Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge with master, gen6 move names

Browse Source
This commit is contained in:
DizzyEggg committed 2018-07-28 00:01:34 +02:00
2 parents 9088c0bdb5 919e7b4387
commit 0148cc8b0c
100 files changed
+32603 -35999
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

asm/battle_frontier_1.s
+3 -3
View File
@@ -6479,7 +6479,7 @@ _0819218E:
mov r0, r9
cmp r0, 0
bne _081921C4
ldr r0, =CB2_ReturnToFieldContinueScript
ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
bl SetMainCallback2
b _081921FC
.pool
@@ -9537,7 +9537,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
@@ -11316,7 +11316,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
asm/battle_frontier_2.s
+2 -2
View File
@@ -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
asm/battle_tower.s
+1 -1
View File
@@ -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}
asm/cable_club.s
+1 -1
View File
@@ -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
asm/contest_link_80F57C4.s
+1 -1
View File
@@ -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:
asm/easy_chat.s
+9 -9
View File
@@ -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}
asm/field_specials.s
+3 -3
View File
@@ -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
asm/party_menu.s
+2 -2
View File
@@ -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
asm/pokemon_storage_system.s
+4 -4
View File
@@ -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
asm/pokemon_summary_screen.s
+4 -4
View File
@@ -210,17 +210,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
asm/pokenav.s
+8 -8
View File
@@ -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
asm/rom_8011DC0.s
+65 -5526
View File
File diff suppressed because it is too large. Load diff
asm/script_pokemon_util_80F87D8.s
+3 -3
View File
@@ -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
charmap.txt
+78 -11
View File
@@ -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
@@ -985,18 +987,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
data/battle_frontier_2.s
+1 -1
View File
@@ -498,7 +498,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
data/data2b.s
-232
View File
@@ -4630,235 +4630,3 @@ gUnknown_08305D0C:: @ 8305D0C
.4byte 0x00000888, 0x00000888, 0x00000888, 0x00000888
.4byte 0x00000888, 0x00000888, 0x00000888, 0x00000888
.4byte 0x00000888, 0x00000888, 0x00000888, 0x00000888
@ 830B62C
.include "data/trainer_parties.inc"
@ 830FCD4
.include "data/text/trainer_class_names.inc"
@ 8310030
.include "data/trainers.inc"
@ 83185C8
.include "data/text/species_names.inc"
@ 831977C
.include "data/text/move_names.inc"
.align 2
.2byte 0x0300, 0x0000
.align 2
gUnknown_0831A988:: @ 831A988
.byte 0x00, 0x03, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_0831A990:: @ 831A990
.byte 0x00, 0x03, 0x00, 0xc0, 0x40, 0x00, 0x00, 0x00
.align 2
gUnknown_0831A998:: @ 831A998
.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0831A9A8:: @ 831A9A8
.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x0018, 0x0018, 0x8000, 0x0000
.2byte 0x0018, 0x0018, 0x8000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0831A9C8:: @ 831A9C8
.4byte gUnknown_0831A998
.4byte gUnknown_0831A9A8
.align 2
gUnknown_0831A9D0:: @ 831A9D0
spr_template 0x2710, 0x2710, gUnknown_0831A988, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17
.align 2
gUnknown_0831A9E8:: @ 831A9E8
spr_template 0x2710, 0x2710, gUnknown_0831A990, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17
.align 2
gUnknown_0831AA00:: @ 831AA00
obj_tiles gUnknown_08D77B0C, 0x1000, 0x2710
.align 2
gBattleBgTemplates:: @ 831AA08
.4byte 0x00000580, 0x000005c5, 0x000013e6, 0x000033ab
.align 2
gUnknown_0831AA18:: @ 831AA18
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090
window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0
window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190
window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300
window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310
window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320
window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330
window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290
window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298
window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298
window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0
window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0
window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100
window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100
window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e
window_template 0x01, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0020
window_template 0x02, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0040
window_template 0x01, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0020
window_template 0x02, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0040
window_template 0x01, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0060
window_template 0x02, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0080
window_template 0x00, 0x0c, 0x02, 0x06, 0x02, 0x00, 0x00a0
window_template 0x00, 0x04, 0x02, 0x07, 0x02, 0x00, 0x00a0
window_template 0x00, 0x13, 0x02, 0x07, 0x02, 0x00, 0x00b0
null_window_template
.align 2
gUnknown_0831AAE0:: @ 831AAE0
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090
window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0
window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190
window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300
window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310
window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320
window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330
window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290
window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298
window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298
window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0
window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0
window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100
window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100
window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e
window_template 0x00, 0x06, 0x01, 0x08, 0x02, 0x05, 0x0100
window_template 0x00, 0x0e, 0x01, 0x02, 0x02, 0x05, 0x0110
window_template 0x00, 0x10, 0x01, 0x08, 0x02, 0x05, 0x0114
window_template 0x00, 0x0c, 0x04, 0x06, 0x02, 0x05, 0x0124
window_template 0x00, 0x0c, 0x06, 0x06, 0x02, 0x05, 0x0130
window_template 0x00, 0x0c, 0x08, 0x06, 0x02, 0x05, 0x013c
window_template 0x00, 0x08, 0x0b, 0x0e, 0x02, 0x05, 0x0148
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x07, 0x0090
null_window_template
.align 2
gBattleWindowTemplates:: @ 831ABA0
.4byte gUnknown_0831AA18
.4byte gUnknown_0831AAE0
.align 2
gBattleTerrainTable:: @ 831ABA8
@ tall_grass
.4byte gBattleTerrainTiles_TallGrass
.4byte gBattleTerrainTilemap_TallGrass
.4byte gBattleTerrainAnimTiles_TallGrass
.4byte gBattleTerrainAnimTilemap_TallGrass
.4byte gBattleTerrainPalette_TallGrass
@ long_grass
.4byte gBattleTerrainTiles_LongGrass
.4byte gBattleTerrainTilemap_LongGrass
.4byte gBattleTerrainAnimTiles_LongGrass
.4byte gBattleTerrainAnimTilemap_LongGrass
.4byte gBattleTerrainPalette_LongGrass
@ sand
.4byte gBattleTerrainTiles_Sand
.4byte gBattleTerrainTilemap_Sand
.4byte gBattleTerrainAnimTiles_Sand
.4byte gBattleTerrainAnimTilemap_Sand
.4byte gBattleTerrainPalette_Sand
@ underwater
.4byte gBattleTerrainTiles_Underwater
.4byte gBattleTerrainTilemap_Underwater
.4byte gBattleTerrainAnimTiles_Underwater
.4byte gBattleTerrainAnimTilemap_Underwater
.4byte gBattleTerrainPalette_Underwater
@ water
.4byte gBattleTerrainTiles_Water
.4byte gBattleTerrainTilemap_Water
.4byte gBattleTerrainAnimTiles_Water
.4byte gBattleTerrainAnimTilemap_Water
.4byte gBattleTerrainPalette_Water
@ pond_water
.4byte gBattleTerrainTiles_PondWater
.4byte gBattleTerrainTilemap_PondWater
.4byte gBattleTerrainAnimTiles_PondWater
.4byte gBattleTerrainAnimTilemap_PondWater
.4byte gBattleTerrainPalette_PondWater
@ rock
.4byte gBattleTerrainTiles_Rock
.4byte gBattleTerrainTilemap_Rock
.4byte gBattleTerrainAnimTiles_Rock
.4byte gBattleTerrainAnimTilemap_Rock
.4byte gBattleTerrainPalette_Rock
@ cave
.4byte gBattleTerrainTiles_Cave
.4byte gBattleTerrainTilemap_Cave
.4byte gBattleTerrainAnimTiles_Cave
.4byte gBattleTerrainAnimTilemap_Cave
.4byte gBattleTerrainPalette_Cave
@ building
.4byte gBattleTerrainTiles_Building
.4byte gBattleTerrainTilemap_Building
.4byte gBattleTerrainAnimTiles_Building
.4byte gBattleTerrainAnimTilemap_Building
.4byte gBattleTerrainPalette_Building
@ plain
.4byte gBattleTerrainTiles_Building
.4byte gBattleTerrainTilemap_Building
.4byte gBattleTerrainAnimTiles_Building
.4byte gBattleTerrainAnimTilemap_Building
.4byte gBattleTerrainPalette_Plain
.align 2
gUnknown_0831AC70:: @ 831AC70
.4byte REG_BG3HOFS
.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
.4byte 1
.4byte REG_BG3HOFS
.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_32BIT | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
.4byte 1
.align 2
gUnknown_0831AC88:: @ 831AC88
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8038528
gText_ShedinjaJapaneseName:: @ 831ACA0
.string "ヌケニン$" @ Nukenin
.align 2
gUnknown_0831ACA8:: @ 831ACA8
.2byte 0x0100
.2byte 0xC000
.2byte 0x0800
.align 2
gUnknown_0831ACB0:: @ 831ACB0
.2byte 0x0100
.2byte 0xC000
.2byte 0x2800
.align 2
gUnknown_0831ACB8:: @ 831ACB8
.2byte 0x0000, 0x0005, 0xfffe, 0x0000
.align 2
gUnknown_0831ACC0:: @ 831ACC0
.4byte gUnknown_0831ACB8
.align 2
gUnknown_0831ACC4:: @ 831ACC4
.2byte 0xfff0, 0x0000, 0x0400, 0x0000, 0x0000, 0x0000, 0x3c00, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000
.align 2
gUnknown_0831ACDC:: @ 831ACDC
.4byte gUnknown_0831ACC4
data/data2c.s
+226
View File
@@ -0,0 +1,226 @@
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/trainers.h"
#include "constants/pokemon.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
.2byte 0x0300, 0x0000
.align 2
gUnknown_0831A988:: @ 831A988
.byte 0x00, 0x03, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_0831A990:: @ 831A990
.byte 0x00, 0x03, 0x00, 0xc0, 0x40, 0x00, 0x00, 0x00
.align 2
gUnknown_0831A998:: @ 831A998
.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0831A9A8:: @ 831A9A8
.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x0018, 0x0018, 0x8000, 0x0000
.2byte 0x0018, 0x0018, 0x8000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0831A9C8:: @ 831A9C8
.4byte gUnknown_0831A998
.4byte gUnknown_0831A9A8
.align 2
gUnknown_0831A9D0:: @ 831A9D0
spr_template 0x2710, 0x2710, gUnknown_0831A988, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17
.align 2
gUnknown_0831A9E8:: @ 831A9E8
spr_template 0x2710, 0x2710, gUnknown_0831A990, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17
.align 2
gUnknown_0831AA00:: @ 831AA00
obj_tiles gUnknown_08D77B0C, 0x1000, 0x2710
.align 2
gBattleBgTemplates:: @ 831AA08
.4byte 0x00000580, 0x000005c5, 0x000013e6, 0x000033ab
.align 2
gUnknown_0831AA18:: @ 831AA18
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090
window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0
window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190
window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300
window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310
window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320
window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330
window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290
window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298
window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298
window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0
window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0
window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100
window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100
window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e
window_template 0x01, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0020
window_template 0x02, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0040
window_template 0x01, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0020
window_template 0x02, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0040
window_template 0x01, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0060
window_template 0x02, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0080
window_template 0x00, 0x0c, 0x02, 0x06, 0x02, 0x00, 0x00a0
window_template 0x00, 0x04, 0x02, 0x07, 0x02, 0x00, 0x00a0
window_template 0x00, 0x13, 0x02, 0x07, 0x02, 0x00, 0x00b0
null_window_template
.align 2
gUnknown_0831AAE0:: @ 831AAE0
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090
window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0
window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190
window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300
window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310
window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320
window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330
window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290
window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298
window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298
window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0
window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0
window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100
window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100
window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e
window_template 0x00, 0x06, 0x01, 0x08, 0x02, 0x05, 0x0100
window_template 0x00, 0x0e, 0x01, 0x02, 0x02, 0x05, 0x0110
window_template 0x00, 0x10, 0x01, 0x08, 0x02, 0x05, 0x0114
window_template 0x00, 0x0c, 0x04, 0x06, 0x02, 0x05, 0x0124
window_template 0x00, 0x0c, 0x06, 0x06, 0x02, 0x05, 0x0130
window_template 0x00, 0x0c, 0x08, 0x06, 0x02, 0x05, 0x013c
window_template 0x00, 0x08, 0x0b, 0x0e, 0x02, 0x05, 0x0148
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x07, 0x0090
null_window_template
.align 2
gBattleWindowTemplates:: @ 831ABA0
.4byte gUnknown_0831AA18
.4byte gUnknown_0831AAE0
.align 2
gBattleTerrainTable:: @ 831ABA8
@ tall_grass
.4byte gBattleTerrainTiles_TallGrass
.4byte gBattleTerrainTilemap_TallGrass
.4byte gBattleTerrainAnimTiles_TallGrass
.4byte gBattleTerrainAnimTilemap_TallGrass
.4byte gBattleTerrainPalette_TallGrass
@ long_grass
.4byte gBattleTerrainTiles_LongGrass
.4byte gBattleTerrainTilemap_LongGrass
.4byte gBattleTerrainAnimTiles_LongGrass
.4byte gBattleTerrainAnimTilemap_LongGrass
.4byte gBattleTerrainPalette_LongGrass
@ sand
.4byte gBattleTerrainTiles_Sand
.4byte gBattleTerrainTilemap_Sand
.4byte gBattleTerrainAnimTiles_Sand
.4byte gBattleTerrainAnimTilemap_Sand
.4byte gBattleTerrainPalette_Sand
@ underwater
.4byte gBattleTerrainTiles_Underwater
.4byte gBattleTerrainTilemap_Underwater
.4byte gBattleTerrainAnimTiles_Underwater
.4byte gBattleTerrainAnimTilemap_Underwater
.4byte gBattleTerrainPalette_Underwater
@ water
.4byte gBattleTerrainTiles_Water
.4byte gBattleTerrainTilemap_Water
.4byte gBattleTerrainAnimTiles_Water
.4byte gBattleTerrainAnimTilemap_Water
.4byte gBattleTerrainPalette_Water
@ pond_water
.4byte gBattleTerrainTiles_PondWater
.4byte gBattleTerrainTilemap_PondWater
.4byte gBattleTerrainAnimTiles_PondWater
.4byte gBattleTerrainAnimTilemap_PondWater
.4byte gBattleTerrainPalette_PondWater
@ rock
.4byte gBattleTerrainTiles_Rock
.4byte gBattleTerrainTilemap_Rock
.4byte gBattleTerrainAnimTiles_Rock
.4byte gBattleTerrainAnimTilemap_Rock
.4byte gBattleTerrainPalette_Rock
@ cave
.4byte gBattleTerrainTiles_Cave
.4byte gBattleTerrainTilemap_Cave
.4byte gBattleTerrainAnimTiles_Cave
.4byte gBattleTerrainAnimTilemap_Cave
.4byte gBattleTerrainPalette_Cave
@ building
.4byte gBattleTerrainTiles_Building
.4byte gBattleTerrainTilemap_Building
.4byte gBattleTerrainAnimTiles_Building
.4byte gBattleTerrainAnimTilemap_Building
.4byte gBattleTerrainPalette_Building
@ plain
.4byte gBattleTerrainTiles_Building
.4byte gBattleTerrainTilemap_Building
.4byte gBattleTerrainAnimTiles_Building
.4byte gBattleTerrainAnimTilemap_Building
.4byte gBattleTerrainPalette_Plain
.align 2
gUnknown_0831AC70:: @ 831AC70
.4byte REG_BG3HOFS
.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
.4byte 1
.4byte REG_BG3HOFS
.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_32BIT | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
.4byte 1
.align 2
gUnknown_0831AC88:: @ 831AC88
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8038528
gText_ShedinjaJapaneseName:: @ 831ACA0
.string "ヌケニン$" @ Nukenin
.align 2
gUnknown_0831ACA8:: @ 831ACA8
.2byte 0x0100
.2byte 0xC000
.2byte 0x0800
.align 2
gUnknown_0831ACB0:: @ 831ACB0
.2byte 0x0100
.2byte 0xC000
.2byte 0x2800
.align 2
gUnknown_0831ACB8:: @ 831ACB8
.2byte 0x0000, 0x0005, 0xfffe, 0x0000
.align 2
gUnknown_0831ACC0:: @ 831ACC0
.4byte gUnknown_0831ACB8
.align 2
gUnknown_0831ACC4:: @ 831ACC4
.2byte 0xfff0, 0x0000, 0x0400, 0x0000, 0x0000, 0x0000, 0x3c00, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000
.align 2
gUnknown_0831ACDC:: @ 831ACDC
.4byte gUnknown_0831ACC4
data/maps/LilycoveCity_ContestLobby/events.inc
+2 -2
View File
@@ -32,7 +32,7 @@ LilycoveCity_ContestLobby_MapWarps: @ 853178C
warp_def 21, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL
LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC
bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_294055
bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_PblockLink
bg_event 23, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293E1E
bg_event 23, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A753
bg_event 25, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A75A
@@ -41,7 +41,7 @@ LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC
bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A73E
bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A745
bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A74C
bg_event 27, 5, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293C3E
bg_event 27, 5, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_Pblock1_Ask
bg_event 27, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293D4D
bg_event 18, 3, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A784
data/maps/LilycoveCity_ContestLobby/scripts.inc
+1 -1
View File
@@ -877,7 +877,7 @@ LilycoveCity_ContestLobby_EventScript_21ABA0:: @ 821ABA0
return
LilycoveCity_ContestLobby_EventScript_21ABA6:: @ 821ABA6
message LilycoveCity_ContestLobby_Text_27C1EA
message Text_DecideLinkLeader
waitmessage
multichoice 16, 6, 81, 0
switch VAR_RESULT
data/maps/MtChimney/scripts.inc
+1 -1
View File
@@ -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
data/maps/Route101/scripts.inc
+1 -1
View File
@@ -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$"
data/maps/Route102/scripts.inc
+2 -2
View File
@@ -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$"
data/maps/Route103/scripts.inc
+1 -1
View File
@@ -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$"
data/maps/Route104/scripts.inc
+2 -2
View File
@@ -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$"
data/maps/Route110/scripts.inc
+4 -4
View File
@@ -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
data/maps/Route111/scripts.inc
+4 -4
View File
@@ -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!”$"
data/maps/Route112/scripts.inc
+2 -2
View File
@@ -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$"
data/maps/Route113/scripts.inc
+2 -2
View File
@@ -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"
data/maps/Route115/scripts.inc
+1 -1
View File
@@ -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"
data/maps/Route116/scripts.inc
+1 -1
View File
@@ -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"
data/maps/Route117/scripts.inc
+2 -2
View File
@@ -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"
data/maps/Route118/scripts.inc
+2 -2
View File
@@ -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$"
data/maps/Route119/scripts.inc
+1 -1
View File
@@ -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$"
data/maps/Route120/scripts.inc
+3 -3
View File
@@ -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$"
data/maps/Route123/scripts.inc
+3 -3
View File
@@ -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
data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
+8 -8
View File
@@ -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$"
data/pokemon_summary_screen.s
+1 -1
View File
@@ -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
data/pokenav.s
+3 -3
View File
@@ -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
data/rom_8011DC0.s
+3 -3
View File
@@ -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
data/scripts/cable_club.inc
+1 -1
View File
@@ -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.$"
data/scripts/contest_hall.inc
+1 -1
View File
@@ -1761,7 +1761,7 @@ LilycoveCity_ContestLobby_Text_27C186: @ 827C186
LilycoveCity_ContestLobby_Text_27C1C3: @ 827C1C3
.string "Which POKéMON would you like to enter?$"
LilycoveCity_ContestLobby_Text_27C1EA: @ 827C1EA
Text_DecideLinkLeader: @ 827C1EA
.string "Please decide which of you will\n"
.string "become the GROUP LEADER.\p"
.string "The other players must then choose\n"
data/scripts/pokeblocks.inc
+164 -150
View File
@@ -1,22 +1,36 @@
LilycoveCity_ContestLobby_Text_292DEE: @ 8292DEE
@ The scripts there concern pokeblock events in LilyCove City's Contest Lobby
@ 'PblockX' number of offline opponents
@ 'Ask' talking with a blender machine
@ 'Yes' agreeing to blend
@ 'No' refusing to blend
@ 'KnowHow' asking if the player knows the blending process
@ 'Explain' explaining the blender process
@ 'Start' start blending
@ 'TalkX' talking with a person next to a blender machine
@ 'NoBerries' can't blend cause they have no berries
@ 'FullPokeblock' can't blend cause full pokeblock case
@ 'NoPokeblock' can't blend cause they have no pokeblock case
Text_Pblock1_Ask: @ 8292DEE
.string "Oh? Did you want to make some {POKEBLOCK}S\n"
.string "with this old-timer?$"
LilycoveCity_ContestLobby_Text_292E28: @ 8292E28
Text_Pblock1_Yes: @ 8292E28
.string "Excellent!$"
LilycoveCity_ContestLobby_Text_292E33: @ 8292E33
Text_Pblock1_No: @ 8292E33
.string "Oh…\n"
.string "You’ve made this old-timer sad…$"
LilycoveCity_ContestLobby_Text_292E57: @ 8292E57
Text_Pblock1_KnowHow: @ 8292E57
.string "Do you know how to make a {POKEBLOCK}?$"
LilycoveCity_ContestLobby_Text_292E78: @ 8292E78
Text_Pblock1_Start: @ 8292E78
.string "Let’s get started, then!\p"
.string "Let’s BERRY BLENDER!$"
LilycoveCity_ContestLobby_Text_292EA6: @ 8292EA6
Text_Pblock1_Explain: @ 8292EA6
.string "Okay, a little explanation, then.\p"
.string "Oh, don’t worry, it’s quite simple.\p"
.string "When the BLENDER’s arrow comes to\n"
@@ -24,7 +38,7 @@ LilycoveCity_ContestLobby_Text_292EA6: @ 8292EA6
.string "That’s all you have to do.\n"
.string "You’ll see how easy it is when you try.$"
LilycoveCity_ContestLobby_Text_292F77: @ 8292F77
Text_Pblock1_NoBerries: @ 8292F77
.string "Oh?\n"
.string "You don’t have any BERRIES?\p"
.string "If you don’t have any BERRIES,\n"
@@ -43,12 +57,12 @@ LilycoveCity_ContestLobby_Text_29307D: @ 829307D
.string "But, I don’t have any to spare today.\n"
.string "We’ll have to do this another time.$"
LilycoveCity_ContestLobby_Text_293101: @ 8293101
Text_Pblock1_FullPokeblock: @ 8293101
.string "But your {POKEBLOCK} CASE is full.\p"
.string "You should use some {POKEBLOCK}S before\n"
.string "you come see me again.$"
LilycoveCity_ContestLobby_Text_293157: @ 8293157
Text_Pblock1_NoPokeblock: @ 8293157
.string "But you don’t have a {POKEBLOCK} CASE.\p"
.string "You should get a {POKEBLOCK} CASE and then\n"
.string "come see me.$"
@@ -171,43 +185,43 @@ LilycoveCity_ContestLobby_Text_29388F: @ 829388F
.string "I’m going to make delicious {POKEBLOCK}S\n"
.string "and make my POKéMON cuter.$"
LilycoveCity_ContestLobby_Text_2938CD: @ 82938CD
Text_PblockLink_Ask: @ 82938CD
.string "{POKEBLOCK}S will be made with your friends \n"
.string "from BERRIES in the BERRY BLENDER.\p"
.string "Is it okay to save the game before\n"
.string "linking with your friends?$"
LilycoveCity_ContestLobby_Text_293955: @ 8293955
Text_PblockLink_Searching: @ 8293955
.string "Searching for your friends…\n"
.string "… … B Button: Cancel$"
LilycoveCity_ContestLobby_Text_293986: @ 8293986
Text_PblockLink_1Arrived: @ 8293986
.string "{STR_VAR_1} arrived.$"
LilycoveCity_ContestLobby_Text_293992: @ 8293992
Text_PblockLink_2Arrived: @ 8293992
.string "{STR_VAR_1} and {STR_VAR_2} arrived.$"
LilycoveCity_ContestLobby_Text_2939A5: @ 82939A5
Text_PblockLink_3Arrived: @ 82939A5
.string "{STR_VAR_1}, {STR_VAR_2}, and\n"
.string "{STR_VAR_3} arrived.$"
LilycoveCity_ContestLobby_Text_2939BD: @ 82939BD
Text_PblockLink_NoBerries: @ 82939BD
.string "You have no BERRIES.\n"
.string "The BERRY BLENDER can’t be used.$"
LilycoveCity_ContestLobby_Text_2939F3: @ 82939F3
Text_PblockLink_FullPokeblock: @ 82939F3
.string "Your {POKEBLOCK} CASE is full.\n"
.string "The BERRY BLENDER can’t be used.$"
LilycoveCity_ContestLobby_Text_293A2D: @ 8293A2D
Text_PblockLink_NoPokeblock: @ 8293A2D
.string "You don’t have a {POKEBLOCK} CASE.\n"
.string "The BERRY BLENDER can’t be used.$"
LilycoveCity_ContestLobby_Text_293A6B: @ 8293A6B
Text_Pblock1_Talk_0: @ 8293A6B
.string "I love making {POKEBLOCK}S.\p"
.string "I always have some BERRIES with me.$"
LilycoveCity_ContestLobby_Text_293AA5: @ 8293AA5
Text_Pblock1_Talk_1: @ 8293AA5
.string "If you’d like, we could make some\n"
.string "{POKEBLOCK}S together using the\l"
.string "BERRY BLENDER.$"
@@ -231,76 +245,76 @@ LilycoveCity_ContestLobby_Text_293BB4: @ 8293BB4
.string "But, I don’t have any to spare today.\n"
.string "Sorry about that.$"
LilycoveCity_ContestLobby_EventScript_293C3E:: @ 8293C3E
EventScript_Pblock1_Ask:: @ 8293C3E
lockall
checkflag FLAG_0x340
goto_if 0, LilycoveCity_ContestLobby_EventScript_293EFB
setvar VAR_0x8009, 1
applymovement 16, LilycoveCity_ContestLobby_Movement_294053
waitmovement 0
msgbox LilycoveCity_ContestLobby_Text_292DEE, 5
msgbox Text_Pblock1_Ask, 5
compare VAR_RESULT, 1
goto_eq LilycoveCity_ContestLobby_EventScript_293CEE
goto LilycoveCity_ContestLobby_EventScript_293C70
goto_eq EventScript_Pblock1_Yes
goto EventScript_Pblock1_No
end
LilycoveCity_ContestLobby_EventScript_293C70:: @ 8293C70
msgbox LilycoveCity_ContestLobby_Text_292E33, 4
EventScript_Pblock1_No: @ 8293C70
msgbox Text_Pblock1_No, 4
releaseall
end
LilycoveCity_ContestLobby_EventScript_293C7A:: @ 8293C7A
msgbox LilycoveCity_ContestLobby_Text_292F77, 4
EventScript_Pblock1_NoBerries: @ 8293C7A
msgbox Text_Pblock1_NoBerries, 4
dodailyevents
checkflag FLAG_0x921
goto_eq LilycoveCity_ContestLobby_EventScript_293C92
goto LilycoveCity_ContestLobby_EventScript_293C9C
end
LilycoveCity_ContestLobby_EventScript_293C92:: @ 8293C92
LilycoveCity_ContestLobby_EventScript_293C92: @ 8293C92
msgbox LilycoveCity_ContestLobby_Text_29307D, 4
releaseall
end
LilycoveCity_ContestLobby_EventScript_293C9C:: @ 8293C9C
LilycoveCity_ContestLobby_EventScript_293C9C: @ 8293C9C
msgbox LilycoveCity_ContestLobby_Text_292FD1, 4
giveitem_std ITEM_PECHA_BERRY
setflag FLAG_0x921
goto LilycoveCity_ContestLobby_EventScript_293CB9
goto EventScript_Pblock1_KnowHow
end
LilycoveCity_ContestLobby_EventScript_293CB9:: @ 8293CB9
msgbox LilycoveCity_ContestLobby_Text_292E57, 5
EventScript_Pblock1_KnowHow: @ 8293CB9
msgbox Text_Pblock1_KnowHow, 5
compare VAR_RESULT, 1
goto_eq LilycoveCity_ContestLobby_EventScript_293CD2
goto LilycoveCity_ContestLobby_EventScript_293CE0
goto_eq EventScript_Pblock1_Start
goto EventScript_Pblock1_Explain
end
LilycoveCity_ContestLobby_EventScript_293CD2:: @ 8293CD2
msgbox LilycoveCity_ContestLobby_Text_292E78, 4
goto LilycoveCity_ContestLobby_EventScript_293D2C
EventScript_Pblock1_Start: @ 8293CD2
msgbox Text_Pblock1_Start, 4
goto EventScript_StartBlending
end
LilycoveCity_ContestLobby_EventScript_293CE0:: @ 8293CE0
msgbox LilycoveCity_ContestLobby_Text_292EA6, 4
goto LilycoveCity_ContestLobby_EventScript_293CD2
EventScript_Pblock1_Explain: @ 8293CE0
msgbox Text_Pblock1_Explain, 4
goto EventScript_Pblock1_Start
end
LilycoveCity_ContestLobby_EventScript_293CEE:: @ 8293CEE
EventScript_Pblock1_Yes: @ 8293CEE
checkitem ITEM_POKEBLOCK_CASE, 1
compare VAR_RESULT, 0
goto_eq LilycoveCity_ContestLobby_EventScript_293D43
goto_eq EventScript_Pblock1_NoPokeblock
specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare VAR_RESULT, 65535
goto_eq LilycoveCity_ContestLobby_EventScript_293D39
goto_eq EventScript_Pblock1_FullPokeblock
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, 0
goto_eq LilycoveCity_ContestLobby_EventScript_293C7A
msgbox LilycoveCity_ContestLobby_Text_292E28, 4
goto LilycoveCity_ContestLobby_EventScript_293CB9
goto_eq EventScript_Pblock1_NoBerries
msgbox Text_Pblock1_Yes, 4
goto EventScript_Pblock1_KnowHow
end
LilycoveCity_ContestLobby_EventScript_293D2C:: @ 8293D2C
EventScript_StartBlending: @ 8293D2C
copyvar VAR_0x8004, VAR_0x8009
fadescreen 1
special DoBerryBlending
@@ -308,13 +322,13 @@ LilycoveCity_ContestLobby_EventScript_293D2C:: @ 8293D2C
releaseall
end
LilycoveCity_ContestLobby_EventScript_293D39:: @ 8293D39
msgbox LilycoveCity_ContestLobby_Text_293101, 4
EventScript_Pblock1_FullPokeblock: @ 8293D39
msgbox Text_Pblock1_FullPokeblock, 4
releaseall
end
LilycoveCity_ContestLobby_EventScript_293D43:: @ 8293D43
msgbox LilycoveCity_ContestLobby_Text_293157, 4
EventScript_Pblock1_NoPokeblock: @ 8293D43
msgbox Text_Pblock1_NoPokeblock, 4
releaseall
end
@@ -330,34 +344,34 @@ LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D
goto LilycoveCity_ContestLobby_EventScript_293D7D
end
LilycoveCity_ContestLobby_EventScript_293D7D:: @ 8293D7D
LilycoveCity_ContestLobby_EventScript_293D7D: @ 8293D7D
msgbox LilycoveCity_ContestLobby_Text_29323D, 4
releaseall
end
LilycoveCity_ContestLobby_EventScript_293D87:: @ 8293D87
LilycoveCity_ContestLobby_EventScript_293D87: @ 8293D87
msgbox LilycoveCity_ContestLobby_Text_293394, 4
release
end
LilycoveCity_ContestLobby_EventScript_293D91:: @ 8293D91
LilycoveCity_ContestLobby_EventScript_293D91: @ 8293D91
msgbox LilycoveCity_ContestLobby_Text_29328C, 5
compare VAR_RESULT, 1
goto_eq LilycoveCity_ContestLobby_EventScript_293DAA
goto LilycoveCity_ContestLobby_EventScript_293DB8
end
LilycoveCity_ContestLobby_EventScript_293DAA:: @ 8293DAA
LilycoveCity_ContestLobby_EventScript_293DAA: @ 8293DAA
msgbox LilycoveCity_ContestLobby_Text_2932C3, 4
goto LilycoveCity_ContestLobby_EventScript_293D2C
goto EventScript_StartBlending
end
LilycoveCity_ContestLobby_EventScript_293DB8:: @ 8293DB8
LilycoveCity_ContestLobby_EventScript_293DB8: @ 8293DB8
msgbox LilycoveCity_ContestLobby_Text_2932F1, 4
goto LilycoveCity_ContestLobby_EventScript_293DAA
end
LilycoveCity_ContestLobby_EventScript_293DC6:: @ 8293DC6
LilycoveCity_ContestLobby_EventScript_293DC6: @ 8293DC6
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, 0
goto_eq LilycoveCity_ContestLobby_EventScript_293D87
@@ -372,12 +386,12 @@ LilycoveCity_ContestLobby_EventScript_293DC6:: @ 8293DC6
goto_eq LilycoveCity_ContestLobby_EventScript_293E0A
end
LilycoveCity_ContestLobby_EventScript_293E0A:: @ 8293E0A
LilycoveCity_ContestLobby_EventScript_293E0A: @ 8293E0A
msgbox LilycoveCity_ContestLobby_Text_29343E, 4
releaseall
end
LilycoveCity_ContestLobby_EventScript_293E14:: @ 8293E14
LilycoveCity_ContestLobby_EventScript_293E14: @ 8293E14
msgbox LilycoveCity_ContestLobby_Text_2934A2, 4
releaseall
end
@@ -396,34 +410,34 @@ LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E
goto LilycoveCity_ContestLobby_EventScript_293E5A
end
LilycoveCity_ContestLobby_EventScript_293E5A:: @ 8293E5A
LilycoveCity_ContestLobby_EventScript_293E5A: @ 8293E5A
msgbox LilycoveCity_ContestLobby_Text_293558, 4
releaseall
end
LilycoveCity_ContestLobby_EventScript_293E64:: @ 8293E64
LilycoveCity_ContestLobby_EventScript_293E64: @ 8293E64
msgbox LilycoveCity_ContestLobby_Text_29367D, 4
release
end
LilycoveCity_ContestLobby_EventScript_293E6E:: @ 8293E6E
LilycoveCity_ContestLobby_EventScript_293E6E: @ 8293E6E
msgbox LilycoveCity_ContestLobby_Text_29357E, 5
compare VAR_RESULT, 1
goto_eq LilycoveCity_ContestLobby_EventScript_293E87
goto LilycoveCity_ContestLobby_EventScript_293E95
end
LilycoveCity_ContestLobby_EventScript_293E87:: @ 8293E87
LilycoveCity_ContestLobby_EventScript_293E87: @ 8293E87
msgbox LilycoveCity_ContestLobby_Text_2935B1, 4
goto LilycoveCity_ContestLobby_EventScript_293D2C
goto EventScript_StartBlending
end
LilycoveCity_ContestLobby_EventScript_293E95:: @ 8293E95
LilycoveCity_ContestLobby_EventScript_293E95: @ 8293E95
msgbox LilycoveCity_ContestLobby_Text_2935E5, 4
goto LilycoveCity_ContestLobby_EventScript_293E87
end
LilycoveCity_ContestLobby_EventScript_293EA3:: @ 8293EA3
LilycoveCity_ContestLobby_EventScript_293EA3: @ 8293EA3
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, 0
goto_eq LilycoveCity_ContestLobby_EventScript_293E64
@@ -438,17 +452,17 @@ LilycoveCity_ContestLobby_EventScript_293EA3:: @ 8293EA3
goto_eq LilycoveCity_ContestLobby_EventScript_293EE7
end
LilycoveCity_ContestLobby_EventScript_293EE7:: @ 8293EE7
LilycoveCity_ContestLobby_EventScript_293EE7: @ 8293EE7
msgbox LilycoveCity_ContestLobby_Text_293738, 4
releaseall
end
LilycoveCity_ContestLobby_EventScript_293EF1:: @ 8293EF1
LilycoveCity_ContestLobby_EventScript_293EF1: @ 8293EF1
msgbox LilycoveCity_ContestLobby_Text_293792, 4
releaseall
end
LilycoveCity_ContestLobby_EventScript_293EFB:: @ 8293EFB
LilycoveCity_ContestLobby_EventScript_293EFB: @ 8293EFB
lockall
setvar VAR_0x8009, 1
msgbox LilycoveCity_ContestLobby_Text_2C42F4, 5
@@ -458,12 +472,12 @@ LilycoveCity_ContestLobby_EventScript_293EFB:: @ 8293EFB
releaseall
end
LilycoveCity_ContestLobby_EventScript_293F1E:: @ 8293F1E
LilycoveCity_ContestLobby_EventScript_293F1E: @ 8293F1E
msgbox LilycoveCity_ContestLobby_Text_2C439D, 4
releaseall
end
LilycoveCity_ContestLobby_EventScript_293F28:: @ 8293F28
LilycoveCity_ContestLobby_EventScript_293F28: @ 8293F28
checkitem ITEM_POKEBLOCK_CASE, 1
compare VAR_RESULT, 0
goto_eq LilycoveCity_ContestLobby_EventScript_293F8E
@@ -477,24 +491,24 @@ LilycoveCity_ContestLobby_EventScript_293F28:: @ 8293F28
goto_eq LilycoveCity_ContestLobby_EventScript_293F98
end
LilycoveCity_ContestLobby_EventScript_293F64:: @ 8293F64
LilycoveCity_ContestLobby_EventScript_293F64: @ 8293F64
msgbox LilycoveCity_ContestLobby_Text_2C43FA, 5
compare VAR_RESULT, 0
call_if 1, LilycoveCity_ContestLobby_EventScript_293F85
msgbox LilycoveCity_ContestLobby_Text_2C451B, 4
goto LilycoveCity_ContestLobby_EventScript_293D2C
goto EventScript_StartBlending
end
LilycoveCity_ContestLobby_EventScript_293F85:: @ 8293F85
LilycoveCity_ContestLobby_EventScript_293F85: @ 8293F85
msgbox LilycoveCity_ContestLobby_Text_2C444C, 4
return
LilycoveCity_ContestLobby_EventScript_293F8E:: @ 8293F8E
LilycoveCity_ContestLobby_EventScript_293F8E: @ 8293F8E
msgbox LilycoveCity_ContestLobby_Text_2C4573, 4
releaseall
end
LilycoveCity_ContestLobby_EventScript_293F98:: @ 8293F98
LilycoveCity_ContestLobby_EventScript_293F98: @ 8293F98
msgbox LilycoveCity_ContestLobby_Text_2C45E8, 4
releaseall
end
@@ -516,10 +530,10 @@ LilycoveCity_ContestLobby_EventScript_293FBD:: @ 8293FBD
goto LilycoveCity_ContestLobby_EventScript_293FC8
end
LilycoveCity_ContestLobby_EventScript_293FC8:: @ 8293FC8
LilycoveCity_ContestLobby_EventScript_293FC8: @ 8293FC8
lock
faceplayer
msgbox LilycoveCity_ContestLobby_Text_293A6B, 4
msgbox Text_Pblock1_Talk_0, 4
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, 1
goto_eq LilycoveCity_ContestLobby_EventScript_293FEE
@@ -527,12 +541,12 @@ LilycoveCity_ContestLobby_EventScript_293FC8:: @ 8293FC8
goto_eq LilycoveCity_ContestLobby_EventScript_293FF8
end
LilycoveCity_ContestLobby_EventScript_293FEE:: @ 8293FEE
msgbox LilycoveCity_ContestLobby_Text_293AA5, 4
LilycoveCity_ContestLobby_EventScript_293FEE: @ 8293FEE
msgbox Text_Pblock1_Talk_1, 4
release
end
LilycoveCity_ContestLobby_EventScript_293FF8:: @ 8293FF8
LilycoveCity_ContestLobby_EventScript_293FF8: @ 8293FF8
checkitem ITEM_POKEBLOCK_CASE, 1
compare VAR_RESULT, 0
goto_eq LilycoveCity_ContestLobby_EventScript_294028
@@ -545,12 +559,12 @@ LilycoveCity_ContestLobby_EventScript_293FF8:: @ 8293FF8
goto LilycoveCity_ContestLobby_EventScript_294032
end
LilycoveCity_ContestLobby_EventScript_294028:: @ 8294028
LilycoveCity_ContestLobby_EventScript_294028: @ 8294028
msgbox LilycoveCity_ContestLobby_Text_293BB4, 4
release
end
LilycoveCity_ContestLobby_EventScript_294032:: @ 8294032
LilycoveCity_ContestLobby_EventScript_294032: @ 8294032
msgbox LilycoveCity_ContestLobby_Text_293AF0, 4
giveitem_std ITEM_PECHA_BERRY
setflag FLAG_0x921
@@ -562,73 +576,73 @@ LilycoveCity_ContestLobby_Movement_294053: @ 8294053
walk_in_place_fastest_right
step_end
LilycoveCity_ContestLobby_EventScript_294055:: @ 8294055
EventScript_PblockLink:: @ 8294055
lockall
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, 0
goto_eq LilycoveCity_ContestLobby_EventScript_2940B1
goto_eq EventScript_PblocLink_NoBerries
checkitem ITEM_POKEBLOCK_CASE, 1
compare VAR_RESULT, 0
goto_eq LilycoveCity_ContestLobby_EventScript_29416C
goto_eq EventScript_PblocLink_NoPokeblock
specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare VAR_RESULT, 65535
goto_if 5, LilycoveCity_ContestLobby_EventScript_294092
goto_if 5, EventScript_PblocLink_Ask
compare VAR_RESULT, 65535
goto_eq LilycoveCity_ContestLobby_EventScript_294162
goto_eq EventScript_PblocLink_FullPokeblock
end
LilycoveCity_ContestLobby_EventScript_294092:: @ 8294092
msgbox LilycoveCity_ContestLobby_Text_2938CD, 5
EventScript_PblocLink_Ask: @ 8294092
msgbox Text_PblockLink_Ask, 5
compare VAR_RESULT, 1
goto_eq LilycoveCity_ContestLobby_EventScript_2940BB
goto_eq EventScript_PblocLink_TryConnect
compare VAR_RESULT, 0
goto_eq LilycoveCity_ContestLobby_EventScript_294160
goto_eq EventScript_PblocLink_End
end
LilycoveCity_ContestLobby_EventScript_2940B1:: @ 82940B1
msgbox LilycoveCity_ContestLobby_Text_2939BD, 4
EventScript_PblocLink_NoBerries: @ 82940B1
msgbox Text_PblockLink_NoBerries, 4
releaseall
end
LilycoveCity_ContestLobby_EventScript_2940BB:: @ 82940BB
EventScript_PblocLink_TryConnect: @ 82940BB
call LilycoveCity_ContestLobby_EventScript_27134F
compare VAR_RESULT, 0
goto_eq LilycoveCity_ContestLobby_EventScript_294160
goto_eq EventScript_PblocLink_End
specialvar VAR_RESULT, IsWirelessAdapterConnected
compare VAR_RESULT, 1
goto_eq LilycoveCity_ContestLobby_EventScript_2941ED
message LilycoveCity_ContestLobby_Text_293955
message Text_PblockLink_Searching
waitmessage
special sub_80B2FD8
waitstate
compare VAR_RESULT, 1
goto_eq LilycoveCity_ContestLobby_EventScript_2941AA
goto_eq EventScript_PblocLink_SpawnPartners
compare VAR_RESULT, 2
goto_eq LilycoveCity_ContestLobby_EventScript_294176
goto_eq EventScript_PblocLink_SomeoneNotReady
compare VAR_RESULT, 3
goto_eq LilycoveCity_ContestLobby_EventScript_294183
goto_eq EventScript_PblocLink_DifferentSelections
compare VAR_RESULT, 5
goto_eq LilycoveCity_ContestLobby_EventScript_294190
goto_eq EventScript_PblocLink_CloseLink
compare VAR_RESULT, 6
goto_eq LilycoveCity_ContestLobby_EventScript_29419D
goto_eq EventScript_PblocLink_LinkError
end
LilycoveCity_ContestLobby_EventScript_29411D:: @ 829411D
msgbox LilycoveCity_ContestLobby_Text_293986, 4
goto LilycoveCity_ContestLobby_EventScript_294147
EventScript_PblocLink_1Arrived: @ 829411D
msgbox Text_PblockLink_1Arrived, 4
goto EventScript_PblocLink_StartLinkBlending
end
LilycoveCity_ContestLobby_EventScript_29412B:: @ 829412B
msgbox LilycoveCity_ContestLobby_Text_293992, 4
goto LilycoveCity_ContestLobby_EventScript_294147
EventScript_PblocLink_2Arrived: @ 829412B
msgbox Text_PblockLink_2Arrived, 4
goto EventScript_PblocLink_StartLinkBlending
end
LilycoveCity_ContestLobby_EventScript_294139:: @ 8294139
msgbox LilycoveCity_ContestLobby_Text_2939A5, 4
goto LilycoveCity_ContestLobby_EventScript_294147
EventScript_PblocLink_3Arrived: @ 8294139
msgbox Text_PblockLink_3Arrived, 4
goto EventScript_PblocLink_StartLinkBlending
end
LilycoveCity_ContestLobby_EventScript_294147:: @ 8294147
EventScript_PblocLink_StartLinkBlending: @ 8294147
setvar VAR_0x8004, 0
fadescreen 1
removeobject 240
@@ -640,109 +654,109 @@ LilycoveCity_ContestLobby_EventScript_294147:: @ 8294147
releaseall
end
LilycoveCity_ContestLobby_EventScript_294160:: @ 8294160
EventScript_PblocLink_End: @ 8294160
releaseall
end
LilycoveCity_ContestLobby_EventScript_294162:: @ 8294162
msgbox LilycoveCity_ContestLobby_Text_2939F3, 4
EventScript_PblocLink_FullPokeblock: @ 8294162
msgbox Text_PblockLink_FullPokeblock, 4
releaseall
end
LilycoveCity_ContestLobby_EventScript_29416C:: @ 829416C
msgbox LilycoveCity_ContestLobby_Text_293A2D, 4
EventScript_PblocLink_NoPokeblock: @ 829416C
msgbox Text_PblockLink_NoPokeblock, 4
releaseall
end
LilycoveCity_ContestLobby_EventScript_294176:: @ 8294176
EventScript_PblocLink_SomeoneNotReady: @ 8294176
special CloseLink
msgbox LilycoveCity_ContestLobby_Text_2781C7, 4
releaseall
end
LilycoveCity_ContestLobby_EventScript_294183:: @ 8294183
EventScript_PblocLink_DifferentSelections: @ 8294183
special CloseLink
msgbox LilycoveCity_ContestLobby_Text_278255, 4
releaseall
end
LilycoveCity_ContestLobby_EventScript_294190:: @ 8294190
EventScript_PblocLink_CloseLink: @ 8294190
special CloseLink
msgbox gUnknown_08272D9C, 4
releaseall
end
LilycoveCity_ContestLobby_EventScript_29419D:: @ 829419D
EventScript_PblocLink_LinkError: @ 829419D
special CloseLink
msgbox LilycoveCity_ContestLobby_Text_27821C, 4
releaseall
end
LilycoveCity_ContestLobby_EventScript_2941AA:: @ 82941AA
EventScript_PblocLink_SpawnPartners: @ 82941AA
fadescreen 1
specialvar VAR_RESULT, GetLinkPartnerNames
copyvar VAR_0x8008, VAR_RESULT
copyvar VAR_0x8004, VAR_0x8008
special SpawnLinkPartnerEventObject
goto LilycoveCity_ContestLobby_EventScript_2941C4
goto EventScript_PblocLink_Arrived
end
LilycoveCity_ContestLobby_EventScript_2941C4:: @ 82941C4
EventScript_PblocLink_Arrived: @ 82941C4
fadescreen 0
switch VAR_0x8008
case 2, LilycoveCity_ContestLobby_EventScript_29411D
case 3, LilycoveCity_ContestLobby_EventScript_29412B
case 4, LilycoveCity_ContestLobby_EventScript_294139
case 2, EventScript_PblocLink_1Arrived
case 3, EventScript_PblocLink_2Arrived
case 4, EventScript_PblocLink_3Arrived
end
LilycoveCity_ContestLobby_EventScript_2941ED:: @ 82941ED
LilycoveCity_ContestLobby_EventScript_2941ED: @ 82941ED
setvar VAR_0x8004, 13
goto LilycoveCity_ContestLobby_EventScript_2941F8
goto EventScript_PblocLink_DecideLeader
end
LilycoveCity_ContestLobby_EventScript_2941F8:: @ 82941F8
message LilycoveCity_ContestLobby_Text_27C1EA
EventScript_PblocLink_DecideLeader: @ 82941F8
message Text_DecideLinkLeader
waitmessage
multichoice 16, 6, 81, 0
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_29425D
case 1, LilycoveCity_ContestLobby_EventScript_294235
case 2, LilycoveCity_ContestLobby_EventScript_294190
case 127, LilycoveCity_ContestLobby_EventScript_294190
case 0, EventScript_PblocLink_TryJoinGroup
case 1, EventScript_PblocLink_TryBecomeLeader
case 2, EventScript_PblocLink_CloseLink
case 127, EventScript_PblocLink_CloseLink
end
LilycoveCity_ContestLobby_EventScript_294235:: @ 8294235
call LilycoveCity_ContestLobby_EventScript_294285
EventScript_PblocLink_TryBecomeLeader: @ 8294235
call EventScript_PblocLink_BecomeLeader
compare VAR_RESULT, 1
goto_eq LilycoveCity_ContestLobby_EventScript_29428F
goto_eq EventScript_PblocLink_SpawnPartners_
compare VAR_RESULT, 5
goto_eq LilycoveCity_ContestLobby_EventScript_2941F8
goto_eq EventScript_PblocLink_DecideLeader
compare VAR_RESULT, 8
goto_eq LilycoveCity_ContestLobby_EventScript_294235
goto_eq EventScript_PblocLink_TryBecomeLeader
release
end
LilycoveCity_ContestLobby_EventScript_29425D:: @ 829425D
call LilycoveCity_ContestLobby_EventScript_29428A
EventScript_PblocLink_TryJoinGroup: @ 829425D
call EventScript_PblocLink_JoinGroup
compare VAR_RESULT, 1
goto_eq LilycoveCity_ContestLobby_EventScript_29428F
goto_eq EventScript_PblocLink_SpawnPartners_
compare VAR_RESULT, 5
goto_eq LilycoveCity_ContestLobby_EventScript_2941F8
goto_eq EventScript_PblocLink_DecideLeader
compare VAR_RESULT, 8
goto_eq LilycoveCity_ContestLobby_EventScript_29425D
goto_eq EventScript_PblocLink_TryJoinGroup
release
end
LilycoveCity_ContestLobby_EventScript_294285:: @ 8294285
EventScript_PblocLink_BecomeLeader: @ 8294285
special BerryBlenderLinkBecomeLeader
waitstate
return
LilycoveCity_ContestLobby_EventScript_29428A:: @ 829428A
EventScript_PblocLink_JoinGroup: @ 829428A
special BerryBlenderLinkJoinGroup
waitstate
return
LilycoveCity_ContestLobby_EventScript_29428F:: @ 829428F
goto LilycoveCity_ContestLobby_EventScript_2941AA
EventScript_PblocLink_SpawnPartners_: @ 829428F
goto EventScript_PblocLink_SpawnPartners
end
data/strings.s
-5387
View File
File diff suppressed because it is too large. Load diff
data/text/berry_firmness_strings.inc
-14
View File
@@ -1,14 +0,0 @@
gBerryFirmnessString_VerySoft:: @ 85E923A
.string "Very soft$"
gBerryFirmnessString_Soft:: @ 85E9244
.string "Soft$"
gBerryFirmnessString_Hard:: @ 85E9249
.string "Hard$"
gBerryFirmnessString_VeryHard:: @ 85E924E
.string "Very hard$"
gBerryFirmnessString_SuperHard:: @ 85E9258
.string "Super hard$"
data/text/easy_chat/easy_chat_group_names.inc
-65
View File
@@ -1,65 +0,0 @@
gEasyChatGroupName_Pokemon:: @ 85EE98D
.string "POKéMON$"
gEasyChatGroupName_Trainer:: @ 85EE995
.string "TRAINER$"
gEasyChatGroupName_Status:: @ 85EE99D
.string "STATUS$"
gEasyChatGroupName_Battle:: @ 85EE9A4
.string "BATTLE$"
gEasyChatGroupName_Greetings:: @ 85EE9AB
.string "GREETINGS$"
gEasyChatGroupName_People:: @ 85EE9B5
.string "PEOPLE$"
gEasyChatGroupName_Voices:: @ 85EE9BC
.string "VOICES$"
gEasyChatGroupName_Speech:: @ 85EE9C3
.string "SPEECH$"
gEasyChatGroupName_Endings:: @ 85EE9CA
.string "ENDINGS$"
gEasyChatGroupName_Feelings:: @ 85EE9D2
.string "FEELINGS$"
gEasyChatGroupName_Conditions:: @ 85EE9DB
.string "CONDITIONS$"
gEasyChatGroupName_Actions:: @ 85EE9E6
.string "ACTIONS$"
gEasyChatGroupName_Lifestyle:: @ 85EE9EE
.string "LIFESTYLE$"
gEasyChatGroupName_Hobbies:: @ 85EE9F8
.string "HOBBIES$"
gEasyChatGroupName_Time:: @ 85EEA00
.string "TIME$"
gEasyChatGroupName_Misc:: @ 85EEA05
.string "MISC.$"
gEasyChatGroupName_Adjectives:: @ 85EEA0B
.string "ADJECTIVES$"
gEasyChatGroupName_Events:: @ 85EEA16
.string "EVENTS$"
gEasyChatGroupName_Move1:: @ 85EEA1D
.string "MOVE 1$"
gEasyChatGroupName_Move2:: @ 85EEA24
.string "MOVE 2$"
gEasyChatGroupName_TrendySaying:: @ 85EEA2B
.string "TRENDY SAYING$"
gEasyChatGroupName_Pokemon2:: @ 85EEA39
.string "POKéMON2$"
data/text/move_names.inc
-562
View File
@@ -1,562 +0,0 @@
gMoveNames:: @ 831977C
.string "-$", 13
.string "POUND$", 13
.string "KARATE CHOP$", 13
.string "DOUBLESLAP$", 13
.string "COMET PUNCH$", 13
.string "MEGA PUNCH$", 13
.string "PAY DAY$", 13
.string "FIRE PUNCH$", 13
.string "ICE PUNCH$", 13
.string "THUNDERPUNCH$", 13
.string "SCRATCH$", 13
.string "VICEGRIP$", 13
.string "GUILLOTINE$", 13
.string "RAZOR WIND$", 13
.string "SWORDS DANCE$", 13
.string "CUT$", 13
.string "GUST$", 13
.string "WING ATTACK$", 13
.string "WHIRLWIND$", 13
.string "FLY$", 13
.string "BIND$", 13
.string "SLAM$", 13
.string "VINE WHIP$", 13
.string "STOMP$", 13
.string "DOUBLE KICK$", 13
.string "MEGA KICK$", 13
.string "JUMP KICK$", 13
.string "ROLLING KICK$", 13
.string "SAND-ATTACK$", 13
.string "HEADBUTT$", 13
.string "HORN ATTACK$", 13
.string "FURY ATTACK$", 13
.string "HORN DRILL$", 13
.string "TACKLE$", 13
.string "BODY SLAM$", 13
.string "WRAP$", 13
.string "TAKE DOWN$", 13
.string "THRASH$", 13
.string "DOUBLE-EDGE$", 13
.string "TAIL WHIP$", 13
.string "POISON STING$", 13
.string "TWINEEDLE$", 13
.string "PIN MISSILE$", 13
.string "LEER$", 13
.string "BITE$", 13
.string "GROWL$", 13
.string "ROAR$", 13
.string "SING$", 13
.string "SUPERSONIC$", 13
.string "SONICBOOM$", 13
.string "DISABLE$", 13
.string "ACID$", 13
.string "EMBER$", 13
.string "FLAMETHROWER$", 13
.string "MIST$", 13
.string "WATER GUN$", 13
.string "HYDRO PUMP$", 13
.string "SURF$", 13
.string "ICE BEAM$", 13
.string "BLIZZARD$", 13
.string "PSYBEAM$", 13
.string "BUBBLEBEAM$", 13
.string "AURORA BEAM$", 13
.string "HYPER BEAM$", 13
.string "PECK$", 13
.string "DRILL PECK$", 13
.string "SUBMISSION$", 13
.string "LOW KICK$", 13
.string "COUNTER$", 13
.string "SEISMIC TOSS$", 13
.string "STRENGTH$", 13
.string "ABSORB$", 13
.string "MEGA DRAIN$", 13
.string "LEECH SEED$", 13
.string "GROWTH$", 13
.string "RAZOR LEAF$", 13
.string "SOLARBEAM$", 13
.string "POISONPOWDER$", 13
.string "STUN SPORE$", 13
.string "SLEEP POWDER$", 13
.string "PETAL DANCE$", 13
.string "STRING SHOT$", 13
.string "DRAGON RAGE$", 13
.string "FIRE SPIN$", 13
.string "THUNDERSHOCK$", 13
.string "THUNDERBOLT$", 13
.string "THUNDER WAVE$", 13
.string "THUNDER$", 13
.string "ROCK THROW$", 13
.string "EARTHQUAKE$", 13
.string "FISSURE$", 13
.string "DIG$", 13
.string "TOXIC$", 13
.string "CONFUSION$", 13
.string "PSYCHIC$", 13
.string "HYPNOSIS$", 13
.string "MEDITATE$", 13
.string "AGILITY$", 13
.string "QUICK ATTACK$", 13
.string "RAGE$", 13
.string "TELEPORT$", 13
.string "NIGHT SHADE$", 13
.string "MIMIC$", 13
.string "SCREECH$", 13
.string "DOUBLE TEAM$", 13
.string "RECOVER$", 13
.string "HARDEN$", 13
.string "MINIMIZE$", 13
.string "SMOKESCREEN$", 13
.string "CONFUSE RAY$", 13
.string "WITHDRAW$", 13
.string "DEFENSE CURL$", 13
.string "BARRIER$", 13
.string "LIGHT SCREEN$", 13
.string "HAZE$", 13
.string "REFLECT$", 13
.string "FOCUS ENERGY$", 13
.string "BIDE$", 13
.string "METRONOME$", 13
.string "MIRROR MOVE$", 13
.string "SELFDESTRUCT$", 13
.string "EGG BOMB$", 13
.string "LICK$", 13
.string "SMOG$", 13
.string "SLUDGE$", 13
.string "BONE CLUB$", 13
.string "FIRE BLAST$", 13
.string "WATERFALL$", 13
.string "CLAMP$", 13
.string "SWIFT$", 13
.string "SKULL BASH$", 13
.string "SPIKE CANNON$", 13
.string "CONSTRICT$", 13
.string "AMNESIA$", 13
.string "KINESIS$", 13
.string "SOFTBOILED$", 13
.string "HI JUMP KICK$", 13
.string "GLARE$", 13
.string "DREAM EATER$", 13
.string "POISON GAS$", 13
.string "BARRAGE$", 13
.string "LEECH LIFE$", 13
.string "LOVELY KISS$", 13
.string "SKY ATTACK$", 13
.string "TRANSFORM$", 13
.string "BUBBLE$", 13
.string "DIZZY PUNCH$", 13
.string "SPORE$", 13
.string "FLASH$", 13
.string "PSYWAVE$", 13
.string "SPLASH$", 13
.string "ACID ARMOR$", 13
.string "CRABHAMMER$", 13
.string "EXPLOSION$", 13
.string "FURY SWIPES$", 13
.string "BONEMERANG$", 13
.string "REST$", 13
.string "ROCK SLIDE$", 13
.string "HYPER FANG$", 13
.string "SHARPEN$", 13
.string "CONVERSION$", 13
.string "TRI ATTACK$", 13
.string "SUPER FANG$", 13
.string "SLASH$", 13
.string "SUBSTITUTE$", 13
.string "STRUGGLE$", 13
.string "SKETCH$", 13
.string "TRIPLE KICK$", 13
.string "THIEF$", 13
.string "SPIDER WEB$", 13
.string "MIND READER$", 13
.string "NIGHTMARE$", 13
.string "FLAME WHEEL$", 13
.string "SNORE$", 13
.string "CURSE$", 13
.string "FLAIL$", 13
.string "CONVERSION 2$", 13
.string "AEROBLAST$", 13
.string "COTTON SPORE$", 13
.string "REVERSAL$", 13
.string "SPITE$", 13
.string "POWDER SNOW$", 13
.string "PROTECT$", 13
.string "MACH PUNCH$", 13
.string "SCARY FACE$", 13
.string "FAINT ATTACK$", 13
.string "SWEET KISS$", 13
.string "BELLY DRUM$", 13
.string "SLUDGE BOMB$", 13
.string "MUD-SLAP$", 13
.string "OCTAZOOKA$", 13
.string "SPIKES$", 13
.string "ZAP CANNON$", 13
.string "FORESIGHT$", 13
.string "DESTINY BOND$", 13
.string "PERISH SONG$", 13
.string "ICY WIND$", 13
.string "DETECT$", 13
.string "BONE RUSH$", 13
.string "LOCK-ON$", 13
.string "OUTRAGE$", 13
.string "SANDSTORM$", 13
.string "GIGA DRAIN$", 13
.string "ENDURE$", 13
.string "CHARM$", 13
.string "ROLLOUT$", 13
.string "FALSE SWIPE$", 13
.string "SWAGGER$", 13
.string "MILK DRINK$", 13
.string "SPARK$", 13
.string "FURY CUTTER$", 13
.string "STEEL WING$", 13
.string "MEAN LOOK$", 13
.string "ATTRACT$", 13
.string "SLEEP TALK$", 13
.string "HEAL BELL$", 13
.string "RETURN$", 13
.string "PRESENT$", 13
.string "FRUSTRATION$", 13
.string "SAFEGUARD$", 13
.string "PAIN SPLIT$", 13
.string "SACRED FIRE$", 13
.string "MAGNITUDE$", 13
.string "DYNAMICPUNCH$", 13
.string "MEGAHORN$", 13
.string "DRAGONBREATH$", 13
.string "BATON PASS$", 13
.string "ENCORE$", 13
.string "PURSUIT$", 13
.string "RAPID SPIN$", 13
.string "SWEET SCENT$", 13
.string "IRON TAIL$", 13
.string "METAL CLAW$", 13
.string "VITAL THROW$", 13
.string "MORNING SUN$", 13
.string "SYNTHESIS$", 13
.string "MOONLIGHT$", 13
.string "HIDDEN POWER$", 13
.string "CROSS CHOP$", 13
.string "TWISTER$", 13
.string "RAIN DANCE$", 13
.string "SUNNY DAY$", 13
.string "CRUNCH$", 13
.string "MIRROR COAT$", 13
.string "PSYCH UP$", 13
.string "EXTREMESPEED$", 13
.string "ANCIENTPOWER$", 13
.string "SHADOW BALL$", 13
.string "FUTURE SIGHT$", 13
.string "ROCK SMASH$", 13
.string "WHIRLPOOL$", 13
.string "BEAT UP$", 13
.string "FAKE OUT$", 13
.string "UPROAR$", 13
.string "STOCKPILE$", 13
.string "SPIT UP$", 13
.string "SWALLOW$", 13
.string "HEAT WAVE$", 13
.string "HAIL$", 13
.string "TORMENT$", 13
.string "FLATTER$", 13
.string "WILL-O-WISP$", 13
.string "MEMENTO$", 13
.string "FACADE$", 13
.string "FOCUS PUNCH$", 13
.string "SMELLINGSALT$", 13
.string "FOLLOW ME$", 13
.string "NATURE POWER$", 13
.string "CHARGE$", 13
.string "TAUNT$", 13
.string "HELPING HAND$", 13
.string "TRICK$", 13
.string "ROLE PLAY$", 13
.string "WISH$", 13
.string "ASSIST$", 13
.string "INGRAIN$", 13
.string "SUPERPOWER$", 13
.string "MAGIC COAT$", 13
.string "RECYCLE$", 13
.string "REVENGE$", 13
.string "BRICK BREAK$", 13
.string "YAWN$", 13
.string "KNOCK OFF$", 13
.string "ENDEAVOR$", 13
.string "ERUPTION$", 13
.string "SKILL SWAP$", 13
.string "IMPRISON$", 13
.string "REFRESH$", 13
.string "GRUDGE$", 13
.string "SNATCH$", 13
.string "SECRET POWER$", 13
.string "DIVE$", 13
.string "ARM THRUST$", 13
.string "CAMOUFLAGE$", 13
.string "TAIL GLOW$", 13
.string "LUSTER PURGE$", 13
.string "MIST BALL$", 13
.string "FEATHERDANCE$", 13
.string "TEETER DANCE$", 13
.string "BLAZE KICK$", 13
.string "MUD SPORT$", 13
.string "ICE BALL$", 13
.string "NEEDLE ARM$", 13
.string "SLACK OFF$", 13
.string "HYPER VOICE$", 13
.string "POISON FANG$", 13
.string "CRUSH CLAW$", 13
.string "BLAST BURN$", 13
.string "HYDRO CANNON$", 13
.string "METEOR MASH$", 13
.string "ASTONISH$", 13
.string "WEATHER BALL$", 13
.string "AROMATHERAPY$", 13
.string "FAKE TEARS$", 13
.string "AIR CUTTER$", 13
.string "OVERHEAT$", 13
.string "ODOR SLEUTH$", 13
.string "ROCK TOMB$", 13
.string "SILVER WIND$", 13
.string "METAL SOUND$", 13
.string "GRASSWHISTLE$", 13
.string "TICKLE$", 13
.string "COSMIC POWER$", 13
.string "WATER SPOUT$", 13
.string "SIGNAL BEAM$", 13
.string "SHADOW PUNCH$", 13
.string "EXTRASENSORY$", 13
.string "SKY UPPERCUT$", 13
.string "SAND TOMB$", 13
.string "SHEER COLD$", 13
.string "MUDDY WATER$", 13
.string "BULLET SEED$", 13
.string "AERIAL ACE$", 13
.string "ICICLE SPEAR$", 13
.string "IRON DEFENSE$", 13
.string "BLOCK$", 13
.string "HOWL$", 13
.string "DRAGON CLAW$", 13
.string "FRENZY PLANT$", 13
.string "BULK UP$", 13
.string "BOUNCE$", 13
.string "MUD SHOT$", 13
.string "POISON TAIL$", 13
.string "COVET$", 13
.string "VOLT TACKLE$", 13
.string "MAGICAL LEAF$", 13
.string "WATER SPORT$", 13
.string "CALM MIND$", 13
.string "LEAF BLADE$", 13
.string "DRAGON DANCE$", 13
.string "ROCK BLAST$", 13
.string "SHOCK WAVE$", 13
.string "WATER PULSE$", 13
.string "DOOM DESIRE$", 13
.string "PSYCHO BOOST$", 13
.string "Roost$", 13
.string "Gravity$", 13
.string "Miracle Eye$", 13
.string "Wake Up Slap$", 13
.string "Hammer Arm$", 13
.string "Gyro Ball$", 13
.string "Healing Wish$", 13
.string "Brine$", 13
.string "Natural Gift$", 13
.string "Feint$", 13
.string "Pluck$", 13
.string "Tailwind$", 13
.string "Acupressure$", 13
.string "Metal Burst$", 13
.string "U Turn$", 13
.string "Close Combat$", 13
.string "Payback$", 13
.string "Assurance$", 13
.string "Embargo$", 13
.string "Fling$", 13
.string "Psycho Shift$", 13
.string "Trump Card$", 13
.string "Heal Block$", 13
.string "Wring Out$", 13
.string "Power Trick$", 13
.string "Gastro Acid$", 13
.string "Lucky Chant$", 13
.string "Me First$", 13
.string "Copycat$", 13
.string "Power Swap$", 13
.string "Guard Swap$", 13
.string "Punishment$", 13
.string "Last Resort$", 13
.string "Worry Seed$", 13
.string "Sucker Punch$", 13
.string "Toxic Spikes$", 13
.string "Heart Swap$", 13
.string "Aqua Ring$", 13
.string "Magnet Rise$", 13
.string "Flare Blitz$", 13
.string "Force Palm$", 13
.string "Aura Sphere$", 13
.string "Rock Polish$", 13
.string "Poison Jab$", 13
.string "Dark Pulse$", 13
.string "Night Slash$", 13
.string "Aqua Tail$", 13
.string "Seed Bomb$", 13
.string "Air Slash$", 13
.string "X Scissor$", 13
.string "Bug Buzz$", 13
.string "Dragon Pulse$", 13
.string "Dragon Rush$", 13
.string "Power Gem$", 13
.string "Drain Punch$", 13
.string "Vacuum Wave$", 13
.string "Focus Blast$", 13
.string "Energy Ball$", 13
.string "Brave Bird$", 13
.string "Earth Power$", 13
.string "Switcheroo$", 13
.string "Giga Impact$", 13
.string "Nasty Plot$", 13
.string "Bullet Punch$", 13
.string "Avalanche$", 13
.string "Ice Shard$", 13
.string "Shadow Claw$", 13
.string "Thunder Fang$", 13
.string "Ice Fang$", 13
.string "Fire Fang$", 13
.string "Shadow Sneak$", 13
.string "Mud Bomb$", 13
.string "Psycho Cut$", 13
.string "Zen Headbutt$", 13
.string "Mirror Shot$", 13
.string "Flash Cannon$", 13
.string "Rock Climb$", 13
.string "Defog$", 13
.string "Trick Room$", 13
.string "Draco Meteor$", 13
.string "Discharge$", 13
.string "Lava Plume$", 13
.string "Leaf Storm$", 13
.string "Power Whip$", 13
.string "Rock Wrecker$", 13
.string "Cross Poison$", 13
.string "Gunk Shot$", 13
.string "Iron Head$", 13
.string "Magnet Bomb$", 13
.string "Stone Edge$", 13
.string "Captivate$", 13
.string "Stealth Rock$", 13
.string "Grass Knot$", 13
.string "Chatter$", 13
.string "Judgment$", 13
.string "Bug Bite$", 13
.string "Charge Beam$", 13
.string "Wood Hammer$", 13
.string "Aqua Jet$", 13
.string "Attack Order$", 13
.string "Defend Order$", 13
.string "Heal Order$", 13
.string "Head Smash$", 13
.string "Double Hit$", 13
.string "Roar Of Time$", 13
.string "Spacial Rend$", 13
.string "Lunar Dance$", 13
.string "Crush Grip$", 13
.string "Magma Storm$", 13
.string "Dark Void$", 13
.string "Seed Flare$", 13
.string "Ominous Wind$", 13
.string "Shadow Force$", 13
.string "Hone Claws$", 13
.string "Wide Guard$", 13
.string "Guard Split$", 13
.string "Power Split$", 13
.string "Wonder Room$", 13
.string "Psyshock$", 13
.string "Venoshock$", 13
.string "Autotomize$", 13
.string "Rage Powder$", 13
.string "Telekinesis$", 13
.string "Magic Room$", 13
.string "Smack Down$", 13
.string "Storm Throw$", 13
.string "Flame Burst$", 13
.string "Sludge Wave$", 13
.string "Quiver Dance$", 13
.string "Heavy Slam$", 13
.string "Synchronoise$", 13
.string "Electro Ball$", 13
.string "Soak$", 13
.string "Flame Charge$", 13
.string "Coil$", 13
.string "Low Sweep$", 13
.string "Acid Spray$", 13
.string "Foul Play$", 13
.string "Simple Beam$", 13
.string "Entrainment$", 13
.string "After You$", 13
.string "Round$", 13
.string "Echoed Voice$", 13
.string "Chip Away$", 13
.string "Clear Smog$", 13
.string "Stored Power$", 13
.string "Quick Guard$", 13
.string "Ally Switch$", 13
.string "Scald$", 13
.string "Shell Smash$", 13
.string "Heal Pulse$", 13
.string "Hex$", 13
.string "Sky Drop$", 13
.string "Shift Gear$", 13
.string "Circle Throw$", 13
.string "Incinerate$", 13
.string "Quash$", 13
.string "Acrobatics$", 13
.string "Reflect Type$", 13
.string "Retaliate$", 13
.string "Final Gambit$", 13
.string "Bestow$", 13
.string "Inferno$", 13
.string "Water Pledge$", 13
.string "Fire Pledge$", 13
.string "Grass Pledge$", 13
.string "Volt Switch$", 13
.string "Struggle Bug$", 13
.string "Bulldoze$", 13
.string "Frost Breath$", 13
.string "Dragon Tail$", 13
.string "Work Up$", 13
.string "Electroweb$", 13
.string "Wild Charge$", 13
.string "Drill Run$", 13
.string "Dual Chop$", 13
.string "Heart Stamp$", 13
.string "Horn Leech$", 13
.string "Sacred Sword$", 13
.string "Razor Shell$", 13
.string "Heat Crash$", 13
.string "Leaf Tornado$", 13
.string "Steamroller$", 13
.string "Cotton Guard$", 13
.string "Night Daze$", 13
.string "Psystrike$", 13
.string "Tail Slap$", 13
.string "Hurricane$", 13
.string "Head Charge$", 13
.string "Gear Grind$", 13
.string "Searing Shot$", 13
.string "Techno Blast$", 13
.string "Relic Song$", 13
.string "Secret Sword$", 13
.string "Glaciate$", 13
.string "Bolt Strike$", 13
.string "Blue Flare$", 13
.string "Fiery Dance$", 13
.string "Freeze Shock$", 13
.string "Ice Burn$", 13
.string "Snarl$", 13
.string "Icicle Crash$", 13
.string "V Create$", 13
.string "Fusion Flare$", 13
.string "Fusion Bolt$", 13
.string "Flying Press$", 13
data/text/species_names.inc
-413
View File
@@ -1,413 +0,0 @@
gSpeciesNames:: @ 83185C8
.string "??????????$", 11
.string "BULBASAUR$", 11
.string "IVYSAUR$", 11
.string "VENUSAUR$", 11
.string "CHARMANDER$", 11
.string "CHARMELEON$", 11
.string "CHARIZARD$", 11
.string "SQUIRTLE$", 11
.string "WARTORTLE$", 11
.string "BLASTOISE$", 11
.string "CATERPIE$", 11
.string "METAPOD$", 11
.string "BUTTERFREE$", 11
.string "WEEDLE$", 11
.string "KAKUNA$", 11
.string "BEEDRILL$", 11
.string "PIDGEY$", 11
.string "PIDGEOTTO$", 11
.string "PIDGEOT$", 11
.string "RATTATA$", 11
.string "RATICATE$", 11
.string "SPEAROW$", 11
.string "FEAROW$", 11
.string "EKANS$", 11
.string "ARBOK$", 11
.string "PIKACHU$", 11
.string "RAICHU$", 11
.string "SANDSHREW$", 11
.string "SANDSLASH$", 11
.string "NIDORAN♀$", 11
.string "NIDORINA$", 11
.string "NIDOQUEEN$", 11
.string "NIDORAN♂$", 11
.string "NIDORINO$", 11
.string "NIDOKING$", 11
.string "CLEFAIRY$", 11
.string "CLEFABLE$", 11
.string "VULPIX$", 11
.string "NINETALES$", 11
.string "JIGGLYPUFF$", 11
.string "WIGGLYTUFF$", 11
.string "ZUBAT$", 11
.string "GOLBAT$", 11
.string "ODDISH$", 11
.string "GLOOM$", 11
.string "VILEPLUME$", 11
.string "PARAS$", 11
.string "PARASECT$", 11
.string "VENONAT$", 11
.string "VENOMOTH$", 11
.string "DIGLETT$", 11
.string "DUGTRIO$", 11
.string "MEOWTH$", 11
.string "PERSIAN$", 11
.string "PSYDUCK$", 11
.string "GOLDUCK$", 11
.string "MANKEY$", 11
.string "PRIMEAPE$", 11
.string "GROWLITHE$", 11
.string "ARCANINE$", 11
.string "POLIWAG$", 11
.string "POLIWHIRL$", 11
.string "POLIWRATH$", 11
.string "ABRA$", 11
.string "KADABRA$", 11
.string "ALAKAZAM$", 11
.string "MACHOP$", 11
.string "MACHOKE$", 11
.string "MACHAMP$", 11
.string "BELLSPROUT$", 11
.string "WEEPINBELL$", 11
.string "VICTREEBEL$", 11
.string "TENTACOOL$", 11
.string "TENTACRUEL$", 11
.string "GEODUDE$", 11
.string "GRAVELER$", 11
.string "GOLEM$", 11
.string "PONYTA$", 11
.string "RAPIDASH$", 11
.string "SLOWPOKE$", 11
.string "SLOWBRO$", 11
.string "MAGNEMITE$", 11
.string "MAGNETON$", 11
.string "FARFETCH’D$", 11
.string "DODUO$", 11
.string "DODRIO$", 11
.string "SEEL$", 11
.string "DEWGONG$", 11
.string "GRIMER$", 11
.string "MUK$", 11
.string "SHELLDER$", 11
.string "CLOYSTER$", 11
.string "GASTLY$", 11
.string "HAUNTER$", 11
.string "GENGAR$", 11
.string "ONIX$", 11
.string "DROWZEE$", 11
.string "HYPNO$", 11
.string "KRABBY$", 11
.string "KINGLER$", 11
.string "VOLTORB$", 11
.string "ELECTRODE$", 11
.string "EXEGGCUTE$", 11
.string "EXEGGUTOR$", 11
.string "CUBONE$", 11
.string "MAROWAK$", 11
.string "HITMONLEE$", 11
.string "HITMONCHAN$", 11
.string "LICKITUNG$", 11
.string "KOFFING$", 11
.string "WEEZING$", 11
.string "RHYHORN$", 11
.string "RHYDON$", 11
.string "CHANSEY$", 11
.string "TANGELA$", 11
.string "KANGASKHAN$", 11
.string "HORSEA$", 11
.string "SEADRA$", 11
.string "GOLDEEN$", 11
.string "SEAKING$", 11
.string "STARYU$", 11
.string "STARMIE$", 11
.string "MR. MIME$", 11
.string "SCYTHER$", 11
.string "JYNX$", 11
.string "ELECTABUZZ$", 11
.string "MAGMAR$", 11
.string "PINSIR$", 11
.string "TAUROS$", 11
.string "MAGIKARP$", 11
.string "GYARADOS$", 11
.string "LAPRAS$", 11
.string "DITTO$", 11
.string "EEVEE$", 11
.string "VAPOREON$", 11
.string "JOLTEON$", 11
.string "FLAREON$", 11
.string "PORYGON$", 11
.string "OMANYTE$", 11
.string "OMASTAR$", 11
.string "KABUTO$", 11
.string "KABUTOPS$", 11
.string "AERODACTYL$", 11
.string "SNORLAX$", 11
.string "ARTICUNO$", 11
.string "ZAPDOS$", 11
.string "MOLTRES$", 11
.string "DRATINI$", 11
.string "DRAGONAIR$", 11
.string "DRAGONITE$", 11
.string "MEWTWO$", 11
.string "MEW$", 11
.string "CHIKORITA$", 11
.string "BAYLEEF$", 11
.string "MEGANIUM$", 11
.string "CYNDAQUIL$", 11
.string "QUILAVA$", 11
.string "TYPHLOSION$", 11
.string "TOTODILE$", 11
.string "CROCONAW$", 11
.string "FERALIGATR$", 11
.string "SENTRET$", 11
.string "FURRET$", 11
.string "HOOTHOOT$", 11
.string "NOCTOWL$", 11
.string "LEDYBA$", 11
.string "LEDIAN$", 11
.string "SPINARAK$", 11
.string "ARIADOS$", 11
.string "CROBAT$", 11
.string "CHINCHOU$", 11
.string "LANTURN$", 11
.string "PICHU$", 11
.string "CLEFFA$", 11
.string "IGGLYBUFF$", 11
.string "TOGEPI$", 11
.string "TOGETIC$", 11
.string "NATU$", 11
.string "XATU$", 11
.string "MAREEP$", 11
.string "FLAAFFY$", 11
.string "AMPHAROS$", 11
.string "BELLOSSOM$", 11
.string "MARILL$", 11
.string "AZUMARILL$", 11
.string "SUDOWOODO$", 11
.string "POLITOED$", 11
.string "HOPPIP$", 11
.string "SKIPLOOM$", 11
.string "JUMPLUFF$", 11
.string "AIPOM$", 11
.string "SUNKERN$", 11
.string "SUNFLORA$", 11
.string "YANMA$", 11
.string "WOOPER$", 11
.string "QUAGSIRE$", 11
.string "ESPEON$", 11
.string "UMBREON$", 11
.string "MURKROW$", 11
.string "SLOWKING$", 11
.string "MISDREAVUS$", 11
.string "UNOWN$", 11
.string "WOBBUFFET$", 11
.string "GIRAFARIG$", 11
.string "PINECO$", 11
.string "FORRETRESS$", 11
.string "DUNSPARCE$", 11
.string "GLIGAR$", 11
.string "STEELIX$", 11
.string "SNUBBULL$", 11
.string "GRANBULL$", 11
.string "QWILFISH$", 11
.string "SCIZOR$", 11
.string "SHUCKLE$", 11
.string "HERACROSS$", 11
.string "SNEASEL$", 11
.string "TEDDIURSA$", 11
.string "URSARING$", 11
.string "SLUGMA$", 11
.string "MAGCARGO$", 11
.string "SWINUB$", 11
.string "PILOSWINE$", 11
.string "CORSOLA$", 11
.string "REMORAID$", 11
.string "OCTILLERY$", 11
.string "DELIBIRD$", 11
.string "MANTINE$", 11
.string "SKARMORY$", 11
.string "HOUNDOUR$", 11
.string "HOUNDOOM$", 11
.string "KINGDRA$", 11
.string "PHANPY$", 11
.string "DONPHAN$", 11
.string "PORYGON2$", 11
.string "STANTLER$", 11
.string "SMEARGLE$", 11
.string "TYROGUE$", 11
.string "HITMONTOP$", 11
.string "SMOOCHUM$", 11
.string "ELEKID$", 11
.string "MAGBY$", 11
.string "MILTANK$", 11
.string "BLISSEY$", 11
.string "RAIKOU$", 11
.string "ENTEI$", 11
.string "SUICUNE$", 11
.string "LARVITAR$", 11
.string "PUPITAR$", 11
.string "TYRANITAR$", 11
.string "LUGIA$", 11
.string "HO-OH$", 11
.string "CELEBI$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "?$", 11
.string "TREECKO$", 11
.string "GROVYLE$", 11
.string "SCEPTILE$", 11
.string "TORCHIC$", 11
.string "COMBUSKEN$", 11
.string "BLAZIKEN$", 11
.string "MUDKIP$", 11
.string "MARSHTOMP$", 11
.string "SWAMPERT$", 11
.string "POOCHYENA$", 11
.string "MIGHTYENA$", 11
.string "ZIGZAGOON$", 11
.string "LINOONE$", 11
.string "WURMPLE$", 11
.string "SILCOON$", 11
.string "BEAUTIFLY$", 11
.string "CASCOON$", 11
.string "DUSTOX$", 11
.string "LOTAD$", 11
.string "LOMBRE$", 11
.string "LUDICOLO$", 11
.string "SEEDOT$", 11
.string "NUZLEAF$", 11
.string "SHIFTRY$", 11
.string "NINCADA$", 11
.string "NINJASK$", 11
.string "SHEDINJA$", 11
.string "TAILLOW$", 11
.string "SWELLOW$", 11
.string "SHROOMISH$", 11
.string "BRELOOM$", 11
.string "SPINDA$", 11
.string "WINGULL$", 11
.string "PELIPPER$", 11
.string "SURSKIT$", 11
.string "MASQUERAIN$", 11
.string "WAILMER$", 11
.string "WAILORD$", 11
.string "SKITTY$", 11
.string "DELCATTY$", 11
.string "KECLEON$", 11
.string "BALTOY$", 11
.string "CLAYDOL$", 11
.string "NOSEPASS$", 11
.string "TORKOAL$", 11
.string "SABLEYE$", 11
.string "BARBOACH$", 11
.string "WHISCASH$", 11
.string "LUVDISC$", 11
.string "CORPHISH$", 11
.string "CRAWDAUNT$", 11
.string "FEEBAS$", 11
.string "MILOTIC$", 11
.string "CARVANHA$", 11
.string "SHARPEDO$", 11
.string "TRAPINCH$", 11
.string "VIBRAVA$", 11
.string "FLYGON$", 11
.string "MAKUHITA$", 11
.string "HARIYAMA$", 11
.string "ELECTRIKE$", 11
.string "MANECTRIC$", 11
.string "NUMEL$", 11
.string "CAMERUPT$", 11
.string "SPHEAL$", 11
.string "SEALEO$", 11
.string "WALREIN$", 11
.string "CACNEA$", 11
.string "CACTURNE$", 11
.string "SNORUNT$", 11
.string "GLALIE$", 11
.string "LUNATONE$", 11
.string "SOLROCK$", 11
.string "AZURILL$", 11
.string "SPOINK$", 11
.string "GRUMPIG$", 11
.string "PLUSLE$", 11
.string "MINUN$", 11
.string "MAWILE$", 11
.string "MEDITITE$", 11
.string "MEDICHAM$", 11
.string "SWABLU$", 11
.string "ALTARIA$", 11
.string "WYNAUT$", 11
.string "DUSKULL$", 11
.string "DUSCLOPS$", 11
.string "ROSELIA$", 11
.string "SLAKOTH$", 11
.string "VIGOROTH$", 11
.string "SLAKING$", 11
.string "GULPIN$", 11
.string "SWALOT$", 11
.string "TROPIUS$", 11
.string "WHISMUR$", 11
.string "LOUDRED$", 11
.string "EXPLOUD$", 11
.string "CLAMPERL$", 11
.string "HUNTAIL$", 11
.string "GOREBYSS$", 11
.string "ABSOL$", 11
.string "SHUPPET$", 11
.string "BANETTE$", 11
.string "SEVIPER$", 11
.string "ZANGOOSE$", 11
.string "RELICANTH$", 11
.string "ARON$", 11
.string "LAIRON$", 11
.string "AGGRON$", 11
.string "CASTFORM$", 11
.string "VOLBEAT$", 11
.string "ILLUMISE$", 11
.string "LILEEP$", 11
.string "CRADILY$", 11
.string "ANORITH$", 11
.string "ARMALDO$", 11
.string "RALTS$", 11
.string "KIRLIA$", 11
.string "GARDEVOIR$", 11
.string "BAGON$", 11
.string "SHELGON$", 11
.string "SALAMENCE$", 11
.string "BELDUM$", 11
.string "METANG$", 11
.string "METAGROSS$", 11
.string "REGIROCK$", 11
.string "REGICE$", 11
.string "REGISTEEL$", 11
.string "KYOGRE$", 11
.string "GROUDON$", 11
.string "RAYQUAZA$", 11
.string "LATIAS$", 11
.string "LATIOS$", 11
.string "JIRACHI$", 11
.string "DEOXYS$", 11
.string "CHIMECHO$", 11
data/text/trainer_class_names.inc
-67
View File
@@ -1,67 +0,0 @@
gTrainerClassNames:: @ 830FCD4
.string "{PKMN} TRAINER$", 13
.string "{PKMN} TRAINER$", 13
.string "HIKER$", 13
.string "TEAM AQUA$", 13
.string "{PKMN} BREEDER$", 13
.string "COOLTRAINER$", 13
.string "BIRD KEEPER$", 13
.string "COLLECTOR$", 13
.string "SWIMMER♂$", 13
.string "TEAM MAGMA$", 13
.string "EXPERT$", 13
.string "AQUA ADMIN$", 13
.string "BLACK BELT$", 13
.string "AQUA LEADER$", 13
.string "HEX MANIAC$", 13
.string "AROMA LADY$", 13
.string "RUIN MANIAC$", 13
.string "INTERVIEWER$", 13
.string "TUBER$", 13
.string "TUBER$", 13
.string "LADY$", 13
.string "BEAUTY$", 13
.string "RICH BOY$", 13
.string "POKéMANIAC$", 13
.string "GUITARIST$", 13
.string "KINDLER$", 13
.string "CAMPER$", 13
.string "PICNICKER$", 13
.string "BUG MANIAC$", 13
.string "PSYCHIC$", 13
.string "GENTLEMAN$", 13
.string "ELITE FOUR$", 13
.string "LEADER$", 13
.string "SCHOOL KID$", 13
.string "SR. AND JR.$", 13
.string "WINSTRATE$", 13
.string "POKéFAN$", 13
.string "YOUNGSTER$", 13
.string "CHAMPION$", 13
.string "FISHERMAN$", 13
.string "TRIATHLETE$", 13
.string "DRAGON TAMER$", 13
.string "NINJA BOY$", 13
.string "BATTLE GIRL$", 13
.string "PARASOL LADY$", 13
.string "SWIMMER♀$", 13
.string "TWINS$", 13
.string "SAILOR$", 13
.string "COOLTRAINER$", 13
.string "MAGMA ADMIN$", 13
.string "{PKMN} TRAINER$", 13
.string "BUG CATCHER$", 13
.string "{PKMN} RANGER$", 13
.string "MAGMA LEADER$", 13
.string "LASS$", 13
.string "YOUNG COUPLE$", 13
.string "OLD COUPLE$", 13
.string "SIS AND BRO$", 13
.string "SALON MAIDEN$", 13
.string "DOME ACE$", 13
.string "PALACE MAVEN$", 13
.string "ARENA TYCOON$", 13
.string "FACTORY HEAD$", 13
.string "PIKE QUEEN$", 13
.string "PYRAMID KING$", 13
.string "{PKMN} TRAINER$", 13
data/text_input_strings.s
+10 -10
View File
@@ -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};: $"
data/trainer_parties.inc
-11268
View File
File diff suppressed because it is too large. Load diff
data/trainers.inc
-10261
View File
File diff suppressed because it is too large. Load diff
include/battle.h
+4 -4
View File
@@ -108,10 +108,10 @@ struct TrainerMonItemCustomMoves
union TrainerMonPtr
{
struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves;
struct TrainerMonNoItemCustomMoves *NoItemCustomMoves;
struct TrainerMonItemDefaultMoves *ItemDefaultMoves;
struct TrainerMonItemCustomMoves *ItemCustomMoves;
const struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves;
const struct TrainerMonNoItemCustomMoves *NoItemCustomMoves;
const struct TrainerMonItemDefaultMoves *ItemDefaultMoves;
const struct TrainerMonItemCustomMoves *ItemCustomMoves;
};
struct Trainer
include/cable_club.h
+2
View File
@@ -9,5 +9,7 @@
void sub_80B37D4(TaskFunc taskFunc);
u8 sub_80B3050(void);
void sub_80B360C(void);
bool32 sub_80B2AF4(u16 *arg0, u16 *arg1);
#endif //GUARD_CABLE_CLUB_H
include/constants/opponents.h
+857 -855
View File
File diff suppressed because it is too large. Load diff
include/constants/trainers.h
+1 -857
View File
@@ -1,863 +1,7 @@
#ifndef GUARD_TRAINERS_H
#define GUARD_TRAINERS_H
#define TRAINER_NONE 0
#define TRAINER_SAWYER_1 1
#define TRAINER_GRUNT_1 2
#define TRAINER_GRUNT_2 3
#define TRAINER_GRUNT_3 4
#define TRAINER_GRUNT_4 5
#define TRAINER_GRUNT_5 6
#define TRAINER_GRUNT_6 7
#define TRAINER_GRUNT_7 8
#define TRAINER_GABRIELLE_1 9
#define TRAINER_GRUNT_8 10
#define TRAINER_MARCEL 11
#define TRAINER_ALBERTO 12
#define TRAINER_ED 13
#define TRAINER_GRUNT_9 14
#define TRAINER_DECLAN 15
#define TRAINER_GRUNT_10 16
#define TRAINER_GRUNT_11 17
#define TRAINER_GRUNT_12 18
#define TRAINER_GRUNT_13 19
#define TRAINER_GRUNT_14 20
#define TRAINER_GRUNT_15 21
#define TRAINER_GRUNT_16 22
#define TRAINER_GRUNT_17 23
#define TRAINER_GRUNT_18 24
#define TRAINER_GRUNT_19 25
#define TRAINER_GRUNT_20 26
#define TRAINER_GRUNT_21 27
#define TRAINER_GRUNT_22 28
#define TRAINER_FREDRICK 29
#define TRAINER_MATT 30
#define TRAINER_ZANDER 31
#define TRAINER_SHELLY_1 32
#define TRAINER_SHELLY_2 33
#define TRAINER_ARCHIE 34
#define TRAINER_LEAH 35
#define TRAINER_DAISY 36
#define TRAINER_ROSE_1 37
#define TRAINER_FELIX 38
#define TRAINER_VIOLET 39
#define TRAINER_ROSE_2 40
#define TRAINER_ROSE_3 41
#define TRAINER_ROSE_4 42
#define TRAINER_ROSE_5 43
#define TRAINER_DUSTY_1 44
#define TRAINER_CHIP 45
#define TRAINER_FOSTER 46
#define TRAINER_DUSTY_2 47
#define TRAINER_DUSTY_3 48
#define TRAINER_DUSTY_4 49
#define TRAINER_DUSTY_5 50
#define TRAINER_GABBY_AND_TY_1 51
#define TRAINER_GABBY_AND_TY_2 52
#define TRAINER_GABBY_AND_TY_3 53
#define TRAINER_GABBY_AND_TY_4 54
#define TRAINER_GABBY_AND_TY_5 55
#define TRAINER_GABBY_AND_TY_6 56
#define TRAINER_LOLA_1 57
#define TRAINER_AUSTINA 58
#define TRAINER_GWEN 59
#define TRAINER_LOLA_2 60
#define TRAINER_LOLA_3 61
#define TRAINER_LOLA_4 62
#define TRAINER_LOLA_5 63
#define TRAINER_RICKY_1 64
#define TRAINER_SIMON 65
#define TRAINER_CHARLIE 66
#define TRAINER_RICKY_2 67
#define TRAINER_RICKY_3 68
#define TRAINER_RICKY_4 69
#define TRAINER_RICKY_5 70
#define TRAINER_RANDALL 71
#define TRAINER_PARKER 72
#define TRAINER_GEORGE 73
#define TRAINER_BERKE 74
#define TRAINER_BRAXTON 75
#define TRAINER_VINCENT 76
#define TRAINER_LEROY 77
#define TRAINER_WILTON_1 78
#define TRAINER_EDGAR 79
#define TRAINER_ALBERT 80
#define TRAINER_SAMUEL 81
#define TRAINER_VITO 82
#define TRAINER_OWEN 83
#define TRAINER_WILTON_2 84
#define TRAINER_WILTON_3 85
#define TRAINER_WILTON_4 86
#define TRAINER_WILTON_5 87
#define TRAINER_WARREN 88
#define TRAINER_MARY 89
#define TRAINER_ALEXIA 90
#define TRAINER_JODY 91
#define TRAINER_WENDY 92
#define TRAINER_KEIRA 93
#define TRAINER_BROOKE_1 94
#define TRAINER_JENNIFER 95
#define TRAINER_HOPE 96
#define TRAINER_SHANNON 97
#define TRAINER_MICHELLE 98
#define TRAINER_CAROLINE 99
#define TRAINER_JULIE 100
#define TRAINER_BROOKE_2 101
#define TRAINER_BROOKE_3 102
#define TRAINER_BROOKE_4 103
#define TRAINER_BROOKE_5 104
#define TRAINER_PATRICIA 105
#define TRAINER_KINDRA 106
#define TRAINER_TAMMY 107
#define TRAINER_VALERIE_1 108
#define TRAINER_TASHA 109
#define TRAINER_VALERIE_2 110
#define TRAINER_VALERIE_3 111
#define TRAINER_VALERIE_4 112
#define TRAINER_VALERIE_5 113
#define TRAINER_CINDY_1 114
#define TRAINER_DAPHNE 115
#define TRAINER_GRUNT_23 116
#define TRAINER_CINDY_2 117
#define TRAINER_BRIANNA 118
#define TRAINER_NAOMI 119
#define TRAINER_CINDY_3 120
#define TRAINER_CINDY_4 121
#define TRAINER_CINDY_5 122
#define TRAINER_CINDY_6 123
#define TRAINER_MELISSA 124
#define TRAINER_SHEILA 125
#define TRAINER_SHIRLEY 126
#define TRAINER_JESSICA_1 127
#define TRAINER_CONNIE 128
#define TRAINER_BRIDGET 129
#define TRAINER_OLIVIA 130
#define TRAINER_TIFFANY 131
#define TRAINER_JESSICA_2 132
#define TRAINER_JESSICA_3 133
#define TRAINER_JESSICA_4 134
#define TRAINER_JESSICA_5 135
#define TRAINER_WINSTON_1 136
#define TRAINER_MOLLIE 137
#define TRAINER_GARRET 138
#define TRAINER_WINSTON_2 139
#define TRAINER_WINSTON_3 140
#define TRAINER_WINSTON_4 141
#define TRAINER_WINSTON_5 142
#define TRAINER_STEVE_1 143
#define TRAINER_THALIA_1 144
#define TRAINER_MARK 145
#define TRAINER_GRUNT_24 146
#define TRAINER_STEVE_2 147
#define TRAINER_STEVE_3 148
#define TRAINER_STEVE_4 149
#define TRAINER_STEVE_5 150
#define TRAINER_LUIS 151
#define TRAINER_DOMINIK 152
#define TRAINER_DOUGLAS 153
#define TRAINER_DARRIN 154
#define TRAINER_TONY_1 155
#define TRAINER_JEROME 156
#define TRAINER_MATTHEW 157
#define TRAINER_DAVID 158
#define TRAINER_SPENCER 159
#define TRAINER_ROLAND 160
#define TRAINER_NOLEN 161
#define TRAINER_STAN 162
#define TRAINER_BARRY 163
#define TRAINER_DEAN 164
#define TRAINER_RODNEY 165
#define TRAINER_RICHARD 166
#define TRAINER_HERMAN 167
#define TRAINER_SANTIAGO 168
#define TRAINER_GILBERT 169
#define TRAINER_FRANKLIN 170
#define TRAINER_KEVIN 171
#define TRAINER_JACK 172
#define TRAINER_DUDLEY 173
#define TRAINER_CHAD 174
#define TRAINER_TONY_2 175
#define TRAINER_TONY_3 176
#define TRAINER_TONY_4 177
#define TRAINER_TONY_5 178
#define TRAINER_TAKAO 179
#define TRAINER_HITOSHI 180
#define TRAINER_KIYO 181
#define TRAINER_KOICHI 182
#define TRAINER_NOB_1 183
#define TRAINER_NOB_2 184
#define TRAINER_NOB_3 185
#define TRAINER_NOB_4 186
#define TRAINER_NOB_5 187
#define TRAINER_YUJI 188
#define TRAINER_DAISUKE 189
#define TRAINER_ATSUSHI 190
#define TRAINER_KIRK 191
#define TRAINER_GRUNT_25 192
#define TRAINER_GRUNT_26 193
#define TRAINER_SHAWN 194
#define TRAINER_FERNANDO_1 195
#define TRAINER_DALTON_1 196
#define TRAINER_DALTON_2 197
#define TRAINER_DALTON_3 198
#define TRAINER_DALTON_4 199
#define TRAINER_DALTON_5 200
#define TRAINER_COLE 201
#define TRAINER_JEFF 202
#define TRAINER_AXLE 203
#define TRAINER_JACE 204
#define TRAINER_KEEGAN 205
#define TRAINER_BERNIE_1 206
#define TRAINER_BERNIE_2 207
#define TRAINER_BERNIE_3 208
#define TRAINER_BERNIE_4 209
#define TRAINER_BERNIE_5 210
#define TRAINER_DREW 211
#define TRAINER_BEAU 212
#define TRAINER_LARRY 213
#define TRAINER_SHANE 214
#define TRAINER_JUSTIN 215
#define TRAINER_ETHAN_1 216
#define TRAINER_AUTUMN 217
#define TRAINER_TRAVIS 218
#define TRAINER_ETHAN_2 219
#define TRAINER_ETHAN_3 220
#define TRAINER_ETHAN_4 221
#define TRAINER_ETHAN_5 222
#define TRAINER_BRENT 223
#define TRAINER_DONALD 224
#define TRAINER_TAYLOR 225
#define TRAINER_JEFFREY_1 226
#define TRAINER_DEREK 227
#define TRAINER_JEFFREY_2 228
#define TRAINER_JEFFREY_3 229
#define TRAINER_JEFFREY_4 230
#define TRAINER_JEFFREY_5 231
#define TRAINER_EDWARD 232
#define TRAINER_PRESTON 233
#define TRAINER_VIRGIL 234
#define TRAINER_BLAKE 235
#define TRAINER_WILLIAM 236
#define TRAINER_JOSHUA 237
#define TRAINER_CAMERON_1 238
#define TRAINER_CAMERON_2 239
#define TRAINER_CAMERON_3 240
#define TRAINER_CAMERON_4 241
#define TRAINER_CAMERON_5 242
#define TRAINER_JACLYN 243
#define TRAINER_HANNAH 244
#define TRAINER_SAMANTHA 245
#define TRAINER_MAURA 246
#define TRAINER_KAYLA 247
#define TRAINER_ALEXIS 248
#define TRAINER_JACKI_1 249
#define TRAINER_JACKI_2 250
#define TRAINER_JACKI_3 251
#define TRAINER_JACKI_4 252
#define TRAINER_JACKI_5 253
#define TRAINER_WALTER_1 254
#define TRAINER_MICAH 255
#define TRAINER_THOMAS 256
#define TRAINER_WALTER_2 257
#define TRAINER_WALTER_3 258
#define TRAINER_WALTER_4 259
#define TRAINER_WALTER_5 260
#define TRAINER_SIDNEY 261
#define TRAINER_PHOEBE 262
#define TRAINER_GLACIA 263
#define TRAINER_DRAKE 264
#define TRAINER_ROXANNE_1 265
#define TRAINER_BRAWLY_1 266
#define TRAINER_WATTSON_1 267
#define TRAINER_FLANNERY_1 268
#define TRAINER_NORMAN_1 269
#define TRAINER_WINONA_1 270
#define TRAINER_TATE_AND_LIZA_1 271
#define TRAINER_JUAN_1 272
#define TRAINER_JERRY_1 273
#define TRAINER_TED 274
#define TRAINER_PAUL 275
#define TRAINER_JERRY_2 276
#define TRAINER_JERRY_3 277
#define TRAINER_JERRY_4 278
#define TRAINER_JERRY_5 279
#define TRAINER_KAREN_1 280
#define TRAINER_GEORGIA 281
#define TRAINER_KAREN_2 282
#define TRAINER_KAREN_3 283
#define TRAINER_KAREN_4 284
#define TRAINER_KAREN_5 285
#define TRAINER_KATE_AND_JOY 286
#define TRAINER_ANNA_AND_MEG_1 287
#define TRAINER_ANNA_AND_MEG_2 288
#define TRAINER_ANNA_AND_MEG_3 289
#define TRAINER_ANNA_AND_MEG_4 290
#define TRAINER_ANNA_AND_MEG_5 291
#define TRAINER_VICTOR 292
#define TRAINER_MIGUEL_1 293
#define TRAINER_COLTON 294
#define TRAINER_MIGUEL_2 295
#define TRAINER_MIGUEL_3 296
#define TRAINER_MIGUEL_4 297
#define TRAINER_MIGUEL_5 298
#define TRAINER_VICTORIA 299
#define TRAINER_VANESSA 300
#define TRAINER_BETHANY 301
#define TRAINER_ISABEL_1 302
#define TRAINER_ISABEL_2 303
#define TRAINER_ISABEL_3 304
#define TRAINER_ISABEL_4 305
#define TRAINER_ISABEL_5 306
#define TRAINER_TIMOTHY_1 307
#define TRAINER_TIMOTHY_2 308
#define TRAINER_TIMOTHY_3 309
#define TRAINER_TIMOTHY_4 310
#define TRAINER_TIMOTHY_5 311
#define TRAINER_VICKY 312
#define TRAINER_SHELBY_1 313
#define TRAINER_SHELBY_2 314
#define TRAINER_SHELBY_3 315
#define TRAINER_SHELBY_4 316
#define TRAINER_SHELBY_5 317
#define TRAINER_CALVIN_1 318
#define TRAINER_BILLY 319
#define TRAINER_JOSH 320
#define TRAINER_TOMMY 321
#define TRAINER_JOEY 322
#define TRAINER_BEN 323
#define TRAINER_QUINCY 324
#define TRAINER_KATELYNN 325
#define TRAINER_JAYLEN 326
#define TRAINER_DILLON 327
#define TRAINER_CALVIN_2 328
#define TRAINER_CALVIN_3 329
#define TRAINER_CALVIN_4 330
#define TRAINER_CALVIN_5 331
#define TRAINER_EDDIE 332
#define TRAINER_ALLEN 333
#define TRAINER_TIMMY 334
#define TRAINER_WALLACE 335
#define TRAINER_ANDREW 336
#define TRAINER_IVAN 337
#define TRAINER_CLAUDE 338
#define TRAINER_ELLIOT_1 339
#define TRAINER_NED 340
#define TRAINER_DALE 341
#define TRAINER_NOLAN 342
#define TRAINER_BARNY 343
#define TRAINER_WADE 344
#define TRAINER_CARTER 345
#define TRAINER_ELLIOT_2 346
#define TRAINER_ELLIOT_3 347
#define TRAINER_ELLIOT_4 348
#define TRAINER_ELLIOT_5 349
#define TRAINER_RONALD 350
#define TRAINER_JACOB 351
#define TRAINER_ANTHONY 352
#define TRAINER_BENJAMIN_1 353
#define TRAINER_BENJAMIN_2 354
#define TRAINER_BENJAMIN_3 355
#define TRAINER_BENJAMIN_4 356
#define TRAINER_BENJAMIN_5 357
#define TRAINER_ABIGAIL_1 358
#define TRAINER_JASMINE 359
#define TRAINER_ABIGAIL_2 360
#define TRAINER_ABIGAIL_3 361
#define TRAINER_ABIGAIL_4 362
#define TRAINER_ABIGAIL_5 363
#define TRAINER_DYLAN_1 364
#define TRAINER_DYLAN_2 365
#define TRAINER_DYLAN_3 366
#define TRAINER_DYLAN_4 367
#define TRAINER_DYLAN_5 368
#define TRAINER_MARIA_1 369
#define TRAINER_MARIA_2 370
#define TRAINER_MARIA_3 371
#define TRAINER_MARIA_4 372
#define TRAINER_MARIA_5 373
#define TRAINER_CAMDEN 374
#define TRAINER_DEMETRIUS 375
#define TRAINER_ISAIAH_1 376
#define TRAINER_PABLO_1 377
#define TRAINER_CHASE 378
#define TRAINER_ISAIAH_2 379
#define TRAINER_ISAIAH_3 380
#define TRAINER_ISAIAH_4 381
#define TRAINER_ISAIAH_5 382
#define TRAINER_ISOBEL 383
#define TRAINER_DONNY 384
#define TRAINER_TALIA 385
#define TRAINER_KATELYN_1 386
#define TRAINER_ALLISON 387
#define TRAINER_KATELYN_2 388
#define TRAINER_KATELYN_3 389
#define TRAINER_KATELYN_4 390
#define TRAINER_KATELYN_5 391
#define TRAINER_NICOLAS_1 392
#define TRAINER_NICOLAS_2 393
#define TRAINER_NICOLAS_3 394
#define TRAINER_NICOLAS_4 395
#define TRAINER_NICOLAS_5 396
#define TRAINER_AARON 397
#define TRAINER_PERRY 398
#define TRAINER_HUGH 399
#define TRAINER_PHIL 400
#define TRAINER_JARED 401
#define TRAINER_HUMBERTO 402
#define TRAINER_PRESLEY 403
#define TRAINER_EDWARDO 404
#define TRAINER_COLIN 405
#define TRAINER_ROBERT_1 406
#define TRAINER_BENNY 407
#define TRAINER_CHESTER 408
#define TRAINER_ROBERT_2 409
#define TRAINER_ROBERT_3 410
#define TRAINER_ROBERT_4 411
#define TRAINER_ROBERT_5 412
#define TRAINER_ALEX 413
#define TRAINER_BECK 414
#define TRAINER_YASU 415
#define TRAINER_TAKASHI 416
#define TRAINER_DIANNE 417
#define TRAINER_JANI 418
#define TRAINER_LAO_1 419
#define TRAINER_LUNG 420
#define TRAINER_LAO_2 421
#define TRAINER_LAO_3 422
#define TRAINER_LAO_4 423
#define TRAINER_LAO_5 424
#define TRAINER_JOCELYN 425
#define TRAINER_LAURA 426
#define TRAINER_CYNDY_1 427
#define TRAINER_CORA 428
#define TRAINER_PAULA 429
#define TRAINER_CYNDY_2 430
#define TRAINER_CYNDY_3 431
#define TRAINER_CYNDY_4 432
#define TRAINER_CYNDY_5 433
#define TRAINER_MADELINE_1 434
#define TRAINER_CLARISSA 435
#define TRAINER_ANGELICA 436
#define TRAINER_MADELINE_2 437
#define TRAINER_MADELINE_3 438
#define TRAINER_MADELINE_4 439
#define TRAINER_MADELINE_5 440
#define TRAINER_BEVERLY 441
#define TRAINER_IMANI 442
#define TRAINER_KYLA 443
#define TRAINER_DENISE 444
#define TRAINER_BETH 445
#define TRAINER_TARA 446
#define TRAINER_MISSY 447
#define TRAINER_ALICE 448
#define TRAINER_JENNY_1 449
#define TRAINER_GRACE 450
#define TRAINER_TANYA 451
#define TRAINER_SHARON 452
#define TRAINER_NIKKI 453
#define TRAINER_BRENDA 454
#define TRAINER_KATIE 455
#define TRAINER_SUSIE 456
#define TRAINER_KARA 457
#define TRAINER_DANA 458
#define TRAINER_SIENNA 459
#define TRAINER_DEBRA 460
#define TRAINER_LINDA 461
#define TRAINER_KAYLEE 462
#define TRAINER_LAUREL 463
#define TRAINER_CARLEE 464
#define TRAINER_JENNY_2 465
#define TRAINER_JENNY_3 466
#define TRAINER_JENNY_4 467
#define TRAINER_JENNY_5 468
#define TRAINER_HEIDI 469
#define TRAINER_BECKY 470
#define TRAINER_CAROL 471
#define TRAINER_NANCY 472
#define TRAINER_MARTHA 473
#define TRAINER_DIANA_1 474
#define TRAINER_CEDRIC 475
#define TRAINER_IRENE 476
#define TRAINER_DIANA_2 477
#define TRAINER_DIANA_3 478
#define TRAINER_DIANA_4 479
#define TRAINER_DIANA_5 480
#define TRAINER_AMY_AND_LIV_1 481
#define TRAINER_AMY_AND_LIV_2 482
#define TRAINER_GINA_AND_MIA_1 483
#define TRAINER_MIU_AND_YUKI 484
#define TRAINER_AMY_AND_LIV_3 485
#define TRAINER_GINA_AND_MIA_2 486
#define TRAINER_AMY_AND_LIV_4 487
#define TRAINER_AMY_AND_LIV_5 488
#define TRAINER_AMY_AND_LIV_6 489
#define TRAINER_HUEY 490
#define TRAINER_EDMOND 491
#define TRAINER_ERNEST_1 492
#define TRAINER_DWAYNE 493
#define TRAINER_PHILLIP 494
#define TRAINER_LEONARD 495
#define TRAINER_DUNCAN 496
#define TRAINER_ERNEST_2 497
#define TRAINER_ERNEST_3 498
#define TRAINER_ERNEST_4 499
#define TRAINER_ERNEST_5 500
#define TRAINER_ELI 501
#define TRAINER_ANNIKA 502
#define TRAINER_JAZMYN 503
#define TRAINER_JONAS 504
#define TRAINER_KAYLEY 505
#define TRAINER_AURON 506
#define TRAINER_KELVIN 507
#define TRAINER_MARLEY 508
#define TRAINER_REYNA 509
#define TRAINER_HUDSON 510
#define TRAINER_CONOR 511
#define TRAINER_EDWIN_1 512
#define TRAINER_HECTOR 513
#define TRAINER_TABITHA_1 514
#define TRAINER_EDWIN_2 515
#define TRAINER_EDWIN_3 516
#define TRAINER_EDWIN_4 517
#define TRAINER_EDWIN_5 518
#define TRAINER_WALLY_1 519
#define TRAINER_BRENDAN_1 520
#define TRAINER_BRENDAN_2 521
#define TRAINER_BRENDAN_3 522
#define TRAINER_BRENDAN_4 523
#define TRAINER_BRENDAN_5 524
#define TRAINER_BRENDAN_6 525
#define TRAINER_BRENDAN_7 526
#define TRAINER_BRENDAN_8 527
#define TRAINER_BRENDAN_9 528
#define TRAINER_MAY_1 529
#define TRAINER_MAY_2 530
#define TRAINER_MAY_3 531
#define TRAINER_MAY_4 532
#define TRAINER_MAY_5 533
#define TRAINER_MAY_6 534
#define TRAINER_MAY_7 535
#define TRAINER_MAY_8 536
#define TRAINER_MAY_9 537
#define TRAINER_ISAAC_1 538
#define TRAINER_DAVIS 539
#define TRAINER_MITCHELL 540
#define TRAINER_ISAAC_2 541
#define TRAINER_ISAAC_3 542
#define TRAINER_ISAAC_4 543
#define TRAINER_ISAAC_5 544
#define TRAINER_LYDIA_1 545
#define TRAINER_HALLE 546
#define TRAINER_GARRISON 547
#define TRAINER_LYDIA_2 548
#define TRAINER_LYDIA_3 549
#define TRAINER_LYDIA_4 550
#define TRAINER_LYDIA_5 551
#define TRAINER_JACKSON_1 552
#define TRAINER_LORENZO 553
#define TRAINER_SEBASTIAN 554
#define TRAINER_JACKSON_2 555
#define TRAINER_JACKSON_3 556
#define TRAINER_JACKSON_4 557
#define TRAINER_JACKSON_5 558
#define TRAINER_CATHERINE_1 559
#define TRAINER_JENNA 560
#define TRAINER_SOPHIA 561
#define TRAINER_CATHERINE_2 562
#define TRAINER_CATHERINE_3 563
#define TRAINER_CATHERINE_4 564
#define TRAINER_CATHERINE_5 565
#define TRAINER_JULIO 566
#define TRAINER_GRUNT_27 567
#define TRAINER_GRUNT_28 568
#define TRAINER_GRUNT_29 569
#define TRAINER_GRUNT_30 570
#define TRAINER_MARC 571
#define TRAINER_BRENDEN 572
#define TRAINER_LILITH 573
#define TRAINER_CRISTIAN 574
#define TRAINER_SYLVIA 575
#define TRAINER_LEONARDO 576
#define TRAINER_ATHENA 577
#define TRAINER_HARRISON 578
#define TRAINER_GRUNT_31 579
#define TRAINER_CLARENCE 580
#define TRAINER_TERRY 581
#define TRAINER_NATE 582
#define TRAINER_KATHLEEN 583
#define TRAINER_CLIFFORD 584
#define TRAINER_NICHOLAS 585
#define TRAINER_GRUNT_32 586
#define TRAINER_GRUNT_33 587
#define TRAINER_GRUNT_34 588
#define TRAINER_GRUNT_35 589
#define TRAINER_GRUNT_36 590
#define TRAINER_MACEY 591
#define TRAINER_BRENDAN_10 592
#define TRAINER_BRENDAN_11 593
#define TRAINER_PAXTON 594
#define TRAINER_ISABELLA 595
#define TRAINER_GRUNT_37 596
#define TRAINER_TABITHA_2 597
#define TRAINER_JONATHAN 598
#define TRAINER_BRENDAN_12 599
#define TRAINER_MAY_10 600
#define TRAINER_MAXIE_1 601
#define TRAINER_MAXIE_2 602
#define TRAINER_TIANA 603
#define TRAINER_HALEY_1 604
#define TRAINER_JANICE 605
#define TRAINER_VIVI 606
#define TRAINER_HALEY_2 607
#define TRAINER_HALEY_3 608
#define TRAINER_HALEY_4 609
#define TRAINER_HALEY_5 610
#define TRAINER_SALLY 611
#define TRAINER_ROBIN 612
#define TRAINER_ANDREA 613
#define TRAINER_CRISSY 614
#define TRAINER_RICK 615
#define TRAINER_LYLE 616
#define TRAINER_JOSE 617
#define TRAINER_DOUG 618
#define TRAINER_GREG 619
#define TRAINER_KENT 620
#define TRAINER_JAMES_1 621
#define TRAINER_JAMES_2 622
#define TRAINER_JAMES_3 623
#define TRAINER_JAMES_4 624
#define TRAINER_JAMES_5 625
#define TRAINER_BRICE 626
#define TRAINER_TRENT_1 627
#define TRAINER_LENNY 628
#define TRAINER_LUCAS_1 629
#define TRAINER_ALAN 630
#define TRAINER_CLARK 631
#define TRAINER_ERIC 632
#define TRAINER_LUCAS_2 633
#define TRAINER_MIKE_1 634
#define TRAINER_MIKE_2 635
#define TRAINER_TRENT_2 636
#define TRAINER_TRENT_3 637
#define TRAINER_TRENT_4 638
#define TRAINER_TRENT_5 639
#define TRAINER_DEZ_AND_LUKE 640
#define TRAINER_LEA_AND_JED 641
#define TRAINER_KIRA_AND_DAN_1 642
#define TRAINER_KIRA_AND_DAN_2 643
#define TRAINER_KIRA_AND_DAN_3 644
#define TRAINER_KIRA_AND_DAN_4 645
#define TRAINER_KIRA_AND_DAN_5 646
#define TRAINER_JOHANNA 647
#define TRAINER_GERALD 648
#define TRAINER_VIVIAN 649
#define TRAINER_DANIELLE 650
#define TRAINER_HIDEO 651
#define TRAINER_KEIGO 652
#define TRAINER_RILEY 653
#define TRAINER_FLINT 654
#define TRAINER_ASHLEY 655
#define TRAINER_WALLY_2 656
#define TRAINER_WALLY_3 657
#define TRAINER_WALLY_4 658
#define TRAINER_WALLY_5 659
#define TRAINER_WALLY_6 660
#define TRAINER_BRENDAN_13 661
#define TRAINER_BRENDAN_14 662
#define TRAINER_BRENDAN_15 663
#define TRAINER_MAY_11 664
#define TRAINER_MAY_12 665
#define TRAINER_MAY_13 666
#define TRAINER_JONAH 667
#define TRAINER_HENRY 668
#define TRAINER_ROGER 669
#define TRAINER_ALEXA 670
#define TRAINER_RUBEN 671
#define TRAINER_KOJI_1 672
#define TRAINER_WAYNE 673
#define TRAINER_AIDAN 674
#define TRAINER_REED 675
#define TRAINER_TISHA 676
#define TRAINER_TORI_AND_TIA 677
#define TRAINER_KIM_AND_IRIS 678
#define TRAINER_TYRA_AND_IVY 679
#define TRAINER_MEL_AND_PAUL 680
#define TRAINER_JOHN_AND_JAY_1 681
#define TRAINER_JOHN_AND_JAY_2 682
#define TRAINER_JOHN_AND_JAY_3 683
#define TRAINER_JOHN_AND_JAY_4 684
#define TRAINER_JOHN_AND_JAY_5 685
#define TRAINER_RELI_AND_IAN 686
#define TRAINER_LILA_AND_ROY_1 687
#define TRAINER_LILA_AND_ROY_2 688
#define TRAINER_LILA_AND_ROY_3 689
#define TRAINER_LILA_AND_ROY_4 690
#define TRAINER_LILA_AND_ROY_5 691
#define TRAINER_LISA_AND_RAY 692
#define TRAINER_CHRIS 693
#define TRAINER_DAWSON 694
#define TRAINER_SARAH 695
#define TRAINER_DARIAN 696
#define TRAINER_HAILEY 697
#define TRAINER_CHANDLER 698
#define TRAINER_KALEB 699
#define TRAINER_JOSEPH 700
#define TRAINER_ALYSSA 701
#define TRAINER_MARCOS 702
#define TRAINER_RHETT 703
#define TRAINER_TYRON 704
#define TRAINER_CELINA 705
#define TRAINER_BIANCA 706
#define TRAINER_HAYDEN 707
#define TRAINER_SOPHIE 708
#define TRAINER_COBY 709
#define TRAINER_LAWRENCE 710
#define TRAINER_WYATT 711
#define TRAINER_ANGELINA 712
#define TRAINER_KAI 713
#define TRAINER_CHARLOTTE 714
#define TRAINER_DEANDRE 715
#define TRAINER_GRUNT_38 716
#define TRAINER_GRUNT_39 717
#define TRAINER_GRUNT_40 718
#define TRAINER_GRUNT_41 719
#define TRAINER_GRUNT_42 720
#define TRAINER_GRUNT_43 721
#define TRAINER_GRUNT_44 722
#define TRAINER_GRUNT_45 723
#define TRAINER_GRUNT_46 724
#define TRAINER_GRUNT_47 725
#define TRAINER_GRUNT_48 726
#define TRAINER_GRUNT_49 727
#define TRAINER_GRUNT_50 728
#define TRAINER_GRUNT_51 729
#define TRAINER_GRUNT_52 730
#define TRAINER_GRUNT_53 731
#define TRAINER_TABITHA_3 732
#define TRAINER_DARCY 733
#define TRAINER_MAXIE_3 734
#define TRAINER_PETE 735
#define TRAINER_ISABELLE 736
#define TRAINER_ANDRES_1 737
#define TRAINER_JOSUE 738
#define TRAINER_CAMRON 739
#define TRAINER_CORY_1 740
#define TRAINER_CAROLINA 741
#define TRAINER_ELIJAH 742
#define TRAINER_CELIA 743
#define TRAINER_BRYAN 744
#define TRAINER_BRANDEN 745
#define TRAINER_BRYANT 746
#define TRAINER_SHAYLA 747
#define TRAINER_KYRA 748
#define TRAINER_JAIDEN 749
#define TRAINER_ALIX 750
#define TRAINER_HELENE 751
#define TRAINER_MARLENE 752
#define TRAINER_DEVAN 753
#define TRAINER_JOHNSON 754
#define TRAINER_MELINA 755
#define TRAINER_BRANDI 756
#define TRAINER_AISHA 757
#define TRAINER_MAKAYLA 758
#define TRAINER_FABIAN 759
#define TRAINER_DAYTON 760
#define TRAINER_RACHEL 761
#define TRAINER_LEONEL 762
#define TRAINER_CALLIE 763
#define TRAINER_CALE 764
#define TRAINER_MYLES 765
#define TRAINER_PAT 766
#define TRAINER_CRISTIN_1 767
#define TRAINER_MAY_14 768
#define TRAINER_MAY_15 769
#define TRAINER_ROXANNE_2 770
#define TRAINER_ROXANNE_3 771
#define TRAINER_ROXANNE_4 772
#define TRAINER_ROXANNE_5 773
#define TRAINER_BRAWLY_2 774
#define TRAINER_BRAWLY_3 775
#define TRAINER_BRAWLY_4 776
#define TRAINER_BRAWLY_5 777
#define TRAINER_WATTSON_2 778
#define TRAINER_WATTSON_3 779
#define TRAINER_WATTSON_4 780
#define TRAINER_WATTSON_5 781
#define TRAINER_FLANNERY_2 782
#define TRAINER_FLANNERY_3 783
#define TRAINER_FLANNERY_4 784
#define TRAINER_FLANNERY_5 785
#define TRAINER_NORMAN_2 786
#define TRAINER_NORMAN_3 787
#define TRAINER_NORMAN_4 788
#define TRAINER_NORMAN_5 789
#define TRAINER_WINONA_2 790
#define TRAINER_WINONA_3 791
#define TRAINER_WINONA_4 792
#define TRAINER_WINONA_5 793
#define TRAINER_TATE_AND_LIZA_2 794
#define TRAINER_TATE_AND_LIZA_3 795
#define TRAINER_TATE_AND_LIZA_4 796
#define TRAINER_TATE_AND_LIZA_5 797
#define TRAINER_JUAN_2 798
#define TRAINER_JUAN_3 799
#define TRAINER_JUAN_4 800
#define TRAINER_JUAN_5 801
#define TRAINER_ANGELO 802
#define TRAINER_DARIUS 803
#define TRAINER_STEVEN 804
#define TRAINER_ANABEL 805
#define TRAINER_TUCKER 806
#define TRAINER_SPENSER 807
#define TRAINER_GRETA 808
#define TRAINER_NOLAND 809
#define TRAINER_LUCY 810
#define TRAINER_BRANDON 811
#define TRAINER_ANDRES_2 812
#define TRAINER_ANDRES_3 813
#define TRAINER_ANDRES_4 814
#define TRAINER_ANDRES_5 815
#define TRAINER_CORY_2 816
#define TRAINER_CORY_3 817
#define TRAINER_CORY_4 818
#define TRAINER_CORY_5 819
#define TRAINER_PABLO_2 820
#define TRAINER_PABLO_3 821
#define TRAINER_PABLO_4 822
#define TRAINER_PABLO_5 823
#define TRAINER_KOJI_2 824
#define TRAINER_KOJI_3 825
#define TRAINER_KOJI_4 826
#define TRAINER_KOJI_5 827
#define TRAINER_CRISTIN_2 828
#define TRAINER_CRISTIN_3 829
#define TRAINER_CRISTIN_4 830
#define TRAINER_CRISTIN_5 831
#define TRAINER_FERNANDO_2 832
#define TRAINER_FERNANDO_3 833
#define TRAINER_FERNANDO_4 834
#define TRAINER_FERNANDO_5 835
#define TRAINER_SAWYER_2 836
#define TRAINER_SAWYER_3 837
#define TRAINER_SAWYER_4 838
#define TRAINER_SAWYER_5 839
#define TRAINER_GABRIELLE_2 840
#define TRAINER_GABRIELLE_3 841
#define TRAINER_GABRIELLE_4 842
#define TRAINER_GABRIELLE_5 843
#define TRAINER_THALIA_2 844
#define TRAINER_THALIA_3 845
#define TRAINER_THALIA_4 846
#define TRAINER_THALIA_5 847
#define TRAINER_MARIELA 848
#define TRAINER_ALVARO 849
#define TRAINER_EVERETT 850
#define TRAINER_RED 851
#define TRAINER_LEAF 852
#define TRAINER_BRENDAN_16 853
#define TRAINER_MAY_16 854
#define TRAINERS_COUNT 855
#include "constants/opponents.h"
// Special Trainer Ids.
#define TRAINER_FRONTIER_BRAIN 1022
include/dynamic_placeholder_text_util.h
+9
View 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
include/field_control_avatar.h
+1
View File
@@ -37,5 +37,6 @@ bool8 sub_8068894(void);
bool8 sub_8068A64(struct MapPosition *, u16);
u8 sub_8068F18(void);
bool8 dive_warp(struct MapPosition *position, u16 b);
void sub_809D2BC(void);
#endif // GUARD_FIELDCONTROLAVATAR_H
include/field_screen.h
+1
View File
@@ -14,5 +14,6 @@ void UpdateWeatherPerDay(u16 days);
void sub_80AC3D0(void);
void sub_80AC3E4(void);
void PreservePaletteInWeather(u8);
void sub_80AF128(void);
#endif //GUARD_FIELD_SCREEN_H
include/librfu.h
+9 -6
View File
@@ -47,7 +47,7 @@ enum
RFU_UNK3A,
RFU_UNK3B,
RFU_UNK3C,
RFU_STOP_MODE, //3D
RFU_STOP_MODE, // 3D
};
struct RfuPacket8
@@ -67,7 +67,7 @@ union RfuPacket
struct RfuPacket8 rfuPacket8;
};
struct __attribute__((packed)) UnkLinkRfuStruct_02022B14
struct UnkLinkRfuStruct_02022B14Substruct
{
u16 unk_00_0:4;
u16 unk_00_4:1;
@@ -79,9 +79,14 @@ struct __attribute__((packed)) UnkLinkRfuStruct_02022B14
u16 unk_01_2:4;
u16 unk_01_6:2;
u8 playerTrainerId[2];
};
struct __attribute__((packed)) UnkLinkRfuStruct_02022B14
{
struct UnkLinkRfuStruct_02022B14Substruct unk_00;
u8 unk_04[4];
u16 unk_08_0:10;
u16 unk_09_2:6;
u16 species:10;
u16 type:6;
u8 unk_0a_0:7;
u8 unk_0a_7:1;
u8 playerGender:1;
@@ -200,8 +205,6 @@ extern struct RfuUnk1* gUnknown_03007870[4];
extern void* sub_82E53F4;
extern void rfu_STC_clearAPIVariables(void);
struct UnkLinkRfuStruct_02022B14;
void STWI_init_all(struct RfuIntrStruct *interruptStruct, IntrFunc *interrupt, bool8 copyInterruptToRam);
void rfu_REQ_stopMode(void);
void rfu_waitREQComplete(void);
include/link.h
+1 -1
View File
@@ -122,7 +122,7 @@ struct LinkPlayer
/* 0x08 */ u8 name[11];
/* 0x13 */ u8 gender;
/* 0x14 */ u32 linkType;
/* 0x18 */ u16 lp_field_18; // battle bank in battles
/* 0x18 */ u16 id; // battler id in battles
/* 0x1A */ u16 language;
};
include/link_rfu.h
+32
View File
@@ -232,5 +232,37 @@ void sub_8011068(u8 a0);
void sub_8011170(u32 a0);
void sub_8011A64(u8 a0, u16 a1);
u8 sub_801048C(bool32 a0);
void sub_800DF90(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2);
void sub_8010F84(u8 a0, u32 a1, u32 a2);
void sub_8011C10(u32 a0);
bool32 sub_8012240(void);
void sub_800EF38(void);
bool32 sub_80105EC(void);
bool32 sub_801064C(u16 a0, const u8 *a1);
void sub_8010688(u8 a0, u16 a1, const u8 *a2);
u32 sub_8010714(u16 a0, const u8 *a1);
void sub_8011DC0(const u8 *a0, u16 a1);
bool8 sub_800EF1C(void);
bool32 sub_800EF58(bool32 a0);
void sub_800E084(void);
void sub_801103C(void);
void sub_8011C5C(void);
void sub_80106D4(void);
void sub_800E3A8(void);
void sub_800ED10(void);
void sub_800ED28(void);
void sub_8011090(u8 a0, u32 a1, u32 a2);
void sub_8011FC8(u8 *a0, u16 a1);
void sub_8010FA0(bool32 a0, bool32 a1);
void sub_8010F60(void);
void sub_8010FCC(u32 a0, u32 a1, u32 a2);
void sub_8011C84(void);
void sub_8012188(const u8 *a0, struct UnkLinkRfuStruct_02022B14 *arg1, u8 arg2);
bool32 sub_8011B90(void);
void sub_800FE50(u16 *a0);
bool32 sub_800E540(u16 id, u8 *name);
void sub_8011DE0(u32 arg0);
u8 sub_801100C(int a0);
void sub_800EF7C(void);
#endif //GUARD_LINK_RFU_H
include/overworld.h
+1 -1
View File
@@ -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);
include/party_menu.h
+3
View File
@@ -50,6 +50,9 @@ void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func);
void sub_81B1B5C(void *a, u8 b);
u8 sub_81B1BD4();
void sub_81B8448();
void sub_81B8518(u8 unused);
u8 sub_81B1360(void);
void sub_81B8904(u8 arg0, void (*callback)(void));
void OpenPartyMenuInBattle(u8 caseId);
#endif // GUARD_PARTY_MENU_H
include/trade.h
+3 -1
View File
@@ -7,6 +7,8 @@
// Exported ROM declarations
int sub_807A728(void);
s32 sub_807A728(void);
void sub_80773AC(void);
void sub_807AE50(void);
#endif //GUARD_TRADE_H
include/trainer_card.h
+4
View File
@@ -32,4 +32,8 @@ struct TrainerCard
extern struct TrainerCard gTrainerCards[4];
void sub_80C3120(struct TrainerCard *arg0, u16 *arg1, u8 gameVersion);
void sub_80C4E74(u8 arg0, void (*callback)(void));
void sub_80C30A4(u16 *arg0);
#endif // GUARD_TRAINER_CARD_H
include/unk_text_util.h
-9
View File
@@ -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
ld_script.txt
+6 -2
View File
@@ -55,6 +55,7 @@ SECTIONS {
src/link.o(.text);
src/link_rfu.o(.text);
asm/link_rfu.o(.text);
src/rom_8011DC0.o(.text);
asm/rom_8011DC0.o(.text);
src/rtc.o(.text);
src/main_menu.o(.text);
@@ -242,7 +243,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);
@@ -367,11 +368,14 @@ SECTIONS {
src/string_util.o(.rodata);
src/link.o(.rodata);
src/link_rfu.o(.rodata);
src/rom_8011DC0.o(.rodata);
data/rom_8011DC0.o(.rodata);
src/rtc.o(.rodata);
src/main_menu.o(.rodata);
src/rom_8034C54.o(.rodata);
data/data2b.o(.rodata);
src/battle_data.o(.rodata);
data/data2c.o(.rodata);
src/battle_main.o(.rodata);
src/battle_util.o(.rodata);
src/battle_script_commands.o(.rodata);
@@ -496,7 +500,7 @@ SECTIONS {
src/credits.o(.rodata);
src/lottery_corner.o(.rodata);
src/diploma.o(.rodata);
data/strings.o(.rodata);
src/strings.o(.rodata);
src/berry_tag_screen.o(.rodata);
src/mystery_event_menu.o(.rodata);
src/save_failed_screen.o(.rodata);
src/battle_bg.c
+10 -10
View File
@@ -279,7 +279,7 @@ static void sub_8035C4C(void)
{
if (gBattleOutcome == B_OUTCOME_WON)
{
switch (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18)
switch (gLinkPlayers[gBattleScripting.multiplayerId].id)
{
case 0:
BattlePutTextOnWindow(gText_Win, 0x16);
@@ -301,7 +301,7 @@ static void sub_8035C4C(void)
}
else
{
switch (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18)
switch (gLinkPlayers[gBattleScripting.multiplayerId].id)
{
case 0:
BattlePutTextOnWindow(gText_Win, 0x17);
@@ -324,7 +324,7 @@ static void sub_8035C4C(void)
}
else if (gBattleOutcome == B_OUTCOME_WON)
{
if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 != 0)
if (gLinkPlayers[gBattleScripting.multiplayerId].id != 0)
{
BattlePutTextOnWindow(gText_Win, 0x17);
BattlePutTextOnWindow(gText_Loss, 0x16);
@@ -337,7 +337,7 @@ static void sub_8035C4C(void)
}
else
{
if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 != 0)
if (gLinkPlayers[gBattleScripting.multiplayerId].id != 0)
{
BattlePutTextOnWindow(gText_Win, 0x16);
BattlePutTextOnWindow(gText_Loss, 0x17);
@@ -366,23 +366,23 @@ void sub_8035D74(u8 taskId)
name = gLinkPlayers[i].name;
linkPlayer = &gLinkPlayers[i];
switch (linkPlayer->lp_field_18)
switch (linkPlayer->id)
{
case 0:
BattlePutTextOnWindow(name, 0x11);
sub_8035AE4(taskId, linkPlayer->lp_field_18, 1, 2, 4);
sub_8035AE4(taskId, linkPlayer->id, 1, 2, 4);
break;
case 1:
BattlePutTextOnWindow(name, 0x12);
sub_8035AE4(taskId, linkPlayer->lp_field_18, 2, 2, 4);
sub_8035AE4(taskId, linkPlayer->id, 2, 2, 4);
break;
case 2:
BattlePutTextOnWindow(name, 0x13);
sub_8035AE4(taskId, linkPlayer->lp_field_18, 1, 2, 8);
sub_8035AE4(taskId, linkPlayer->id, 1, 2, 8);
break;
case 3:
BattlePutTextOnWindow(name, 0x14);
sub_8035AE4(taskId, linkPlayer->lp_field_18, 2, 2, 8);
sub_8035AE4(taskId, linkPlayer->id, 2, 2, 8);
break;
}
}
@@ -393,7 +393,7 @@ void sub_8035D74(u8 taskId)
u8 opponentId = playerId ^ BIT_SIDE;
u8 opponentId_copy = opponentId;
if (gLinkPlayers[playerId].lp_field_18 != 0)
if (gLinkPlayers[playerId].id != 0)
opponentId = playerId, playerId = opponentId_copy;
name = gLinkPlayers[playerId].name;
src/battle_controllers.c
+46 -46
View File
@@ -264,67 +264,67 @@ static void InitSinglePlayerBtlControllers(void)
for (var = gUnknown_0203C7B4, i = 0; i < MAX_BATTLERS_COUNT; i++)
{
switch (gLinkPlayers[i].lp_field_18)
switch (gLinkPlayers[i].id)
{
case 0:
case 3:
sub_81B8D64(gLinkPlayers[i].lp_field_18, 0);
sub_81B8D64(gLinkPlayers[i].id, 0);
break;
case 1:
case 2:
sub_81B8D64(gLinkPlayers[i].lp_field_18, 1);
sub_81B8D64(gLinkPlayers[i].id, 1);
break;
}
if (i == var)
{
gBattlerControllerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToRecordedPlayer;
switch (gLinkPlayers[i].lp_field_18)
gBattlerControllerFuncs[gLinkPlayers[i].id] = SetControllerToRecordedPlayer;
switch (gLinkPlayers[i].id)
{
case 0:
case 3:
gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_LEFT;
gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 0;
gBattlerPositions[gLinkPlayers[i].id] = B_POSITION_PLAYER_LEFT;
gBattlerPartyIndexes[gLinkPlayers[i].id] = 0;
break;
case 1:
case 2:
gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_RIGHT;
gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 3;
gBattlerPositions[gLinkPlayers[i].id] = B_POSITION_PLAYER_RIGHT;
gBattlerPartyIndexes[gLinkPlayers[i].id] = 3;
break;
}
}
else if ((!(gLinkPlayers[i].lp_field_18 & 1) && !(gLinkPlayers[var].lp_field_18 & 1))
|| ((gLinkPlayers[i].lp_field_18 & 1) && (gLinkPlayers[var].lp_field_18 & 1)))
else if ((!(gLinkPlayers[i].id & 1) && !(gLinkPlayers[var].id & 1))
|| ((gLinkPlayers[i].id & 1) && (gLinkPlayers[var].id & 1)))
{
gBattlerControllerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToRecordedPlayer;
switch (gLinkPlayers[i].lp_field_18)
gBattlerControllerFuncs[gLinkPlayers[i].id] = SetControllerToRecordedPlayer;
switch (gLinkPlayers[i].id)
{
case 0:
case 3:
gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_LEFT;
gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 0;
gBattlerPositions[gLinkPlayers[i].id] = B_POSITION_PLAYER_LEFT;
gBattlerPartyIndexes[gLinkPlayers[i].id] = 0;
break;
case 1:
case 2:
gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_PLAYER_RIGHT;
gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 3;
gBattlerPositions[gLinkPlayers[i].id] = B_POSITION_PLAYER_RIGHT;
gBattlerPartyIndexes[gLinkPlayers[i].id] = 3;
break;
}
}
else
{
gBattlerControllerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToRecordedOpponent;
switch (gLinkPlayers[i].lp_field_18)
gBattlerControllerFuncs[gLinkPlayers[i].id] = SetControllerToRecordedOpponent;
switch (gLinkPlayers[i].id)
{
case 0:
case 3:
gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_OPPONENT_LEFT;
gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 0;
gBattlerPositions[gLinkPlayers[i].id] = B_POSITION_OPPONENT_LEFT;
gBattlerPartyIndexes[gLinkPlayers[i].id] = 0;
break;
case 1:
case 2:
gBattlerPositions[gLinkPlayers[i].lp_field_18] = B_POSITION_OPPONENT_RIGHT;
gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 3;
gBattlerPositions[gLinkPlayers[i].id] = B_POSITION_OPPONENT_RIGHT;
gBattlerPartyIndexes[gLinkPlayers[i].id] = 3;
break;
}
}
@@ -506,69 +506,69 @@ static void InitLinkBtlControllers(void)
for (i = 0; i < MAX_BATTLERS_COUNT; i++)
{
switch (gLinkPlayers[i].lp_field_18)
switch (gLinkPlayers[i].id)
{
case 0:
case 3:
sub_81B8D64(gLinkPlayers[i].lp_field_18, 0);
sub_81B8D64(gLinkPlayers[i].id, 0);
break;
case 1:
case 2:
sub_81B8D64(gLinkPlayers[i].lp_field_18, 1);
sub_81B8D64(gLinkPlayers[i].id, 1);
break;
}
if (i == multiplayerId)
{
gBattlerControllerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToPlayer;
switch (gLinkPlayers[i].lp_field_18)
gBattlerControllerFuncs[gLinkPlayers[i].id] = SetControllerToPlayer;
switch (gLinkPlayers[i].id)
{
case 0:
case 3:
gBattlerPositions[gLinkPlayers[i].lp_field_18] = 0;
gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 0;
gBattlerPositions[gLinkPlayers[i].id] = 0;
gBattlerPartyIndexes[gLinkPlayers[i].id] = 0;
break;
case 1:
case 2:
gBattlerPositions[gLinkPlayers[i].lp_field_18] = 2;
gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 3;
gBattlerPositions[gLinkPlayers[i].id] = 2;
gBattlerPartyIndexes[gLinkPlayers[i].id] = 3;
break;
}
}
else
{
if ((!(gLinkPlayers[i].lp_field_18 & 1) && !(gLinkPlayers[multiplayerId].lp_field_18 & 1))
|| ((gLinkPlayers[i].lp_field_18 & 1) && (gLinkPlayers[multiplayerId].lp_field_18 & 1)))
if ((!(gLinkPlayers[i].id & 1) && !(gLinkPlayers[multiplayerId].id & 1))
|| ((gLinkPlayers[i].id & 1) && (gLinkPlayers[multiplayerId].id & 1)))
{
gBattlerControllerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToLinkPartner;
switch (gLinkPlayers[i].lp_field_18)
gBattlerControllerFuncs[gLinkPlayers[i].id] = SetControllerToLinkPartner;
switch (gLinkPlayers[i].id)
{
case 0:
case 3:
gBattlerPositions[gLinkPlayers[i].lp_field_18] = 0;
gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 0;
gBattlerPositions[gLinkPlayers[i].id] = 0;
gBattlerPartyIndexes[gLinkPlayers[i].id] = 0;
break;
case 1:
case 2:
gBattlerPositions[gLinkPlayers[i].lp_field_18] = 2;
gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 3;
gBattlerPositions[gLinkPlayers[i].id] = 2;
gBattlerPartyIndexes[gLinkPlayers[i].id] = 3;
break;
}
}
else
{
gBattlerControllerFuncs[gLinkPlayers[i].lp_field_18] = SetControllerToLinkOpponent;
switch (gLinkPlayers[i].lp_field_18)
gBattlerControllerFuncs[gLinkPlayers[i].id] = SetControllerToLinkOpponent;
switch (gLinkPlayers[i].id)
{
case 0:
case 3:
gBattlerPositions[gLinkPlayers[i].lp_field_18] = 1;
gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 0;
gBattlerPositions[gLinkPlayers[i].id] = 1;
gBattlerPartyIndexes[gLinkPlayers[i].id] = 0;
break;
case 1:
case 2:
gBattlerPositions[gLinkPlayers[i].lp_field_18] = 3;
gBattlerPartyIndexes[gLinkPlayers[i].lp_field_18] = 3;
gBattlerPositions[gLinkPlayers[i].id] = 3;
gBattlerPartyIndexes[gLinkPlayers[i].id] = 3;
break;
}
}
src/battle_data.c
+13
View File
@@ -0,0 +1,13 @@
#include "global.h"
#include "battle.h"
#include "data2.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/trainers.h"
#include "data/trainer_parties.h"
#include "data/text/trainer_class_names.h"
#include "data/trainers.h"
#include "data/text/species_names.h"
#include "data/text/move_names.h"
src/battle_main.c
+23 -23
View File
@@ -830,7 +830,7 @@ static void SetAllPlayersBerryData(void)
for (i = 0; i < numPlayers; i++)
{
src = (struct BattleEnigmaBerry *)(gBlockRecvBuffer[i] + 2);
battlerId = gLinkPlayers[i].lp_field_18;
battlerId = gLinkPlayers[i].id;
for (j = 0; j < BERRY_NAME_COUNT - 1; j++)
gEnigmaBerries[battlerId].name[j] = src->name[j];
@@ -967,8 +967,8 @@ static void CB2_HandleStartBattle(void)
if (gTrainerBattleOpponent_A == TRAINER_OPPONENT_C00)
{
gLinkPlayers[0].lp_field_18 = 0;
gLinkPlayers[1].lp_field_18 = 1;
gLinkPlayers[0].id = 0;
gLinkPlayers[1].id = 1;
}
SendBlock(bitmask_all_link_players_but_self(), &gBattleStruct->field_180, 32);
@@ -1155,10 +1155,10 @@ static void CB2_HandleStartMultiPartnerBattle(void)
{
u8 language;
gLinkPlayers[0].lp_field_18 = 0;
gLinkPlayers[1].lp_field_18 = 2;
gLinkPlayers[2].lp_field_18 = 1;
gLinkPlayers[3].lp_field_18 = 3;
gLinkPlayers[0].id = 0;
gLinkPlayers[1].id = 2;
gLinkPlayers[2].id = 1;
gLinkPlayers[3].id = 3;
GetFrontierTrainerName(gLinkPlayers[2].name, gTrainerBattleOpponent_A);
GetFrontierTrainerName(gLinkPlayers[3].name, gTrainerBattleOpponent_B);
sub_8165B88(&language, gTrainerBattleOpponent_A);
@@ -1216,7 +1216,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
if ((GetBlockReceivedStatus() & 3) == 3)
{
ResetBlockReceivedFlags();
if (gLinkPlayers[playerMultiplayerId].lp_field_18 != 0)
if (gLinkPlayers[playerMultiplayerId].id != 0)
{
memcpy(gPlayerParty, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon) * 2);
memcpy(gPlayerParty + 3, gBlockRecvBuffer[playerMultiplayerId], sizeof(struct Pokemon) * 2);
@@ -1240,7 +1240,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
if ((GetBlockReceivedStatus() & 3) == 3)
{
ResetBlockReceivedFlags();
if (gLinkPlayers[playerMultiplayerId].lp_field_18 != 0)
if (gLinkPlayers[playerMultiplayerId].id != 0)
{
memcpy(gPlayerParty + 2, gBlockRecvBuffer[enemyMultiplayerId], sizeof(struct Pokemon));
memcpy(gPlayerParty + 5, gBlockRecvBuffer[playerMultiplayerId], sizeof(struct Pokemon));
@@ -1431,8 +1431,8 @@ static void CB2_PreInitMultiBattle(void)
if (numPlayers == 4)
{
if ((!(gLinkPlayers[i].lp_field_18 & 1) && !(gLinkPlayers[playerMultiplierId].lp_field_18 & 1))
|| (gLinkPlayers[i].lp_field_18 & 1 && gLinkPlayers[playerMultiplierId].lp_field_18 & 1))
if ((!(gLinkPlayers[i].id & 1) && !(gLinkPlayers[playerMultiplierId].id & 1))
|| (gLinkPlayers[i].id & 1 && gLinkPlayers[playerMultiplierId].id & 1))
{
memcpy(gUnknown_02022FF8, gBlockRecvBuffer[i], sizeof(struct UnknownPokemonStruct4) * 3);
}
@@ -1592,7 +1592,7 @@ static void CB2_HandleStartMultiBattle(void)
for (id = 0; id < MAX_LINK_PLAYERS; id++)
{
sub_8185F90(gBlockRecvBuffer[id][1]);
switch (gLinkPlayers[id].lp_field_18)
switch (gLinkPlayers[id].id)
{
case 0:
gTasks[var].data[3] |= gBlockRecvBuffer[id][1] & 0x3F;
@@ -1629,7 +1629,7 @@ static void CB2_HandleStartMultiBattle(void)
{
if (id == playerMultiplayerId)
{
switch (gLinkPlayers[id].lp_field_18)
switch (gLinkPlayers[id].id)
{
case 0:
case 3:
@@ -1643,10 +1643,10 @@ static void CB2_HandleStartMultiBattle(void)
}
else
{
if ((!(gLinkPlayers[id].lp_field_18 & 1) && !(gLinkPlayers[playerMultiplayerId].lp_field_18 & 1))
|| ((gLinkPlayers[id].lp_field_18 & 1) && (gLinkPlayers[playerMultiplayerId].lp_field_18 & 1)))
if ((!(gLinkPlayers[id].id & 1) && !(gLinkPlayers[playerMultiplayerId].id & 1))
|| ((gLinkPlayers[id].id & 1) && (gLinkPlayers[playerMultiplayerId].id & 1)))
{
switch (gLinkPlayers[id].lp_field_18)
switch (gLinkPlayers[id].id)
{
case 0:
case 3:
@@ -1660,7 +1660,7 @@ static void CB2_HandleStartMultiBattle(void)
}
else
{
switch (gLinkPlayers[id].lp_field_18)
switch (gLinkPlayers[id].id)
{
case 0:
case 3:
@@ -1692,7 +1692,7 @@ static void CB2_HandleStartMultiBattle(void)
{
if (id == playerMultiplayerId)
{
switch (gLinkPlayers[id].lp_field_18)
switch (gLinkPlayers[id].id)
{
case 0:
case 3:
@@ -1706,10 +1706,10 @@ static void CB2_HandleStartMultiBattle(void)
}
else
{
if ((!(gLinkPlayers[id].lp_field_18 & 1) && !(gLinkPlayers[playerMultiplayerId].lp_field_18 & 1))
|| ((gLinkPlayers[id].lp_field_18 & 1) && (gLinkPlayers[playerMultiplayerId].lp_field_18 & 1)))
if ((!(gLinkPlayers[id].id & 1) && !(gLinkPlayers[playerMultiplayerId].id & 1))
|| ((gLinkPlayers[id].id & 1) && (gLinkPlayers[playerMultiplayerId].id & 1)))
{
switch (gLinkPlayers[id].lp_field_18)
switch (gLinkPlayers[id].id)
{
case 0:
case 3:
@@ -1723,7 +1723,7 @@ static void CB2_HandleStartMultiBattle(void)
}
else
{
switch (gLinkPlayers[id].lp_field_18)
switch (gLinkPlayers[id].id)
{
case 0:
case 3:
@@ -2097,7 +2097,7 @@ static void sub_8038B94(u8 taskId)
if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
{
switch (gLinkPlayers[r2].lp_field_18)
switch (gLinkPlayers[r2].id)
{
case 0:
case 2:
src/battle_message.c
+9 -9
View File
@@ -2681,25 +2681,25 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
toCpy = text;
break;
case B_TXT_LINK_PLAYER_MON1_NAME: // link first player poke name
GetMonData(&gPlayerParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].lp_field_18]],
GetMonData(&gPlayerParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].id]],
MON_DATA_NICKNAME, text);
StringGetEnd10(text);
toCpy = text;
break;
case B_TXT_LINK_OPPONENT_MON1_NAME: // link first opponent poke name
GetMonData(&gEnemyParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].lp_field_18 ^ 1]],
GetMonData(&gEnemyParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].id ^ 1]],
MON_DATA_NICKNAME, text);
StringGetEnd10(text);
toCpy = text;
break;
case B_TXT_LINK_PLAYER_MON2_NAME: // link second player poke name
GetMonData(&gPlayerParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].lp_field_18 ^ 2]],
GetMonData(&gPlayerParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].id ^ 2]],
MON_DATA_NICKNAME, text);
StringGetEnd10(text);
toCpy = text;
break;
case B_TXT_LINK_OPPONENT_MON2_NAME: // link second opponent poke name
GetMonData(&gEnemyParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].lp_field_18 ^ 3]],
GetMonData(&gEnemyParty[gBattlerPartyIndexes[gLinkPlayers[multiplayerID].id ^ 3]],
MON_DATA_NICKNAME, text);
StringGetEnd10(text);
toCpy = text;
@@ -2765,7 +2765,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
}
else
{
if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 == gPotentialItemEffectBattler)
if (gLinkPlayers[gBattleScripting.multiplayerId].id == gPotentialItemEffectBattler)
{
StringCopy(text, gEnigmaBerries[gPotentialItemEffectBattler].name);
StringAppend(text, sText_BerrySuffix);
@@ -2812,13 +2812,13 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
toCpy = gLinkPlayers[multiplayerID].name;
break;
case B_TXT_1F: // link partner name?
toCpy = gLinkPlayers[GetBattlerMultiplayerId(2 ^ gLinkPlayers[multiplayerID].lp_field_18)].name;
toCpy = gLinkPlayers[GetBattlerMultiplayerId(2 ^ gLinkPlayers[multiplayerID].id)].name;
break;
case B_TXT_20: // link opponent 1 name?
toCpy = gLinkPlayers[GetBattlerMultiplayerId(1 ^ gLinkPlayers[multiplayerID].lp_field_18)].name;
toCpy = gLinkPlayers[GetBattlerMultiplayerId(1 ^ gLinkPlayers[multiplayerID].id)].name;
break;
case B_TXT_21: // link opponent 2 name?
toCpy = gLinkPlayers[GetBattlerMultiplayerId(3 ^ gLinkPlayers[multiplayerID].lp_field_18)].name;
toCpy = gLinkPlayers[GetBattlerMultiplayerId(3 ^ gLinkPlayers[multiplayerID].id)].name;
break;
case B_TXT_22: // link scripting active name
toCpy = gLinkPlayers[GetBattlerMultiplayerId(gBattleScripting.battler)].name;
@@ -3119,7 +3119,7 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst)
{
if (hword == ITEM_ENIGMA_BERRY)
{
if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 == gPotentialItemEffectBattler)
if (gLinkPlayers[gBattleScripting.multiplayerId].id == gPotentialItemEffectBattler)
{
StringCopy(dst, gEnigmaBerries[gPotentialItemEffectBattler].name);
StringAppend(dst, sText_BerrySuffix);
src/battle_records.c
+1 -1
View File
@@ -356,7 +356,7 @@ static void Task_ExitTrainerHillRecords(u8 taskId)
{
if (!gPaletteFade.active)
{
SetMainCallback2(CB2_ReturnToFieldContinueScript);
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
Free(sTilemapBuffer);
RemoveTrainerHillRecordsWindow(0);
FreeAllWindowBuffers();
src/battle_setup.c
+9 -9
View File
@@ -467,7 +467,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);
}
@@ -609,13 +609,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);
}
}
@@ -932,7 +932,7 @@ static void CB2_StartFirstBattle(void)
static void CB2_EndFirstBattle(void)
{
Overworld_ClearSavedMusic();
SetMainCallback2(CB2_ReturnToFieldContinueScript);
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
}
static void sub_80B1218(void)
@@ -1308,18 +1308,18 @@ static void CB2_EndTrainerBattle(void)
{
if (gTrainerBattleOpponent_A == TRAINER_SECRET_BASE)
{
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();
@@ -1332,7 +1332,7 @@ static void CB2_EndRematchBattle(void)
{
if (gTrainerBattleOpponent_A == TRAINER_SECRET_BASE)
{
SetMainCallback2(CB2_ReturnToFieldContinueScript);
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
}
else if (IsPlayerDefeated(gBattleOutcome) == TRUE)
{
@@ -1340,7 +1340,7 @@ static void CB2_EndRematchBattle(void)
}
else
{
SetMainCallback2(CB2_ReturnToFieldContinueScript);
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
RegisterTrainerInMatchCall();
SetBattledTrainersFlags();
HandleRematchVarsOnBattleEnd();
src/berry_blender.c
+2 -2
View File
@@ -2687,7 +2687,7 @@ static void CB2_HandlePlayerLinkPlayAgainChoice(void)
if (gReceivedRemoteLinkPlayers == 0)
{
FREE_AND_SET_NULL(sBerryBlenderData);
SetMainCallback2(CB2_ReturnToFieldContinueScript);
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
}
break;
}
@@ -2737,7 +2737,7 @@ static void CB2_HandlePlayerPlayAgainChoice(void)
if (sBerryBlenderData->playAgainState == PLAY_AGAIN_OK)
SetMainCallback2(DoBerryBlending);
else
SetMainCallback2(CB2_ReturnToFieldContinueScript);
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
FreeAllWindowBuffers();
UnsetBgTilemapBuffer(2);
src/clock.c
+1 -1
View File
@@ -83,7 +83,7 @@ static void UpdatePerMinute(struct Time *localTime)
static void ReturnFromStartWallClock(void)
{
InitTimeBasedEvents();
SetMainCallback2(CB2_ReturnToFieldContinueScript);
SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
}
void StartWallClock(void)
src/data/text/move_names.h
+625
View File
@@ -0,0 +1,625 @@
const u8 gMoveNames[][13] =
{
[MOVE_NONE] = _("-"),
[MOVE_POUND] = _("POUND"),
[MOVE_KARATE_CHOP] = _("KARATE CHOP"),
[MOVE_DOUBLE_SLAP] = _("DOUBLESLAP"),
[MOVE_COMET_PUNCH] = _("COMET PUNCH"),
[MOVE_MEGA_PUNCH] = _("MEGA PUNCH"),
[MOVE_PAY_DAY] = _("PAY DAY"),
[MOVE_FIRE_PUNCH] = _("FIRE PUNCH"),
[MOVE_ICE_PUNCH] = _("ICE PUNCH"),
[MOVE_THUNDER_PUNCH] = _("THUNDERPUNCH"),
[MOVE_SCRATCH] = _("SCRATCH"),
[MOVE_VICE_GRIP] = _("VICEGRIP"),
[MOVE_GUILLOTINE] = _("GUILLOTINE"),
[MOVE_RAZOR_WIND] = _("RAZOR WIND"),
[MOVE_SWORDS_DANCE] = _("SWORDS DANCE"),
[MOVE_CUT] = _("CUT"),
[MOVE_GUST] = _("GUST"),
[MOVE_WING_ATTACK] = _("WING ATTACK"),
[MOVE_WHIRLWIND] = _("WHIRLWIND"),
[MOVE_FLY] = _("FLY"),
[MOVE_BIND] = _("BIND"),
[MOVE_SLAM] = _("SLAM"),
[MOVE_VINE_WHIP] = _("VINE WHIP"),
[MOVE_STOMP] = _("STOMP"),
[MOVE_DOUBLE_KICK] = _("DOUBLE KICK"),
[MOVE_MEGA_KICK] = _("MEGA KICK"),
[MOVE_JUMP_KICK] = _("JUMP KICK"),
[MOVE_ROLLING_KICK] = _("ROLLING KICK"),
[MOVE_SAND_ATTACK] = _("SAND-ATTACK"),
[MOVE_HEADBUTT] = _("HEADBUTT"),
[MOVE_HORN_ATTACK] = _("HORN ATTACK"),
[MOVE_FURY_ATTACK] = _("FURY ATTACK"),
[MOVE_HORN_DRILL] = _("HORN DRILL"),
[MOVE_TACKLE] = _("TACKLE"),
[MOVE_BODY_SLAM] = _("BODY SLAM"),
[MOVE_WRAP] = _("WRAP"),
[MOVE_TAKE_DOWN] = _("TAKE DOWN"),
[MOVE_THRASH] = _("THRASH"),
[MOVE_DOUBLE_EDGE] = _("DOUBLE-EDGE"),
[MOVE_TAIL_WHIP] = _("TAIL WHIP"),
[MOVE_POISON_STING] = _("POISON STING"),
[MOVE_TWINEEDLE] = _("TWINEEDLE"),
[MOVE_PIN_MISSILE] = _("PIN MISSILE"),
[MOVE_LEER] = _("LEER"),
[MOVE_BITE] = _("BITE"),
[MOVE_GROWL] = _("GROWL"),
[MOVE_ROAR] = _("ROAR"),
[MOVE_SING] = _("SING"),
[MOVE_SUPERSONIC] = _("SUPERSONIC"),
[MOVE_SONIC_BOOM] = _("SONICBOOM"),
[MOVE_DISABLE] = _("DISABLE"),
[MOVE_ACID] = _("ACID"),
[MOVE_EMBER] = _("EMBER"),
[MOVE_FLAMETHROWER] = _("FLAMETHROWER"),
[MOVE_MIST] = _("MIST"),
[MOVE_WATER_GUN] = _("WATER GUN"),
[MOVE_HYDRO_PUMP] = _("HYDRO PUMP"),
[MOVE_SURF] = _("SURF"),
[MOVE_ICE_BEAM] = _("ICE BEAM"),
[MOVE_BLIZZARD] = _("BLIZZARD"),
[MOVE_PSYBEAM] = _("PSYBEAM"),
[MOVE_BUBBLE_BEAM] = _("BUBBLEBEAM"),
[MOVE_AURORA_BEAM] = _("AURORA BEAM"),
[MOVE_HYPER_BEAM] = _("HYPER BEAM"),
[MOVE_PECK] = _("PECK"),
[MOVE_DRILL_PECK] = _("DRILL PECK"),
[MOVE_SUBMISSION] = _("SUBMISSION"),
[MOVE_LOW_KICK] = _("LOW KICK"),
[MOVE_COUNTER] = _("COUNTER"),
[MOVE_SEISMIC_TOSS] = _("SEISMIC TOSS"),
[MOVE_STRENGTH] = _("STRENGTH"),
[MOVE_ABSORB] = _("ABSORB"),
[MOVE_MEGA_DRAIN] = _("MEGA DRAIN"),
[MOVE_LEECH_SEED] = _("LEECH SEED"),
[MOVE_GROWTH] = _("GROWTH"),
[MOVE_RAZOR_LEAF] = _("RAZOR LEAF"),
[MOVE_SOLAR_BEAM] = _("SOLARBEAM"),
[MOVE_POISON_POWDER] = _("POISONPOWDER"),
[MOVE_STUN_SPORE] = _("STUN SPORE"),
[MOVE_SLEEP_POWDER] = _("SLEEP POWDER"),
[MOVE_PETAL_DANCE] = _("PETAL DANCE"),
[MOVE_STRING_SHOT] = _("STRING SHOT"),
[MOVE_DRAGON_RAGE] = _("DRAGON RAGE"),
[MOVE_FIRE_SPIN] = _("FIRE SPIN"),
[MOVE_THUNDER_SHOCK] = _("THUNDERSHOCK"),
[MOVE_THUNDERBOLT] = _("THUNDERBOLT"),
[MOVE_THUNDER_WAVE] = _("THUNDER WAVE"),
[MOVE_THUNDER] = _("THUNDER"),
[MOVE_ROCK_THROW] = _("ROCK THROW"),
[MOVE_EARTHQUAKE] = _("EARTHQUAKE"),
[MOVE_FISSURE] = _("FISSURE"),
[MOVE_DIG] = _("DIG"),
[MOVE_TOXIC] = _("TOXIC"),
[MOVE_CONFUSION] = _("CONFUSION"),
[MOVE_PSYCHIC] = _("PSYCHIC"),
[MOVE_HYPNOSIS] = _("HYPNOSIS"),
[MOVE_MEDITATE] = _("MEDITATE"),
[MOVE_AGILITY] = _("AGILITY"),
[MOVE_QUICK_ATTACK] = _("QUICK ATTACK"),
[MOVE_RAGE] = _("RAGE"),
[MOVE_TELEPORT] = _("TELEPORT"),
[MOVE_NIGHT_SHADE] = _("NIGHT SHADE"),
[MOVE_MIMIC] = _("MIMIC"),
[MOVE_SCREECH] = _("SCREECH"),
[MOVE_DOUBLE_TEAM] = _("DOUBLE TEAM"),
[MOVE_RECOVER] = _("RECOVER"),
[MOVE_HARDEN] = _("HARDEN"),
[MOVE_MINIMIZE] = _("MINIMIZE"),
[MOVE_SMOKESCREEN] = _("SMOKESCREEN"),
[MOVE_CONFUSE_RAY] = _("CONFUSE RAY"),
[MOVE_WITHDRAW] = _("WITHDRAW"),
[MOVE_DEFENSE_CURL] = _("DEFENSE CURL"),
[MOVE_BARRIER] = _("BARRIER"),
[MOVE_LIGHT_SCREEN] = _("LIGHT SCREEN"),
[MOVE_HAZE] = _("HAZE"),
[MOVE_REFLECT] = _("REFLECT"),
[MOVE_FOCUS_ENERGY] = _("FOCUS ENERGY"),
[MOVE_BIDE] = _("BIDE"),
[MOVE_METRONOME] = _("METRONOME"),
[MOVE_MIRROR_MOVE] = _("MIRROR MOVE"),
[MOVE_SELF_DESTRUCT] = _("SELFDESTRUCT"),
[MOVE_EGG_BOMB] = _("EGG BOMB"),
[MOVE_LICK] = _("LICK"),
[MOVE_SMOG] = _("SMOG"),
[MOVE_SLUDGE] = _("SLUDGE"),
[MOVE_BONE_CLUB] = _("BONE CLUB"),
[MOVE_FIRE_BLAST] = _("FIRE BLAST"),
[MOVE_WATERFALL] = _("WATERFALL"),
[MOVE_CLAMP] = _("CLAMP"),
[MOVE_SWIFT] = _("SWIFT"),
[MOVE_SKULL_BASH] = _("SKULL BASH"),
[MOVE_SPIKE_CANNON] = _("SPIKE CANNON"),
[MOVE_CONSTRICT] = _("CONSTRICT"),
[MOVE_AMNESIA] = _("AMNESIA"),
[MOVE_KINESIS] = _("KINESIS"),
[MOVE_SOFT_BOILED] = _("SOFTBOILED"),
[MOVE_HI_JUMP_KICK] = _("HI JUMP KICK"),
[MOVE_GLARE] = _("GLARE"),
[MOVE_DREAM_EATER] = _("DREAM EATER"),
[MOVE_POISON_GAS] = _("POISON GAS"),
[MOVE_BARRAGE] = _("BARRAGE"),
[MOVE_LEECH_LIFE] = _("LEECH LIFE"),
[MOVE_LOVELY_KISS] = _("LOVELY KISS"),
[MOVE_SKY_ATTACK] = _("SKY ATTACK"),
[MOVE_TRANSFORM] = _("TRANSFORM"),
[MOVE_BUBBLE] = _("BUBBLE"),
[MOVE_DIZZY_PUNCH] = _("DIZZY PUNCH"),
[MOVE_SPORE] = _("SPORE"),
[MOVE_FLASH] = _("FLASH"),
[MOVE_PSYWAVE] = _("PSYWAVE"),
[MOVE_SPLASH] = _("SPLASH"),
[MOVE_ACID_ARMOR] = _("ACID ARMOR"),
[MOVE_CRABHAMMER] = _("CRABHAMMER"),
[MOVE_EXPLOSION] = _("EXPLOSION"),
[MOVE_FURY_SWIPES] = _("FURY SWIPES"),
[MOVE_BONEMERANG] = _("BONEMERANG"),
[MOVE_REST] = _("REST"),
[MOVE_ROCK_SLIDE] = _("ROCK SLIDE"),
[MOVE_HYPER_FANG] = _("HYPER FANG"),
[MOVE_SHARPEN] = _("SHARPEN"),
[MOVE_CONVERSION] = _("CONVERSION"),
[MOVE_TRI_ATTACK] = _("TRI ATTACK"),
[MOVE_SUPER_FANG] = _("SUPER FANG"),
[MOVE_SLASH] = _("SLASH"),
[MOVE_SUBSTITUTE] = _("SUBSTITUTE"),
[MOVE_STRUGGLE] = _("STRUGGLE"),
[MOVE_SKETCH] = _("SKETCH"),
[MOVE_TRIPLE_KICK] = _("TRIPLE KICK"),
[MOVE_THIEF] = _("THIEF"),
[MOVE_SPIDER_WEB] = _("SPIDER WEB"),
[MOVE_MIND_READER] = _("MIND READER"),
[MOVE_NIGHTMARE] = _("NIGHTMARE"),
[MOVE_FLAME_WHEEL] = _("FLAME WHEEL"),
[MOVE_SNORE] = _("SNORE"),
[MOVE_CURSE] = _("CURSE"),
[MOVE_FLAIL] = _("FLAIL"),
[MOVE_CONVERSION_2] = _("CONVERSION 2"),
[MOVE_AEROBLAST] = _("AEROBLAST"),
[MOVE_COTTON_SPORE] = _("COTTON SPORE"),
[MOVE_REVERSAL] = _("REVERSAL"),
[MOVE_SPITE] = _("SPITE"),
[MOVE_POWDER_SNOW] = _("POWDER SNOW"),
[MOVE_PROTECT] = _("PROTECT"),
[MOVE_MACH_PUNCH] = _("MACH PUNCH"),
[MOVE_SCARY_FACE] = _("SCARY FACE"),
[MOVE_FAINT_ATTACK] = _("FAINT ATTACK"),
[MOVE_SWEET_KISS] = _("SWEET KISS"),
[MOVE_BELLY_DRUM] = _("BELLY DRUM"),
[MOVE_SLUDGE_BOMB] = _("SLUDGE BOMB"),
[MOVE_MUD_SLAP] = _("MUD-SLAP"),
[MOVE_OCTAZOOKA] = _("OCTAZOOKA"),
[MOVE_SPIKES] = _("SPIKES"),
[MOVE_ZAP_CANNON] = _("ZAP CANNON"),
[MOVE_FORESIGHT] = _("FORESIGHT"),
[MOVE_DESTINY_BOND] = _("DESTINY BOND"),
[MOVE_PERISH_SONG] = _("PERISH SONG"),
[MOVE_ICY_WIND] = _("ICY WIND"),
[MOVE_DETECT] = _("DETECT"),
[MOVE_BONE_RUSH] = _("BONE RUSH"),
[MOVE_LOCK_ON] = _("LOCK-ON"),
[MOVE_OUTRAGE] = _("OUTRAGE"),
[MOVE_SANDSTORM] = _("SANDSTORM"),
[MOVE_GIGA_DRAIN] = _("GIGA DRAIN"),
[MOVE_ENDURE] = _("ENDURE"),
[MOVE_CHARM] = _("CHARM"),
[MOVE_ROLLOUT] = _("ROLLOUT"),
[MOVE_FALSE_SWIPE] = _("FALSE SWIPE"),
[MOVE_SWAGGER] = _("SWAGGER"),
[MOVE_MILK_DRINK] = _("MILK DRINK"),
[MOVE_SPARK] = _("SPARK"),
[MOVE_FURY_CUTTER] = _("FURY CUTTER"),
[MOVE_STEEL_WING] = _("STEEL WING"),
[MOVE_MEAN_LOOK] = _("MEAN LOOK"),
[MOVE_ATTRACT] = _("ATTRACT"),
[MOVE_SLEEP_TALK] = _("SLEEP TALK"),
[MOVE_HEAL_BELL] = _("HEAL BELL"),
[MOVE_RETURN] = _("RETURN"),
[MOVE_PRESENT] = _("PRESENT"),
[MOVE_FRUSTRATION] = _("FRUSTRATION"),
[MOVE_SAFEGUARD] = _("SAFEGUARD"),
[MOVE_PAIN_SPLIT] = _("PAIN SPLIT"),
[MOVE_SACRED_FIRE] = _("SACRED FIRE"),
[MOVE_MAGNITUDE] = _("MAGNITUDE"),
[MOVE_DYNAMIC_PUNCH] = _("DYNAMICPUNCH"),
[MOVE_MEGAHORN] = _("MEGAHORN"),
[MOVE_DRAGON_BREATH] = _("DRAGONBREATH"),
[MOVE_BATON_PASS] = _("BATON PASS"),
[MOVE_ENCORE] = _("ENCORE"),
[MOVE_PURSUIT] = _("PURSUIT"),
[MOVE_RAPID_SPIN] = _("RAPID SPIN"),
[MOVE_SWEET_SCENT] = _("SWEET SCENT"),
[MOVE_IRON_TAIL] = _("IRON TAIL"),
[MOVE_METAL_CLAW] = _("METAL CLAW"),
[MOVE_VITAL_THROW] = _("VITAL THROW"),
[MOVE_MORNING_SUN] = _("MORNING SUN"),
[MOVE_SYNTHESIS] = _("SYNTHESIS"),
[MOVE_MOONLIGHT] = _("MOONLIGHT"),
[MOVE_HIDDEN_POWER] = _("HIDDEN POWER"),
[MOVE_CROSS_CHOP] = _("CROSS CHOP"),
[MOVE_TWISTER] = _("TWISTER"),
[MOVE_RAIN_DANCE] = _("RAIN DANCE"),
[MOVE_SUNNY_DAY] = _("SUNNY DAY"),
[MOVE_CRUNCH] = _("CRUNCH"),
[MOVE_MIRROR_COAT] = _("MIRROR COAT"),
[MOVE_PSYCH_UP] = _("PSYCH UP"),
[MOVE_EXTREME_SPEED] = _("EXTREMESPEED"),
[MOVE_ANCIENT_POWER] = _("ANCIENTPOWER"),
[MOVE_SHADOW_BALL] = _("SHADOW BALL"),
[MOVE_FUTURE_SIGHT] = _("FUTURE SIGHT"),
[MOVE_ROCK_SMASH] = _("ROCK SMASH"),
[MOVE_WHIRLPOOL] = _("WHIRLPOOL"),
[MOVE_BEAT_UP] = _("BEAT UP"),
[MOVE_FAKE_OUT] = _("FAKE OUT"),
[MOVE_UPROAR] = _("UPROAR"),
[MOVE_STOCKPILE] = _("STOCKPILE"),
[MOVE_SPIT_UP] = _("SPIT UP"),
[MOVE_SWALLOW] = _("SWALLOW"),
[MOVE_HEAT_WAVE] = _("HEAT WAVE"),
[MOVE_HAIL] = _("HAIL"),
[MOVE_TORMENT] = _("TORMENT"),
[MOVE_FLATTER] = _("FLATTER"),
[MOVE_WILL_O_WISP] = _("WILL-O-WISP"),
[MOVE_MEMENTO] = _("MEMENTO"),
[MOVE_FACADE] = _("FACADE"),
[MOVE_FOCUS_PUNCH] = _("FOCUS PUNCH"),
[MOVE_SMELLING_SALT] = _("SMELLINGSALT"),
[MOVE_FOLLOW_ME] = _("FOLLOW ME"),
[MOVE_NATURE_POWER] = _("NATURE POWER"),
[MOVE_CHARGE] = _("CHARGE"),
[MOVE_TAUNT] = _("TAUNT"),
[MOVE_HELPING_HAND] = _("HELPING HAND"),
[MOVE_TRICK] = _("TRICK"),
[MOVE_ROLE_PLAY] = _("ROLE PLAY"),
[MOVE_WISH] = _("WISH"),
[MOVE_ASSIST] = _("ASSIST"),
[MOVE_INGRAIN] = _("INGRAIN"),
[MOVE_SUPERPOWER] = _("SUPERPOWER"),
[MOVE_MAGIC_COAT] = _("MAGIC COAT"),
[MOVE_RECYCLE] = _("RECYCLE"),
[MOVE_REVENGE] = _("REVENGE"),
[MOVE_BRICK_BREAK] = _("BRICK BREAK"),
[MOVE_YAWN] = _("YAWN"),
[MOVE_KNOCK_OFF] = _("KNOCK OFF"),
[MOVE_ENDEAVOR] = _("ENDEAVOR"),
[MOVE_ERUPTION] = _("ERUPTION"),
[MOVE_SKILL_SWAP] = _("SKILL SWAP"),
[MOVE_IMPRISON] = _("IMPRISON"),
[MOVE_REFRESH] = _("REFRESH"),
[MOVE_GRUDGE] = _("GRUDGE"),
[MOVE_SNATCH] = _("SNATCH"),
[MOVE_SECRET_POWER] = _("SECRET POWER"),
[MOVE_DIVE] = _("DIVE"),
[MOVE_ARM_THRUST] = _("ARM THRUST"),
[MOVE_CAMOUFLAGE] = _("CAMOUFLAGE"),
[MOVE_TAIL_GLOW] = _("TAIL GLOW"),
[MOVE_LUSTER_PURGE] = _("LUSTER PURGE"),
[MOVE_MIST_BALL] = _("MIST BALL"),
[MOVE_FEATHER_DANCE] = _("FEATHERDANCE"),
[MOVE_TEETER_DANCE] = _("TEETER DANCE"),
[MOVE_BLAZE_KICK] = _("BLAZE KICK"),
[MOVE_MUD_SPORT] = _("MUD SPORT"),
[MOVE_ICE_BALL] = _("ICE BALL"),
[MOVE_NEEDLE_ARM] = _("NEEDLE ARM"),
[MOVE_SLACK_OFF] = _("SLACK OFF"),
[MOVE_HYPER_VOICE] = _("HYPER VOICE"),
[MOVE_POISON_FANG] = _("POISON FANG"),
[MOVE_CRUSH_CLAW] = _("CRUSH CLAW"),
[MOVE_BLAST_BURN] = _("BLAST BURN"),
[MOVE_HYDRO_CANNON] = _("HYDRO CANNON"),
[MOVE_METEOR_MASH] = _("METEOR MASH"),
[MOVE_ASTONISH] = _("ASTONISH"),
[MOVE_WEATHER_BALL] = _("WEATHER BALL"),
[MOVE_AROMATHERAPY] = _("AROMATHERAPY"),
[MOVE_FAKE_TEARS] = _("FAKE TEARS"),
[MOVE_AIR_CUTTER] = _("AIR CUTTER"),
[MOVE_OVERHEAT] = _("OVERHEAT"),
[MOVE_ODOR_SLEUTH] = _("ODOR SLEUTH"),
[MOVE_ROCK_TOMB] = _("ROCK TOMB"),
[MOVE_SILVER_WIND] = _("SILVER WIND"),
[MOVE_METAL_SOUND] = _("METAL SOUND"),
[MOVE_GRASS_WHISTLE] = _("GRASSWHISTLE"),
[MOVE_TICKLE] = _("TICKLE"),
[MOVE_COSMIC_POWER] = _("COSMIC POWER"),
[MOVE_WATER_SPOUT] = _("WATER SPOUT"),
[MOVE_SIGNAL_BEAM] = _("SIGNAL BEAM"),
[MOVE_SHADOW_PUNCH] = _("SHADOW PUNCH"),
[MOVE_EXTRASENSORY] = _("EXTRASENSORY"),
[MOVE_SKY_UPPERCUT] = _("SKY UPPERCUT"),
[MOVE_SAND_TOMB] = _("SAND TOMB"),
[MOVE_SHEER_COLD] = _("SHEER COLD"),
[MOVE_MUDDY_WATER] = _("MUDDY WATER"),
[MOVE_BULLET_SEED] = _("BULLET SEED"),
[MOVE_AERIAL_ACE] = _("AERIAL ACE"),
[MOVE_ICICLE_SPEAR] = _("ICICLE SPEAR"),
[MOVE_IRON_DEFENSE] = _("IRON DEFENSE"),
[MOVE_BLOCK] = _("BLOCK"),
[MOVE_HOWL] = _("HOWL"),
[MOVE_DRAGON_CLAW] = _("DRAGON CLAW"),
[MOVE_FRENZY_PLANT] = _("FRENZY PLANT"),
[MOVE_BULK_UP] = _("BULK UP"),
[MOVE_BOUNCE] = _("BOUNCE"),
[MOVE_MUD_SHOT] = _("MUD SHOT"),
[MOVE_POISON_TAIL] = _("POISON TAIL"),
[MOVE_COVET] = _("COVET"),
[MOVE_VOLT_TACKLE] = _("VOLT TACKLE"),
[MOVE_MAGICAL_LEAF] = _("MAGICAL LEAF"),
[MOVE_WATER_SPORT] = _("WATER SPORT"),
[MOVE_CALM_MIND] = _("CALM MIND"),
[MOVE_LEAF_BLADE] = _("LEAF BLADE"),
[MOVE_DRAGON_DANCE] = _("DRAGON DANCE"),
[MOVE_ROCK_BLAST] = _("ROCK BLAST"),
[MOVE_SHOCK_WAVE] = _("SHOCK WAVE"),
[MOVE_WATER_PULSE] = _("WATER PULSE"),
[MOVE_DOOM_DESIRE] = _("DOOM DESIRE"),
[MOVE_PSYCHO_BOOST] = _("PSYCHO BOOST"),
[MOVE_ROOST] = _("Roost"),
[MOVE_GRAVITY] = _("Gravity"),
[MOVE_MIRACLE_EYE] = _("Miracle Eye"),
[MOVE_WAKE_UP_SLAP] = _("Wake Up Slap"),
[MOVE_HAMMER_ARM] = _("Hammer Arm"),
[MOVE_GYRO_BALL] = _("Gyro Ball"),
[MOVE_HEALING_WISH] = _("Healing Wish"),
[MOVE_BRINE] = _("Brine"),
[MOVE_NATURAL_GIFT] = _("Natural Gift"),
[MOVE_FEINT] = _("Feint"),
[MOVE_PLUCK] = _("Pluck"),
[MOVE_TAILWIND] = _("Tailwind"),
[MOVE_ACUPRESSURE] = _("Acupressure"),
[MOVE_METAL_BURST] = _("Metal Burst"),
[MOVE_U_TURN] = _("U Turn"),
[MOVE_CLOSE_COMBAT] = _("Close Combat"),
[MOVE_PAYBACK] = _("Payback"),
[MOVE_ASSURANCE] = _("Assurance"),
[MOVE_EMBARGO] = _("Embargo"),
[MOVE_FLING] = _("Fling"),
[MOVE_PSYCHO_SHIFT] = _("Psycho Shift"),
[MOVE_TRUMP_CARD] = _("Trump Card"),
[MOVE_HEAL_BLOCK] = _("Heal Block"),
[MOVE_WRING_OUT] = _("Wring Out"),
[MOVE_POWER_TRICK] = _("Power Trick"),
[MOVE_GASTRO_ACID] = _("Gastro Acid"),
[MOVE_LUCKY_CHANT] = _("Lucky Chant"),
[MOVE_ME_FIRST] = _("Me First"),
[MOVE_COPYCAT] = _("Copycat"),
[MOVE_POWER_SWAP] = _("Power Swap"),
[MOVE_GUARD_SWAP] = _("Guard Swap"),
[MOVE_PUNISHMENT] = _("Punishment"),
[MOVE_LAST_RESORT] = _("Last Resort"),
[MOVE_WORRY_SEED] = _("Worry Seed"),
[MOVE_SUCKER_PUNCH] = _("Sucker Punch"),
[MOVE_TOXIC_SPIKES] = _("Toxic Spikes"),
[MOVE_HEART_SWAP] = _("Heart Swap"),
[MOVE_AQUA_RING] = _("Aqua Ring"),
[MOVE_MAGNET_RISE] = _("Magnet Rise"),
[MOVE_FLARE_BLITZ] = _("Flare Blitz"),
[MOVE_FORCE_PALM] = _("Force Palm"),
[MOVE_AURA_SPHERE] = _("Aura Sphere"),
[MOVE_ROCK_POLISH] = _("Rock Polish"),
[MOVE_POISON_JAB] = _("Poison Jab"),
[MOVE_DARK_PULSE] = _("Dark Pulse"),
[MOVE_NIGHT_SLASH] = _("Night Slash"),
[MOVE_AQUA_TAIL] = _("Aqua Tail"),
[MOVE_SEED_BOMB] = _("Seed Bomb"),
[MOVE_AIR_SLASH] = _("Air Slash"),
[MOVE_X_SCISSOR] = _("X Scissor"),
[MOVE_BUG_BUZZ] = _("Bug Buzz"),
[MOVE_DRAGON_PULSE] = _("Dragon Pulse"),
[MOVE_DRAGON_RUSH] = _("Dragon Rush"),
[MOVE_POWER_GEM] = _("Power Gem"),
[MOVE_DRAIN_PUNCH] = _("Drain Punch"),
[MOVE_VACUUM_WAVE] = _("Vacuum Wave"),
[MOVE_FOCUS_BLAST] = _("Focus Blast"),
[MOVE_ENERGY_BALL] = _("Energy Ball"),
[MOVE_BRAVE_BIRD] = _("Brave Bird"),
[MOVE_EARTH_POWER] = _("Earth Power"),
[MOVE_SWITCHEROO] = _("Switcheroo"),
[MOVE_GIGA_IMPACT] = _("Giga Impact"),
[MOVE_NASTY_PLOT] = _("Nasty Plot"),
[MOVE_BULLET_PUNCH] = _("Bullet Punch"),
[MOVE_AVALANCHE] = _("Avalanche"),
[MOVE_ICE_SHARD] = _("Ice Shard"),
[MOVE_SHADOW_CLAW] = _("Shadow Claw"),
[MOVE_THUNDER_FANG] = _("Thunder Fang"),
[MOVE_ICE_FANG] = _("Ice Fang"),
[MOVE_FIRE_FANG] = _("Fire Fang"),
[MOVE_SHADOW_SNEAK] = _("Shadow Sneak"),
[MOVE_MUD_BOMB] = _("Mud Bomb"),
[MOVE_PSYCHO_CUT] = _("Psycho Cut"),
[MOVE_ZEN_HEADBUTT] = _("Zen Headbutt"),
[MOVE_MIRROR_SHOT] = _("Mirror Shot"),
[MOVE_FLASH_CANNON] = _("Flash Cannon"),
[MOVE_ROCK_CLIMB] = _("Rock Climb"),
[MOVE_DEFOG] = _("Defog"),
[MOVE_TRICK_ROOM] = _("Trick Room"),
[MOVE_DRACO_METEOR] = _("Draco Meteor"),
[MOVE_DISCHARGE] = _("Discharge"),
[MOVE_LAVA_PLUME] = _("Lava Plume"),
[MOVE_LEAF_STORM] = _("Leaf Storm"),
[MOVE_POWER_WHIP] = _("Power Whip"),
[MOVE_ROCK_WRECKER] = _("Rock Wrecker"),
[MOVE_CROSS_POISON] = _("Cross Poison"),
[MOVE_GUNK_SHOT] = _("Gunk Shot"),
[MOVE_IRON_HEAD] = _("Iron Head"),
[MOVE_MAGNET_BOMB] = _("Magnet Bomb"),
[MOVE_STONE_EDGE] = _("Stone Edge"),
[MOVE_CAPTIVATE] = _("Captivate"),
[MOVE_STEALTH_ROCK] = _("Stealth Rock"),
[MOVE_GRASS_KNOT] = _("Grass Knot"),
[MOVE_CHATTER] = _("Chatter"),
[MOVE_JUDGMENT] = _("Judgment"),
[MOVE_BUG_BITE] = _("Bug Bite"),
[MOVE_CHARGE_BEAM] = _("Charge Beam"),
[MOVE_WOOD_HAMMER] = _("Wood Hammer"),
[MOVE_AQUA_JET] = _("Aqua Jet"),
[MOVE_ATTACK_ORDER] = _("Attack Order"),
[MOVE_DEFEND_ORDER] = _("Defend Order"),
[MOVE_HEAL_ORDER] = _("Heal Order"),
[MOVE_HEAD_SMASH] = _("Head Smash"),
[MOVE_DOUBLE_HIT] = _("Double Hit"),
[MOVE_ROAR_OF_TIME] = _("Roar Of Time"),
[MOVE_SPACIAL_REND] = _("Spacial Rend"),
[MOVE_LUNAR_DANCE] = _("Lunar Dance"),
[MOVE_CRUSH_GRIP] = _("Crush Grip"),
[MOVE_MAGMA_STORM] = _("Magma Storm"),
[MOVE_DARK_VOID] = _("Dark Void"),
[MOVE_SEED_FLARE] = _("Seed Flare"),
[MOVE_OMINOUS_WIND] = _("Ominous Wind"),
[MOVE_SHADOW_FORCE] = _("Shadow Force"),
[MOVE_HONE_CLAWS] = _("Hone Claws"),
[MOVE_WIDE_GUARD] = _("Wide Guard"),
[MOVE_GUARD_SPLIT] = _("Guard Split"),
[MOVE_POWER_SPLIT] = _("Power Split"),
[MOVE_WONDER_ROOM] = _("Wonder Room"),
[MOVE_PSYSHOCK] = _("Psyshock"),
[MOVE_VENOSHOCK] = _("Venoshock"),
[MOVE_AUTOTOMIZE] = _("Autotomize"),
[MOVE_RAGE_POWDER] = _("Rage Powder"),
[MOVE_TELEKINESIS] = _("Telekinesis"),
[MOVE_MAGIC_ROOM] = _("Magic Room"),
[MOVE_SMACK_DOWN] = _("Smack Down"),
[MOVE_STORM_THROW] = _("Storm Throw"),
[MOVE_FLAME_BURST] = _("Flame Burst"),
[MOVE_SLUDGE_WAVE] = _("Sludge Wave"),
[MOVE_QUIVER_DANCE] = _("Quiver Dance"),
[MOVE_HEAVY_SLAM] = _("Heavy Slam"),
[MOVE_SYNCHRONOISE] = _("Synchronoise"),
[MOVE_ELECTRO_BALL] = _("Electro Ball"),
[MOVE_SOAK] = _("Soak"),
[MOVE_FLAME_CHARGE] = _("Flame Charge"),
[MOVE_COIL] = _("Coil"),
[MOVE_LOW_SWEEP] = _("Low Sweep"),
[MOVE_ACID_SPRAY] = _("Acid Spray"),
[MOVE_FOUL_PLAY] = _("Foul Play"),
[MOVE_SIMPLE_BEAM] = _("Simple Beam"),
[MOVE_ENTRAINMENT] = _("Entrainment"),
[MOVE_AFTER_YOU] = _("After You"),
[MOVE_ROUND] = _("Round"),
[MOVE_ECHOED_VOICE] = _("Echoed Voice"),
[MOVE_CHIP_AWAY] = _("Chip Away"),
[MOVE_CLEAR_SMOG] = _("Clear Smog"),
[MOVE_STORED_POWER] = _("Stored Power"),
[MOVE_QUICK_GUARD] = _("Quick Guard"),
[MOVE_ALLY_SWITCH] = _("Ally Switch"),
[MOVE_SCALD] = _("Scald"),
[MOVE_SHELL_SMASH] = _("Shell Smash"),
[MOVE_HEAL_PULSE] = _("Heal Pulse"),
[MOVE_HEX] = _("Hex"),
[MOVE_SKY_DROP] = _("Sky Drop"),
[MOVE_SHIFT_GEAR] = _("Shift Gear"),
[MOVE_CIRCLE_THROW] = _("Circle Throw"),
[MOVE_INCINERATE] = _("Incinerate"),
[MOVE_QUASH] = _("Quash"),
[MOVE_ACROBATICS] = _("Acrobatics"),
[MOVE_REFLECT_TYPE] = _("Reflect Type"),
[MOVE_RETALIATE] = _("Retaliate"),
[MOVE_FINAL_GAMBIT] = _("Final Gambit"),
[MOVE_BESTOW] = _("Bestow"),
[MOVE_INFERNO] = _("Inferno"),
[MOVE_WATER_PLEDGE] = _("Water Pledge"),
[MOVE_FIRE_PLEDGE] = _("Fire Pledge"),
[MOVE_GRASS_PLEDGE] = _("Grass Pledge"),
[MOVE_VOLT_SWITCH] = _("Volt Switch"),
[MOVE_STRUGGLE_BUG] = _("Struggle Bug"),
[MOVE_BULLDOZE] = _("Bulldoze"),
[MOVE_FROST_BREATH] = _("Frost Breath"),
[MOVE_DRAGON_TAIL] = _("Dragon Tail"),
[MOVE_WORK_UP] = _("Work Up"),
[MOVE_ELECTROWEB] = _("Electroweb"),
[MOVE_WILD_CHARGE] = _("Wild Charge"),
[MOVE_DRILL_RUN] = _("Drill Run"),
[MOVE_DUAL_CHOP] = _("Dual Chop"),
[MOVE_HEART_STAMP] = _("Heart Stamp"),
[MOVE_HORN_LEECH] = _("Horn Leech"),
[MOVE_SACRED_SWORD] = _("Sacred Sword"),
[MOVE_RAZOR_SHELL] = _("Razor Shell"),
[MOVE_HEAT_CRASH] = _("Heat Crash"),
[MOVE_LEAF_TORNADO] = _("Leaf Tornado"),
[MOVE_STEAMROLLER] = _("Steamroller"),
[MOVE_COTTON_GUARD] = _("Cotton Guard"),
[MOVE_NIGHT_DAZE] = _("Night Daze"),
[MOVE_PSYSTRIKE] = _("Psystrike"),
[MOVE_TAIL_SLAP] = _("Tail Slap"),
[MOVE_HURRICANE] = _("Hurricane"),
[MOVE_HEAD_CHARGE] = _("Head Charge"),
[MOVE_GEAR_GRIND] = _("Gear Grind"),
[MOVE_SEARING_SHOT] = _("Searing Shot"),
[MOVE_TECHNO_BLAST] = _("Techno Blast"),
[MOVE_RELIC_SONG] = _("Relic Song"),
[MOVE_SECRET_SWORD] = _("Secret Sword"),
[MOVE_GLACIATE] = _("Glaciate"),
[MOVE_BOLT_STRIKE] = _("Bolt Strike"),
[MOVE_BLUE_FLARE] = _("Blue Flare"),
[MOVE_FIERY_DANCE] = _("Fiery Dance"),
[MOVE_FREEZE_SHOCK] = _("Freeze Shock"),
[MOVE_ICE_BURN] = _("Ice Burn"),
[MOVE_SNARL] = _("Snarl"),
[MOVE_ICICLE_CRASH] = _("Icicle Crash"),
[MOVE_V_CREATE] = _("V Create"),
[MOVE_FUSION_FLARE] = _("Fusion Flare"),
[MOVE_FUSION_BOLT] = _("Fusion Bolt"),
[MOVE_FLYING_PRESS] = _("Flying Press"),
[MOVE_MAT_BLOCK] = _("Mat Block"),
[MOVE_BELCH] = _("Belch"),
[MOVE_ROTOTILLER] = _("Rototiller"),
[MOVE_STICKY_WEB] = _("Sticky Web"),
[MOVE_FELL_STINGER] = _("Fell Stinger"),
[MOVE_PHANTOM_FORCE] = _("Phantom Forc"),
[MOVE_TRICK_OR_TREAT] = _("Halloween"),
[MOVE_NOBLE_ROAR] = _("Noble Roar"),
[MOVE_ION_DELUGE] = _("Ion Deluge"),
[MOVE_PARABOLIC_CHARGE] = _("Parabolic Ch"),
[MOVE_FOREST_S_CURSE] = _("Forests Curs"),
[MOVE_PETAL_BLIZZARD] = _("Petal Storm"),
[MOVE_FREEZE_DRY] = _("Freeze Dry"),
[MOVE_DISARMING_VOICE] = _("Disarming Vo"),
[MOVE_PARTING_SHOT] = _("Parting Shot"),
[MOVE_TOPSY_TURVY] = _("Topsy Turvy"),
[MOVE_DRAINING_KISS] = _("Draining Kis"),
[MOVE_CRAFTY_SHIELD] = _("CraftyShield"),
[MOVE_FLOWER_SHIELD] = _("FlowerShield"),
[MOVE_GRASSY_TERRAIN] = _("GrassTerrain"),
[MOVE_MISTY_TERRAIN] = _("Mist Terrain"),
[MOVE_ELECTRIFY] = _("Electrify"),
[MOVE_PLAY_ROUGH] = _("Play Rough"),
[MOVE_FAIRY_WIND] = _("Fairy Wind"),
[MOVE_MOONBLAST] = _("Moonblast"),
[MOVE_BOOMBURST] = _("Boomburst"),
[MOVE_FAIRY_LOCK] = _("Fairy Lock"),
[MOVE_KING_S_SHIELD] = _("Kings Shield"),
[MOVE_PLAY_NICE] = _("Play Nice"),
[MOVE_CONFIDE] = _("Confide"),
[MOVE_DIAMOND_STORM] = _("DiamondStorm"),
[MOVE_STEAM_ERUPTION] = _("Steam Erupt"),
[MOVE_HYPERSPACE_HOLE] = _("Hyperspace H"),
[MOVE_WATER_SHURIKEN] = _("Water Shuri"),
[MOVE_MYSTICAL_FIRE] = _("Mystical Fir"),
[MOVE_SPIKY_SHIELD] = _("Spiky Shield"),
[MOVE_AROMATIC_MIST] = _("Aromatic Mis"),
[MOVE_EERIE_IMPULSE] = _("EerieImpulse"),
[MOVE_VENOM_DRENCH] = _("Venom Drench"),
[MOVE_POWDER] = _("Powder"),
[MOVE_GEOMANCY] = _("Geomancy"),
[MOVE_MAGNETIC_FLUX] = _("Magnetic Flu"),
[MOVE_HAPPY_HOUR] = _("Happy Hour"),
[MOVE_ELECTRIC_TERRAIN] = _("Electric Ter"),
[MOVE_DAZZLING_GLEAM] = _("Dazzling Gle"),
[MOVE_CELEBRATE] = _("Celebrate"),
[MOVE_HOLD_HANDS] = _("Hold Hands"),
[MOVE_BABY_DOLL_EYES] = _("BabyDollEyes"),
[MOVE_NUZZLE] = _("Nuzzle"),
[MOVE_HOLD_BACK] = _("Hold Back"),
[MOVE_INFESTATION] = _("Infestation"),
[MOVE_POWER_UP_PUNCH] = _("PowerUpPunch"),
[MOVE_OBLIVION_WING] = _("Oblivion Win"),
[MOVE_THOUSAND_ARROWS] = _("Thousand Ar"),
[MOVE_THOUSAND_WAVES] = _("Thousand Wav"),
[MOVE_LAND_S_WRATH] = _("Lands Wrath"),
[MOVE_LIGHT_OF_RUIN] = _("Light Of Ru"),
[MOVE_ORIGIN_PULSE] = _("Origin Pulse"),
[MOVE_PRECIPICE_BLADES] = _("Precipice Bl"),
[MOVE_DRAGON_ASCENT] = _("DragonAscent"),
[MOVE_HYPERSPACE_FURY] = _("Hyperspace F"),
};
src/data/text/species_names.h
+414
View File
@@ -0,0 +1,414 @@
const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_NONE] = _("??????????"),
[SPECIES_BULBASAUR] = _("BULBASAUR"),
[SPECIES_IVYSAUR] = _("IVYSAUR"),
[SPECIES_VENUSAUR] = _("VENUSAUR"),
[SPECIES_CHARMANDER] = _("CHARMANDER"),
[SPECIES_CHARMELEON] = _("CHARMELEON"),
[SPECIES_CHARIZARD] = _("CHARIZARD"),
[SPECIES_SQUIRTLE] = _("SQUIRTLE"),
[SPECIES_WARTORTLE] = _("WARTORTLE"),
[SPECIES_BLASTOISE] = _("BLASTOISE"),
[SPECIES_CATERPIE] = _("CATERPIE"),
[SPECIES_METAPOD] = _("METAPOD"),
[SPECIES_BUTTERFREE] = _("BUTTERFREE"),
[SPECIES_WEEDLE] = _("WEEDLE"),
[SPECIES_KAKUNA] = _("KAKUNA"),
[SPECIES_BEEDRILL] = _("BEEDRILL"),
[SPECIES_PIDGEY] = _("PIDGEY"),
[SPECIES_PIDGEOTTO] = _("PIDGEOTTO"),
[SPECIES_PIDGEOT] = _("PIDGEOT"),
[SPECIES_RATTATA] = _("RATTATA"),
[SPECIES_RATICATE] = _("RATICATE"),
[SPECIES_SPEAROW] = _("SPEAROW"),
[SPECIES_FEAROW] = _("FEAROW"),
[SPECIES_EKANS] = _("EKANS"),
[SPECIES_ARBOK] = _("ARBOK"),
[SPECIES_PIKACHU] = _("PIKACHU"),
[SPECIES_RAICHU] = _("RAICHU"),
[SPECIES_SANDSHREW] = _("SANDSHREW"),
[SPECIES_SANDSLASH] = _("SANDSLASH"),
[SPECIES_NIDORAN_F] = _("NIDORAN♀"),
[SPECIES_NIDORINA] = _("NIDORINA"),
[SPECIES_NIDOQUEEN] = _("NIDOQUEEN"),
[SPECIES_NIDORAN_M] = _("NIDORAN♂"),
[SPECIES_NIDORINO] = _("NIDORINO"),
[SPECIES_NIDOKING] = _("NIDOKING"),
[SPECIES_CLEFAIRY] = _("CLEFAIRY"),
[SPECIES_CLEFABLE] = _("CLEFABLE"),
[SPECIES_VULPIX] = _("VULPIX"),
[SPECIES_NINETALES] = _("NINETALES"),
[SPECIES_JIGGLYPUFF] = _("JIGGLYPUFF"),
[SPECIES_WIGGLYTUFF] = _("WIGGLYTUFF"),
[SPECIES_ZUBAT] = _("ZUBAT"),
[SPECIES_GOLBAT] = _("GOLBAT"),
[SPECIES_ODDISH] = _("ODDISH"),
[SPECIES_GLOOM] = _("GLOOM"),
[SPECIES_VILEPLUME] = _("VILEPLUME"),
[SPECIES_PARAS] = _("PARAS"),
[SPECIES_PARASECT] = _("PARASECT"),
[SPECIES_VENONAT] = _("VENONAT"),
[SPECIES_VENOMOTH] = _("VENOMOTH"),
[SPECIES_DIGLETT] = _("DIGLETT"),
[SPECIES_DUGTRIO] = _("DUGTRIO"),
[SPECIES_MEOWTH] = _("MEOWTH"),
[SPECIES_PERSIAN] = _("PERSIAN"),
[SPECIES_PSYDUCK] = _("PSYDUCK"),
[SPECIES_GOLDUCK] = _("GOLDUCK"),
[SPECIES_MANKEY] = _("MANKEY"),
[SPECIES_PRIMEAPE] = _("PRIMEAPE"),
[SPECIES_GROWLITHE] = _("GROWLITHE"),
[SPECIES_ARCANINE] = _("ARCANINE"),
[SPECIES_POLIWAG] = _("POLIWAG"),
[SPECIES_POLIWHIRL] = _("POLIWHIRL"),
[SPECIES_POLIWRATH] = _("POLIWRATH"),
[SPECIES_ABRA] = _("ABRA"),
[SPECIES_KADABRA] = _("KADABRA"),
[SPECIES_ALAKAZAM] = _("ALAKAZAM"),
[SPECIES_MACHOP] = _("MACHOP"),
[SPECIES_MACHOKE] = _("MACHOKE"),
[SPECIES_MACHAMP] = _("MACHAMP"),
[SPECIES_BELLSPROUT] = _("BELLSPROUT"),
[SPECIES_WEEPINBELL] = _("WEEPINBELL"),
[SPECIES_VICTREEBEL] = _("VICTREEBEL"),
[SPECIES_TENTACOOL] = _("TENTACOOL"),
[SPECIES_TENTACRUEL] = _("TENTACRUEL"),
[SPECIES_GEODUDE] = _("GEODUDE"),
[SPECIES_GRAVELER] = _("GRAVELER"),
[SPECIES_GOLEM] = _("GOLEM"),
[SPECIES_PONYTA] = _("PONYTA"),
[SPECIES_RAPIDASH] = _("RAPIDASH"),
[SPECIES_SLOWPOKE] = _("SLOWPOKE"),
[SPECIES_SLOWBRO] = _("SLOWBRO"),
[SPECIES_MAGNEMITE] = _("MAGNEMITE"),
[SPECIES_MAGNETON] = _("MAGNETON"),
[SPECIES_FARFETCHD] = _("FARFETCH’D"),
[SPECIES_DODUO] = _("DODUO"),
[SPECIES_DODRIO] = _("DODRIO"),
[SPECIES_SEEL] = _("SEEL"),
[SPECIES_DEWGONG] = _("DEWGONG"),
[SPECIES_GRIMER] = _("GRIMER"),
[SPECIES_MUK] = _("MUK"),
[SPECIES_SHELLDER] = _("SHELLDER"),
[SPECIES_CLOYSTER] = _("CLOYSTER"),
[SPECIES_GASTLY] = _("GASTLY"),
[SPECIES_HAUNTER] = _("HAUNTER"),
[SPECIES_GENGAR] = _("GENGAR"),
[SPECIES_ONIX] = _("ONIX"),
[SPECIES_DROWZEE] = _("DROWZEE"),
[SPECIES_HYPNO] = _("HYPNO"),
[SPECIES_KRABBY] = _("KRABBY"),
[SPECIES_KINGLER] = _("KINGLER"),
[SPECIES_VOLTORB] = _("VOLTORB"),
[SPECIES_ELECTRODE] = _("ELECTRODE"),
[SPECIES_EXEGGCUTE] = _("EXEGGCUTE"),
[SPECIES_EXEGGUTOR] = _("EXEGGUTOR"),
[SPECIES_CUBONE] = _("CUBONE"),
[SPECIES_MAROWAK] = _("MAROWAK"),
[SPECIES_HITMONLEE] = _("HITMONLEE"),
[SPECIES_HITMONCHAN] = _("HITMONCHAN"),
[SPECIES_LICKITUNG] = _("LICKITUNG"),
[SPECIES_KOFFING] = _("KOFFING"),
[SPECIES_WEEZING] = _("WEEZING"),
[SPECIES_RHYHORN] = _("RHYHORN"),
[SPECIES_RHYDON] = _("RHYDON"),
[SPECIES_CHANSEY] = _("CHANSEY"),
[SPECIES_TANGELA] = _("TANGELA"),
[SPECIES_KANGASKHAN] = _("KANGASKHAN"),
[SPECIES_HORSEA] = _("HORSEA"),
[SPECIES_SEADRA] = _("SEADRA"),
[SPECIES_GOLDEEN] = _("GOLDEEN"),
[SPECIES_SEAKING] = _("SEAKING"),
[SPECIES_STARYU] = _("STARYU"),
[SPECIES_STARMIE] = _("STARMIE"),
[SPECIES_MR_MIME] = _("MR. MIME"),
[SPECIES_SCYTHER] = _("SCYTHER"),
[SPECIES_JYNX] = _("JYNX"),
[SPECIES_ELECTABUZZ] = _("ELECTABUZZ"),
[SPECIES_MAGMAR] = _("MAGMAR"),
[SPECIES_PINSIR] = _("PINSIR"),
[SPECIES_TAUROS] = _("TAUROS"),
[SPECIES_MAGIKARP] = _("MAGIKARP"),
[SPECIES_GYARADOS] = _("GYARADOS"),
[SPECIES_LAPRAS] = _("LAPRAS"),
[SPECIES_DITTO] = _("DITTO"),
[SPECIES_EEVEE] = _("EEVEE"),
[SPECIES_VAPOREON] = _("VAPOREON"),
[SPECIES_JOLTEON] = _("JOLTEON"),
[SPECIES_FLAREON] = _("FLAREON"),
[SPECIES_PORYGON] = _("PORYGON"),
[SPECIES_OMANYTE] = _("OMANYTE"),
[SPECIES_OMASTAR] = _("OMASTAR"),
[SPECIES_KABUTO] = _("KABUTO"),
[SPECIES_KABUTOPS] = _("KABUTOPS"),
[SPECIES_AERODACTYL] = _("AERODACTYL"),
[SPECIES_SNORLAX] = _("SNORLAX"),
[SPECIES_ARTICUNO] = _("ARTICUNO"),
[SPECIES_ZAPDOS] = _("ZAPDOS"),
[SPECIES_MOLTRES] = _("MOLTRES"),
[SPECIES_DRATINI] = _("DRATINI"),
[SPECIES_DRAGONAIR] = _("DRAGONAIR"),
[SPECIES_DRAGONITE] = _("DRAGONITE"),
[SPECIES_MEWTWO] = _("MEWTWO"),
[SPECIES_MEW] = _("MEW"),
[SPECIES_CHIKORITA] = _("CHIKORITA"),
[SPECIES_BAYLEEF] = _("BAYLEEF"),
[SPECIES_MEGANIUM] = _("MEGANIUM"),
[SPECIES_CYNDAQUIL] = _("CYNDAQUIL"),
[SPECIES_QUILAVA] = _("QUILAVA"),
[SPECIES_TYPHLOSION] = _("TYPHLOSION"),
[SPECIES_TOTODILE] = _("TOTODILE"),
[SPECIES_CROCONAW] = _("CROCONAW"),
[SPECIES_FERALIGATR] = _("FERALIGATR"),
[SPECIES_SENTRET] = _("SENTRET"),
[SPECIES_FURRET] = _("FURRET"),
[SPECIES_HOOTHOOT] = _("HOOTHOOT"),
[SPECIES_NOCTOWL] = _("NOCTOWL"),
[SPECIES_LEDYBA] = _("LEDYBA"),
[SPECIES_LEDIAN] = _("LEDIAN"),
[SPECIES_SPINARAK] = _("SPINARAK"),
[SPECIES_ARIADOS] = _("ARIADOS"),
[SPECIES_CROBAT] = _("CROBAT"),
[SPECIES_CHINCHOU] = _("CHINCHOU"),
[SPECIES_LANTURN] = _("LANTURN"),
[SPECIES_PICHU] = _("PICHU"),
[SPECIES_CLEFFA] = _("CLEFFA"),
[SPECIES_IGGLYBUFF] = _("IGGLYBUFF"),
[SPECIES_TOGEPI] = _("TOGEPI"),
[SPECIES_TOGETIC] = _("TOGETIC"),
[SPECIES_NATU] = _("NATU"),
[SPECIES_XATU] = _("XATU"),
[SPECIES_MAREEP] = _("MAREEP"),
[SPECIES_FLAAFFY] = _("FLAAFFY"),
[SPECIES_AMPHAROS] = _("AMPHAROS"),
[SPECIES_BELLOSSOM] = _("BELLOSSOM"),
[SPECIES_MARILL] = _("MARILL"),
[SPECIES_AZUMARILL] = _("AZUMARILL"),
[SPECIES_SUDOWOODO] = _("SUDOWOODO"),
[SPECIES_POLITOED] = _("POLITOED"),
[SPECIES_HOPPIP] = _("HOPPIP"),
[SPECIES_SKIPLOOM] = _("SKIPLOOM"),
[SPECIES_JUMPLUFF] = _("JUMPLUFF"),
[SPECIES_AIPOM] = _("AIPOM"),
[SPECIES_SUNKERN] = _("SUNKERN"),
[SPECIES_SUNFLORA] = _("SUNFLORA"),
[SPECIES_YANMA] = _("YANMA"),
[SPECIES_WOOPER] = _("WOOPER"),
[SPECIES_QUAGSIRE] = _("QUAGSIRE"),
[SPECIES_ESPEON] = _("ESPEON"),
[SPECIES_UMBREON] = _("UMBREON"),
[SPECIES_MURKROW] = _("MURKROW"),
[SPECIES_SLOWKING] = _("SLOWKING"),
[SPECIES_MISDREAVUS] = _("MISDREAVUS"),
[SPECIES_UNOWN] = _("UNOWN"),
[SPECIES_WOBBUFFET] = _("WOBBUFFET"),
[SPECIES_GIRAFARIG] = _("GIRAFARIG"),
[SPECIES_PINECO] = _("PINECO"),
[SPECIES_FORRETRESS] = _("FORRETRESS"),
[SPECIES_DUNSPARCE] = _("DUNSPARCE"),
[SPECIES_GLIGAR] = _("GLIGAR"),
[SPECIES_STEELIX] = _("STEELIX"),
[SPECIES_SNUBBULL] = _("SNUBBULL"),
[SPECIES_GRANBULL] = _("GRANBULL"),
[SPECIES_QWILFISH] = _("QWILFISH"),
[SPECIES_SCIZOR] = _("SCIZOR"),
[SPECIES_SHUCKLE] = _("SHUCKLE"),
[SPECIES_HERACROSS] = _("HERACROSS"),
[SPECIES_SNEASEL] = _("SNEASEL"),
[SPECIES_TEDDIURSA] = _("TEDDIURSA"),
[SPECIES_URSARING] = _("URSARING"),
[SPECIES_SLUGMA] = _("SLUGMA"),
[SPECIES_MAGCARGO] = _("MAGCARGO"),
[SPECIES_SWINUB] = _("SWINUB"),
[SPECIES_PILOSWINE] = _("PILOSWINE"),
[SPECIES_CORSOLA] = _("CORSOLA"),
[SPECIES_REMORAID] = _("REMORAID"),
[SPECIES_OCTILLERY] = _("OCTILLERY"),
[SPECIES_DELIBIRD] = _("DELIBIRD"),
[SPECIES_MANTINE] = _("MANTINE"),
[SPECIES_SKARMORY] = _("SKARMORY"),
[SPECIES_HOUNDOUR] = _("HOUNDOUR"),
[SPECIES_HOUNDOOM] = _("HOUNDOOM"),
[SPECIES_KINGDRA] = _("KINGDRA"),
[SPECIES_PHANPY] = _("PHANPY"),
[SPECIES_DONPHAN] = _("DONPHAN"),
[SPECIES_PORYGON2] = _("PORYGON2"),
[SPECIES_STANTLER] = _("STANTLER"),
[SPECIES_SMEARGLE] = _("SMEARGLE"),
[SPECIES_TYROGUE] = _("TYROGUE"),
[SPECIES_HITMONTOP] = _("HITMONTOP"),
[SPECIES_SMOOCHUM] = _("SMOOCHUM"),
[SPECIES_ELEKID] = _("ELEKID"),
[SPECIES_MAGBY] = _("MAGBY"),
[SPECIES_MILTANK] = _("MILTANK"),
[SPECIES_BLISSEY] = _("BLISSEY"),
[SPECIES_RAIKOU] = _("RAIKOU"),
[SPECIES_ENTEI] = _("ENTEI"),
[SPECIES_SUICUNE] = _("SUICUNE"),
[SPECIES_LARVITAR] = _("LARVITAR"),
[SPECIES_PUPITAR] = _("PUPITAR"),
[SPECIES_TYRANITAR] = _("TYRANITAR"),
[SPECIES_LUGIA] = _("LUGIA"),
[SPECIES_HO_OH] = _("HO-OH"),
[SPECIES_CELEBI] = _("CELEBI"),
[SPECIES_OLD_UNOWN_B] = _("?"),
[SPECIES_OLD_UNOWN_C] = _("?"),
[SPECIES_OLD_UNOWN_D] = _("?"),
[SPECIES_OLD_UNOWN_E] = _("?"),
[SPECIES_OLD_UNOWN_F] = _("?"),
[SPECIES_OLD_UNOWN_G] = _("?"),
[SPECIES_OLD_UNOWN_H] = _("?"),
[SPECIES_OLD_UNOWN_I] = _("?"),
[SPECIES_OLD_UNOWN_J] = _("?"),
[SPECIES_OLD_UNOWN_K] = _("?"),
[SPECIES_OLD_UNOWN_L] = _("?"),
[SPECIES_OLD_UNOWN_M] = _("?"),
[SPECIES_OLD_UNOWN_N] = _("?"),
[SPECIES_OLD_UNOWN_O] = _("?"),
[SPECIES_OLD_UNOWN_P] = _("?"),
[SPECIES_OLD_UNOWN_Q] = _("?"),
[SPECIES_OLD_UNOWN_R] = _("?"),
[SPECIES_OLD_UNOWN_S] = _("?"),
[SPECIES_OLD_UNOWN_T] = _("?"),
[SPECIES_OLD_UNOWN_U] = _("?"),
[SPECIES_OLD_UNOWN_V] = _("?"),
[SPECIES_OLD_UNOWN_W] = _("?"),
[SPECIES_OLD_UNOWN_X] = _("?"),
[SPECIES_OLD_UNOWN_Y] = _("?"),
[SPECIES_OLD_UNOWN_Z] = _("?"),
[SPECIES_TREECKO] = _("TREECKO"),
[SPECIES_GROVYLE] = _("GROVYLE"),
[SPECIES_SCEPTILE] = _("SCEPTILE"),
[SPECIES_TORCHIC] = _("TORCHIC"),
[SPECIES_COMBUSKEN] = _("COMBUSKEN"),
[SPECIES_BLAZIKEN] = _("BLAZIKEN"),
[SPECIES_MUDKIP] = _("MUDKIP"),
[SPECIES_MARSHTOMP] = _("MARSHTOMP"),
[SPECIES_SWAMPERT] = _("SWAMPERT"),
[SPECIES_POOCHYENA] = _("POOCHYENA"),
[SPECIES_MIGHTYENA] = _("MIGHTYENA"),
[SPECIES_ZIGZAGOON] = _("ZIGZAGOON"),
[SPECIES_LINOONE] = _("LINOONE"),
[SPECIES_WURMPLE] = _("WURMPLE"),
[SPECIES_SILCOON] = _("SILCOON"),
[SPECIES_BEAUTIFLY] = _("BEAUTIFLY"),
[SPECIES_CASCOON] = _("CASCOON"),
[SPECIES_DUSTOX] = _("DUSTOX"),
[SPECIES_LOTAD] = _("LOTAD"),
[SPECIES_LOMBRE] = _("LOMBRE"),
[SPECIES_LUDICOLO] = _("LUDICOLO"),
[SPECIES_SEEDOT] = _("SEEDOT"),
[SPECIES_NUZLEAF] = _("NUZLEAF"),
[SPECIES_SHIFTRY] = _("SHIFTRY"),
[SPECIES_NINCADA] = _("NINCADA"),
[SPECIES_NINJASK] = _("NINJASK"),
[SPECIES_SHEDINJA] = _("SHEDINJA"),
[SPECIES_TAILLOW] = _("TAILLOW"),
[SPECIES_SWELLOW] = _("SWELLOW"),
[SPECIES_SHROOMISH] = _("SHROOMISH"),
[SPECIES_BRELOOM] = _("BRELOOM"),
[SPECIES_SPINDA] = _("SPINDA"),
[SPECIES_WINGULL] = _("WINGULL"),
[SPECIES_PELIPPER] = _("PELIPPER"),
[SPECIES_SURSKIT] = _("SURSKIT"),
[SPECIES_MASQUERAIN] = _("MASQUERAIN"),
[SPECIES_WAILMER] = _("WAILMER"),
[SPECIES_WAILORD] = _("WAILORD"),
[SPECIES_SKITTY] = _("SKITTY"),
[SPECIES_DELCATTY] = _("DELCATTY"),
[SPECIES_KECLEON] = _("KECLEON"),
[SPECIES_BALTOY] = _("BALTOY"),
[SPECIES_CLAYDOL] = _("CLAYDOL"),
[SPECIES_NOSEPASS] = _("NOSEPASS"),
[SPECIES_TORKOAL] = _("TORKOAL"),
[SPECIES_SABLEYE] = _("SABLEYE"),
[SPECIES_BARBOACH] = _("BARBOACH"),
[SPECIES_WHISCASH] = _("WHISCASH"),
[SPECIES_LUVDISC] = _("LUVDISC"),
[SPECIES_CORPHISH] = _("CORPHISH"),
[SPECIES_CRAWDAUNT] = _("CRAWDAUNT"),
[SPECIES_FEEBAS] = _("FEEBAS"),
[SPECIES_MILOTIC] = _("MILOTIC"),
[SPECIES_CARVANHA] = _("CARVANHA"),
[SPECIES_SHARPEDO] = _("SHARPEDO"),
[SPECIES_TRAPINCH] = _("TRAPINCH"),
[SPECIES_VIBRAVA] = _("VIBRAVA"),
[SPECIES_FLYGON] = _("FLYGON"),
[SPECIES_MAKUHITA] = _("MAKUHITA"),
[SPECIES_HARIYAMA] = _("HARIYAMA"),
[SPECIES_ELECTRIKE] = _("ELECTRIKE"),
[SPECIES_MANECTRIC] = _("MANECTRIC"),
[SPECIES_NUMEL] = _("NUMEL"),
[SPECIES_CAMERUPT] = _("CAMERUPT"),
[SPECIES_SPHEAL] = _("SPHEAL"),
[SPECIES_SEALEO] = _("SEALEO"),
[SPECIES_WALREIN] = _("WALREIN"),
[SPECIES_CACNEA] = _("CACNEA"),
[SPECIES_CACTURNE] = _("CACTURNE"),
[SPECIES_SNORUNT] = _("SNORUNT"),
[SPECIES_GLALIE] = _("GLALIE"),
[SPECIES_LUNATONE] = _("LUNATONE"),
[SPECIES_SOLROCK] = _("SOLROCK"),
[SPECIES_AZURILL] = _("AZURILL"),
[SPECIES_SPOINK] = _("SPOINK"),
[SPECIES_GRUMPIG] = _("GRUMPIG"),
[SPECIES_PLUSLE] = _("PLUSLE"),
[SPECIES_MINUN] = _("MINUN"),
[SPECIES_MAWILE] = _("MAWILE"),
[SPECIES_MEDITITE] = _("MEDITITE"),
[SPECIES_MEDICHAM] = _("MEDICHAM"),
[SPECIES_SWABLU] = _("SWABLU"),
[SPECIES_ALTARIA] = _("ALTARIA"),
[SPECIES_WYNAUT] = _("WYNAUT"),
[SPECIES_DUSKULL] = _("DUSKULL"),
[SPECIES_DUSCLOPS] = _("DUSCLOPS"),
[SPECIES_ROSELIA] = _("ROSELIA"),
[SPECIES_SLAKOTH] = _("SLAKOTH"),
[SPECIES_VIGOROTH] = _("VIGOROTH"),
[SPECIES_SLAKING] = _("SLAKING"),
[SPECIES_GULPIN] = _("GULPIN"),
[SPECIES_SWALOT] = _("SWALOT"),
[SPECIES_TROPIUS] = _("TROPIUS"),
[SPECIES_WHISMUR] = _("WHISMUR"),
[SPECIES_LOUDRED] = _("LOUDRED"),
[SPECIES_EXPLOUD] = _("EXPLOUD"),
[SPECIES_CLAMPERL] = _("CLAMPERL"),
[SPECIES_HUNTAIL] = _("HUNTAIL"),
[SPECIES_GOREBYSS] = _("GOREBYSS"),
[SPECIES_ABSOL] = _("ABSOL"),
[SPECIES_SHUPPET] = _("SHUPPET"),
[SPECIES_BANETTE] = _("BANETTE"),
[SPECIES_SEVIPER] = _("SEVIPER"),
[SPECIES_ZANGOOSE] = _("ZANGOOSE"),
[SPECIES_RELICANTH] = _("RELICANTH"),
[SPECIES_ARON] = _("ARON"),
[SPECIES_LAIRON] = _("LAIRON"),
[SPECIES_AGGRON] = _("AGGRON"),
[SPECIES_CASTFORM] = _("CASTFORM"),
[SPECIES_VOLBEAT] = _("VOLBEAT"),
[SPECIES_ILLUMISE] = _("ILLUMISE"),
[SPECIES_LILEEP] = _("LILEEP"),
[SPECIES_CRADILY] = _("CRADILY"),
[SPECIES_ANORITH] = _("ANORITH"),
[SPECIES_ARMALDO] = _("ARMALDO"),
[SPECIES_RALTS] = _("RALTS"),
[SPECIES_KIRLIA] = _("KIRLIA"),
[SPECIES_GARDEVOIR] = _("GARDEVOIR"),
[SPECIES_BAGON] = _("BAGON"),
[SPECIES_SHELGON] = _("SHELGON"),
[SPECIES_SALAMENCE] = _("SALAMENCE"),
[SPECIES_BELDUM] = _("BELDUM"),
[SPECIES_METANG] = _("METANG"),
[SPECIES_METAGROSS] = _("METAGROSS"),
[SPECIES_REGIROCK] = _("REGIROCK"),
[SPECIES_REGICE] = _("REGICE"),
[SPECIES_REGISTEEL] = _("REGISTEEL"),
[SPECIES_KYOGRE] = _("KYOGRE"),
[SPECIES_GROUDON] = _("GROUDON"),
[SPECIES_RAYQUAZA] = _("RAYQUAZA"),
[SPECIES_LATIAS] = _("LATIAS"),
[SPECIES_LATIOS] = _("LATIOS"),
[SPECIES_JIRACHI] = _("JIRACHI"),
[SPECIES_DEOXYS] = _("DEOXYS"),
[SPECIES_CHIMECHO] = _("CHIMECHO"),
};
src/data/text/trainer_class_names.h
+73
View File
@@ -0,0 +1,73 @@
#ifndef GUARD_TRAINER_CLASS_NAMES_H
#define GUARD_TRAINER_CLASS_NAMES_H
const u8 gTrainerClassNames[][13] = {
_("{PKMN} TRAINER"),
_("{PKMN} TRAINER"),
_("HIKER"),
_("TEAM AQUA"),
_("{PKMN} BREEDER"),
_("COOLTRAINER"),
_("BIRD KEEPER"),
_("COLLECTOR"),
_("SWIMMER♂"),
_("TEAM MAGMA"),
_("EXPERT"),
_("AQUA ADMIN"),
_("BLACK BELT"),
_("AQUA LEADER"),
_("HEX MANIAC"),
_("AROMA LADY"),
_("RUIN MANIAC"),
_("INTERVIEWER"),
_("TUBER"),
_("TUBER"),
_("LADY"),
_("BEAUTY"),
_("RICH BOY"),
_("POKéMANIAC"),
_("GUITARIST"),
_("KINDLER"),
_("CAMPER"),
_("PICNICKER"),
_("BUG MANIAC"),
_("PSYCHIC"),
_("GENTLEMAN"),
_("ELITE FOUR"),
_("LEADER"),
_("SCHOOL KID"),
_("SR. AND JR."),
_("WINSTRATE"),
_("POKéFAN"),
_("YOUNGSTER"),
_("CHAMPION"),
_("FISHERMAN"),
_("TRIATHLETE"),
_("DRAGON TAMER"),
_("NINJA BOY"),
_("BATTLE GIRL"),
_("PARASOL LADY"),
_("SWIMMER♀"),
_("TWINS"),
_("SAILOR"),
_("COOLTRAINER"),
_("MAGMA ADMIN"),
_("{PKMN} TRAINER"),
_("BUG CATCHER"),
_("{PKMN} RANGER"),
_("MAGMA LEADER"),
_("LASS"),
_("YOUNG COUPLE"),
_("OLD COUPLE"),
_("SIS AND BRO"),
_("SALON MAIDEN"),
_("DOME ACE"),
_("PALACE MAVEN"),
_("ARENA TYCOON"),
_("FACTORY HEAD"),
_("PIKE QUEEN"),
_("PYRAMID KING"),
_("{PKMN} TRAINER"),
};
#endif
src/data/trainer_parties.h
+12437
View File
File diff suppressed because it is too large. Load diff
src/data/trainers.h
+11971
View File
File diff suppressed because it is too large. Load diff
src/unk_text_util.c → src/dynamic_placeholder_text_util.c
+5 -5
View File
@@ -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];
}
src/item_menu.c
+1 -1
View File
@@ -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))
src/link.c
+1 -1
View File
@@ -304,7 +304,7 @@ void LinkTestScreen(void)
void sub_8009628(u8 a0)
{
gLocalLinkPlayer.lp_field_18 = a0;
gLocalLinkPlayer.id = a0;
}
static void InitLocalLinkPlayer(void)
src/link_rfu.c
+23 -23
View File
@@ -2126,7 +2126,7 @@ void sub_800DD94(struct UnkLinkRfuStruct_02022B14 *data, u8 r9, bool32 r2, int r
for (i = 0; i < 2; i++)
{
data->playerTrainerId[i] = gSaveBlock2Ptr->playerTrainerId[i];
data->unk_00.playerTrainerId[i] = gSaveBlock2Ptr->playerTrainerId[i];
}
for (i = 0; i < 4; i++)
{
@@ -2136,14 +2136,14 @@ void sub_800DD94(struct UnkLinkRfuStruct_02022B14 *data, u8 r9, bool32 r2, int r
data->playerGender = gSaveBlock2Ptr->playerGender;
data->unk_0a_0 = r9;
data->unk_0a_7 = r2;
data->unk_00_0 = 2;
data->unk_01_2 = 3;
data->unk_00_4 = 0;
data->unk_00_5 = 0;
data->unk_00_6 = 0;
data->unk_00_7 = FlagGet(FLAG_0x87F);
data->unk_01_0 = IsNationalPokedexEnabled();
data->unk_01_1 = FlagGet(FLAG_SYS_GAME_CLEAR);
data->unk_00.unk_00_0 = 2;
data->unk_00.unk_01_2 = 3;
data->unk_00.unk_00_4 = 0;
data->unk_00.unk_00_5 = 0;
data->unk_00.unk_00_6 = 0;
data->unk_00.unk_00_7 = FlagGet(FLAG_0x87F);
data->unk_00.unk_01_0 = IsNationalPokedexEnabled();
data->unk_00.unk_01_1 = FlagGet(FLAG_SYS_GAME_CLEAR);
}
bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx)
@@ -2155,12 +2155,12 @@ bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx)
retVal = TRUE;
if (sub_8010454(gUnknown_03007890->unk_14[idx].unk_04) && ((gUnknown_03007890->unk_07 >> idx) & 1))
{
memcpy(buff1, &gUnknown_03007890->unk_14[idx].unk_06, sizeof(gUnknown_03007890->unk_14[idx].unk_06));
memcpy(buff1, &gUnknown_03007890->unk_14[idx].unk_06, 0xD);
memcpy(buff2, gUnknown_03007890->unk_14[idx].unk_15, sizeof(gUnknown_03007890->unk_14[idx].unk_15));
}
else
{
memset(buff1, 0, sizeof(gUnknown_03007890->unk_14[idx].unk_06));
memset(buff1, 0, 0xD);
memset(buff2, 0, sizeof(gUnknown_03007890->unk_14[idx].unk_15));
}
}
@@ -2169,12 +2169,12 @@ bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx)
retVal = FALSE;
if (sub_8010454(gUnknown_03007890->unk_14[idx].unk_04))
{
memcpy(buff1, &gUnknown_03007890->unk_14[idx].unk_06, sizeof(gUnknown_03007890->unk_14[idx].unk_06));
memcpy(buff1, &gUnknown_03007890->unk_14[idx].unk_06, 0xD);
memcpy(buff2, gUnknown_03007890->unk_14[idx].unk_15, sizeof(gUnknown_03007890->unk_14[idx].unk_15));
}
else
{
memset(buff1, 0, sizeof(gUnknown_03007890->unk_14[idx].unk_06));
memset(buff1, 0, 0xD);
memset(buff2, 0, sizeof(gUnknown_03007890->unk_14[idx].unk_15));
}
}
@@ -2850,7 +2850,7 @@ void sub_800EF38(void)
gUnknown_03005000.unk_ce7 = gUnknown_03004140.unk_00;
}
bool8 sub_800EF58(bool32 a0)
bool32 sub_800EF58(bool32 a0)
{
if (gUnknown_03005000.unk_04 == 17 || a0)
{
@@ -4104,7 +4104,7 @@ bool8 sub_8010540(void)
return retval;
}
bool8 sub_80105EC(void)
bool32 sub_80105EC(void)
{
u8 flags = 0;
int i;
@@ -4129,7 +4129,7 @@ bool8 sub_80105EC(void)
return FALSE;
}
bool8 sub_801064C(u16 a0, const u8 *a1)
bool32 sub_801064C(u16 a0, const u8 *a1)
{
u8 r1 = sub_8011CE4(a1, a0);
if (r1 == 0xFF)
@@ -4154,14 +4154,14 @@ void sub_80106D4(void)
rfu_NI_setSendData(1 << gUnknown_03005000.unk_c3e, 8, &gUnknown_03005000.unk_c85, 1);
}
u8 sub_8010714(u16 a0, const u8 *a1)
u32 sub_8010714(u16 a0, const u8 *a1)
{
u8 r0 = sub_8011CE4(a1, a0);
if (r0 == 0xff)
return 2;
if (gUnknown_03007880[r0]->unk_0 == 0)
return TRUE;
return FALSE;
return 1;
return 0;
}
void sub_8010750(void)
@@ -4512,14 +4512,14 @@ void sub_8010F84(u8 a0, u32 a1, u32 a2)
void sub_8010FA0(bool32 a0, bool32 a1)
{
gUnknown_02022B14.unk_00_4 = a0;
gUnknown_02022B14.unk_00_5 = a1;
gUnknown_02022B14.unk_00.unk_00_4 = a0;
gUnknown_02022B14.unk_00.unk_00_5 = a1;
}
void sub_8010FCC(u32 a0, u32 a1, u32 a2)
{
gUnknown_02022B14.unk_09_2 = a0;
gUnknown_02022B14.unk_08_0 = a1;
gUnknown_02022B14.type = a0;
gUnknown_02022B14.species = a1;
gUnknown_02022B14.unk_0b_1 = a2;
}
src/list_menu.c
+6 -6
View File
@@ -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;
src/load_save.c
+1 -1
View File
@@ -38,7 +38,7 @@ EWRAM_DATA struct PokemonStorage gPokemonStorage = {0};
EWRAM_DATA u8 gSaveblock3_DMA[SAVEBLOCK_MOVE_RANGE] = {0};
EWRAM_DATA struct LoadedSaveData gLoadedSaveData = {0};
EWRAM_DATA u32 gLastEncryptionKey = {0};
EWRAM_DATA u32 gLastEncryptionKey = 0;
// IWRAM common
IWRAM_DATA bool32 gFlashMemoryPresent;
src/overworld.c
+2 -2
View File
@@ -1689,14 +1689,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;
src/pokedex.c
+1 -1
View File
@@ -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[] = _("----------");
src/pokemon.c
+10 -10
View File
@@ -1731,7 +1731,7 @@ bool8 sub_80688F8(u8 caseId, u8 battlerId)
return FALSE;
if (!gMain.inBattle)
return FALSE;
if (gLinkPlayers[GetMultiplayerId()].lp_field_18 == battlerId)
if (gLinkPlayers[GetMultiplayerId()].id == battlerId)
return FALSE;
break;
case 2:
@@ -1753,7 +1753,7 @@ bool8 sub_80688F8(u8 caseId, u8 battlerId)
return FALSE;
if (gBattleTypeFlags & BATTLE_TYPE_MULTI)
{
if (gLinkPlayers[GetMultiplayerId()].lp_field_18 == battlerId)
if (gLinkPlayers[GetMultiplayerId()].id == battlerId)
return FALSE;
}
else
@@ -4530,7 +4530,7 @@ void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies)
bool8 sub_806D7EC(void)
{
bool8 retVal = FALSE;
switch (gLinkPlayers[GetMultiplayerId()].lp_field_18)
switch (gLinkPlayers[GetMultiplayerId()].id)
{
case 0:
case 3:
@@ -4547,7 +4547,7 @@ bool8 sub_806D7EC(void)
u16 GetLinkTrainerFlankId(u8 linkPlayerId)
{
u16 flankId = 0;
switch (gLinkPlayers[linkPlayerId].lp_field_18)
switch (gLinkPlayers[linkPlayerId].id)
{
case 0:
case 3:
@@ -4565,7 +4565,7 @@ s32 GetBattlerMultiplayerId(u16 a1)
{
s32 id;
for (id = 0; id < MAX_LINK_PLAYERS; id++)
if (gLinkPlayers[id].lp_field_18 == a1)
if (gLinkPlayers[id].id == a1)
break;
return id;
}
@@ -5418,7 +5418,7 @@ const u8 *GetTrainerPartnerName(void)
else
{
u8 id = GetMultiplayerId();
return gLinkPlayers[GetBattlerMultiplayerId(gLinkPlayers[id].lp_field_18 ^ 2)].name;
return gLinkPlayers[GetBattlerMultiplayerId(gLinkPlayers[id].id ^ 2)].name;
}
}
@@ -5548,7 +5548,7 @@ u8 sub_806EF08(u8 arg0)
s32 i;
s32 var = 0;
u8 multiplayerId = GetMultiplayerId();
switch (gLinkPlayers[multiplayerId].lp_field_18)
switch (gLinkPlayers[multiplayerId].id)
{
case 0:
case 2:
@@ -5561,7 +5561,7 @@ u8 sub_806EF08(u8 arg0)
}
for (i = 0; i < 4; i++)
{
if (gLinkPlayers[i].lp_field_18 == (s16)(var))
if (gLinkPlayers[i].id == (s16)(var))
break;
}
return i;
@@ -5571,7 +5571,7 @@ u8 sub_806EF84(u8 arg0, u8 arg1)
{
s32 i;
s32 var = 0;
switch (gLinkPlayers[arg1].lp_field_18)
switch (gLinkPlayers[arg1].id)
{
case 0:
case 2:
@@ -5584,7 +5584,7 @@ u8 sub_806EF84(u8 arg0, u8 arg1)
}
for (i = 0; i < 4; i++)
{
if (gLinkPlayers[i].lp_field_18 == (s16)(var))
if (gLinkPlayers[i].id == (s16)(var))
break;
}
return i;
src/pokemon_summary_screen.c
+30 -30
View File
@@ -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\
src/recorded_battle.c
+3 -3
View File
@@ -159,7 +159,7 @@ void sub_8184E58(void)
{
sPlayers[i].trainerId = gLinkPlayers[i].trainerId;
sPlayers[i].gender = gLinkPlayers[i].gender;
sPlayers[i].battlerId = gLinkPlayers[i].lp_field_18;
sPlayers[i].battlerId = gLinkPlayers[i].id;
sPlayers[i].language = gLinkPlayers[i].language;
if (i < linkPlayersCount)
@@ -1340,7 +1340,7 @@ static void SetRecordedBattleVarsFromSave(struct RecordedBattleSave *src)
}
gLinkPlayers[i].gender = src->playersGender[i];
gLinkPlayers[i].language = src->playersLanguage[i];
gLinkPlayers[i].lp_field_18 = src->playersBattlers[i];
gLinkPlayers[i].id = src->playersBattlers[i];
gLinkPlayers[i].trainerId = src->playersTrainerId[i];
if (var)
@@ -1453,7 +1453,7 @@ u8 GetActiveBattlerLinkPlayerGender(void)
for (i = 0; i < MAX_LINK_PLAYERS; i++)
{
if (gLinkPlayers[i].lp_field_18 == gActiveBattler)
if (gLinkPlayers[i].id == gActiveBattler)
break;
}
src/rom_8011DC0.c
+3256 -10
View File
File diff suppressed because it is too large. Load diff
src/safari_zone.c
+2 -2
View File
@@ -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);
}
}
src/scrcmd.c
+1 -1
View File
@@ -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;
}
src/strings.c
+2051
View File
File diff suppressed because it is too large. Load diff
src/text.c
+2 -2
View File
@@ -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);
src/tv.c
+2 -2
View File
@@ -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)
src/walda_phrase.c
-1
View File
@@ -13,7 +13,6 @@ extern const u8 gText_Peekaboo[];
extern u8 *GetWaldaPhrasePtr(void);
extern bool32 IsWaldaPhraseEmpty(void);
extern void sub_80AF168(void);
extern void CB2_ReturnToField(void);
extern void SetWaldaPhrase(const u8 *src);
extern void SetWaldaWallpaperPatternId(u8 patternId);
extern void SetWaldaWallpaperIconId(u8 iconId);
sym_ewram.txt
+1 -1
View File
@@ -797,7 +797,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