diff options
130 files changed, 8589 insertions, 8476 deletions
@@ -64,7 +64,7 @@ LD_SCRIPT := $(BUILD_DIR)/ld_script.ld #### Main Rules #### -ALL_BUILDS := ruby ruby_rev1 ruby_rev1 sapphire sapphire_rev1 sapphire_rev2 ruby_de sapphire_de ruby_de_debug +ALL_BUILDS := ruby ruby_rev1 ruby_rev2 sapphire sapphire_rev1 sapphire_rev2 ruby_de sapphire_de ruby_de_debug # Available targets .PHONY: all clean tidy tools $(ALL_BUILDS) diff --git a/asm/contest_painting_effects.s b/asm/contest_painting_effects.s index bc72a6ef5..0c403c093 100644 --- a/asm/contest_painting_effects.s +++ b/asm/contest_painting_effects.s @@ -5,1366 +5,6 @@ .text - thumb_func_start sub_80FCB5C -sub_80FCB5C: @ 80FCB5C - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - movs r2, 0 - ldr r0, _080FCC00 @ =gUnknown_03005DF8 - ldrb r0, [r0] - cmp r2, r0 - bcs _080FCBF2 - ldr r0, _080FCC04 @ =gUnknown_03005DEC - mov r8, r0 - ldr r3, _080FCC08 @ =gUnknown_03005E04 -_080FCB74: - ldr r0, _080FCC0C @ =gUnknown_03005DFC - ldrb r1, [r0] - ldrb r0, [r3] - muls r0, r1 - lsls r0, 1 - mov r4, r8 - ldr r1, [r4] - adds r1, r0 - ldr r0, _080FCC10 @ =gUnknown_03005DE8 - ldrb r0, [r0] - adds r0, r2 - lsls r0, 1 - adds r4, r1, r0 - ldrh r1, [r4] - mov r0, sp - strh r1, [r0] - movs r5, 0x1 - ldrb r0, [r3] - lsls r0, 1 - adds r4, r0 - ldr r0, _080FCC14 @ =gUnknown_03005DF0 - ldrb r0, [r0] - subs r0, 0x1 - adds r7, r2, 0x1 - cmp r5, r0 - bge _080FCBE6 - ldr r6, _080FCC08 @ =gUnknown_03005E04 -_080FCBAA: - ldrh r0, [r4] - movs r2, 0x80 - lsls r2, 8 - adds r1, r2, 0 - ands r0, r1 - cmp r0, 0 - bne _080FCBD0 - ldrb r2, [r6] - lsls r2, 1 - adds r2, r4, r2 - mov r0, sp - adds r1, r4, 0 - str r3, [sp, 0x4] - bl sub_80FD68C - strh r0, [r4] - mov r1, sp - strh r0, [r1] - ldr r3, [sp, 0x4] -_080FCBD0: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - ldrb r0, [r6] - lsls r0, 1 - adds r4, r0 - ldr r0, _080FCC14 @ =gUnknown_03005DF0 - ldrb r0, [r0] - subs r0, 0x1 - cmp r5, r0 - blt _080FCBAA -_080FCBE6: - lsls r0, r7, 24 - lsrs r2, r0, 24 - ldr r0, _080FCC00 @ =gUnknown_03005DF8 - ldrb r0, [r0] - cmp r2, r0 - bcc _080FCB74 -_080FCBF2: - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080FCC00: .4byte gUnknown_03005DF8 -_080FCC04: .4byte gUnknown_03005DEC -_080FCC08: .4byte gUnknown_03005E04 -_080FCC0C: .4byte gUnknown_03005DFC -_080FCC10: .4byte gUnknown_03005DE8 -_080FCC14: .4byte gUnknown_03005DF0 - thumb_func_end sub_80FCB5C - - thumb_func_start sub_80FCC18 -sub_80FCC18: @ 80FCC18 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x4 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - movs r2, 0 - ldr r0, _080FCCA4 @ =gUnknown_03005DF0 - ldrb r0, [r0] - cmp r2, r0 - bcs _080FCC94 - ldr r0, _080FCCA8 @ =gUnknown_03005DEC - mov r9, r0 - ldr r3, _080FCCAC @ =gUnknown_03005DF8 -_080FCC38: - ldr r0, _080FCCB0 @ =gUnknown_03005DFC - ldrb r1, [r0] - adds r1, r2 - ldr r0, _080FCCB4 @ =gUnknown_03005E04 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r4, r9 - ldr r1, [r4] - adds r1, r0 - ldr r0, _080FCCB8 @ =gUnknown_03005DE8 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - movs r5, 0 - adds r6, r2, 0x1 - ldrb r0, [r3] - cmp r5, r0 - bcs _080FCC88 - movs r0, 0x80 - lsls r0, 8 - adds r7, r0, 0 -_080FCC64: - ldrh r0, [r4] - ands r0, r7 - cmp r0, 0 - bne _080FCC7A - adds r0, r4, 0 - mov r1, r8 - str r3, [sp] - bl sub_80FD3D0 - strh r0, [r4] - ldr r3, [sp] -_080FCC7A: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r4, 0x2 - ldrb r0, [r3] - cmp r5, r0 - bcc _080FCC64 -_080FCC88: - lsls r0, r6, 24 - lsrs r2, r0, 24 - ldr r0, _080FCCA4 @ =gUnknown_03005DF0 - ldrb r0, [r0] - cmp r2, r0 - bcc _080FCC38 -_080FCC94: - add sp, 0x4 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080FCCA4: .4byte gUnknown_03005DF0 -_080FCCA8: .4byte gUnknown_03005DEC -_080FCCAC: .4byte gUnknown_03005DF8 -_080FCCB0: .4byte gUnknown_03005DFC -_080FCCB4: .4byte gUnknown_03005E04 -_080FCCB8: .4byte gUnknown_03005DE8 - thumb_func_end sub_80FCC18 - - thumb_func_start sub_80FCCBC -sub_80FCCBC: @ 80FCCBC - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - movs r2, 0 - ldr r0, _080FCD3C @ =gUnknown_03005DF0 - ldrb r0, [r0] - cmp r2, r0 - bcs _080FCD2E - ldr r0, _080FCD40 @ =gUnknown_03005DEC - mov r8, r0 - ldr r3, _080FCD44 @ =gUnknown_03005DF8 -_080FCCD4: - ldr r0, _080FCD48 @ =gUnknown_03005DFC - ldrb r1, [r0] - adds r1, r2 - ldr r0, _080FCD4C @ =gUnknown_03005E04 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r4, r8 - ldr r1, [r4] - adds r1, r0 - ldr r0, _080FCD50 @ =gUnknown_03005DE8 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - movs r5, 0 - adds r6, r2, 0x1 - ldrb r0, [r3] - cmp r5, r0 - bcs _080FCD22 - movs r0, 0x80 - lsls r0, 8 - adds r7, r0, 0 -_080FCD00: - ldrh r0, [r4] - ands r0, r7 - cmp r0, 0 - bne _080FCD14 - adds r0, r4, 0 - str r3, [sp] - bl sub_80FD4DC - strh r0, [r4] - ldr r3, [sp] -_080FCD14: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r4, 0x2 - ldrb r0, [r3] - cmp r5, r0 - bcc _080FCD00 -_080FCD22: - lsls r0, r6, 24 - lsrs r2, r0, 24 - ldr r0, _080FCD3C @ =gUnknown_03005DF0 - ldrb r0, [r0] - cmp r2, r0 - bcc _080FCCD4 -_080FCD2E: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080FCD3C: .4byte gUnknown_03005DF0 -_080FCD40: .4byte gUnknown_03005DEC -_080FCD44: .4byte gUnknown_03005DF8 -_080FCD48: .4byte gUnknown_03005DFC -_080FCD4C: .4byte gUnknown_03005E04 -_080FCD50: .4byte gUnknown_03005DE8 - thumb_func_end sub_80FCCBC - - thumb_func_start sub_80FCD54 -sub_80FCD54: @ 80FCD54 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - movs r7, 0 - ldr r0, _080FCE8C @ =gUnknown_03005DF0 - ldrb r0, [r0] - cmp r7, r0 - bcs _080FCDE0 - ldr r0, _080FCE90 @ =gUnknown_03005DEC - mov r8, r0 -_080FCD6A: - ldr r0, _080FCE94 @ =gUnknown_03005DFC - ldrb r1, [r0] - adds r1, r7 - ldr r0, _080FCE98 @ =gUnknown_03005E04 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r2, r8 - ldr r1, [r2] - adds r1, r0 - ldr r0, _080FCE9C @ =gUnknown_03005DE8 - ldrb r0, [r0] - lsls r0, 1 - adds r5, r1, r0 - adds r4, r5, 0x2 - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_80FD50C - strh r0, [r5] - movs r6, 0x1 - adds r5, r4, 0 - ldr r0, _080FCEA0 @ =gUnknown_03005DF8 - ldrb r0, [r0] - subs r0, 0x1 - adds r7, 0x1 - cmp r6, r0 - bge _080FCDCA -_080FCDA2: - adds r4, r5, 0x2 - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_80FD50C - strh r0, [r5] - subs r1, r5, 0x2 - adds r0, r5, 0 - bl sub_80FD50C - strh r0, [r5] - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - adds r5, r4, 0 - ldr r0, _080FCEA0 @ =gUnknown_03005DF8 - ldrb r0, [r0] - subs r0, 0x1 - cmp r6, r0 - blt _080FCDA2 -_080FCDCA: - subs r1, r5, 0x2 - adds r0, r5, 0 - bl sub_80FD50C - strh r0, [r5] - lsls r0, r7, 24 - lsrs r7, r0, 24 - ldr r0, _080FCE8C @ =gUnknown_03005DF0 - ldrb r0, [r0] - cmp r7, r0 - bcc _080FCD6A -_080FCDE0: - movs r6, 0 - ldr r0, _080FCEA0 @ =gUnknown_03005DF8 - ldrb r0, [r0] - cmp r6, r0 - bcs _080FCE80 - ldr r3, _080FCE90 @ =gUnknown_03005DEC - mov r9, r3 - ldr r0, _080FCE98 @ =gUnknown_03005E04 - mov r8, r0 -_080FCDF2: - ldr r0, _080FCE94 @ =gUnknown_03005DFC - ldrb r0, [r0] - mov r2, r8 - ldrb r1, [r2] - muls r0, r1 - lsls r0, 1 - mov r3, r9 - ldr r2, [r3] - adds r2, r0 - ldr r0, _080FCE9C @ =gUnknown_03005DE8 - ldrb r0, [r0] - adds r0, r6 - lsls r0, 1 - adds r5, r2, r0 - lsls r1, 1 - adds r1, r5, r1 - adds r0, r5, 0 - bl sub_80FD50C - strh r0, [r5] - movs r7, 0x1 - mov r1, r8 - ldrb r0, [r1] - lsls r0, 1 - adds r5, r0 - ldr r0, _080FCE8C @ =gUnknown_03005DF0 - ldrb r0, [r0] - subs r0, 0x1 - adds r6, 0x1 - cmp r7, r0 - bge _080FCE64 - ldr r4, _080FCE98 @ =gUnknown_03005E04 -_080FCE32: - ldrb r1, [r4] - lsls r1, 1 - adds r1, r5, r1 - adds r0, r5, 0 - bl sub_80FD50C - strh r0, [r5] - ldrb r1, [r4] - lsls r1, 1 - subs r1, r5, r1 - adds r0, r5, 0 - bl sub_80FD50C - strh r0, [r5] - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - ldrb r0, [r4] - lsls r0, 1 - adds r5, r0 - ldr r0, _080FCE8C @ =gUnknown_03005DF0 - ldrb r0, [r0] - subs r0, 0x1 - cmp r7, r0 - blt _080FCE32 -_080FCE64: - mov r2, r8 - ldrb r1, [r2] - lsls r1, 1 - subs r1, r5, r1 - adds r0, r5, 0 - bl sub_80FD50C - strh r0, [r5] - lsls r0, r6, 24 - lsrs r6, r0, 24 - ldr r0, _080FCEA0 @ =gUnknown_03005DF8 - ldrb r0, [r0] - cmp r6, r0 - bcc _080FCDF2 -_080FCE80: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080FCE8C: .4byte gUnknown_03005DF0 -_080FCE90: .4byte gUnknown_03005DEC -_080FCE94: .4byte gUnknown_03005DFC -_080FCE98: .4byte gUnknown_03005E04 -_080FCE9C: .4byte gUnknown_03005DE8 -_080FCEA0: .4byte gUnknown_03005DF8 - thumb_func_end sub_80FCD54 - - thumb_func_start sub_80FCEA4 -sub_80FCEA4: @ 80FCEA4 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - movs r2, 0 - ldr r0, _080FCF24 @ =gUnknown_03005DF0 - ldrb r0, [r0] - cmp r2, r0 - bcs _080FCF16 - ldr r0, _080FCF28 @ =gUnknown_03005DEC - mov r8, r0 - ldr r3, _080FCF2C @ =gUnknown_03005DF8 -_080FCEBC: - ldr r0, _080FCF30 @ =gUnknown_03005DFC - ldrb r1, [r0] - adds r1, r2 - ldr r0, _080FCF34 @ =gUnknown_03005E04 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r4, r8 - ldr r1, [r4] - adds r1, r0 - ldr r0, _080FCF38 @ =gUnknown_03005DE8 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - movs r5, 0 - adds r6, r2, 0x1 - ldrb r0, [r3] - cmp r5, r0 - bcs _080FCF0A - movs r0, 0x80 - lsls r0, 8 - adds r7, r0, 0 -_080FCEE8: - ldrh r0, [r4] - ands r0, r7 - cmp r0, 0 - bne _080FCEFC - adds r0, r4, 0 - str r3, [sp] - bl sub_80FD53C - strh r0, [r4] - ldr r3, [sp] -_080FCEFC: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r4, 0x2 - ldrb r0, [r3] - cmp r5, r0 - bcc _080FCEE8 -_080FCF0A: - lsls r0, r6, 24 - lsrs r2, r0, 24 - ldr r0, _080FCF24 @ =gUnknown_03005DF0 - ldrb r0, [r0] - cmp r2, r0 - bcc _080FCEBC -_080FCF16: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080FCF24: .4byte gUnknown_03005DF0 -_080FCF28: .4byte gUnknown_03005DEC -_080FCF2C: .4byte gUnknown_03005DF8 -_080FCF30: .4byte gUnknown_03005DFC -_080FCF34: .4byte gUnknown_03005E04 -_080FCF38: .4byte gUnknown_03005DE8 - thumb_func_end sub_80FCEA4 - - thumb_func_start sub_80FCF3C -sub_80FCF3C: @ 80FCF3C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - ldr r0, _080FD068 @ =gUnknown_03005DEC - ldr r4, [r0] - movs r6, 0 - movs r0, 0x80 - lsls r0, 8 - adds r5, r0, 0 -_080FCF54: - movs r7, 0 -_080FCF56: - ldrh r0, [r4] - ands r0, r5 - cmp r0, 0 - bne _080FCF66 - adds r0, r4, 0 - bl sub_80FD53C - strh r0, [r4] -_080FCF66: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - adds r4, 0x2 - cmp r7, 0x3F - bls _080FCF56 - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x3F - bls _080FCF54 - movs r7, 0 - ldr r1, _080FD068 @ =gUnknown_03005DEC - mov r10, r1 - mov r3, sp - movs r2, 0x80 - lsls r2, 8 - mov r9, r2 -_080FCF8A: - lsls r0, r7, 1 - mov r2, r10 - ldr r1, [r2] - adds r4, r1, r0 - ldrh r1, [r4] - strh r1, [r3] - mov r1, r9 - strh r1, [r4] - movs r6, 0x1 - adds r4, 0x80 - adds r5, r0, 0 -_080FCFA0: - ldrh r0, [r4] - movs r2, 0x80 - lsls r2, 8 - ands r0, r2 - cmp r0, 0 - bne _080FCFC0 - adds r2, r4, 0 - adds r2, 0x80 - mov r0, sp - adds r1, r4, 0 - str r3, [sp, 0x4] - bl sub_80FD7AC - strh r0, [r4] - ldr r3, [sp, 0x4] - strh r0, [r3] -_080FCFC0: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - adds r4, 0x80 - cmp r6, 0x3E - bls _080FCFA0 - mov r0, r9 - strh r0, [r4] - mov r1, r10 - ldr r0, [r1] - adds r4, r0, r5 - ldrh r0, [r4] - strh r0, [r3] - mov r2, r9 - strh r2, [r4] - movs r6, 0x1 - adds r4, 0x80 - movs r0, 0x80 - lsls r0, 8 - mov r8, r0 -_080FCFE8: - ldrh r0, [r4] - mov r1, r8 - ands r0, r1 - adds r5, r4, 0 - adds r5, 0x80 - cmp r0, 0 - bne _080FD008 - mov r0, sp - adds r1, r4, 0 - adds r2, r5, 0 - str r3, [sp, 0x4] - bl sub_80FD7AC - strh r0, [r4] - ldr r3, [sp, 0x4] - strh r0, [r3] -_080FD008: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - adds r4, r5, 0 - cmp r6, 0x3E - bls _080FCFE8 - mov r2, r9 - strh r2, [r4] - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x3F - bls _080FCF8A - ldr r0, _080FD068 @ =gUnknown_03005DEC - ldr r4, [r0] - movs r6, 0 - movs r0, 0x80 - lsls r0, 8 - mov r8, r0 -_080FD02E: - movs r7, 0 - adds r5, r6, 0x1 -_080FD032: - ldrh r0, [r4] - mov r1, r8 - ands r0, r1 - cmp r0, 0 - bne _080FD044 - adds r0, r4, 0 - bl sub_80FD53C - strh r0, [r4] -_080FD044: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - adds r4, 0x2 - cmp r7, 0x3F - bls _080FD032 - lsls r0, r5, 24 - lsrs r6, r0, 24 - cmp r6, 0x3F - bls _080FD02E - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080FD068: .4byte gUnknown_03005DEC - thumb_func_end sub_80FCF3C - - thumb_func_start sub_80FD06C -sub_80FD06C: @ 80FD06C - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - movs r2, 0 - ldr r0, _080FD0FC @ =gUnknown_03005DF0 - ldrb r0, [r0] - cmp r2, r0 - bcs _080FD0EE - ldr r0, _080FD100 @ =gUnknown_03005DEC - mov r8, r0 -_080FD082: - ldr r0, _080FD104 @ =gUnknown_03005DFC - ldrb r1, [r0] - adds r1, r2 - ldr r0, _080FD108 @ =gUnknown_03005E04 - ldrb r0, [r0] - muls r0, r1 - lsls r0, 1 - mov r3, r8 - ldr r1, [r3] - adds r1, r0 - ldr r0, _080FD10C @ =gUnknown_03005DE8 - ldrb r0, [r0] - lsls r0, 1 - adds r4, r1, r0 - ldrh r1, [r4] - mov r0, sp - strh r1, [r0] - movs r5, 0x1 - adds r4, 0x2 - ldr r0, _080FD110 @ =gUnknown_03005DF8 - ldrb r0, [r0] - subs r0, 0x1 - adds r6, r2, 0x1 - cmp r5, r0 - bge _080FD0E2 - movs r0, 0x80 - lsls r0, 8 - adds r7, r0, 0 -_080FD0BA: - ldrh r0, [r4] - ands r0, r7 - cmp r0, 0 - bne _080FD0D0 - mov r0, sp - adds r1, r4, 0 - bl sub_80FD568 - strh r0, [r4] - mov r1, sp - strh r0, [r1] -_080FD0D0: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r4, 0x2 - ldr r0, _080FD110 @ =gUnknown_03005DF8 - ldrb r0, [r0] - subs r0, 0x1 - cmp r5, r0 - blt _080FD0BA -_080FD0E2: - lsls r0, r6, 24 - lsrs r2, r0, 24 - ldr r0, _080FD0FC @ =gUnknown_03005DF0 - ldrb r0, [r0] - cmp r2, r0 - bcc _080FD082 -_080FD0EE: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080FD0FC: .4byte gUnknown_03005DF0 -_080FD100: .4byte gUnknown_03005DEC -_080FD104: .4byte gUnknown_03005DFC -_080FD108: .4byte gUnknown_03005E04 -_080FD10C: .4byte gUnknown_03005DE8 -_080FD110: .4byte gUnknown_03005DF8 - thumb_func_end sub_80FD06C - - thumb_func_start sub_80FD114 -sub_80FD114: @ 80FD114 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - movs r2, 0 - ldr r0, _080FD1B0 @ =gUnknown_03005DF8 - ldrb r0, [r0] - cmp r2, r0 - bcs _080FD1A2 - ldr r0, _080FD1B4 @ =gUnknown_03005DEC - mov r8, r0 - ldr r7, _080FD1B8 @ =gUnknown_03005E04 -_080FD12C: - ldr r0, _080FD1BC @ =gUnknown_03005DFC - ldrb r1, [r0] - ldrb r0, [r7] - muls r0, r1 - lsls r0, 1 - mov r3, r8 - ldr r1, [r3] - adds r1, r0 - ldr r0, _080FD1C0 @ =gUnknown_03005DE8 - ldrb r0, [r0] - adds r0, r2 - lsls r0, 1 - adds r4, r1, r0 - ldrh r1, [r4] - mov r0, sp - strh r1, [r0] - movs r5, 0x1 - ldrb r0, [r7] - lsls r0, 1 - adds r4, r0 - ldr r0, _080FD1C4 @ =gUnknown_03005DF0 - ldrb r0, [r0] - subs r0, 0x1 - adds r6, r2, 0x1 - cmp r5, r0 - bge _080FD196 - movs r0, 0x80 - lsls r0, 8 - adds r2, r0, 0 -_080FD166: - ldrh r0, [r4] - ands r0, r2 - cmp r0, 0 - bne _080FD180 - mov r0, sp - adds r1, r4, 0 - str r2, [sp, 0x4] - bl sub_80FD568 - strh r0, [r4] - mov r1, sp - strh r0, [r1] - ldr r2, [sp, 0x4] -_080FD180: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - ldrb r0, [r7] - lsls r0, 1 - adds r4, r0 - ldr r0, _080FD1C4 @ =gUnknown_03005DF0 - ldrb r0, [r0] - subs r0, 0x1 - cmp r5, r0 - blt _080FD166 -_080FD196: - lsls r0, r6, 24 - lsrs r2, r0, 24 - ldr r0, _080FD1B0 @ =gUnknown_03005DF8 - ldrb r0, [r0] - cmp r2, r0 - bcc _080FD12C -_080FD1A2: - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080FD1B0: .4byte gUnknown_03005DF8 -_080FD1B4: .4byte gUnknown_03005DEC -_080FD1B8: .4byte gUnknown_03005E04 -_080FD1BC: .4byte gUnknown_03005DFC -_080FD1C0: .4byte gUnknown_03005DE8 -_080FD1C4: .4byte gUnknown_03005DF0 - thumb_func_end sub_80FD114 - - thumb_func_start sub_80FD1C8 -sub_80FD1C8: @ 80FD1C8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x20 - lsls r0, 16 - lsrs r0, 16 - mov r10, r0 - mov r2, sp - ldr r3, _080FD234 @ =gUnknown_083E7A50 - lsls r1, r0, 1 - add r1, r10 - adds r0, r1, r3 - ldrb r0, [r0] - strb r0, [r2] - adds r0, r3, 0x1 - adds r0, r1, r0 - ldrb r0, [r0] - strb r0, [r2, 0x1] - mov r5, sp - adds r0, r3, 0x2 - adds r1, r0 - ldrb r4, [r1] - lsls r2, r4, 24 - lsrs r1, r2, 27 - movs r0, 0x7 - ands r1, r0 - strh r1, [r5, 0x2] - lsrs r2, 25 - mov r9, r2 - movs r0, 0x3 - ands r2, r0 - mov r9, r2 - movs r5, 0x1 - ands r5, r4 - movs r4, 0x1 - mov r8, r4 - cmp r8, r1 - bcs _080FD27A - mov r3, sp -_080FD21A: - cmp r5, 0 - bne _080FD238 - mov r0, r8 - lsls r2, r0, 2 - mov r4, sp - adds r1, r4, r2 - ldrb r0, [r3] - mov r4, r8 - subs r0, r4 - strb r0, [r1] - ldrb r0, [r3, 0x1] - add r0, r8 - b _080FD24A - .align 2, 0 -_080FD234: .4byte gUnknown_083E7A50 -_080FD238: - mov r0, r8 - lsls r2, r0, 2 - mov r4, sp - adds r1, r4, r2 - ldrb r0, [r3] - adds r0, 0x1 - strb r0, [r1] - ldrb r0, [r3, 0x1] - subs r0, 0x1 -_080FD24A: - strb r0, [r1, 0x1] - add r2, sp - ldrb r0, [r2] - cmp r0, 0x3F - bhi _080FD25A - ldrb r0, [r2, 0x1] - cmp r0, 0x3F - bls _080FD262 -_080FD25A: - mov r0, r8 - subs r0, 0x1 - strh r0, [r3, 0x2] - b _080FD27A -_080FD262: - ldrh r0, [r3, 0x2] - mov r1, r8 - subs r0, r1 - strh r0, [r2, 0x2] - mov r0, r8 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldrh r0, [r3, 0x2] - cmp r8, r0 - bcc _080FD21A -_080FD27A: - movs r2, 0 - mov r8, r2 - mov r0, sp - ldrh r0, [r0, 0x2] - cmp r8, r0 - bcc _080FD288 - b _080FD38A -_080FD288: - movs r3, 0x1F -_080FD28A: - ldr r1, _080FD2E8 @ =gUnknown_03005DEC - mov r4, r8 - lsls r0, r4, 2 - mov r2, sp - adds r6, r2, r0 - ldrb r0, [r6, 0x1] - lsls r0, 7 - ldr r1, [r1] - adds r1, r0 - ldrb r0, [r6] - lsls r0, 1 - adds r2, r1, r0 - ldrh r1, [r2] - movs r4, 0x80 - lsls r4, 8 - adds r0, r4, 0 - ands r0, r1 - cmp r0, 0 - bne _080FD376 - movs r7, 0x1F - ands r7, r1 - lsls r0, r1, 16 - lsrs r5, r0, 21 - ands r5, r3 - lsrs r4, r0, 26 - ands r4, r3 - mov r0, r9 - cmp r0, 0 - blt _080FD36C - cmp r0, 0x1 - ble _080FD2EC - cmp r0, 0x3 - bgt _080FD36C - ldrh r0, [r6, 0x2] - adds r1, r7, r0 - lsls r1, 16 - lsrs r7, r1, 16 - adds r1, r5, r0 - lsls r1, 16 - lsrs r5, r1, 16 - adds r0, r4, r0 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r7, 0x1F - bls _080FD360 - movs r7, 0x1F - b _080FD360 - .align 2, 0 -_080FD2E8: .4byte gUnknown_03005DEC -_080FD2EC: - mov r1, r10 - lsls r0, r1, 1 - add r0, r10 - ldr r1, _080FD320 @ =gUnknown_083E7A50 - adds r1, 0x2 - adds r0, r1 - ldrb r0, [r0] - lsrs r0, 3 - movs r1, 0x7 - ands r0, r1 - movs r1, 0x3 - str r2, [sp, 0x18] - str r3, [sp, 0x1C] - bl __umodsi3 - lsls r0, 24 - lsrs r0, 24 - ldr r2, [sp, 0x18] - ldr r3, [sp, 0x1C] - cmp r0, 0x1 - beq _080FD33C - cmp r0, 0x1 - bgt _080FD324 - cmp r0, 0 - beq _080FD32A - b _080FD36C - .align 2, 0 -_080FD320: .4byte gUnknown_083E7A50 -_080FD324: - cmp r0, 0x2 - beq _080FD34E - b _080FD36C -_080FD32A: - ldrh r0, [r6, 0x2] - cmp r7, r0 - bcc _080FD338 - subs r0, r7, r0 - lsls r0, 16 - lsrs r7, r0, 16 - b _080FD36C -_080FD338: - movs r7, 0 - b _080FD36C -_080FD33C: - ldrh r0, [r6, 0x2] - cmp r5, r0 - bcc _080FD34A - subs r0, r5, r0 - lsls r0, 16 - lsrs r5, r0, 16 - b _080FD36C -_080FD34A: - movs r5, 0 - b _080FD36C -_080FD34E: - ldrh r0, [r6, 0x2] - cmp r4, r0 - bcc _080FD35C - subs r0, r4, r0 - lsls r0, 16 - lsrs r4, r0, 16 - b _080FD36C -_080FD35C: - movs r4, 0 - b _080FD36C -_080FD360: - cmp r5, 0x1F - bls _080FD366 - movs r5, 0x1F -_080FD366: - cmp r4, 0x1F - bls _080FD36C - movs r4, 0x1F -_080FD36C: - lsls r0, r4, 10 - lsls r1, r5, 5 - orrs r0, r1 - orrs r7, r0 - strh r7, [r2] -_080FD376: - mov r0, r8 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - mov r0, sp - ldrh r0, [r0, 0x2] - cmp r8, r0 - bcs _080FD38A - b _080FD28A -_080FD38A: - add sp, 0x20 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80FD1C8 - - thumb_func_start sub_80FD39C -sub_80FD39C: @ 80FD39C - push {lr} - ldrh r1, [r0] - movs r3, 0x1F - movs r0, 0x1F - ands r0, r1 - lsls r1, 16 - lsrs r2, r1, 21 - ands r2, r3 - lsrs r1, 26 - ands r1, r3 - adds r0, r2 - adds r0, r1 - movs r1, 0x3 - bl __divsi3 - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - lsls r0, r1, 10 - lsls r2, r1, 5 - orrs r0, r2 - orrs r0, r1 - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - thumb_func_end sub_80FD39C - - thumb_func_start sub_80FD3D0 -sub_80FD3D0: @ 80FD3D0 - push {r4,lr} - lsls r1, 24 - lsrs r4, r1, 24 - ldrh r0, [r0] - movs r2, 0x1F - movs r1, 0x1F - ands r1, r0 - lsls r0, 16 - lsrs r3, r0, 21 - ands r3, r2 - lsrs r0, 26 - ands r0, r2 - cmp r1, 0x10 - bhi _080FD400 - cmp r3, 0x10 - bhi _080FD400 - cmp r0, 0x10 - bhi _080FD400 - adds r0, r4, 0 - bl sub_80FD40C - lsls r0, 16 - lsrs r0, 16 - b _080FD402 -_080FD400: - ldr r0, _080FD408 @ =0x00007fff -_080FD402: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080FD408: .4byte 0x00007fff - thumb_func_end sub_80FD3D0 - - thumb_func_start sub_80FD40C -sub_80FD40C: @ 80FD40C - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0 - mov r8, r0 - movs r6, 0 - movs r7, 0 - adds r0, r4, 0 - movs r1, 0x6 - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x3 - bl __umodsi3 - lsls r0, 24 - lsrs r5, r0, 24 - adds r0, r4, 0 - movs r1, 0x6 - bl __umodsi3 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x5 - bhi _080FD4C4 - lsls r0, 2 - ldr r1, _080FD450 @ =_080FD454 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080FD450: .4byte _080FD454 - .align 2, 0 -_080FD454: - .4byte _080FD46C - .4byte _080FD47C - .4byte _080FD48C - .4byte _080FD49A - .4byte _080FD4A8 - .4byte _080FD4B6 -_080FD46C: - movs r0, 0x15 - subs r0, r5 - lsls r0, 16 - lsrs r6, r0, 16 - adds r7, r6, 0 - movs r1, 0 - mov r8, r1 - b _080FD4C4 -_080FD47C: - movs r7, 0 - movs r0, 0x15 - subs r0, r5 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - mov r6, r8 - b _080FD4C4 -_080FD48C: - movs r0, 0x15 - subs r0, r5 - lsls r0, 16 - lsrs r7, r0, 16 - movs r6, 0 - mov r8, r7 - b _080FD4C4 -_080FD49A: - movs r7, 0 - movs r6, 0 - movs r0, 0x17 - subs r0, r5 - lsls r0, 16 - lsrs r0, 16 - b _080FD4C2 -_080FD4A8: - movs r0, 0x17 - subs r0, r5 - lsls r0, 16 - lsrs r7, r0, 16 - movs r6, 0 - mov r8, r6 - b _080FD4C4 -_080FD4B6: - movs r7, 0 - movs r0, 0x17 - subs r0, r5 - lsls r0, 16 - lsrs r6, r0, 16 - movs r0, 0 -_080FD4C2: - mov r8, r0 -_080FD4C4: - lsls r0, r7, 10 - lsls r1, r6, 5 - orrs r0, r1 - mov r1, r8 - orrs r1, r0 - lsls r0, r1, 16 - lsrs r0, 16 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80FD40C - - thumb_func_start sub_80FD4DC -sub_80FD4DC: @ 80FD4DC - push {lr} - ldrh r0, [r0] - movs r2, 0x1F - movs r1, 0x1F - ands r1, r0 - lsls r0, 16 - lsrs r3, r0, 21 - ands r3, r2 - lsrs r0, 26 - ands r0, r2 - cmp r1, 0x10 - bhi _080FD500 - cmp r3, 0x10 - bhi _080FD500 - cmp r0, 0x10 - bhi _080FD500 - movs r0, 0 - b _080FD502 -_080FD500: - ldr r0, _080FD508 @ =0x00007fff -_080FD502: - pop {r1} - bx r1 - .align 2, 0 -_080FD508: .4byte 0x00007fff - thumb_func_end sub_80FD4DC - - thumb_func_start sub_80FD50C -sub_80FD50C: @ 80FD50C - push {r4,lr} - adds r4, r0, 0 - ldrh r3, [r4] - cmp r3, 0 - beq _080FD534 - movs r2, 0x80 - lsls r2, 8 - adds r0, r2, 0 - ands r0, r3 - cmp r0, 0 - beq _080FD526 - adds r0, r2, 0 - b _080FD536 -_080FD526: - ldrh r1, [r1] - adds r0, r2, 0 - ands r0, r1 - cmp r0, 0 - bne _080FD534 - ldrh r0, [r4] - b _080FD536 -_080FD534: - movs r0, 0 -_080FD536: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80FD50C - - thumb_func_start sub_80FD53C -sub_80FD53C: @ 80FD53C - push {r4,lr} - ldrh r1, [r0] - movs r0, 0x1F - movs r3, 0x1F - ands r3, r1 - lsls r1, 16 - lsrs r2, r1, 21 - lsrs r1, 26 - subs r3, r0, r3 - adds r4, r0, 0 - bics r4, r2 - adds r2, r4, 0 - bics r0, r1 - lsls r0, 10 - lsls r2, 5 - orrs r0, r2 - orrs r0, r3 - lsls r0, 16 - lsrs r0, 16 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80FD53C - thumb_func_start sub_80FD568 sub_80FD568: @ 80FD568 push {r4-r7,lr} @@ -2479,7 +1119,7 @@ _080FDDD8: .4byte gUnknown_03005DF8 _080FDDDC: .4byte gUnknown_03005E0C _080FDDE0: adds r0, r4, 0 - bl sub_80FD4DC + bl ConvertToBlackOrWhite lsls r0, 16 cmp r0, 0 bne _080FDDF2 diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s deleted file mode 100644 index 67655e63f..000000000 --- a/asm/pokemon_storage_system.s +++ /dev/null @@ -1,1485 +0,0 @@ - .include "constants/gba_constants.inc" - .include "include/macros.inc" - - .syntax unified - - .text - - thumb_func_start sub_809C85C -@ u8 sub_809C85C(void) -sub_809C85C: @ 809C85C - push {r4-r6,lr} - ldr r0, _0809C894 @ =gPokemonStorageSystemPtr - ldr r2, [r0] - ldr r1, _0809C898 @ =0x000011df - adds r0, r2, r1 - movs r1, 0 - strb r1, [r0] - ldr r3, _0809C89C @ =0x000011de - adds r0, r2, r3 - strb r1, [r0] - ldr r0, _0809C8A0 @ =0x000011e3 - adds r2, r0 - strb r1, [r2] - ldr r1, _0809C8A4 @ =gMain - ldrh r3, [r1, 0x30] - movs r0, 0x40 - ands r0, r3 - cmp r0, 0 - bne _0809C91A - movs r0, 0x80 - ands r0, r3 - cmp r0, 0 - beq _0809C8A8 - movs r4, 0x1 - movs r0, 0 - movs r5, 0x2 - b _0809C922 - .align 2, 0 -_0809C894: .4byte gPokemonStorageSystemPtr -_0809C898: .4byte 0x000011df -_0809C89C: .4byte 0x000011de -_0809C8A0: .4byte 0x000011e3 -_0809C8A4: .4byte gMain -_0809C8A8: - ldrh r2, [r1, 0x2C] - movs r0, 0x20 - ands r0, r2 - cmp r0, 0 - bne _0809C8CC - movs r0, 0x10 - ands r0, r2 - cmp r0, 0 - bne _0809C8DE - ldr r0, _0809C8D0 @ =gSaveBlock2 - ldrb r0, [r0, 0x13] - cmp r0, 0x1 - bne _0809C8E2 - movs r0, 0x80 - lsls r0, 2 - ands r0, r2 - cmp r0, 0 - beq _0809C8D4 -_0809C8CC: - movs r0, 0xA - b _0809C93E - .align 2, 0 -_0809C8D0: .4byte gSaveBlock2 -_0809C8D4: - movs r0, 0x80 - lsls r0, 1 - ands r0, r2 - cmp r0, 0 - beq _0809C8E2 -_0809C8DE: - movs r0, 0x9 - b _0809C93E -_0809C8E2: - ldrh r1, [r1, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0809C8FA - movs r0, 0 - bl sub_809A860 - bl sub_809CA8C - movs r0, 0x7 - b _0809C93E -_0809C8FA: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0809C906 - movs r0, 0x10 - b _0809C93E -_0809C906: - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0809C916 - bl sub_809CD88 - movs r0, 0 - b _0809C93E -_0809C916: - movs r4, 0 - b _0809C93C -_0809C91A: - movs r4, 0x1 - movs r0, 0x3 - movs r5, 0 - strb r4, [r2] -_0809C922: - cmp r4, 0 - beq _0809C93C - lsls r6, r0, 24 - cmp r0, 0x2 - beq _0809C932 - movs r0, 0 - bl sub_809A860 -_0809C932: - lsrs r0, r6, 24 - lsls r1, r5, 24 - lsrs r1, 24 - bl sub_809AF18 -_0809C93C: - adds r0, r4, 0 -_0809C93E: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_809C85C - - thumb_func_start sub_809C944 -@ u8 sub_809C944(void) -sub_809C944: @ 809C944 - push {r4-r7,lr} - ldr r0, _0809C988 @ =gUnknown_020384E4 - ldrb r0, [r0] - mov r12, r0 - ldr r7, _0809C98C @ =gUnknown_020384E5 - ldrb r3, [r7] - ldr r0, _0809C990 @ =gPokemonStorageSystemPtr - ldr r1, [r0] - ldr r0, _0809C994 @ =0x000011df - adds r5, r1, r0 - movs r0, 0 - strb r0, [r5] - ldr r2, _0809C998 @ =0x000011de - adds r4, r1, r2 - strb r0, [r4] - adds r2, 0x5 - adds r1, r2 - strb r0, [r1] - ldr r6, _0809C99C @ =gMain - ldrh r2, [r6, 0x30] - movs r0, 0x40 - ands r0, r2 - cmp r0, 0 - bne _0809CA14 - movs r0, 0x88 - ands r0, r2 - cmp r0, 0 - beq _0809C9A0 - movs r6, 0x1 - movs r0, 0x2 - mov r12, r0 - movs r3, 0 - b _0809CA2A - .align 2, 0 -_0809C988: .4byte gUnknown_020384E4 -_0809C98C: .4byte gUnknown_020384E5 -_0809C990: .4byte gPokemonStorageSystemPtr -_0809C994: .4byte 0x000011df -_0809C998: .4byte 0x000011de -_0809C99C: .4byte gMain -_0809C9A0: - movs r0, 0x20 - ands r0, r2 - cmp r0, 0 - beq _0809C9C0 - movs r6, 0x1 - lsls r0, r3, 24 - movs r1, 0xFF - lsls r1, 24 - adds r0, r1 - lsrs r3, r0, 24 - cmp r0, 0 - bge _0809CA2C - movs r0, 0xFF - strb r0, [r5] - movs r3, 0x1 - b _0809CA2C -_0809C9C0: - movs r0, 0x10 - ands r0, r2 - cmp r0, 0 - beq _0809C9E0 - movs r6, 0x1 - lsls r0, r3, 24 - movs r2, 0x80 - lsls r2, 17 - adds r0, r2 - lsrs r3, r0, 24 - asrs r0, 24 - cmp r0, 0x1 - ble _0809CA2C - strb r6, [r5] - movs r3, 0 - b _0809CA2C -_0809C9E0: - ldrh r1, [r6, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0809C9F4 - movs r0, 0x4 - cmp r3, 0 - bne _0809CA3A - movs r0, 0x5 - b _0809CA3A -_0809C9F4: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0809CA00 - movs r0, 0x10 - b _0809CA3A -_0809CA00: - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0809CA10 - bl sub_809CD88 - movs r0, 0 - b _0809CA3A -_0809CA10: - movs r6, 0 - b _0809CA38 -_0809CA14: - movs r6, 0x1 - movs r0, 0 - mov r12, r0 - movs r0, 0xFF - strb r0, [r4] - movs r0, 0 - ldrsb r0, [r7, r0] - movs r3, 0x1D - cmp r0, 0 - bne _0809CA2A - movs r3, 0x18 -_0809CA2A: - strb r6, [r1] -_0809CA2C: - cmp r6, 0 - beq _0809CA38 - mov r0, r12 - adds r1, r3, 0 - bl sub_809AF18 -_0809CA38: - adds r0, r6, 0 -_0809CA3A: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_809C944 - - thumb_func_start sub_809CA40 -sub_809CA40: @ 809CA40 - push {r4,r5,lr} - movs r3, 0 - ldr r0, _0809CA6C @ =gUnknown_083BBBD4 - ldr r1, [r0] - adds r4, r0, 0 - cmp r1, 0 - beq _0809CA84 - ldr r5, _0809CA70 @ =gUnknown_020384E4 -_0809CA50: - lsls r0, r3, 3 - adds r2, r0, r4 - movs r1, 0x4 - ldrsb r1, [r2, r1] - movs r0, 0 - ldrsb r0, [r5, r0] - cmp r1, r0 - bne _0809CA74 - ldr r0, [r2] - bl _call_via_r0 - lsls r0, 24 - lsrs r0, 24 - b _0809CA86 - .align 2, 0 -_0809CA6C: .4byte gUnknown_083BBBD4 -_0809CA70: .4byte gUnknown_020384E4 -_0809CA74: - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - lsls r0, r3, 3 - adds r0, r4 - ldr r0, [r0] - cmp r0, 0 - bne _0809CA50 -_0809CA84: - movs r0, 0 -_0809CA86: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_809CA40 - - thumb_func_start sub_809CA8C -sub_809CA8C: @ 809CA8C - push {lr} - bl sub_809CDCC - movs r0, 0x9 - bl sub_809CDEC - movs r0, 0xA - bl sub_809CDEC - movs r0, 0xB - bl sub_809CDEC - movs r0, 0 - bl sub_809CDEC - pop {r0} - bx r0 - thumb_func_end sub_809CA8C - -.if DEBUG - thumb_func_start debug_sub_80AA40C -debug_sub_80AA40C: -.syntax divided - push {lr} - bl sub_809AB8C - lsl r0, r0, #0x10 - cmp r0, #0 - beq ._2084 @cond_branch - bl sub_809CDCC - mov r0, #0x20 - bl sub_809CDEC - mov r0, #0x6 - bl sub_809CDEC - mov r0, #0x1 - b ._2085 -._2084: - mov r0, #0x0 -._2085: - pop {r1} - bx r1 -.syntax unified - thumb_func_end debug_sub_80AA40C -.endif - -.if DEBUG - thumb_func_start sub_809CAB0 -sub_809CAB0: -.syntax divided - push {lr} - ldr r0, ._2088 @ unk_2038790 - ldrb r0, [r0] - cmp r0, #0 - beq ._2086 @cond_branch - bl debug_sub_80AA40C - lsl r0, r0, #0x18 - lsr r0, r0, #0x18 - b ._2110 -._2089: - .align 2, 0 -._2088: - .word unk_2038790 -._2086: - bl sub_809CDCC - bl sub_809AB8C - lsl r0, r0, #0x10 - lsr r1, r0, #0x10 - ldr r0, ._2094 @ gPokemonStorageSystemPtr - ldr r0, [r0] - ldrb r0, [r0, #0x5] - cmp r0, #0x1 - beq ._2090 @cond_branch - cmp r0, #0x1 - bgt ._2091 @cond_branch - cmp r0, #0 - beq ._2092 @cond_branch - b ._2108 -._2095: - .align 2, 0 -._2094: - .word gPokemonStorageSystemPtr -._2091: - cmp r0, #0x2 - beq ._2096 @cond_branch - b ._2108 -._2090: - cmp r1, #0 - beq ._2108 @cond_branch - mov r0, #0x1 - bl sub_809CDEC - b ._2109 -._2092: - cmp r1, #0 - beq ._2108 @cond_branch - mov r0, #0x2 - bl sub_809CDEC - b ._2109 -._2096: - ldr r0, ._2105 @ gUnknown_020384E6 - ldrb r0, [r0] - cmp r0, #0 - beq ._2102 @cond_branch - cmp r1, #0 - beq ._2103 @cond_branch - mov r0, #0x4 - bl sub_809CDEC - b ._2109 -._2106: - .align 2, 0 -._2105: - .word gUnknown_020384E6 -._2103: - mov r0, #0x5 - bl sub_809CDEC - b ._2109 -._2102: - cmp r1, #0 - beq ._2108 @cond_branch - mov r0, #0x3 - bl sub_809CDEC - b ._2109 -._2108: - mov r0, #0x0 - b ._2110 -._2109: - mov r0, #0x6 - bl sub_809CDEC - ldr r0, ._2114 @ gPokemonStorageSystemPtr - ldr r0, [r0] - ldrb r0, [r0, #0x5] - cmp r0, #0x2 - bne ._2113 @cond_branch - ldr r0, ._2114 + 4 @ gUnknown_020384E4 - ldrb r0, [r0] - lsl r0, r0, #0x18 - asr r0, r0, #0x18 - cmp r0, #0 - bne ._2112 @cond_branch - mov r0, #0x2 - bl sub_809CDEC - b ._2113 -._2115: - .align 2, 0 -._2114: - .word gPokemonStorageSystemPtr - .word gUnknown_020384E4 -._2112: - mov r0, #0x1 - bl sub_809CDEC -._2113: - mov r0, #0x8 - bl sub_809CDEC - mov r0, #0x7 - bl sub_809CDEC - mov r0, #0x0 - bl sub_809CDEC - mov r0, #0x1 -._2110: - pop {r1} - bx r1 -.syntax unified - thumb_func_end sub_809CAB0 -.else - thumb_func_start sub_809CAB0 -sub_809CAB0: @ 809CAB0 - push {lr} - bl sub_809CDCC - bl sub_809AB8C - lsls r0, 16 - lsrs r1, r0, 16 - ldr r0, _0809CAD4 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldrb r0, [r0, 0x5] - cmp r0, 0x1 - beq _0809CADE - cmp r0, 0x1 - bgt _0809CAD8 - cmp r0, 0 - beq _0809CAEA - b _0809CB24 - .align 2, 0 -_0809CAD4: .4byte gPokemonStorageSystemPtr -_0809CAD8: - cmp r0, 0x2 - beq _0809CAF6 - b _0809CB24 -_0809CADE: - cmp r1, 0 - beq _0809CB24 - movs r0, 0x1 - bl sub_809CDEC - b _0809CB28 -_0809CAEA: - cmp r1, 0 - beq _0809CB24 - movs r0, 0x2 - bl sub_809CDEC - b _0809CB28 -_0809CAF6: - ldr r0, _0809CB0C @ =gUnknown_020384E6 - ldrb r0, [r0] - cmp r0, 0 - beq _0809CB18 - cmp r1, 0 - beq _0809CB10 - movs r0, 0x4 - bl sub_809CDEC - b _0809CB28 - .align 2, 0 -_0809CB0C: .4byte gUnknown_020384E6 -_0809CB10: - movs r0, 0x5 - bl sub_809CDEC - b _0809CB28 -_0809CB18: - cmp r1, 0 - beq _0809CB24 - movs r0, 0x3 - bl sub_809CDEC - b _0809CB28 -_0809CB24: - movs r0, 0 - b _0809CB6E -_0809CB28: - movs r0, 0x6 - bl sub_809CDEC - ldr r0, _0809CB4C @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldrb r0, [r0, 0x5] - cmp r0, 0x2 - bne _0809CB5A - ldr r0, _0809CB50 @ =gUnknown_020384E4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - bne _0809CB54 - movs r0, 0x2 - bl sub_809CDEC - b _0809CB5A - .align 2, 0 -_0809CB4C: .4byte gPokemonStorageSystemPtr -_0809CB50: .4byte gUnknown_020384E4 -_0809CB54: - movs r0, 0x1 - bl sub_809CDEC -_0809CB5A: - movs r0, 0x8 - bl sub_809CDEC - movs r0, 0x7 - bl sub_809CDEC - movs r0, 0 - bl sub_809CDEC - movs r0, 0x1 -_0809CB6E: - pop {r1} - bx r1 - thumb_func_end sub_809CAB0 -.endif - - thumb_func_start sub_809CB74 -sub_809CB74: @ 809CB74 - ldr r1, _0809CB90 @ =gPokemonStorageSystemPtr - ldr r1, [r1] - movs r2, 0x8E - lsls r2, 5 - adds r1, r2 - ldr r2, [r1] - ldrh r2, [r2, 0x20] - strh r2, [r0, 0x20] - ldr r1, [r1] - ldrh r1, [r1, 0x22] - adds r1, 0x14 - strh r1, [r0, 0x22] - bx lr - .align 2, 0 -_0809CB90: .4byte gPokemonStorageSystemPtr - thumb_func_end sub_809CB74 - - thumb_func_start debug_sub_809CB94 -debug_sub_809CB94: @ 809CB94 - push {r4,lr} - adds r4, r0, 0 - ldr r0, _0809CBBC @ =gUnknown_020384E4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x1 - bne _0809CBC8 - ldr r2, _0809CBC0 @ =gPlayerParty - ldr r0, _0809CBC4 @ =gUnknown_020384E5 - movs r1, 0 - ldrsb r1, [r0, r1] - movs r0, 0x64 - muls r1, r0 - adds r1, r2 - adds r0, r4, 0 - movs r2, 0x50 - bl memcpy - b _0809CBF6 - .align 2, 0 -_0809CBBC: .4byte gUnknown_020384E4 -_0809CBC0: .4byte gPlayerParty -_0809CBC4: .4byte gUnknown_020384E5 -_0809CBC8: - bl get_preferred_box - lsls r0, 24 - lsrs r0, 24 - ldr r3, _0809CBFC @ =gPokemonStorage - ldr r1, _0809CC00 @ =gUnknown_020384E5 - movs r2, 0 - ldrsb r2, [r1, r2] - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 4 - lsls r2, r0, 2 - adds r2, r0 - lsls r0, r2, 4 - subs r0, r2 - lsls r0, 5 - adds r1, r0 - adds r1, r3 - adds r1, 0x4 - adds r0, r4, 0 - movs r2, 0x50 - bl memcpy -_0809CBF6: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0809CBFC: .4byte gPokemonStorage -_0809CC00: .4byte gUnknown_020384E5 - thumb_func_end debug_sub_809CB94 - - thumb_func_start sub_809CC04 -sub_809CC04: @ 809CC04 - push {r4-r7,lr} - sub sp, 0x34 - mov r1, sp - ldr r0, _0809CCB0 @ =gHandCursorSpriteSheets - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - add r4, sp, 0x18 - adds r1, r4, 0 - ldr r0, _0809CCB4 @ =gHandCursorSpritePalettes - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - mov r0, sp - bl LoadSpriteSheets - adds r0, r4, 0 - bl LoadSpritePalettes - ldr r0, _0809CCB8 @ =0x0000dac6 - bl IndexOfSpritePaletteTag - ldr r1, _0809CCBC @ =gPokemonStorageSystemPtr - ldr r6, [r1] - ldr r4, _0809CCC0 @ =0x000011e4 - adds r7, r6, r4 - strb r0, [r7] - ldr r0, _0809CCC4 @ =0x0000dad1 - bl IndexOfSpritePaletteTag - ldr r5, _0809CCC8 @ =0x000011e5 - adds r1, r6, r5 - strb r0, [r1] - ldr r0, _0809CCCC @ =gUnknown_020384E4 - ldrb r0, [r0] - ldr r1, _0809CCD0 @ =gUnknown_020384E5 - ldrb r1, [r1] - add r4, sp, 0x30 - mov r5, sp - adds r5, 0x32 - adds r2, r4, 0 - adds r3, r5, 0 - bl sub_809AACC - ldr r0, _0809CCD4 @ =gSpriteTemplate_83BBC70 - movs r2, 0 - ldrsh r1, [r4, r2] - movs r3, 0 - ldrsh r2, [r5, r3] - movs r3, 0x6 - bl CreateSprite - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x40 - beq _0809CCE4 - movs r5, 0x8E - lsls r5, 5 - adds r4, r6, r5 - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - ldr r0, _0809CCD8 @ =gSprites - adds r1, r0 - str r1, [r4] - ldr r0, _0809CCDC @ =gUnknown_020384E9 - ldrb r0, [r0] - adds r0, r7, r0 - ldrb r2, [r0] - lsls r2, 4 - ldrb r3, [r1, 0x5] - movs r0, 0xF - ands r0, r3 - orrs r0, r2 - strb r0, [r1, 0x5] - ldr r0, _0809CCE0 @ =gUnknown_020384E6 - ldrb r0, [r0] - cmp r0, 0 - beq _0809CCEE - ldr r0, [r4] - movs r1, 0x3 - bl StartSpriteAnim - b _0809CCEE - .align 2, 0 -_0809CCB0: .4byte gHandCursorSpriteSheets -_0809CCB4: .4byte gHandCursorSpritePalettes -_0809CCB8: .4byte 0x0000dac6 -_0809CCBC: .4byte gPokemonStorageSystemPtr -_0809CCC0: .4byte 0x000011e4 -_0809CCC4: .4byte 0x0000dad1 -_0809CCC8: .4byte 0x000011e5 -_0809CCCC: .4byte gUnknown_020384E4 -_0809CCD0: .4byte gUnknown_020384E5 -_0809CCD4: .4byte gSpriteTemplate_83BBC70 -_0809CCD8: .4byte gSprites -_0809CCDC: .4byte gUnknown_020384E9 -_0809CCE0: .4byte gUnknown_020384E6 -_0809CCE4: - movs r0, 0x8E - lsls r0, 5 - adds r1, r6, r0 - movs r0, 0 - str r0, [r1] -_0809CCEE: - ldr r0, _0809CD00 @ =gUnknown_020384E4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x1 - bne _0809CD04 - movs r3, 0xC - movs r5, 0x1 - b _0809CD08 - .align 2, 0 -_0809CD00: .4byte gUnknown_020384E4 -_0809CD04: - movs r3, 0x14 - movs r5, 0x2 -_0809CD08: - ldr r0, _0809CD58 @ =gSpriteTemplate_83BBC88 - movs r1, 0 - movs r2, 0 - bl CreateSprite - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x40 - beq _0809CD6C - ldr r0, _0809CD5C @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r1, _0809CD60 @ =0x000011c4 - adds r4, r0, r1 - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - ldr r0, _0809CD64 @ =gSprites - adds r1, r0 - str r1, [r4] - lsls r3, r5, 2 - ldrb r2, [r1, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r3 - strb r0, [r1, 0x5] - ldr r0, _0809CD68 @ =gUnknown_020384E4 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0 - beq _0809CD78 - ldr r0, [r4] - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - b _0809CD78 - .align 2, 0 -_0809CD58: .4byte gSpriteTemplate_83BBC88 -_0809CD5C: .4byte gPokemonStorageSystemPtr -_0809CD60: .4byte 0x000011c4 -_0809CD64: .4byte gSprites -_0809CD68: .4byte gUnknown_020384E4 -_0809CD6C: - ldr r0, _0809CD80 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r2, _0809CD84 @ =0x000011c4 - adds r0, r2 - movs r1, 0 - str r1, [r0] -_0809CD78: - add sp, 0x34 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0809CD80: .4byte gPokemonStorageSystemPtr -_0809CD84: .4byte 0x000011c4 - thumb_func_end sub_809CC04 - - thumb_func_start sub_809CD88 -sub_809CD88: @ 809CD88 - push {lr} - ldr r2, _0809CDC0 @ =gUnknown_020384E9 - movs r1, 0 - ldrb r0, [r2] - cmp r0, 0 - bne _0809CD96 - movs r1, 0x1 -_0809CD96: - strb r1, [r2] - ldr r0, _0809CDC4 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - movs r3, 0x8E - lsls r3, 5 - adds r1, r0, r3 - ldr r3, [r1] - ldr r1, _0809CDC8 @ =0x000011e4 - adds r0, r1 - ldrb r2, [r2] - adds r0, r2 - ldrb r1, [r0] - lsls r1, 4 - ldrb r2, [r3, 0x5] - movs r0, 0xF - ands r0, r2 - orrs r0, r1 - strb r0, [r3, 0x5] - pop {r0} - bx r0 - .align 2, 0 -_0809CDC0: .4byte gUnknown_020384E9 -_0809CDC4: .4byte gPokemonStorageSystemPtr -_0809CDC8: .4byte 0x000011e4 - thumb_func_end sub_809CD88 - -// file boundary here - - thumb_func_start sub_809CDCC -sub_809CDCC: @ 809CDCC - ldr r0, _0809CDE0 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - ldr r2, _0809CDE4 @ =0x000011b8 - adds r1, r0, r2 - movs r2, 0 - strb r2, [r1] - ldr r1, _0809CDE8 @ =0x000011b9 - adds r0, r1 - strb r2, [r0] - bx lr - .align 2, 0 -_0809CDE0: .4byte gPokemonStorageSystemPtr -_0809CDE4: .4byte 0x000011b8 -_0809CDE8: .4byte 0x000011b9 - thumb_func_end sub_809CDCC - - thumb_func_start sub_809CDEC -sub_809CDEC: @ 809CDEC - push {r4,r5,lr} - lsls r0, 24 - lsrs r3, r0, 24 - ldr r0, _0809CE3C @ =gPokemonStorageSystemPtr - ldr r5, [r0] - ldr r0, _0809CE40 @ =0x000011b8 - adds r4, r5, r0 - ldrb r0, [r4] - cmp r0, 0x6 - bhi _0809CE36 - adds r1, r0, 0 - lsls r1, 3 - movs r2, 0x8C - lsls r2, 5 - adds r1, r2 - adds r1, r5, r1 - ldr r2, _0809CE44 @ =gUnknown_083BBCA0 - lsls r0, r3, 2 - adds r0, r2 - ldr r0, [r0] - str r0, [r1] - str r3, [r1, 0x4] - bl GetStringWidthInMenuWindow - lsls r0, 24 - lsrs r0, 24 - adds r1, r0, 0x7 - lsrs r1, 3 - ldr r2, _0809CE48 @ =0x000011b9 - adds r0, r5, r2 - ldrb r2, [r0] - cmp r1, r2 - bls _0809CE30 - strb r1, [r0] -_0809CE30: - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] -_0809CE36: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0809CE3C: .4byte gPokemonStorageSystemPtr -_0809CE40: .4byte 0x000011b8 -_0809CE44: .4byte gUnknown_083BBCA0 -_0809CE48: .4byte 0x000011b9 - thumb_func_end sub_809CDEC - - thumb_func_start sub_809CE4C -sub_809CE4C: @ 809CE4C - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, _0809CE70 @ =gPokemonStorageSystemPtr - ldr r1, [r0] - ldr r3, _0809CE74 @ =0x000011b8 - adds r0, r1, r3 - ldrb r0, [r0] - cmp r2, r0 - bcs _0809CE7C - lsls r0, r2, 3 - ldr r2, _0809CE78 @ =0x00001184 - adds r1, r2 - adds r1, r0 - movs r0, 0 - ldrsb r0, [r1, r0] - b _0809CE80 - .align 2, 0 -_0809CE70: .4byte gPokemonStorageSystemPtr -_0809CE74: .4byte 0x000011b8 -_0809CE78: .4byte 0x00001184 -_0809CE7C: - movs r0, 0x1 - negs r0, r0 -_0809CE80: - pop {r1} - bx r1 - thumb_func_end sub_809CE4C - - thumb_func_start sub_809CE84 -sub_809CE84: @ 809CE84 - push {r4-r6,lr} - mov r6, r10 - mov r5, r9 - mov r4, r8 - push {r4-r6} - sub sp, 0x8 - ldr r0, _0809CF20 @ =gPokemonStorageSystemPtr - ldr r4, [r0] - ldr r0, _0809CF24 @ =0x000011b8 - adds r0, r4 - mov r8, r0 - ldrb r0, [r0] - lsls r0, 1 - movs r1, 0xE - subs r1, r0 - ldr r3, _0809CF28 @ =0x000011bc - adds r6, r4, r3 - movs r0, 0 - mov r10, r0 - strh r1, [r6] - ldr r1, _0809CF2C @ =0x000011b9 - adds r1, r4 - mov r9, r1 - ldrb r1, [r1] - movs r0, 0x1C - subs r0, r1 - subs r3, 0x2 - adds r5, r4, r3 - strh r0, [r5] - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r6] - movs r2, 0x1D - movs r3, 0xF - bl Menu_DrawStdWindowFrame - ldrb r0, [r5] - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r6] - adds r1, 0x1 - lsls r1, 24 - lsrs r1, 24 - mov r3, r8 - ldrb r2, [r3] - movs r3, 0x8C - lsls r3, 5 - adds r4, r3 - adds r3, r4, 0 - bl Menu_PrintItems - ldrb r1, [r5] - adds r1, 0x1 - lsls r1, 24 - lsrs r1, 24 - ldrb r2, [r6] - adds r2, 0x1 - lsls r2, 24 - lsrs r2, 24 - mov r4, r8 - ldrb r3, [r4] - mov r0, r10 - str r0, [sp] - mov r4, r9 - ldrb r0, [r4] - str r0, [sp, 0x4] - movs r0, 0 - bl InitMenu - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0809CF20: .4byte gPokemonStorageSystemPtr -_0809CF24: .4byte 0x000011b8 -_0809CF28: .4byte 0x000011bc -_0809CF2C: .4byte 0x000011b9 - thumb_func_end sub_809CE84 - - thumb_func_start sub_809CF30 -sub_809CF30: @ 809CF30 - push {r4,r5,lr} - movs r5, 0x2 - negs r5, r5 - ldr r4, _0809CF6C @ =gMain - ldrh r1, [r4, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - bne _0809CF86 - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0809CF52 - movs r0, 0x5 - bl PlaySE - adds r5, 0x1 -_0809CF52: - ldrh r1, [r4, 0x2E] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _0809CF70 - movs r0, 0x5 - bl PlaySE - movs r0, 0x1 - negs r0, r0 - bl Menu_MoveCursor - b _0809CF8E - .align 2, 0 -_0809CF6C: .4byte gMain -_0809CF70: - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _0809CF8E - movs r0, 0x5 - bl PlaySE - movs r0, 0x1 - bl Menu_MoveCursor - b _0809CF8E -_0809CF86: - bl Menu_GetCursorPos - lsls r0, 24 - lsrs r5, r0, 24 -_0809CF8E: - movs r0, 0x2 - negs r0, r0 - cmp r5, r0 - beq _0809CFB2 - bl Menu_DestroyCursor - ldr r0, _0809CFD0 @ =gPokemonStorageSystemPtr - ldr r1, [r0] - ldr r2, _0809CFD4 @ =0x000011ba - adds r0, r1, r2 - ldrb r0, [r0] - adds r2, 0x2 - adds r1, r2 - ldrb r1, [r1] - movs r2, 0x1D - movs r3, 0xF - bl Menu_EraseWindowRect -_0809CFB2: - cmp r5, 0 - blt _0809CFC4 - ldr r0, _0809CFD0 @ =gPokemonStorageSystemPtr - ldr r0, [r0] - lsls r1, r5, 3 - ldr r2, _0809CFD8 @ =0x00001184 - adds r0, r2 - adds r0, r1 - ldr r5, [r0] -_0809CFC4: - lsls r0, r5, 16 - asrs r0, 16 - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_0809CFD0: .4byte gPokemonStorageSystemPtr -_0809CFD4: .4byte 0x000011ba -_0809CFD8: .4byte 0x00001184 - thumb_func_end sub_809CF30 - - thumb_func_start sub_809CFDC -sub_809CFDC: @ 809CFDC - ldr r3, _0809CFEC @ =gUnknown_020384EC - str r0, [r3] - str r1, [r0] - movs r1, 0 - strb r2, [r0, 0x5] - strb r1, [r0, 0x4] - bx lr - .align 2, 0 -_0809CFEC: .4byte gUnknown_020384EC - thumb_func_end sub_809CFDC - - thumb_func_start sub_809CFF0 -sub_809CFF0: @ 809CFF0 - push {r4,r5,lr} - ldr r2, _0809D030 @ =gUnknown_020384EC - ldr r1, [r2] - ldrb r0, [r1, 0x4] - cmp r0, 0 - beq _0809D02A - movs r4, 0 - ldrb r1, [r1, 0x4] - cmp r4, r1 - bcs _0809D022 - adds r5, r2, 0 -_0809D006: - ldr r0, [r5] - lsls r1, r4, 4 - ldr r0, [r0] - adds r0, r1 - ldr r1, [r0, 0xC] - bl _call_via_r1 - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, [r5] - ldrb r0, [r0, 0x4] - cmp r4, r0 - bcc _0809D006 -_0809D022: - ldr r0, _0809D030 @ =gUnknown_020384EC - ldr r1, [r0] - movs r0, 0 - strb r0, [r1, 0x4] -_0809D02A: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0809D030: .4byte gUnknown_020384EC - thumb_func_end sub_809CFF0 - - thumb_func_start sub_809D034 -sub_809D034: @ 809D034 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - mov r8, r0 - mov r9, r3 - ldr r0, [sp, 0x20] - ldr r3, [sp, 0x24] - ldr r4, [sp, 0x28] - ldr r5, [sp, 0x2C] - lsls r1, 16 - lsrs r1, 16 - mov r10, r1 - lsls r2, 16 - lsrs r6, r2, 16 - lsls r0, 16 - lsrs r0, 16 - mov r12, r0 - lsls r3, 16 - lsrs r3, 16 - lsls r4, 16 - lsrs r4, 16 - lsls r5, 16 - lsrs r5, 16 - ldr r0, _0809D0A4 @ =gUnknown_020384EC - ldr r2, [r0] - ldrb r0, [r2, 0x4] - adds r1, r0, 0 - ldrb r7, [r2, 0x5] - cmp r1, r7 - bcs _0809D0AC - adds r0, 0x1 - strb r0, [r2, 0x4] - lsls r0, r1, 4 - ldr r2, [r2] - adds r2, r0 - lsls r0, r4, 1 - strh r0, [r2, 0x8] - lsls r0, r6, 6 - add r0, r8 - mov r4, r10 - lsls r1, r4, 1 - adds r0, r1 - str r0, [r2, 0x4] - lsls r0, r3, 6 - add r0, r9 - mov r7, r12 - lsls r1, r7, 1 - adds r0, r1 - str r0, [r2] - strh r5, [r2, 0xA] - ldr r0, _0809D0A8 @ =sub_809D0BC - str r0, [r2, 0xC] - movs r0, 0x1 - b _0809D0AE - .align 2, 0 -_0809D0A4: .4byte gUnknown_020384EC -_0809D0A8: .4byte sub_809D0BC -_0809D0AC: - movs r0, 0 -_0809D0AE: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_809D034 - - thumb_func_start sub_809D0BC -sub_809D0BC: @ 809D0BC - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - ldr r6, [r0] - ldr r5, [r0, 0x4] - ldrh r7, [r0, 0xA] - ldrh r2, [r0, 0x8] - movs r4, 0 - cmp r4, r7 - bcs _0809D0F2 - lsrs r2, 1 - mov r8, r2 - ldr r0, _0809D100 @ =0x001fffff - mov r9, r0 -_0809D0DA: - adds r0, r6, 0 - adds r1, r5, 0 - mov r2, r8 - mov r3, r9 - ands r2, r3 - bl CpuSet - adds r5, 0x40 - adds r6, 0x40 - adds r4, 0x1 - cmp r4, r7 - bcc _0809D0DA -_0809D0F2: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0809D100: .4byte 0x001fffff - thumb_func_end sub_809D0BC - - thumb_func_start sub_809D104 -sub_809D104: @ 809D104 - push {r4-r7,lr} - mov r7, r8 - push {r7} - ldr r5, [sp, 0x18] - ldr r4, [sp, 0x1C] - ldr r6, [sp, 0x20] - mov r8, r6 - ldr r6, [sp, 0x24] - lsls r1, 16 - lsls r2, 16 - lsrs r2, 16 - lsls r5, 16 - lsls r4, 16 - mov r7, r8 - lsls r7, 16 - lsls r6, 16 - lsrs r6, 16 - lsrs r4, 10 - adds r3, r4 - lsrs r5, 15 - adds r5, r3, r5 - lsls r3, r2, 6 - adds r3, r0, r3 - lsrs r1, 15 - adds r4, r3, r1 - adds r2, r6 - lsls r2, 6 - adds r6, r0, r2 - lsrs r2, r7, 15 - cmp r4, r6 - bcs _0809D15C - lsrs r7, r2, 1 - ldr r0, _0809D168 @ =0x001fffff - mov r8, r0 -_0809D148: - adds r0, r5, 0 - adds r1, r4, 0 - mov r2, r8 - ands r2, r7 - bl CpuSet - adds r4, 0x40 - adds r5, 0x40 - cmp r4, r6 - bcc _0809D148 -_0809D15C: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0809D168: .4byte 0x001fffff - thumb_func_end sub_809D104 - - thumb_func_start sub_809D16C -sub_809D16C: @ 809D16C - push {r4-r7,lr} - mov r12, r0 - ldr r0, [sp, 0x14] - lsls r1, 16 - lsrs r6, r1, 16 - lsls r2, 16 - lsrs r4, r2, 16 - lsls r3, 16 - lsrs r3, 16 - lsls r0, 16 - lsrs r5, r0, 16 - ldr r0, _0809D1B4 @ =gUnknown_020384EC - ldr r1, [r0] - ldrb r0, [r1, 0x4] - adds r2, r0, 0 - ldrb r7, [r1, 0x5] - cmp r2, r7 - bcs _0809D1BC - adds r0, 0x1 - strb r0, [r1, 0x4] - lsls r0, r2, 4 - ldr r1, [r1] - adds r1, r0 - lsls r0, r3, 1 - strh r0, [r1, 0x8] - lsls r0, r4, 5 - adds r0, r6 - lsls r0, 1 - add r0, r12 - str r0, [r1, 0x4] - strh r5, [r1, 0xA] - ldr r0, _0809D1B8 @ =sub_809D1C4 - str r0, [r1, 0xC] - movs r0, 0x1 - b _0809D1BE - .align 2, 0 -_0809D1B4: .4byte gUnknown_020384EC -_0809D1B8: .4byte sub_809D1C4 -_0809D1BC: - movs r0, 0 -_0809D1BE: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_809D16C - - thumb_func_start sub_809D1C4 -sub_809D1C4: @ 809D1C4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - adds r6, r0, 0 - movs r0, 0 - ldrh r1, [r6, 0xA] - cmp r0, r1 - bcs _0809D252 - movs r7, 0x80 - lsls r7, 5 - mov r5, sp - ldr r2, _0809D210 @ =0x040000d4 - mov r8, r2 - movs r1, 0x81 - lsls r1, 24 - mov r10, r1 -_0809D1EA: - ldr r2, [r6, 0x4] - ldrh r3, [r6, 0x8] - mov r12, r2 - adds r0, 0x1 - mov r9, r0 - cmp r3, r7 - bhi _0809D214 - movs r0, 0 - strh r0, [r5] - mov r2, sp - mov r0, r8 - str r2, [r0] - mov r1, r12 - str r1, [r0, 0x4] - lsrs r0, r3, 1 - mov r2, r10 - orrs r0, r2 - mov r1, r8 - b _0809D23C - .align 2, 0 -_0809D210: .4byte 0x040000d4 -_0809D214: - movs r4, 0 - strh r4, [r5] - ldr r1, _0809D264 @ =0x040000d4 - mov r0, sp - str r0, [r1] - str r2, [r1, 0x4] - ldr r0, _0809D268 @ =0x81000800 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - adds r2, r7 - subs r3, r7 - cmp r3, r7 - bhi _0809D214 - strh r4, [r5] - mov r0, sp - str r0, [r1] - str r2, [r1, 0x4] - lsrs r0, r3, 1 - mov r2, r10 - orrs r0, r2 -_0809D23C: - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - mov r0, r12 - adds r0, 0x40 - str r0, [r6, 0x4] - mov r1, r9 - lsls r0, r1, 16 - lsrs r0, 16 - ldrh r2, [r6, 0xA] - cmp r0, r2 - bcc _0809D1EA -_0809D252: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0809D264: .4byte 0x040000d4 -_0809D268: .4byte 0x81000800 - thumb_func_end sub_809D1C4 - - .align 2, 0 @ Don't pad with nop. diff --git a/constants/version.inc b/constants/version.inc index 271b46dd3..09df3503c 100644 --- a/constants/version.inc +++ b/constants/version.inc @@ -31,61 +31,61 @@ .endif .ifdef SAPPHIRE - .set OPPONENT_PETALBURG_WOODS_GRUNT, OPPONENT_GRUNT_9 - .set OPPONENT_RUSTURF_TUNNEL_GRUNT, OPPONENT_GRUNT_15 - .set OPPONENT_MUSEUM_2F_GRUNT_1, OPPONENT_GRUNT_19 - .set OPPONENT_MUSEUM_2F_GRUNT_2, OPPONENT_GRUNT_20 - .set OPPONENT_514, OPPONENT_HECTOR_1 - .set OPPONENT_MT_CHIMNEY_GRUNT_1, OPPONENT_MATT_2 - .set OPPONENT_MT_CHIMNEY_GRUNT_2, OPPONENT_GRUNT_13 - .set OPPONENT_HIDEOUT_1F_GRUNT, OPPONENT_GRUNT_1 - .set OPPONENT_HIDEOUT_B1F_GRUNT_1, OPPONENT_GRUNT_2 - .set OPPONENT_HIDEOUT_B1F_GRUNT_2, OPPONENT_GRUNT_3 - .set OPPONENT_HIDEOUT_B1F_GRUNT_3, OPPONENT_GRUNT_26 - .set OPPONENT_HIDEOUT_B2F_GRUNT_1, OPPONENT_MATT_1 - .set OPPONENT_HIDEOUT_B2F_GRUNT_2, OPPONENT_GRUNT_4 - .set OPPONENT_HIDEOUT_B2F_GRUNT_3, OPPONENT_GRUNT_27 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_1, OPPONENT_GRUNT_5 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_2, OPPONENT_GRUNT_6 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_3, OPPONENT_SHELLY_2 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_4, OPPONENT_GRUNT_7 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, OPPONENT_ARCHIE_2 - .set OPPONENT_MT_CHIMNEY_GRUNT_3, OPPONENT_ARCHIE_3 - .set OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, OPPONENT_GRUNT_22 - .set OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, OPPONENT_GRUNT_23 - .set OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, OPPONENT_GRUNT_24 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_1, OPPONENT_GRUNT_16 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_2, OPPONENT_GRUNT_25 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_3, OPPONENT_GRUNT_17 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_4, OPPONENT_GRUNT_18 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_5, OPPONENT_SHELLY_1 + .set TRAINER_PETALBURG_WOODS_GRUNT, TRAINER_GRUNT_9 + .set TRAINER_RUSTURF_TUNNEL_GRUNT, TRAINER_GRUNT_15 + .set TRAINER_MUSEUM_2F_GRUNT_1, TRAINER_GRUNT_19 + .set TRAINER_MUSEUM_2F_GRUNT_2, TRAINER_GRUNT_20 + .set TRAINER_514, TRAINER_HECTOR_1 + .set TRAINER_MT_CHIMNEY_GRUNT_1, TRAINER_MATT_2 + .set TRAINER_MT_CHIMNEY_GRUNT_2, TRAINER_GRUNT_13 + .set TRAINER_HIDEOUT_1F_GRUNT, TRAINER_GRUNT_1 + .set TRAINER_HIDEOUT_B1F_GRUNT_1, TRAINER_GRUNT_2 + .set TRAINER_HIDEOUT_B1F_GRUNT_2, TRAINER_GRUNT_3 + .set TRAINER_HIDEOUT_B1F_GRUNT_3, TRAINER_GRUNT_26 + .set TRAINER_HIDEOUT_B2F_GRUNT_1, TRAINER_MATT_1 + .set TRAINER_HIDEOUT_B2F_GRUNT_2, TRAINER_GRUNT_4 + .set TRAINER_HIDEOUT_B2F_GRUNT_3, TRAINER_GRUNT_27 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_1, TRAINER_GRUNT_5 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_2, TRAINER_GRUNT_6 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_3, TRAINER_SHELLY_2 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_4, TRAINER_GRUNT_7 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_5, TRAINER_ARCHIE_2 + .set TRAINER_MT_CHIMNEY_GRUNT_3, TRAINER_ARCHIE_3 + .set TRAINER_MT_PYRE_SUMMIT_GRUNT_1, TRAINER_GRUNT_22 + .set TRAINER_MT_PYRE_SUMMIT_GRUNT_2, TRAINER_GRUNT_23 + .set TRAINER_MT_PYRE_SUMMIT_GRUNT_3, TRAINER_GRUNT_24 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_1, TRAINER_GRUNT_16 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_2, TRAINER_GRUNT_25 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_3, TRAINER_GRUNT_17 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_4, TRAINER_GRUNT_18 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_5, TRAINER_SHELLY_1 .else - .set OPPONENT_PETALBURG_WOODS_GRUNT, OPPONENT_GRUNT_36 - .set OPPONENT_RUSTURF_TUNNEL_GRUNT, OPPONENT_GRUNT_42 - .set OPPONENT_MUSEUM_2F_GRUNT_1, OPPONENT_GRUNT_46 - .set OPPONENT_MUSEUM_2F_GRUNT_2, OPPONENT_GRUNT_47 - .set OPPONENT_514, OPPONENT_HECTOR_2 - .set OPPONENT_MT_CHIMNEY_GRUNT_1, OPPONENT_TABITHA_2 - .set OPPONENT_MT_CHIMNEY_GRUNT_2, OPPONENT_GRUNT_40 - .set OPPONENT_HIDEOUT_1F_GRUNT, OPPONENT_GRUNT_28 - .set OPPONENT_HIDEOUT_B1F_GRUNT_1, OPPONENT_GRUNT_29 - .set OPPONENT_HIDEOUT_B1F_GRUNT_2, OPPONENT_GRUNT_30 - .set OPPONENT_HIDEOUT_B1F_GRUNT_3, OPPONENT_GRUNT_53 - .set OPPONENT_HIDEOUT_B2F_GRUNT_1, OPPONENT_TABITHA_1 - .set OPPONENT_HIDEOUT_B2F_GRUNT_2, OPPONENT_GRUNT_31 - .set OPPONENT_HIDEOUT_B2F_GRUNT_3, OPPONENT_GRUNT_54 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_1, OPPONENT_GRUNT_32 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_2, OPPONENT_GRUNT_33 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_3, OPPONENT_COURTNEY_2 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_4, OPPONENT_GRUNT_34 - .set OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, OPPONENT_MAXIE_2 - .set OPPONENT_MT_CHIMNEY_GRUNT_3, OPPONENT_MAXIE_3 - .set OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, OPPONENT_GRUNT_49 - .set OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, OPPONENT_GRUNT_50 - .set OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, OPPONENT_GRUNT_51 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_1, OPPONENT_GRUNT_43 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_2, OPPONENT_GRUNT_52 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_3, OPPONENT_GRUNT_44 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_4, OPPONENT_GRUNT_45 - .set OPPONENT_WEATHER_INSTITUTE_GRUNT_5, OPPONENT_COURTNEY_1 + .set TRAINER_PETALBURG_WOODS_GRUNT, TRAINER_GRUNT_36 + .set TRAINER_RUSTURF_TUNNEL_GRUNT, TRAINER_GRUNT_42 + .set TRAINER_MUSEUM_2F_GRUNT_1, TRAINER_GRUNT_46 + .set TRAINER_MUSEUM_2F_GRUNT_2, TRAINER_GRUNT_47 + .set TRAINER_514, TRAINER_HECTOR_2 + .set TRAINER_MT_CHIMNEY_GRUNT_1, TRAINER_TABITHA_2 + .set TRAINER_MT_CHIMNEY_GRUNT_2, TRAINER_GRUNT_40 + .set TRAINER_HIDEOUT_1F_GRUNT, TRAINER_GRUNT_28 + .set TRAINER_HIDEOUT_B1F_GRUNT_1, TRAINER_GRUNT_29 + .set TRAINER_HIDEOUT_B1F_GRUNT_2, TRAINER_GRUNT_30 + .set TRAINER_HIDEOUT_B1F_GRUNT_3, TRAINER_GRUNT_53 + .set TRAINER_HIDEOUT_B2F_GRUNT_1, TRAINER_TABITHA_1 + .set TRAINER_HIDEOUT_B2F_GRUNT_2, TRAINER_GRUNT_31 + .set TRAINER_HIDEOUT_B2F_GRUNT_3, TRAINER_GRUNT_54 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_1, TRAINER_GRUNT_32 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_2, TRAINER_GRUNT_33 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_3, TRAINER_COURTNEY_2 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_4, TRAINER_GRUNT_34 + .set TRAINER_SEAFLOOR_CAVERN_GRUNT_5, TRAINER_MAXIE_2 + .set TRAINER_MT_CHIMNEY_GRUNT_3, TRAINER_MAXIE_3 + .set TRAINER_MT_PYRE_SUMMIT_GRUNT_1, TRAINER_GRUNT_49 + .set TRAINER_MT_PYRE_SUMMIT_GRUNT_2, TRAINER_GRUNT_50 + .set TRAINER_MT_PYRE_SUMMIT_GRUNT_3, TRAINER_GRUNT_51 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_1, TRAINER_GRUNT_43 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_2, TRAINER_GRUNT_52 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_3, TRAINER_GRUNT_44 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_4, TRAINER_GRUNT_45 + .set TRAINER_WEATHER_INSTITUTE_GRUNT_5, TRAINER_COURTNEY_1 .endif diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index a10c2ddb0..9b27d25a1 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -1941,66 +1941,66 @@ SootopolisCity_Gym_1F_EventScript_1A01C0:: @ 81A01C0 end DewfordTown_Gym_EventScript_1A021E:: @ 81A021E - settrainerflag OPPONENT_JOSH - settrainerflag OPPONENT_TOMMY + settrainerflag TRAINER_JOSH + settrainerflag TRAINER_TOMMY return DewfordTown_Gym_EventScript_1A0225:: @ 81A0225 - settrainerflag OPPONENT_HIDEKI - settrainerflag OPPONENT_TESSA - settrainerflag OPPONENT_LAURA + settrainerflag TRAINER_HIDEKI + settrainerflag TRAINER_TESSA + settrainerflag TRAINER_LAURA return DewfordTown_Gym_EventScript_1A022F:: @ 81A022F - settrainerflag OPPONENT_KIRK - settrainerflag OPPONENT_SHAWN - settrainerflag OPPONENT_BEN - settrainerflag OPPONENT_VIVIAN + settrainerflag TRAINER_KIRK + settrainerflag TRAINER_SHAWN + settrainerflag TRAINER_BEN + settrainerflag TRAINER_VIVIAN return DewfordTown_Gym_EventScript_1A023C:: @ 81A023C - settrainerflag OPPONENT_COLE - settrainerflag OPPONENT_AXLE - settrainerflag OPPONENT_ANDY - settrainerflag OPPONENT_ZANE - settrainerflag OPPONENT_SADIE + settrainerflag TRAINER_COLE + settrainerflag TRAINER_AXLE + settrainerflag TRAINER_ANDY + settrainerflag TRAINER_ZANE + settrainerflag TRAINER_SADIE return DewfordTown_Gym_EventScript_1A024C:: @ 81A024C - settrainerflag OPPONENT_RANDALL - settrainerflag OPPONENT_PARKER - settrainerflag OPPONENT_GEORGE - settrainerflag OPPONENT_BERKE - settrainerflag OPPONENT_MARY - settrainerflag OPPONENT_LORI - settrainerflag OPPONENT_JODY + settrainerflag TRAINER_RANDALL + settrainerflag TRAINER_PARKER + settrainerflag TRAINER_GEORGE + settrainerflag TRAINER_BERKE + settrainerflag TRAINER_MARY + settrainerflag TRAINER_LORI + settrainerflag TRAINER_JODY return DewfordTown_Gym_EventScript_1A0262:: @ 81A0262 - settrainerflag OPPONENT_JARED - settrainerflag OPPONENT_TERRELL - settrainerflag OPPONENT_KYLEE - settrainerflag OPPONENT_WILL + settrainerflag TRAINER_JARED + settrainerflag TRAINER_TERRELL + settrainerflag TRAINER_KYLEE + settrainerflag TRAINER_WILL return DewfordTown_Gym_EventScript_1A026F:: @ 81A026F - settrainerflag OPPONENT_PRESTON - settrainerflag OPPONENT_VIRGIL - settrainerflag OPPONENT_FRITZ - settrainerflag OPPONENT_HANNAH - settrainerflag OPPONENT_SAMANTHA - settrainerflag OPPONENT_MAURA + settrainerflag TRAINER_PRESTON + settrainerflag TRAINER_VIRGIL + settrainerflag TRAINER_FRITZ + settrainerflag TRAINER_HANNAH + settrainerflag TRAINER_SAMANTHA + settrainerflag TRAINER_MAURA return DewfordTown_Gym_EventScript_1A0282:: @ 81A0282 - settrainerflag OPPONENT_ANDREA - settrainerflag OPPONENT_CRISSY - settrainerflag OPPONENT_BRIANNA_2 - settrainerflag OPPONENT_CONNIE - settrainerflag OPPONENT_BRIDGET - settrainerflag OPPONENT_OLIVIA - settrainerflag OPPONENT_TIFFANY - settrainerflag OPPONENT_MARISSA + settrainerflag TRAINER_ANDREA + settrainerflag TRAINER_CRISSY + settrainerflag TRAINER_BRIANNA_2 + settrainerflag TRAINER_CONNIE + settrainerflag TRAINER_BRIDGET + settrainerflag TRAINER_OLIVIA + settrainerflag TRAINER_TIFFANY + settrainerflag TRAINER_MARISSA return DewfordTown_Gym_EventScript_1A029B:: @ 81A029B diff --git a/data/event_scripts.s b/data/event_scripts.s index 1f514321c..3ce319397 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1935,66 +1935,66 @@ SootopolisCity_Gym_1F_EventScript_1A01C0:: @ 81A01C0 end DewfordTown_Gym_EventScript_1A021E:: @ 81A021E - settrainerflag OPPONENT_JOSH - settrainerflag OPPONENT_TOMMY + settrainerflag TRAINER_JOSH + settrainerflag TRAINER_TOMMY return DewfordTown_Gym_EventScript_1A0225:: @ 81A0225 - settrainerflag OPPONENT_HIDEKI - settrainerflag OPPONENT_TESSA - settrainerflag OPPONENT_LAURA + settrainerflag TRAINER_HIDEKI + settrainerflag TRAINER_TESSA + settrainerflag TRAINER_LAURA return DewfordTown_Gym_EventScript_1A022F:: @ 81A022F - settrainerflag OPPONENT_KIRK - settrainerflag OPPONENT_SHAWN - settrainerflag OPPONENT_BEN - settrainerflag OPPONENT_VIVIAN + settrainerflag TRAINER_KIRK + settrainerflag TRAINER_SHAWN + settrainerflag TRAINER_BEN + settrainerflag TRAINER_VIVIAN return DewfordTown_Gym_EventScript_1A023C:: @ 81A023C - settrainerflag OPPONENT_COLE - settrainerflag OPPONENT_AXLE - settrainerflag OPPONENT_ANDY - settrainerflag OPPONENT_ZANE - settrainerflag OPPONENT_SADIE + settrainerflag TRAINER_COLE + settrainerflag TRAINER_AXLE + settrainerflag TRAINER_ANDY + settrainerflag TRAINER_ZANE + settrainerflag TRAINER_SADIE return DewfordTown_Gym_EventScript_1A024C:: @ 81A024C - settrainerflag OPPONENT_RANDALL - settrainerflag OPPONENT_PARKER - settrainerflag OPPONENT_GEORGE - settrainerflag OPPONENT_BERKE - settrainerflag OPPONENT_MARY - settrainerflag OPPONENT_LORI - settrainerflag OPPONENT_JODY + settrainerflag TRAINER_RANDALL + settrainerflag TRAINER_PARKER + settrainerflag TRAINER_GEORGE + settrainerflag TRAINER_BERKE + settrainerflag TRAINER_MARY + settrainerflag TRAINER_LORI + settrainerflag TRAINER_JODY return DewfordTown_Gym_EventScript_1A0262:: @ 81A0262 - settrainerflag OPPONENT_JARED - settrainerflag OPPONENT_TERRELL - settrainerflag OPPONENT_KYLEE - settrainerflag OPPONENT_WILL + settrainerflag TRAINER_JARED + settrainerflag TRAINER_TERRELL + settrainerflag TRAINER_KYLEE + settrainerflag TRAINER_WILL return DewfordTown_Gym_EventScript_1A026F:: @ 81A026F - settrainerflag OPPONENT_PRESTON - settrainerflag OPPONENT_VIRGIL - settrainerflag OPPONENT_FRITZ - settrainerflag OPPONENT_HANNAH - settrainerflag OPPONENT_SAMANTHA - settrainerflag OPPONENT_MAURA + settrainerflag TRAINER_PRESTON + settrainerflag TRAINER_VIRGIL + settrainerflag TRAINER_FRITZ + settrainerflag TRAINER_HANNAH + settrainerflag TRAINER_SAMANTHA + settrainerflag TRAINER_MAURA return DewfordTown_Gym_EventScript_1A0282:: @ 81A0282 - settrainerflag OPPONENT_ANDREA - settrainerflag OPPONENT_CRISSY - settrainerflag OPPONENT_BRIANNA_2 - settrainerflag OPPONENT_CONNIE - settrainerflag OPPONENT_BRIDGET - settrainerflag OPPONENT_OLIVIA - settrainerflag OPPONENT_TIFFANY - settrainerflag OPPONENT_MARISSA + settrainerflag TRAINER_ANDREA + settrainerflag TRAINER_CRISSY + settrainerflag TRAINER_BRIANNA_2 + settrainerflag TRAINER_CONNIE + settrainerflag TRAINER_BRIDGET + settrainerflag TRAINER_OLIVIA + settrainerflag TRAINER_TIFFANY + settrainerflag TRAINER_MARISSA return DewfordTown_Gym_EventScript_1A029B:: @ 81A029B diff --git a/data/graphics.s b/data/graphics.s index 7970dc904..587be6df0 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3225,8 +3225,8 @@ gBagScreenMale_Pal:: @ 8E76F94 gBagScreenFemale_Pal:: @ 8E76FCC .incbin "graphics/interface/bag_screen_female.gbapal.lz" -gUnknown_08E77004:: @ 8E77004 - .incbin "graphics/unknown/unknown_E77004.bin" +gBagScreen_Tilemap:: @ 8E77004 + .incbin "graphics/interface/bag_screen.bin" .align 2 gBuyMenuFrame_Gfx:: @ 8E77804 @@ -4039,8 +4039,8 @@ gUnknown_08E96D2C:: @ 8E96D2C .incbin "graphics/unknown/unknown_E96D2C.bin.lz" .align 2 -gUnknown_08E96EC8:: @ 8E96EC8 - .incbin "graphics/unknown/unknown_E96EC8.bin" +gBagScreenLabels_Tilemap:: @ 8E96EC8 + .incbin "graphics/interface/bag_screen_labels.bin" .align 2 gSlotMachineSpritePalette0:: @ 8E976C8 diff --git a/data/maps/AbandonedShip_Corridors_1F/scripts.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc index 0c7278f3b..f2636fd31 100644 --- a/data/maps/AbandonedShip_Corridors_1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc @@ -6,6 +6,6 @@ AbandonedShip_Corridors_1F_EventScript_15E965:: @ 815E965 end AbandonedShip_Corridors_1F_EventScript_15E96E:: @ 815E96E - trainerbattle 0, OPPONENT_CHARLIE, 0, AbandonedShip_Corridors_1F_Text_19843D, AbandonedShip_Corridors_1F_Text_198479 + trainerbattle 0, TRAINER_CHARLIE, 0, AbandonedShip_Corridors_1F_Text_19843D, AbandonedShip_Corridors_1F_Text_198479 msgbox AbandonedShip_Corridors_1F_Text_198493, 6 end diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index c34f2c28b..f1b7240db 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -50,6 +50,6 @@ AbandonedShip_Corridors_B1F_EventScript_15EA14:: @ 815EA14 end AbandonedShip_Corridors_B1F_EventScript_15EA1E:: @ 815EA1E - trainerbattle 0, OPPONENT_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_19856F, AbandonedShip_Corridors_B1F_Text_1985C5 + trainerbattle 0, TRAINER_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_19856F, AbandonedShip_Corridors_B1F_Text_1985C5 msgbox AbandonedShip_Corridors_B1F_Text_1985D7, 6 end diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc index e1e903cc0..cd7c8fd9f 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc @@ -2,7 +2,7 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 815EA67 .byte 0 AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 - trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F + trainerbattle 4, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93 @@ -10,12 +10,12 @@ AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 end AbandonedShip_Rooms2_1F_EventScript_15EA93:: @ 815EA93 - trainerbattle 7, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1989DF, AbandonedShip_Rooms2_1F_Text_198A53, AbandonedShip_Rooms2_1F_Text_198AEE + trainerbattle 7, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1989DF, AbandonedShip_Rooms2_1F_Text_198A53, AbandonedShip_Rooms2_1F_Text_198AEE msgbox AbandonedShip_Rooms2_1F_Text_198A70, 6 end AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE - trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A + trainerbattle 4, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9 @@ -23,6 +23,6 @@ AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE end AbandonedShip_Rooms2_1F_EventScript_15EAD9:: @ 815EAD9 - trainerbattle 7, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_198B3B, AbandonedShip_Rooms2_1F_Text_198BCF, AbandonedShip_Rooms2_1F_Text_198C40 + trainerbattle 7, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_198B3B, AbandonedShip_Rooms2_1F_Text_198BCF, AbandonedShip_Rooms2_1F_Text_198C40 msgbox AbandonedShip_Rooms2_1F_Text_198BEA, 6 end diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc index ee49ba695..e92e83cc8 100644 --- a/data/maps/AquaHideout_1F/scripts.inc +++ b/data/maps/AquaHideout_1F/scripts.inc @@ -36,7 +36,7 @@ AquaHideout_1F_EventScript_15D802:: @ 815D802 AquaHideout_1F_EventScript_15D80C:: @ 815D80C MagmaHideout_1F_EventScript_15D80C:: @ 815D80C - trainerbattle 2, OPPONENT_HIDEOUT_1F_GRUNT, 0, AquaHideout_1F_Text_196E01, AquaHideout_1F_Text_196E28, AquaHideout_1F_EventScript_15D827 + trainerbattle 2, TRAINER_HIDEOUT_1F_GRUNT, 0, AquaHideout_1F_Text_196E01, AquaHideout_1F_Text_196E28, AquaHideout_1F_EventScript_15D827 msgbox AquaHideout_1F_Text_196E3D, 6 end diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 3be8d487d..3b4c04273 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -17,7 +17,7 @@ AquaHideout_B1F_MapScript1_15D84A:: @ 815D84A AquaHideout_B1F_EventScript_15D850:: @ 815D850 MagmaHideout_B1F_EventScript_15D850:: @ 815D850 - trainerbattle 2, OPPONENT_HIDEOUT_B1F_GRUNT_1, 0, AquaHideout_B1F_Text_196E6F, AquaHideout_B1F_Text_196EB6, AquaHideout_B1F_EventScript_15D86B + trainerbattle 2, TRAINER_HIDEOUT_B1F_GRUNT_1, 0, AquaHideout_B1F_Text_196E6F, AquaHideout_B1F_Text_196EB6, AquaHideout_B1F_EventScript_15D86B msgbox AquaHideout_B1F_Text_196ECC, 6 end @@ -28,7 +28,7 @@ AquaHideout_B1F_EventScript_15D86B:: @ 815D86B AquaHideout_B1F_EventScript_15D875:: @ 815D875 MagmaHideout_B1F_EventScript_15D875:: @ 815D875 - trainerbattle 2, OPPONENT_HIDEOUT_B1F_GRUNT_2, 0, AquaHideout_B1F_Text_196F39, AquaHideout_B1F_Text_196F9B, AquaHideout_B1F_EventScript_15D890 + trainerbattle 2, TRAINER_HIDEOUT_B1F_GRUNT_2, 0, AquaHideout_B1F_Text_196F39, AquaHideout_B1F_Text_196F9B, AquaHideout_B1F_EventScript_15D890 msgbox AquaHideout_B1F_Text_196FB5, 6 end @@ -39,6 +39,6 @@ AquaHideout_B1F_EventScript_15D890:: @ 815D890 AquaHideout_B1F_EventScript_15D89A:: @ 815D89A MagmaHideout_B1F_EventScript_15D89A:: @ 815D89A - trainerbattle 0, OPPONENT_HIDEOUT_B1F_GRUNT_3, 0, AquaHideout_B1F_Text_196FFD, AquaHideout_B1F_Text_197040 + trainerbattle 0, TRAINER_HIDEOUT_B1F_GRUNT_3, 0, AquaHideout_B1F_Text_196FFD, AquaHideout_B1F_Text_197040 msgbox AquaHideout_B1F_Text_197056, 6 end diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index 37830a00e..103de2313 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -25,7 +25,7 @@ MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD AquaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 - trainerbattle 2, OPPONENT_HIDEOUT_B2F_GRUNT_1, 0, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD + trainerbattle 2, TRAINER_HIDEOUT_B2F_GRUNT_1, 0, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD msgbox AquaHideout_B2F_Text_1971AE, 4 release end @@ -85,7 +85,7 @@ AquaHideout_B2F_Movement_15D95D:: @ 815D95D AquaHideout_B2F_EventScript_15D962:: @ 815D962 MagmaHideout_B2F_EventScript_15D962:: @ 815D962 - trainerbattle 2, OPPONENT_HIDEOUT_B2F_GRUNT_2, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D + trainerbattle 2, TRAINER_HIDEOUT_B2F_GRUNT_2, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D msgbox AquaHideout_B2F_Text_1972D2, 6 end @@ -96,6 +96,6 @@ AquaHideout_B2F_EventScript_15D97D:: @ 815D97D AquaHideout_B2F_EventScript_15D987:: @ 815D987 MagmaHideout_B2F_EventScript_15D987:: @ 815D987 - trainerbattle 0, OPPONENT_HIDEOUT_B2F_GRUNT_3, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390 + trainerbattle 0, TRAINER_HIDEOUT_B2F_GRUNT_3, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390 msgbox AquaHideout_B2F_Text_1973C0, 6 end diff --git a/data/maps/BattleTower_BattleRoom/scripts.inc b/data/maps/BattleTower_BattleRoom/scripts.inc index 22529962a..ea80ae58b 100644 --- a/data/maps/BattleTower_BattleRoom/scripts.inc +++ b/data/maps/BattleTower_BattleRoom/scripts.inc @@ -12,7 +12,7 @@ BattleTower_BattleRoom_EventScript_1608EB:: @ 81608EB waitmovement 0 BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA - special sub_81347F8 + special ChooseNextBattleTowerTrainer addobject 1 applymovement 1, BattleTower_BattleRoom_Movement_160AC0 waitmovement 0 diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 596f2c77f..3e57e0fec 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -7,7 +7,7 @@ DewfordTown_Gym_MapScript1_15306B:: @ 815306B end DewfordTown_Gym_EventScript_153071:: @ 8153071 - goto_if_trainer_defeated OPPONENT_BRAWLY, DewfordTown_Gym_EventScript_1530AA + goto_if_trainer_defeated TRAINER_BRAWLY, DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 copyvar VAR_SPECIAL_1, VAR_SPECIAL_0 compare VAR_SPECIAL_0, 0 @@ -80,22 +80,22 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117 DewfordTown_Gym_EventScript_153122:: @ 8153122 setvar VAR_SPECIAL_0, 0 - goto_if_trainer_not_defeated OPPONENT_HIDEKI, DewfordTown_Gym_EventScript_153135 + goto_if_trainer_not_defeated TRAINER_HIDEKI, DewfordTown_Gym_EventScript_153135 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 - goto_if_trainer_not_defeated OPPONENT_TESSA, DewfordTown_Gym_EventScript_153143 + goto_if_trainer_not_defeated TRAINER_TESSA, DewfordTown_Gym_EventScript_153143 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 - goto_if_trainer_not_defeated OPPONENT_LAURA, DewfordTown_Gym_EventScript_153151 + goto_if_trainer_not_defeated TRAINER_LAURA, DewfordTown_Gym_EventScript_153151 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153151:: @ 8153151 return DewfordTown_Gym_EventScript_153152:: @ 8153152 - trainerbattle 1, OPPONENT_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 + trainerbattle 1, TRAINER_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_1531B5 msgbox DewfordTown_Gym_Text_175412, 4 release @@ -127,7 +127,7 @@ DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 end DewfordTown_Gym_EventScript_1531D9:: @ 81531D9 - trainerbattle 2, OPPONENT_HIDEKI, 0, DewfordTown_Gym_Text_174F61, DewfordTown_Gym_Text_174F7A, DewfordTown_Gym_EventScript_1531F4 + trainerbattle 2, TRAINER_HIDEKI, 0, DewfordTown_Gym_Text_174F61, DewfordTown_Gym_Text_174F7A, DewfordTown_Gym_EventScript_1531F4 msgbox DewfordTown_Gym_Text_174F8E, 6 end @@ -137,7 +137,7 @@ DewfordTown_Gym_EventScript_1531F4:: @ 81531F4 end DewfordTown_Gym_EventScript_1531FB:: @ 81531FB - trainerbattle 2, OPPONENT_TESSA, 0, DewfordTown_Gym_Text_174FCE, DewfordTown_Gym_Text_175009, DewfordTown_Gym_EventScript_153216 + trainerbattle 2, TRAINER_TESSA, 0, DewfordTown_Gym_Text_174FCE, DewfordTown_Gym_Text_175009, DewfordTown_Gym_EventScript_153216 msgbox DewfordTown_Gym_Text_175031, 6 end @@ -147,7 +147,7 @@ DewfordTown_Gym_EventScript_153216:: @ 8153216 end DewfordTown_Gym_EventScript_15321D:: @ 815321D - trainerbattle 2, OPPONENT_LAURA, 0, DewfordTown_Gym_Text_1750C9, DewfordTown_Gym_Text_175104, DewfordTown_Gym_EventScript_153238 + trainerbattle 2, TRAINER_LAURA, 0, DewfordTown_Gym_Text_1750C9, DewfordTown_Gym_Text_175104, DewfordTown_Gym_EventScript_153238 msgbox DewfordTown_Gym_Text_175117, 6 end diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 7e1f6e6cb..01b2cc970 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -40,7 +40,7 @@ EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802 EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 playbgm MUS_DAIGO, FALSE msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, 4 - trainerbattle 3, OPPONENT_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0 + trainerbattle 3, TRAINER_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0 goto EverGrandeCity_ChampionsRoom_EventScript_15B821 end diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index 4dad28923..f00a809bd 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -43,7 +43,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B78B playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 - trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 + trainerbattle 3, TRAINER_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 goto EverGrandeCity_DrakesRoom_EventScript_15B795 end diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 17555f2f6..ede08e504 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -43,7 +43,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6F1 playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 - trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 + trainerbattle 3, TRAINER_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB end diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 5575b99b3..db30bcfa7 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -43,7 +43,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B657 playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 - trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C + trainerbattle 3, TRAINER_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C goto EverGrandeCity_PhoebesRoom_EventScript_15B661 end diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 2b6cc0571..b2b731004 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -44,7 +44,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 - trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 + trainerbattle 3, TRAINER_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 goto EverGrandeCity_SidneysRoom_EventScript_15B5C7 end diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index c0de6bfee..3a814a4b7 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -16,7 +16,7 @@ FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC end FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 - trainerbattle 1, OPPONENT_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15 + trainerbattle 1, TRAINER_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15 goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_157F3E msgbox FortreeCity_Gym_Text_185F98, 4 release @@ -44,22 +44,22 @@ FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E end FortreeCity_Gym_EventScript_157F62:: @ 8157F62 - trainerbattle 0, OPPONENT_JARED, 0, FortreeCity_Gym_Text_1859B9, FortreeCity_Gym_Text_1859EA + trainerbattle 0, TRAINER_JARED, 0, FortreeCity_Gym_Text_1859B9, FortreeCity_Gym_Text_1859EA msgbox FortreeCity_Gym_Text_185A02, 6 end FortreeCity_Gym_EventScript_157F79:: @ 8157F79 - trainerbattle 0, OPPONENT_WILL, 0, FortreeCity_Gym_Text_185A7F, FortreeCity_Gym_Text_185AEC + trainerbattle 0, TRAINER_WILL, 0, FortreeCity_Gym_Text_185A7F, FortreeCity_Gym_Text_185AEC msgbox FortreeCity_Gym_Text_185B18, 6 end FortreeCity_Gym_EventScript_157F90:: @ 8157F90 - trainerbattle 0, OPPONENT_TERRELL, 0, FortreeCity_Gym_Text_185B8D, FortreeCity_Gym_Text_185BEB + trainerbattle 0, TRAINER_TERRELL, 0, FortreeCity_Gym_Text_185B8D, FortreeCity_Gym_Text_185BEB msgbox FortreeCity_Gym_Text_185C00, 6 end FortreeCity_Gym_EventScript_157FA7:: @ 8157FA7 - trainerbattle 0, OPPONENT_KYLEE, 0, FortreeCity_Gym_Text_185C45, FortreeCity_Gym_Text_185C7C + trainerbattle 0, TRAINER_KYLEE, 0, FortreeCity_Gym_Text_185C45, FortreeCity_Gym_Text_185C7C msgbox FortreeCity_Gym_Text_185C8C, 6 end diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index d75420e88..96ad4a0aa 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -18,12 +18,12 @@ JaggedPass_EventScript_15D280:: @ 815D280 return JaggedPass_EventScript_15D285:: @ 815D285 - trainerbattle 0, OPPONENT_ERIC, 0, JaggedPass_Text_195DAC, JaggedPass_Text_195E27 + trainerbattle 0, TRAINER_ERIC, 0, JaggedPass_Text_195DAC, JaggedPass_Text_195E27 msgbox JaggedPass_Text_195E3E, 6 end JaggedPass_EventScript_15D29C:: @ 815D29C - trainerbattle 0, OPPONENT_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF + trainerbattle 0, TRAINER_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq JaggedPass_EventScript_15D2C3 @@ -31,12 +31,12 @@ JaggedPass_EventScript_15D29C:: @ 815D29C end JaggedPass_EventScript_15D2C3:: @ 815D2C3 - trainerbattle 5, OPPONENT_DIANA_1, 0, JaggedPass_Text_195F58, JaggedPass_Text_195F8C + trainerbattle 5, TRAINER_DIANA_1, 0, JaggedPass_Text_195F58, JaggedPass_Text_195F8C msgbox JaggedPass_Text_195FB9, 6 end JaggedPass_EventScript_15D2DA:: @ 815D2DA - trainerbattle 0, OPPONENT_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 + trainerbattle 0, TRAINER_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq JaggedPass_EventScript_15D301 @@ -44,6 +44,6 @@ JaggedPass_EventScript_15D2DA:: @ 815D2DA end JaggedPass_EventScript_15D301:: @ 815D301 - trainerbattle 5, OPPONENT_ETHAN_1, 0, JaggedPass_Text_1960AA, JaggedPass_Text_1960E2 + trainerbattle 5, TRAINER_ETHAN_1, 0, JaggedPass_Text_1960AA, JaggedPass_Text_1960E2 msgbox JaggedPass_Text_196118, 6 end diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 27655127a..3f5f9a285 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -13,53 +13,53 @@ LavaridgeTown_Gym_1F_EventScript_15369F:: @ 815369F setvar VAR_TEMP_D, 0 setvar VAR_TEMP_E, 0 setvar VAR_TEMP_F, 0 - goto_if_trainer_defeated OPPONENT_COLE, LavaridgeTown_Gym_1F_EventScript_1536C6 + goto_if_trainer_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_1536C6 setvar VAR_TEMP_B, 1 LavaridgeTown_Gym_1F_EventScript_1536C6:: @ 81536C6 - goto_if_trainer_defeated OPPONENT_ZANE, LavaridgeTown_Gym_1F_EventScript_1536D4 + goto_if_trainer_defeated TRAINER_ZANE, LavaridgeTown_Gym_1F_EventScript_1536D4 setvar VAR_TEMP_C, 1 LavaridgeTown_Gym_1F_EventScript_1536D4:: @ 81536D4 - goto_if_trainer_defeated OPPONENT_AXLE, LavaridgeTown_Gym_1F_EventScript_1536E2 + goto_if_trainer_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_1536E2 setvar VAR_TEMP_D, 1 LavaridgeTown_Gym_1F_EventScript_1536E2:: @ 81536E2 - goto_if_trainer_defeated OPPONENT_SADIE, LavaridgeTown_Gym_1F_EventScript_1536F0 + goto_if_trainer_defeated TRAINER_SADIE, LavaridgeTown_Gym_1F_EventScript_1536F0 setvar VAR_TEMP_E, 1 LavaridgeTown_Gym_1F_EventScript_1536F0:: @ 81536F0 - goto_if_trainer_defeated OPPONENT_ANDY, LavaridgeTown_Gym_1F_EventScript_1536FE + goto_if_trainer_defeated TRAINER_ANDY, LavaridgeTown_Gym_1F_EventScript_1536FE setvar VAR_TEMP_F, 1 LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE return LavaridgeTown_Gym_1F_EventScript_1536FF:: @ 81536FF - goto_if_trainer_defeated OPPONENT_COLE, LavaridgeTown_Gym_1F_EventScript_15370C + goto_if_trainer_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_15370C setobjectmovementtype 2, 63 LavaridgeTown_Gym_1F_EventScript_15370C:: @ 815370C - goto_if_trainer_defeated OPPONENT_ZANE, LavaridgeTown_Gym_1F_EventScript_153719 + goto_if_trainer_defeated TRAINER_ZANE, LavaridgeTown_Gym_1F_EventScript_153719 setobjectmovementtype 3, 63 LavaridgeTown_Gym_1F_EventScript_153719:: @ 8153719 - goto_if_trainer_defeated OPPONENT_AXLE, LavaridgeTown_Gym_1F_EventScript_153726 + goto_if_trainer_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_153726 setobjectmovementtype 4, 63 LavaridgeTown_Gym_1F_EventScript_153726:: @ 8153726 - goto_if_trainer_defeated OPPONENT_SADIE, LavaridgeTown_Gym_1F_EventScript_153733 + goto_if_trainer_defeated TRAINER_SADIE, LavaridgeTown_Gym_1F_EventScript_153733 setobjectmovementtype 5, 63 LavaridgeTown_Gym_1F_EventScript_153733:: @ 8153733 - goto_if_trainer_defeated OPPONENT_ANDY, LavaridgeTown_Gym_1F_EventScript_153740 + goto_if_trainer_defeated TRAINER_ANDY, LavaridgeTown_Gym_1F_EventScript_153740 setobjectmovementtype 7, 63 LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 return LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741 - trainerbattle 1, OPPONENT_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766 + trainerbattle 1, TRAINER_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766 goto_if_unset FLAG_RECEIVED_TM50, LavaridgeTown_Gym_1F_EventScript_1537A7 msgbox LavaridgeTown_Gym_1F_Text_176C4A, 4 release @@ -92,7 +92,7 @@ LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 end LavaridgeTown_Gym_1F_EventScript_1537CB:: @ 81537CB - trainerbattle 2, OPPONENT_COLE, 2, LavaridgeTown_Gym_1F_Text_176432, LavaridgeTown_Gym_1F_Text_17644F, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_176432, LavaridgeTown_Gym_1F_Text_17644F, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_176472, 6 end @@ -102,22 +102,22 @@ LavaridgeTown_Gym_1F_EventScript_1537E6:: @ 81537E6 end LavaridgeTown_Gym_1F_EventScript_1537ED:: @ 81537ED - trainerbattle 2, OPPONENT_AXLE, 4, LavaridgeTown_Gym_1F_Text_1764D1, LavaridgeTown_Gym_1F_Text_176516, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1764D1, LavaridgeTown_Gym_1F_Text_176516, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_176537, 6 end LavaridgeTown_Gym_1F_EventScript_153808:: @ 8153808 - trainerbattle 2, OPPONENT_ANDY, 7, LavaridgeTown_Gym_1F_Text_17658D, LavaridgeTown_Gym_1F_Text_17663F, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, TRAINER_ANDY, 7, LavaridgeTown_Gym_1F_Text_17658D, LavaridgeTown_Gym_1F_Text_17663F, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_176660, 6 end LavaridgeTown_Gym_1F_EventScript_153823:: @ 8153823 - trainerbattle 2, OPPONENT_SADIE, 5, LavaridgeTown_Gym_1F_Text_176784, LavaridgeTown_Gym_1F_Text_1767A6, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, TRAINER_SADIE, 5, LavaridgeTown_Gym_1F_Text_176784, LavaridgeTown_Gym_1F_Text_1767A6, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_1767C1, 6 end LavaridgeTown_Gym_1F_EventScript_15383E:: @ 815383E - trainerbattle 2, OPPONENT_ZANE, 3, LavaridgeTown_Gym_1F_Text_1766D2, LavaridgeTown_Gym_1F_Text_1766FE, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, TRAINER_ZANE, 3, LavaridgeTown_Gym_1F_Text_1766D2, LavaridgeTown_Gym_1F_Text_1766FE, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_17671D, 6 end diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 081914bda..e32582b24 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -303,32 +303,32 @@ LilycoveCity_EventScript_14CE35:: @ 814CE35 end LilycoveCity_EventScript_14CE46:: @ 814CE46 - trainerbattle 3, OPPONENT_MAY_11, 0, LilycoveCity_Text_167BD5 + trainerbattle 3, TRAINER_MAY_11, 0, LilycoveCity_Text_167BD5 goto LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE56:: @ 814CE56 - trainerbattle 3, OPPONENT_MAY_12, 0, LilycoveCity_Text_167BD5 + trainerbattle 3, TRAINER_MAY_12, 0, LilycoveCity_Text_167BD5 goto LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE66:: @ 814CE66 - trainerbattle 3, OPPONENT_MAY_10, 0, LilycoveCity_Text_167BD5 + trainerbattle 3, TRAINER_MAY_10, 0, LilycoveCity_Text_167BD5 goto LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE76:: @ 814CE76 - trainerbattle 3, OPPONENT_BRENDAN_11, 0, LilycoveCity_Text_1680E4 + trainerbattle 3, TRAINER_BRENDAN_11, 0, LilycoveCity_Text_1680E4 goto LilycoveCity_EventScript_14CF12 end LilycoveCity_EventScript_14CE86:: @ 814CE86 - trainerbattle 3, OPPONENT_BRENDAN_12, 0, LilycoveCity_Text_1680E4 + trainerbattle 3, TRAINER_BRENDAN_12, 0, LilycoveCity_Text_1680E4 goto LilycoveCity_EventScript_14CF12 end LilycoveCity_EventScript_14CE96:: @ 814CE96 - trainerbattle 3, OPPONENT_BRENDAN_10, 0, LilycoveCity_Text_1680E4 + trainerbattle 3, TRAINER_BRENDAN_10, 0, LilycoveCity_Text_1680E4 goto LilycoveCity_EventScript_14CF12 end diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index bd4f8ab3d..f5eb064e5 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -160,7 +160,7 @@ MauvilleCity_EventScript_14C22B:: @ 814C22B MauvilleCity_EventScript_14C23C:: @ 814C23C msgbox MauvilleCity_Text_165F0D, 4 - trainerbattle 3, OPPONENT_WALLY_2, 0, MauvilleCity_Text_165F38 + trainerbattle 3, TRAINER_WALLY_2, 0, MauvilleCity_Text_165F38 applymovement 6, MauvilleCity_Movement_1A0843 waitmovement 0 msgbox MauvilleCity_Text_165F85, 4 diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index d9b8aced7..ae10eadfd 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -66,7 +66,7 @@ MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7 end MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB - trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB + trainerbattle 1, TRAINER_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_15661D compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_156641 @@ -161,22 +161,22 @@ MauvilleCity_Gym_EventScript_1566E1:: @ 81566E1 end MauvilleCity_Gym_EventScript_1566E6:: @ 81566E6 - trainerbattle 0, OPPONENT_KIRK, 0, MauvilleCity_Gym_Text_180956, MauvilleCity_Gym_Text_180997 + trainerbattle 0, TRAINER_KIRK, 0, MauvilleCity_Gym_Text_180956, MauvilleCity_Gym_Text_180997 msgbox MauvilleCity_Gym_Text_1809D1, 6 end MauvilleCity_Gym_EventScript_1566FD:: @ 81566FD - trainerbattle 0, OPPONENT_SHAWN, 0, MauvilleCity_Gym_Text_180A05, MauvilleCity_Gym_Text_180A42 + trainerbattle 0, TRAINER_SHAWN, 0, MauvilleCity_Gym_Text_180A05, MauvilleCity_Gym_Text_180A42 msgbox MauvilleCity_Gym_Text_180A5E, 6 end MauvilleCity_Gym_EventScript_156714:: @ 8156714 - trainerbattle 0, OPPONENT_BEN, 0, MauvilleCity_Gym_Text_180AE0, MauvilleCity_Gym_Text_180B06 + trainerbattle 0, TRAINER_BEN, 0, MauvilleCity_Gym_Text_180AE0, MauvilleCity_Gym_Text_180B06 msgbox MauvilleCity_Gym_Text_180B1D, 6 end MauvilleCity_Gym_EventScript_15672B:: @ 815672B - trainerbattle 0, OPPONENT_VIVIAN, 0, MauvilleCity_Gym_Text_180B5A, MauvilleCity_Gym_Text_180B93 + trainerbattle 0, TRAINER_VIVIAN, 0, MauvilleCity_Gym_Text_180B5A, MauvilleCity_Gym_Text_180B93 msgbox MauvilleCity_Gym_Text_180BAE, 6 end diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc index 49d629294..92b9f4661 100644 --- a/data/maps/MeteorFalls_1F_2R/scripts.inc +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -2,7 +2,7 @@ MeteorFalls_1F_2R_MapScripts:: @ 815C678 .byte 0 MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 - trainerbattle 0, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 + trainerbattle 0, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6A0 @@ -10,12 +10,12 @@ MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 end MeteorFalls_1F_2R_EventScript_15C6A0:: @ 815C6A0 - trainerbattle 5, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_193AB3, MeteorFalls_1F_2R_Text_193B21 + trainerbattle 5, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_193AB3, MeteorFalls_1F_2R_Text_193B21 msgbox MeteorFalls_1F_2R_Text_193B4C, 6 end MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 - trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F + trainerbattle 4, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6E2 @@ -23,12 +23,12 @@ MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 end MeteorFalls_1F_2R_EventScript_15C6E2:: @ 815C6E2 - trainerbattle 7, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193E75, MeteorFalls_1F_2R_Text_193ECE, MeteorFalls_1F_2R_Text_193F59 + trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193E75, MeteorFalls_1F_2R_Text_193ECE, MeteorFalls_1F_2R_Text_193F59 msgbox MeteorFalls_1F_2R_Text_193EF3, 6 end MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD - trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB + trainerbattle 4, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C728 @@ -36,6 +36,6 @@ MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD end MeteorFalls_1F_2R_EventScript_15C728:: @ 815C728 - trainerbattle 7, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193FCA, MeteorFalls_1F_2R_Text_19403A, MeteorFalls_1F_2R_Text_1940DF + trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193FCA, MeteorFalls_1F_2R_Text_19403A, MeteorFalls_1F_2R_Text_1940DF msgbox MeteorFalls_1F_2R_Text_194066, 6 end diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index a17d09e10..0fa79a6ec 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -45,7 +45,7 @@ MossdeepCity_Gym_EventScript_15A558:: @ 815A558 end MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B - trainerbattle 8, OPPONENT_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594 + trainerbattle 8, TRAINER_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594 goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_15A5C6 msgbox MossdeepCity_Gym_Text_18D273, 4 release @@ -169,32 +169,32 @@ MossdeepCity_Gym_EventScript_15A742:: @ 815A742 end MossdeepCity_Gym_EventScript_15A74E:: @ 815A74E - trainerbattle 0, OPPONENT_PRESTON, 0, MossdeepCity_Gym_Text_18C96A, MossdeepCity_Gym_Text_18C9BA + trainerbattle 0, TRAINER_PRESTON, 0, MossdeepCity_Gym_Text_18C96A, MossdeepCity_Gym_Text_18C9BA msgbox MossdeepCity_Gym_Text_18C9E1, 6 end MossdeepCity_Gym_EventScript_15A765:: @ 815A765 - trainerbattle 0, OPPONENT_VIRGIL, 0, MossdeepCity_Gym_Text_18CA10, MossdeepCity_Gym_Text_18CA28 + trainerbattle 0, TRAINER_VIRGIL, 0, MossdeepCity_Gym_Text_18CA10, MossdeepCity_Gym_Text_18CA28 msgbox MossdeepCity_Gym_Text_18CA48, 6 end MossdeepCity_Gym_EventScript_15A77C:: @ 815A77C - trainerbattle 0, OPPONENT_FRITZ, 0, MossdeepCity_Gym_Text_18CAC0, MossdeepCity_Gym_Text_18CB46 + trainerbattle 0, TRAINER_FRITZ, 0, MossdeepCity_Gym_Text_18CAC0, MossdeepCity_Gym_Text_18CB46 msgbox MossdeepCity_Gym_Text_18CB77, 6 end MossdeepCity_Gym_EventScript_15A793:: @ 815A793 - trainerbattle 0, OPPONENT_HANNAH, 0, MossdeepCity_Gym_Text_18CC1E, MossdeepCity_Gym_Text_18CC83 + trainerbattle 0, TRAINER_HANNAH, 0, MossdeepCity_Gym_Text_18CC1E, MossdeepCity_Gym_Text_18CC83 msgbox MossdeepCity_Gym_Text_18CC9B, 6 end MossdeepCity_Gym_EventScript_15A7AA:: @ 815A7AA - trainerbattle 0, OPPONENT_SAMANTHA, 0, MossdeepCity_Gym_Text_18CD14, MossdeepCity_Gym_Text_18CD66 + trainerbattle 0, TRAINER_SAMANTHA, 0, MossdeepCity_Gym_Text_18CD14, MossdeepCity_Gym_Text_18CD66 msgbox MossdeepCity_Gym_Text_18CD73, 6 end MossdeepCity_Gym_EventScript_15A7C1:: @ 815A7C1 - trainerbattle 0, OPPONENT_MAURA, 0, MossdeepCity_Gym_Text_18CDE0, MossdeepCity_Gym_Text_18CE47 + trainerbattle 0, TRAINER_MAURA, 0, MossdeepCity_Gym_Text_18CDE0, MossdeepCity_Gym_Text_18CE47 msgbox MossdeepCity_Gym_Text_18CE6C, 6 end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index f13850570..a3906af8c 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -330,20 +330,20 @@ MtChimney_EventScript_15D107:: @ 815D107 MtChimney_EventScript_15D110:: @ 815D110 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3168, MtChimney_Text_1B31EA + trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3168, MtChimney_Text_1B31EA msgbox MtChimney_Text_1B3239, 6 .else - trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8 + trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8 msgbox MtChimney_Text_1B3C07, 6 .endif end MtChimney_EventScript_15D127:: @ 815D127 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B32C8, MtChimney_Text_1B336E + trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B32C8, MtChimney_Text_1B336E msgbox MtChimney_Text_1B338D, 6 .else - trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E + trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E msgbox MtChimney_Text_1B3D3D, 6 .endif end @@ -437,7 +437,7 @@ MtChimney_EventScript_15D1DA:: @ 815D1DA end MtChimney_EventScript_15D1E3:: @ 815D1E3 - trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 + trainerbattle 0, TRAINER_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MtChimney_EventScript_15D20A @@ -445,21 +445,21 @@ MtChimney_EventScript_15D1E3:: @ 815D1E3 end MtChimney_EventScript_15D20A:: @ 815D20A - trainerbattle 5, OPPONENT_SHELBY_1, 0, MtChimney_Text_195A45, MtChimney_Text_195AAD + trainerbattle 5, TRAINER_SHELBY_1, 0, MtChimney_Text_195A45, MtChimney_Text_195AAD msgbox MtChimney_Text_195AD9, 6 end MtChimney_EventScript_15D221:: @ 815D221 - trainerbattle 0, OPPONENT_MELISSA, 0, MtChimney_Text_195B1C, MtChimney_Text_195B5F + trainerbattle 0, TRAINER_MELISSA, 0, MtChimney_Text_195B1C, MtChimney_Text_195B5F msgbox MtChimney_Text_195B84, 6 end MtChimney_EventScript_15D238:: @ 815D238 - trainerbattle 0, OPPONENT_SHEILA, 0, MtChimney_Text_195BB2, MtChimney_Text_195BF9 + trainerbattle 0, TRAINER_SHEILA, 0, MtChimney_Text_195BB2, MtChimney_Text_195BF9 msgbox MtChimney_Text_195C31, 6 end MtChimney_EventScript_15D24F:: @ 815D24F - trainerbattle 0, OPPONENT_SHIRLEY, 0, MtChimney_Text_195CD8, MtChimney_Text_195D2F + trainerbattle 0, TRAINER_SHIRLEY, 0, MtChimney_Text_195CD8, MtChimney_Text_195D2F msgbox MtChimney_Text_195D5C, 6 end diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index 1d2368597..d2ef2894e 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -18,16 +18,16 @@ MtPyre_2F_EventScript_15D392:: @ 815D392 end MtPyre_2F_EventScript_15D39B:: @ 815D39B - trainerbattle 0, OPPONENT_MARK, 0, MtPyre_2F_Text_196674, MtPyre_2F_Text_1966BE + trainerbattle 0, TRAINER_MARK, 0, MtPyre_2F_Text_196674, MtPyre_2F_Text_1966BE msgbox MtPyre_2F_Text_1966E7, 6 end MtPyre_2F_EventScript_15D3B2:: @ 815D3B2 - trainerbattle 4, OPPONENT_DEZ_AND_LUKE, 0, MtPyre_2F_Text_1962C6, MtPyre_2F_Text_196358, MtPyre_2F_Text_1963CB + trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_1962C6, MtPyre_2F_Text_196358, MtPyre_2F_Text_1963CB msgbox MtPyre_2F_Text_196368, 6 end MtPyre_2F_EventScript_15D3CD:: @ 815D3CD - trainerbattle 4, OPPONENT_DEZ_AND_LUKE, 0, MtPyre_2F_Text_196449, MtPyre_2F_Text_1964EB, MtPyre_2F_Text_196539 + trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_196449, MtPyre_2F_Text_1964EB, MtPyre_2F_Text_196539 msgbox MtPyre_2F_Text_196504, 6 end diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc index ea8bda7b5..69a57df19 100644 --- a/data/maps/MtPyre_3F/scripts.inc +++ b/data/maps/MtPyre_3F/scripts.inc @@ -2,11 +2,11 @@ MtPyre_3F_MapScripts:: @ 815D3E8 .byte 0 MtPyre_3F_EventScript_15D3E9:: @ 815D3E9 - trainerbattle 0, OPPONENT_WILLIAM, 0, MtPyre_3F_Text_19672B, MtPyre_3F_Text_19679D + trainerbattle 0, TRAINER_WILLIAM, 0, MtPyre_3F_Text_19672B, MtPyre_3F_Text_19679D msgbox MtPyre_3F_Text_1967B5, 6 end MtPyre_3F_EventScript_15D400:: @ 815D400 - trainerbattle 0, OPPONENT_KAYLA, 0, MtPyre_3F_Text_1967EF, MtPyre_3F_Text_19682B + trainerbattle 0, TRAINER_KAYLA, 0, MtPyre_3F_Text_1967EF, MtPyre_3F_Text_19682B msgbox MtPyre_3F_Text_196842, 6 end diff --git a/data/maps/MtPyre_4F/scripts.inc b/data/maps/MtPyre_4F/scripts.inc index e1ebac7c1..3910d6f45 100644 --- a/data/maps/MtPyre_4F/scripts.inc +++ b/data/maps/MtPyre_4F/scripts.inc @@ -2,6 +2,6 @@ MtPyre_4F_MapScripts:: @ 815D417 .byte 0 MtPyre_4F_EventScript_15D418:: @ 815D418 - trainerbattle 0, OPPONENT_ATSUSHI, 0, MtPyre_4F_Text_1968A6, MtPyre_4F_Text_1968D0 + trainerbattle 0, TRAINER_ATSUSHI, 0, MtPyre_4F_Text_1968A6, MtPyre_4F_Text_1968D0 msgbox MtPyre_4F_Text_1968EE, 6 end diff --git a/data/maps/MtPyre_5F/scripts.inc b/data/maps/MtPyre_5F/scripts.inc index 9adb249f0..8cec3a32f 100644 --- a/data/maps/MtPyre_5F/scripts.inc +++ b/data/maps/MtPyre_5F/scripts.inc @@ -2,6 +2,6 @@ MtPyre_5F_MapScripts:: @ 815D42F .byte 0 MtPyre_5F_EventScript_15D430:: @ 815D430 - trainerbattle 0, OPPONENT_TASHA, 0, MtPyre_5F_Text_196939, MtPyre_5F_Text_196997 + trainerbattle 0, TRAINER_TASHA, 0, MtPyre_5F_Text_196939, MtPyre_5F_Text_196997 msgbox MtPyre_5F_Text_1969AC, 6 end diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index ae09300a3..92086949f 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -2,7 +2,7 @@ MtPyre_6F_MapScripts:: @ 815D447 .byte 0 MtPyre_6F_EventScript_15D448:: @ 815D448 - trainerbattle 0, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 + trainerbattle 0, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MtPyre_6F_EventScript_15D46F @@ -10,6 +10,6 @@ MtPyre_6F_EventScript_15D448:: @ 815D448 end MtPyre_6F_EventScript_15D46F:: @ 815D46F - trainerbattle 5, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_196A95, MtPyre_6F_Text_196AB1 + trainerbattle 5, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_196A95, MtPyre_6F_Text_196AB1 msgbox MtPyre_6F_Text_196AC9, 6 end diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index a3fb5c494..44398e6d5 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -15,13 +15,13 @@ PetalburgCity_Gym_MapScript1_15448C:: @ 815448C PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 setvar VAR_SPECIAL_5, 1 call PetalburgCity_Gym_EventScript_154F9A - call_if_trainer_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154FBB - call_if_trainer_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154FDC - call_if_trainer_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154FFD - call_if_trainer_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_15501E - call_if_trainer_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_15503F - call_if_trainer_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_155060 - call_if_trainer_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_155081 + call_if_trainer_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154FBB + call_if_trainer_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154FDC + call_if_trainer_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_154FFD + call_if_trainer_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_15501E + call_if_trainer_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_15503F + call_if_trainer_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_155060 + call_if_trainer_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_155081 end PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED @@ -382,7 +382,7 @@ PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 msgbox PetalburgCity_Gym_Text_17A653, 4 - trainerbattle 3, OPPONENT_NORMAN, 0, PetalburgCity_Gym_Text_17A77A + trainerbattle 3, TRAINER_NORMAN, 0, PetalburgCity_Gym_Text_17A77A message PetalburgCity_Gym_Text_17A7DD waitmessage call PetalburgCity_Gym_EventScript_1A02C5 @@ -625,7 +625,7 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 lockall - goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 46 msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO @@ -637,7 +637,7 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B lockall - goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -649,7 +649,7 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E lockall - goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -661,7 +661,7 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 lockall - goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 72 msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO @@ -673,7 +673,7 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 lockall - goto_if_trainer_not_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -685,7 +685,7 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 lockall - goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -697,7 +697,7 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A lockall - goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -709,7 +709,7 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D lockall - goto_if_trainer_not_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -721,7 +721,7 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 lockall - goto_if_trainer_not_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO @@ -733,7 +733,7 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 lockall - goto_if_trainer_not_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO @@ -744,7 +744,7 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 end PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 - trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A + trainerbattle 2, TRAINER_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E29 msgbox PetalburgCity_Gym_Text_17AE30, 6 end @@ -761,7 +761,7 @@ PetalburgCity_Gym_EventScript_154E29:: @ 8154E29 end PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 - trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 + trainerbattle 2, TRAINER_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E65 msgbox PetalburgCity_Gym_Text_17AFD3, 6 end @@ -778,7 +778,7 @@ PetalburgCity_Gym_EventScript_154E65:: @ 8154E65 end PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E - trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 + trainerbattle 2, TRAINER_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EA1 msgbox PetalburgCity_Gym_Text_17B12C, 6 end @@ -795,7 +795,7 @@ PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1 end PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA - trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE + trainerbattle 2, TRAINER_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EDD msgbox PetalburgCity_Gym_Text_17B2E4, 6 end @@ -812,7 +812,7 @@ PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD end PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 - trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A + trainerbattle 2, TRAINER_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F19 msgbox PetalburgCity_Gym_Text_17B46F, 6 end @@ -829,7 +829,7 @@ PetalburgCity_Gym_EventScript_154F19:: @ 8154F19 end PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 - trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 + trainerbattle 2, TRAINER_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F55 msgbox PetalburgCity_Gym_Text_17B5EA, 6 end @@ -846,7 +846,7 @@ PetalburgCity_Gym_EventScript_154F55:: @ 8154F55 end PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E - trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 + trainerbattle 2, TRAINER_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F91 msgbox PetalburgCity_Gym_Text_17B749, 6 end diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 69b85d743..8d1651d3a 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -30,7 +30,7 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 applymovement 3, PetalburgWoods_Movement_15CEC8 waitmovement 0 msgbox PetalburgWoods_Text_194EE8, 4 - trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 + trainerbattle 3, TRAINER_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 applymovement 3, PetalburgWoods_Movement_15CEB3 waitmovement 0 call PetalburgWoods_EventScript_15CDFA @@ -65,7 +65,7 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42 applymovement 255, PetalburgWoods_Movement_1A0841 waitmovement 0 msgbox PetalburgWoods_Text_194EE8, 4 - trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 + trainerbattle 3, TRAINER_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 applymovement 3, PetalburgWoods_Movement_15CEB3 waitmovement 0 call PetalburgWoods_EventScript_15CDFA @@ -264,12 +264,12 @@ PetalburgWoods_EventScript_15CF1E:: @ 815CF1E end PetalburgWoods_EventScript_15CF27:: @ 815CF27 - trainerbattle 0, OPPONENT_LYLE, 0, PetalburgWoods_Text_1951BE, PetalburgWoods_Text_195202 + trainerbattle 0, TRAINER_LYLE, 0, PetalburgWoods_Text_1951BE, PetalburgWoods_Text_195202 msgbox PetalburgWoods_Text_195232, 6 end PetalburgWoods_EventScript_15CF3E:: @ 815CF3E - trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE + trainerbattle 0, TRAINER_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq PetalburgWoods_EventScript_15CF65 @@ -277,6 +277,6 @@ PetalburgWoods_EventScript_15CF3E:: @ 815CF3E end PetalburgWoods_EventScript_15CF65:: @ 815CF65 - trainerbattle 5, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338 + trainerbattle 5, TRAINER_JAMES_1, 0, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338 msgbox PetalburgWoods_Text_195356, 6 end diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index ad1571caa..758d05d45 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -18,7 +18,7 @@ Route102_EventScript_14EAF5:: @ 814EAF5 end Route102_EventScript_14EAFE:: @ 814EAFE - trainerbattle 0, OPPONENT_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C + trainerbattle 0, TRAINER_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route102_EventScript_14EB25 @@ -26,21 +26,21 @@ Route102_EventScript_14EAFE:: @ 814EAFE end Route102_EventScript_14EB25:: @ 814EB25 - trainerbattle 5, OPPONENT_CALVIN_1, 0, Route102_Text_1B7A9F, Route102_Text_1B7AFD + trainerbattle 5, TRAINER_CALVIN_1, 0, Route102_Text_1B7A9F, Route102_Text_1B7AFD msgbox Route102_Text_1B7B2F, 6 end Route102_EventScript_14EB3C:: @ 814EB3C - trainerbattle 0, OPPONENT_RICK, 0, Route102_Text_1B7C05, Route102_Text_1B7C40 + trainerbattle 0, TRAINER_RICK, 0, Route102_Text_1B7C05, Route102_Text_1B7C40 msgbox Route102_Text_1B7C52, 6 end Route102_EventScript_14EB53:: @ 814EB53 - trainerbattle 0, OPPONENT_TIANA, 0, Route102_Text_1B7C97, Route102_Text_1B7CEC + trainerbattle 0, TRAINER_TIANA, 0, Route102_Text_1B7C97, Route102_Text_1B7CEC msgbox Route102_Text_1B7D11, 6 end Route102_EventScript_14EB6A:: @ 814EB6A - trainerbattle 0, OPPONENT_ALLEN, 0, Route102_Text_1B7B68, Route102_Text_1B7B9D + trainerbattle 0, TRAINER_ALLEN, 0, Route102_Text_1B7B68, Route102_Text_1B7B9D msgbox Route102_Text_1B7BD0, 6 end diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 361dc78c3..625fc5271 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -49,32 +49,32 @@ Route103_EventScript_14EC04:: @ 814EC04 end Route103_EventScript_14EC5D:: @ 814EC5D - trainerbattle 3, OPPONENT_MAY_4, 0, Route103_Text_16D65B + trainerbattle 3, TRAINER_MAY_4, 0, Route103_Text_16D65B goto Route103_EventScript_14ECBD end Route103_EventScript_14EC6D:: @ 814EC6D - trainerbattle 3, OPPONENT_MAY_7, 0, Route103_Text_16D65B + trainerbattle 3, TRAINER_MAY_7, 0, Route103_Text_16D65B goto Route103_EventScript_14ECBD end Route103_EventScript_14EC7D:: @ 814EC7D - trainerbattle 3, OPPONENT_MAY_1, 0, Route103_Text_16D65B + trainerbattle 3, TRAINER_MAY_1, 0, Route103_Text_16D65B goto Route103_EventScript_14ECBD end Route103_EventScript_14EC8D:: @ 814EC8D - trainerbattle 3, OPPONENT_BRENDAN_4, 0, Route103_Text_16D836 + trainerbattle 3, TRAINER_BRENDAN_4, 0, Route103_Text_16D836 goto Route103_EventScript_14ECCB end Route103_EventScript_14EC9D:: @ 814EC9D - trainerbattle 3, OPPONENT_BRENDAN_7, 0, Route103_Text_16D836 + trainerbattle 3, TRAINER_BRENDAN_7, 0, Route103_Text_16D836 goto Route103_EventScript_14ECCB end Route103_EventScript_14ECAD:: @ 814ECAD - trainerbattle 3, OPPONENT_BRENDAN_1, 0, Route103_Text_16D836 + trainerbattle 3, TRAINER_BRENDAN_1, 0, Route103_Text_16D836 goto Route103_EventScript_14ECCB end @@ -167,12 +167,12 @@ Route103_EventScript_14ED8B:: @ 814ED8B end Route103_EventScript_14ED94:: @ 814ED94 - trainerbattle 0, OPPONENT_DAISY, 0, Route103_Text_1B7D55, Route103_Text_1B7D8B + trainerbattle 0, TRAINER_DAISY, 0, Route103_Text_1B7D55, Route103_Text_1B7D8B msgbox Route103_Text_1B7DB2, 6 end Route103_EventScript_14EDAB:: @ 814EDAB - trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC + trainerbattle 4, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EDD6 @@ -180,12 +180,12 @@ Route103_EventScript_14EDAB:: @ 814EDAB end Route103_EventScript_14EDD6:: @ 814EDD6 - trainerbattle 7, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7FE7, Route103_Text_1B802B, Route103_Text_1B80AF + trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7FE7, Route103_Text_1B802B, Route103_Text_1B80AF msgbox Route103_Text_1B8053, 6 end Route103_EventScript_14EDF1:: @ 814EDF1 - trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E + trainerbattle 4, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EE1C @@ -193,17 +193,17 @@ Route103_EventScript_14EDF1:: @ 814EDF1 end Route103_EventScript_14EE1C:: @ 814EE1C - trainerbattle 7, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B80FE, Route103_Text_1B8123, Route103_Text_1B81A1 + trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B80FE, Route103_Text_1B8123, Route103_Text_1B81A1 msgbox Route103_Text_1B814D, 6 end Route103_EventScript_14EE37:: @ 814EE37 - trainerbattle 0, OPPONENT_ANDREW, 0, Route103_Text_1B81FA, Route103_Text_1B8258 + trainerbattle 0, TRAINER_ANDREW, 0, Route103_Text_1B81FA, Route103_Text_1B8258 msgbox Route103_Text_1B8281, 6 end Route103_EventScript_14EE4E:: @ 814EE4E - trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC + trainerbattle 0, TRAINER_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EE75 @@ -211,6 +211,6 @@ Route103_EventScript_14EE4E:: @ 814EE4E end Route103_EventScript_14EE75:: @ 814EE75 - trainerbattle 5, OPPONENT_MIGUEL_1, 0, Route103_Text_1B8349, Route103_Text_1B838C + trainerbattle 5, TRAINER_MIGUEL_1, 0, Route103_Text_1B8349, Route103_Text_1B838C msgbox Route103_Text_1B83A4, 6 end diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 8fda04ea5..9b055f134 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -391,17 +391,17 @@ Route104_Movement_14F16F:: @ 814F16F end_movement Route104_EventScript_14F172:: @ 814F172 - trainerbattle 0, OPPONENT_IVAN, 0, Route104_Text_1B85EB, Route104_Text_1B8637 + trainerbattle 0, TRAINER_IVAN, 0, Route104_Text_1B85EB, Route104_Text_1B8637 msgbox Route104_Text_1B8680, 6 end Route104_EventScript_14F189:: @ 814F189 - trainerbattle 0, OPPONENT_BILLY, 0, Route104_Text_1B86BE, Route104_Text_1B86E8 + trainerbattle 0, TRAINER_BILLY, 0, Route104_Text_1B86BE, Route104_Text_1B86E8 msgbox Route104_Text_1B871C, 6 end Route104_EventScript_14F1A0:: @ 814F1A0 - trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 + trainerbattle 0, TRAINER_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F1C7 @@ -409,12 +409,12 @@ Route104_EventScript_14F1A0:: @ 814F1A0 end Route104_EventScript_14F1C7:: @ 814F1C7 - trainerbattle 5, OPPONENT_HALEY_1, 0, Route104_Text_1B8839, Route104_Text_1B8852 + trainerbattle 5, TRAINER_HALEY_1, 0, Route104_Text_1B8839, Route104_Text_1B8852 msgbox Route104_Text_1B8872, 6 end Route104_EventScript_14F1DE:: @ 814F1DE - trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 + trainerbattle 0, TRAINER_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F205 @@ -422,12 +422,12 @@ Route104_EventScript_14F1DE:: @ 814F1DE end Route104_EventScript_14F205:: @ 814F205 - trainerbattle 5, OPPONENT_WINSTON_1, 0, Route104_Text_1B895E, Route104_Text_1B899E + trainerbattle 5, TRAINER_WINSTON_1, 0, Route104_Text_1B895E, Route104_Text_1B899E msgbox Route104_Text_1B89C0, 6 end Route104_EventScript_14F21C:: @ 814F21C - trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 + trainerbattle 0, TRAINER_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F243 @@ -435,19 +435,19 @@ Route104_EventScript_14F21C:: @ 814F21C end Route104_EventScript_14F243:: @ 814F243 - trainerbattle 5, OPPONENT_CINDY_1, 0, Route104_Text_1B8AA7, Route104_Text_1B8AD9 + trainerbattle 5, TRAINER_CINDY_1, 0, Route104_Text_1B8AA7, Route104_Text_1B8AD9 msgbox Route104_Text_1B8B02, 6 end Route104_EventScript_14F25A:: @ 814F25A - trainerbattle 4, OPPONENT_GINA_AND_MIA_1, 0, Route104_Text_1B83E9, Route104_Text_1B8414, Route104_Text_1B845C + trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_1B83E9, Route104_Text_1B8414, Route104_Text_1B845C special GetPlayerBigGuyGirlString msgbox Route104_Text_1B842C, 4 release end Route104_EventScript_14F279:: @ 814F279 - trainerbattle 4, OPPONENT_GINA_AND_MIA_1, 0, Route104_Text_1B84DB, Route104_Text_1B850D, Route104_Text_1B8577 + trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_1B84DB, Route104_Text_1B850D, Route104_Text_1B8577 special GetPlayerBigGuyGirlString msgbox Route104_Text_1B853B, 4 release diff --git a/data/maps/Route104_Prototype/scripts.inc b/data/maps/Route104_Prototype/scripts.inc index e0aba01c9..1b8458e62 100644 --- a/data/maps/Route104_Prototype/scripts.inc +++ b/data/maps/Route104_Prototype/scripts.inc @@ -4,12 +4,12 @@ Route104_Prototype_MapScripts:: @ 8160C4A Route104_Prototype_EventScript_160C4B:: @ 8160C4B lock faceplayer - goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_BRIANNA_1, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_CINDY_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_AMY_AND_LIV_3, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_GINA_AND_MIA_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_LUCAS_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_MIKE_1, Route104_Prototype_EventScript_160C99 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 msgbox Route104_Prototype_Text_19B267, 4 goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_2, Route104_Prototype_EventScript_160CFB @@ -24,12 +24,12 @@ Route104_Prototype_EventScript_160C99:: @ 8160C99 Route104_Prototype_EventScript_160CA3:: @ 8160CA3 lock faceplayer - goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_BRIANNA_1, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_CINDY_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_AMY_AND_LIV_3, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_GINA_AND_MIA_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_LUCAS_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_MIKE_1, Route104_Prototype_EventScript_160CF1 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 msgbox Route104_Prototype_Text_19B2E9, 4 goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_1, Route104_Prototype_EventScript_160CFB @@ -68,31 +68,31 @@ Route104_Prototype_EventScript_160D25:: @ 8160D25 end Route104_Prototype_EventScript_160D2E:: @ 8160D2E - trainerbattle 0, OPPONENT_CINDY_2, 0, Route104_Prototype_Text_19AD9B, Route104_Prototype_Text_19ADDA + trainerbattle 0, TRAINER_CINDY_2, 0, Route104_Prototype_Text_19AD9B, Route104_Prototype_Text_19ADDA msgbox Route104_Prototype_Text_19ADF7, 6 end Route104_Prototype_EventScript_160D45:: @ 8160D45 - trainerbattle 4, OPPONENT_AMY_AND_LIV_3, 0, Route104_Prototype_Text_19AE3E, Route104_Prototype_Text_19AE53, Route104_Prototype_Text_19AEA9 + trainerbattle 4, TRAINER_AMY_AND_LIV_3, 0, Route104_Prototype_Text_19AE3E, Route104_Prototype_Text_19AE53, Route104_Prototype_Text_19AEA9 msgbox Route104_Prototype_Text_19AE6A, 6 end Route104_Prototype_EventScript_160D60:: @ 8160D60 - trainerbattle 4, OPPONENT_GINA_AND_MIA_2, 0, Route104_Prototype_Text_19B148, Route104_Prototype_Text_19B17D, Route104_Prototype_Text_19B1DD + trainerbattle 4, TRAINER_GINA_AND_MIA_2, 0, Route104_Prototype_Text_19B148, Route104_Prototype_Text_19B17D, Route104_Prototype_Text_19B1DD msgbox Route104_Prototype_Text_19B18D, 6 end Route104_Prototype_EventScript_160D7B:: @ 8160D7B - trainerbattle 0, OPPONENT_MIKE_1, 0, Route104_Prototype_Text_19AEFB, Route104_Prototype_Text_19AF3E + trainerbattle 0, TRAINER_MIKE_1, 0, Route104_Prototype_Text_19AEFB, Route104_Prototype_Text_19AF3E msgbox Route104_Prototype_Text_19AF56, 6 end Route104_Prototype_EventScript_160D92:: @ 8160D92 - trainerbattle 0, OPPONENT_BRIANNA_1, 0, Route104_Prototype_Text_19AF8A, Route104_Prototype_Text_19AFDB + trainerbattle 0, TRAINER_BRIANNA_1, 0, Route104_Prototype_Text_19AF8A, Route104_Prototype_Text_19AFDB msgbox Route104_Prototype_Text_19B00D, 6 end Route104_Prototype_EventScript_160DA9:: @ 8160DA9 - trainerbattle 0, OPPONENT_LUCAS_2, 0, Route104_Prototype_Text_19B066, Route104_Prototype_Text_19B0D7 + trainerbattle 0, TRAINER_LUCAS_2, 0, Route104_Prototype_Text_19B066, Route104_Prototype_Text_19B0D7 msgbox Route104_Prototype_Text_19B0EF, 6 end diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 305a2e9af..e628c4761 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -12,26 +12,26 @@ Route105_EventScript_14F2A8:: @ 814F2A8 return Route105_EventScript_14F2BB:: @ 814F2BB - trainerbattle 0, OPPONENT_FOSTER, 0, Route105_Text_1B8B40, Route105_Text_1B8B93 + trainerbattle 0, TRAINER_FOSTER, 0, Route105_Text_1B8B40, Route105_Text_1B8B93 msgbox Route105_Text_1B8BDE, 6 end Route105_EventScript_14F2D2:: @ 814F2D2 - trainerbattle 0, OPPONENT_LUIS, 0, Route105_Text_1B8C28, Route105_Text_1B8C99 + trainerbattle 0, TRAINER_LUIS, 0, Route105_Text_1B8C28, Route105_Text_1B8C99 msgbox Route105_Text_1B8CA9, 6 end Route105_EventScript_14F2E9:: @ 814F2E9 - trainerbattle 0, OPPONENT_AUSTIN, 0, Route105_Text_1B8CEE, Route105_Text_1B8D23 + trainerbattle 0, TRAINER_AUSTIN, 0, Route105_Text_1B8CEE, Route105_Text_1B8D23 msgbox Route105_Text_1B8D45, 6 end Route105_EventScript_14F300:: @ 814F300 - trainerbattle 0, OPPONENT_BEVERLY, 0, Route105_Text_1B8D99, Route105_Text_1B8DDD + trainerbattle 0, TRAINER_BEVERLY, 0, Route105_Text_1B8D99, Route105_Text_1B8DDD msgbox Route105_Text_1B8DED, 6 end Route105_EventScript_14F317:: @ 814F317 - trainerbattle 0, OPPONENT_DAWN, 0, Route105_Text_1B8E66, Route105_Text_1B8EA0 + trainerbattle 0, TRAINER_DAWN, 0, Route105_Text_1B8E66, Route105_Text_1B8EA0 msgbox Route105_Text_1B8EBD, 6 end diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc index ae65c7013..16132e530 100644 --- a/data/maps/Route106/scripts.inc +++ b/data/maps/Route106/scripts.inc @@ -6,17 +6,17 @@ Route106_EventScript_14F32F:: @ 814F32F end Route106_EventScript_14F338:: @ 814F338 - trainerbattle 0, OPPONENT_DOUGLAS, 0, Route106_Text_1B913D, Route106_Text_1B917F + trainerbattle 0, TRAINER_DOUGLAS, 0, Route106_Text_1B913D, Route106_Text_1B917F msgbox Route106_Text_1B918A, 6 end Route106_EventScript_14F34F:: @ 814F34F - trainerbattle 0, OPPONENT_NICOLE, 0, Route106_Text_1B91AC, Route106_Text_1B91F8 + trainerbattle 0, TRAINER_NICOLE, 0, Route106_Text_1B91AC, Route106_Text_1B91F8 msgbox Route106_Text_1B9222, 6 end Route106_EventScript_14F366:: @ 814F366 - trainerbattle 0, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 + trainerbattle 0, TRAINER_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route106_EventScript_14F38D @@ -24,11 +24,11 @@ Route106_EventScript_14F366:: @ 814F366 end Route106_EventScript_14F38D:: @ 814F38D - trainerbattle 5, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8FAC, Route106_Text_1B8FF5 + trainerbattle 5, TRAINER_ELLIOT_1, 0, Route106_Text_1B8FAC, Route106_Text_1B8FF5 msgbox Route106_Text_1B9011, 6 end Route106_EventScript_14F3A4:: @ 814F3A4 - trainerbattle 0, OPPONENT_NED, 0, Route106_Text_1B9052, Route106_Text_1B90D3 + trainerbattle 0, TRAINER_NED, 0, Route106_Text_1B9052, Route106_Text_1B90D3 msgbox Route106_Text_1B910A, 6 end diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc index ad2d293fc..3f8d2dc0f 100644 --- a/data/maps/Route107/scripts.inc +++ b/data/maps/Route107/scripts.inc @@ -2,12 +2,12 @@ Route107_MapScripts:: @ 814F3BB .byte 0 Route107_EventScript_14F3BC:: @ 814F3BC - trainerbattle 0, OPPONENT_DARRIN, 0, Route107_Text_1B926B, Route107_Text_1B92B7 + trainerbattle 0, TRAINER_DARRIN, 0, Route107_Text_1B926B, Route107_Text_1B92B7 msgbox Route107_Text_1B92E7, 6 end Route107_EventScript_14F3D3:: @ 814F3D3 - trainerbattle 0, OPPONENT_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 + trainerbattle 0, TRAINER_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route107_EventScript_14F3FA @@ -15,26 +15,26 @@ Route107_EventScript_14F3D3:: @ 814F3D3 end Route107_EventScript_14F3FA:: @ 814F3FA - trainerbattle 5, OPPONENT_TONY_1, 0, Route107_Text_1B93EB, Route107_Text_1B9429 + trainerbattle 5, TRAINER_TONY_1, 0, Route107_Text_1B93EB, Route107_Text_1B9429 msgbox Route107_Text_1B9477, 6 end Route107_EventScript_14F411:: @ 814F411 - trainerbattle 0, OPPONENT_DENISE, 0, Route107_Text_1B94C8, Route107_Text_1B94F2 + trainerbattle 0, TRAINER_DENISE, 0, Route107_Text_1B94C8, Route107_Text_1B94F2 msgbox Route107_Text_1B94FF, 6 end Route107_EventScript_14F428:: @ 814F428 - trainerbattle 0, OPPONENT_BETH, 0, Route107_Text_1B9538, Route107_Text_1B956B + trainerbattle 0, TRAINER_BETH, 0, Route107_Text_1B9538, Route107_Text_1B956B msgbox Route107_Text_1B9589, 6 end Route107_EventScript_14F43F:: @ 814F43F - trainerbattle 4, OPPONENT_LISA_AND_RAY, 0, Route107_Text_1B95CB, Route107_Text_1B95FB, Route107_Text_1B9672 + trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_1B95CB, Route107_Text_1B95FB, Route107_Text_1B9672 msgbox Route107_Text_1B9630, 6 end Route107_EventScript_14F45A:: @ 814F45A - trainerbattle 4, OPPONENT_LISA_AND_RAY, 0, Route107_Text_1B96AB, Route107_Text_1B9707, Route107_Text_1B9788 + trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_1B96AB, Route107_Text_1B9707, Route107_Text_1B9788 msgbox Route107_Text_1B9735, 6 end diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc index 2e40c882d..498a52a51 100644 --- a/data/maps/Route108/scripts.inc +++ b/data/maps/Route108/scripts.inc @@ -2,21 +2,21 @@ Route108_MapScripts:: @ 814F475 .byte 0 Route108_EventScript_14F476:: @ 814F476 - trainerbattle 0, OPPONENT_JEROME, 0, Route108_Text_1B97C3, Route108_Text_1B97EF + trainerbattle 0, TRAINER_JEROME, 0, Route108_Text_1B97C3, Route108_Text_1B97EF msgbox Route108_Text_1B9823, 6 end Route108_EventScript_14F48D:: @ 814F48D - trainerbattle 0, OPPONENT_MATTHEW, 0, Route108_Text_1B9864, Route108_Text_1B989F + trainerbattle 0, TRAINER_MATTHEW, 0, Route108_Text_1B9864, Route108_Text_1B989F msgbox Route108_Text_1B98BC, 6 end Route108_EventScript_14F4A4:: @ 814F4A4 - trainerbattle 0, OPPONENT_TARA, 0, Route108_Text_1B98EC, Route108_Text_1B992C + trainerbattle 0, TRAINER_TARA, 0, Route108_Text_1B98EC, Route108_Text_1B992C msgbox Route108_Text_1B9935, 6 end Route108_EventScript_14F4BB:: @ 814F4BB - trainerbattle 0, OPPONENT_MISSY, 0, Route108_Text_1B9986, Route108_Text_1B99BB + trainerbattle 0, TRAINER_MISSY, 0, Route108_Text_1B9986, Route108_Text_1B99BB msgbox Route108_Text_1B99E9, 6 end diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 6f24b2142..899952d1a 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -373,27 +373,27 @@ Route109_EventScript_14F7A4:: @ 814F7A4 end Route109_EventScript_14F7AD:: @ 814F7AD - trainerbattle 0, OPPONENT_DAVID, 0, Route109_Text_1B9A1C, Route109_Text_1B9A59 + trainerbattle 0, TRAINER_DAVID, 0, Route109_Text_1B9A1C, Route109_Text_1B9A59 msgbox Route109_Text_1B9A6D, 6 end Route109_EventScript_14F7C4:: @ 814F7C4 - trainerbattle 0, OPPONENT_ALICE, 0, Route109_Text_1B9AAD, Route109_Text_1B9AD9 + trainerbattle 0, TRAINER_ALICE, 0, Route109_Text_1B9AAD, Route109_Text_1B9AD9 msgbox Route109_Text_1B9AEB, 6 end Route109_EventScript_14F7DB:: @ 814F7DB - trainerbattle 0, OPPONENT_HUEY, 0, Route109_Text_1B9B11, Route109_Text_1B9B57 + trainerbattle 0, TRAINER_HUEY, 0, Route109_Text_1B9B11, Route109_Text_1B9B57 msgbox Route109_Text_1B9B68, 6 end Route109_EventScript_14F7F2:: @ 814F7F2 - trainerbattle 0, OPPONENT_EDMOND, 0, Route109_Text_1B9B91, Route109_Text_1B9BAE + trainerbattle 0, TRAINER_EDMOND, 0, Route109_Text_1B9B91, Route109_Text_1B9BAE msgbox Route109_Text_1B9BD3, 6 end Route109_EventScript_14F809:: @ 814F809 - trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 + trainerbattle 0, TRAINER_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route109_EventScript_14F830 @@ -401,12 +401,12 @@ Route109_EventScript_14F809:: @ 814F809 end Route109_EventScript_14F830:: @ 814F830 - trainerbattle 5, OPPONENT_RICKY_1, 0, Route109_Text_1B9CB3, Route109_Text_1B9CEB + trainerbattle 5, TRAINER_RICKY_1, 0, Route109_Text_1B9CB3, Route109_Text_1B9CEB msgbox Route109_Text_1B9D10, 6 end Route109_EventScript_14F847:: @ 814F847 - trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 + trainerbattle 0, TRAINER_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route109_EventScript_14F86E @@ -414,31 +414,31 @@ Route109_EventScript_14F847:: @ 814F847 end Route109_EventScript_14F86E:: @ 814F86E - trainerbattle 5, OPPONENT_LOLA_1, 0, Route109_Text_1B9DD8, Route109_Text_1B9E16 + trainerbattle 5, TRAINER_LOLA_1, 0, Route109_Text_1B9DD8, Route109_Text_1B9E16 msgbox Route109_Text_1B9E1D, 6 end Route109_EventScript_14F885:: @ 814F885 - trainerbattle 0, OPPONENT_CARMEN, 0, Route109_Text_1B9E60, Route109_Text_1B9EA1 + trainerbattle 0, TRAINER_CARMEN, 0, Route109_Text_1B9E60, Route109_Text_1B9EA1 msgbox Route109_Text_1B9ECA, 6 end Route109_EventScript_14F89C:: @ 814F89C - trainerbattle 0, OPPONENT_GWEN, 0, Route109_Text_1B9F07, Route109_Text_1B9F31 + trainerbattle 0, TRAINER_GWEN, 0, Route109_Text_1B9F07, Route109_Text_1B9F31 msgbox Route109_Text_1B9F44, 6 end Route109_EventScript_14F8B3:: @ 814F8B3 - trainerbattle 0, OPPONENT_CARTER, 0, Route109_Text_1B9F65, Route109_Text_1B9F9C + trainerbattle 0, TRAINER_CARTER, 0, Route109_Text_1B9F65, Route109_Text_1B9F9C msgbox Route109_Text_1B9FB7, 6 end Route109_EventScript_14F8CA:: @ 814F8CA - trainerbattle 4, OPPONENT_MEL_AND_PAUL, 0, Route109_Text_1B9FF6, Route109_Text_1BA052, Route109_Text_1BA0BF + trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_1B9FF6, Route109_Text_1BA052, Route109_Text_1BA0BF msgbox Route109_Text_1BA069, 6 end Route109_EventScript_14F8E5:: @ 814F8E5 - trainerbattle 4, OPPONENT_MEL_AND_PAUL, 0, Route109_Text_1BA114, Route109_Text_1BA15F, Route109_Text_1BA1D0 + trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_1BA114, Route109_Text_1BA15F, Route109_Text_1BA1D0 msgbox Route109_Text_1BA193, 6 end diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index 13d37e7bd..1506e18f9 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -76,24 +76,24 @@ Route109_SeashoreHouse_EventScript_160EAB:: @ 8160EAB end Route109_SeashoreHouse_EventScript_160EB8:: @ 8160EB8 - trainerbattle 2, OPPONENT_DWAYNE, 0, Route109_SeashoreHouse_Text_19B809, Route109_SeashoreHouse_Text_19B869, Route109_SeashoreHouse_EventScript_160F09 + trainerbattle 2, TRAINER_DWAYNE, 0, Route109_SeashoreHouse_Text_19B809, Route109_SeashoreHouse_Text_19B869, Route109_SeashoreHouse_EventScript_160F09 msgbox Route109_SeashoreHouse_Text_19B89F, 6 end Route109_SeashoreHouse_EventScript_160ED3:: @ 8160ED3 - trainerbattle 2, OPPONENT_JOHANNA, 0, Route109_SeashoreHouse_Text_19B8E5, Route109_SeashoreHouse_Text_19B949, Route109_SeashoreHouse_EventScript_160F09 + trainerbattle 2, TRAINER_JOHANNA, 0, Route109_SeashoreHouse_Text_19B8E5, Route109_SeashoreHouse_Text_19B949, Route109_SeashoreHouse_EventScript_160F09 msgbox Route109_SeashoreHouse_Text_19B955, 6 end Route109_SeashoreHouse_EventScript_160EEE:: @ 8160EEE - trainerbattle 2, OPPONENT_SIMON, 0, Route109_SeashoreHouse_Text_19B988, Route109_SeashoreHouse_Text_19B9C7, Route109_SeashoreHouse_EventScript_160F09 + trainerbattle 2, TRAINER_SIMON, 0, Route109_SeashoreHouse_Text_19B988, Route109_SeashoreHouse_Text_19B9C7, Route109_SeashoreHouse_EventScript_160F09 msgbox Route109_SeashoreHouse_Text_19B9E5, 6 end Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09 - goto_if_trainer_not_defeated OPPONENT_DWAYNE, Route109_SeashoreHouse_EventScript_160F29 - goto_if_trainer_not_defeated OPPONENT_JOHANNA, Route109_SeashoreHouse_EventScript_160F29 - goto_if_trainer_not_defeated OPPONENT_SIMON, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated TRAINER_DWAYNE, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated TRAINER_JOHANNA, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated TRAINER_SIMON, Route109_SeashoreHouse_EventScript_160F29 setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS release end diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 36e5cd7a2..93333ce56 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -166,17 +166,17 @@ Route110_EventScript_14FA84:: @ 814FA84 end Route110_EventScript_14FA8E:: @ 814FA8E - trainerbattle 0, OPPONENT_EDWARD, 0, Route110_Text_1BA699, Route110_Text_1BA6D2 + trainerbattle 0, TRAINER_EDWARD, 0, Route110_Text_1BA699, Route110_Text_1BA6D2 msgbox Route110_Text_1BA6F8, 6 end Route110_EventScript_14FAA5:: @ 814FAA5 - trainerbattle 0, OPPONENT_JACLYN, 0, Route110_Text_1BA72D, Route110_Text_1BA759 + trainerbattle 0, TRAINER_JACLYN, 0, Route110_Text_1BA72D, Route110_Text_1BA759 msgbox Route110_Text_1BA76C, 6 end Route110_EventScript_14FABC:: @ 814FABC - trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 + trainerbattle 0, TRAINER_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FAE3 @@ -184,27 +184,27 @@ Route110_EventScript_14FABC:: @ 814FABC end Route110_EventScript_14FAE3:: @ 814FAE3 - trainerbattle 5, OPPONENT_EDWIN_1, 0, Route110_Text_1BA877, Route110_Text_1BA8CD + trainerbattle 5, TRAINER_EDWIN_1, 0, Route110_Text_1BA877, Route110_Text_1BA8CD msgbox Route110_Text_1BA8E9, 6 end Route110_EventScript_14FAFA:: @ 814FAFA - trainerbattle 0, OPPONENT_DALE, 0, Route110_Text_1BA913, Route110_Text_1BA93C + trainerbattle 0, TRAINER_DALE, 0, Route110_Text_1BA913, Route110_Text_1BA93C msgbox Route110_Text_1BA94A, 6 end Route110_EventScript_14FB11:: @ 814FB11 - trainerbattle 0, OPPONENT_JACOB, 0, Route110_Text_1BA22C, Route110_Text_1BA264 + trainerbattle 0, TRAINER_JACOB, 0, Route110_Text_1BA22C, Route110_Text_1BA264 msgbox Route110_Text_1BA27C, 6 end Route110_EventScript_14FB28:: @ 814FB28 - trainerbattle 0, OPPONENT_ANTHONY, 0, Route110_Text_1BA2D4, Route110_Text_1BA2FC + trainerbattle 0, TRAINER_ANTHONY, 0, Route110_Text_1BA2D4, Route110_Text_1BA2FC msgbox Route110_Text_1BA30C, 6 end Route110_EventScript_14FB3F:: @ 814FB3F - trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 + trainerbattle 0, TRAINER_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FB66 @@ -212,17 +212,17 @@ Route110_EventScript_14FB3F:: @ 814FB3F end Route110_EventScript_14FB66:: @ 814FB66 - trainerbattle 5, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA3EF, Route110_Text_1BA432 + trainerbattle 5, TRAINER_BENJAMIN_1, 0, Route110_Text_1BA3EF, Route110_Text_1BA432 msgbox Route110_Text_1BA456, 6 end Route110_EventScript_14FB7D:: @ 814FB7D - trainerbattle 0, OPPONENT_JASMINE, 0, Route110_Text_1BA5FF, Route110_Text_1BA63C + trainerbattle 0, TRAINER_JASMINE, 0, Route110_Text_1BA5FF, Route110_Text_1BA63C msgbox Route110_Text_1BA65F, 6 end Route110_EventScript_14FB94:: @ 814FB94 - trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F + trainerbattle 0, TRAINER_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FBBB @@ -230,12 +230,12 @@ Route110_EventScript_14FB94:: @ 814FB94 end Route110_EventScript_14FBBB:: @ 814FBBB - trainerbattle 5, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA573, Route110_Text_1BA5A1 + trainerbattle 5, TRAINER_ABIGAIL_1, 0, Route110_Text_1BA573, Route110_Text_1BA5A1 msgbox Route110_Text_1BA5C4, 6 end Route110_EventScript_14FBD2:: @ 814FBD2 - trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 + trainerbattle 0, TRAINER_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FBF9 @@ -243,12 +243,12 @@ Route110_EventScript_14FBD2:: @ 814FBD2 end Route110_EventScript_14FBF9:: @ 814FBF9 - trainerbattle 5, OPPONENT_ISABEL_1, 0, Route110_Text_1BAA2D, Route110_Text_1BAA76 + trainerbattle 5, TRAINER_ISABEL_1, 0, Route110_Text_1BAA2D, Route110_Text_1BAA76 msgbox Route110_Text_1BAA8F, 6 end Route110_EventScript_14FC10:: @ 814FC10 - trainerbattle 0, OPPONENT_TIMMY, 0, Route110_Text_1BAAC3, Route110_Text_1BAAF7 + trainerbattle 0, TRAINER_TIMMY, 0, Route110_Text_1BAAC3, Route110_Text_1BAAF7 msgbox Route110_Text_1BAB19, 6 end @@ -368,17 +368,17 @@ Route110_EventScript_14FDB1:: @ 814FDB1 end Route110_EventScript_14FDE0:: @ 814FDE0 - trainerbattle 3, OPPONENT_MAY_5, 0, Route110_Text_16E826 + trainerbattle 3, TRAINER_MAY_5, 0, Route110_Text_16E826 goto Route110_EventScript_14FE10 end Route110_EventScript_14FDF0:: @ 814FDF0 - trainerbattle 3, OPPONENT_MAY_8, 0, Route110_Text_16E826 + trainerbattle 3, TRAINER_MAY_8, 0, Route110_Text_16E826 goto Route110_EventScript_14FE10 end Route110_EventScript_14FE00:: @ 814FE00 - trainerbattle 3, OPPONENT_MAY_2, 0, Route110_Text_16E826 + trainerbattle 3, TRAINER_MAY_2, 0, Route110_Text_16E826 goto Route110_EventScript_14FE10 end @@ -398,17 +398,17 @@ Route110_EventScript_14FE2B:: @ 814FE2B end Route110_EventScript_14FE5A:: @ 814FE5A - trainerbattle 3, OPPONENT_BRENDAN_5, 0, Route110_Text_16EA0F + trainerbattle 3, TRAINER_BRENDAN_5, 0, Route110_Text_16EA0F goto Route110_EventScript_14FE8A end Route110_EventScript_14FE6A:: @ 814FE6A - trainerbattle 3, OPPONENT_BRENDAN_8, 0, Route110_Text_16EA0F + trainerbattle 3, TRAINER_BRENDAN_8, 0, Route110_Text_16EA0F goto Route110_EventScript_14FE8A end Route110_EventScript_14FE7A:: @ 814FE7A - trainerbattle 3, OPPONENT_BRENDAN_2, 0, Route110_Text_16EA0F + trainerbattle 3, TRAINER_BRENDAN_2, 0, Route110_Text_16EA0F goto Route110_EventScript_14FE8A end diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index df0484baf..547160a92 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -24,16 +24,16 @@ Route110_TrickHousePuzzle1_EventScript_161D26:: @ 8161D26 end Route110_TrickHousePuzzle1_EventScript_161D31:: @ 8161D31 - trainerbattle 0, OPPONENT_SALLY, 0, Route110_TrickHousePuzzle1_Text_19CB4F, Route110_TrickHousePuzzle1_Text_19CB93 + trainerbattle 0, TRAINER_SALLY, 0, Route110_TrickHousePuzzle1_Text_19CB4F, Route110_TrickHousePuzzle1_Text_19CB93 msgbox Route110_TrickHousePuzzle1_Text_19CBAB, 6 end Route110_TrickHousePuzzle1_EventScript_161D48:: @ 8161D48 - trainerbattle 0, OPPONENT_EDDIE, 0, Route110_TrickHousePuzzle1_Text_19CBD6, Route110_TrickHousePuzzle1_Text_19CC06 + trainerbattle 0, TRAINER_EDDIE, 0, Route110_TrickHousePuzzle1_Text_19CBD6, Route110_TrickHousePuzzle1_Text_19CC06 msgbox Route110_TrickHousePuzzle1_Text_19CC1B, 6 end Route110_TrickHousePuzzle1_EventScript_161D5F:: @ 8161D5F - trainerbattle 0, OPPONENT_ROBIN, 0, Route110_TrickHousePuzzle1_Text_19CC68, Route110_TrickHousePuzzle1_Text_19CC86 + trainerbattle 0, TRAINER_ROBIN, 0, Route110_TrickHousePuzzle1_Text_19CC68, Route110_TrickHousePuzzle1_Text_19CC86 msgbox Route110_TrickHousePuzzle1_Text_19CCAA, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index cdde15d1a..b8e00f385 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -90,16 +90,16 @@ Route110_TrickHousePuzzle2_EventScript_161E65:: @ 8161E65 return Route110_TrickHousePuzzle2_EventScript_161E78:: @ 8161E78 - trainerbattle 0, OPPONENT_TED, 0, Route110_TrickHousePuzzle2_Text_19CD46, Route110_TrickHousePuzzle2_Text_19CD66 + trainerbattle 0, TRAINER_TED, 0, Route110_TrickHousePuzzle2_Text_19CD46, Route110_TrickHousePuzzle2_Text_19CD66 msgbox Route110_TrickHousePuzzle2_Text_19CD91, 6 end Route110_TrickHousePuzzle2_EventScript_161E8F:: @ 8161E8F - trainerbattle 0, OPPONENT_PAUL, 0, Route110_TrickHousePuzzle2_Text_19CDBF, Route110_TrickHousePuzzle2_Text_19CDF0 + trainerbattle 0, TRAINER_PAUL, 0, Route110_TrickHousePuzzle2_Text_19CDBF, Route110_TrickHousePuzzle2_Text_19CDF0 msgbox Route110_TrickHousePuzzle2_Text_19CE0D, 6 end Route110_TrickHousePuzzle2_EventScript_161EA6:: @ 8161EA6 - trainerbattle 0, OPPONENT_GEORGIA, 0, Route110_TrickHousePuzzle2_Text_19CE52, Route110_TrickHousePuzzle2_Text_19CE98 + trainerbattle 0, TRAINER_GEORGIA, 0, Route110_TrickHousePuzzle2_Text_19CE52, Route110_TrickHousePuzzle2_Text_19CE98 msgbox Route110_TrickHousePuzzle2_Text_19CEB8, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index 14a021e8d..0bb582c5d 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -381,16 +381,16 @@ Route110_TrickHousePuzzle3_EventScript_1626FD:: @ 81626FD end Route110_TrickHousePuzzle3_EventScript_162708:: @ 8162708 - trainerbattle 0, OPPONENT_JUSTIN, 0, Route110_TrickHousePuzzle3_Text_19CF76, Route110_TrickHousePuzzle3_Text_19CF9D + trainerbattle 0, TRAINER_JUSTIN, 0, Route110_TrickHousePuzzle3_Text_19CF76, Route110_TrickHousePuzzle3_Text_19CF9D msgbox Route110_TrickHousePuzzle3_Text_19CFE6, 6 end Route110_TrickHousePuzzle3_EventScript_16271F:: @ 816271F - trainerbattle 0, OPPONENT_MARTHA, 0, Route110_TrickHousePuzzle3_Text_19D026, Route110_TrickHousePuzzle3_Text_19D065 + trainerbattle 0, TRAINER_MARTHA, 0, Route110_TrickHousePuzzle3_Text_19D026, Route110_TrickHousePuzzle3_Text_19D065 msgbox Route110_TrickHousePuzzle3_Text_19D07A, 6 end Route110_TrickHousePuzzle3_EventScript_162736:: @ 8162736 - trainerbattle 0, OPPONENT_ALAN, 0, Route110_TrickHousePuzzle3_Text_19D0AE, Route110_TrickHousePuzzle3_Text_19D0F0 + trainerbattle 0, TRAINER_ALAN, 0, Route110_TrickHousePuzzle3_Text_19D0AE, Route110_TrickHousePuzzle3_Text_19D0F0 msgbox Route110_TrickHousePuzzle3_Text_19D110, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc index 3808f1f2d..606697070 100644 --- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc @@ -14,16 +14,16 @@ Route110_TrickHousePuzzle4_EventScript_162760:: @ 8162760 end Route110_TrickHousePuzzle4_EventScript_16276B:: @ 816276B - trainerbattle 0, OPPONENT_CORA, 0, Route110_TrickHousePuzzle4_Text_19D1DE, Route110_TrickHousePuzzle4_Text_19D21F + trainerbattle 0, TRAINER_CORA, 0, Route110_TrickHousePuzzle4_Text_19D1DE, Route110_TrickHousePuzzle4_Text_19D21F msgbox Route110_TrickHousePuzzle4_Text_19D253, 6 end Route110_TrickHousePuzzle4_EventScript_162782:: @ 8162782 - trainerbattle 0, OPPONENT_YUJI, 0, Route110_TrickHousePuzzle4_Text_19D295, Route110_TrickHousePuzzle4_Text_19D2D1 + trainerbattle 0, TRAINER_YUJI, 0, Route110_TrickHousePuzzle4_Text_19D295, Route110_TrickHousePuzzle4_Text_19D2D1 msgbox Route110_TrickHousePuzzle4_Text_19D306, 6 end Route110_TrickHousePuzzle4_EventScript_162799:: @ 8162799 - trainerbattle 0, OPPONENT_JILL, 0, Route110_TrickHousePuzzle4_Text_19D351, Route110_TrickHousePuzzle4_Text_19D380 + trainerbattle 0, TRAINER_JILL, 0, Route110_TrickHousePuzzle4_Text_19D351, Route110_TrickHousePuzzle4_Text_19D380 msgbox Route110_TrickHousePuzzle4_Text_19D386, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index 971d2a275..3378dc50b 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -28,16 +28,16 @@ Route110_TrickHousePuzzle6_EventScript_1630FC:: @ 81630FC end Route110_TrickHousePuzzle6_EventScript_163107:: @ 8163107 - trainerbattle 0, OPPONENT_SOPHIA, 0, Route110_TrickHousePuzzle6_Text_19DC87, Route110_TrickHousePuzzle6_Text_19DCC6 + trainerbattle 0, TRAINER_SOPHIA, 0, Route110_TrickHousePuzzle6_Text_19DC87, Route110_TrickHousePuzzle6_Text_19DCC6 msgbox Route110_TrickHousePuzzle6_Text_19DCE7, 6 end Route110_TrickHousePuzzle6_EventScript_16311E:: @ 816311E - trainerbattle 0, OPPONENT_BENNY, 0, Route110_TrickHousePuzzle6_Text_19DD49, Route110_TrickHousePuzzle6_Text_19DD83 + trainerbattle 0, TRAINER_BENNY, 0, Route110_TrickHousePuzzle6_Text_19DD49, Route110_TrickHousePuzzle6_Text_19DD83 msgbox Route110_TrickHousePuzzle6_Text_19DD96, 6 end Route110_TrickHousePuzzle6_EventScript_163135:: @ 8163135 - trainerbattle 0, OPPONENT_SEBASTIAN, 0, Route110_TrickHousePuzzle6_Text_19DDCF, Route110_TrickHousePuzzle6_Text_19DDFE + trainerbattle 0, TRAINER_SEBASTIAN, 0, Route110_TrickHousePuzzle6_Text_19DDCF, Route110_TrickHousePuzzle6_Text_19DDFE msgbox Route110_TrickHousePuzzle6_Text_19DE44, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 1ee608166..43bce5ceb 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -219,16 +219,16 @@ Route110_TrickHousePuzzle7_EventScript_1633D1:: @ 81633D1 end Route110_TrickHousePuzzle7_EventScript_1633D6:: @ 81633D6 - trainerbattle 0, OPPONENT_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_19DF0B, Route110_TrickHousePuzzle7_Text_19DF4B + trainerbattle 0, TRAINER_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_19DF0B, Route110_TrickHousePuzzle7_Text_19DF4B msgbox Route110_TrickHousePuzzle7_Text_19DF7E, 6 end Route110_TrickHousePuzzle7_EventScript_1633ED:: @ 81633ED - trainerbattle 0, OPPONENT_PATRICIA, 0, Route110_TrickHousePuzzle7_Text_19DFBB, Route110_TrickHousePuzzle7_Text_19DFF2 + trainerbattle 0, TRAINER_PATRICIA, 0, Route110_TrickHousePuzzle7_Text_19DFBB, Route110_TrickHousePuzzle7_Text_19DFF2 msgbox Route110_TrickHousePuzzle7_Text_19E00F, 6 end Route110_TrickHousePuzzle7_EventScript_163404:: @ 8163404 - trainerbattle 0, OPPONENT_ALEXIS, 0, Route110_TrickHousePuzzle7_Text_19E054, Route110_TrickHousePuzzle7_Text_19E098 + trainerbattle 0, TRAINER_ALEXIS, 0, Route110_TrickHousePuzzle7_Text_19E054, Route110_TrickHousePuzzle7_Text_19E098 msgbox Route110_TrickHousePuzzle7_Text_19E0B2, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc index 2c55aae4c..182f3d68a 100644 --- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc @@ -14,16 +14,16 @@ Route110_TrickHousePuzzle8_EventScript_16342E:: @ 816342E end Route110_TrickHousePuzzle8_EventScript_163439:: @ 8163439 - trainerbattle 0, OPPONENT_VINCENT, 0, Route110_TrickHousePuzzle8_Text_19E178, Route110_TrickHousePuzzle8_Text_19E1A1 + trainerbattle 0, TRAINER_VINCENT, 0, Route110_TrickHousePuzzle8_Text_19E178, Route110_TrickHousePuzzle8_Text_19E1A1 msgbox Route110_TrickHousePuzzle8_Text_19E1C5, 6 end Route110_TrickHousePuzzle8_EventScript_163450:: @ 8163450 - trainerbattle 0, OPPONENT_ELAINE, 0, Route110_TrickHousePuzzle8_Text_19E201, Route110_TrickHousePuzzle8_Text_19E22C + trainerbattle 0, TRAINER_ELAINE, 0, Route110_TrickHousePuzzle8_Text_19E201, Route110_TrickHousePuzzle8_Text_19E22C msgbox Route110_TrickHousePuzzle8_Text_19E24C, 6 end Route110_TrickHousePuzzle8_EventScript_163467:: @ 8163467 - trainerbattle 0, OPPONENT_LEROY, 0, Route110_TrickHousePuzzle8_Text_19E284, Route110_TrickHousePuzzle8_Text_19E2C1 + trainerbattle 0, TRAINER_LEROY, 0, Route110_TrickHousePuzzle8_Text_19E284, Route110_TrickHousePuzzle8_Text_19E2C1 msgbox Route110_TrickHousePuzzle8_Text_19E2EE, 6 end diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index e554de5f4..9aa8894f4 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -15,7 +15,7 @@ Route111_EventScript_14FFA6:: @ 814FFA6 Route111_MapScript1_14FFB9:: @ 814FFB9 call Route111_EventScript_14FFCD call Route111_EventScript_1AE313 - goto_if_trainer_not_defeated OPPONENT_VICKY, Route111_EventScript_15000D + goto_if_trainer_not_defeated TRAINER_VICKY, Route111_EventScript_15000D end Route111_EventScript_14FFCD:: @ 814FFCD @@ -42,9 +42,9 @@ Route111_EventScript_15000D:: @ 815000D setflag FLAG_HIDE_VICTORIA_WINSTRATE setflag FLAG_HIDE_VIVI_WINSTRATE setflag FLAG_HIDE_VICKI_WINSTRATE - cleartrainerflag OPPONENT_VICTOR - cleartrainerflag OPPONENT_VICTORIA - cleartrainerflag OPPONENT_VIVI + cleartrainerflag TRAINER_VICTOR + cleartrainerflag TRAINER_VICTORIA + cleartrainerflag TRAINER_VIVI end Route111_EventScript_150023:: @ 8150023 @@ -243,7 +243,7 @@ Route111_EventScript_1501D1:: @ 81501D1 Route111_EventScript_1501F3:: @ 81501F3 msgbox Route111_Text_16F7B3, 4 - trainerbattle 3, OPPONENT_VICTOR, 0, Route111_Text_16F7D2 + trainerbattle 3, TRAINER_VICTOR, 0, Route111_Text_16F7D2 applymovement 1, Route111_Movement_1A0841 waitmovement 0 call Route111_EventScript_150348 @@ -261,7 +261,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 call Route111_EventScript_15034F msgbox Route111_Text_16F82D, 4 - trainerbattle 3, OPPONENT_VICTORIA, 0, Route111_Text_16F8A6 + trainerbattle 3, TRAINER_VICTORIA, 0, Route111_Text_16F8A6 applymovement 2, Route111_Movement_1A0841 waitmovement 0 call Route111_EventScript_150348 @@ -279,7 +279,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 call Route111_EventScript_15034F msgbox Route111_Text_16F90E, 4 - trainerbattle 3, OPPONENT_VIVI, 0, Route111_Text_16F956 + trainerbattle 3, TRAINER_VIVI, 0, Route111_Text_16F956 applymovement 3, Route111_Movement_1A0841 waitmovement 0 call Route111_EventScript_150348 @@ -297,7 +297,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 call Route111_EventScript_15034F msgbox Route111_Text_16F991, 4 - trainerbattle 3, OPPONENT_VICKY, 0, Route111_Text_16F9EC + trainerbattle 3, TRAINER_VICKY, 0, Route111_Text_16F9EC msgbox Route111_Text_16FA22, 4 closemessage applymovement 4, Route111_Movement_1A0841 @@ -368,27 +368,27 @@ Route111_EventScript_15039E:: @ 815039E end Route111_EventScript_1503A7:: @ 81503A7 - trainerbattle 0, OPPONENT_DREW, 0, Route111_Text_1BAB4B, Route111_Text_1BABC7 + trainerbattle 0, TRAINER_DREW, 0, Route111_Text_1BAB4B, Route111_Text_1BABC7 msgbox Route111_Text_1BAC10, 6 end Route111_EventScript_1503BE:: @ 81503BE - trainerbattle 0, OPPONENT_HEIDI, 0, Route111_Text_1BAC60, Route111_Text_1BACC5 + trainerbattle 0, TRAINER_HEIDI, 0, Route111_Text_1BAC60, Route111_Text_1BACC5 msgbox Route111_Text_1BACD8, 6 end Route111_EventScript_1503D5:: @ 81503D5 - trainerbattle 0, OPPONENT_CLIFF, 0, Route111_Text_1BAD4B, Route111_Text_1BADA3 + trainerbattle 0, TRAINER_CLIFF, 0, Route111_Text_1BAD4B, Route111_Text_1BADA3 msgbox Route111_Text_1BADC2, 6 end Route111_EventScript_1503EC:: @ 81503EC - trainerbattle 0, OPPONENT_BECKY, 0, Route111_Text_1BAE24, Route111_Text_1BAE6E + trainerbattle 0, TRAINER_BECKY, 0, Route111_Text_1BAE24, Route111_Text_1BAE6E msgbox Route111_Text_1BAE81, 6 end Route111_EventScript_150403:: @ 8150403 - trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 + trainerbattle 0, TRAINER_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_15042A @@ -396,27 +396,27 @@ Route111_EventScript_150403:: @ 8150403 end Route111_EventScript_15042A:: @ 815042A - trainerbattle 5, OPPONENT_DUSTY_1, 0, Route111_Text_1BAFC1, Route111_Text_1BB034 + trainerbattle 5, TRAINER_DUSTY_1, 0, Route111_Text_1BAFC1, Route111_Text_1BB034 msgbox Route111_Text_1BB070, 6 end Route111_EventScript_150441:: @ 8150441 - trainerbattle 0, OPPONENT_TRAVIS, 0, Route111_Text_1BB111, Route111_Text_1BB140 + trainerbattle 0, TRAINER_TRAVIS, 0, Route111_Text_1BB111, Route111_Text_1BB140 msgbox Route111_Text_1BB15B, 6 end Route111_EventScript_150458:: @ 8150458 - trainerbattle 0, OPPONENT_IRENE, 0, Route111_Text_1BB199, Route111_Text_1BB1D8 + trainerbattle 0, TRAINER_IRENE, 0, Route111_Text_1BB199, Route111_Text_1BB1D8 msgbox Route111_Text_1BB1F6, 6 end Route111_EventScript_15046F:: @ 815046F - trainerbattle 0, OPPONENT_DAISUKE, 0, Route111_Text_1BB250, Route111_Text_1BB27E + trainerbattle 0, TRAINER_DAISUKE, 0, Route111_Text_1BB250, Route111_Text_1BB27E msgbox Route111_Text_1BB290, 6 end Route111_EventScript_150486:: @ 8150486 - trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 + trainerbattle 0, TRAINER_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_1504AD @@ -424,12 +424,12 @@ Route111_EventScript_150486:: @ 8150486 end Route111_EventScript_1504AD:: @ 81504AD - trainerbattle 5, OPPONENT_WILTON_1, 0, Route111_Text_1BB3A7, Route111_Text_1BB3FA + trainerbattle 5, TRAINER_WILTON_1, 0, Route111_Text_1BB3A7, Route111_Text_1BB3FA msgbox Route111_Text_1BB40E, 6 end Route111_EventScript_1504C4:: @ 81504C4 - trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F + trainerbattle 0, TRAINER_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_1504EB @@ -437,6 +437,6 @@ Route111_EventScript_1504C4:: @ 81504C4 end Route111_EventScript_1504EB:: @ 81504EB - trainerbattle 5, OPPONENT_BROOKE_1, 0, Route111_Text_1BB529, Route111_Text_1BB5A2 + trainerbattle 5, TRAINER_BROOKE_1, 0, Route111_Text_1BB529, Route111_Text_1BB5A2 msgbox Route111_Text_1BB5C1, 6 end diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 83d93f222..8e3f73fc0 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -32,12 +32,12 @@ Route112_EventScript_150540:: @ 8150540 end Route112_EventScript_150549:: @ 8150549 - trainerbattle 0, OPPONENT_BRICE, 0, Route112_Text_1BB619, Route112_Text_1BB655 + trainerbattle 0, TRAINER_BRICE, 0, Route112_Text_1BB619, Route112_Text_1BB655 msgbox Route112_Text_1BB667, 6 end Route112_EventScript_150560:: @ 8150560 - trainerbattle 0, OPPONENT_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 + trainerbattle 0, TRAINER_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route112_EventScript_150587 @@ -45,16 +45,16 @@ Route112_EventScript_150560:: @ 8150560 end Route112_EventScript_150587:: @ 8150587 - trainerbattle 5, OPPONENT_TRENT_1, 0, Route112_Text_1BB7C7, Route112_Text_1BB801 + trainerbattle 5, TRAINER_TRENT_1, 0, Route112_Text_1BB7C7, Route112_Text_1BB801 msgbox Route112_Text_1BB819, 6 end Route112_EventScript_15059E:: @ 815059E - trainerbattle 0, OPPONENT_LARRY, 0, Route112_Text_1BB893, Route112_Text_1BB8B6 + trainerbattle 0, TRAINER_LARRY, 0, Route112_Text_1BB893, Route112_Text_1BB8B6 msgbox Route112_Text_1BB8BE, 6 end Route112_EventScript_1505B5:: @ 81505B5 - trainerbattle 0, OPPONENT_CAROL, 0, Route112_Text_1BB8F0, Route112_Text_1BB942 + trainerbattle 0, TRAINER_CAROL, 0, Route112_Text_1BB8F0, Route112_Text_1BB942 msgbox Route112_Text_1BB958, 6 end diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 41b289db0..5b44f2442 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -49,17 +49,17 @@ Route113_EventScript_150632:: @ 8150632 end Route113_EventScript_15063B:: @ 815063B - trainerbattle 0, OPPONENT_NEAL, 0, Route113_Text_1BB9BA, Route113_Text_1BB9E6 + trainerbattle 0, TRAINER_NEAL, 0, Route113_Text_1BB9BA, Route113_Text_1BB9E6 msgbox Route113_Text_1BB9FB, 6 end Route113_EventScript_150652:: @ 8150652 - trainerbattle 0, OPPONENT_DILLON, 0, Route113_Text_1BBA62, Route113_Text_1BBA9B + trainerbattle 0, TRAINER_DILLON, 0, Route113_Text_1BBA62, Route113_Text_1BBA9B msgbox Route113_Text_1BBAB7, 6 end Route113_EventScript_150669:: @ 8150669 - trainerbattle 0, OPPONENT_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A + trainerbattle 0, TRAINER_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route113_EventScript_150690 @@ -67,12 +67,12 @@ Route113_EventScript_150669:: @ 8150669 end Route113_EventScript_150690:: @ 8150690 - trainerbattle 5, OPPONENT_MADELINE_1, 0, Route113_Text_1BBBCE, Route113_Text_1BBC0D + trainerbattle 5, TRAINER_MADELINE_1, 0, Route113_Text_1BBBCE, Route113_Text_1BBC0D msgbox Route113_Text_1BBC1C, 6 end Route113_EventScript_1506A7:: @ 81506A7 - trainerbattle 0, OPPONENT_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 + trainerbattle 0, TRAINER_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route113_EventScript_1506CE @@ -80,21 +80,21 @@ Route113_EventScript_1506A7:: @ 81506A7 end Route113_EventScript_1506CE:: @ 81506CE - trainerbattle 5, OPPONENT_LAO_1, 0, Route113_Text_1BBCE6, Route113_Text_1BBD1D + trainerbattle 5, TRAINER_LAO_1, 0, Route113_Text_1BBCE6, Route113_Text_1BBD1D msgbox Route113_Text_1BBD38, 6 end Route113_EventScript_1506E5:: @ 81506E5 - trainerbattle 0, OPPONENT_LUNG, 0, Route113_Text_1BBD92, Route113_Text_1BBDC6 + trainerbattle 0, TRAINER_LUNG, 0, Route113_Text_1BBD92, Route113_Text_1BBDC6 msgbox Route113_Text_1BBE1D, 6 end Route113_EventScript_1506FC:: @ 81506FC - trainerbattle 4, OPPONENT_TORI_AND_TIA, 0, Route113_Text_1BBE65, Route113_Text_1BBEA1, Route113_Text_1BBF25 + trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_1BBE65, Route113_Text_1BBEA1, Route113_Text_1BBF25 msgbox Route113_Text_1BBEE4, 6 end Route113_EventScript_150717:: @ 8150717 - trainerbattle 4, OPPONENT_TORI_AND_TIA, 0, Route113_Text_1BBF62, Route113_Text_1BBF9D, Route113_Text_1BC021 + trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_1BBF62, Route113_Text_1BBF9D, Route113_Text_1BC021 msgbox Route113_Text_1BBFE2, 6 end diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 54a4ee59a..dd5ec1695 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -64,27 +64,27 @@ Route114_EventScript_1507E8:: @ 81507E8 end Route114_EventScript_1507F1:: @ 81507F1 - trainerbattle 0, OPPONENT_LENNY, 0, Route114_Text_1BC05B, Route114_Text_1BC0B5 + trainerbattle 0, TRAINER_LENNY, 0, Route114_Text_1BC05B, Route114_Text_1BC0B5 msgbox Route114_Text_1BC0C3, 6 end Route114_EventScript_150808:: @ 8150808 - trainerbattle 0, OPPONENT_LUCAS_1, 0, Route114_Text_1BC125, Route114_Text_1BC163 + trainerbattle 0, TRAINER_LUCAS_1, 0, Route114_Text_1BC125, Route114_Text_1BC163 msgbox Route114_Text_1BC184, 6 end Route114_EventScript_15081F:: @ 815081F - trainerbattle 0, OPPONENT_SHANE, 0, Route114_Text_1BC1C8, Route114_Text_1BC23F + trainerbattle 0, TRAINER_SHANE, 0, Route114_Text_1BC1C8, Route114_Text_1BC23F msgbox Route114_Text_1BC24F, 6 end Route114_EventScript_150836:: @ 8150836 - trainerbattle 0, OPPONENT_NANCY, 0, Route114_Text_1BC289, Route114_Text_1BC2BE + trainerbattle 0, TRAINER_NANCY, 0, Route114_Text_1BC289, Route114_Text_1BC2BE msgbox Route114_Text_1BC2C6, 6 end Route114_EventScript_15084D:: @ 815084D - trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 + trainerbattle 0, TRAINER_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route114_EventScript_150874 @@ -92,12 +92,12 @@ Route114_EventScript_15084D:: @ 815084D end Route114_EventScript_150874:: @ 8150874 - trainerbattle 5, OPPONENT_STEVE_1, 0, Route114_Text_1BC3B3, Route114_Text_1BC3E0 + trainerbattle 5, TRAINER_STEVE_1, 0, Route114_Text_1BC3B3, Route114_Text_1BC3E0 msgbox Route114_Text_1BC40F, 6 end Route114_EventScript_15088B:: @ 815088B - trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 + trainerbattle 0, TRAINER_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route114_EventScript_1508B2 @@ -105,26 +105,26 @@ Route114_EventScript_15088B:: @ 815088B end Route114_EventScript_1508B2:: @ 81508B2 - trainerbattle 5, OPPONENT_BERNIE_1, 0, Route114_Text_1BC525, Route114_Text_1BC559 + trainerbattle 5, TRAINER_BERNIE_1, 0, Route114_Text_1BC525, Route114_Text_1BC559 msgbox Route114_Text_1BC58C, 6 end Route114_EventScript_1508C9:: @ 81508C9 - trainerbattle 0, OPPONENT_CLAUDE, 0, Route114_Text_1BC5FC, Route114_Text_1BC653 + trainerbattle 0, TRAINER_CLAUDE, 0, Route114_Text_1BC5FC, Route114_Text_1BC653 msgbox Route114_Text_1BC679, 6 end Route114_EventScript_1508E0:: @ 81508E0 - trainerbattle 0, OPPONENT_NOLAN, 0, Route114_Text_1BC6EC, Route114_Text_1BC750 + trainerbattle 0, TRAINER_NOLAN, 0, Route114_Text_1BC6EC, Route114_Text_1BC750 msgbox Route114_Text_1BC78A, 6 end Route114_EventScript_1508F7:: @ 81508F7 - trainerbattle 4, OPPONENT_TYRA_AND_IVY, 0, Route114_Text_1BC7E3, Route114_Text_1BC834, Route114_Text_1BC88A + trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_1BC7E3, Route114_Text_1BC834, Route114_Text_1BC88A msgbox Route114_Text_1BC858, 6 end Route114_EventScript_150912:: @ 8150912 - trainerbattle 4, OPPONENT_TYRA_AND_IVY, 0, Route114_Text_1BC8D8, Route114_Text_1BC8FB, Route114_Text_1BC96A + trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_1BC8D8, Route114_Text_1BC8FB, Route114_Text_1BC96A msgbox Route114_Text_1BC91E, 6 end diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index f16c2088a..9cb3652f1 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -14,7 +14,7 @@ Route115_EventScript_150940:: @ 8150940 end Route115_EventScript_150949:: @ 8150949 - trainerbattle 0, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 + trainerbattle 0, TRAINER_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_150970 @@ -22,17 +22,17 @@ Route115_EventScript_150949:: @ 8150949 end Route115_EventScript_150970:: @ 8150970 - trainerbattle 5, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BCA6B, Route115_Text_1BCAB3 + trainerbattle 5, TRAINER_TIMOTHY_1, 0, Route115_Text_1BCA6B, Route115_Text_1BCAB3 msgbox Route115_Text_1BCAC6, 6 end Route115_EventScript_150987:: @ 8150987 - trainerbattle 0, OPPONENT_KOICHI, 0, Route115_Text_1BCB0D, Route115_Text_1BCB2E + trainerbattle 0, TRAINER_KOICHI, 0, Route115_Text_1BCB0D, Route115_Text_1BCB2E msgbox Route115_Text_1BCB40, 6 end Route115_EventScript_15099E:: @ 815099E - trainerbattle 0, OPPONENT_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 + trainerbattle 0, TRAINER_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_1509C5 @@ -40,12 +40,12 @@ Route115_EventScript_15099E:: @ 815099E end Route115_EventScript_1509C5:: @ 81509C5 - trainerbattle 5, OPPONENT_NOB_1, 0, Route115_Text_1BCC4C, Route115_Text_1BCCA2 + trainerbattle 5, TRAINER_NOB_1, 0, Route115_Text_1BCC4C, Route115_Text_1BCCA2 msgbox Route115_Text_1BCCBA, 6 end Route115_EventScript_1509DC:: @ 81509DC - trainerbattle 0, OPPONENT_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 + trainerbattle 0, TRAINER_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_150A03 @@ -53,16 +53,16 @@ Route115_EventScript_1509DC:: @ 81509DC end Route115_EventScript_150A03:: @ 8150A03 - trainerbattle 5, OPPONENT_CYNDY_1, 0, Route115_Text_1BCDB0, Route115_Text_1BCDD0 + trainerbattle 5, TRAINER_CYNDY_1, 0, Route115_Text_1BCDB0, Route115_Text_1BCDD0 msgbox Route115_Text_1BCDEF, 6 end Route115_EventScript_150A1A:: @ 8150A1A .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_514, 0, UnknownString_81BCE47, UnknownString_81BCE7D + trainerbattle 0, TRAINER_514, 0, UnknownString_81BCE47, UnknownString_81BCE7D msgbox UnknownString_81BCEA4, 6 .else - trainerbattle 0, OPPONENT_514, 0, Route115_Text_1BCEE0, Route115_Text_1BCF16 + trainerbattle 0, TRAINER_514, 0, Route115_Text_1BCEE0, Route115_Text_1BCF16 msgbox Route115_Text_1BCF3D, 6 .endc end diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 77fbf57a4..284ce3363 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -225,17 +225,17 @@ Route116_Movement_150C57:: @ 8150C57 end_movement Route116_EventScript_150C62:: @ 8150C62 - trainerbattle 0, OPPONENT_JOEY, 0, Route116_Text_1BD02B, Route116_Text_1BD04C + trainerbattle 0, TRAINER_JOEY, 0, Route116_Text_1BD02B, Route116_Text_1BD04C msgbox Route116_Text_1BD078, 6 end Route116_EventScript_150C79:: @ 8150C79 - trainerbattle 0, OPPONENT_JOSE, 0, Route116_Text_1BD0AF, Route116_Text_1BD0D7 + trainerbattle 0, TRAINER_JOSE, 0, Route116_Text_1BD0AF, Route116_Text_1BD0D7 msgbox Route116_Text_1BD0F4, 6 end Route116_EventScript_150C90:: @ 8150C90 - trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A + trainerbattle 0, TRAINER_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route116_EventScript_150CB7 @@ -243,22 +243,22 @@ Route116_EventScript_150C90:: @ 8150C90 end Route116_EventScript_150CB7:: @ 8150CB7 - trainerbattle 5, OPPONENT_JERRY_1, 0, Route116_Text_1BD2A5, Route116_Text_1BD2FE + trainerbattle 5, TRAINER_JERRY_1, 0, Route116_Text_1BD2A5, Route116_Text_1BD2FE msgbox Route116_Text_1BD31A, 6 end Route116_EventScript_150CCE:: @ 8150CCE - trainerbattle 0, OPPONENT_CLARK, 0, Route116_Text_1BCF79, Route116_Text_1BCFBB + trainerbattle 0, TRAINER_CLARK, 0, Route116_Text_1BCF79, Route116_Text_1BCFBB msgbox Route116_Text_1BCFE3, 6 end Route116_EventScript_150CE5:: @ 8150CE5 - trainerbattle 0, OPPONENT_JANICE, 0, Route116_Text_1BD131, Route116_Text_1BD165 + trainerbattle 0, TRAINER_JANICE, 0, Route116_Text_1BD131, Route116_Text_1BD165 msgbox Route116_Text_1BD180, 6 end Route116_EventScript_150CFC:: @ 8150CFC - trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC + trainerbattle 0, TRAINER_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route116_EventScript_150D23 @@ -266,6 +266,6 @@ Route116_EventScript_150CFC:: @ 8150CFC end Route116_EventScript_150D23:: @ 8150D23 - trainerbattle 5, OPPONENT_KAREN_1, 0, Route116_Text_1BD405, Route116_Text_1BD44A + trainerbattle 5, TRAINER_KAREN_1, 0, Route116_Text_1BD405, Route116_Text_1BD44A msgbox Route116_Text_1BD466, 6 end diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 9f42412ab..3c5bc8a66 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -38,7 +38,7 @@ Route117_EventScript_150D84:: @ 8150D84 end Route117_EventScript_150D8D:: @ 8150D8D - trainerbattle 0, OPPONENT_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 + trainerbattle 0, TRAINER_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150DB4 @@ -46,12 +46,12 @@ Route117_EventScript_150D8D:: @ 8150D8D end Route117_EventScript_150DB4:: @ 8150DB4 - trainerbattle 5, OPPONENT_ISAAC_1, 0, Route117_Text_1BD569, Route117_Text_1BD5AB + trainerbattle 5, TRAINER_ISAAC_1, 0, Route117_Text_1BD569, Route117_Text_1BD5AB msgbox Route117_Text_1BD5F2, 6 end Route117_EventScript_150DCB:: @ 8150DCB - trainerbattle 0, OPPONENT_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B + trainerbattle 0, TRAINER_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150DF2 @@ -59,12 +59,12 @@ Route117_EventScript_150DCB:: @ 8150DCB end Route117_EventScript_150DF2:: @ 8150DF2 - trainerbattle 5, OPPONENT_LYDIA_1, 0, Route117_Text_1BD6F2, Route117_Text_1BD733 + trainerbattle 5, TRAINER_LYDIA_1, 0, Route117_Text_1BD6F2, Route117_Text_1BD733 msgbox Route117_Text_1BD74F, 6 end Route117_EventScript_150E09:: @ 8150E09 - trainerbattle 0, OPPONENT_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 + trainerbattle 0, TRAINER_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150E30 @@ -72,12 +72,12 @@ Route117_EventScript_150E09:: @ 8150E09 end Route117_EventScript_150E30:: @ 8150E30 - trainerbattle 5, OPPONENT_DYLAN_1, 0, Route117_Text_1BD83F, Route117_Text_1BD8A2 + trainerbattle 5, TRAINER_DYLAN_1, 0, Route117_Text_1BD83F, Route117_Text_1BD8A2 msgbox Route117_Text_1BD8BD, 6 end Route117_EventScript_150E47:: @ 8150E47 - trainerbattle 0, OPPONENT_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 + trainerbattle 0, TRAINER_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150E6E @@ -85,17 +85,17 @@ Route117_EventScript_150E47:: @ 8150E47 end Route117_EventScript_150E6E:: @ 8150E6E - trainerbattle 5, OPPONENT_MARIA_1, 0, Route117_Text_1BD9F1, Route117_Text_1BDA41 + trainerbattle 5, TRAINER_MARIA_1, 0, Route117_Text_1BD9F1, Route117_Text_1BDA41 msgbox Route117_Text_1BDA6B, 6 end Route117_EventScript_150E85:: @ 8150E85 - trainerbattle 0, OPPONENT_DEREK, 0, Route117_Text_1BDAA7, Route117_Text_1BDAFC + trainerbattle 0, TRAINER_DEREK, 0, Route117_Text_1BDAA7, Route117_Text_1BDAFC msgbox Route117_Text_1BDB24, 6 end Route117_EventScript_150E9C:: @ 8150E9C - trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 + trainerbattle 4, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150EC7 @@ -103,12 +103,12 @@ Route117_EventScript_150E9C:: @ 8150E9C end Route117_EventScript_150EC7:: @ 8150EC7 - trainerbattle 7, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDDEF, Route117_Text_1BDE2F, Route117_Text_1BDEA7 + trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDDEF, Route117_Text_1BDE2F, Route117_Text_1BDEA7 msgbox Route117_Text_1BDE55, 6 end Route117_EventScript_150EE2:: @ 8150EE2 - trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B + trainerbattle 4, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150F0D @@ -116,6 +116,6 @@ Route117_EventScript_150EE2:: @ 8150EE2 end Route117_EventScript_150F0D:: @ 8150F0D - trainerbattle 7, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDEE3, Route117_Text_1BDF26, Route117_Text_1BDF90 + trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDEE3, Route117_Text_1BDF26, Route117_Text_1BDF90 msgbox Route117_Text_1BDF37, 6 end diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index b938d0cc2..850d9138d 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -159,7 +159,7 @@ Route118_Movement_151086:: @ 8151086 end_movement Route118_EventScript_15108F:: @ 815108F - trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C + trainerbattle 0, TRAINER_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route118_EventScript_1510B6 @@ -167,22 +167,22 @@ Route118_EventScript_15108F:: @ 815108F end Route118_EventScript_1510B6:: @ 81510B6 - trainerbattle 5, OPPONENT_ROSE_1, 0, Route118_Text_1BE0AB, Route118_Text_1BE0D3 + trainerbattle 5, TRAINER_ROSE_1, 0, Route118_Text_1BE0AB, Route118_Text_1BE0D3 msgbox Route118_Text_1BE104, 6 end Route118_EventScript_1510CD:: @ 81510CD - trainerbattle 0, OPPONENT_BARNY, 0, Route118_Text_1BE24A, Route118_Text_1BE291 + trainerbattle 0, TRAINER_BARNY, 0, Route118_Text_1BE24A, Route118_Text_1BE291 msgbox Route118_Text_1BE2BE, 6 end Route118_EventScript_1510E4:: @ 81510E4 - trainerbattle 0, OPPONENT_WADE, 0, Route118_Text_1BE318, Route118_Text_1BE385 + trainerbattle 0, TRAINER_WADE, 0, Route118_Text_1BE318, Route118_Text_1BE385 msgbox Route118_Text_1BE39C, 6 end Route118_EventScript_1510FB:: @ 81510FB - trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 + trainerbattle 0, TRAINER_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route118_EventScript_151122 @@ -190,16 +190,16 @@ Route118_EventScript_1510FB:: @ 81510FB end Route118_EventScript_151122:: @ 8151122 - trainerbattle 5, OPPONENT_DALTON_1, 0, Route118_Text_1BE489, Route118_Text_1BE4CC + trainerbattle 5, TRAINER_DALTON_1, 0, Route118_Text_1BE489, Route118_Text_1BE4CC msgbox Route118_Text_1BE4D9, 6 end Route118_EventScript_151139:: @ 8151139 - trainerbattle 0, OPPONENT_PERRY, 0, Route118_Text_1BE148, Route118_Text_1BE188 + trainerbattle 0, TRAINER_PERRY, 0, Route118_Text_1BE148, Route118_Text_1BE188 msgbox Route118_Text_1BE19D, 6 end Route118_EventScript_151150:: @ 8151150 - trainerbattle 0, OPPONENT_CHESTER, 0, Route118_Text_1BE1D7, Route118_Text_1BE1F5 + trainerbattle 0, TRAINER_CHESTER, 0, Route118_Text_1BE1D7, Route118_Text_1BE1F5 msgbox Route118_Text_1BE20D, 6 end diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index fe1ef4e45..9874d3098 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -95,17 +95,17 @@ Route119_EventScript_15125E:: @ 815125E end Route119_EventScript_15128D:: @ 815128D - trainerbattle 3, OPPONENT_MAY_6, 0, Route119_Text_171156 + trainerbattle 3, TRAINER_MAY_6, 0, Route119_Text_171156 goto Route119_EventScript_1512BD end Route119_EventScript_15129D:: @ 815129D - trainerbattle 3, OPPONENT_MAY_9, 0, Route119_Text_171156 + trainerbattle 3, TRAINER_MAY_9, 0, Route119_Text_171156 goto Route119_EventScript_1512BD end Route119_EventScript_1512AD:: @ 81512AD - trainerbattle 3, OPPONENT_MAY_3, 0, Route119_Text_171156 + trainerbattle 3, TRAINER_MAY_3, 0, Route119_Text_171156 goto Route119_EventScript_1512BD end @@ -125,17 +125,17 @@ Route119_EventScript_1512D8:: @ 81512D8 end Route119_EventScript_151307:: @ 8151307 - trainerbattle 3, OPPONENT_BRENDAN_6, 0, Route119_Text_1713E2 + trainerbattle 3, TRAINER_BRENDAN_6, 0, Route119_Text_1713E2 goto Route119_EventScript_151337 end Route119_EventScript_151317:: @ 8151317 - trainerbattle 3, OPPONENT_BRENDAN_9, 0, Route119_Text_1713E2 + trainerbattle 3, TRAINER_BRENDAN_9, 0, Route119_Text_1713E2 goto Route119_EventScript_151337 end Route119_EventScript_151327:: @ 8151327 - trainerbattle 3, OPPONENT_BRENDAN_3, 0, Route119_Text_1713E2 + trainerbattle 3, TRAINER_BRENDAN_3, 0, Route119_Text_1713E2 goto Route119_EventScript_151337 end @@ -264,37 +264,37 @@ Route119_EventScript_15142C:: @ 815142C end Route119_EventScript_151435:: @ 8151435 - trainerbattle 0, OPPONENT_BRENT, 0, Route119_Text_1BE521, Route119_Text_1BE54F + trainerbattle 0, TRAINER_BRENT, 0, Route119_Text_1BE521, Route119_Text_1BE54F msgbox Route119_Text_1BE561, 6 end Route119_EventScript_15144C:: @ 815144C - trainerbattle 0, OPPONENT_DONALD, 0, Route119_Text_1BE5A4, Route119_Text_1BE5DF + trainerbattle 0, TRAINER_DONALD, 0, Route119_Text_1BE5A4, Route119_Text_1BE5DF msgbox Route119_Text_1BE5F8, 6 end Route119_EventScript_151463:: @ 8151463 - trainerbattle 0, OPPONENT_TAYLOR, 0, Route119_Text_1BE632, Route119_Text_1BE67B + trainerbattle 0, TRAINER_TAYLOR, 0, Route119_Text_1BE632, Route119_Text_1BE67B msgbox Route119_Text_1BE695, 6 end Route119_EventScript_15147A:: @ 815147A - trainerbattle 0, OPPONENT_DOUG, 0, Route119_Text_1BE6EA, Route119_Text_1BE729 + trainerbattle 0, TRAINER_DOUG, 0, Route119_Text_1BE6EA, Route119_Text_1BE729 msgbox Route119_Text_1BE748, 6 end Route119_EventScript_151491:: @ 8151491 - trainerbattle 0, OPPONENT_GREG, 0, Route119_Text_1BE784, Route119_Text_1BE7D3 + trainerbattle 0, TRAINER_GREG, 0, Route119_Text_1BE784, Route119_Text_1BE7D3 msgbox Route119_Text_1BE7E9, 6 end Route119_EventScript_1514A8:: @ 81514A8 - trainerbattle 0, OPPONENT_KENT, 0, Route119_Text_1BE82F, Route119_Text_1BE88D + trainerbattle 0, TRAINER_KENT, 0, Route119_Text_1BE82F, Route119_Text_1BE88D msgbox Route119_Text_1BE89A, 6 end Route119_EventScript_1514BF:: @ 81514BF - trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E + trainerbattle 0, TRAINER_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route119_EventScript_1514E6 @@ -302,12 +302,12 @@ Route119_EventScript_1514BF:: @ 81514BF end Route119_EventScript_1514E6:: @ 81514E6 - trainerbattle 5, OPPONENT_JACKSON_1, 0, Route119_Text_1BE98D, Route119_Text_1BE9D0 + trainerbattle 5, TRAINER_JACKSON_1, 0, Route119_Text_1BE98D, Route119_Text_1BE9D0 msgbox Route119_Text_1BE9E8, 6 end Route119_EventScript_1514FD:: @ 81514FD - trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 + trainerbattle 0, TRAINER_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route119_EventScript_151524 @@ -315,37 +315,37 @@ Route119_EventScript_1514FD:: @ 81514FD end Route119_EventScript_151524:: @ 8151524 - trainerbattle 5, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEB22, Route119_Text_1BEB49 + trainerbattle 5, TRAINER_CATHERINE_1, 0, Route119_Text_1BEB22, Route119_Text_1BEB49 msgbox Route119_Text_1BEB68, 6 end Route119_EventScript_15153B:: @ 815153B - trainerbattle 0, OPPONENT_HUGH, 0, Route119_Text_1BEBC0, Route119_Text_1BEC1C + trainerbattle 0, TRAINER_HUGH, 0, Route119_Text_1BEBC0, Route119_Text_1BEC1C msgbox Route119_Text_1BEC2A, 6 end Route119_EventScript_151552:: @ 8151552 - trainerbattle 0, OPPONENT_PHIL, 0, Route119_Text_1BEC5E, Route119_Text_1BEC9A + trainerbattle 0, TRAINER_PHIL, 0, Route119_Text_1BEC5E, Route119_Text_1BEC9A msgbox Route119_Text_1BECB1, 6 end Route119_EventScript_151569:: @ 8151569 - trainerbattle 0, OPPONENT_YASU, 0, Route119_Text_1BECF1, Route119_Text_1BED4C + trainerbattle 0, TRAINER_YASU, 0, Route119_Text_1BECF1, Route119_Text_1BED4C msgbox Route119_Text_1BED5C, 6 end Route119_EventScript_151580:: @ 8151580 - trainerbattle 0, OPPONENT_TAKASHI, 0, Route119_Text_1BEDB6, Route119_Text_1BEDEC + trainerbattle 0, TRAINER_TAKASHI, 0, Route119_Text_1BEDB6, Route119_Text_1BEDEC msgbox Route119_Text_1BEE06, 6 end Route119_EventScript_151597:: @ 8151597 - trainerbattle 0, OPPONENT_HIDEO_2, 0, Route119_Text_1BEE2D, Route119_Text_1BEE4B + trainerbattle 0, TRAINER_HIDEO_2, 0, Route119_Text_1BEE2D, Route119_Text_1BEE4B msgbox Route119_Text_1BEE66, 6 end Route119_EventScript_1515AE:: @ 81515AE - trainerbattle 0, OPPONENT_EUGENE, 0, Route119_Text_1BEED0, Route119_Text_1BEF37 + trainerbattle 0, TRAINER_EUGENE, 0, Route119_Text_1BEED0, Route119_Text_1BEF37 msgbox Route119_Text_1BEF67, 6 end diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index e5ca6550b..547241940 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -45,11 +45,11 @@ Route119_WeatherInstitute_1F_EventScript_163C83:: @ 8163C83 end Route119_WeatherInstitute_1F_EventScript_163C94:: @ 8163C94 - trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_1, 0, Route119_WeatherInstitute_1F_Text_19EB8A, Route119_WeatherInstitute_1F_Text_19EBEE + trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_1, 0, Route119_WeatherInstitute_1F_Text_19EB8A, Route119_WeatherInstitute_1F_Text_19EBEE msgbox Route119_WeatherInstitute_1F_Text_19EC0E, 6 end Route119_WeatherInstitute_1F_EventScript_163CAB:: @ 8163CAB - trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_2, 0, Route119_WeatherInstitute_1F_Text_19EC6B, Route119_WeatherInstitute_1F_Text_19EC89 + trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_2, 0, Route119_WeatherInstitute_1F_Text_19EC6B, Route119_WeatherInstitute_1F_Text_19EC89 msgbox Route119_WeatherInstitute_1F_Text_19EC97, 6 end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 0a1a51562..8a8737dad 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -21,17 +21,17 @@ Route119_WeatherInstitute_2F_EventScript_163CF0:: @ 8163CF0 return Route119_WeatherInstitute_2F_EventScript_163CFC:: @ 8163CFC - trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_3, 0, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B + trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_3, 0, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B msgbox Route119_WeatherInstitute_2F_Text_19EF3E, 6 end Route119_WeatherInstitute_2F_EventScript_163D13:: @ 8163D13 - trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_4, 0, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD + trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_4, 0, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD msgbox Route119_WeatherInstitute_2F_Text_19EFE9, 6 end Route119_WeatherInstitute_2F_EventScript_163D2A:: @ 8163D2A - trainerbattle 2, OPPONENT_WEATHER_INSTITUTE_GRUNT_5, 0, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45 + trainerbattle 2, TRAINER_WEATHER_INSTITUTE_GRUNT_5, 0, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45 msgbox Route119_WeatherInstitute_2F_Text_19F11B, 6 end diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 6f561391f..f3081fc8c 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -280,12 +280,12 @@ Route120_EventScript_1519AA:: @ 81519AA end Route120_EventScript_1519B3:: @ 81519B3 - trainerbattle 0, OPPONENT_COLIN, 0, Route120_Text_1BEFC8, Route120_Text_1BF000 + trainerbattle 0, TRAINER_COLIN, 0, Route120_Text_1BEFC8, Route120_Text_1BF000 msgbox Route120_Text_1BF015, 6 end Route120_EventScript_1519CA:: @ 81519CA - trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 + trainerbattle 0, TRAINER_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route120_EventScript_1519F1 @@ -293,22 +293,22 @@ Route120_EventScript_1519CA:: @ 81519CA end Route120_EventScript_1519F1:: @ 81519F1 - trainerbattle 5, OPPONENT_ROBERT_1, 0, Route120_Text_1BF0FA, Route120_Text_1BF131 + trainerbattle 5, TRAINER_ROBERT_1, 0, Route120_Text_1BF0FA, Route120_Text_1BF131 msgbox Route120_Text_1BF154, 6 end Route120_EventScript_151A08:: @ 8151A08 - trainerbattle 0, OPPONENT_CARLOS, 0, Route120_Text_1BF193, Route120_Text_1BF1D4 + trainerbattle 0, TRAINER_CARLOS, 0, Route120_Text_1BF193, Route120_Text_1BF1D4 msgbox Route120_Text_1BF215, 6 end Route120_EventScript_151A1F:: @ 8151A1F - trainerbattle 0, OPPONENT_JENNA, 0, Route120_Text_1BF26E, Route120_Text_1BF2D2 + trainerbattle 0, TRAINER_JENNA, 0, Route120_Text_1BF26E, Route120_Text_1BF2D2 msgbox Route120_Text_1BF2EA, 6 end Route120_EventScript_151A36:: @ 8151A36 - trainerbattle 0, OPPONENT_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B + trainerbattle 0, TRAINER_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route120_EventScript_151A5D @@ -316,36 +316,36 @@ Route120_EventScript_151A36:: @ 8151A36 end Route120_EventScript_151A5D:: @ 8151A5D - trainerbattle 5, OPPONENT_BRANDON_1, 0, Route120_Text_1BF3D0, Route120_Text_1BF416 + trainerbattle 5, TRAINER_BRANDON_1, 0, Route120_Text_1BF3D0, Route120_Text_1BF416 msgbox Route120_Text_1BF43E, 6 end Route120_EventScript_151A74:: @ 8151A74 - trainerbattle 0, OPPONENT_JENNIFER, 0, Route120_Text_1BF4A0, Route120_Text_1BF504 + trainerbattle 0, TRAINER_JENNIFER, 0, Route120_Text_1BF4A0, Route120_Text_1BF504 msgbox Route120_Text_1BF51F, 6 end Route120_EventScript_151A8B:: @ 8151A8B - trainerbattle 0, OPPONENT_CHIP, 0, Route120_Text_1BF560, Route120_Text_1BF5D6 + trainerbattle 0, TRAINER_CHIP, 0, Route120_Text_1BF560, Route120_Text_1BF5D6 msgbox Route120_Text_1BF5F4, 6 end Route120_EventScript_151AA2:: @ 8151AA2 - trainerbattle 0, OPPONENT_CLARISSA, 0, Route120_Text_1BF65B, Route120_Text_1BF6A4 + trainerbattle 0, TRAINER_CLARISSA, 0, Route120_Text_1BF65B, Route120_Text_1BF6A4 msgbox Route120_Text_1BF6D0, 6 end Route120_EventScript_151AB9:: @ 8151AB9 - trainerbattle 0, OPPONENT_ANGELICA, 0, Route120_Text_1BF728, Route120_Text_1BF78C + trainerbattle 0, TRAINER_ANGELICA, 0, Route120_Text_1BF728, Route120_Text_1BF78C msgbox Route120_Text_1BF7B2, 6 end Route120_EventScript_151AD0:: @ 8151AD0 - trainerbattle 0, OPPONENT_KEIGO, 0, Route120_Text_1BF80B, Route120_Text_1BF852 + trainerbattle 0, TRAINER_KEIGO, 0, Route120_Text_1BF80B, Route120_Text_1BF852 msgbox Route120_Text_1BF891, 6 end Route120_EventScript_151AE7:: @ 8151AE7 - trainerbattle 0, OPPONENT_TSUNAO, 0, Route120_Text_1BF8C5, Route120_Text_1BF920 + trainerbattle 0, TRAINER_TSUNAO, 0, Route120_Text_1BF8C5, Route120_Text_1BF920 msgbox Route120_Text_1BF946, 6 end diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 5fe7f6330..d154d3f6b 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -67,12 +67,12 @@ Route121_Movement_151B69:: @ 8151B69 end_movement Route121_EventScript_151B72:: @ 8151B72 - trainerbattle 0, OPPONENT_VANESSA, 0, Route121_Text_1BF96E, Route121_Text_1BF9A1 + trainerbattle 0, TRAINER_VANESSA, 0, Route121_Text_1BF96E, Route121_Text_1BF9A1 msgbox Route121_Text_1BF9BA, 6 end Route121_EventScript_151B89:: @ 8151B89 - trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C + trainerbattle 0, TRAINER_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route121_EventScript_151BB0 @@ -80,27 +80,27 @@ Route121_EventScript_151B89:: @ 8151B89 end Route121_EventScript_151BB0:: @ 8151BB0 - trainerbattle 5, OPPONENT_WALTER_1, 0, Route121_Text_1BFADA, Route121_Text_1BFB4B + trainerbattle 5, TRAINER_WALTER_1, 0, Route121_Text_1BFADA, Route121_Text_1BFB4B msgbox Route121_Text_1BFB5C, 6 end Route121_EventScript_151BC7:: @ 8151BC7 - trainerbattle 0, OPPONENT_TAMMY, 0, Route121_Text_1BFBB4, Route121_Text_1BFBEE + trainerbattle 0, TRAINER_TAMMY, 0, Route121_Text_1BFBB4, Route121_Text_1BFBEE msgbox Route121_Text_1BFBFD, 6 end Route121_EventScript_151BDE:: @ 8151BDE - trainerbattle 4, OPPONENT_KATE_AND_JOY, 0, Route121_Text_1BFC36, Route121_Text_1BFC7A, Route121_Text_1BFD08 + trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_1BFC36, Route121_Text_1BFC7A, Route121_Text_1BFD08 msgbox Route121_Text_1BFCB3, 6 end Route121_EventScript_151BF9:: @ 8151BF9 - trainerbattle 4, OPPONENT_KATE_AND_JOY, 0, Route121_Text_1BFD60, Route121_Text_1BFDA3, Route121_Text_1BFE0D + trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_1BFD60, Route121_Text_1BFDA3, Route121_Text_1BFE0D msgbox Route121_Text_1BFDC1, 6 end Route121_EventScript_151C14:: @ 8151C14 - trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 + trainerbattle 0, TRAINER_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route121_EventScript_151C3B @@ -108,6 +108,6 @@ Route121_EventScript_151C14:: @ 8151C14 end Route121_EventScript_151C3B:: @ 8151C3B - trainerbattle 5, OPPONENT_JESSICA_1, 0, Route121_Text_1BFEDE, Route121_Text_1BFF0A + trainerbattle 5, TRAINER_JESSICA_1, 0, Route121_Text_1BFEDE, Route121_Text_1BFF0A msgbox Route121_Text_1BFF3A, 6 end diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index d954bec1a..4dda69997 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -45,22 +45,22 @@ Route123_EventScript_151CC8:: @ 8151CC8 end Route123_EventScript_151CD1:: @ 8151CD1 - trainerbattle 0, OPPONENT_WENDY, 0, Route123_Text_1BFF6A, Route123_Text_1BFFA2 + trainerbattle 0, TRAINER_WENDY, 0, Route123_Text_1BFF6A, Route123_Text_1BFFA2 msgbox Route123_Text_1BFFC1, 6 end Route123_EventScript_151CE8:: @ 8151CE8 - trainerbattle 0, OPPONENT_CLYDE, 0, Route123_Text_1BFFF0, Route123_Text_1C0057 + trainerbattle 0, TRAINER_CLYDE, 0, Route123_Text_1BFFF0, Route123_Text_1C0057 msgbox Route123_Text_1C0075, 6 end Route123_EventScript_151CFF:: @ 8151CFF - trainerbattle 0, OPPONENT_VIOLET, 0, Route123_Text_1C009E, Route123_Text_1C00D4 + trainerbattle 0, TRAINER_VIOLET, 0, Route123_Text_1C009E, Route123_Text_1C00D4 msgbox Route123_Text_1C0100, 6 end Route123_EventScript_151D16:: @ 8151D16 - trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 + trainerbattle 0, TRAINER_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route123_EventScript_151D3D @@ -68,12 +68,12 @@ Route123_EventScript_151D16:: @ 8151D16 end Route123_EventScript_151D3D:: @ 8151D3D - trainerbattle 5, OPPONENT_CAMERON_1, 0, Route123_Text_1C01F9, Route123_Text_1C0240 + trainerbattle 5, TRAINER_CAMERON_1, 0, Route123_Text_1C01F9, Route123_Text_1C0240 msgbox Route123_Text_1C024E, 6 end Route123_EventScript_151D54:: @ 8151D54 - trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 + trainerbattle 0, TRAINER_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route123_EventScript_151D7B @@ -81,21 +81,21 @@ Route123_EventScript_151D54:: @ 8151D54 end Route123_EventScript_151D7B:: @ 8151D7B - trainerbattle 5, OPPONENT_JACKI_1, 0, Route123_Text_1C0351, Route123_Text_1C0380 + trainerbattle 5, TRAINER_JACKI_1, 0, Route123_Text_1C0351, Route123_Text_1C0380 msgbox Route123_Text_1C038C, 6 end Route123_EventScript_151D92:: @ 8151D92 - trainerbattle 4, OPPONENT_MIU_AND_YUKI, 0, Route123_Text_1C03CB, Route123_Text_1C040E, Route123_Text_1C0462 + trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_1C03CB, Route123_Text_1C040E, Route123_Text_1C0462 msgbox Route123_Text_1C0423, 6 end Route123_EventScript_151DAD:: @ 8151DAD - trainerbattle 4, OPPONENT_MIU_AND_YUKI, 0, Route123_Text_1C049C, Route123_Text_1C04CD, Route123_Text_1C0519 + trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_1C049C, Route123_Text_1C04CD, Route123_Text_1C0519 msgbox Route123_Text_1C04E3, 6 end Route123_EventScript_151DC8:: @ 8151DC8 - trainerbattle 0, OPPONENT_KINDRA, 0, Route123_Text_1C0554, Route123_Text_1C059F + trainerbattle 0, TRAINER_KINDRA, 0, Route123_Text_1C0554, Route123_Text_1C059F msgbox Route123_Text_1C05BC, 6 end diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 3f02fc6e3..cb42e1944 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -11,17 +11,17 @@ Route124_EventScript_151DEF:: @ 8151DEF end Route124_EventScript_151DF8:: @ 8151DF8 - trainerbattle 0, OPPONENT_SPENCER, 0, Route124_Text_1C0624, Route124_Text_1C0675 + trainerbattle 0, TRAINER_SPENCER, 0, Route124_Text_1C0624, Route124_Text_1C0675 msgbox Route124_Text_1C0693, 6 end Route124_EventScript_151E0F:: @ 8151E0F - trainerbattle 0, OPPONENT_ROLAND, 0, Route124_Text_1C06F7, Route124_Text_1C0741 + trainerbattle 0, TRAINER_ROLAND, 0, Route124_Text_1C06F7, Route124_Text_1C0741 msgbox Route124_Text_1C0750, 6 end Route124_EventScript_151E26:: @ 8151E26 - trainerbattle 0, OPPONENT_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 + trainerbattle 0, TRAINER_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151E4D @@ -29,22 +29,22 @@ Route124_EventScript_151E26:: @ 8151E26 end Route124_EventScript_151E4D:: @ 8151E4D - trainerbattle 5, OPPONENT_JENNY_1, 0, Route124_Text_1C0888, Route124_Text_1C08C8 + trainerbattle 5, TRAINER_JENNY_1, 0, Route124_Text_1C0888, Route124_Text_1C08C8 msgbox Route124_Text_1C08EA, 6 end Route124_EventScript_151E64:: @ 8151E64 - trainerbattle 0, OPPONENT_GRACE, 0, Route124_Text_1C0936, Route124_Text_1C096B + trainerbattle 0, TRAINER_GRACE, 0, Route124_Text_1C0936, Route124_Text_1C096B msgbox Route124_Text_1C0994, 6 end Route124_EventScript_151E7B:: @ 8151E7B - trainerbattle 0, OPPONENT_CHAD, 0, Route124_Text_1C09CE, Route124_Text_1C0A2F + trainerbattle 0, TRAINER_CHAD, 0, Route124_Text_1C09CE, Route124_Text_1C0A2F msgbox Route124_Text_1C0A52, 6 end Route124_EventScript_151E92:: @ 8151E92 - trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 + trainerbattle 4, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151EBD @@ -52,12 +52,12 @@ Route124_EventScript_151E92:: @ 8151E92 end Route124_EventScript_151EBD:: @ 8151EBD - trainerbattle 7, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0D1F, Route124_Text_1C0DB5, Route124_Text_1C0E5C + trainerbattle 7, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0D1F, Route124_Text_1C0DB5, Route124_Text_1C0E5C msgbox Route124_Text_1C0E06, 6 end Route124_EventScript_151ED8:: @ 8151ED8 - trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 + trainerbattle 4, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151F03 @@ -65,6 +65,6 @@ Route124_EventScript_151ED8:: @ 8151ED8 end Route124_EventScript_151F03:: @ 8151F03 - trainerbattle 7, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0EA2, Route124_Text_1C0EE5, Route124_Text_1C0F90 + trainerbattle 7, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0EA2, Route124_Text_1C0EE5, Route124_Text_1C0F90 msgbox Route124_Text_1C0F19, 6 end diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index a1495ac83..4ff30f363 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -7,27 +7,27 @@ Route125_MapScript1_151F24:: @ 8151F24 end Route125_EventScript_151F2E:: @ 8151F2E - trainerbattle 0, OPPONENT_CODY, 0, Route125_Text_1C0FCF, Route125_Text_1C1002 + trainerbattle 0, TRAINER_CODY, 0, Route125_Text_1C0FCF, Route125_Text_1C1002 msgbox Route125_Text_1C1013, 6 end Route125_EventScript_151F45:: @ 8151F45 - trainerbattle 0, OPPONENT_STAN, 0, Route125_Text_1C104B, Route125_Text_1C1073 + trainerbattle 0, TRAINER_STAN, 0, Route125_Text_1C104B, Route125_Text_1C1073 msgbox Route125_Text_1C1083, 6 end Route125_EventScript_151F5C:: @ 8151F5C - trainerbattle 0, OPPONENT_TANYA, 0, Route125_Text_1C10C3, Route125_Text_1C10FB + trainerbattle 0, TRAINER_TANYA, 0, Route125_Text_1C10C3, Route125_Text_1C10FB msgbox Route125_Text_1C110C, 6 end Route125_EventScript_151F73:: @ 8151F73 - trainerbattle 0, OPPONENT_SHARON, 0, Route125_Text_1C1136, Route125_Text_1C1175 + trainerbattle 0, TRAINER_SHARON, 0, Route125_Text_1C1136, Route125_Text_1C1175 msgbox Route125_Text_1C117F, 6 end Route125_EventScript_151F8A:: @ 8151F8A - trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED + trainerbattle 0, TRAINER_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route125_EventScript_151FB1 @@ -35,16 +35,16 @@ Route125_EventScript_151F8A:: @ 8151F8A end Route125_EventScript_151FB1:: @ 8151FB1 - trainerbattle 5, OPPONENT_ERNEST_1, 0, Route125_Text_1C1282, Route125_Text_1C12C5 + trainerbattle 5, TRAINER_ERNEST_1, 0, Route125_Text_1C1282, Route125_Text_1C12C5 msgbox Route125_Text_1C12EE, 6 end Route125_EventScript_151FC8:: @ 8151FC8 - trainerbattle 4, OPPONENT_KIM_AND_IRIS, 0, Route125_Text_1C13A1, Route125_Text_1C13FF, Route125_Text_1C146E + trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_1C13A1, Route125_Text_1C13FF, Route125_Text_1C146E msgbox Route125_Text_1C141C, 6 end Route125_EventScript_151FE3:: @ 8151FE3 - trainerbattle 4, OPPONENT_KIM_AND_IRIS, 0, Route125_Text_1C14AB, Route125_Text_1C14E7, Route125_Text_1C154F + trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_1C14AB, Route125_Text_1C14E7, Route125_Text_1C154F msgbox Route125_Text_1C1508, 6 end diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 4a28abfb7..3eb68a1d1 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -7,21 +7,21 @@ Route126_MapScript1_152004:: @ 8152004 end Route126_EventScript_15200E:: @ 815200E - trainerbattle 0, OPPONENT_BARRY, 0, Route126_Text_1C1590, Route126_Text_1C15C3 + trainerbattle 0, TRAINER_BARRY, 0, Route126_Text_1C1590, Route126_Text_1C15C3 msgbox Route126_Text_1C15D8, 6 end Route126_EventScript_152025:: @ 8152025 - trainerbattle 0, OPPONENT_DEAN, 0, Route126_Text_1C1627, Route126_Text_1C1660 + trainerbattle 0, TRAINER_DEAN, 0, Route126_Text_1C1627, Route126_Text_1C1660 msgbox Route126_Text_1C166F, 6 end Route126_EventScript_15203C:: @ 815203C - trainerbattle 0, OPPONENT_NIKKI, 0, Route126_Text_1C16AB, Route126_Text_1C16C5 + trainerbattle 0, TRAINER_NIKKI, 0, Route126_Text_1C16AB, Route126_Text_1C16C5 msgbox Route126_Text_1C1702, 6 end Route126_EventScript_152053:: @ 8152053 - trainerbattle 0, OPPONENT_BRENDA, 0, Route126_Text_1C1741, Route126_Text_1C1766 + trainerbattle 0, TRAINER_BRENDA, 0, Route126_Text_1C1741, Route126_Text_1C1766 msgbox Route126_Text_1C1773, 6 end diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 7552f7c5d..51ff52501 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -7,36 +7,36 @@ Route127_MapScript1_152070:: @ 8152070 end Route127_EventScript_15207A:: @ 815207A - trainerbattle 0, OPPONENT_CALEB, 0, Route127_Text_1C17A8, Route127_Text_1C17DD + trainerbattle 0, TRAINER_CALEB, 0, Route127_Text_1C17A8, Route127_Text_1C17DD msgbox Route127_Text_1C17EC, 6 end Route127_EventScript_152091:: @ 8152091 - trainerbattle 0, OPPONENT_CONNOR, 0, Route127_Text_1C1828, Route127_Text_1C1860 + trainerbattle 0, TRAINER_CONNOR, 0, Route127_Text_1C1828, Route127_Text_1C1860 msgbox Route127_Text_1C1877, 6 end Route127_EventScript_1520A8:: @ 81520A8 - trainerbattle 0, OPPONENT_JONAH, 0, Route127_Text_1C18CC, Route127_Text_1C1930 + trainerbattle 0, TRAINER_JONAH, 0, Route127_Text_1C18CC, Route127_Text_1C1930 msgbox Route127_Text_1C195D, 6 end Route127_EventScript_1520BF:: @ 81520BF - trainerbattle 0, OPPONENT_HENRY, 0, Route127_Text_1C19A3, Route127_Text_1C19D6 + trainerbattle 0, TRAINER_HENRY, 0, Route127_Text_1C19A3, Route127_Text_1C19D6 msgbox Route127_Text_1C19E7, 6 end Route127_EventScript_1520D6:: @ 81520D6 - trainerbattle 0, OPPONENT_ROGER, 0, Route127_Text_1C1A2E, Route127_Text_1C1A73 + trainerbattle 0, TRAINER_ROGER, 0, Route127_Text_1C1A2E, Route127_Text_1C1A73 msgbox Route127_Text_1C1AA0, 6 end Route127_EventScript_1520ED:: @ 81520ED - trainerbattle 0, OPPONENT_KOJI, 0, Route127_Text_1C1AE2, Route127_Text_1C1B2A + trainerbattle 0, TRAINER_KOJI, 0, Route127_Text_1C1AE2, Route127_Text_1C1B2A msgbox Route127_Text_1C1B39, 6 end Route127_EventScript_152104:: @ 8152104 - trainerbattle 0, OPPONENT_BYRON, 0, Route127_Text_1C1B92, Route127_Text_1C1BD9 + trainerbattle 0, TRAINER_BYRON, 0, Route127_Text_1C1B92, Route127_Text_1C1BD9 msgbox Route127_Text_1C1BEC, 6 end diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index ec4fb954e..12d9bace5 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -180,7 +180,7 @@ Route128_Movement_1522A1:: @ 81522A1 end_movement Route128_EventScript_1522A4:: @ 81522A4 - trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 + trainerbattle 0, TRAINER_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route128_EventScript_1522CB @@ -188,12 +188,12 @@ Route128_EventScript_1522A4:: @ 81522A4 end Route128_EventScript_1522CB:: @ 81522CB - trainerbattle 5, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1D02, Route128_Text_1C1D45 + trainerbattle 5, TRAINER_ISAIAH_1, 0, Route128_Text_1C1D02, Route128_Text_1C1D45 msgbox Route128_Text_1C1D6B, 6 end Route128_EventScript_1522E2:: @ 81522E2 - trainerbattle 0, OPPONENT_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 + trainerbattle 0, TRAINER_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route128_EventScript_152309 @@ -201,21 +201,21 @@ Route128_EventScript_1522E2:: @ 81522E2 end Route128_EventScript_152309:: @ 8152309 - trainerbattle 5, OPPONENT_KATELYN_1, 0, Route128_Text_1C1E90, Route128_Text_1C1EFA + trainerbattle 5, TRAINER_KATELYN_1, 0, Route128_Text_1C1E90, Route128_Text_1C1EFA msgbox Route128_Text_1C1F2E, 6 end Route128_EventScript_152320:: @ 8152320 - trainerbattle 0, OPPONENT_ALEXA, 0, Route128_Text_1C1F6D, Route128_Text_1C1FCC + trainerbattle 0, TRAINER_ALEXA, 0, Route128_Text_1C1F6D, Route128_Text_1C1FCC msgbox Route128_Text_1C1FE8, 6 end Route128_EventScript_152337:: @ 8152337 - trainerbattle 0, OPPONENT_RUBEN, 0, Route128_Text_1C202C, Route128_Text_1C2051 + trainerbattle 0, TRAINER_RUBEN, 0, Route128_Text_1C202C, Route128_Text_1C2051 msgbox Route128_Text_1C2060, 6 end Route128_EventScript_15234E:: @ 815234E - trainerbattle 0, OPPONENT_WAYNE, 0, Route128_Text_1C2090, Route128_Text_1C20FC + trainerbattle 0, TRAINER_WAYNE, 0, Route128_Text_1C2090, Route128_Text_1C20FC msgbox Route128_Text_1C210D, 6 end diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index ea43c5eab..360c67e02 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -2,21 +2,21 @@ Route129_MapScripts:: @ 8152365 .byte 0 Route129_EventScript_152366:: @ 8152366 - trainerbattle 0, OPPONENT_CHASE, 0, Route129_Text_1C2161, Route129_Text_1C2198 + trainerbattle 0, TRAINER_CHASE, 0, Route129_Text_1C2161, Route129_Text_1C2198 msgbox Route129_Text_1C21B4, 6 end Route129_EventScript_15237D:: @ 815237D - trainerbattle 0, OPPONENT_ALLISON, 0, Route129_Text_1C21ED, Route129_Text_1C222F + trainerbattle 0, TRAINER_ALLISON, 0, Route129_Text_1C21ED, Route129_Text_1C222F msgbox Route129_Text_1C2243, 6 end Route129_EventScript_152394:: @ 8152394 - trainerbattle 0, OPPONENT_REED, 0, Route129_Text_1C22C8, Route129_Text_1C22EC + trainerbattle 0, TRAINER_REED, 0, Route129_Text_1C22C8, Route129_Text_1C22EC msgbox Route129_Text_1C230F, 6 end Route129_EventScript_1523AB:: @ 81523AB - trainerbattle 0, OPPONENT_TISHA, 0, Route129_Text_1C2349, Route129_Text_1C2378 + trainerbattle 0, TRAINER_TISHA, 0, Route129_Text_1C2349, Route129_Text_1C2378 msgbox Route129_Text_1C23A3, 6 end diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index b0381969d..70eace112 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -30,11 +30,11 @@ Route130_EventScript_15240C:: @ 815240C end Route130_EventScript_152410:: @ 8152410 - trainerbattle 0, OPPONENT_RODNEY, 0, Route130_Text_1C2401, Route130_Text_1C245D + trainerbattle 0, TRAINER_RODNEY, 0, Route130_Text_1C2401, Route130_Text_1C245D msgbox Route130_Text_1C2479, 6 end Route130_EventScript_152427:: @ 8152427 - trainerbattle 0, OPPONENT_KATIE, 0, Route130_Text_1C24DC, Route130_Text_1C2525 + trainerbattle 0, TRAINER_KATIE, 0, Route130_Text_1C24DC, Route130_Text_1C2525 msgbox Route130_Text_1C256E, 6 end diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index ffd204bb9..6aa6868f3 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -11,31 +11,31 @@ Route131_EventScript_15244E:: @ 815244E return Route131_EventScript_152452:: @ 8152452 - trainerbattle 0, OPPONENT_RICHARD, 0, Route131_Text_1C25B3, Route131_Text_1C25F8 + trainerbattle 0, TRAINER_RICHARD, 0, Route131_Text_1C25B3, Route131_Text_1C25F8 msgbox Route131_Text_1C262A, 6 end Route131_EventScript_152469:: @ 8152469 - trainerbattle 0, OPPONENT_HERMAN, 0, Route131_Text_1C26B9, Route131_Text_1C271F + trainerbattle 0, TRAINER_HERMAN, 0, Route131_Text_1C26B9, Route131_Text_1C271F msgbox Route131_Text_1C2726, 6 end Route131_EventScript_152480:: @ 8152480 - trainerbattle 0, OPPONENT_SUSIE, 0, Route131_Text_1C2774, Route131_Text_1C27A4 + trainerbattle 0, TRAINER_SUSIE, 0, Route131_Text_1C2774, Route131_Text_1C27A4 msgbox Route131_Text_1C27CF, 6 end Route131_EventScript_152497:: @ 8152497 - trainerbattle 0, OPPONENT_KARA, 0, Route131_Text_1C284A, Route131_Text_1C2883 + trainerbattle 0, TRAINER_KARA, 0, Route131_Text_1C284A, Route131_Text_1C2883 msgbox Route131_Text_1C2898, 6 end Route131_EventScript_1524AE:: @ 81524AE - trainerbattle 4, OPPONENT_RELI_AND_IAN, 0, Route131_Text_1C28E2, Route131_Text_1C2918, Route131_Text_1C29B2 + trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_1C28E2, Route131_Text_1C2918, Route131_Text_1C29B2 msgbox Route131_Text_1C2950, 6 end Route131_EventScript_1524C9:: @ 81524C9 - trainerbattle 4, OPPONENT_RELI_AND_IAN, 0, Route131_Text_1C29F3, Route131_Text_1C2A20, Route131_Text_1C2ACA + trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_1C29F3, Route131_Text_1C2A20, Route131_Text_1C2ACA msgbox Route131_Text_1C2A5D, 6 end diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc index 642330fd4..6d964aacf 100644 --- a/data/maps/Route132/scripts.inc +++ b/data/maps/Route132/scripts.inc @@ -2,21 +2,21 @@ Route132_MapScripts:: @ 81524E4 .byte 0 Route132_EventScript_1524E5:: @ 81524E5 - trainerbattle 0, OPPONENT_GILBERT, 0, Route132_Text_1C2AFB, Route132_Text_1C2B5B + trainerbattle 0, TRAINER_GILBERT, 0, Route132_Text_1C2AFB, Route132_Text_1C2B5B msgbox Route132_Text_1C2B71, 6 end Route132_EventScript_1524FC:: @ 81524FC - trainerbattle 0, OPPONENT_DANA, 0, Route132_Text_1C2BB5, Route132_Text_1C2BEA + trainerbattle 0, TRAINER_DANA, 0, Route132_Text_1C2BB5, Route132_Text_1C2BEA msgbox Route132_Text_1C2BFA, 6 end Route132_EventScript_152513:: @ 8152513 - trainerbattle 0, OPPONENT_RONALD, 0, Route132_Text_1C2C32, Route132_Text_1C2C60 + trainerbattle 0, TRAINER_RONALD, 0, Route132_Text_1C2C32, Route132_Text_1C2C60 msgbox Route132_Text_1C2C78, 6 end Route132_EventScript_15252A:: @ 815252A - trainerbattle 0, OPPONENT_KIYO, 0, Route132_Text_1C2CD9, Route132_Text_1C2D1F + trainerbattle 0, TRAINER_KIYO, 0, Route132_Text_1C2CD9, Route132_Text_1C2D1F msgbox Route132_Text_1C2D3E, 6 end diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc index 78bec4141..213be5562 100644 --- a/data/maps/Route133/scripts.inc +++ b/data/maps/Route133/scripts.inc @@ -2,26 +2,26 @@ Route133_MapScripts:: @ 8152541 .byte 0 Route133_EventScript_152542:: @ 8152542 - trainerbattle 0, OPPONENT_FRANKLIN, 0, Route133_Text_1C2DA5, Route133_Text_1C2DF4 + trainerbattle 0, TRAINER_FRANKLIN, 0, Route133_Text_1C2DA5, Route133_Text_1C2DF4 msgbox Route133_Text_1C2E09, 6 end Route133_EventScript_152559:: @ 8152559 - trainerbattle 0, OPPONENT_DEBRA, 0, Route133_Text_1C2E61, Route133_Text_1C2EBD + trainerbattle 0, TRAINER_DEBRA, 0, Route133_Text_1C2E61, Route133_Text_1C2EBD msgbox Route133_Text_1C2ECD, 6 end Route133_EventScript_152570:: @ 8152570 - trainerbattle 0, OPPONENT_LINDA, 0, Route133_Text_1C2EF7, Route133_Text_1C2F19 + trainerbattle 0, TRAINER_LINDA, 0, Route133_Text_1C2EF7, Route133_Text_1C2F19 msgbox Route133_Text_1C2F25, 6 end Route133_EventScript_152587:: @ 8152587 - trainerbattle 0, OPPONENT_WARREN, 0, Route133_Text_1C2F53, Route133_Text_1C2FA3 + trainerbattle 0, TRAINER_WARREN, 0, Route133_Text_1C2F53, Route133_Text_1C2FA3 msgbox Route133_Text_1C2FC7, 6 end Route133_EventScript_15259E:: @ 815259E - trainerbattle 0, OPPONENT_BECK, 0, Route133_Text_1C302D, Route133_Text_1C305F + trainerbattle 0, TRAINER_BECK, 0, Route133_Text_1C302D, Route133_Text_1C305F msgbox Route133_Text_1C307E, 6 end diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc index 06b53ce31..e5c106899 100644 --- a/data/maps/Route134/scripts.inc +++ b/data/maps/Route134/scripts.inc @@ -7,26 +7,26 @@ Route134_MapScript1_1525BB:: @ 81525BB end Route134_EventScript_1525C4:: @ 81525C4 - trainerbattle 0, OPPONENT_JACK, 0, Route134_Text_1C30C6, Route134_Text_1C3110 + trainerbattle 0, TRAINER_JACK, 0, Route134_Text_1C30C6, Route134_Text_1C3110 msgbox Route134_Text_1C311A, 6 end Route134_EventScript_1525DB:: @ 81525DB - trainerbattle 0, OPPONENT_LAUREL, 0, Route134_Text_1C315E, Route134_Text_1C3198 + trainerbattle 0, TRAINER_LAUREL, 0, Route134_Text_1C315E, Route134_Text_1C3198 msgbox Route134_Text_1C31A0, 6 end Route134_EventScript_1525F2:: @ 81525F2 - trainerbattle 0, OPPONENT_ALEX, 0, Route134_Text_1C31D7, Route134_Text_1C3213 + trainerbattle 0, TRAINER_ALEX, 0, Route134_Text_1C31D7, Route134_Text_1C3213 msgbox Route134_Text_1C3229, 6 end Route134_EventScript_152609:: @ 8152609 - trainerbattle 0, OPPONENT_AARON, 0, Route134_Text_1C3319, Route134_Text_1C335C + trainerbattle 0, TRAINER_AARON, 0, Route134_Text_1C3319, Route134_Text_1C335C msgbox Route134_Text_1C336E, 6 end Route134_EventScript_152620:: @ 8152620 - trainerbattle 0, OPPONENT_HITOSHI, 0, Route134_Text_1C3262, Route134_Text_1C329E + trainerbattle 0, TRAINER_HITOSHI, 0, Route134_Text_1C3262, Route134_Text_1C329E msgbox Route134_Text_1C32D6, 6 end diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 307617e50..9c379107f 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -2,7 +2,7 @@ RustboroCity_Gym_MapScripts:: @ 81578D8 .byte 0 RustboroCity_Gym_EventScript_1578D9:: @ 81578D9 - trainerbattle 1, OPPONENT_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE + trainerbattle 1, TRAINER_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE goto_if_unset FLAG_RECEIVED_TM39, RustboroCity_Gym_EventScript_15793C msgbox RustboroCity_Gym_Text_184252, 4 release @@ -34,12 +34,12 @@ RustboroCity_Gym_EventScript_15793C:: @ 815793C end RustboroCity_Gym_EventScript_157960:: @ 8157960 - trainerbattle 0, OPPONENT_JOSH, 0, RustboroCity_Gym_Text_183D99, RustboroCity_Gym_Text_183DDD + trainerbattle 0, TRAINER_JOSH, 0, RustboroCity_Gym_Text_183D99, RustboroCity_Gym_Text_183DDD msgbox RustboroCity_Gym_Text_183DF9, 6 end RustboroCity_Gym_EventScript_157977:: @ 8157977 - trainerbattle 0, OPPONENT_TOMMY, 0, RustboroCity_Gym_Text_183E38, RustboroCity_Gym_Text_183E78 + trainerbattle 0, TRAINER_TOMMY, 0, RustboroCity_Gym_Text_183E38, RustboroCity_Gym_Text_183E78 msgbox RustboroCity_Gym_Text_183E98, 6 end diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 13fb80043..6c3f759cc 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -310,7 +310,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA faceplayer playbgm MUS_EVIL_TEAM, FALSE msgbox RusturfTunnel_Text_19419B, 4 - trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 + trainerbattle 3, TRAINER_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 msgbox RusturfTunnel_Text_194274, 4 giveitem_std ITEM_DEVON_GOODS closemessage @@ -415,6 +415,6 @@ RusturfTunnel_Movement_15CAC3:: @ 815CAC3 end_movement RusturfTunnel_EventScript_15CACD:: @ 815CACD - trainerbattle 0, OPPONENT_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 + trainerbattle 0, TRAINER_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 msgbox RusturfTunnel_Text_1948C4, 6 end diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 7bc5a7fdd..57872a66a 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -173,14 +173,14 @@ SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A end SSTidalCorridor_EventScript_15FE84:: @ 815FE84 - goto_if_trainer_not_defeated OPPONENT_PHILLIP, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_LEONARD, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_COLTON, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_TUCKER, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_THOMAS, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_LEA_AND_JED, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_GARRET, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_ANETTE, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_PHILLIP, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_LEONARD, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_COLTON, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_TUCKER, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_THOMAS, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_LEA_AND_JED, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_GARRET, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_ANETTE, SSTidalCorridor_EventScript_15FED5 setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto SSTidalCorridor_EventScript_15FE7A return diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc index e91c20625..9b19a2f3a 100644 --- a/data/maps/SSTidalLowerDeck/scripts.inc +++ b/data/maps/SSTidalLowerDeck/scripts.inc @@ -2,11 +2,11 @@ SSTidalLowerDeck_MapScripts:: @ 815FED6 .byte 0 SSTidalLowerDeck_EventScript_15FED7:: @ 815FED7 - trainerbattle 0, OPPONENT_PHILLIP, 0, SSTidalLowerDeck_Text_1993C1, SSTidalLowerDeck_Text_19941A + trainerbattle 0, TRAINER_PHILLIP, 0, SSTidalLowerDeck_Text_1993C1, SSTidalLowerDeck_Text_19941A msgbox SSTidalLowerDeck_Text_19942E, 6 end SSTidalLowerDeck_EventScript_15FEEE:: @ 815FEEE - trainerbattle 0, OPPONENT_LEONARD, 0, SSTidalLowerDeck_Text_199491, SSTidalLowerDeck_Text_1994F7 + trainerbattle 0, TRAINER_LEONARD, 0, SSTidalLowerDeck_Text_199491, SSTidalLowerDeck_Text_1994F7 msgbox SSTidalLowerDeck_Text_199508, 6 end diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index 89372bd84..52927d54e 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -29,36 +29,36 @@ SSTidalRooms_EventScript_15FF47:: @ 815FF47 end SSTidalRooms_EventScript_15FF5D:: @ 815FF5D - trainerbattle 0, OPPONENT_COLTON, 0, SSTidalRooms_Text_19958A, SSTidalRooms_Text_199613 + trainerbattle 0, TRAINER_COLTON, 0, SSTidalRooms_Text_19958A, SSTidalRooms_Text_199613 msgbox SSTidalRooms_Text_199630, 6 end SSTidalRooms_EventScript_15FF74:: @ 815FF74 - trainerbattle 0, OPPONENT_TUCKER, 0, SSTidalRooms_Text_1996A6, SSTidalRooms_Text_1996BF + trainerbattle 0, TRAINER_TUCKER, 0, SSTidalRooms_Text_1996A6, SSTidalRooms_Text_1996BF msgbox SSTidalRooms_Text_1996E1, 6 end SSTidalRooms_EventScript_15FF8B:: @ 815FF8B - trainerbattle 0, OPPONENT_THOMAS, 0, SSTidalRooms_Text_199723, SSTidalRooms_Text_199747 + trainerbattle 0, TRAINER_THOMAS, 0, SSTidalRooms_Text_199723, SSTidalRooms_Text_199747 msgbox SSTidalRooms_Text_199778, 6 end SSTidalRooms_EventScript_15FFA2:: @ 815FFA2 - trainerbattle 4, OPPONENT_LEA_AND_JED, 0, SSTidalRooms_Text_1997C1, SSTidalRooms_Text_199813, SSTidalRooms_Text_199887 + trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_1997C1, SSTidalRooms_Text_199813, SSTidalRooms_Text_199887 msgbox SSTidalRooms_Text_199820, 6 end SSTidalRooms_EventScript_15FFBD:: @ 815FFBD - trainerbattle 4, OPPONENT_LEA_AND_JED, 0, SSTidalRooms_Text_1998C5, SSTidalRooms_Text_19990E, SSTidalRooms_Text_199975 + trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_1998C5, SSTidalRooms_Text_19990E, SSTidalRooms_Text_199975 msgbox SSTidalRooms_Text_19991C, 6 end SSTidalRooms_EventScript_15FFD8:: @ 815FFD8 - trainerbattle 0, OPPONENT_GARRET, 0, SSTidalRooms_Text_1999B7, SSTidalRooms_Text_1999FF + trainerbattle 0, TRAINER_GARRET, 0, SSTidalRooms_Text_1999B7, SSTidalRooms_Text_1999FF msgbox SSTidalRooms_Text_199A10, 6 end SSTidalRooms_EventScript_15FFEF:: @ 815FFEF - trainerbattle 0, OPPONENT_ANETTE, 0, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF + trainerbattle 0, TRAINER_ANETTE, 0, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF msgbox SSTidalRooms_Text_199ADE, 6 end diff --git a/data/maps/SeafloorCavern_Room1/scripts.inc b/data/maps/SeafloorCavern_Room1/scripts.inc index 6478efac1..cd1513ec1 100644 --- a/data/maps/SeafloorCavern_Room1/scripts.inc +++ b/data/maps/SeafloorCavern_Room1/scripts.inc @@ -7,11 +7,11 @@ SeafloorCavern_Room1_MapScript1_15DA67:: @ 815DA67 end SeafloorCavern_Room1_EventScript_15DA6D:: @ 815DA6D - trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_1, 0, SeafloorCavern_Room1_Text_1974BA, SeafloorCavern_Room1_Text_1974EA + trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_1, 0, SeafloorCavern_Room1_Text_1974BA, SeafloorCavern_Room1_Text_1974EA msgbox SeafloorCavern_Room1_Text_1974FF, 6 end SeafloorCavern_Room1_EventScript_15DA84:: @ 815DA84 - trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_2, 0, SeafloorCavern_Room1_Text_19753C, SeafloorCavern_Room1_Text_197573 + trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_2, 0, SeafloorCavern_Room1_Text_19753C, SeafloorCavern_Room1_Text_197573 msgbox SeafloorCavern_Room1_Text_197589, 6 end diff --git a/data/maps/SeafloorCavern_Room3/scripts.inc b/data/maps/SeafloorCavern_Room3/scripts.inc index 2ff8c4b26..57f2bc20a 100644 --- a/data/maps/SeafloorCavern_Room3/scripts.inc +++ b/data/maps/SeafloorCavern_Room3/scripts.inc @@ -7,6 +7,6 @@ SeafloorCavern_Room3_MapScript1_15DAA2:: @ 815DAA2 end SeafloorCavern_Room3_EventScript_15DAA8:: @ 815DAA8 - trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_3, 0, SeafloorCavern_Room3_Text_1975DC, SeafloorCavern_Room3_Text_1976F3 + trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_3, 0, SeafloorCavern_Room3_Text_1975DC, SeafloorCavern_Room3_Text_1976F3 msgbox SeafloorCavern_Room3_Text_197704, 6 end diff --git a/data/maps/SeafloorCavern_Room4/scripts.inc b/data/maps/SeafloorCavern_Room4/scripts.inc index cbed797c0..8f53d948c 100644 --- a/data/maps/SeafloorCavern_Room4/scripts.inc +++ b/data/maps/SeafloorCavern_Room4/scripts.inc @@ -7,6 +7,6 @@ SeafloorCavern_Room4_MapScript1_15DAC5:: @ 815DAC5 end SeafloorCavern_Room4_EventScript_15DACB:: @ 815DACB - trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_4, 0, SeafloorCavern_Room4_Text_1977B9, SeafloorCavern_Room4_Text_1977E2 + trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_4, 0, SeafloorCavern_Room4_Text_1977B9, SeafloorCavern_Room4_Text_1977E2 msgbox SeafloorCavern_Room4_Text_1977ED, 6 end diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 74d624141..d50a591f7 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -53,9 +53,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B491F, 4 .endif .ifdef SAPPHIRE - trainerbattle 3, OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, 0, UnknownString_81B4319 + trainerbattle 3, TRAINER_SEAFLOOR_CAVERN_GRUNT_5, 0, UnknownString_81B4319 .else - trainerbattle 3, OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, 0, SeafloorCavern_Room9_Text_1B49AE + trainerbattle 3, TRAINER_SEAFLOOR_CAVERN_GRUNT_5, 0, SeafloorCavern_Room9_Text_1B49AE .endif .ifdef SAPPHIRE msgbox UnknownString_81B432C, 4 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index ce0bc855f..58e4ba240 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -37,7 +37,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E78 compare FACING, 3 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E83 - trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E + trainerbattle 3, TRAINER_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4 closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EBF @@ -46,7 +46,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17EEA5, 4 savebgm 0 - trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_2, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6 + trainerbattle 3, TRAINER_MUSEUM_2F_GRUNT_2, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EBF waitmovement 0 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_1A0845 diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index a404013e0..a918c0568 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -86,7 +86,7 @@ SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD end_movement SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF - trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D + trainerbattle 1, TRAINER_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_15B056 goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_15B07A msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4 diff --git a/data/maps/SootopolisCity_Gym_B1F/scripts.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc index e54970701..06c7d33a3 100644 --- a/data/maps/SootopolisCity_Gym_B1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc @@ -2,41 +2,41 @@ SootopolisCity_Gym_B1F_MapScripts:: @ 815B0D7 .byte 0 SootopolisCity_Gym_B1F_EventScript_15B0D8:: @ 815B0D8 - trainerbattle 0, OPPONENT_ANDREA, 0, SootopolisCity_Gym_B1F_Text_18EA87, SootopolisCity_Gym_B1F_Text_18EACF + trainerbattle 0, TRAINER_ANDREA, 0, SootopolisCity_Gym_B1F_Text_18EA87, SootopolisCity_Gym_B1F_Text_18EACF msgbox SootopolisCity_Gym_B1F_Text_18EAED, 6 end SootopolisCity_Gym_B1F_EventScript_15B0EF:: @ 815B0EF - trainerbattle 0, OPPONENT_CRISSY, 0, SootopolisCity_Gym_B1F_Text_18EB22, SootopolisCity_Gym_B1F_Text_18EB81 + trainerbattle 0, TRAINER_CRISSY, 0, SootopolisCity_Gym_B1F_Text_18EB22, SootopolisCity_Gym_B1F_Text_18EB81 msgbox SootopolisCity_Gym_B1F_Text_18EBB1, 6 end SootopolisCity_Gym_B1F_EventScript_15B106:: @ 815B106 - trainerbattle 0, OPPONENT_BRIANNA_2, 0, SootopolisCity_Gym_B1F_Text_18EBFA, SootopolisCity_Gym_B1F_Text_18EC5E + trainerbattle 0, TRAINER_BRIANNA_2, 0, SootopolisCity_Gym_B1F_Text_18EBFA, SootopolisCity_Gym_B1F_Text_18EC5E msgbox SootopolisCity_Gym_B1F_Text_18EC92, 6 end SootopolisCity_Gym_B1F_EventScript_15B11D:: @ 815B11D - trainerbattle 0, OPPONENT_CONNIE, 0, SootopolisCity_Gym_B1F_Text_18ECEB, SootopolisCity_Gym_B1F_Text_18ED18 + trainerbattle 0, TRAINER_CONNIE, 0, SootopolisCity_Gym_B1F_Text_18ECEB, SootopolisCity_Gym_B1F_Text_18ED18 msgbox SootopolisCity_Gym_B1F_Text_18ED2B, 6 end SootopolisCity_Gym_B1F_EventScript_15B134:: @ 815B134 - trainerbattle 0, OPPONENT_BRIDGET, 0, SootopolisCity_Gym_B1F_Text_18ED91, SootopolisCity_Gym_B1F_Text_18EDE8 + trainerbattle 0, TRAINER_BRIDGET, 0, SootopolisCity_Gym_B1F_Text_18ED91, SootopolisCity_Gym_B1F_Text_18EDE8 msgbox SootopolisCity_Gym_B1F_Text_18EE03, 6 end SootopolisCity_Gym_B1F_EventScript_15B14B:: @ 815B14B - trainerbattle 0, OPPONENT_OLIVIA, 0, SootopolisCity_Gym_B1F_Text_18EE96, SootopolisCity_Gym_B1F_Text_18EEDC + trainerbattle 0, TRAINER_OLIVIA, 0, SootopolisCity_Gym_B1F_Text_18EE96, SootopolisCity_Gym_B1F_Text_18EEDC msgbox SootopolisCity_Gym_B1F_Text_18EEF7, 6 end SootopolisCity_Gym_B1F_EventScript_15B162:: @ 815B162 - trainerbattle 0, OPPONENT_TIFFANY, 0, SootopolisCity_Gym_B1F_Text_18EF39, SootopolisCity_Gym_B1F_Text_18EFB8 + trainerbattle 0, TRAINER_TIFFANY, 0, SootopolisCity_Gym_B1F_Text_18EF39, SootopolisCity_Gym_B1F_Text_18EFB8 msgbox SootopolisCity_Gym_B1F_Text_18EFCA, 6 end SootopolisCity_Gym_B1F_EventScript_15B179:: @ 815B179 - trainerbattle 0, OPPONENT_MARISSA, 0, SootopolisCity_Gym_B1F_Text_18F037, SootopolisCity_Gym_B1F_Text_18F07F + trainerbattle 0, TRAINER_MARISSA, 0, SootopolisCity_Gym_B1F_Text_18F037, SootopolisCity_Gym_B1F_Text_18F07F msgbox SootopolisCity_Gym_B1F_Text_18F085, 6 end diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 045189759..b4931325a 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -38,7 +38,7 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 applymovement 255, VictoryRoad_1F_Movement_1A083F waitmovement 0 msgbox VictoryRoad_1F_Text_19782B, 4 - trainerbattle 3, OPPONENT_WALLY_1, 0, VictoryRoad_1F_Text_197943 + trainerbattle 3, TRAINER_WALLY_1, 0, VictoryRoad_1F_Text_197943 msgbox VictoryRoad_1F_Text_197967, 4 clearflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD moveobjectoffscreen 4 @@ -91,7 +91,7 @@ VictoryRoad_1F_EventScript_15DF28:: @ 815DF28 end VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 - trainerbattle 0, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 + trainerbattle 0, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq VictoryRoad_1F_EventScript_15DF58 @@ -99,21 +99,21 @@ VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 end VictoryRoad_1F_EventScript_15DF58:: @ 815DF58 - trainerbattle 5, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 + trainerbattle 5, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 msgbox VictoryRoad_1F_Text_197A47, 6 end VictoryRoad_1F_EventScript_15DF6F:: @ 815DF6F - trainerbattle 0, OPPONENT_EDGAR, 0, VictoryRoad_1F_Text_197AD1, VictoryRoad_1F_Text_197B1A + trainerbattle 0, TRAINER_EDGAR, 0, VictoryRoad_1F_Text_197AD1, VictoryRoad_1F_Text_197B1A msgbox VictoryRoad_1F_Text_197B36, 6 end VictoryRoad_1F_EventScript_15DF86:: @ 815DF86 - trainerbattle 0, OPPONENT_ALBERT, 0, VictoryRoad_1F_Text_197B99, VictoryRoad_1F_Text_197BE1 + trainerbattle 0, TRAINER_ALBERT, 0, VictoryRoad_1F_Text_197B99, VictoryRoad_1F_Text_197BE1 msgbox VictoryRoad_1F_Text_197BF7, 6 end VictoryRoad_1F_EventScript_15DF9D:: @ 815DF9D - trainerbattle 0, OPPONENT_HOPE, 0, VictoryRoad_1F_Text_197C45, VictoryRoad_1F_Text_197C8D + trainerbattle 0, TRAINER_HOPE, 0, VictoryRoad_1F_Text_197C45, VictoryRoad_1F_Text_197C8D msgbox VictoryRoad_1F_Text_197CAF, 6 end diff --git a/data/maps/VictoryRoad_B1F/scripts.inc b/data/maps/VictoryRoad_B1F/scripts.inc index e07cd4286..5667866d7 100644 --- a/data/maps/VictoryRoad_B1F/scripts.inc +++ b/data/maps/VictoryRoad_B1F/scripts.inc @@ -2,16 +2,16 @@ VictoryRoad_B1F_MapScripts:: @ 815DFB4 .byte 0 VictoryRoad_B1F_EventScript_15DFB5:: @ 815DFB5 - trainerbattle 0, OPPONENT_SAMUEL, 0, VictoryRoad_B1F_Text_197CE9, VictoryRoad_B1F_Text_197D42 + trainerbattle 0, TRAINER_SAMUEL, 0, VictoryRoad_B1F_Text_197CE9, VictoryRoad_B1F_Text_197D42 msgbox VictoryRoad_B1F_Text_197D5B, 6 end VictoryRoad_B1F_EventScript_15DFCC:: @ 815DFCC - trainerbattle 0, OPPONENT_SHANNON, 0, VictoryRoad_B1F_Text_197D98, VictoryRoad_B1F_Text_197DE8 + trainerbattle 0, TRAINER_SHANNON, 0, VictoryRoad_B1F_Text_197D98, VictoryRoad_B1F_Text_197DE8 msgbox VictoryRoad_B1F_Text_197E13, 6 end VictoryRoad_B1F_EventScript_15DFE3:: @ 815DFE3 - trainerbattle 0, OPPONENT_MICHELLE, 0, VictoryRoad_B1F_Text_197E5D, VictoryRoad_B1F_Text_197EA6 + trainerbattle 0, TRAINER_MICHELLE, 0, VictoryRoad_B1F_Text_197E5D, VictoryRoad_B1F_Text_197EA6 msgbox VictoryRoad_B1F_Text_197EB6, 6 end diff --git a/data/maps/VictoryRoad_B2F/scripts.inc b/data/maps/VictoryRoad_B2F/scripts.inc index 6b8fe2569..929af39e8 100644 --- a/data/maps/VictoryRoad_B2F/scripts.inc +++ b/data/maps/VictoryRoad_B2F/scripts.inc @@ -2,21 +2,21 @@ VictoryRoad_B2F_MapScripts:: @ 815DFFA .byte 0 VictoryRoad_B2F_EventScript_15DFFB:: @ 815DFFB - trainerbattle 0, OPPONENT_VITO, 0, VictoryRoad_B2F_Text_197EF2, VictoryRoad_B2F_Text_197F46 + trainerbattle 0, TRAINER_VITO, 0, VictoryRoad_B2F_Text_197EF2, VictoryRoad_B2F_Text_197F46 msgbox VictoryRoad_B2F_Text_197F71, 6 end VictoryRoad_B2F_EventScript_15E012:: @ 815E012 - trainerbattle 0, OPPONENT_OWEN, 0, VictoryRoad_B2F_Text_197FE5, VictoryRoad_B2F_Text_19802B + trainerbattle 0, TRAINER_OWEN, 0, VictoryRoad_B2F_Text_197FE5, VictoryRoad_B2F_Text_19802B msgbox VictoryRoad_B2F_Text_198047, 6 end VictoryRoad_B2F_EventScript_15E029:: @ 815E029 - trainerbattle 0, OPPONENT_CAROLINE, 0, VictoryRoad_B2F_Text_198089, VictoryRoad_B2F_Text_1980AD + trainerbattle 0, TRAINER_CAROLINE, 0, VictoryRoad_B2F_Text_198089, VictoryRoad_B2F_Text_1980AD msgbox VictoryRoad_B2F_Text_1980C8, 6 end VictoryRoad_B2F_EventScript_15E040:: @ 815E040 - trainerbattle 0, OPPONENT_JULIE, 0, VictoryRoad_B2F_Text_198121, VictoryRoad_B2F_Text_1981A3 + trainerbattle 0, TRAINER_JULIE, 0, VictoryRoad_B2F_Text_198121, VictoryRoad_B2F_Text_1981A3 msgbox VictoryRoad_B2F_Text_1981BA, 6 end diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 56ed0d9ab..34ba18f08 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -47,7 +47,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2 end Route117_EventScript_1B22CD:: @ 81B22CD - specialvar RESULT, sub_8042B4C + specialvar RESULT, DaycareMonReceivedMail compare RESULT, 1 call_if_eq Route117_EventScript_1B22DE return diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 957d56609..b1c47fa62 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -1,7 +1,7 @@ Route111_EventScript_1AE313:: @ 81AE313 Route118_EventScript_1AE313:: @ 81AE313 Route120_EventScript_1AE313:: @ 81AE313 - cleartrainerflag OPPONENT_GABBY_AND_TY_6 + cleartrainerflag TRAINER_GABBY_AND_TY_6 specialvar RESULT, GabbyAndTyGetBattleNum switch RESULT case 0, Route111_EventScript_1AE384 @@ -124,61 +124,61 @@ Route111_EventScript_1AE41E:: @ 81AE41E return Route111_EventScript_1AE422:: @ 81AE422 - trainerbattle 6, OPPONENT_GABBY_AND_TY_1, 0, Route111_Text_1ABED8, Route111_Text_1ABFD3, Route111_Text_1AC5CA, Route111_EventScript_1AE5A2 + trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_1ABED8, Route111_Text_1ABFD3, Route111_Text_1AC5CA, Route111_EventScript_1AE5A2 msgbox Route111_Text_1AC59E, 4 release end Route111_EventScript_1AE442:: @ 81AE442 - trainerbattle 6, OPPONENT_GABBY_AND_TY_1, 0, Route111_Text_1AC73B, Route111_Text_1AC892, Route111_Text_1AC820, Route111_EventScript_1AE5A2 + trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_1AC73B, Route111_Text_1AC892, Route111_Text_1AC820, Route111_EventScript_1AE5A2 msgbox Route111_Text_1AC7E4, 4 release end Route118_EventScript_1AE462:: @ 81AE462 - trainerbattle 6, OPPONENT_GABBY_AND_TY_2, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F msgbox Route118_Text_1AC59E, 4 release end Route118_EventScript_1AE482:: @ 81AE482 - trainerbattle 6, OPPONENT_GABBY_AND_TY_2, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F msgbox Route118_Text_1AC7E4, 4 release end Route120_EventScript_1AE4A2:: @ 81AE4A2 - trainerbattle 6, OPPONENT_GABBY_AND_TY_3, 0, Route120_Text_1ABF50, Route120_Text_1AC6F8, Route120_Text_1AC5CA, Route120_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_1ABF50, Route120_Text_1AC6F8, Route120_Text_1AC5CA, Route120_EventScript_1AE60F msgbox Route120_Text_1AC59E, 4 release end Route120_EventScript_1AE4C2:: @ 81AE4C2 - trainerbattle 6, OPPONENT_GABBY_AND_TY_3, 0, Route120_Text_1AC790, Route120_Text_1AC8D7, Route120_Text_1AC820, Route120_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_1AC790, Route120_Text_1AC8D7, Route120_Text_1AC820, Route120_EventScript_1AE60F msgbox Route120_Text_1AC7E4, 4 release end Route111_EventScript_1AE4E2:: @ 81AE4E2 - trainerbattle 6, OPPONENT_GABBY_AND_TY_4, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F msgbox Route111_Text_1AC59E, 4 release end Route111_EventScript_1AE502:: @ 81AE502 - trainerbattle 6, OPPONENT_GABBY_AND_TY_4, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F msgbox Route111_Text_1AC7E4, 4 release end Route118_EventScript_1AE522:: @ 81AE522 - trainerbattle 6, OPPONENT_GABBY_AND_TY_5, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F msgbox Route118_Text_1AC59E, 4 release end Route118_EventScript_1AE542:: @ 81AE542 - trainerbattle 6, OPPONENT_GABBY_AND_TY_5, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F msgbox Route118_Text_1AC7E4, 4 release end @@ -186,7 +186,7 @@ Route118_EventScript_1AE542:: @ 81AE542 Route111_EventScript_1AE562:: @ 81AE562 Route118_EventScript_1AE562:: @ 81AE562 Route120_EventScript_1AE562:: @ 81AE562 - trainerbattle 6, OPPONENT_GABBY_AND_TY_6, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F msgbox Route111_Text_1AC59E, 4 release end @@ -194,7 +194,7 @@ Route120_EventScript_1AE562:: @ 81AE562 Route111_EventScript_1AE582:: @ 81AE582 Route118_EventScript_1AE582:: @ 81AE582 Route120_EventScript_1AE582:: @ 81AE582 - trainerbattle 6, OPPONENT_GABBY_AND_TY_6, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F msgbox Route111_Text_1AC7E4, 4 release end diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index ed81e6628..daa8c96db 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -46,9 +46,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB msgbox MtChimney_Text_1B38B3, 4 .endif .ifdef SAPPHIRE - trainerbattle 3, OPPONENT_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3099 + trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3099 .else - trainerbattle 3, OPPONENT_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3A68 + trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3A68 .endif .ifdef SAPPHIRE msgbox MtChimney_Text_1B30C2, 4 diff --git a/data/scripts/magma_summit.inc b/data/scripts/magma_summit.inc index ac71b038f..0992a62c0 100644 --- a/data/scripts/magma_summit.inc +++ b/data/scripts/magma_summit.inc @@ -1,29 +1,29 @@ MtPyre_Summit_EventScript_1B2DA9:: @ 81B2DA9 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, 0, UnknownString_81B50C3, UnknownString_81B50F5 + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, UnknownString_81B50C3, UnknownString_81B50F5 msgbox UnknownString_81B5131, 6 .else - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, 0, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30 + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30 msgbox MtPyre_Summit_Text_1B5D6D, 6 .endif end MtPyre_Summit_EventScript_1B2DC0:: @ 81B2DC0 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, 0, UnknownString_81B5166, UnknownString_81B519F + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, UnknownString_81B5166, UnknownString_81B519F msgbox UnknownString_81B51B5, 6 .else - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, 0, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB msgbox MtPyre_Summit_Text_1B5DF1, 6 .endif end MtPyre_Summit_EventScript_1B2DD7:: @ 81B2DD7 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, 0, UnknownString_81B51EB, UnknownString_81B5224 + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, UnknownString_81B51EB, UnknownString_81B5224 msgbox UnknownString_81B5248, 6 .else - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, 0, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60 + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60 msgbox MtPyre_Summit_Text_1B5E84, 6 .endif end diff --git a/data/specials.inc b/data/specials.inc index 7983c71af..db77f74a9 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -203,7 +203,7 @@ gSpecials:: def_special TakePokemonFromDaycare def_special ScriptHatchMon def_special EggHatch - def_special sub_8042B4C + def_special DaycareMonReceivedMail def_special ShowLinkBattleRecords def_special HasEnoughMoneyFor def_special PayMoneyFor @@ -240,7 +240,7 @@ gSpecials:: def_special UpdateCyclingRoadState def_special GetLeadMonFriendshipScore def_special sub_8134548 - def_special sub_81347F8 + def_special ChooseNextBattleTowerTrainer def_special CheckPartyBattleTowerBanlist def_special PrintBattleTowerTrainerGreeting def_special PrintEReaderTrainerGreeting diff --git a/graphics/unknown/unknown_E77004.bin b/graphics/interface/bag_screen.bin Binary files differindex 0342aac39..0342aac39 100644 --- a/graphics/unknown/unknown_E77004.bin +++ b/graphics/interface/bag_screen.bin diff --git a/graphics/unknown/unknown_E96EC8.bin b/graphics/interface/bag_screen_labels.bin Binary files differindex eaaed586e..eaaed586e 100644 --- a/graphics/unknown/unknown_E96EC8.bin +++ b/graphics/interface/bag_screen_labels.bin diff --git a/graphics/unknown_sprites/83C172C.png b/graphics/interface/bag_spinner.png Binary files differindex a05d86c79..a05d86c79 100644 --- a/graphics/unknown_sprites/83C172C.png +++ b/graphics/interface/bag_spinner.png diff --git a/include/battle.h b/include/battle.h index 06a390cdf..ac95f6fff 100644 --- a/include/battle.h +++ b/include/battle.h @@ -3,6 +3,7 @@ #include "sprite.h" #include "constants/battle_constants.h" +#include "battle_setup.h" #define GET_BATTLER_POSITION(bank)((gBattlerPositions[bank])) #define GET_BATTLER_SIDE(bank)((GetBattlerPosition(bank) & BIT_SIDE)) @@ -60,6 +61,14 @@ enum BATTLE_TERRAIN_PLAIN, }; +union TrainerMonPtr +{ + const struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves; + const struct TrainerMonNoItemCustomMoves *NoItemCustomMoves; + const struct TrainerMonItemDefaultMoves *ItemDefaultMoves; + const struct TrainerMonItemCustomMoves *ItemCustomMoves; +}; + struct Trainer { /*0x00*/ u8 partyFlags; @@ -71,7 +80,7 @@ struct Trainer /*0x18*/ bool8 doubleBattle; /*0x1C*/ u32 aiFlags; /*0x20*/ u8 partySize; - /*0x24*/ const void *party; + /*0x24*/ union TrainerMonPtr party; }; struct BattleHistory diff --git a/include/battle_setup.h b/include/battle_setup.h index 88afcdf0a..fec5a249a 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -5,7 +5,7 @@ #define TRAINER_REMATCH_STEPS 255 // IV + LEVEL + SPECIES -struct TrainerPartyMember0 +struct TrainerMonNoItemDefaultMoves { u16 iv; u8 level; @@ -13,7 +13,7 @@ struct TrainerPartyMember0 }; // IV + LEVEL + SPECIES + MOVES -struct TrainerPartyMember1 +struct TrainerMonNoItemCustomMoves { u16 iv; u8 level; @@ -22,7 +22,7 @@ struct TrainerPartyMember1 }; // IV + LEVEL + SPECIES + ITEMS -struct TrainerPartyMember2 +struct TrainerMonItemDefaultMoves { u16 iv; u8 level; @@ -31,7 +31,7 @@ struct TrainerPartyMember2 }; // IV + LEVEL + SPECIES + ITEMS + MOVES -struct TrainerPartyMember3 +struct TrainerMonItemCustomMoves { u16 iv; u8 level; diff --git a/include/constants/opponents.h b/include/constants/opponents.h index d907153bd..11dd87ec4 100644 --- a/include/constants/opponents.h +++ b/include/constants/opponents.h @@ -1,699 +1,699 @@ #ifndef GUARD_CONSTANTS_OPPONENTS_H #define GUARD_CONSTANTS_OPPONENTS_H -#define OPPONENT_NONE 0 -#define OPPONENT_ARCHIE_1 1 -#define OPPONENT_GRUNT_1 2 -#define OPPONENT_GRUNT_2 3 -#define OPPONENT_GRUNT_3 4 -#define OPPONENT_GRUNT_4 5 -#define OPPONENT_GRUNT_5 6 -#define OPPONENT_GRUNT_6 7 -#define OPPONENT_GRUNT_7 8 -#define OPPONENT_GRUNT_8 9 -#define OPPONENT_GRUNT_9 10 -#define OPPONENT_GRUNT_10 11 -#define OPPONENT_GRUNT_11 12 -#define OPPONENT_GRUNT_12 13 -#define OPPONENT_GRUNT_13 14 -#define OPPONENT_GRUNT_14 15 -#define OPPONENT_GRUNT_15 16 -#define OPPONENT_GRUNT_16 17 -#define OPPONENT_GRUNT_17 18 -#define OPPONENT_GRUNT_18 19 -#define OPPONENT_GRUNT_19 20 -#define OPPONENT_GRUNT_20 21 -#define OPPONENT_GRUNT_21 22 -#define OPPONENT_GRUNT_22 23 -#define OPPONENT_GRUNT_23 24 -#define OPPONENT_GRUNT_24 25 -#define OPPONENT_GRUNT_25 26 -#define OPPONENT_GRUNT_26 27 -#define OPPONENT_GRUNT_27 28 -#define OPPONENT_ANONYMOUS_1 29 -#define OPPONENT_MATT_1 30 -#define OPPONENT_MATT_2 31 -#define OPPONENT_SHELLY_1 32 -#define OPPONENT_SHELLY_2 33 -#define OPPONENT_ARCHIE_2 34 -#define OPPONENT_ARCHIE_3 35 -#define OPPONENT_DAISY 36 -#define OPPONENT_ROSE_1 37 -#define OPPONENT_LILY 38 -#define OPPONENT_VIOLET 39 -#define OPPONENT_ROSE_2 40 -#define OPPONENT_ROSE_3 41 -#define OPPONENT_ROSE_4 42 -#define OPPONENT_ROSE_5 43 -#define OPPONENT_DUSTY_1 44 -#define OPPONENT_CHIP 45 -#define OPPONENT_FOSTER 46 -#define OPPONENT_DUSTY_2 47 -#define OPPONENT_DUSTY_3 48 -#define OPPONENT_DUSTY_4 49 -#define OPPONENT_DUSTY_5 50 -#define OPPONENT_GABBY_AND_TY_1 51 -#define OPPONENT_GABBY_AND_TY_2 52 -#define OPPONENT_GABBY_AND_TY_3 53 -#define OPPONENT_GABBY_AND_TY_4 54 -#define OPPONENT_GABBY_AND_TY_5 55 -#define OPPONENT_GABBY_AND_TY_6 56 -#define OPPONENT_LOLA_1 57 -#define OPPONENT_CARMEN 58 -#define OPPONENT_GWEN 59 -#define OPPONENT_LOLA_2 60 -#define OPPONENT_LOLA_3 61 -#define OPPONENT_LOLA_4 62 -#define OPPONENT_LOLA_5 63 -#define OPPONENT_RICKY_1 64 -#define OPPONENT_SIMON 65 -#define OPPONENT_CHARLIE 66 -#define OPPONENT_RICKY_2 67 -#define OPPONENT_RICKY_3 68 -#define OPPONENT_RICKY_4 69 -#define OPPONENT_RICKY_5 70 -#define OPPONENT_RANDALL 71 -#define OPPONENT_PARKER 72 -#define OPPONENT_GEORGE 73 -#define OPPONENT_BERKE 74 -#define OPPONENT_CLYDE 75 -#define OPPONENT_VINCENT 76 -#define OPPONENT_LEROY 77 -#define OPPONENT_WILTON_1 78 -#define OPPONENT_EDGAR 79 -#define OPPONENT_ALBERT 80 -#define OPPONENT_SAMUEL 81 -#define OPPONENT_VITO 82 -#define OPPONENT_OWEN 83 -#define OPPONENT_WILTON_2 84 -#define OPPONENT_WILTON_3 85 -#define OPPONENT_WILTON_4 86 -#define OPPONENT_WILTON_5 87 -#define OPPONENT_WARREN 88 -#define OPPONENT_MARY 89 -#define OPPONENT_LORI 90 -#define OPPONENT_JODY 91 -#define OPPONENT_WENDY 92 -#define OPPONENT_ELAINE 93 -#define OPPONENT_BROOKE_1 94 -#define OPPONENT_JENNIFER 95 -#define OPPONENT_HOPE 96 -#define OPPONENT_SHANNON 97 -#define OPPONENT_MICHELLE 98 -#define OPPONENT_CAROLINE 99 -#define OPPONENT_JULIE 100 -#define OPPONENT_BROOKE_2 101 -#define OPPONENT_BROOKE_3 102 -#define OPPONENT_BROOKE_4 103 -#define OPPONENT_BROOKE_5 104 -#define OPPONENT_PATRICIA 105 -#define OPPONENT_KINDRA 106 -#define OPPONENT_TAMMY 107 -#define OPPONENT_VALERIE_1 108 -#define OPPONENT_TASHA 109 -#define OPPONENT_VALERIE_2 110 -#define OPPONENT_VALERIE_3 111 -#define OPPONENT_VALERIE_4 112 -#define OPPONENT_VALERIE_5 113 -#define OPPONENT_CINDY_1 114 -#define OPPONENT_ANONYMOUS_2 115 -#define OPPONENT_BRIANNA_1 116 -#define OPPONENT_CINDY_2 117 -#define OPPONENT_BRIANNA_2 118 -#define OPPONENT_ANETTE 119 -#define OPPONENT_CINDY_3 120 -#define OPPONENT_CINDY_4 121 -#define OPPONENT_CINDY_5 122 -#define OPPONENT_CINDY_6 123 -#define OPPONENT_MELISSA 124 -#define OPPONENT_SHEILA 125 -#define OPPONENT_SHIRLEY 126 -#define OPPONENT_JESSICA_1 127 -#define OPPONENT_CONNIE 128 -#define OPPONENT_BRIDGET 129 -#define OPPONENT_OLIVIA 130 -#define OPPONENT_TIFFANY 131 -#define OPPONENT_JESSICA_2 132 -#define OPPONENT_JESSICA_3 133 -#define OPPONENT_JESSICA_4 134 -#define OPPONENT_JESSICA_5 135 -#define OPPONENT_WINSTON_1 136 -#define OPPONENT_ANONYMOUS_3 137 -#define OPPONENT_GARRET 138 -#define OPPONENT_WINSTON_2 139 -#define OPPONENT_WINSTON_3 140 -#define OPPONENT_WINSTON_4 141 -#define OPPONENT_WINSTON_5 142 -#define OPPONENT_STEVE_1 143 -#define OPPONENT_CHRIS 144 -#define OPPONENT_MARK 145 -#define OPPONENT_KENN 146 -#define OPPONENT_STEVE_2 147 -#define OPPONENT_STEVE_3 148 -#define OPPONENT_STEVE_4 149 -#define OPPONENT_STEVE_5 150 -#define OPPONENT_LUIS 151 -#define OPPONENT_AUSTIN 152 -#define OPPONENT_DOUGLAS 153 -#define OPPONENT_DARRIN 154 -#define OPPONENT_TONY_1 155 -#define OPPONENT_JEROME 156 -#define OPPONENT_MATTHEW 157 -#define OPPONENT_DAVID 158 -#define OPPONENT_SPENCER 159 -#define OPPONENT_ROLAND 160 -#define OPPONENT_CODY 161 -#define OPPONENT_STAN 162 -#define OPPONENT_BARRY 163 -#define OPPONENT_DEAN 164 -#define OPPONENT_RODNEY 165 -#define OPPONENT_RICHARD 166 -#define OPPONENT_HERMAN 167 -#define OPPONENT_ANONYMOUS_4 168 -#define OPPONENT_GILBERT 169 -#define OPPONENT_FRANKLIN 170 -#define OPPONENT_DANNY 171 -#define OPPONENT_JACK 172 -#define OPPONENT_DUDLEY 173 -#define OPPONENT_CHAD 174 -#define OPPONENT_TONY_2 175 -#define OPPONENT_TONY_3 176 -#define OPPONENT_TONY_4 177 -#define OPPONENT_TONY_5 178 -#define OPPONENT_HIDEKI 179 -#define OPPONENT_HITOSHI 180 -#define OPPONENT_KIYO 181 -#define OPPONENT_KOICHI 182 -#define OPPONENT_NOB_1 183 -#define OPPONENT_NOB_2 184 -#define OPPONENT_NOB_3 185 -#define OPPONENT_NOB_4 186 -#define OPPONENT_NOB_5 187 -#define OPPONENT_YUJI 188 -#define OPPONENT_DAISUKE 189 -#define OPPONENT_ATSUSHI 190 -#define OPPONENT_KIRK 191 -#define OPPONENT_SCOTT 192 -#define OPPONENT_HARVEY 193 -#define OPPONENT_SHAWN 194 -#define OPPONENT_RANDY 195 -#define OPPONENT_DALTON_1 196 -#define OPPONENT_DALTON_2 197 -#define OPPONENT_DALTON_3 198 -#define OPPONENT_DALTON_4 199 -#define OPPONENT_DALTON_5 200 -#define OPPONENT_COLE 201 -#define OPPONENT_FLINT 202 -#define OPPONENT_AXLE 203 -#define OPPONENT_JAKE 204 -#define OPPONENT_ANDY 205 -#define OPPONENT_BERNIE_1 206 -#define OPPONENT_BERNIE_2 207 -#define OPPONENT_BERNIE_3 208 -#define OPPONENT_BERNIE_4 209 -#define OPPONENT_BERNIE_5 210 -#define OPPONENT_DREW 211 -#define OPPONENT_CLIFF 212 -#define OPPONENT_LARRY 213 -#define OPPONENT_SHANE 214 -#define OPPONENT_JUSTIN 215 -#define OPPONENT_ETHAN_1 216 -#define OPPONENT_JEFF 217 -#define OPPONENT_TRAVIS 218 -#define OPPONENT_ETHAN_2 219 -#define OPPONENT_ETHAN_3 220 -#define OPPONENT_ETHAN_4 221 -#define OPPONENT_ETHAN_5 222 -#define OPPONENT_BRENT 223 -#define OPPONENT_DONALD 224 -#define OPPONENT_TAYLOR 225 -#define OPPONENT_BRANDON_1 226 -#define OPPONENT_DEREK 227 -#define OPPONENT_BRANDON_2 228 -#define OPPONENT_BRANDON_3 229 -#define OPPONENT_BRANDON_4 230 -#define OPPONENT_BRANDON_5 231 -#define OPPONENT_EDWARD 232 -#define OPPONENT_PRESTON 233 -#define OPPONENT_VIRGIL 234 -#define OPPONENT_FRITZ 235 -#define OPPONENT_WILLIAM 236 -#define OPPONENT_JOSHUA 237 -#define OPPONENT_CAMERON_1 238 -#define OPPONENT_CAMERON_2 239 -#define OPPONENT_CAMERON_3 240 -#define OPPONENT_CAMERON_4 241 -#define OPPONENT_CAMERON_5 242 -#define OPPONENT_JACLYN 243 -#define OPPONENT_HANNAH 244 -#define OPPONENT_SAMANTHA 245 -#define OPPONENT_MAURA 246 -#define OPPONENT_KAYLA 247 -#define OPPONENT_ALEXIS 248 -#define OPPONENT_JACKI_1 249 -#define OPPONENT_JACKI_2 250 -#define OPPONENT_JACKI_3 251 -#define OPPONENT_JACKI_4 252 -#define OPPONENT_JACKI_5 253 -#define OPPONENT_WALTER_1 254 -#define OPPONENT_TUCKER 255 -#define OPPONENT_THOMAS 256 -#define OPPONENT_WALTER_2 257 -#define OPPONENT_WALTER_3 258 -#define OPPONENT_WALTER_4 259 -#define OPPONENT_WALTER_5 260 -#define OPPONENT_SIDNEY 261 -#define OPPONENT_PHOEBE 262 -#define OPPONENT_GLACIA 263 -#define OPPONENT_DRAKE 264 -#define OPPONENT_ROXANNE 265 -#define OPPONENT_BRAWLY 266 -#define OPPONENT_WATTSON 267 -#define OPPONENT_FLANNERY 268 -#define OPPONENT_NORMAN 269 -#define OPPONENT_WINONA 270 -#define OPPONENT_TATE_AND_LIZA 271 -#define OPPONENT_WALLACE 272 -#define OPPONENT_JERRY_1 273 -#define OPPONENT_TED 274 -#define OPPONENT_PAUL 275 -#define OPPONENT_JERRY_2 276 -#define OPPONENT_JERRY_3 277 -#define OPPONENT_JERRY_4 278 -#define OPPONENT_JERRY_5 279 -#define OPPONENT_KAREN_1 280 -#define OPPONENT_GEORGIA 281 -#define OPPONENT_KAREN_2 282 -#define OPPONENT_KAREN_3 283 -#define OPPONENT_KAREN_4 284 -#define OPPONENT_KAREN_5 285 -#define OPPONENT_KATE_AND_JOY 286 -#define OPPONENT_ANNA_AND_MEG_1 287 -#define OPPONENT_ANNA_AND_MEG_2 288 -#define OPPONENT_ANNA_AND_MEG_3 289 -#define OPPONENT_ANNA_AND_MEG_4 290 -#define OPPONENT_ANNA_AND_MEG_5 291 -#define OPPONENT_VICTOR 292 -#define OPPONENT_MIGUEL_1 293 -#define OPPONENT_COLTON 294 -#define OPPONENT_MIGUEL_2 295 -#define OPPONENT_MIGUEL_3 296 -#define OPPONENT_MIGUEL_4 297 -#define OPPONENT_MIGUEL_5 298 -#define OPPONENT_VICTORIA 299 -#define OPPONENT_VANESSA 300 -#define OPPONENT_MARISSA 301 -#define OPPONENT_ISABEL_1 302 -#define OPPONENT_ISABEL_2 303 -#define OPPONENT_ISABEL_3 304 -#define OPPONENT_ISABEL_4 305 -#define OPPONENT_ISABEL_5 306 -#define OPPONENT_TIMOTHY_1 307 -#define OPPONENT_TIMOTHY_2 308 -#define OPPONENT_TIMOTHY_3 309 -#define OPPONENT_TIMOTHY_4 310 -#define OPPONENT_TIMOTHY_5 311 -#define OPPONENT_VICKY 312 -#define OPPONENT_SHELBY_1 313 -#define OPPONENT_SHELBY_2 314 -#define OPPONENT_SHELBY_3 315 -#define OPPONENT_SHELBY_4 316 -#define OPPONENT_SHELBY_5 317 -#define OPPONENT_CALVIN_1 318 -#define OPPONENT_BILLY 319 -#define OPPONENT_JOSH 320 -#define OPPONENT_TOMMY 321 -#define OPPONENT_JOEY 322 -#define OPPONENT_BEN 323 -#define OPPONENT_ANONYMOUS_5 324 -#define OPPONENT_KEVIN 325 -#define OPPONENT_NEAL 326 -#define OPPONENT_DILLON 327 -#define OPPONENT_CALVIN_2 328 -#define OPPONENT_CALVIN_3 329 -#define OPPONENT_CALVIN_4 330 -#define OPPONENT_CALVIN_5 331 -#define OPPONENT_EDDIE 332 -#define OPPONENT_ALLEN 333 -#define OPPONENT_TIMMY 334 -#define OPPONENT_STEVEN 335 -#define OPPONENT_ANDREW 336 -#define OPPONENT_IVAN 337 -#define OPPONENT_CLAUDE 338 -#define OPPONENT_ELLIOT_1 339 -#define OPPONENT_NED 340 -#define OPPONENT_DALE 341 -#define OPPONENT_NOLAN 342 -#define OPPONENT_BARNY 343 -#define OPPONENT_WADE 344 -#define OPPONENT_CARTER 345 -#define OPPONENT_ELLIOT_2 346 -#define OPPONENT_ELLIOT_3 347 -#define OPPONENT_ELLIOT_4 348 -#define OPPONENT_ELLIOT_5 349 -#define OPPONENT_RONALD 350 -#define OPPONENT_JACOB 351 -#define OPPONENT_ANTHONY 352 -#define OPPONENT_BENJAMIN_1 353 -#define OPPONENT_BENJAMIN_2 354 -#define OPPONENT_BENJAMIN_3 355 -#define OPPONENT_BENJAMIN_4 356 -#define OPPONENT_BENJAMIN_5 357 -#define OPPONENT_ABIGAIL_1 358 -#define OPPONENT_JASMINE 359 -#define OPPONENT_ABIGAIL_2 360 -#define OPPONENT_ABIGAIL_3 361 -#define OPPONENT_ABIGAIL_4 362 -#define OPPONENT_ABIGAIL_5 363 -#define OPPONENT_DYLAN_1 364 -#define OPPONENT_DYLAN_2 365 -#define OPPONENT_DYLAN_3 366 -#define OPPONENT_DYLAN_4 367 -#define OPPONENT_DYLAN_5 368 -#define OPPONENT_MARIA_1 369 -#define OPPONENT_MARIA_2 370 -#define OPPONENT_MARIA_3 371 -#define OPPONENT_MARIA_4 372 -#define OPPONENT_MARIA_5 373 -#define OPPONENT_CALEB 374 -#define OPPONENT_ANONYMOUS_6 375 -#define OPPONENT_ISAIAH_1 376 -#define OPPONENT_ANONYMOUS_7 377 -#define OPPONENT_CHASE 378 -#define OPPONENT_ISAIAH_2 379 -#define OPPONENT_ISAIAH_3 380 -#define OPPONENT_ISAIAH_4 381 -#define OPPONENT_ISAIAH_5 382 -#define OPPONENT_ANONYMOUS_8 383 -#define OPPONENT_CONNOR 384 -#define OPPONENT_ANONYMOUS_9 385 -#define OPPONENT_KATELYN_1 386 -#define OPPONENT_ALLISON 387 -#define OPPONENT_KATELYN_2 388 -#define OPPONENT_KATELYN_3 389 -#define OPPONENT_KATELYN_4 390 -#define OPPONENT_KATELYN_5 391 -#define OPPONENT_NICOLAS_1 392 -#define OPPONENT_NICOLAS_2 393 -#define OPPONENT_NICOLAS_3 394 -#define OPPONENT_NICOLAS_4 395 -#define OPPONENT_NICOLAS_5 396 -#define OPPONENT_AARON 397 -#define OPPONENT_PERRY 398 -#define OPPONENT_HUGH 399 -#define OPPONENT_PHIL 400 -#define OPPONENT_JARED 401 -#define OPPONENT_ANONYMOUS_10 402 -#define OPPONENT_TANNER 403 -#define OPPONENT_WILL 404 -#define OPPONENT_COLIN 405 -#define OPPONENT_ROBERT_1 406 -#define OPPONENT_BENNY 407 -#define OPPONENT_CHESTER 408 -#define OPPONENT_ROBERT_2 409 -#define OPPONENT_ROBERT_3 410 -#define OPPONENT_ROBERT_4 411 -#define OPPONENT_ROBERT_5 412 -#define OPPONENT_ALEX 413 -#define OPPONENT_BECK 414 -#define OPPONENT_YASU 415 -#define OPPONENT_TAKASHI 416 -#define OPPONENT_MAKOTO 417 -#define OPPONENT_HIDEO_1 418 -#define OPPONENT_LAO_1 419 -#define OPPONENT_LUNG 420 -#define OPPONENT_LAO_2 421 -#define OPPONENT_LAO_3 422 -#define OPPONENT_LAO_4 423 -#define OPPONENT_LAO_5 424 -#define OPPONENT_TESSA 425 -#define OPPONENT_LAURA 426 -#define OPPONENT_CYNDY_1 427 -#define OPPONENT_CORA 428 -#define OPPONENT_JILL 429 -#define OPPONENT_CYNDY_2 430 -#define OPPONENT_CYNDY_3 431 -#define OPPONENT_CYNDY_4 432 -#define OPPONENT_CYNDY_5 433 -#define OPPONENT_MADELINE_1 434 -#define OPPONENT_CLARISSA 435 -#define OPPONENT_ANGELICA 436 -#define OPPONENT_MADELINE_2 437 -#define OPPONENT_MADELINE_3 438 -#define OPPONENT_MADELINE_4 439 -#define OPPONENT_MADELINE_5 440 -#define OPPONENT_BEVERLY 441 -#define OPPONENT_DAWN 442 -#define OPPONENT_NICOLE 443 -#define OPPONENT_DENISE 444 -#define OPPONENT_BETH 445 -#define OPPONENT_TARA 446 -#define OPPONENT_MISSY 447 -#define OPPONENT_ALICE 448 -#define OPPONENT_JENNY_1 449 -#define OPPONENT_GRACE 450 -#define OPPONENT_TANYA 451 -#define OPPONENT_SHARON 452 -#define OPPONENT_NIKKI 453 -#define OPPONENT_BRENDA 454 -#define OPPONENT_KATIE 455 -#define OPPONENT_SUSIE 456 -#define OPPONENT_KARA 457 -#define OPPONENT_DANA 458 -#define OPPONENT_ERIN 459 -#define OPPONENT_DEBRA 460 -#define OPPONENT_LINDA 461 -#define OPPONENT_KAYLEE 462 -#define OPPONENT_LAUREL 463 -#define OPPONENT_DARCY 464 -#define OPPONENT_JENNY_2 465 -#define OPPONENT_JENNY_3 466 -#define OPPONENT_JENNY_4 467 -#define OPPONENT_JENNY_5 468 -#define OPPONENT_HEIDI 469 -#define OPPONENT_BECKY 470 -#define OPPONENT_CAROL 471 -#define OPPONENT_NANCY 472 -#define OPPONENT_MARTHA 473 -#define OPPONENT_DIANA_1 474 -#define OPPONENT_NINA 475 -#define OPPONENT_IRENE 476 -#define OPPONENT_DIANA_2 477 -#define OPPONENT_DIANA_3 478 -#define OPPONENT_DIANA_4 479 -#define OPPONENT_DIANA_5 480 -#define OPPONENT_AMY_AND_LIV_1 481 -#define OPPONENT_AMY_AND_LIV_2 482 -#define OPPONENT_GINA_AND_MIA_1 483 -#define OPPONENT_MIU_AND_YUKI 484 -#define OPPONENT_AMY_AND_LIV_3 485 -#define OPPONENT_GINA_AND_MIA_2 486 -#define OPPONENT_AMY_AND_LIV_4 487 -#define OPPONENT_AMY_AND_LIV_5 488 -#define OPPONENT_AMY_AND_LIV_6 489 -#define OPPONENT_HUEY 490 -#define OPPONENT_EDMOND 491 -#define OPPONENT_ERNEST_1 492 -#define OPPONENT_DWAYNE 493 -#define OPPONENT_PHILLIP 494 -#define OPPONENT_LEONARD 495 -#define OPPONENT_DUNCAN 496 -#define OPPONENT_ERNEST_2 497 -#define OPPONENT_ERNEST_3 498 -#define OPPONENT_ERNEST_4 499 -#define OPPONENT_ERNEST_5 500 -#define OPPONENT_ANONYMOUS_11 501 -#define OPPONENT_ANONYMOUS_12 502 -#define OPPONENT_ANONYMOUS_13 503 -#define OPPONENT_SONNY 504 -#define OPPONENT_DONOVAN 505 -#define OPPONENT_GERALD 506 -#define OPPONENT_KELVIN 507 -#define OPPONENT_KODY 508 -#define OPPONENT_TEVIN 509 -#define OPPONENT_DAMON 510 -#define OPPONENT_PABLO 511 -#define OPPONENT_EDWIN_1 512 -#define OPPONENT_HECTOR_1 513 -#define OPPONENT_HECTOR_2 514 -#define OPPONENT_EDWIN_2 515 -#define OPPONENT_EDWIN_3 516 -#define OPPONENT_EDWIN_4 517 -#define OPPONENT_EDWIN_5 518 -#define OPPONENT_WALLY_1 519 -#define OPPONENT_BRENDAN_1 520 -#define OPPONENT_BRENDAN_2 521 -#define OPPONENT_BRENDAN_3 522 -#define OPPONENT_BRENDAN_4 523 -#define OPPONENT_BRENDAN_5 524 -#define OPPONENT_BRENDAN_6 525 -#define OPPONENT_BRENDAN_7 526 -#define OPPONENT_BRENDAN_8 527 -#define OPPONENT_BRENDAN_9 528 -#define OPPONENT_MAY_1 529 -#define OPPONENT_MAY_2 530 -#define OPPONENT_MAY_3 531 -#define OPPONENT_MAY_4 532 -#define OPPONENT_MAY_5 533 -#define OPPONENT_MAY_6 534 -#define OPPONENT_MAY_7 535 -#define OPPONENT_MAY_8 536 -#define OPPONENT_MAY_9 537 -#define OPPONENT_ISAAC_1 538 -#define OPPONENT_RILEY 539 -#define OPPONENT_AIDAN 540 -#define OPPONENT_ISAAC_2 541 -#define OPPONENT_ISAAC_3 542 -#define OPPONENT_ISAAC_4 543 -#define OPPONENT_ISAAC_5 544 -#define OPPONENT_LYDIA_1 545 -#define OPPONENT_ALEXIA 546 -#define OPPONENT_DANIELLE 547 -#define OPPONENT_LYDIA_2 548 -#define OPPONENT_LYDIA_3 549 -#define OPPONENT_LYDIA_4 550 -#define OPPONENT_LYDIA_5 551 -#define OPPONENT_JACKSON_1 552 -#define OPPONENT_CARLOS 553 -#define OPPONENT_SEBASTIAN 554 -#define OPPONENT_JACKSON_2 555 -#define OPPONENT_JACKSON_3 556 -#define OPPONENT_JACKSON_4 557 -#define OPPONENT_JACKSON_5 558 -#define OPPONENT_CATHERINE_1 559 -#define OPPONENT_JENNA 560 -#define OPPONENT_SOPHIA 561 -#define OPPONENT_CATHERINE_2 562 -#define OPPONENT_CATHERINE_3 563 -#define OPPONENT_CATHERINE_4 564 -#define OPPONENT_CATHERINE_5 565 -#define OPPONENT_MAXIE_1 566 -#define OPPONENT_GRUNT_28 567 -#define OPPONENT_GRUNT_29 568 -#define OPPONENT_GRUNT_30 569 -#define OPPONENT_GRUNT_31 570 -#define OPPONENT_GRUNT_32 571 -#define OPPONENT_GRUNT_33 572 -#define OPPONENT_GRUNT_34 573 -#define OPPONENT_GRUNT_35 574 -#define OPPONENT_GRUNT_36 575 -#define OPPONENT_GRUNT_37 576 -#define OPPONENT_GRUNT_38 577 -#define OPPONENT_GRUNT_39 578 -#define OPPONENT_GRUNT_40 579 -#define OPPONENT_GRUNT_41 580 -#define OPPONENT_GRUNT_42 581 -#define OPPONENT_GRUNT_43 582 -#define OPPONENT_GRUNT_44 583 -#define OPPONENT_GRUNT_45 584 -#define OPPONENT_GRUNT_46 585 -#define OPPONENT_GRUNT_47 586 -#define OPPONENT_GRUNT_48 587 -#define OPPONENT_GRUNT_49 588 -#define OPPONENT_GRUNT_50 589 -#define OPPONENT_GRUNT_51 590 -#define OPPONENT_GRUNT_52 591 -#define OPPONENT_GRUNT_53 592 -#define OPPONENT_GRUNT_54 593 -#define OPPONENT_ANONYMOUS_14 594 -#define OPPONENT_ANONYMOUS_15 595 -#define OPPONENT_TABITHA_1 596 -#define OPPONENT_TABITHA_2 597 -#define OPPONENT_ANONYMOUS_16 598 -#define OPPONENT_COURTNEY_1 599 -#define OPPONENT_COURTNEY_2 600 -#define OPPONENT_MAXIE_2 601 -#define OPPONENT_MAXIE_3 602 -#define OPPONENT_TIANA 603 -#define OPPONENT_HALEY_1 604 -#define OPPONENT_JANICE 605 -#define OPPONENT_VIVI 606 -#define OPPONENT_HALEY_2 607 -#define OPPONENT_HALEY_3 608 -#define OPPONENT_HALEY_4 609 -#define OPPONENT_HALEY_5 610 -#define OPPONENT_SALLY 611 -#define OPPONENT_ROBIN 612 -#define OPPONENT_ANDREA 613 -#define OPPONENT_CRISSY 614 -#define OPPONENT_RICK 615 -#define OPPONENT_LYLE 616 -#define OPPONENT_JOSE 617 -#define OPPONENT_DOUG 618 -#define OPPONENT_GREG 619 -#define OPPONENT_KENT 620 -#define OPPONENT_JAMES_1 621 -#define OPPONENT_JAMES_2 622 -#define OPPONENT_JAMES_3 623 -#define OPPONENT_JAMES_4 624 -#define OPPONENT_JAMES_5 625 -#define OPPONENT_BRICE 626 -#define OPPONENT_TRENT_1 627 -#define OPPONENT_LENNY 628 -#define OPPONENT_LUCAS_1 629 -#define OPPONENT_ALAN 630 -#define OPPONENT_CLARK 631 -#define OPPONENT_ERIC 632 -#define OPPONENT_LUCAS_2 633 -#define OPPONENT_MIKE_1 634 -#define OPPONENT_MIKE_2 635 -#define OPPONENT_TRENT_2 636 -#define OPPONENT_TRENT_3 637 -#define OPPONENT_TRENT_4 638 -#define OPPONENT_TRENT_5 639 -#define OPPONENT_DEZ_AND_LUKE 640 -#define OPPONENT_LEA_AND_JED 641 -#define OPPONENT_LOIS_AND_HAL_1 642 -#define OPPONENT_LOIS_AND_HAL_2 643 -#define OPPONENT_LOIS_AND_HAL_3 644 -#define OPPONENT_LOIS_AND_HAL_4 645 -#define OPPONENT_LOIS_AND_HAL_5 646 -#define OPPONENT_JOHANNA 647 -#define OPPONENT_ZANE 648 -#define OPPONENT_VIVIAN 649 -#define OPPONENT_SADIE 650 -#define OPPONENT_HIDEO_2 651 -#define OPPONENT_KEIGO 652 -#define OPPONENT_TSUNAO 653 -#define OPPONENT_TERRELL 654 -#define OPPONENT_KYLEE 655 -#define OPPONENT_WALLY_2 656 -#define OPPONENT_WALLY_3 657 -#define OPPONENT_WALLY_4 658 -#define OPPONENT_WALLY_5 659 -#define OPPONENT_WALLY_6 660 -#define OPPONENT_BRENDAN_10 661 -#define OPPONENT_BRENDAN_11 662 -#define OPPONENT_BRENDAN_12 663 -#define OPPONENT_MAY_10 664 -#define OPPONENT_MAY_11 665 -#define OPPONENT_MAY_12 666 -#define OPPONENT_JONAH 667 -#define OPPONENT_HENRY 668 -#define OPPONENT_ROGER 669 -#define OPPONENT_ALEXA 670 -#define OPPONENT_RUBEN 671 -#define OPPONENT_KOJI 672 -#define OPPONENT_WAYNE 673 -#define OPPONENT_BYRON 674 -#define OPPONENT_REED 675 -#define OPPONENT_TISHA 676 -#define OPPONENT_TORI_AND_TIA 677 -#define OPPONENT_KIM_AND_IRIS 678 -#define OPPONENT_TYRA_AND_IVY 679 -#define OPPONENT_MEL_AND_PAUL 680 -#define OPPONENT_JOHN_AND_JAY_1 681 -#define OPPONENT_JOHN_AND_JAY_2 682 -#define OPPONENT_JOHN_AND_JAY_3 683 -#define OPPONENT_JOHN_AND_JAY_4 684 -#define OPPONENT_JOHN_AND_JAY_5 685 -#define OPPONENT_RELI_AND_IAN 686 -#define OPPONENT_RITA_AND_SAM_1 687 -#define OPPONENT_RITA_AND_SAM_2 688 -#define OPPONENT_RITA_AND_SAM_3 689 -#define OPPONENT_RITA_AND_SAM_4 690 -#define OPPONENT_RITA_AND_SAM_5 691 -#define OPPONENT_LISA_AND_RAY 692 -#define OPPONENT_EUGENE 693 +#define TRAINER_NONE 0 +#define TRAINER_ARCHIE_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_GRUNT_8 9 +#define TRAINER_GRUNT_9 10 +#define TRAINER_GRUNT_10 11 +#define TRAINER_GRUNT_11 12 +#define TRAINER_GRUNT_12 13 +#define TRAINER_GRUNT_13 14 +#define TRAINER_GRUNT_14 15 +#define TRAINER_GRUNT_15 16 +#define TRAINER_GRUNT_16 17 +#define TRAINER_GRUNT_17 18 +#define TRAINER_GRUNT_18 19 +#define TRAINER_GRUNT_19 20 +#define TRAINER_GRUNT_20 21 +#define TRAINER_GRUNT_21 22 +#define TRAINER_GRUNT_22 23 +#define TRAINER_GRUNT_23 24 +#define TRAINER_GRUNT_24 25 +#define TRAINER_GRUNT_25 26 +#define TRAINER_GRUNT_26 27 +#define TRAINER_GRUNT_27 28 +#define TRAINER_ANONYMOUS_1 29 +#define TRAINER_MATT_1 30 +#define TRAINER_MATT_2 31 +#define TRAINER_SHELLY_1 32 +#define TRAINER_SHELLY_2 33 +#define TRAINER_ARCHIE_2 34 +#define TRAINER_ARCHIE_3 35 +#define TRAINER_DAISY 36 +#define TRAINER_ROSE_1 37 +#define TRAINER_LILY 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_CARMEN 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_CLYDE 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_LORI 90 +#define TRAINER_JODY 91 +#define TRAINER_WENDY 92 +#define TRAINER_ELAINE 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_ANONYMOUS_2 115 +#define TRAINER_BRIANNA_1 116 +#define TRAINER_CINDY_2 117 +#define TRAINER_BRIANNA_2 118 +#define TRAINER_ANETTE 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_ANONYMOUS_3 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_CHRIS 144 +#define TRAINER_MARK 145 +#define TRAINER_KENN 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_AUSTIN 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_CODY 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_ANONYMOUS_4 168 +#define TRAINER_GILBERT 169 +#define TRAINER_FRANKLIN 170 +#define TRAINER_DANNY 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_HIDEKI 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_SCOTT 192 +#define TRAINER_HARVEY 193 +#define TRAINER_SHAWN 194 +#define TRAINER_RANDY 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_FLINT 202 +#define TRAINER_AXLE 203 +#define TRAINER_JAKE 204 +#define TRAINER_ANDY 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_CLIFF 212 +#define TRAINER_LARRY 213 +#define TRAINER_SHANE 214 +#define TRAINER_JUSTIN 215 +#define TRAINER_ETHAN_1 216 +#define TRAINER_JEFF 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_BRANDON_1 226 +#define TRAINER_DEREK 227 +#define TRAINER_BRANDON_2 228 +#define TRAINER_BRANDON_3 229 +#define TRAINER_BRANDON_4 230 +#define TRAINER_BRANDON_5 231 +#define TRAINER_EDWARD 232 +#define TRAINER_PRESTON 233 +#define TRAINER_VIRGIL 234 +#define TRAINER_FRITZ 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_TUCKER 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 265 +#define TRAINER_BRAWLY 266 +#define TRAINER_WATTSON 267 +#define TRAINER_FLANNERY 268 +#define TRAINER_NORMAN 269 +#define TRAINER_WINONA 270 +#define TRAINER_TATE_AND_LIZA 271 +#define TRAINER_WALLACE 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_MARISSA 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_ANONYMOUS_5 324 +#define TRAINER_KEVIN 325 +#define TRAINER_NEAL 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_STEVEN 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_CALEB 374 +#define TRAINER_ANONYMOUS_6 375 +#define TRAINER_ISAIAH_1 376 +#define TRAINER_ANONYMOUS_7 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_ANONYMOUS_8 383 +#define TRAINER_CONNOR 384 +#define TRAINER_ANONYMOUS_9 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_ANONYMOUS_10 402 +#define TRAINER_TANNER 403 +#define TRAINER_WILL 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_MAKOTO 417 +#define TRAINER_HIDEO_1 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_TESSA 425 +#define TRAINER_LAURA 426 +#define TRAINER_CYNDY_1 427 +#define TRAINER_CORA 428 +#define TRAINER_JILL 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_DAWN 442 +#define TRAINER_NICOLE 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_ERIN 459 +#define TRAINER_DEBRA 460 +#define TRAINER_LINDA 461 +#define TRAINER_KAYLEE 462 +#define TRAINER_LAUREL 463 +#define TRAINER_DARCY 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_NINA 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_ANONYMOUS_11 501 +#define TRAINER_ANONYMOUS_12 502 +#define TRAINER_ANONYMOUS_13 503 +#define TRAINER_SONNY 504 +#define TRAINER_DONOVAN 505 +#define TRAINER_GERALD 506 +#define TRAINER_KELVIN 507 +#define TRAINER_KODY 508 +#define TRAINER_TEVIN 509 +#define TRAINER_DAMON 510 +#define TRAINER_PABLO 511 +#define TRAINER_EDWIN_1 512 +#define TRAINER_HECTOR_1 513 +#define TRAINER_HECTOR_2 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_RILEY 539 +#define TRAINER_AIDAN 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_ALEXIA 546 +#define TRAINER_DANIELLE 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_CARLOS 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_MAXIE_1 566 +#define TRAINER_GRUNT_28 567 +#define TRAINER_GRUNT_29 568 +#define TRAINER_GRUNT_30 569 +#define TRAINER_GRUNT_31 570 +#define TRAINER_GRUNT_32 571 +#define TRAINER_GRUNT_33 572 +#define TRAINER_GRUNT_34 573 +#define TRAINER_GRUNT_35 574 +#define TRAINER_GRUNT_36 575 +#define TRAINER_GRUNT_37 576 +#define TRAINER_GRUNT_38 577 +#define TRAINER_GRUNT_39 578 +#define TRAINER_GRUNT_40 579 +#define TRAINER_GRUNT_41 580 +#define TRAINER_GRUNT_42 581 +#define TRAINER_GRUNT_43 582 +#define TRAINER_GRUNT_44 583 +#define TRAINER_GRUNT_45 584 +#define TRAINER_GRUNT_46 585 +#define TRAINER_GRUNT_47 586 +#define TRAINER_GRUNT_48 587 +#define TRAINER_GRUNT_49 588 +#define TRAINER_GRUNT_50 589 +#define TRAINER_GRUNT_51 590 +#define TRAINER_GRUNT_52 591 +#define TRAINER_GRUNT_53 592 +#define TRAINER_GRUNT_54 593 +#define TRAINER_ANONYMOUS_14 594 +#define TRAINER_ANONYMOUS_15 595 +#define TRAINER_TABITHA_1 596 +#define TRAINER_TABITHA_2 597 +#define TRAINER_ANONYMOUS_16 598 +#define TRAINER_COURTNEY_1 599 +#define TRAINER_COURTNEY_2 600 +#define TRAINER_MAXIE_2 601 +#define TRAINER_MAXIE_3 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_LOIS_AND_HAL_1 642 +#define TRAINER_LOIS_AND_HAL_2 643 +#define TRAINER_LOIS_AND_HAL_3 644 +#define TRAINER_LOIS_AND_HAL_4 645 +#define TRAINER_LOIS_AND_HAL_5 646 +#define TRAINER_JOHANNA 647 +#define TRAINER_ZANE 648 +#define TRAINER_VIVIAN 649 +#define TRAINER_SADIE 650 +#define TRAINER_HIDEO_2 651 +#define TRAINER_KEIGO 652 +#define TRAINER_TSUNAO 653 +#define TRAINER_TERRELL 654 +#define TRAINER_KYLEE 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_10 661 +#define TRAINER_BRENDAN_11 662 +#define TRAINER_BRENDAN_12 663 +#define TRAINER_MAY_10 664 +#define TRAINER_MAY_11 665 +#define TRAINER_MAY_12 666 +#define TRAINER_JONAH 667 +#define TRAINER_HENRY 668 +#define TRAINER_ROGER 669 +#define TRAINER_ALEXA 670 +#define TRAINER_RUBEN 671 +#define TRAINER_KOJI 672 +#define TRAINER_WAYNE 673 +#define TRAINER_BYRON 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_RITA_AND_SAM_1 687 +#define TRAINER_RITA_AND_SAM_2 688 +#define TRAINER_RITA_AND_SAM_3 689 +#define TRAINER_RITA_AND_SAM_4 690 +#define TRAINER_RITA_AND_SAM_5 691 +#define TRAINER_LISA_AND_RAY 692 +#define TRAINER_EUGENE 693 #endif // GUARD_CONSTANTS_OPPONENTS_H diff --git a/include/constants/species.h b/include/constants/species.h index dc9856081..80c90381e 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -447,6 +447,838 @@ #define NUM_SPECIES SPECIES_EGG +// National Dex Index Defines + +#define NATIONAL_DEX_BULBASAUR 1 +#define NATIONAL_DEX_IVYSAUR 2 +#define NATIONAL_DEX_VENUSAUR 3 +#define NATIONAL_DEX_CHARMANDER 4 +#define NATIONAL_DEX_CHARMELEON 5 +#define NATIONAL_DEX_CHARIZARD 6 +#define NATIONAL_DEX_SQUIRTLE 7 +#define NATIONAL_DEX_WARTORTLE 8 +#define NATIONAL_DEX_BLASTOISE 9 +#define NATIONAL_DEX_CATERPIE 10 +#define NATIONAL_DEX_METAPOD 11 +#define NATIONAL_DEX_BUTTERFREE 12 +#define NATIONAL_DEX_WEEDLE 13 +#define NATIONAL_DEX_KAKUNA 14 +#define NATIONAL_DEX_BEEDRILL 15 +#define NATIONAL_DEX_PIDGEY 16 +#define NATIONAL_DEX_PIDGEOTTO 17 +#define NATIONAL_DEX_PIDGEOT 18 +#define NATIONAL_DEX_RATTATA 19 +#define NATIONAL_DEX_RATICATE 20 +#define NATIONAL_DEX_SPEAROW 21 +#define NATIONAL_DEX_FEAROW 22 +#define NATIONAL_DEX_EKANS 23 +#define NATIONAL_DEX_ARBOK 24 +#define NATIONAL_DEX_PIKACHU 25 +#define NATIONAL_DEX_RAICHU 26 +#define NATIONAL_DEX_SANDSHREW 27 +#define NATIONAL_DEX_SANDSLASH 28 +#define NATIONAL_DEX_NIDORAN_F 29 +#define NATIONAL_DEX_NIDORINA 30 +#define NATIONAL_DEX_NIDOQUEEN 31 +#define NATIONAL_DEX_NIDORAN_M 32 +#define NATIONAL_DEX_NIDORINO 33 +#define NATIONAL_DEX_NIDOKING 34 +#define NATIONAL_DEX_CLEFAIRY 35 +#define NATIONAL_DEX_CLEFABLE 36 +#define NATIONAL_DEX_VULPIX 37 +#define NATIONAL_DEX_NINETALES 38 +#define NATIONAL_DEX_JIGGLYPUFF 39 +#define NATIONAL_DEX_WIGGLYTUFF 40 +#define NATIONAL_DEX_ZUBAT 41 +#define NATIONAL_DEX_GOLBAT 42 +#define NATIONAL_DEX_ODDISH 43 +#define NATIONAL_DEX_GLOOM 44 +#define NATIONAL_DEX_VILEPLUME 45 +#define NATIONAL_DEX_PARAS 46 +#define NATIONAL_DEX_PARASECT 47 +#define NATIONAL_DEX_VENONAT 48 +#define NATIONAL_DEX_VENOMOTH 49 +#define NATIONAL_DEX_DIGLETT 50 +#define NATIONAL_DEX_DUGTRIO 51 +#define NATIONAL_DEX_MEOWTH 52 +#define NATIONAL_DEX_PERSIAN 53 +#define NATIONAL_DEX_PSYDUCK 54 +#define NATIONAL_DEX_GOLDUCK 55 +#define NATIONAL_DEX_MANKEY 56 +#define NATIONAL_DEX_PRIMEAPE 57 +#define NATIONAL_DEX_GROWLITHE 58 +#define NATIONAL_DEX_ARCANINE 59 +#define NATIONAL_DEX_POLIWAG 60 +#define NATIONAL_DEX_POLIWHIRL 61 +#define NATIONAL_DEX_POLIWRATH 62 +#define NATIONAL_DEX_ABRA 63 +#define NATIONAL_DEX_KADABRA 64 +#define NATIONAL_DEX_ALAKAZAM 65 +#define NATIONAL_DEX_MACHOP 66 +#define NATIONAL_DEX_MACHOKE 67 +#define NATIONAL_DEX_MACHAMP 68 +#define NATIONAL_DEX_BELLSPROUT 69 +#define NATIONAL_DEX_WEEPINBELL 70 +#define NATIONAL_DEX_VICTREEBEL 71 +#define NATIONAL_DEX_TENTACOOL 72 +#define NATIONAL_DEX_TENTACRUEL 73 +#define NATIONAL_DEX_GEODUDE 74 +#define NATIONAL_DEX_GRAVELER 75 +#define NATIONAL_DEX_GOLEM 76 +#define NATIONAL_DEX_PONYTA 77 +#define NATIONAL_DEX_RAPIDASH 78 +#define NATIONAL_DEX_SLOWPOKE 79 +#define NATIONAL_DEX_SLOWBRO 80 +#define NATIONAL_DEX_MAGNEMITE 81 +#define NATIONAL_DEX_MAGNETON 82 +#define NATIONAL_DEX_FARFETCHD 83 +#define NATIONAL_DEX_DODUO 84 +#define NATIONAL_DEX_DODRIO 85 +#define NATIONAL_DEX_SEEL 86 +#define NATIONAL_DEX_DEWGONG 87 +#define NATIONAL_DEX_GRIMER 88 +#define NATIONAL_DEX_MUK 89 +#define NATIONAL_DEX_SHELLDER 90 +#define NATIONAL_DEX_CLOYSTER 91 +#define NATIONAL_DEX_GASTLY 92 +#define NATIONAL_DEX_HAUNTER 93 +#define NATIONAL_DEX_GENGAR 94 +#define NATIONAL_DEX_ONIX 95 +#define NATIONAL_DEX_DROWZEE 96 +#define NATIONAL_DEX_HYPNO 97 +#define NATIONAL_DEX_KRABBY 98 +#define NATIONAL_DEX_KINGLER 99 +#define NATIONAL_DEX_VOLTORB 100 +#define NATIONAL_DEX_ELECTRODE 101 +#define NATIONAL_DEX_EXEGGCUTE 102 +#define NATIONAL_DEX_EXEGGUTOR 103 +#define NATIONAL_DEX_CUBONE 104 +#define NATIONAL_DEX_MAROWAK 105 +#define NATIONAL_DEX_HITMONLEE 106 +#define NATIONAL_DEX_HITMONCHAN 107 +#define NATIONAL_DEX_LICKITUNG 108 +#define NATIONAL_DEX_KOFFING 109 +#define NATIONAL_DEX_WEEZING 110 +#define NATIONAL_DEX_RHYHORN 111 +#define NATIONAL_DEX_RHYDON 112 +#define NATIONAL_DEX_CHANSEY 113 +#define NATIONAL_DEX_TANGELA 114 +#define NATIONAL_DEX_KANGASKHAN 115 +#define NATIONAL_DEX_HORSEA 116 +#define NATIONAL_DEX_SEADRA 117 +#define NATIONAL_DEX_GOLDEEN 118 +#define NATIONAL_DEX_SEAKING 119 +#define NATIONAL_DEX_STARYU 120 +#define NATIONAL_DEX_STARMIE 121 +#define NATIONAL_DEX_MR_MIME 122 +#define NATIONAL_DEX_SCYTHER 123 +#define NATIONAL_DEX_JYNX 124 +#define NATIONAL_DEX_ELECTABUZZ 125 +#define NATIONAL_DEX_MAGMAR 126 +#define NATIONAL_DEX_PINSIR 127 +#define NATIONAL_DEX_TAUROS 128 +#define NATIONAL_DEX_MAGIKARP 129 +#define NATIONAL_DEX_GYARADOS 130 +#define NATIONAL_DEX_LAPRAS 131 +#define NATIONAL_DEX_DITTO 132 +#define NATIONAL_DEX_EEVEE 133 +#define NATIONAL_DEX_VAPOREON 134 +#define NATIONAL_DEX_JOLTEON 135 +#define NATIONAL_DEX_FLAREON 136 +#define NATIONAL_DEX_PORYGON 137 +#define NATIONAL_DEX_OMANYTE 138 +#define NATIONAL_DEX_OMASTAR 139 +#define NATIONAL_DEX_KABUTO 140 +#define NATIONAL_DEX_KABUTOPS 141 +#define NATIONAL_DEX_AERODACTYL 142 +#define NATIONAL_DEX_SNORLAX 143 +#define NATIONAL_DEX_ARTICUNO 144 +#define NATIONAL_DEX_ZAPDOS 145 +#define NATIONAL_DEX_MOLTRES 146 +#define NATIONAL_DEX_DRATINI 147 +#define NATIONAL_DEX_DRAGONAIR 148 +#define NATIONAL_DEX_DRAGONITE 149 +#define NATIONAL_DEX_MEWTWO 150 +#define NATIONAL_DEX_MEW 151 +#define NATIONAL_DEX_CHIKORITA 152 +#define NATIONAL_DEX_BAYLEEF 153 +#define NATIONAL_DEX_MEGANIUM 154 +#define NATIONAL_DEX_CYNDAQUIL 155 +#define NATIONAL_DEX_QUILAVA 156 +#define NATIONAL_DEX_TYPHLOSION 157 +#define NATIONAL_DEX_TOTODILE 158 +#define NATIONAL_DEX_CROCONAW 159 +#define NATIONAL_DEX_FERALIGATR 160 +#define NATIONAL_DEX_SENTRET 161 +#define NATIONAL_DEX_FURRET 162 +#define NATIONAL_DEX_HOOTHOOT 163 +#define NATIONAL_DEX_NOCTOWL 164 +#define NATIONAL_DEX_LEDYBA 165 +#define NATIONAL_DEX_LEDIAN 166 +#define NATIONAL_DEX_SPINARAK 167 +#define NATIONAL_DEX_ARIADOS 168 +#define NATIONAL_DEX_CROBAT 169 +#define NATIONAL_DEX_CHINCHOU 170 +#define NATIONAL_DEX_LANTURN 171 +#define NATIONAL_DEX_PICHU 172 +#define NATIONAL_DEX_CLEFFA 173 +#define NATIONAL_DEX_IGGLYBUFF 174 +#define NATIONAL_DEX_TOGEPI 175 +#define NATIONAL_DEX_TOGETIC 176 +#define NATIONAL_DEX_NATU 177 +#define NATIONAL_DEX_XATU 178 +#define NATIONAL_DEX_MAREEP 179 +#define NATIONAL_DEX_FLAAFFY 180 +#define NATIONAL_DEX_AMPHAROS 181 +#define NATIONAL_DEX_BELLOSSOM 182 +#define NATIONAL_DEX_MARILL 183 +#define NATIONAL_DEX_AZUMARILL 184 +#define NATIONAL_DEX_SUDOWOODO 185 +#define NATIONAL_DEX_POLITOED 186 +#define NATIONAL_DEX_HOPPIP 187 +#define NATIONAL_DEX_SKIPLOOM 188 +#define NATIONAL_DEX_JUMPLUFF 189 +#define NATIONAL_DEX_AIPOM 190 +#define NATIONAL_DEX_SUNKERN 191 +#define NATIONAL_DEX_SUNFLORA 192 +#define NATIONAL_DEX_YANMA 193 +#define NATIONAL_DEX_WOOPER 194 +#define NATIONAL_DEX_QUAGSIRE 195 +#define NATIONAL_DEX_ESPEON 196 +#define NATIONAL_DEX_UMBREON 197 +#define NATIONAL_DEX_MURKROW 198 +#define NATIONAL_DEX_SLOWKING 199 +#define NATIONAL_DEX_MISDREAVUS 200 +#define NATIONAL_DEX_UNOWN 201 +#define NATIONAL_DEX_WOBBUFFET 202 +#define NATIONAL_DEX_GIRAFARIG 203 +#define NATIONAL_DEX_PINECO 204 +#define NATIONAL_DEX_FORRETRESS 205 +#define NATIONAL_DEX_DUNSPARCE 206 +#define NATIONAL_DEX_GLIGAR 207 +#define NATIONAL_DEX_STEELIX 208 +#define NATIONAL_DEX_SNUBBULL 209 +#define NATIONAL_DEX_GRANBULL 210 +#define NATIONAL_DEX_QWILFISH 211 +#define NATIONAL_DEX_SCIZOR 212 +#define NATIONAL_DEX_SHUCKLE 213 +#define NATIONAL_DEX_HERACROSS 214 +#define NATIONAL_DEX_SNEASEL 215 +#define NATIONAL_DEX_TEDDIURSA 216 +#define NATIONAL_DEX_URSARING 217 +#define NATIONAL_DEX_SLUGMA 218 +#define NATIONAL_DEX_MAGCARGO 219 +#define NATIONAL_DEX_SWINUB 220 +#define NATIONAL_DEX_PILOSWINE 221 +#define NATIONAL_DEX_CORSOLA 222 +#define NATIONAL_DEX_REMORAID 223 +#define NATIONAL_DEX_OCTILLERY 224 +#define NATIONAL_DEX_DELIBIRD 225 +#define NATIONAL_DEX_MANTINE 226 +#define NATIONAL_DEX_SKARMORY 227 +#define NATIONAL_DEX_HOUNDOUR 228 +#define NATIONAL_DEX_HOUNDOOM 229 +#define NATIONAL_DEX_KINGDRA 230 +#define NATIONAL_DEX_PHANPY 231 +#define NATIONAL_DEX_DONPHAN 232 +#define NATIONAL_DEX_PORYGON2 233 +#define NATIONAL_DEX_STANTLER 234 +#define NATIONAL_DEX_SMEARGLE 235 +#define NATIONAL_DEX_TYROGUE 236 +#define NATIONAL_DEX_HITMONTOP 237 +#define NATIONAL_DEX_SMOOCHUM 238 +#define NATIONAL_DEX_ELEKID 239 +#define NATIONAL_DEX_MAGBY 240 +#define NATIONAL_DEX_MILTANK 241 +#define NATIONAL_DEX_BLISSEY 242 +#define NATIONAL_DEX_RAIKOU 243 +#define NATIONAL_DEX_ENTEI 244 +#define NATIONAL_DEX_SUICUNE 245 +#define NATIONAL_DEX_LARVITAR 246 +#define NATIONAL_DEX_PUPITAR 247 +#define NATIONAL_DEX_TYRANITAR 248 +#define NATIONAL_DEX_LUGIA 249 +#define NATIONAL_DEX_HO_OH 250 +#define NATIONAL_DEX_CELEBI 251 + +#define NATIONAL_DEX_OLD_UNOWN_B 387 +#define NATIONAL_DEX_OLD_UNOWN_C 388 +#define NATIONAL_DEX_OLD_UNOWN_D 389 +#define NATIONAL_DEX_OLD_UNOWN_E 390 +#define NATIONAL_DEX_OLD_UNOWN_F 391 +#define NATIONAL_DEX_OLD_UNOWN_G 392 +#define NATIONAL_DEX_OLD_UNOWN_H 393 +#define NATIONAL_DEX_OLD_UNOWN_I 394 +#define NATIONAL_DEX_OLD_UNOWN_J 395 +#define NATIONAL_DEX_OLD_UNOWN_K 396 +#define NATIONAL_DEX_OLD_UNOWN_L 397 +#define NATIONAL_DEX_OLD_UNOWN_M 398 +#define NATIONAL_DEX_OLD_UNOWN_N 399 +#define NATIONAL_DEX_OLD_UNOWN_O 400 +#define NATIONAL_DEX_OLD_UNOWN_P 401 +#define NATIONAL_DEX_OLD_UNOWN_Q 402 +#define NATIONAL_DEX_OLD_UNOWN_R 403 +#define NATIONAL_DEX_OLD_UNOWN_S 404 +#define NATIONAL_DEX_OLD_UNOWN_T 405 +#define NATIONAL_DEX_OLD_UNOWN_U 406 +#define NATIONAL_DEX_OLD_UNOWN_V 407 +#define NATIONAL_DEX_OLD_UNOWN_W 408 +#define NATIONAL_DEX_OLD_UNOWN_X 409 +#define NATIONAL_DEX_OLD_UNOWN_Y 410 +#define NATIONAL_DEX_OLD_UNOWN_Z 411 + +#define NATIONAL_DEX_TREECKO 252 +#define NATIONAL_DEX_GROVYLE 253 +#define NATIONAL_DEX_SCEPTILE 254 +#define NATIONAL_DEX_TORCHIC 255 +#define NATIONAL_DEX_COMBUSKEN 256 +#define NATIONAL_DEX_BLAZIKEN 257 +#define NATIONAL_DEX_MUDKIP 258 +#define NATIONAL_DEX_MARSHTOMP 259 +#define NATIONAL_DEX_SWAMPERT 260 +#define NATIONAL_DEX_POOCHYENA 261 +#define NATIONAL_DEX_MIGHTYENA 262 +#define NATIONAL_DEX_ZIGZAGOON 263 +#define NATIONAL_DEX_LINOONE 264 +#define NATIONAL_DEX_WURMPLE 265 +#define NATIONAL_DEX_SILCOON 266 +#define NATIONAL_DEX_BEAUTIFLY 267 +#define NATIONAL_DEX_CASCOON 268 +#define NATIONAL_DEX_DUSTOX 269 +#define NATIONAL_DEX_LOTAD 270 +#define NATIONAL_DEX_LOMBRE 271 +#define NATIONAL_DEX_LUDICOLO 272 +#define NATIONAL_DEX_SEEDOT 273 +#define NATIONAL_DEX_NUZLEAF 274 +#define NATIONAL_DEX_SHIFTRY 275 +#define NATIONAL_DEX_NINCADA 290 +#define NATIONAL_DEX_NINJASK 291 +#define NATIONAL_DEX_SHEDINJA 292 +#define NATIONAL_DEX_TAILLOW 276 +#define NATIONAL_DEX_SWELLOW 277 +#define NATIONAL_DEX_SHROOMISH 285 +#define NATIONAL_DEX_BRELOOM 286 +#define NATIONAL_DEX_SPINDA 327 +#define NATIONAL_DEX_WINGULL 278 +#define NATIONAL_DEX_PELIPPER 279 +#define NATIONAL_DEX_SURSKIT 283 +#define NATIONAL_DEX_MASQUERAIN 284 +#define NATIONAL_DEX_WAILMER 320 +#define NATIONAL_DEX_WAILORD 321 +#define NATIONAL_DEX_SKITTY 300 +#define NATIONAL_DEX_DELCATTY 301 +#define NATIONAL_DEX_KECLEON 352 +#define NATIONAL_DEX_BALTOY 343 +#define NATIONAL_DEX_CLAYDOL 344 +#define NATIONAL_DEX_NOSEPASS 299 +#define NATIONAL_DEX_TORKOAL 324 +#define NATIONAL_DEX_SABLEYE 302 +#define NATIONAL_DEX_BARBOACH 339 +#define NATIONAL_DEX_WHISCASH 340 +#define NATIONAL_DEX_LUVDISC 370 +#define NATIONAL_DEX_CORPHISH 341 +#define NATIONAL_DEX_CRAWDAUNT 342 +#define NATIONAL_DEX_FEEBAS 349 +#define NATIONAL_DEX_MILOTIC 350 +#define NATIONAL_DEX_CARVANHA 318 +#define NATIONAL_DEX_SHARPEDO 319 +#define NATIONAL_DEX_TRAPINCH 328 +#define NATIONAL_DEX_VIBRAVA 329 +#define NATIONAL_DEX_FLYGON 330 +#define NATIONAL_DEX_MAKUHITA 296 +#define NATIONAL_DEX_HARIYAMA 297 +#define NATIONAL_DEX_ELECTRIKE 309 +#define NATIONAL_DEX_MANECTRIC 310 +#define NATIONAL_DEX_NUMEL 322 +#define NATIONAL_DEX_CAMERUPT 323 +#define NATIONAL_DEX_SPHEAL 363 +#define NATIONAL_DEX_SEALEO 364 +#define NATIONAL_DEX_WALREIN 365 +#define NATIONAL_DEX_CACNEA 331 +#define NATIONAL_DEX_CACTURNE 332 +#define NATIONAL_DEX_SNORUNT 361 +#define NATIONAL_DEX_GLALIE 362 +#define NATIONAL_DEX_LUNATONE 337 +#define NATIONAL_DEX_SOLROCK 338 +#define NATIONAL_DEX_AZURILL 298 +#define NATIONAL_DEX_SPOINK 325 +#define NATIONAL_DEX_GRUMPIG 326 +#define NATIONAL_DEX_PLUSLE 311 +#define NATIONAL_DEX_MINUN 312 +#define NATIONAL_DEX_MAWILE 303 +#define NATIONAL_DEX_MEDITITE 307 +#define NATIONAL_DEX_MEDICHAM 308 +#define NATIONAL_DEX_SWABLU 333 +#define NATIONAL_DEX_ALTARIA 334 +#define NATIONAL_DEX_WYNAUT 360 +#define NATIONAL_DEX_DUSKULL 355 +#define NATIONAL_DEX_DUSCLOPS 356 +#define NATIONAL_DEX_ROSELIA 315 +#define NATIONAL_DEX_SLAKOTH 287 +#define NATIONAL_DEX_VIGOROTH 288 +#define NATIONAL_DEX_SLAKING 289 +#define NATIONAL_DEX_GULPIN 316 +#define NATIONAL_DEX_SWALOT 317 +#define NATIONAL_DEX_TROPIUS 357 +#define NATIONAL_DEX_WHISMUR 293 +#define NATIONAL_DEX_LOUDRED 294 +#define NATIONAL_DEX_EXPLOUD 295 +#define NATIONAL_DEX_CLAMPERL 366 +#define NATIONAL_DEX_HUNTAIL 367 +#define NATIONAL_DEX_GOREBYSS 368 +#define NATIONAL_DEX_ABSOL 359 +#define NATIONAL_DEX_SHUPPET 353 +#define NATIONAL_DEX_BANETTE 354 +#define NATIONAL_DEX_SEVIPER 336 +#define NATIONAL_DEX_ZANGOOSE 335 +#define NATIONAL_DEX_RELICANTH 369 +#define NATIONAL_DEX_ARON 304 +#define NATIONAL_DEX_LAIRON 305 +#define NATIONAL_DEX_AGGRON 306 +#define NATIONAL_DEX_CASTFORM 351 +#define NATIONAL_DEX_VOLBEAT 313 +#define NATIONAL_DEX_ILLUMISE 314 +#define NATIONAL_DEX_LILEEP 345 +#define NATIONAL_DEX_CRADILY 346 +#define NATIONAL_DEX_ANORITH 347 +#define NATIONAL_DEX_ARMALDO 348 +#define NATIONAL_DEX_RALTS 280 +#define NATIONAL_DEX_KIRLIA 281 +#define NATIONAL_DEX_GARDEVOIR 282 +#define NATIONAL_DEX_BAGON 371 +#define NATIONAL_DEX_SHELGON 372 +#define NATIONAL_DEX_SALAMENCE 373 +#define NATIONAL_DEX_BELDUM 374 +#define NATIONAL_DEX_METANG 375 +#define NATIONAL_DEX_METAGROSS 376 +#define NATIONAL_DEX_REGIROCK 377 +#define NATIONAL_DEX_REGICE 378 +#define NATIONAL_DEX_REGISTEEL 379 +#define NATIONAL_DEX_KYOGRE 382 +#define NATIONAL_DEX_GROUDON 383 +#define NATIONAL_DEX_RAYQUAZA 384 +#define NATIONAL_DEX_LATIAS 380 +#define NATIONAL_DEX_LATIOS 381 +#define NATIONAL_DEX_JIRACHI 385 +#define NATIONAL_DEX_DEOXYS 386 +#define NATIONAL_DEX_CHIMECHO 358 + +// Hoenn Dex Index Defines + +#define HOENN_DEX_BULBASAUR 203 +#define HOENN_DEX_IVYSAUR 204 +#define HOENN_DEX_VENUSAUR 205 +#define HOENN_DEX_CHARMANDER 206 +#define HOENN_DEX_CHARMELEON 207 +#define HOENN_DEX_CHARIZARD 208 +#define HOENN_DEX_SQUIRTLE 209 +#define HOENN_DEX_WARTORTLE 210 +#define HOENN_DEX_BLASTOISE 211 +#define HOENN_DEX_CATERPIE 212 +#define HOENN_DEX_METAPOD 213 +#define HOENN_DEX_BUTTERFREE 214 +#define HOENN_DEX_WEEDLE 215 +#define HOENN_DEX_KAKUNA 216 +#define HOENN_DEX_BEEDRILL 217 +#define HOENN_DEX_PIDGEY 218 +#define HOENN_DEX_PIDGEOTTO 219 +#define HOENN_DEX_PIDGEOT 220 +#define HOENN_DEX_RATTATA 221 +#define HOENN_DEX_RATICATE 222 +#define HOENN_DEX_SPEAROW 223 +#define HOENN_DEX_FEAROW 224 +#define HOENN_DEX_EKANS 225 +#define HOENN_DEX_ARBOK 226 +#define HOENN_DEX_PIKACHU 156 +#define HOENN_DEX_RAICHU 157 +#define HOENN_DEX_SANDSHREW 112 +#define HOENN_DEX_SANDSLASH 113 +#define HOENN_DEX_NIDORAN_F 227 +#define HOENN_DEX_NIDORINA 228 +#define HOENN_DEX_NIDOQUEEN 229 +#define HOENN_DEX_NIDORAN_M 230 +#define HOENN_DEX_NIDORINO 231 +#define HOENN_DEX_NIDOKING 232 +#define HOENN_DEX_CLEFAIRY 233 +#define HOENN_DEX_CLEFABLE 234 +#define HOENN_DEX_VULPIX 153 +#define HOENN_DEX_NINETALES 154 +#define HOENN_DEX_JIGGLYPUFF 138 +#define HOENN_DEX_WIGGLYTUFF 139 +#define HOENN_DEX_ZUBAT 63 +#define HOENN_DEX_GOLBAT 64 +#define HOENN_DEX_ODDISH 88 +#define HOENN_DEX_GLOOM 89 +#define HOENN_DEX_VILEPLUME 90 +#define HOENN_DEX_PARAS 235 +#define HOENN_DEX_PARASECT 236 +#define HOENN_DEX_VENONAT 237 +#define HOENN_DEX_VENOMOTH 238 +#define HOENN_DEX_DIGLETT 239 +#define HOENN_DEX_DUGTRIO 240 +#define HOENN_DEX_MEOWTH 241 +#define HOENN_DEX_PERSIAN 242 +#define HOENN_DEX_PSYDUCK 158 +#define HOENN_DEX_GOLDUCK 159 +#define HOENN_DEX_MANKEY 243 +#define HOENN_DEX_PRIMEAPE 244 +#define HOENN_DEX_GROWLITHE 245 +#define HOENN_DEX_ARCANINE 246 +#define HOENN_DEX_POLIWAG 247 +#define HOENN_DEX_POLIWHIRL 248 +#define HOENN_DEX_POLIWRATH 249 +#define HOENN_DEX_ABRA 39 +#define HOENN_DEX_KADABRA 40 +#define HOENN_DEX_ALAKAZAM 41 +#define HOENN_DEX_MACHOP 73 +#define HOENN_DEX_MACHOKE 74 +#define HOENN_DEX_MACHAMP 75 +#define HOENN_DEX_BELLSPROUT 250 +#define HOENN_DEX_WEEPINBELL 251 +#define HOENN_DEX_VICTREEBEL 252 +#define HOENN_DEX_TENTACOOL 66 +#define HOENN_DEX_TENTACRUEL 67 +#define HOENN_DEX_GEODUDE 57 +#define HOENN_DEX_GRAVELER 58 +#define HOENN_DEX_GOLEM 59 +#define HOENN_DEX_PONYTA 253 +#define HOENN_DEX_RAPIDASH 254 +#define HOENN_DEX_SLOWPOKE 255 +#define HOENN_DEX_SLOWBRO 256 +#define HOENN_DEX_MAGNEMITE 82 +#define HOENN_DEX_MAGNETON 83 +#define HOENN_DEX_FARFETCHD 257 +#define HOENN_DEX_DODUO 92 +#define HOENN_DEX_DODRIO 93 +#define HOENN_DEX_SEEL 258 +#define HOENN_DEX_DEWGONG 259 +#define HOENN_DEX_GRIMER 106 +#define HOENN_DEX_MUK 107 +#define HOENN_DEX_SHELLDER 260 +#define HOENN_DEX_CLOYSTER 261 +#define HOENN_DEX_GASTLY 262 +#define HOENN_DEX_HAUNTER 263 +#define HOENN_DEX_GENGAR 264 +#define HOENN_DEX_ONIX 265 +#define HOENN_DEX_DROWZEE 266 +#define HOENN_DEX_HYPNO 267 +#define HOENN_DEX_KRABBY 268 +#define HOENN_DEX_KINGLER 269 +#define HOENN_DEX_VOLTORB 84 +#define HOENN_DEX_ELECTRODE 85 +#define HOENN_DEX_EXEGGCUTE 270 +#define HOENN_DEX_EXEGGUTOR 271 +#define HOENN_DEX_CUBONE 272 +#define HOENN_DEX_MAROWAK 273 +#define HOENN_DEX_HITMONLEE 274 +#define HOENN_DEX_HITMONCHAN 275 +#define HOENN_DEX_LICKITUNG 276 +#define HOENN_DEX_KOFFING 108 +#define HOENN_DEX_WEEZING 109 +#define HOENN_DEX_RHYHORN 169 +#define HOENN_DEX_RHYDON 170 +#define HOENN_DEX_CHANSEY 277 +#define HOENN_DEX_TANGELA 278 +#define HOENN_DEX_KANGASKHAN 279 +#define HOENN_DEX_HORSEA 184 +#define HOENN_DEX_SEADRA 185 +#define HOENN_DEX_GOLDEEN 50 +#define HOENN_DEX_SEAKING 51 +#define HOENN_DEX_STARYU 143 +#define HOENN_DEX_STARMIE 144 +#define HOENN_DEX_MR_MIME 280 +#define HOENN_DEX_SCYTHER 281 +#define HOENN_DEX_JYNX 282 +#define HOENN_DEX_ELECTABUZZ 283 +#define HOENN_DEX_MAGMAR 284 +#define HOENN_DEX_PINSIR 167 +#define HOENN_DEX_TAUROS 285 +#define HOENN_DEX_MAGIKARP 52 +#define HOENN_DEX_GYARADOS 53 +#define HOENN_DEX_LAPRAS 286 +#define HOENN_DEX_DITTO 287 +#define HOENN_DEX_EEVEE 288 +#define HOENN_DEX_VAPOREON 289 +#define HOENN_DEX_JOLTEON 290 +#define HOENN_DEX_FLAREON 291 +#define HOENN_DEX_PORYGON 292 +#define HOENN_DEX_OMANYTE 293 +#define HOENN_DEX_OMASTAR 294 +#define HOENN_DEX_KABUTO 295 +#define HOENN_DEX_KABUTOPS 296 +#define HOENN_DEX_AERODACTYL 297 +#define HOENN_DEX_SNORLAX 298 +#define HOENN_DEX_ARTICUNO 299 +#define HOENN_DEX_ZAPDOS 300 +#define HOENN_DEX_MOLTRES 301 +#define HOENN_DEX_DRATINI 302 +#define HOENN_DEX_DRAGONAIR 303 +#define HOENN_DEX_DRAGONITE 304 +#define HOENN_DEX_MEWTWO 305 +#define HOENN_DEX_MEW 306 +#define HOENN_DEX_CHIKORITA 307 +#define HOENN_DEX_BAYLEEF 308 +#define HOENN_DEX_MEGANIUM 309 +#define HOENN_DEX_CYNDAQUIL 310 +#define HOENN_DEX_QUILAVA 311 +#define HOENN_DEX_TYPHLOSION 312 +#define HOENN_DEX_TOTODILE 313 +#define HOENN_DEX_CROCONAW 314 +#define HOENN_DEX_FERALIGATR 315 +#define HOENN_DEX_SENTRET 316 +#define HOENN_DEX_FURRET 317 +#define HOENN_DEX_HOOTHOOT 318 +#define HOENN_DEX_NOCTOWL 319 +#define HOENN_DEX_LEDYBA 320 +#define HOENN_DEX_LEDIAN 321 +#define HOENN_DEX_SPINARAK 322 +#define HOENN_DEX_ARIADOS 323 +#define HOENN_DEX_CROBAT 65 +#define HOENN_DEX_CHINCHOU 181 +#define HOENN_DEX_LANTURN 182 +#define HOENN_DEX_PICHU 155 +#define HOENN_DEX_CLEFFA 324 +#define HOENN_DEX_IGGLYBUFF 137 +#define HOENN_DEX_TOGEPI 325 +#define HOENN_DEX_TOGETIC 326 +#define HOENN_DEX_NATU 162 +#define HOENN_DEX_XATU 163 +#define HOENN_DEX_MAREEP 327 +#define HOENN_DEX_FLAAFFY 328 +#define HOENN_DEX_AMPHAROS 329 +#define HOENN_DEX_BELLOSSOM 91 +#define HOENN_DEX_MARILL 55 +#define HOENN_DEX_AZUMARILL 56 +#define HOENN_DEX_SUDOWOODO 330 +#define HOENN_DEX_POLITOED 331 +#define HOENN_DEX_HOPPIP 332 +#define HOENN_DEX_SKIPLOOM 333 +#define HOENN_DEX_JUMPLUFF 334 +#define HOENN_DEX_AIPOM 335 +#define HOENN_DEX_SUNKERN 336 +#define HOENN_DEX_SUNFLORA 337 +#define HOENN_DEX_YANMA 338 +#define HOENN_DEX_WOOPER 339 +#define HOENN_DEX_QUAGSIRE 340 +#define HOENN_DEX_ESPEON 341 +#define HOENN_DEX_UMBREON 342 +#define HOENN_DEX_MURKROW 343 +#define HOENN_DEX_SLOWKING 344 +#define HOENN_DEX_MISDREAVUS 345 +#define HOENN_DEX_UNOWN 346 +#define HOENN_DEX_WOBBUFFET 161 +#define HOENN_DEX_GIRAFARIG 164 +#define HOENN_DEX_PINECO 347 +#define HOENN_DEX_FORRETRESS 348 +#define HOENN_DEX_DUNSPARCE 349 +#define HOENN_DEX_GLIGAR 350 +#define HOENN_DEX_STEELIX 351 +#define HOENN_DEX_SNUBBULL 352 +#define HOENN_DEX_GRANBULL 353 +#define HOENN_DEX_QWILFISH 354 +#define HOENN_DEX_SCIZOR 355 +#define HOENN_DEX_SHUCKLE 356 +#define HOENN_DEX_HERACROSS 168 +#define HOENN_DEX_SNEASEL 357 +#define HOENN_DEX_TEDDIURSA 358 +#define HOENN_DEX_URSARING 359 +#define HOENN_DEX_SLUGMA 103 +#define HOENN_DEX_MAGCARGO 104 +#define HOENN_DEX_SWINUB 360 +#define HOENN_DEX_PILOSWINE 361 +#define HOENN_DEX_CORSOLA 180 +#define HOENN_DEX_REMORAID 362 +#define HOENN_DEX_OCTILLERY 363 +#define HOENN_DEX_DELIBIRD 364 +#define HOENN_DEX_MANTINE 365 +#define HOENN_DEX_SKARMORY 115 +#define HOENN_DEX_HOUNDOUR 366 +#define HOENN_DEX_HOUNDOOM 367 +#define HOENN_DEX_KINGDRA 186 +#define HOENN_DEX_PHANPY 165 +#define HOENN_DEX_DONPHAN 166 +#define HOENN_DEX_PORYGON2 368 +#define HOENN_DEX_STANTLER 369 +#define HOENN_DEX_SMEARGLE 370 +#define HOENN_DEX_TYROGUE 371 +#define HOENN_DEX_HITMONTOP 372 +#define HOENN_DEX_SMOOCHUM 373 +#define HOENN_DEX_ELEKID 374 +#define HOENN_DEX_MAGBY 375 +#define HOENN_DEX_MILTANK 376 +#define HOENN_DEX_BLISSEY 377 +#define HOENN_DEX_RAIKOU 378 +#define HOENN_DEX_ENTEI 379 +#define HOENN_DEX_SUICUNE 380 +#define HOENN_DEX_LARVITAR 381 +#define HOENN_DEX_PUPITAR 382 +#define HOENN_DEX_TYRANITAR 383 +#define HOENN_DEX_LUGIA 384 +#define HOENN_DEX_HO_OH 385 +#define HOENN_DEX_CELEBI 386 + +#define HOENN_DEX_OLD_UNOWN_B 387 +#define HOENN_DEX_OLD_UNOWN_C 388 +#define HOENN_DEX_OLD_UNOWN_D 389 +#define HOENN_DEX_OLD_UNOWN_E 390 +#define HOENN_DEX_OLD_UNOWN_F 391 +#define HOENN_DEX_OLD_UNOWN_G 392 +#define HOENN_DEX_OLD_UNOWN_H 393 +#define HOENN_DEX_OLD_UNOWN_I 394 +#define HOENN_DEX_OLD_UNOWN_J 395 +#define HOENN_DEX_OLD_UNOWN_K 396 +#define HOENN_DEX_OLD_UNOWN_L 397 +#define HOENN_DEX_OLD_UNOWN_M 398 +#define HOENN_DEX_OLD_UNOWN_N 399 +#define HOENN_DEX_OLD_UNOWN_O 400 +#define HOENN_DEX_OLD_UNOWN_P 401 +#define HOENN_DEX_OLD_UNOWN_Q 402 +#define HOENN_DEX_OLD_UNOWN_R 403 +#define HOENN_DEX_OLD_UNOWN_S 404 +#define HOENN_DEX_OLD_UNOWN_T 405 +#define HOENN_DEX_OLD_UNOWN_U 406 +#define HOENN_DEX_OLD_UNOWN_V 407 +#define HOENN_DEX_OLD_UNOWN_W 408 +#define HOENN_DEX_OLD_UNOWN_X 409 +#define HOENN_DEX_OLD_UNOWN_Y 410 +#define HOENN_DEX_OLD_UNOWN_Z 411 + +#define HOENN_DEX_TREECKO 1 +#define HOENN_DEX_GROVYLE 2 +#define HOENN_DEX_SCEPTILE 3 +#define HOENN_DEX_TORCHIC 4 +#define HOENN_DEX_COMBUSKEN 5 +#define HOENN_DEX_BLAZIKEN 6 +#define HOENN_DEX_MUDKIP 7 +#define HOENN_DEX_MARSHTOMP 8 +#define HOENN_DEX_SWAMPERT 9 +#define HOENN_DEX_POOCHYENA 10 +#define HOENN_DEX_MIGHTYENA 11 +#define HOENN_DEX_ZIGZAGOON 12 +#define HOENN_DEX_LINOONE 13 +#define HOENN_DEX_WURMPLE 14 +#define HOENN_DEX_SILCOON 15 +#define HOENN_DEX_BEAUTIFLY 16 +#define HOENN_DEX_CASCOON 17 +#define HOENN_DEX_DUSTOX 18 +#define HOENN_DEX_LOTAD 19 +#define HOENN_DEX_LOMBRE 20 +#define HOENN_DEX_LUDICOLO 21 +#define HOENN_DEX_SEEDOT 22 +#define HOENN_DEX_NUZLEAF 23 +#define HOENN_DEX_SHIFTRY 24 +#define HOENN_DEX_NINCADA 42 +#define HOENN_DEX_NINJASK 43 +#define HOENN_DEX_SHEDINJA 44 +#define HOENN_DEX_TAILLOW 25 +#define HOENN_DEX_SWELLOW 26 +#define HOENN_DEX_SHROOMISH 34 +#define HOENN_DEX_BRELOOM 35 +#define HOENN_DEX_SPINDA 114 +#define HOENN_DEX_WINGULL 27 +#define HOENN_DEX_PELIPPER 28 +#define HOENN_DEX_SURSKIT 32 +#define HOENN_DEX_MASQUERAIN 33 +#define HOENN_DEX_WAILMER 99 +#define HOENN_DEX_WAILORD 100 +#define HOENN_DEX_SKITTY 61 +#define HOENN_DEX_DELCATTY 62 +#define HOENN_DEX_KECLEON 145 +#define HOENN_DEX_BALTOY 131 +#define HOENN_DEX_CLAYDOL 132 +#define HOENN_DEX_NOSEPASS 60 +#define HOENN_DEX_TORKOAL 105 +#define HOENN_DEX_SABLEYE 68 +#define HOENN_DEX_BARBOACH 127 +#define HOENN_DEX_WHISCASH 128 +#define HOENN_DEX_LUVDISC 183 +#define HOENN_DEX_CORPHISH 129 +#define HOENN_DEX_CRAWDAUNT 130 +#define HOENN_DEX_FEEBAS 140 +#define HOENN_DEX_MILOTIC 141 +#define HOENN_DEX_CARVANHA 97 +#define HOENN_DEX_SHARPEDO 98 +#define HOENN_DEX_TRAPINCH 116 +#define HOENN_DEX_VIBRAVA 117 +#define HOENN_DEX_FLYGON 118 +#define HOENN_DEX_MAKUHITA 48 +#define HOENN_DEX_HARIYAMA 49 +#define HOENN_DEX_ELECTRIKE 78 +#define HOENN_DEX_MANECTRIC 79 +#define HOENN_DEX_NUMEL 101 +#define HOENN_DEX_CAMERUPT 102 +#define HOENN_DEX_SPHEAL 173 +#define HOENN_DEX_SEALEO 174 +#define HOENN_DEX_WALREIN 175 +#define HOENN_DEX_CACNEA 119 +#define HOENN_DEX_CACTURNE 120 +#define HOENN_DEX_SNORUNT 171 +#define HOENN_DEX_GLALIE 172 +#define HOENN_DEX_LUNATONE 125 +#define HOENN_DEX_SOLROCK 126 +#define HOENN_DEX_AZURILL 54 +#define HOENN_DEX_SPOINK 110 +#define HOENN_DEX_GRUMPIG 111 +#define HOENN_DEX_PLUSLE 80 +#define HOENN_DEX_MINUN 81 +#define HOENN_DEX_MAWILE 69 +#define HOENN_DEX_MEDITITE 76 +#define HOENN_DEX_MEDICHAM 77 +#define HOENN_DEX_SWABLU 121 +#define HOENN_DEX_ALTARIA 122 +#define HOENN_DEX_WYNAUT 160 +#define HOENN_DEX_DUSKULL 148 +#define HOENN_DEX_DUSCLOPS 149 +#define HOENN_DEX_ROSELIA 94 +#define HOENN_DEX_SLAKOTH 36 +#define HOENN_DEX_VIGOROTH 37 +#define HOENN_DEX_SLAKING 38 +#define HOENN_DEX_GULPIN 95 +#define HOENN_DEX_SWALOT 96 +#define HOENN_DEX_TROPIUS 150 +#define HOENN_DEX_WHISMUR 45 +#define HOENN_DEX_LOUDRED 46 +#define HOENN_DEX_EXPLOUD 47 +#define HOENN_DEX_CLAMPERL 176 +#define HOENN_DEX_HUNTAIL 177 +#define HOENN_DEX_GOREBYSS 178 +#define HOENN_DEX_ABSOL 152 +#define HOENN_DEX_SHUPPET 146 +#define HOENN_DEX_BANETTE 147 +#define HOENN_DEX_SEVIPER 124 +#define HOENN_DEX_ZANGOOSE 123 +#define HOENN_DEX_RELICANTH 179 +#define HOENN_DEX_ARON 70 +#define HOENN_DEX_LAIRON 71 +#define HOENN_DEX_AGGRON 72 +#define HOENN_DEX_CASTFORM 142 +#define HOENN_DEX_VOLBEAT 86 +#define HOENN_DEX_ILLUMISE 87 +#define HOENN_DEX_LILEEP 133 +#define HOENN_DEX_CRADILY 134 +#define HOENN_DEX_ANORITH 135 +#define HOENN_DEX_ARMALDO 136 +#define HOENN_DEX_RALTS 29 +#define HOENN_DEX_KIRLIA 30 +#define HOENN_DEX_GARDEVOIR 31 +#define HOENN_DEX_BAGON 187 +#define HOENN_DEX_SHELGON 188 +#define HOENN_DEX_SALAMENCE 189 +#define HOENN_DEX_BELDUM 190 +#define HOENN_DEX_METANG 191 +#define HOENN_DEX_METAGROSS 192 +#define HOENN_DEX_REGIROCK 193 +#define HOENN_DEX_REGICE 194 +#define HOENN_DEX_REGISTEEL 195 +#define HOENN_DEX_KYOGRE 198 +#define HOENN_DEX_GROUDON 199 +#define HOENN_DEX_RAYQUAZA 200 +#define HOENN_DEX_LATIAS 196 +#define HOENN_DEX_LATIOS 197 +#define HOENN_DEX_JIRACHI 201 +#define HOENN_DEX_DEOXYS 202 +#define HOENN_DEX_CHIMECHO 151 + #ifdef SAPPHIRE #define ROAMER_SPECIES SPECIES_LATIAS #else diff --git a/include/global.h b/include/global.h index 3c0169606..36e1db978 100644 --- a/include/global.h +++ b/include/global.h @@ -176,7 +176,7 @@ struct SecretBaseRecord /*0x1A19*/ u8 sbr_field_11; /*0x1A1A*/ u8 decorations[16]; /*0x1A2A*/ u8 decorationPos[16]; - /*0x1A3A*/ u32 partyPersonality[6]; + /*0x1A3C*/ u32 partyPersonality[6]; /*0x1A54*/ u16 partyMoves[6 * 4]; /*0x1A84*/ u16 partySpecies[6]; /*0x1A90*/ u16 partyHeldItems[6]; @@ -808,7 +808,7 @@ struct BattleTowerData /*0x04BC, 0x0564*/ u8 battleTowerTrainerId; // index for gBattleTowerTrainers table /*0x04BD, 0x0565*/ u8 selectedPartyMons[0x3]; // indices of the 3 selected player party mons. /*0x04C0, 0x0568*/ u16 prizeItem; - /*0x04C2, 0x056A*/ u8 filler_4C2[0x6]; + /*0x04C2, 0x056A*/ u8 battledTrainerIds[6]; /*0x04C8, 0x0570*/ u16 totalBattleTowerWins; /*0x04CA, 0x0572*/ u16 bestBattleTowerWinStreak; /*0x04CC, 0x0574*/ u16 currentWinStreaks[2]; diff --git a/include/graphics.h b/include/graphics.h index 8e8e0c97e..f242e3752 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2472,7 +2472,7 @@ extern const u8 gBagPalette[]; extern const u8 gBagScreen_Gfx[]; extern const u8 gBagScreenMale_Pal[]; extern const u8 gBagScreenFemale_Pal[]; -extern const u16 gUnknown_08E77004[]; +extern const u16 gBagScreen_Tilemap[]; extern const u8 gBuyMenuFrame_Gfx[]; extern const u8 gMenuMoneyPal[]; extern const u8 gBuyMenuFrame_Tilemap[]; @@ -2615,7 +2615,7 @@ extern const u8 gMailTilemap_Dream[]; extern const u8 gMailTilemap_Fab[]; extern const u8 gMailTilemap_Retro[]; -extern const u8 gUnknown_08E96EC8[]; +extern const u8 gBagScreenLabels_Tilemap[]; extern const u8 gMenuTrainerCard_Gfx[]; extern const u16 gMenuTrainerCard0Star_Pal[]; diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 9c8fbdc13..735b7f4f9 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -40,19 +40,30 @@ enum { PC_TEXT_FMT_MON_NAME_AFTER_EXCL_MARK }; +struct PokemonStorageSystemFunc +{ + u8 (*func)(void); + s8 unk4; +}; + struct StorageAction { const u8 *text; u8 format; }; +struct StorageText { + const u8 *text; + int textId; +}; + struct PSS_MenuStringPtrs { const u8 *text; const u8 *desc; }; struct UnkStruct_2000028 { - void *unk_00; - void *unk_04; + const u8 *unk_00; + u8 *unk_04; u16 unk_08; u16 unk_0a; void (*unk_0c)(struct UnkStruct_2000028 *data); @@ -88,7 +99,7 @@ struct PokemonStorageSystemData { struct PCScreenEffectStruct unk_000c; struct UnkStruct_2000020 unk_0020; struct UnkStruct_2000028 unk_0028[8]; - u16 unk_00a8[0x400]; + u8 unk_00a8[0x800]; u16 unk_08a8; u16 unk_08aa; u8 unk_08ac; @@ -142,7 +153,14 @@ struct PokemonStorageSystemData { s8 unk_117b; u8 unk_117c; u8 unk_117d; - u8 filler_117e[0x42]; + u8 filler_117e[2]; + struct StorageText unk_1180[6]; + u8 filler_11b0[8]; + u8 unk_11b8; + u8 unk_11b9; + u16 unk_11ba; + u16 unk_11bc; + u8 filler_11be; struct Sprite *unk_11c0; struct Sprite *unk_11c4; s32 unk_11c8; @@ -158,7 +176,7 @@ struct PokemonStorageSystemData { u8 unk_11e1; u8 unk_11e2; u8 unk_11e3; - u8 filler_11e4[4]; + u8 unk_11e4[4]; const u8 *unk_11e8; u32 unk_11ec; u16 unk_11f0; @@ -213,7 +231,7 @@ struct PokemonStorageSystemData { u8 unk_4784[0x800]; }; -extern u16 gUnknown_02039760[0x600]; +extern u8 gUnknown_02039760[0xC00]; extern struct UnkPSSStruct_2002370 *gUnknown_02038478; extern struct PokemonStorageSystemData *const gPokemonStorageSystemPtr; extern u8 *const gUnknown_083B6DB8; @@ -295,9 +313,9 @@ void sub_809CE84(void); s16 sub_809CF30(void); void sub_809CFDC(struct UnkStruct_2000020 *a0, struct UnkStruct_2000028 *a1, u8 a2); void sub_809CFF0(void); -void sub_809D034(void *dest, u16 dLeft, u16 dTop, const void *src, u16 sLeft, u16 sTop, u16 width, u16 height); -void sub_809D104(void *dest, u16 dLeft, u16 dTop, const void *src, u16 sLeft, u16 sTop, u16 width, u16 height); -void sub_809D16C(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height); +bool8 sub_809D034(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft, u16 sTop, u16 width, u16 height); +void sub_809D104(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft, u16 sTop, u16 width, u16 height); +bool8 sub_809D16C(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height); void ShowPokemonStorageSystem(void); void debug_sub_80A433C(struct Pokemon *pokemon, void (*func)(void)); diff --git a/include/secret_base.h b/include/secret_base.h index 4748c83d7..a9a205bc4 100644 --- a/include/secret_base.h +++ b/include/secret_base.h @@ -15,7 +15,7 @@ void SetCurrentSecretBaseFromPosition(struct MapPosition *, struct MapEvents *); void sub_80BC038(struct MapPosition *, struct MapEvents *); u8 sub_80BC050(); u8 *GetSecretBaseMapName(u8 *dest); -void sub_80BC300(); +void SetPlayerSecretBaseRecordMixingParty(); u8 sub_80BCCA4(u8 secretBaseIndex); const u8 *GetSecretBaseTrainerLoseText(void); void sub_80BCF1C(u8 taskId); diff --git a/ld_script.txt b/ld_script.txt index cf238d12c..364cd4469 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -133,8 +133,6 @@ SECTIONS { src/pokemon_storage_system_2.o(.text); src/pokemon_storage_system_3.o(.text); src/pokemon_storage_system_4.o(.text); - src/pokemon_storage_system_5.o(.text); - asm/pokemon_storage_system.o(.text); src/pokemon_icon.o(.text); src/pokemon_summary_screen.o(.text); src/script_movement.o(.text); @@ -558,7 +556,6 @@ SECTIONS { src/pokemon_storage_system_2.o(.rodata); src/pokemon_storage_system_3.o(.rodata); src/pokemon_storage_system_4.o(.rodata); - src/pokemon_storage_system_5.o(.rodata); data/pokemon_storage_system.o(.rodata); src/pokemon_icon.o(.rodata); src/pokemon_summary_screen.o(.rodata); diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c index 7b6004ce0..5a71733b8 100644 --- a/src/battle/battle_2.c +++ b/src/battle/battle_2.c @@ -1055,7 +1055,7 @@ u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum) { case 0: { - const struct TrainerPartyMember0 *partyData = gTrainers[trainerNum].party; + const struct TrainerMonNoItemDefaultMoves *partyData = gTrainers[trainerNum].party.NoItemDefaultMoves; for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++) nameHash += gSpeciesNames[partyData[i].species][j]; @@ -1064,9 +1064,9 @@ u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum) CreateMon(&party[i], partyData[i].species, partyData[i].level, fixedIV, TRUE, personalityValue, 2, 0); break; } - case 1: + case F_TRAINER_PARTY_CUSTOM_MOVESET: { - const struct TrainerPartyMember1 *partyData = gTrainers[trainerNum].party; + const struct TrainerMonNoItemCustomMoves *partyData = gTrainers[trainerNum].party.NoItemCustomMoves; for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++) nameHash += gSpeciesNames[partyData[i].species][j]; @@ -1081,9 +1081,9 @@ u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum) } break; } - case 2: + case F_TRAINER_PARTY_HELD_ITEM: { - const struct TrainerPartyMember2 *partyData = gTrainers[trainerNum].party; + const struct TrainerMonItemDefaultMoves *partyData = gTrainers[trainerNum].party.ItemDefaultMoves; for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++) nameHash += gSpeciesNames[partyData[i].species][j]; @@ -1094,9 +1094,9 @@ u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum) SetMonData(&party[i], MON_DATA_HELD_ITEM, &partyData[i].heldItem); break; } - case 3: + case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM: { - const struct TrainerPartyMember3 *partyData = gTrainers[trainerNum].party; + const struct TrainerMonItemCustomMoves *partyData = gTrainers[trainerNum].party.ItemCustomMoves; for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++) nameHash += gSpeciesNames[partyData[i].species][j]; diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index e8a3ef451..fc929eb4d 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -160,282 +160,282 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_4[] = const struct TrainerEyeTrainer gTrainerEyeTrainers[] = { { - {OPPONENT_ROSE_1, OPPONENT_ROSE_2, OPPONENT_ROSE_3, OPPONENT_ROSE_4, OPPONENT_ROSE_5}, + {TRAINER_ROSE_1, TRAINER_ROSE_2, TRAINER_ROSE_3, TRAINER_ROSE_4, TRAINER_ROSE_5}, MAP_GROUP(ROUTE118), MAP_NUM(ROUTE118), }, { - {OPPONENT_DUSTY_1, OPPONENT_DUSTY_2, OPPONENT_DUSTY_3, OPPONENT_DUSTY_4, OPPONENT_DUSTY_5}, + {TRAINER_DUSTY_1, TRAINER_DUSTY_2, TRAINER_DUSTY_3, TRAINER_DUSTY_4, TRAINER_DUSTY_5}, MAP_GROUP(ROUTE111), MAP_NUM(ROUTE111), }, { - {OPPONENT_LOLA_1, OPPONENT_LOLA_2, OPPONENT_LOLA_3, OPPONENT_LOLA_4, OPPONENT_LOLA_5}, + {TRAINER_LOLA_1, TRAINER_LOLA_2, TRAINER_LOLA_3, TRAINER_LOLA_4, TRAINER_LOLA_5}, MAP_GROUP(ROUTE109), MAP_NUM(ROUTE109), }, { - {OPPONENT_RICKY_1, OPPONENT_RICKY_2, OPPONENT_RICKY_3, OPPONENT_RICKY_4, OPPONENT_RICKY_5}, + {TRAINER_RICKY_1, TRAINER_RICKY_2, TRAINER_RICKY_3, TRAINER_RICKY_4, TRAINER_RICKY_5}, MAP_GROUP(ROUTE109), MAP_NUM(ROUTE109), }, { - {OPPONENT_RITA_AND_SAM_1, OPPONENT_RITA_AND_SAM_2, OPPONENT_RITA_AND_SAM_3, OPPONENT_RITA_AND_SAM_4, OPPONENT_RITA_AND_SAM_5}, + {TRAINER_RITA_AND_SAM_1, TRAINER_RITA_AND_SAM_2, TRAINER_RITA_AND_SAM_3, TRAINER_RITA_AND_SAM_4, TRAINER_RITA_AND_SAM_5}, MAP_GROUP(ROUTE124), MAP_NUM(ROUTE124), }, { - {OPPONENT_BROOKE_1, OPPONENT_BROOKE_2, OPPONENT_BROOKE_3, OPPONENT_BROOKE_4, OPPONENT_BROOKE_5}, + {TRAINER_BROOKE_1, TRAINER_BROOKE_2, TRAINER_BROOKE_3, TRAINER_BROOKE_4, TRAINER_BROOKE_5}, MAP_GROUP(ROUTE111), MAP_NUM(ROUTE111), }, { - {OPPONENT_WILTON_1, OPPONENT_WILTON_2, OPPONENT_WILTON_3, OPPONENT_WILTON_4, OPPONENT_WILTON_5}, + {TRAINER_WILTON_1, TRAINER_WILTON_2, TRAINER_WILTON_3, TRAINER_WILTON_4, TRAINER_WILTON_5}, MAP_GROUP(ROUTE111), MAP_NUM(ROUTE111), }, { - {OPPONENT_VALERIE_1, OPPONENT_VALERIE_2, OPPONENT_VALERIE_3, OPPONENT_VALERIE_4, OPPONENT_VALERIE_5}, + {TRAINER_VALERIE_1, TRAINER_VALERIE_2, TRAINER_VALERIE_3, TRAINER_VALERIE_4, TRAINER_VALERIE_5}, MAP_GROUP(MT_PYRE_6F), MAP_NUM(MT_PYRE_6F), }, { - {OPPONENT_CINDY_1, OPPONENT_CINDY_3, OPPONENT_CINDY_4, OPPONENT_CINDY_5, OPPONENT_CINDY_6}, + {TRAINER_CINDY_1, TRAINER_CINDY_3, TRAINER_CINDY_4, TRAINER_CINDY_5, TRAINER_CINDY_6}, MAP_GROUP(ROUTE104), MAP_NUM(ROUTE104), }, { - {OPPONENT_JESSICA_1, OPPONENT_JESSICA_2, OPPONENT_JESSICA_3, OPPONENT_JESSICA_4, OPPONENT_JESSICA_5}, + {TRAINER_JESSICA_1, TRAINER_JESSICA_2, TRAINER_JESSICA_3, TRAINER_JESSICA_4, TRAINER_JESSICA_5}, MAP_GROUP(ROUTE121), MAP_NUM(ROUTE121), }, { - {OPPONENT_WINSTON_1, OPPONENT_WINSTON_2, OPPONENT_WINSTON_3, OPPONENT_WINSTON_4, OPPONENT_WINSTON_5}, + {TRAINER_WINSTON_1, TRAINER_WINSTON_2, TRAINER_WINSTON_3, TRAINER_WINSTON_4, TRAINER_WINSTON_5}, MAP_GROUP(ROUTE104), MAP_NUM(ROUTE104), }, { - {OPPONENT_STEVE_1, OPPONENT_STEVE_2, OPPONENT_STEVE_3, OPPONENT_STEVE_4, OPPONENT_STEVE_5}, + {TRAINER_STEVE_1, TRAINER_STEVE_2, TRAINER_STEVE_3, TRAINER_STEVE_4, TRAINER_STEVE_5}, MAP_GROUP(ROUTE114), MAP_NUM(ROUTE114), }, { - {OPPONENT_TONY_1, OPPONENT_TONY_2, OPPONENT_TONY_3, OPPONENT_TONY_4, OPPONENT_TONY_5}, + {TRAINER_TONY_1, TRAINER_TONY_2, TRAINER_TONY_3, TRAINER_TONY_4, TRAINER_TONY_5}, MAP_GROUP(ROUTE107), MAP_NUM(ROUTE107), }, { - {OPPONENT_NOB_1, OPPONENT_NOB_2, OPPONENT_NOB_3, OPPONENT_NOB_4, OPPONENT_NOB_5}, + {TRAINER_NOB_1, TRAINER_NOB_2, TRAINER_NOB_3, TRAINER_NOB_4, TRAINER_NOB_5}, MAP_GROUP(ROUTE115), MAP_NUM(ROUTE115), }, { - {OPPONENT_DALTON_1, OPPONENT_DALTON_2, OPPONENT_DALTON_3, OPPONENT_DALTON_4, OPPONENT_DALTON_5}, + {TRAINER_DALTON_1, TRAINER_DALTON_2, TRAINER_DALTON_3, TRAINER_DALTON_4, TRAINER_DALTON_5}, MAP_GROUP(ROUTE118), MAP_NUM(ROUTE118), }, { - {OPPONENT_BERNIE_1, OPPONENT_BERNIE_2, OPPONENT_BERNIE_3, OPPONENT_BERNIE_4, OPPONENT_BERNIE_5}, + {TRAINER_BERNIE_1, TRAINER_BERNIE_2, TRAINER_BERNIE_3, TRAINER_BERNIE_4, TRAINER_BERNIE_5}, MAP_GROUP(ROUTE114), MAP_NUM(ROUTE114), }, { - {OPPONENT_ETHAN_1, OPPONENT_ETHAN_2, OPPONENT_ETHAN_3, OPPONENT_ETHAN_4, OPPONENT_ETHAN_5}, + {TRAINER_ETHAN_1, TRAINER_ETHAN_2, TRAINER_ETHAN_3, TRAINER_ETHAN_4, TRAINER_ETHAN_5}, MAP_GROUP(JAGGED_PASS), MAP_NUM(JAGGED_PASS), }, { - {OPPONENT_JOHN_AND_JAY_1, OPPONENT_JOHN_AND_JAY_2, OPPONENT_JOHN_AND_JAY_3, OPPONENT_JOHN_AND_JAY_4, OPPONENT_JOHN_AND_JAY_5}, + {TRAINER_JOHN_AND_JAY_1, TRAINER_JOHN_AND_JAY_2, TRAINER_JOHN_AND_JAY_3, TRAINER_JOHN_AND_JAY_4, TRAINER_JOHN_AND_JAY_5}, MAP_GROUP(METEOR_FALLS_1F_2R), MAP_NUM(METEOR_FALLS_1F_2R), }, { - {OPPONENT_BRANDON_1, OPPONENT_BRANDON_2, OPPONENT_BRANDON_3, OPPONENT_BRANDON_4, OPPONENT_BRANDON_5}, + {TRAINER_BRANDON_1, TRAINER_BRANDON_2, TRAINER_BRANDON_3, TRAINER_BRANDON_4, TRAINER_BRANDON_5}, MAP_GROUP(ROUTE120), MAP_NUM(ROUTE120), }, { - {OPPONENT_CAMERON_1, OPPONENT_CAMERON_2, OPPONENT_CAMERON_3, OPPONENT_CAMERON_4, OPPONENT_CAMERON_5}, + {TRAINER_CAMERON_1, TRAINER_CAMERON_2, TRAINER_CAMERON_3, TRAINER_CAMERON_4, TRAINER_CAMERON_5}, MAP_GROUP(ROUTE123), MAP_NUM(ROUTE123), }, { - {OPPONENT_JACKI_1, OPPONENT_JACKI_2, OPPONENT_JACKI_3, OPPONENT_JACKI_4, OPPONENT_JACKI_5}, + {TRAINER_JACKI_1, TRAINER_JACKI_2, TRAINER_JACKI_3, TRAINER_JACKI_4, TRAINER_JACKI_5}, MAP_GROUP(ROUTE123), MAP_NUM(ROUTE123), }, { - {OPPONENT_WALTER_1, OPPONENT_WALTER_2, OPPONENT_WALTER_3, OPPONENT_WALTER_4, OPPONENT_WALTER_5}, + {TRAINER_WALTER_1, TRAINER_WALTER_2, TRAINER_WALTER_3, TRAINER_WALTER_4, TRAINER_WALTER_5}, MAP_GROUP(ROUTE121), MAP_NUM(ROUTE121), }, { - {OPPONENT_KAREN_1, OPPONENT_KAREN_2, OPPONENT_KAREN_3, OPPONENT_KAREN_4, OPPONENT_KAREN_5}, + {TRAINER_KAREN_1, TRAINER_KAREN_2, TRAINER_KAREN_3, TRAINER_KAREN_4, TRAINER_KAREN_5}, MAP_GROUP(ROUTE116), MAP_NUM(ROUTE116), }, { - {OPPONENT_JERRY_1, OPPONENT_JERRY_2, OPPONENT_JERRY_3, OPPONENT_JERRY_4, OPPONENT_JERRY_5}, + {TRAINER_JERRY_1, TRAINER_JERRY_2, TRAINER_JERRY_3, TRAINER_JERRY_4, TRAINER_JERRY_5}, MAP_GROUP(ROUTE116), MAP_NUM(ROUTE116), }, { - {OPPONENT_ANNA_AND_MEG_1, OPPONENT_ANNA_AND_MEG_2, OPPONENT_ANNA_AND_MEG_3, OPPONENT_ANNA_AND_MEG_4, OPPONENT_ANNA_AND_MEG_5}, + {TRAINER_ANNA_AND_MEG_1, TRAINER_ANNA_AND_MEG_2, TRAINER_ANNA_AND_MEG_3, TRAINER_ANNA_AND_MEG_4, TRAINER_ANNA_AND_MEG_5}, MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), }, { - {OPPONENT_ISABEL_1, OPPONENT_ISABEL_2, OPPONENT_ISABEL_3, OPPONENT_ISABEL_4, OPPONENT_ISABEL_5}, + {TRAINER_ISABEL_1, TRAINER_ISABEL_2, TRAINER_ISABEL_3, TRAINER_ISABEL_4, TRAINER_ISABEL_5}, MAP_GROUP(ROUTE110), MAP_NUM(ROUTE110), }, { - {OPPONENT_MIGUEL_1, OPPONENT_MIGUEL_2, OPPONENT_MIGUEL_3, OPPONENT_MIGUEL_4, OPPONENT_MIGUEL_5}, + {TRAINER_MIGUEL_1, TRAINER_MIGUEL_2, TRAINER_MIGUEL_3, TRAINER_MIGUEL_4, TRAINER_MIGUEL_5}, MAP_GROUP(ROUTE103), MAP_NUM(ROUTE103), }, { - {OPPONENT_TIMOTHY_1, OPPONENT_TIMOTHY_2, OPPONENT_TIMOTHY_3, OPPONENT_TIMOTHY_4, OPPONENT_TIMOTHY_5}, + {TRAINER_TIMOTHY_1, TRAINER_TIMOTHY_2, TRAINER_TIMOTHY_3, TRAINER_TIMOTHY_4, TRAINER_TIMOTHY_5}, MAP_GROUP(ROUTE115), MAP_NUM(ROUTE115), }, { - {OPPONENT_SHELBY_1, OPPONENT_SHELBY_2, OPPONENT_SHELBY_3, OPPONENT_SHELBY_4, OPPONENT_SHELBY_5}, + {TRAINER_SHELBY_1, TRAINER_SHELBY_2, TRAINER_SHELBY_3, TRAINER_SHELBY_4, TRAINER_SHELBY_5}, MAP_GROUP(MT_CHIMNEY), MAP_NUM(MT_CHIMNEY), }, { - {OPPONENT_CALVIN_1, OPPONENT_CALVIN_2, OPPONENT_CALVIN_3, OPPONENT_CALVIN_4, OPPONENT_CALVIN_5}, + {TRAINER_CALVIN_1, TRAINER_CALVIN_2, TRAINER_CALVIN_3, TRAINER_CALVIN_4, TRAINER_CALVIN_5}, MAP_GROUP(ROUTE102), MAP_NUM(ROUTE102), }, { - {OPPONENT_ELLIOT_1, OPPONENT_ELLIOT_2, OPPONENT_ELLIOT_3, OPPONENT_ELLIOT_4, OPPONENT_ELLIOT_5}, + {TRAINER_ELLIOT_1, TRAINER_ELLIOT_2, TRAINER_ELLIOT_3, TRAINER_ELLIOT_4, TRAINER_ELLIOT_5}, MAP_GROUP(ROUTE106), MAP_NUM(ROUTE106), }, { - {OPPONENT_ABIGAIL_1, OPPONENT_ABIGAIL_2, OPPONENT_ABIGAIL_3, OPPONENT_ABIGAIL_4, OPPONENT_ABIGAIL_5}, + {TRAINER_ABIGAIL_1, TRAINER_ABIGAIL_2, TRAINER_ABIGAIL_3, TRAINER_ABIGAIL_4, TRAINER_ABIGAIL_5}, MAP_GROUP(ROUTE110), MAP_NUM(ROUTE110), }, { - {OPPONENT_BENJAMIN_1, OPPONENT_BENJAMIN_2, OPPONENT_BENJAMIN_3, OPPONENT_BENJAMIN_4, OPPONENT_BENJAMIN_5}, + {TRAINER_BENJAMIN_1, TRAINER_BENJAMIN_2, TRAINER_BENJAMIN_3, TRAINER_BENJAMIN_4, TRAINER_BENJAMIN_5}, MAP_GROUP(ROUTE110), MAP_NUM(ROUTE110), }, { - {OPPONENT_ISAIAH_1, OPPONENT_ISAIAH_2, OPPONENT_ISAIAH_3, OPPONENT_ISAIAH_4, OPPONENT_ISAIAH_5}, + {TRAINER_ISAIAH_1, TRAINER_ISAIAH_2, TRAINER_ISAIAH_3, TRAINER_ISAIAH_4, TRAINER_ISAIAH_5}, MAP_GROUP(ROUTE128), MAP_NUM(ROUTE128), }, { - {OPPONENT_KATELYN_1, OPPONENT_KATELYN_2, OPPONENT_KATELYN_3, OPPONENT_KATELYN_4, OPPONENT_KATELYN_5}, + {TRAINER_KATELYN_1, TRAINER_KATELYN_2, TRAINER_KATELYN_3, TRAINER_KATELYN_4, TRAINER_KATELYN_5}, MAP_GROUP(ROUTE128), MAP_NUM(ROUTE128), }, { - {OPPONENT_MARIA_1, OPPONENT_MARIA_2, OPPONENT_MARIA_3, OPPONENT_MARIA_4, OPPONENT_MARIA_5}, + {TRAINER_MARIA_1, TRAINER_MARIA_2, TRAINER_MARIA_3, TRAINER_MARIA_4, TRAINER_MARIA_5}, MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), }, { - {OPPONENT_DYLAN_1, OPPONENT_DYLAN_2, OPPONENT_DYLAN_3, OPPONENT_DYLAN_4, OPPONENT_DYLAN_5}, + {TRAINER_DYLAN_1, TRAINER_DYLAN_2, TRAINER_DYLAN_3, TRAINER_DYLAN_4, TRAINER_DYLAN_5}, MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), }, { - {OPPONENT_NICOLAS_1, OPPONENT_NICOLAS_2, OPPONENT_NICOLAS_3, OPPONENT_NICOLAS_4, OPPONENT_NICOLAS_5}, + {TRAINER_NICOLAS_1, TRAINER_NICOLAS_2, TRAINER_NICOLAS_3, TRAINER_NICOLAS_4, TRAINER_NICOLAS_5}, MAP_GROUP(METEOR_FALLS_1F_2R), MAP_NUM(METEOR_FALLS_1F_2R), }, { - {OPPONENT_ROBERT_1, OPPONENT_ROBERT_2, OPPONENT_ROBERT_3, OPPONENT_ROBERT_4, OPPONENT_ROBERT_5}, + {TRAINER_ROBERT_1, TRAINER_ROBERT_2, TRAINER_ROBERT_3, TRAINER_ROBERT_4, TRAINER_ROBERT_5}, MAP_GROUP(ROUTE120), MAP_NUM(ROUTE120), }, { - {OPPONENT_LAO_1, OPPONENT_LAO_2, OPPONENT_LAO_3, OPPONENT_LAO_4, OPPONENT_LAO_5}, + {TRAINER_LAO_1, TRAINER_LAO_2, TRAINER_LAO_3, TRAINER_LAO_4, TRAINER_LAO_5}, MAP_GROUP(ROUTE113), MAP_NUM(ROUTE113), }, { - {OPPONENT_CYNDY_1, OPPONENT_CYNDY_2, OPPONENT_CYNDY_3, OPPONENT_CYNDY_4, OPPONENT_CYNDY_5}, + {TRAINER_CYNDY_1, TRAINER_CYNDY_2, TRAINER_CYNDY_3, TRAINER_CYNDY_4, TRAINER_CYNDY_5}, MAP_GROUP(ROUTE115), MAP_NUM(ROUTE115), }, { - {OPPONENT_MADELINE_1, OPPONENT_MADELINE_2, OPPONENT_MADELINE_3, OPPONENT_MADELINE_4, OPPONENT_MADELINE_5}, + {TRAINER_MADELINE_1, TRAINER_MADELINE_2, TRAINER_MADELINE_3, TRAINER_MADELINE_4, TRAINER_MADELINE_5}, MAP_GROUP(ROUTE113), MAP_NUM(ROUTE113), }, { - {OPPONENT_JENNY_1, OPPONENT_JENNY_2, OPPONENT_JENNY_3, OPPONENT_JENNY_4, OPPONENT_JENNY_5}, + {TRAINER_JENNY_1, TRAINER_JENNY_2, TRAINER_JENNY_3, TRAINER_JENNY_4, TRAINER_JENNY_5}, MAP_GROUP(ROUTE124), MAP_NUM(ROUTE124), }, { - {OPPONENT_DIANA_1, OPPONENT_DIANA_2, OPPONENT_DIANA_3, OPPONENT_DIANA_4, OPPONENT_DIANA_5}, + {TRAINER_DIANA_1, TRAINER_DIANA_2, TRAINER_DIANA_3, TRAINER_DIANA_4, TRAINER_DIANA_5}, MAP_GROUP(JAGGED_PASS), MAP_NUM(JAGGED_PASS), }, { - {OPPONENT_AMY_AND_LIV_1, OPPONENT_AMY_AND_LIV_2, OPPONENT_AMY_AND_LIV_4, OPPONENT_AMY_AND_LIV_5, OPPONENT_AMY_AND_LIV_6}, + {TRAINER_AMY_AND_LIV_1, TRAINER_AMY_AND_LIV_2, TRAINER_AMY_AND_LIV_4, TRAINER_AMY_AND_LIV_5, TRAINER_AMY_AND_LIV_6}, MAP_GROUP(ROUTE103), MAP_NUM(ROUTE103), }, { - {OPPONENT_ERNEST_1, OPPONENT_ERNEST_2, OPPONENT_ERNEST_3, OPPONENT_ERNEST_4, OPPONENT_ERNEST_5}, + {TRAINER_ERNEST_1, TRAINER_ERNEST_2, TRAINER_ERNEST_3, TRAINER_ERNEST_4, TRAINER_ERNEST_5}, MAP_GROUP(ROUTE125), MAP_NUM(ROUTE125), }, { - {OPPONENT_EDWIN_1, OPPONENT_EDWIN_2, OPPONENT_EDWIN_3, OPPONENT_EDWIN_4, OPPONENT_EDWIN_5}, + {TRAINER_EDWIN_1, TRAINER_EDWIN_2, TRAINER_EDWIN_3, TRAINER_EDWIN_4, TRAINER_EDWIN_5}, MAP_GROUP(ROUTE110), MAP_NUM(ROUTE110), }, { - {OPPONENT_LYDIA_1, OPPONENT_LYDIA_2, OPPONENT_LYDIA_3, OPPONENT_LYDIA_4, OPPONENT_LYDIA_5}, + {TRAINER_LYDIA_1, TRAINER_LYDIA_2, TRAINER_LYDIA_3, TRAINER_LYDIA_4, TRAINER_LYDIA_5}, MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), }, { - {OPPONENT_ISAAC_1, OPPONENT_ISAAC_2, OPPONENT_ISAAC_3, OPPONENT_ISAAC_4, OPPONENT_ISAAC_5}, + {TRAINER_ISAAC_1, TRAINER_ISAAC_2, TRAINER_ISAAC_3, TRAINER_ISAAC_4, TRAINER_ISAAC_5}, MAP_GROUP(ROUTE117), MAP_NUM(ROUTE117), }, { - {OPPONENT_CATHERINE_1, OPPONENT_CATHERINE_2, OPPONENT_CATHERINE_3, OPPONENT_CATHERINE_4, OPPONENT_CATHERINE_5}, + {TRAINER_CATHERINE_1, TRAINER_CATHERINE_2, TRAINER_CATHERINE_3, TRAINER_CATHERINE_4, TRAINER_CATHERINE_5}, MAP_GROUP(ROUTE119), MAP_NUM(ROUTE119), }, { - {OPPONENT_JACKSON_1, OPPONENT_JACKSON_2, OPPONENT_JACKSON_3, OPPONENT_JACKSON_4, OPPONENT_JACKSON_5}, + {TRAINER_JACKSON_1, TRAINER_JACKSON_2, TRAINER_JACKSON_3, TRAINER_JACKSON_4, TRAINER_JACKSON_5}, MAP_GROUP(ROUTE119), MAP_NUM(ROUTE119), }, { - {OPPONENT_HALEY_1, OPPONENT_HALEY_2, OPPONENT_HALEY_3, OPPONENT_HALEY_4, OPPONENT_HALEY_5}, + {TRAINER_HALEY_1, TRAINER_HALEY_2, TRAINER_HALEY_3, TRAINER_HALEY_4, TRAINER_HALEY_5}, MAP_GROUP(ROUTE104), MAP_NUM(ROUTE104), }, { - {OPPONENT_JAMES_1, OPPONENT_JAMES_2, OPPONENT_JAMES_3, OPPONENT_JAMES_4, OPPONENT_JAMES_5}, + {TRAINER_JAMES_1, TRAINER_JAMES_2, TRAINER_JAMES_3, TRAINER_JAMES_4, TRAINER_JAMES_5}, MAP_GROUP(PETALBURG_WOODS), MAP_NUM(PETALBURG_WOODS), }, { - {OPPONENT_TRENT_1, OPPONENT_TRENT_2, OPPONENT_TRENT_3, OPPONENT_TRENT_4, OPPONENT_TRENT_5}, + {TRAINER_TRENT_1, TRAINER_TRENT_2, TRAINER_TRENT_3, TRAINER_TRENT_4, TRAINER_TRENT_5}, MAP_GROUP(ROUTE112), MAP_NUM(ROUTE112), }, { - {OPPONENT_LOIS_AND_HAL_1, OPPONENT_LOIS_AND_HAL_2, OPPONENT_LOIS_AND_HAL_3, OPPONENT_LOIS_AND_HAL_4, OPPONENT_LOIS_AND_HAL_5}, + {TRAINER_LOIS_AND_HAL_1, TRAINER_LOIS_AND_HAL_2, TRAINER_LOIS_AND_HAL_3, TRAINER_LOIS_AND_HAL_4, TRAINER_LOIS_AND_HAL_5}, MAP_GROUP(ABANDONED_SHIP_ROOMS2_1F), MAP_NUM(ABANDONED_SHIP_ROOMS2_1F), }, { - {OPPONENT_WALLY_3, OPPONENT_WALLY_4, OPPONENT_WALLY_5, OPPONENT_WALLY_6, OPPONENT_NONE}, + {TRAINER_WALLY_3, TRAINER_WALLY_4, TRAINER_WALLY_5, TRAINER_WALLY_6, TRAINER_NONE}, MAP_GROUP(VICTORY_ROAD_1F), MAP_NUM(VICTORY_ROAD_1F), }, @@ -748,7 +748,6 @@ static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons) u8 i; u8 sum; u32 count = numMons; - const void *party; if (gTrainers[opponentId].partySize < count) count = gTrainers[opponentId].partySize; @@ -758,24 +757,36 @@ static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons) switch (gTrainers[opponentId].partyFlags) { case 0: - party = gTrainers[opponentId].party; - for (i = 0; i < count; i++) - sum += ((struct TrainerPartyMember0 *)party)[i].level; + { + const struct TrainerMonNoItemDefaultMoves *party; + party = gTrainers[opponentId].party.NoItemDefaultMoves; + for (i = 0; i < count; i++) + sum += party[i].level; + } break; - case 1: - party = gTrainers[opponentId].party; - for (i = 0; i < count; i++) - sum += ((struct TrainerPartyMember1 *)party)[i].level; + case F_TRAINER_PARTY_CUSTOM_MOVESET: + { + const struct TrainerMonNoItemCustomMoves *party; + party = gTrainers[opponentId].party.NoItemCustomMoves; + for (i = 0; i < count; i++) + sum += party[i].level; + } break; - case 2: - party = gTrainers[opponentId].party; - for (i = 0; i < count; i++) - sum += ((struct TrainerPartyMember2 *)party)[i].level; + case F_TRAINER_PARTY_HELD_ITEM: + { + const struct TrainerMonItemDefaultMoves *party; + party = gTrainers[opponentId].party.ItemDefaultMoves; + for (i = 0; i < count; i++) + sum += party[i].level; + } break; - case 3: - party = gTrainers[opponentId].party; - for (i = 0; i < count; i++) - sum += ((struct TrainerPartyMember3 *)party)[i].level; + case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM: + { + const struct TrainerMonItemCustomMoves *party; + party = gTrainers[opponentId].party.ItemCustomMoves; + for (i = 0; i < count; i++) + sum += party[i].level; + } break; } @@ -809,13 +820,13 @@ static u8 GetTrainerBattleTransition(void) if (trainer[gTrainerBattleOpponent].trainerClass == TRAINER_CLASS_ELITE_FOUR) { - if (gTrainerBattleOpponent == OPPONENT_SIDNEY) + if (gTrainerBattleOpponent == TRAINER_SIDNEY) return B_TRANSITION_SYDNEY; - if (gTrainerBattleOpponent == OPPONENT_PHOEBE) + if (gTrainerBattleOpponent == TRAINER_PHOEBE) return B_TRANSITION_PHOEBE; - if (gTrainerBattleOpponent == OPPONENT_GLACIA) + if (gTrainerBattleOpponent == TRAINER_GLACIA) return B_TRANSITION_GLACIA; - if (gTrainerBattleOpponent == OPPONENT_DRAKE) + if (gTrainerBattleOpponent == TRAINER_DRAKE) return B_TRANSITION_DRAKE; return B_TRANSITION_STEVEN; } diff --git a/src/battle_tower.c b/src/battle_tower.c index 4de8eba1f..7adfc6f7c 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -380,7 +380,9 @@ bool8 ShouldBattleEReaderTrainer(u8 levelType, u16 winStreak) return (numValid == 3); } -bool8 sub_81346F4(void) +// Tries to choose an E-Reader or record-mixing trainer for the next Battle +// Tower trainer opponent. +bool8 ChooseSpecialBattleTowerTrainer(void) { s32 recordIndex, i; u8 battleTowerLevelType; @@ -437,344 +439,78 @@ bool8 sub_81346F4(void) return retVal; } -// void sub_81347F8(void) -// { -// bool8 levelType = gSaveBlock2.battleTower.battleTowerLevelType; -// if (sub_81346F4()) -// { -// SetBattleTowerTrainerGfxId(gSaveBlock2.battleTower.battleTowerTrainerId); -// gSaveBlock2.battleTower.var_4C1[gSaveBlock2.battleTower.curChallengeBattleNum[levelType]] = gSaveBlock2.battleTower.battleTowerTrainerId; -// } -// else -// { -// u16 var1; - -// if (gSaveBlock2.battleTower.curStreakChallengesNum[levelType] > 7) -// { -// while (1) -// { -// s32 i; -// u32 temp = ((Random() & 0xFF) * 30) >> 8; -// var1 = temp + 70; -// for (i = 0; i < gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1 && var1 != gSaveBlock2.battleTower.var_4C1[i]; i++) // TODO: [i + 1]??? -// { } +// Chooses the next battle tower trainer id opponent. It keeps track of the +// trainer who have already been battled in the current 7-battle challenge +// to ensure no duplicates are fought. +void ChooseNextBattleTowerTrainer(void) +{ + int i; + u16 trainerId; + bool8 levelType; -// if (i == gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1) -// { -// break; -// } -// } -// } -// else -// { -// if (gSaveBlock2.battleTower.curChallengeBattleNum[levelType] == 7) -// { -// while (1) -// { -// s32 i; -// u32 temp = ((Random() & 0xFF) * 5); -// u32 temp2 = (((gSaveBlock2.battleTower.curStreakChallengesNum[levelType] - 1) * 10) + 20); -// var1 = temp / 128 + temp2; -// for (i = 0; i < gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1 && gSaveBlock2.battleTower.var_4C1[i] != var1; i++) // TODO: [i + 1]???? -// { } - -// if (i == gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1) -// { -// break; -// } -// } -// } -// else -// { -// while (1) -// { -// s32 i; -// u32 temp = ((Random() & 0xFF) * 320); -// u32 temp2 = ((gSaveBlock2.battleTower.curStreakChallengesNum[levelType] - 1) * 10); -// var1 = temp + temp2; -// for (i = 0; i < gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1 && gSaveBlock2.battleTower.var_4C1[i] != var1; i++) -// { } - -// if (i == gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1) -// { -// break; -// } -// } -// } -// } + levelType = gSaveBlock2.battleTower.battleTowerLevelType; + if (ChooseSpecialBattleTowerTrainer()) + { + SetBattleTowerTrainerGfxId(gSaveBlock2.battleTower.battleTowerTrainerId); + gSaveBlock2.battleTower.battledTrainerIds[gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1] = gSaveBlock2.battleTower.battleTowerTrainerId; + return; + } -// gSaveBlock2.battleTower.battleTowerTrainerId = var1; -// SetBattleTowerTrainerGfxId(gSaveBlock2.battleTower.battleTowerTrainerId); + if (gSaveBlock2.battleTower.curStreakChallengesNum[levelType] <= 7) + { + if (gSaveBlock2.battleTower.curChallengeBattleNum[levelType] == 7) + { + while (1) + { + trainerId = ((Random() & 0xFF) * 5) >> 7; + trainerId += (gSaveBlock2.battleTower.curStreakChallengesNum[levelType] - 1) * 10 + 20; + + // Ensure trainer wasn't previously fought in this challenge. + for (i = 0; i < gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1 && gSaveBlock2.battleTower.battledTrainerIds[i] != trainerId; i++); + if (i == gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1) + { + gSaveBlock2.battleTower.battleTowerTrainerId = trainerId; + break; + } + } + } + else + { + while (1) + { + trainerId = (((Random() & 0xFF) * 5) >> 6); + trainerId += (gSaveBlock2.battleTower.curStreakChallengesNum[levelType] - 1) * 10; + + // Ensure trainer wasn't previously fought in this challenge. + for (i = 0; i < gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1 && gSaveBlock2.battleTower.battledTrainerIds[i] != trainerId; i++); + if (i == gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1) + { + gSaveBlock2.battleTower.battleTowerTrainerId = trainerId; + break; + } + } + } + } + else + { + while (1) + { + trainerId = (((Random() & 0xFF) * 30) >> 8) + 70; -// if (gSaveBlock2.battleTower.curChallengeBattleNum[levelType] < 7) -// { -// gSaveBlock2.battleTower.var_4C1[gSaveBlock2.battleTower.curChallengeBattleNum[levelType]] = gSaveBlock2.battleTower.battleTowerTrainerId; -// } -// } -// } + // Ensure trainer wasn't previously fought in this challenge. + for (i = 0; i < gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1 && gSaveBlock2.battleTower.battledTrainerIds[i] != trainerId; i++); + if (i == gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1) + { + gSaveBlock2.battleTower.battleTowerTrainerId = trainerId; + break; + } + } + } -NAKED -void sub_81347F8(void) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - ldr r5, _08134838 @ =gSaveBlock2\n\ - ldr r1, _0813483C @ =0x00000554\n\ - adds r0, r5, r1\n\ - ldrb r0, [r0]\n\ - lsls r0, 31\n\ - lsrs r6, r0, 31\n\ - bl sub_81346F4\n\ - lsls r0, 24\n\ - cmp r0, 0\n\ - beq _08134848\n\ - ldr r2, _08134840 @ =0x00000564\n\ - adds r4, r5, r2\n\ - ldrb r0, [r4]\n\ - bl SetBattleTowerTrainerGfxId\n\ - lsls r0, r6, 1\n\ - movs r3, 0xAB\n\ - lsls r3, 3\n\ - adds r1, r5, r3\n\ - adds r0, r1\n\ - ldrh r0, [r0]\n\ - adds r0, r5, r0\n\ - ldr r1, _08134844 @ =0x00000569\n\ - adds r0, r1\n\ - ldrb r1, [r4]\n\ - b _081349DC\n\ - .align 2, 0\n\ -_08134838: .4byte gSaveBlock2\n\ -_0813483C: .4byte 0x00000554\n\ -_08134840: .4byte 0x00000564\n\ -_08134844: .4byte 0x00000569\n\ -_08134848:\n\ - lsls r0, r6, 1\n\ - ldr r2, _081348D8 @ =0x0000055c\n\ - adds r1, r5, r2\n\ - adds r1, r0, r1\n\ - ldrh r1, [r1]\n\ - adds r7, r0, 0\n\ - cmp r1, 0x7\n\ - bls _0813485A\n\ - b _0813495C\n\ -_0813485A:\n\ - movs r3, 0xAB\n\ - lsls r3, 3\n\ - adds r0, r5, r3\n\ - adds r1, r7, r0\n\ - ldrh r0, [r1]\n\ - cmp r0, 0x7\n\ - bne _081348E4\n\ - adds r6, r5, 0\n\ - mov r9, r7\n\ - adds r5, r1, 0\n\ - ldr r0, _081348DC @ =0x0000056a\n\ - adds r0, r6\n\ - mov r10, r0\n\ - mov r8, r5\n\ -_08134876:\n\ - bl Random\n\ - movs r1, 0xFF\n\ - ands r1, r0\n\ - lsls r2, r1, 2\n\ - adds r2, r1\n\ - ldr r1, _081348D8 @ =0x0000055c\n\ - adds r4, r6, r1\n\ - mov r3, r9\n\ - adds r0, r3, r4\n\ - ldrh r1, [r0]\n\ - subs r1, 0x1\n\ - lsls r0, r1, 2\n\ - adds r0, r1\n\ - lsls r0, 1\n\ - adds r0, 0x14\n\ - lsrs r2, 7\n\ - adds r2, r0\n\ - lsls r2, 16\n\ - lsrs r2, 16\n\ - movs r1, 0\n\ - ldrh r0, [r5]\n\ - subs r0, 0x1\n\ - cmp r1, r0\n\ - bge _081348C8\n\ - mov r3, r10\n\ - ldrb r0, [r3]\n\ - cmp r0, r2\n\ - beq _081348C8\n\ - subs r0, r4, 0x4\n\ - adds r0, r7, r0\n\ - ldrh r0, [r0]\n\ - subs r3, r0, 0x1\n\ - adds r4, 0xE\n\ -_081348BA:\n\ - adds r1, 0x1\n\ - cmp r1, r3\n\ - bge _081348C8\n\ - adds r0, r1, r4\n\ - ldrb r0, [r0]\n\ - cmp r0, r2\n\ - bne _081348BA\n\ -_081348C8:\n\ - mov r3, r8\n\ - ldrh r0, [r3]\n\ - subs r0, 0x1\n\ - ldr r4, _081348E0 @ =gSaveBlock2\n\ - cmp r1, r0\n\ - bne _08134876\n\ - b _081349B6\n\ - .align 2, 0\n\ -_081348D8: .4byte 0x0000055c\n\ -_081348DC: .4byte 0x0000056a\n\ -_081348E0: .4byte gSaveBlock2\n\ -_081348E4:\n\ - adds r6, r5, 0\n\ - mov r9, r7\n\ - adds r5, r1, 0\n\ - ldr r2, _08134950 @ =0x0000056a\n\ - adds r2, r6\n\ - mov r10, r2\n\ - mov r8, r5\n\ -_081348F2:\n\ - bl Random\n\ - movs r1, 0xFF\n\ - ands r1, r0\n\ - lsls r0, r1, 2\n\ - adds r0, r1\n\ - lsrs r2, r0, 6\n\ - ldr r3, _08134954 @ =0x0000055c\n\ - adds r4, r6, r3\n\ - mov r1, r9\n\ - adds r0, r1, r4\n\ - ldrh r1, [r0]\n\ - subs r1, 0x1\n\ - lsls r0, r1, 2\n\ - adds r0, r1\n\ - lsls r0, 1\n\ - adds r0, r2, r0\n\ - lsls r0, 16\n\ - lsrs r2, r0, 16\n\ - movs r1, 0\n\ - ldrh r0, [r5]\n\ - subs r0, 0x1\n\ - cmp r1, r0\n\ - bge _08134942\n\ - mov r3, r10\n\ - ldrb r0, [r3]\n\ - cmp r0, r2\n\ - beq _08134942\n\ - subs r0, r4, 0x4\n\ - adds r0, r7, r0\n\ - ldrh r0, [r0]\n\ - subs r3, r0, 0x1\n\ - adds r4, 0xE\n\ -_08134934:\n\ - adds r1, 0x1\n\ - cmp r1, r3\n\ - bge _08134942\n\ - adds r0, r1, r4\n\ - ldrb r0, [r0]\n\ - cmp r0, r2\n\ - bne _08134934\n\ -_08134942:\n\ - mov r3, r8\n\ - ldrh r0, [r3]\n\ - subs r0, 0x1\n\ - ldr r4, _08134958 @ =gSaveBlock2\n\ - cmp r1, r0\n\ - bne _081348F2\n\ - b _081349B6\n\ - .align 2, 0\n\ -_08134950: .4byte 0x0000056a\n\ -_08134954: .4byte 0x0000055c\n\ -_08134958: .4byte gSaveBlock2\n\ -_0813495C:\n\ - movs r2, 0xAB\n\ - lsls r2, 3\n\ - adds r0, r5, r2\n\ - adds r6, r7, r0\n\ - ldr r3, _081349EC @ =0x0000056a\n\ - adds r3, r5\n\ - mov r8, r3\n\ - adds r5, r6, 0\n\ -_0813496C:\n\ - bl Random\n\ - movs r1, 0xFF\n\ - ands r1, r0\n\ - lsls r0, r1, 4\n\ - subs r0, r1\n\ - lsls r0, 1\n\ - asrs r0, 8\n\ - adds r0, 0x46\n\ - lsls r0, 16\n\ - lsrs r2, r0, 16\n\ - movs r1, 0\n\ - ldrh r0, [r6]\n\ - subs r0, 0x1\n\ - cmp r1, r0\n\ - bge _081349AC\n\ - mov r3, r8\n\ - ldrb r0, [r3]\n\ - ldr r4, _081349F0 @ =gSaveBlock2\n\ - cmp r0, r2\n\ - beq _081349AC\n\ - ldrh r0, [r5]\n\ - subs r3, r0, 0x1\n\ - ldr r0, _081349EC @ =0x0000056a\n\ - adds r4, r0\n\ -_0813499E:\n\ - adds r1, 0x1\n\ - cmp r1, r3\n\ - bge _081349AC\n\ - adds r0, r1, r4\n\ - ldrb r0, [r0]\n\ - cmp r0, r2\n\ - bne _0813499E\n\ -_081349AC:\n\ - ldrh r0, [r6]\n\ - subs r0, 0x1\n\ - ldr r4, _081349F0 @ =gSaveBlock2\n\ - cmp r1, r0\n\ - bne _0813496C\n\ -_081349B6:\n\ - ldr r1, _081349F4 @ =0x00000564\n\ - adds r0, r4, r1\n\ - strb r2, [r0]\n\ - ldr r2, _081349F4 @ =0x00000564\n\ - adds r5, r4, r2\n\ - ldrb r0, [r5]\n\ - bl SetBattleTowerTrainerGfxId\n\ - movs r3, 0xAB\n\ - lsls r3, 3\n\ - adds r0, r4, r3\n\ - adds r1, r7, r0\n\ - ldrh r0, [r1]\n\ - cmp r0, 0x6\n\ - bhi _081349DE\n\ - adds r0, r4, r0\n\ - ldr r1, _081349F8 @ =0x00000569\n\ - adds r0, r1\n\ - ldrb r1, [r5]\n\ -_081349DC:\n\ - strb r1, [r0]\n\ -_081349DE:\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_081349EC: .4byte 0x0000056a\n\ -_081349F0: .4byte gSaveBlock2\n\ -_081349F4: .4byte 0x00000564\n\ -_081349F8: .4byte 0x00000569\n\ -.syntax divided\n"); + SetBattleTowerTrainerGfxId(gSaveBlock2.battleTower.battleTowerTrainerId); + // Don't bother saving this trainer, since it's the last one in the challenge. + if (gSaveBlock2.battleTower.curChallengeBattleNum[levelType] < 7) + gSaveBlock2.battleTower.battledTrainerIds[gSaveBlock2.battleTower.curChallengeBattleNum[levelType] - 1] = gSaveBlock2.battleTower.battleTowerTrainerId; } void SetBattleTowerTrainerGfxId(u8 trainerIndex) diff --git a/src/contest_painting_effects.c b/src/contest_painting_effects.c index b07319048..ae89df88e 100644 --- a/src/contest_painting_effects.c +++ b/src/contest_painting_effects.c @@ -3,6 +3,7 @@ #include "contest_painting.h" extern u16 (*gUnknown_03005DEC)[][32]; +extern u8 gUnknown_083E7A50[][3]; extern u8 gUnknown_03005E00; extern u8 gUnknown_03005DFC; extern u8 gUnknown_03005DF8; @@ -26,8 +27,15 @@ void sub_80FCC18(u8); void sub_80FC92C(u8); void sub_80FC9E4(u8); void sub_80FD1C8(u16); -u16 sub_80FD39C(u16*); +u16 ConvertColorToGrayscale(u16*); u16 sub_80FD68C(u16*, u16*, u16*); +u16 ConvertCoolColor(u16*, u8); +u16 ConvertToBlackOrWhite(u16*); +u16 sub_80FD50C(u16*, u16*); +u16 InvertColor(u16*); +u16 sub_80FD7AC(u16*, u16*, u16*); +u16 sub_80FD568(u16*, u16*); +u16 GetCoolColorFromPersonality(u8); void sub_80FC7A0(struct Unk03005E20* info) { @@ -152,13 +160,594 @@ void sub_80FCAC4(void) for (i = 0; i < gUnknown_03005DF0; i++) { u16* var2 = &(*gUnknown_03005DEC)[0][(gUnknown_03005DFC + i) * gUnknown_03005E04]; - u16* pal = &var2[gUnknown_03005DE8]; - for (j = 0; j < gUnknown_03005DF8; j++, pal++) + u16* color = &var2[gUnknown_03005DE8]; + for (j = 0; j < gUnknown_03005DF8; j++, color++) { - if (!(0x8000 & *pal)) + if (!(0x8000 & *color)) + { + *color = ConvertColorToGrayscale(color); + } + } + } +} + +void sub_80FCB5C(void) +{ + u8 i, j; + for (i = 0; i < gUnknown_03005DF8; i++) + { + u16* var0 = &(*gUnknown_03005DEC)[0][gUnknown_03005DFC * gUnknown_03005E04]; + u16* palette = &var0[gUnknown_03005DE8 + i]; + u16 color = *palette; + j = 1; + palette += gUnknown_03005E04; + while (j < gUnknown_03005DF0 - 1) + { + if (!(0x8000 & *palette)) + { + *palette = sub_80FD68C(&color, palette, palette + gUnknown_03005E04); + color = *palette; + } + + j++; + palette += gUnknown_03005E04; + } + } +} + +void sub_80FCC18(u8 arg0) +{ + u8 i, j; + for (i = 0; i < gUnknown_03005DF0; i++) + { + u16* var0 = &(*gUnknown_03005DEC)[0][(gUnknown_03005DFC + i) * gUnknown_03005E04]; + u16* color = &var0[gUnknown_03005DE8]; + for (j = 0; j < gUnknown_03005DF8; j++, color++) + { + if (!(0x8000 & *color)) + { + *color = ConvertCoolColor(color, arg0); + } + } + } +} + +void sub_80FCCBC(void) +{ + u8 i, j; + for (i = 0; i < gUnknown_03005DF0; i++) + { + u16* var0 = &(*gUnknown_03005DEC)[0][(gUnknown_03005DFC + i) * gUnknown_03005E04]; + u16* color = &var0[gUnknown_03005DE8]; + for (j = 0; j < gUnknown_03005DF8; j++, color++) + { + if (!(0x8000 & *color)) + { + *color = ConvertToBlackOrWhite(color); + } + } + } +} + +void sub_80FCD54(void) +{ + u8 i, j; + u16 *palette; + + for (i = 0; i < gUnknown_03005DF0; i++) + { + u16* var0 = &(*gUnknown_03005DEC)[0][(gUnknown_03005DFC + i) * gUnknown_03005E04]; + palette = &var0[gUnknown_03005DE8]; + *palette = sub_80FD50C(palette, palette + 1); + for (j = 1, palette = palette + 1; j < gUnknown_03005DF8 - 1; j++, palette++) + { + *palette = sub_80FD50C(palette, palette + 1); + *palette = sub_80FD50C(palette, palette - 1); + } + + *palette = sub_80FD50C(palette, palette - 1); + } + + for (j = 0; j < gUnknown_03005DF8; j++) + { + u16* var0 = &(*gUnknown_03005DEC)[0][gUnknown_03005DFC * gUnknown_03005E04]; + palette = &var0[gUnknown_03005DE8 + j]; + *palette = sub_80FD50C(palette, palette + gUnknown_03005E04); + for (i = 1, palette = palette + gUnknown_03005E04; i < gUnknown_03005DF0 - 1; i++, palette += gUnknown_03005E04) + { + *palette = sub_80FD50C(palette, palette + gUnknown_03005E04); + *palette = sub_80FD50C(palette, palette - gUnknown_03005E04); + } + + *palette = sub_80FD50C(palette, palette - gUnknown_03005E04); + } +} + +void sub_80FCEA4(void) +{ + u8 i, j; + for (i = 0; i < gUnknown_03005DF0; i++) + { + u16* var0 = &(*gUnknown_03005DEC)[0][(gUnknown_03005DFC + i) * gUnknown_03005E04]; + u16* color = &var0[gUnknown_03005DE8]; + for (j = 0; j < gUnknown_03005DF8; j++, color++) + { + if (!(0x8000 & *color)) + { + *color = InvertColor(color); + } + } + } +} + +void sub_80FCF3C(void) +{ + u8 i, j; + u16 *palette; + u16 color; + + palette = (*gUnknown_03005DEC)[0]; + for (i = 0; i < 64; i++) + { + for (j = 0; j < 64; j++, palette++) + { + if (!(0x8000 & *palette)) + { + *palette = InvertColor(palette); + } + } + } + + for (j = 0; j < 64; j++) + { + palette = &(*gUnknown_03005DEC)[0][j]; + color = *palette; + *palette = 0x8000; + for (i = 1, palette += 64; i < 63; i++, palette += 64) + { + if (!(0x8000 & *palette)) + { + *palette = sub_80FD7AC(&color, palette, palette + 64); + color = *palette; + } + } + + *palette = 0x8000; + palette = &(*gUnknown_03005DEC)[0][j]; + color = *palette; + *palette = 0x8000; + for (i = 1, palette += 64; i < 63; i++, palette += 64) + { + if (!(0x8000 & *palette)) + { + *palette = sub_80FD7AC(&color, palette, palette + 64); + color = *palette; + } + } + + *palette = 0x8000; + } + + palette = (*gUnknown_03005DEC)[0]; + for (i = 0; i < 64; i++) + { + for (j = 0; j < 64; j++, palette++) + { + if (!(0x8000 & *palette)) + { + *palette = InvertColor(palette); + } + } + } +} + +void sub_80FD06C(void) +{ + u8 i, j; + for (i = 0; i < gUnknown_03005DF0; i++) + { + u16* var0 = &(*gUnknown_03005DEC)[0][(gUnknown_03005DFC + i) * gUnknown_03005E04]; + u16* palette = &var0[gUnknown_03005DE8]; + u16 color = *palette; + for (j = 1, palette++; j < gUnknown_03005DF8 - 1; j++, palette++) + { + if (!(0x8000 & *palette)) + { + *palette = sub_80FD568(&color, palette); + color = *palette; + } + } + } +} + +void sub_80FD114(void) +{ + u8 i, j; + for (i = 0; i < gUnknown_03005DF8; i++) + { + u16* var0 = &(*gUnknown_03005DEC)[0][gUnknown_03005DFC * gUnknown_03005E04]; + u16* palette = &var0[gUnknown_03005DE8 + i]; + u16 color = *palette; + for (j = 1, palette += gUnknown_03005E04; j < gUnknown_03005DF0 - 1; j++, palette += gUnknown_03005E04) + { + if (!(0x8000 & *palette)) { - *pal = sub_80FD39C(pal); + *palette = sub_80FD568(&color, palette); + color = *palette; } } } } + +NAKED +void sub_80FD1C8(u16 arg0) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r10\n\ + mov r6, r9\n\ + mov r5, r8\n\ + push {r5-r7}\n\ + sub sp, 0x20\n\ + lsls r0, 16\n\ + lsrs r0, 16\n\ + mov r10, r0\n\ + mov r2, sp\n\ + ldr r3, _080FD234 @ =gUnknown_083E7A50\n\ + lsls r1, r0, 1\n\ + add r1, r10\n\ + adds r0, r1, r3\n\ + ldrb r0, [r0]\n\ + strb r0, [r2]\n\ + adds r0, r3, 0x1\n\ + adds r0, r1, r0\n\ + ldrb r0, [r0]\n\ + strb r0, [r2, 0x1]\n\ + mov r5, sp\n\ + adds r0, r3, 0x2\n\ + adds r1, r0\n\ + ldrb r4, [r1]\n\ + lsls r2, r4, 24\n\ + lsrs r1, r2, 27\n\ + movs r0, 0x7\n\ + ands r1, r0\n\ + strh r1, [r5, 0x2]\n\ + lsrs r2, 25\n\ + mov r9, r2\n\ + movs r0, 0x3\n\ + ands r2, r0\n\ + mov r9, r2\n\ + movs r5, 0x1\n\ + ands r5, r4\n\ + movs r4, 0x1\n\ + mov r8, r4\n\ + cmp r8, r1\n\ + bcs _080FD27A\n\ + mov r3, sp\n\ +_080FD21A:\n\ + cmp r5, 0\n\ + bne _080FD238\n\ + mov r0, r8\n\ + lsls r2, r0, 2\n\ + mov r4, sp\n\ + adds r1, r4, r2\n\ + ldrb r0, [r3]\n\ + mov r4, r8\n\ + subs r0, r4\n\ + strb r0, [r1]\n\ + ldrb r0, [r3, 0x1]\n\ + add r0, r8\n\ + b _080FD24A\n\ + .align 2, 0\n\ +_080FD234: .4byte gUnknown_083E7A50\n\ +_080FD238:\n\ + mov r0, r8\n\ + lsls r2, r0, 2\n\ + mov r4, sp\n\ + adds r1, r4, r2\n\ + ldrb r0, [r3]\n\ + adds r0, 0x1\n\ + strb r0, [r1]\n\ + ldrb r0, [r3, 0x1]\n\ + subs r0, 0x1\n\ +_080FD24A:\n\ + strb r0, [r1, 0x1]\n\ + add r2, sp\n\ + ldrb r0, [r2]\n\ + cmp r0, 0x3F\n\ + bhi _080FD25A\n\ + ldrb r0, [r2, 0x1]\n\ + cmp r0, 0x3F\n\ + bls _080FD262\n\ +_080FD25A:\n\ + mov r0, r8\n\ + subs r0, 0x1\n\ + strh r0, [r3, 0x2]\n\ + b _080FD27A\n\ +_080FD262:\n\ + ldrh r0, [r3, 0x2]\n\ + mov r1, r8\n\ + subs r0, r1\n\ + strh r0, [r2, 0x2]\n\ + mov r0, r8\n\ + adds r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r8, r0\n\ + ldrh r0, [r3, 0x2]\n\ + cmp r8, r0\n\ + bcc _080FD21A\n\ +_080FD27A:\n\ + movs r2, 0\n\ + mov r8, r2\n\ + mov r0, sp\n\ + ldrh r0, [r0, 0x2]\n\ + cmp r8, r0\n\ + bcc _080FD288\n\ + b _080FD38A\n\ +_080FD288:\n\ + movs r3, 0x1F\n\ +_080FD28A:\n\ + ldr r1, _080FD2E8 @ =gUnknown_03005DEC\n\ + mov r4, r8\n\ + lsls r0, r4, 2\n\ + mov r2, sp\n\ + adds r6, r2, r0\n\ + ldrb r0, [r6, 0x1]\n\ + lsls r0, 7\n\ + ldr r1, [r1]\n\ + adds r1, r0\n\ + ldrb r0, [r6]\n\ + lsls r0, 1\n\ + adds r2, r1, r0\n\ + ldrh r1, [r2]\n\ + movs r4, 0x80\n\ + lsls r4, 8\n\ + adds r0, r4, 0\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _080FD376\n\ + movs r7, 0x1F\n\ + ands r7, r1\n\ + lsls r0, r1, 16\n\ + lsrs r5, r0, 21\n\ + ands r5, r3\n\ + lsrs r4, r0, 26\n\ + ands r4, r3\n\ + mov r0, r9\n\ + cmp r0, 0\n\ + blt _080FD36C\n\ + cmp r0, 0x1\n\ + ble _080FD2EC\n\ + cmp r0, 0x3\n\ + bgt _080FD36C\n\ + ldrh r0, [r6, 0x2]\n\ + adds r1, r7, r0\n\ + lsls r1, 16\n\ + lsrs r7, r1, 16\n\ + adds r1, r5, r0\n\ + lsls r1, 16\n\ + lsrs r5, r1, 16\n\ + adds r0, r4, r0\n\ + lsls r0, 16\n\ + lsrs r4, r0, 16\n\ + cmp r7, 0x1F\n\ + bls _080FD360\n\ + movs r7, 0x1F\n\ + b _080FD360\n\ + .align 2, 0\n\ +_080FD2E8: .4byte gUnknown_03005DEC\n\ +_080FD2EC:\n\ + mov r1, r10\n\ + lsls r0, r1, 1\n\ + add r0, r10\n\ + ldr r1, _080FD320 @ =gUnknown_083E7A50\n\ + adds r1, 0x2\n\ + adds r0, r1\n\ + ldrb r0, [r0]\n\ + lsrs r0, 3\n\ + movs r1, 0x7\n\ + ands r0, r1\n\ + movs r1, 0x3\n\ + str r2, [sp, 0x18]\n\ + str r3, [sp, 0x1C]\n\ + bl __umodsi3\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + ldr r2, [sp, 0x18]\n\ + ldr r3, [sp, 0x1C]\n\ + cmp r0, 0x1\n\ + beq _080FD33C\n\ + cmp r0, 0x1\n\ + bgt _080FD324\n\ + cmp r0, 0\n\ + beq _080FD32A\n\ + b _080FD36C\n\ + .align 2, 0\n\ +_080FD320: .4byte gUnknown_083E7A50\n\ +_080FD324:\n\ + cmp r0, 0x2\n\ + beq _080FD34E\n\ + b _080FD36C\n\ +_080FD32A:\n\ + ldrh r0, [r6, 0x2]\n\ + cmp r7, r0\n\ + bcc _080FD338\n\ + subs r0, r7, r0\n\ + lsls r0, 16\n\ + lsrs r7, r0, 16\n\ + b _080FD36C\n\ +_080FD338:\n\ + movs r7, 0\n\ + b _080FD36C\n\ +_080FD33C:\n\ + ldrh r0, [r6, 0x2]\n\ + cmp r5, r0\n\ + bcc _080FD34A\n\ + subs r0, r5, r0\n\ + lsls r0, 16\n\ + lsrs r5, r0, 16\n\ + b _080FD36C\n\ +_080FD34A:\n\ + movs r5, 0\n\ + b _080FD36C\n\ +_080FD34E:\n\ + ldrh r0, [r6, 0x2]\n\ + cmp r4, r0\n\ + bcc _080FD35C\n\ + subs r0, r4, r0\n\ + lsls r0, 16\n\ + lsrs r4, r0, 16\n\ + b _080FD36C\n\ +_080FD35C:\n\ + movs r4, 0\n\ + b _080FD36C\n\ +_080FD360:\n\ + cmp r5, 0x1F\n\ + bls _080FD366\n\ + movs r5, 0x1F\n\ +_080FD366:\n\ + cmp r4, 0x1F\n\ + bls _080FD36C\n\ + movs r4, 0x1F\n\ +_080FD36C:\n\ + lsls r0, r4, 10\n\ + lsls r1, r5, 5\n\ + orrs r0, r1\n\ + orrs r7, r0\n\ + strh r7, [r2]\n\ +_080FD376:\n\ + mov r0, r8\n\ + adds r0, 0x1\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + mov r8, r0\n\ + mov r0, sp\n\ + ldrh r0, [r0, 0x2]\n\ + cmp r8, r0\n\ + bcs _080FD38A\n\ + b _080FD28A\n\ +_080FD38A:\n\ + add sp, 0x20\n\ + pop {r3-r5}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + mov r10, r5\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided\n"); +} + +u16 ConvertColorToGrayscale(u16 *color) +{ + u16 red = *color & 0x1F; + u16 green = (*color >> 5) & 0x1F; + u16 blue = (*color >> 10) & 0x1F; + u16 average = (red + green + blue) / 3; + return RGB2(average, average, average); +} + +// The dark colors are the colored edges of the Cool painting effect. +// Everything else is white. +u16 ConvertCoolColor(u16 *color, u8 personality) +{ + u16 red = *color & 0x1F; + u16 green = (*color >> 5) & 0x1F; + u16 blue = (*color >> 10) & 0x1F; + if (red < 17 && green < 17 && blue < 17) + return GetCoolColorFromPersonality(personality); + else + return RGB2(31, 31, 31); +} + +// Based on the given value, which comes from the first 8 bits of +// the mon's personality value, return a color. +u16 GetCoolColorFromPersonality(u8 personality) +{ + u16 red = 0; + u16 green = 0; + u16 blue = 0; + u8 strength = (personality / 6) % 3; + u8 colorType = personality % 6; + + switch (colorType) + { + case 0: + // Teal color + green = 21 - strength; + blue = green; + red = 0; + break; + case 1: + // Yellow color + blue = 0; + red = 21 - strength; + green = red; + break; + case 2: + // Purple color + blue = 21 - strength; + green = 0; + red = blue; + break; + case 3: + // Red color + blue = 0; + green = 0; + red = 23 - strength; + break; + case 4: + // Blue color + blue = 23 - strength; + green = 0; + red = 0; + break; + case 5: + // Green color + blue = 0; + green = 23 - strength; + red = 0; + break; + } + + return RGB2(red, green, blue); +} + +u16 ConvertToBlackOrWhite(u16 *color) +{ + u16 red = *color & 0x1F; + u16 green = (*color >> 5) & 0x1F; + u16 blue = (*color >> 10) & 0x1F; + if (red < 17 && green < 17 && blue < 17) + return RGB2(0, 0, 0); + else + return RGB2(31, 31, 31); +} + +u16 sub_80FD50C(u16 *colorA, u16 *colorB) +{ + if (*colorA) + { + if (*colorA & 0x8000) + return 0x8000; + if (*colorB & 0x8000) + return RGB2(0, 0, 0); + + return *colorA; + } + + return RGB2(0, 0, 0); +} + +u16 InvertColor(u16 *color) +{ + u16 red = *color & 0x1F; + u16 green = (*color >> 5) & 0x1F; + u16 blue = (*color >> 10) & 0x1F; + red = 31 - red; + green = 31 - green; + blue = 31 - blue; + + return RGB2(red, green, blue); +} diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h index ad6b052df..5bd2a0f99 100644 --- a/src/data/trainer_parties.h +++ b/src/data/trainer_parties.h @@ -1,4 +1,4 @@ -const struct TrainerPartyMember0 gTrainerParty_Archie1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Archie1[] = { { .iv = 0, .level = 17, @@ -11,7 +11,7 @@ const struct TrainerPartyMember0 gTrainerParty_Archie1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt1[] = { { .iv = 0, .level = 32, @@ -24,7 +24,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt2[] = { { .iv = 0, .level = 30, @@ -47,7 +47,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt3[] = { { .iv = 0, .level = 32, @@ -60,7 +60,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt4[] = { { .iv = 0, .level = 33, @@ -68,7 +68,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt5[] = { { .iv = 0, .level = 37, @@ -81,7 +81,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt6[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt6[] = { { .iv = 0, .level = 38, @@ -89,7 +89,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt6[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt7[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt7[] = { { .iv = 0, .level = 36, @@ -107,7 +107,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt7[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt8[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt8[] = { { .iv = 0, .level = 17, @@ -115,7 +115,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt8[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt9[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt9[] = { { .iv = 0, .level = 9, @@ -123,7 +123,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt9[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt10[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt10[] = { { .iv = 0, .level = 9, @@ -136,7 +136,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt10[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt11[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt11[] = { { .iv = 0, .level = 16, @@ -149,7 +149,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt11[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt12[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt12[] = { { .iv = 0, .level = 16, @@ -162,7 +162,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt12[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt13[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt13[] = { { .iv = 0, .level = 20, @@ -175,7 +175,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt13[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt14[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt14[] = { { .iv = 0, .level = 17, @@ -188,7 +188,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt14[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt15[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt15[] = { { .iv = 0, .level = 11, @@ -196,7 +196,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt15[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt16[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt16[] = { { .iv = 0, .level = 27, @@ -209,7 +209,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt16[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt17[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt17[] = { { .iv = 0, .level = 27, @@ -222,7 +222,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt17[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt18[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt18[] = { { .iv = 0, .level = 26, @@ -240,7 +240,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt18[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt19[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt19[] = { { .iv = 0, .level = 15, @@ -248,7 +248,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt19[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt20[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt20[] = { { .iv = 0, .level = 14, @@ -261,7 +261,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt20[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt21[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt21[] = { { .iv = 0, .level = 17, @@ -269,7 +269,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt21[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt22[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt22[] = { { .iv = 0, .level = 30, @@ -287,7 +287,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt22[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt23[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt23[] = { { .iv = 0, .level = 31, @@ -300,7 +300,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt23[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt24[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt24[] = { { .iv = 0, .level = 31, @@ -313,7 +313,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt24[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt25[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt25[] = { { .iv = 0, .level = 28, @@ -321,7 +321,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt25[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt26[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt26[] = { { .iv = 0, .level = 31, @@ -339,7 +339,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt26[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt27[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt27[] = { { .iv = 0, .level = 33, @@ -347,7 +347,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt27[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous1[] = { { .iv = 50, .level = 30, @@ -360,7 +360,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Matt1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matt1[] = { { .iv = 50, .level = 32, @@ -378,7 +378,7 @@ const struct TrainerPartyMember0 gTrainerParty_Matt1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Matt2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matt2[] = { { .iv = 50, .level = 20, @@ -396,7 +396,7 @@ const struct TrainerPartyMember0 gTrainerParty_Matt2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shelly1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelly1[] = { { .iv = 50, .level = 28, @@ -409,7 +409,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelly1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shelly2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelly2[] = { { .iv = 50, .level = 38, @@ -422,7 +422,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelly2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Archie2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Archie2[] = { { .iv = 150, .level = 41, @@ -440,7 +440,7 @@ const struct TrainerPartyMember0 gTrainerParty_Archie2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Archie3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Archie3[] = { { .iv = 150, .level = 24, @@ -458,7 +458,7 @@ const struct TrainerPartyMember0 gTrainerParty_Archie3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Daisy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Daisy[] = { { .iv = 0, .level = 16, @@ -466,7 +466,7 @@ const struct TrainerPartyMember0 gTrainerParty_Daisy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Rose1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose1[] = { { .iv = 0, .level = 16, @@ -479,7 +479,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rose1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lily[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lily[] = { { .iv = 0, .level = 17, @@ -492,7 +492,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lily[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Violet[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Violet[] = { { .iv = 0, .level = 25, @@ -510,7 +510,7 @@ const struct TrainerPartyMember0 gTrainerParty_Violet[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Rose2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose2[] = { { .iv = 10, .level = 26, @@ -523,7 +523,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rose2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Rose3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose3[] = { { .iv = 20, .level = 28, @@ -541,7 +541,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rose3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Rose4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose4[] = { { .iv = 30, .level = 31, @@ -559,7 +559,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rose4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Rose5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rose5[] = { { .iv = 40, .level = 34, @@ -577,7 +577,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rose5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Dusty1[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty1[] = { { .iv = 50, .level = 24, @@ -586,7 +586,7 @@ const struct TrainerPartyMember1 gTrainerParty_Dusty1[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Chip[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Chip[] = { { .iv = 50, .level = 28, @@ -607,7 +607,7 @@ const struct TrainerPartyMember1 gTrainerParty_Chip[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Foster[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Foster[] = { { .iv = 50, .level = 26, @@ -622,7 +622,7 @@ const struct TrainerPartyMember1 gTrainerParty_Foster[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Dusty2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty2[] = { { .iv = 60, .level = 27, @@ -631,7 +631,7 @@ const struct TrainerPartyMember1 gTrainerParty_Dusty2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Dusty3[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty3[] = { { .iv = 70, .level = 30, @@ -640,7 +640,7 @@ const struct TrainerPartyMember1 gTrainerParty_Dusty3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Dusty4[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty4[] = { { .iv = 80, .level = 33, @@ -649,7 +649,7 @@ const struct TrainerPartyMember1 gTrainerParty_Dusty4[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Dusty5[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Dusty5[] = { { .iv = 90, .level = 36, @@ -658,7 +658,7 @@ const struct TrainerPartyMember1 gTrainerParty_Dusty5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy1[] = { { .iv = 50, .level = 19, @@ -671,7 +671,7 @@ const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy2[] = { { .iv = 100, .level = 27, @@ -684,7 +684,7 @@ const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy3[] = { { .iv = 150, .level = 30, @@ -697,7 +697,7 @@ const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy4[] = { { .iv = 200, .level = 33, @@ -710,7 +710,7 @@ const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_GabbyAndTy5[] = { { .iv = 250, .level = 36, @@ -723,7 +723,7 @@ const struct TrainerPartyMember0 gTrainerParty_GabbyAndTy5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_GabbyAndTy6[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_GabbyAndTy6[] = { { .iv = 250, .level = 39, @@ -738,7 +738,7 @@ const struct TrainerPartyMember1 gTrainerParty_GabbyAndTy6[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lola1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola1[] = { { .iv = 0, .level = 13, @@ -751,7 +751,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lola1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Carmen[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carmen[] = { { .iv = 0, .level = 27, @@ -759,7 +759,7 @@ const struct TrainerPartyMember0 gTrainerParty_Carmen[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Gwen[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gwen[] = { { .iv = 0, .level = 27, @@ -767,7 +767,7 @@ const struct TrainerPartyMember0 gTrainerParty_Gwen[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lola2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola2[] = { { .iv = 10, .level = 26, @@ -780,7 +780,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lola2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lola3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola3[] = { { .iv = 20, .level = 29, @@ -793,7 +793,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lola3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lola4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola4[] = { { .iv = 30, .level = 32, @@ -806,7 +806,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lola4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lola5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lola5[] = { { .iv = 40, .level = 35, @@ -819,7 +819,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lola5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Ricky1[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky1[] = { { .iv = 0, .level = 14, @@ -828,7 +828,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ricky1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Simon[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Simon[] = { { .iv = 0, .level = 12, @@ -841,7 +841,7 @@ const struct TrainerPartyMember0 gTrainerParty_Simon[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Charlie[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Charlie[] = { { .iv = 0, .level = 27, @@ -849,7 +849,7 @@ const struct TrainerPartyMember0 gTrainerParty_Charlie[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Ricky2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky2[] = { { .iv = 10, .level = 27, @@ -858,7 +858,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ricky2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Ricky3[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky3[] = { { .iv = 20, .level = 30, @@ -867,7 +867,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ricky3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Ricky4[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky4[] = { { .iv = 30, .level = 33, @@ -876,7 +876,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ricky4[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Ricky5[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Ricky5[] = { { .iv = 40, .level = 36, @@ -885,7 +885,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ricky5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Randall[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Randall[] = { { .iv = 100, .level = 27, @@ -893,7 +893,7 @@ const struct TrainerPartyMember0 gTrainerParty_Randall[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Parker[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Parker[] = { { .iv = 100, .level = 27, @@ -901,7 +901,7 @@ const struct TrainerPartyMember0 gTrainerParty_Parker[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_George[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_George[] = { { .iv = 100, .level = 27, @@ -909,7 +909,7 @@ const struct TrainerPartyMember0 gTrainerParty_George[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Berke[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Berke[] = { { .iv = 100, .level = 27, @@ -917,7 +917,7 @@ const struct TrainerPartyMember0 gTrainerParty_Berke[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Clyde[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Clyde[] = { { .iv = 100, .level = 29, @@ -950,7 +950,7 @@ const struct TrainerPartyMember1 gTrainerParty_Clyde[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Vincent[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vincent[] = { { .iv = 100, .level = 44, @@ -968,7 +968,7 @@ const struct TrainerPartyMember0 gTrainerParty_Vincent[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Leroy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leroy[] = { { .iv = 100, .level = 46, @@ -981,7 +981,7 @@ const struct TrainerPartyMember0 gTrainerParty_Leroy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Wilton1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton1[] = { { .iv = 100, .level = 18, @@ -999,7 +999,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wilton1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Edgar[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edgar[] = { { .iv = 100, .level = 44, @@ -1007,7 +1007,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edgar[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Albert[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Albert[] = { { .iv = 100, .level = 43, @@ -1020,7 +1020,7 @@ const struct TrainerPartyMember0 gTrainerParty_Albert[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Samuel[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Samuel[] = { { .iv = 100, .level = 42, @@ -1038,7 +1038,7 @@ const struct TrainerPartyMember0 gTrainerParty_Samuel[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Vito[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vito[] = { { .iv = 100, .level = 42, @@ -1061,7 +1061,7 @@ const struct TrainerPartyMember0 gTrainerParty_Vito[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Owen[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Owen[] = { { .iv = 100, .level = 42, @@ -1079,7 +1079,7 @@ const struct TrainerPartyMember0 gTrainerParty_Owen[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Wilton2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton2[] = { { .iv = 110, .level = 26, @@ -1097,7 +1097,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wilton2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Wilton3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton3[] = { { .iv = 120, .level = 29, @@ -1115,7 +1115,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wilton3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Wilton4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton4[] = { { .iv = 130, .level = 32, @@ -1133,7 +1133,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wilton4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Wilton5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wilton5[] = { { .iv = 140, .level = 35, @@ -1151,7 +1151,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wilton5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Warren[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Warren[] = { { .iv = 100, .level = 34, @@ -1169,7 +1169,7 @@ const struct TrainerPartyMember0 gTrainerParty_Warren[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Mary[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mary[] = { { .iv = 100, .level = 27, @@ -1177,7 +1177,7 @@ const struct TrainerPartyMember0 gTrainerParty_Mary[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lori[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lori[] = { { .iv = 100, .level = 27, @@ -1185,7 +1185,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lori[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jody[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jody[] = { { .iv = 100, .level = 27, @@ -1193,7 +1193,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jody[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Wendy[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wendy[] = { { .iv = 100, .level = 31, @@ -1214,7 +1214,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wendy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Elaine[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elaine[] = { { .iv = 100, .level = 45, @@ -1227,7 +1227,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elaine[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brooke1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke1[] = { { .iv = 100, .level = 18, @@ -1245,7 +1245,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brooke1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jennifer[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jennifer[] = { { .iv = 100, .level = 31, @@ -1253,7 +1253,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jennifer[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Hope[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hope[] = { { .iv = 100, .level = 44, @@ -1261,7 +1261,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hope[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shannon[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shannon[] = { { .iv = 100, .level = 44, @@ -1269,7 +1269,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shannon[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Michelle[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Michelle[] = { { .iv = 100, .level = 42, @@ -1287,7 +1287,7 @@ const struct TrainerPartyMember0 gTrainerParty_Michelle[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Caroline[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Caroline[] = { { .iv = 100, .level = 43, @@ -1300,7 +1300,7 @@ const struct TrainerPartyMember0 gTrainerParty_Caroline[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Julie[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Julie[] = { { .iv = 100, .level = 43, @@ -1313,7 +1313,7 @@ const struct TrainerPartyMember0 gTrainerParty_Julie[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brooke2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke2[] = { { .iv = 110, .level = 26, @@ -1331,7 +1331,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brooke2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brooke3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke3[] = { { .iv = 120, .level = 29, @@ -1349,7 +1349,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brooke3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brooke4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke4[] = { { .iv = 130, .level = 32, @@ -1367,7 +1367,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brooke4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brooke5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brooke5[] = { { .iv = 140, .level = 34, @@ -1385,7 +1385,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brooke5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Patricia[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Patricia[] = { { .iv = 0, .level = 42, @@ -1393,7 +1393,7 @@ const struct TrainerPartyMember0 gTrainerParty_Patricia[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kindra[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kindra[] = { { .iv = 0, .level = 31, @@ -1406,7 +1406,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kindra[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tammy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tammy[] = { { .iv = 0, .level = 30, @@ -1419,7 +1419,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tammy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Valerie1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie1[] = { { .iv = 0, .level = 32, @@ -1427,7 +1427,7 @@ const struct TrainerPartyMember0 gTrainerParty_Valerie1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tasha[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tasha[] = { { .iv = 0, .level = 31, @@ -1440,7 +1440,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tasha[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Valerie2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie2[] = { { .iv = 10, .level = 35, @@ -1448,7 +1448,7 @@ const struct TrainerPartyMember0 gTrainerParty_Valerie2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Valerie3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie3[] = { { .iv = 20, .level = 37, @@ -1461,7 +1461,7 @@ const struct TrainerPartyMember0 gTrainerParty_Valerie3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Valerie4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie4[] = { { .iv = 30, .level = 40, @@ -1474,7 +1474,7 @@ const struct TrainerPartyMember0 gTrainerParty_Valerie4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Valerie5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Valerie5[] = { { .iv = 40, .level = 42, @@ -1492,7 +1492,7 @@ const struct TrainerPartyMember0 gTrainerParty_Valerie5[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Cindy1[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy1[] = { { .iv = 0, .level = 7, @@ -1501,7 +1501,7 @@ const struct TrainerPartyMember2 gTrainerParty_Cindy1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous2[] = { { .iv = 0, .level = 18, @@ -1509,7 +1509,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Brianna1[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Brianna1[] = { { .iv = 0, .level = 10, @@ -1524,7 +1524,7 @@ const struct TrainerPartyMember1 gTrainerParty_Brianna1[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Cindy2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Cindy2[] = { { .iv = 0, .level = 11, @@ -1533,7 +1533,7 @@ const struct TrainerPartyMember1 gTrainerParty_Cindy2[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Brianna2[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Brianna2[] = { { .iv = 100, .level = 41, @@ -1542,7 +1542,7 @@ const struct TrainerPartyMember2 gTrainerParty_Brianna2[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Anette[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Anette[] = { { .iv = 100, .level = 45, @@ -1551,7 +1551,7 @@ const struct TrainerPartyMember2 gTrainerParty_Anette[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Cindy3[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy3[] = { { .iv = 10, .level = 27, @@ -1560,7 +1560,7 @@ const struct TrainerPartyMember2 gTrainerParty_Cindy3[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Cindy4[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy4[] = { { .iv = 20, .level = 30, @@ -1569,7 +1569,7 @@ const struct TrainerPartyMember2 gTrainerParty_Cindy4[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Cindy5[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Cindy5[] = { { .iv = 30, .level = 33, @@ -1578,7 +1578,7 @@ const struct TrainerPartyMember2 gTrainerParty_Cindy5[] = { } }; -const struct TrainerPartyMember3 gTrainerParty_Cindy6[] = { +const struct TrainerMonItemCustomMoves gTrainerParty_Cindy6[] = { { .iv = 40, .level = 36, @@ -1588,7 +1588,7 @@ const struct TrainerPartyMember3 gTrainerParty_Cindy6[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Melissa[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Melissa[] = { { .iv = 0, .level = 22, @@ -1596,7 +1596,7 @@ const struct TrainerPartyMember0 gTrainerParty_Melissa[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Sheila[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sheila[] = { { .iv = 0, .level = 22, @@ -1604,7 +1604,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sheila[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shirley[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shirley[] = { { .iv = 0, .level = 22, @@ -1612,7 +1612,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shirley[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Jessica1[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica1[] = { { .iv = 0, .level = 30, @@ -1627,7 +1627,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jessica1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Connie[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Connie[] = { { .iv = 100, .level = 40, @@ -1640,7 +1640,7 @@ const struct TrainerPartyMember0 gTrainerParty_Connie[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Bridget[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bridget[] = { { .iv = 100, .level = 41, @@ -1648,7 +1648,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bridget[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Olivia[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Olivia[] = { { .iv = 100, .level = 41, @@ -1657,7 +1657,7 @@ const struct TrainerPartyMember1 gTrainerParty_Olivia[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tiffany[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tiffany[] = { { .iv = 100, .level = 39, @@ -1675,7 +1675,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tiffany[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Jessica2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica2[] = { { .iv = 10, .level = 33, @@ -1690,7 +1690,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jessica2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Jessica3[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica3[] = { { .iv = 20, .level = 36, @@ -1705,7 +1705,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jessica3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Jessica4[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica4[] = { { .iv = 30, .level = 39, @@ -1720,7 +1720,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jessica4[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Jessica5[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Jessica5[] = { { .iv = 40, .level = 42, @@ -1735,7 +1735,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jessica5[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Winston1[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Winston1[] = { { .iv = 0, .level = 7, @@ -1744,7 +1744,7 @@ const struct TrainerPartyMember2 gTrainerParty_Winston1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous3[] = { { .iv = 0, .level = 18, @@ -1752,7 +1752,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous3[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Garret[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Garret[] = { { .iv = 0, .level = 45, @@ -1761,7 +1761,7 @@ const struct TrainerPartyMember2 gTrainerParty_Garret[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Winston2[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Winston2[] = { { .iv = 0, .level = 27, @@ -1770,7 +1770,7 @@ const struct TrainerPartyMember2 gTrainerParty_Winston2[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Winston3[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Winston3[] = { { .iv = 0, .level = 30, @@ -1779,7 +1779,7 @@ const struct TrainerPartyMember2 gTrainerParty_Winston3[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Winston4[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Winston4[] = { { .iv = 0, .level = 33, @@ -1788,7 +1788,7 @@ const struct TrainerPartyMember2 gTrainerParty_Winston4[] = { } }; -const struct TrainerPartyMember3 gTrainerParty_Winston5[] = { +const struct TrainerMonItemCustomMoves gTrainerParty_Winston5[] = { { .iv = 0, .level = 36, @@ -1798,7 +1798,7 @@ const struct TrainerPartyMember3 gTrainerParty_Winston5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Steve1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve1[] = { { .iv = 0, .level = 20, @@ -1806,7 +1806,7 @@ const struct TrainerPartyMember0 gTrainerParty_Steve1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Chris[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chris[] = { { .iv = 0, .level = 23, @@ -1814,7 +1814,7 @@ const struct TrainerPartyMember0 gTrainerParty_Chris[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Mark[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mark[] = { { .iv = 0, .level = 32, @@ -1822,7 +1822,7 @@ const struct TrainerPartyMember0 gTrainerParty_Mark[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kenn[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kenn[] = { { .iv = 0, .level = 25, @@ -1830,7 +1830,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kenn[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Steve2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve2[] = { { .iv = 10, .level = 27, @@ -1838,7 +1838,7 @@ const struct TrainerPartyMember0 gTrainerParty_Steve2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Steve3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve3[] = { { .iv = 20, .level = 29, @@ -1851,7 +1851,7 @@ const struct TrainerPartyMember0 gTrainerParty_Steve3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Steve4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve4[] = { { .iv = 30, .level = 32, @@ -1864,7 +1864,7 @@ const struct TrainerPartyMember0 gTrainerParty_Steve4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Steve5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Steve5[] = { { .iv = 40, .level = 35, @@ -1877,7 +1877,7 @@ const struct TrainerPartyMember0 gTrainerParty_Steve5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Luis[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Luis[] = { { .iv = 0, .level = 27, @@ -1885,7 +1885,7 @@ const struct TrainerPartyMember0 gTrainerParty_Luis[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Austin[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Austin[] = { { .iv = 0, .level = 25, @@ -1903,7 +1903,7 @@ const struct TrainerPartyMember0 gTrainerParty_Austin[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Douglas[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Douglas[] = { { .iv = 0, .level = 26, @@ -1916,7 +1916,7 @@ const struct TrainerPartyMember0 gTrainerParty_Douglas[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Darrin[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darrin[] = { { .iv = 0, .level = 27, @@ -1924,7 +1924,7 @@ const struct TrainerPartyMember0 gTrainerParty_Darrin[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tony1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony1[] = { { .iv = 0, .level = 27, @@ -1932,7 +1932,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tony1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jerome[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerome[] = { { .iv = 0, .level = 26, @@ -1945,7 +1945,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerome[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Matthew[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Matthew[] = { { .iv = 0, .level = 27, @@ -1953,7 +1953,7 @@ const struct TrainerPartyMember0 gTrainerParty_Matthew[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_David[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_David[] = { { .iv = 0, .level = 26, @@ -1966,7 +1966,7 @@ const struct TrainerPartyMember0 gTrainerParty_David[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Spencer[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Spencer[] = { { .iv = 0, .level = 33, @@ -1984,7 +1984,7 @@ const struct TrainerPartyMember0 gTrainerParty_Spencer[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Roland[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Roland[] = { { .iv = 0, .level = 35, @@ -1992,7 +1992,7 @@ const struct TrainerPartyMember0 gTrainerParty_Roland[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cody[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cody[] = { { .iv = 0, .level = 34, @@ -2005,7 +2005,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cody[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Stan[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Stan[] = { { .iv = 0, .level = 35, @@ -2013,7 +2013,7 @@ const struct TrainerPartyMember0 gTrainerParty_Stan[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Barry[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Barry[] = { { .iv = 0, .level = 35, @@ -2021,7 +2021,7 @@ const struct TrainerPartyMember0 gTrainerParty_Barry[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dean[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dean[] = { { .iv = 0, .level = 33, @@ -2039,7 +2039,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dean[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Rodney[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rodney[] = { { .iv = 0, .level = 34, @@ -2052,7 +2052,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rodney[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Richard[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Richard[] = { { .iv = 0, .level = 35, @@ -2060,7 +2060,7 @@ const struct TrainerPartyMember0 gTrainerParty_Richard[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Herman[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Herman[] = { { .iv = 0, .level = 34, @@ -2073,7 +2073,7 @@ const struct TrainerPartyMember0 gTrainerParty_Herman[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous4[] = { { .iv = 0, .level = 38, @@ -2081,7 +2081,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Gilbert[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gilbert[] = { { .iv = 0, .level = 35, @@ -2089,7 +2089,7 @@ const struct TrainerPartyMember0 gTrainerParty_Gilbert[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Franklin[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Franklin[] = { { .iv = 0, .level = 34, @@ -2102,7 +2102,7 @@ const struct TrainerPartyMember0 gTrainerParty_Franklin[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Danny[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Danny[] = { { .iv = 0, .level = 37, @@ -2115,7 +2115,7 @@ const struct TrainerPartyMember0 gTrainerParty_Danny[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jack[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jack[] = { { .iv = 0, .level = 34, @@ -2128,7 +2128,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jack[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dudley[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dudley[] = { { .iv = 0, .level = 33, @@ -2146,7 +2146,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dudley[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Chad[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chad[] = { { .iv = 0, .level = 34, @@ -2159,7 +2159,7 @@ const struct TrainerPartyMember0 gTrainerParty_Chad[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tony2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony2[] = { { .iv = 10, .level = 30, @@ -2167,7 +2167,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tony2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tony3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony3[] = { { .iv = 20, .level = 33, @@ -2175,7 +2175,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tony3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tony4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony4[] = { { .iv = 30, .level = 34, @@ -2188,7 +2188,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tony4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tony5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tony5[] = { { .iv = 40, .level = 37, @@ -2201,7 +2201,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tony5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Hideki[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hideki[] = { { .iv = 100, .level = 14, @@ -2209,7 +2209,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hideki[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Hitoshi[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hitoshi[] = { { .iv = 100, .level = 34, @@ -2222,7 +2222,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hitoshi[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kiyo[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kiyo[] = { { .iv = 100, .level = 33, @@ -2240,7 +2240,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kiyo[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Koichi[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koichi[] = { { .iv = 100, .level = 26, @@ -2253,7 +2253,7 @@ const struct TrainerPartyMember0 gTrainerParty_Koichi[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nob1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob1[] = { { .iv = 100, .level = 20, @@ -2261,7 +2261,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nob1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nob2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob2[] = { { .iv = 110, .level = 27, @@ -2269,7 +2269,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nob2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nob3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob3[] = { { .iv = 120, .level = 29, @@ -2282,7 +2282,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nob3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nob4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nob4[] = { { .iv = 130, .level = 31, @@ -2300,7 +2300,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nob4[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Nob5[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Nob5[] = { { .iv = 140, .level = 33, @@ -2327,7 +2327,7 @@ const struct TrainerPartyMember2 gTrainerParty_Nob5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Yuji[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Yuji[] = { { .iv = 100, .level = 26, @@ -2340,7 +2340,7 @@ const struct TrainerPartyMember0 gTrainerParty_Yuji[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Daisuke[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Daisuke[] = { { .iv = 100, .level = 19, @@ -2348,7 +2348,7 @@ const struct TrainerPartyMember0 gTrainerParty_Daisuke[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Atsushi[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Atsushi[] = { { .iv = 100, .level = 30, @@ -2366,7 +2366,7 @@ const struct TrainerPartyMember0 gTrainerParty_Atsushi[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kirk[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kirk[] = { { .iv = 100, .level = 18, @@ -2379,7 +2379,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kirk[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Scott[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Scott[] = { { .iv = 100, .level = 19, @@ -2387,7 +2387,7 @@ const struct TrainerPartyMember0 gTrainerParty_Scott[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Harvey[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Harvey[] = { { .iv = 100, .level = 18, @@ -2400,7 +2400,7 @@ const struct TrainerPartyMember0 gTrainerParty_Harvey[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shawn[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shawn[] = { { .iv = 100, .level = 17, @@ -2418,7 +2418,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shawn[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Randy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Randy[] = { { .iv = 0, .level = 13, @@ -2436,7 +2436,7 @@ const struct TrainerPartyMember0 gTrainerParty_Randy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dalton1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton1[] = { { .iv = 0, .level = 15, @@ -2454,7 +2454,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dalton1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dalton2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton2[] = { { .iv = 10, .level = 25, @@ -2472,7 +2472,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dalton2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dalton3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton3[] = { { .iv = 20, .level = 28, @@ -2490,7 +2490,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dalton3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dalton4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton4[] = { { .iv = 30, .level = 31, @@ -2508,7 +2508,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dalton4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dalton5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dalton5[] = { { .iv = 40, .level = 34, @@ -2526,7 +2526,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dalton5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cole[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cole[] = { { .iv = 100, .level = 22, @@ -2544,7 +2544,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cole[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Flint[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Flint[] = { { .iv = 100, .level = 24, @@ -2552,7 +2552,7 @@ const struct TrainerPartyMember0 gTrainerParty_Flint[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Axle[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Axle[] = { { .iv = 100, .level = 23, @@ -2565,7 +2565,7 @@ const struct TrainerPartyMember0 gTrainerParty_Axle[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jake[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jake[] = { { .iv = 100, .level = 24, @@ -2573,7 +2573,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jake[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Andy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andy[] = { { .iv = 100, .level = 23, @@ -2586,7 +2586,7 @@ const struct TrainerPartyMember0 gTrainerParty_Andy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Bernie1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie1[] = { { .iv = 0, .level = 19, @@ -2599,7 +2599,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bernie1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Bernie2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie2[] = { { .iv = 10, .level = 26, @@ -2612,7 +2612,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bernie2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Bernie3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie3[] = { { .iv = 20, .level = 29, @@ -2625,7 +2625,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bernie3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Bernie4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie4[] = { { .iv = 30, .level = 32, @@ -2638,7 +2638,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bernie4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Bernie5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Bernie5[] = { { .iv = 40, .level = 35, @@ -2651,7 +2651,7 @@ const struct TrainerPartyMember0 gTrainerParty_Bernie5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Drew[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Drew[] = { { .iv = 0, .level = 24, @@ -2660,7 +2660,7 @@ const struct TrainerPartyMember1 gTrainerParty_Drew[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Cliff[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Cliff[] = { { .iv = 0, .level = 22, @@ -2681,7 +2681,7 @@ const struct TrainerPartyMember1 gTrainerParty_Cliff[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Larry[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Larry[] = { { .iv = 0, .level = 18, @@ -2694,7 +2694,7 @@ const struct TrainerPartyMember0 gTrainerParty_Larry[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shane[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shane[] = { { .iv = 0, .level = 19, @@ -2707,7 +2707,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shane[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Justin[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Justin[] = { { .iv = 0, .level = 24, @@ -2715,7 +2715,7 @@ const struct TrainerPartyMember0 gTrainerParty_Justin[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ethan1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan1[] = { { .iv = 0, .level = 21, @@ -2728,7 +2728,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ethan1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jeff[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jeff[] = { { .iv = 0, .level = 9, @@ -2741,7 +2741,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jeff[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Travis[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Travis[] = { { .iv = 0, .level = 19, @@ -2749,7 +2749,7 @@ const struct TrainerPartyMember0 gTrainerParty_Travis[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ethan2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan2[] = { { .iv = 10, .level = 26, @@ -2762,7 +2762,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ethan2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ethan3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan3[] = { { .iv = 20, .level = 29, @@ -2775,7 +2775,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ethan3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ethan4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan4[] = { { .iv = 30, .level = 31, @@ -2793,7 +2793,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ethan4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ethan5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ethan5[] = { { .iv = 40, .level = 34, @@ -2811,7 +2811,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ethan5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brent[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brent[] = { { .iv = 100, .level = 27, @@ -2819,7 +2819,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brent[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Donald[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Donald[] = { { .iv = 100, .level = 25, @@ -2837,7 +2837,7 @@ const struct TrainerPartyMember0 gTrainerParty_Donald[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Taylor[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Taylor[] = { { .iv = 100, .level = 25, @@ -2855,7 +2855,7 @@ const struct TrainerPartyMember0 gTrainerParty_Taylor[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brandon1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon1[] = { { .iv = 0, .level = 28, @@ -2873,7 +2873,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brandon1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Derek[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Derek[] = { { .iv = 100, .level = 15, @@ -2891,7 +2891,7 @@ const struct TrainerPartyMember0 gTrainerParty_Derek[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brandon2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon2[] = { { .iv = 10, .level = 31, @@ -2909,7 +2909,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brandon2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brandon3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon3[] = { { .iv = 20, .level = 34, @@ -2927,7 +2927,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brandon3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brandon4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brandon4[] = { { .iv = 30, .level = 36, @@ -2950,7 +2950,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brandon4[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Brandon5[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Brandon5[] = { { .iv = 40, .level = 38, @@ -2983,7 +2983,7 @@ const struct TrainerPartyMember2 gTrainerParty_Brandon5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Edward[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Edward[] = { { .iv = 0, .level = 16, @@ -2992,7 +2992,7 @@ const struct TrainerPartyMember1 gTrainerParty_Edward[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Preston[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Preston[] = { { .iv = 100, .level = 37, @@ -3000,7 +3000,7 @@ const struct TrainerPartyMember0 gTrainerParty_Preston[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Virgil[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Virgil[] = { { .iv = 100, .level = 36, @@ -3013,7 +3013,7 @@ const struct TrainerPartyMember0 gTrainerParty_Virgil[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Fritz[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Fritz[] = { { .iv = 100, .level = 35, @@ -3031,7 +3031,7 @@ const struct TrainerPartyMember0 gTrainerParty_Fritz[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_William[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_William[] = { { .iv = 0, .level = 31, @@ -3044,7 +3044,7 @@ const struct TrainerPartyMember0 gTrainerParty_William[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Joshua[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joshua[] = { { .iv = 0, .level = 41, @@ -3057,7 +3057,7 @@ const struct TrainerPartyMember0 gTrainerParty_Joshua[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cameron1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron1[] = { { .iv = 0, .level = 31, @@ -3070,7 +3070,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cameron1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cameron2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron2[] = { { .iv = 10, .level = 34, @@ -3083,7 +3083,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cameron2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cameron3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron3[] = { { .iv = 20, .level = 37, @@ -3096,7 +3096,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cameron3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cameron4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron4[] = { { .iv = 30, .level = 40, @@ -3109,7 +3109,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cameron4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cameron5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cameron5[] = { { .iv = 40, .level = 43, @@ -3122,7 +3122,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cameron5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Jaclyn[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Jaclyn[] = { { .iv = 0, .level = 16, @@ -3131,7 +3131,7 @@ const struct TrainerPartyMember1 gTrainerParty_Jaclyn[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Hannah[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hannah[] = { { .iv = 100, .level = 36, @@ -3144,7 +3144,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hannah[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Samantha[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Samantha[] = { { .iv = 100, .level = 37, @@ -3152,7 +3152,7 @@ const struct TrainerPartyMember0 gTrainerParty_Samantha[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Maura[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maura[] = { { .iv = 100, .level = 36, @@ -3165,7 +3165,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maura[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kayla[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kayla[] = { { .iv = 0, .level = 32, @@ -3173,7 +3173,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kayla[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Alexis[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexis[] = { { .iv = 0, .level = 40, @@ -3191,7 +3191,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alexis[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jacki1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki1[] = { { .iv = 0, .level = 31, @@ -3204,7 +3204,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacki1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jacki2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki2[] = { { .iv = 10, .level = 34, @@ -3217,7 +3217,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacki2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jacki3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki3[] = { { .iv = 20, .level = 37, @@ -3230,7 +3230,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacki3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jacki4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki4[] = { { .iv = 30, .level = 40, @@ -3243,7 +3243,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacki4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jacki5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacki5[] = { { .iv = 40, .level = 43, @@ -3256,7 +3256,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacki5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Walter1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Walter1[] = { { .iv = 0, .level = 31, @@ -3264,7 +3264,7 @@ const struct TrainerPartyMember0 gTrainerParty_Walter1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tucker[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tucker[] = { { .iv = 0, .level = 44, @@ -3277,7 +3277,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tucker[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Thomas[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Thomas[] = { { .iv = 0, .level = 45, @@ -3285,7 +3285,7 @@ const struct TrainerPartyMember0 gTrainerParty_Thomas[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Walter2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Walter2[] = { { .iv = 10, .level = 34, @@ -3293,7 +3293,7 @@ const struct TrainerPartyMember0 gTrainerParty_Walter2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Walter3[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter3[] = { { .iv = 20, .level = 36, @@ -3308,7 +3308,7 @@ const struct TrainerPartyMember1 gTrainerParty_Walter3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Walter4[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter4[] = { { .iv = 30, .level = 39, @@ -3323,7 +3323,7 @@ const struct TrainerPartyMember1 gTrainerParty_Walter4[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Walter5[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Walter5[] = { { .iv = 40, .level = 41, @@ -3344,7 +3344,7 @@ const struct TrainerPartyMember1 gTrainerParty_Walter5[] = { } }; -const struct TrainerPartyMember3 gTrainerParty_Sidney[] = { +const struct TrainerMonItemCustomMoves gTrainerParty_Sidney[] = { { .iv = 250, .level = 46, @@ -3382,7 +3382,7 @@ const struct TrainerPartyMember3 gTrainerParty_Sidney[] = { } }; -const struct TrainerPartyMember3 gTrainerParty_Phoebe[] = { +const struct TrainerMonItemCustomMoves gTrainerParty_Phoebe[] = { { .iv = 250, .level = 48, @@ -3420,7 +3420,7 @@ const struct TrainerPartyMember3 gTrainerParty_Phoebe[] = { } }; -const struct TrainerPartyMember3 gTrainerParty_Glacia[] = { +const struct TrainerMonItemCustomMoves gTrainerParty_Glacia[] = { { .iv = 250, .level = 50, @@ -3458,7 +3458,7 @@ const struct TrainerPartyMember3 gTrainerParty_Glacia[] = { } }; -const struct TrainerPartyMember3 gTrainerParty_Drake[] = { +const struct TrainerMonItemCustomMoves gTrainerParty_Drake[] = { { .iv = 250, .level = 52, @@ -3496,7 +3496,7 @@ const struct TrainerPartyMember3 gTrainerParty_Drake[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Roxanne[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Roxanne[] = { { .iv = 150, .level = 14, @@ -3511,7 +3511,7 @@ const struct TrainerPartyMember1 gTrainerParty_Roxanne[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Brawly[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Brawly[] = { { .iv = 150, .level = 17, @@ -3526,7 +3526,7 @@ const struct TrainerPartyMember1 gTrainerParty_Brawly[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Wattson[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wattson[] = { { .iv = 200, .level = 22, @@ -3547,7 +3547,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wattson[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Flannery[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Flannery[] = { { .iv = 200, .level = 26, @@ -3568,7 +3568,7 @@ const struct TrainerPartyMember1 gTrainerParty_Flannery[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Norman[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Norman[] = { { .iv = 200, .level = 28, @@ -3589,7 +3589,7 @@ const struct TrainerPartyMember1 gTrainerParty_Norman[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Winona[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Winona[] = { { .iv = 200, .level = 31, @@ -3616,7 +3616,7 @@ const struct TrainerPartyMember1 gTrainerParty_Winona[] = { } }; -const struct TrainerPartyMember3 gTrainerParty_TateAndLiza[] = { +const struct TrainerMonItemCustomMoves gTrainerParty_TateAndLiza[] = { { .iv = 250, .level = 42, @@ -3633,7 +3633,7 @@ const struct TrainerPartyMember3 gTrainerParty_TateAndLiza[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Wallace[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wallace[] = { { .iv = 200, .level = 40, @@ -3666,7 +3666,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wallace[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jerry1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry1[] = { { .iv = 10, .level = 10, @@ -3674,7 +3674,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerry1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ted[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ted[] = { { .iv = 10, .level = 17, @@ -3682,7 +3682,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ted[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Paul[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Paul[] = { { .iv = 10, .level = 15, @@ -3700,7 +3700,7 @@ const struct TrainerPartyMember0 gTrainerParty_Paul[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jerry2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry2[] = { { .iv = 20, .level = 26, @@ -3713,7 +3713,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerry2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jerry3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry3[] = { { .iv = 30, .level = 29, @@ -3726,7 +3726,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerry3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jerry4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry4[] = { { .iv = 40, .level = 32, @@ -3739,7 +3739,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerry4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jerry5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jerry5[] = { { .iv = 50, .level = 34, @@ -3757,7 +3757,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jerry5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Karen1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen1[] = { { .iv = 10, .level = 9, @@ -3770,7 +3770,7 @@ const struct TrainerPartyMember0 gTrainerParty_Karen1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Georgia[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Georgia[] = { { .iv = 10, .level = 16, @@ -3783,7 +3783,7 @@ const struct TrainerPartyMember0 gTrainerParty_Georgia[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Karen2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen2[] = { { .iv = 20, .level = 26, @@ -3796,7 +3796,7 @@ const struct TrainerPartyMember0 gTrainerParty_Karen2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Karen3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen3[] = { { .iv = 30, .level = 29, @@ -3809,7 +3809,7 @@ const struct TrainerPartyMember0 gTrainerParty_Karen3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Karen4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen4[] = { { .iv = 40, .level = 32, @@ -3822,7 +3822,7 @@ const struct TrainerPartyMember0 gTrainerParty_Karen4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Karen5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Karen5[] = { { .iv = 50, .level = 35, @@ -3835,7 +3835,7 @@ const struct TrainerPartyMember0 gTrainerParty_Karen5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_KateAndJoy[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_KateAndJoy[] = { { .iv = 0, .level = 30, @@ -3850,7 +3850,7 @@ const struct TrainerPartyMember1 gTrainerParty_KateAndJoy[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg1[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg1[] = { { .iv = 0, .level = 16, @@ -3865,7 +3865,7 @@ const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg1[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg2[] = { { .iv = 10, .level = 26, @@ -3880,7 +3880,7 @@ const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg3[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg3[] = { { .iv = 20, .level = 29, @@ -3895,7 +3895,7 @@ const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg4[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg4[] = { { .iv = 30, .level = 32, @@ -3910,7 +3910,7 @@ const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg4[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg5[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_AnnaAndMeg5[] = { { .iv = 40, .level = 35, @@ -3925,7 +3925,7 @@ const struct TrainerPartyMember1 gTrainerParty_AnnaAndMeg5[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Victor[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Victor[] = { { .iv = 25, .level = 16, @@ -3940,7 +3940,7 @@ const struct TrainerPartyMember2 gTrainerParty_Victor[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Miguel1[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel1[] = { { .iv = 0, .level = 16, @@ -3949,7 +3949,7 @@ const struct TrainerPartyMember2 gTrainerParty_Miguel1[] = { } }; -const struct TrainerPartyMember3 gTrainerParty_Colton[] = { +const struct TrainerMonItemCustomMoves gTrainerParty_Colton[] = { { .iv = 0, .level = 22, @@ -3994,7 +3994,7 @@ const struct TrainerPartyMember3 gTrainerParty_Colton[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Miguel2[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel2[] = { { .iv = 0, .level = 27, @@ -4003,7 +4003,7 @@ const struct TrainerPartyMember2 gTrainerParty_Miguel2[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Miguel3[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel3[] = { { .iv = 0, .level = 30, @@ -4012,7 +4012,7 @@ const struct TrainerPartyMember2 gTrainerParty_Miguel3[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Miguel4[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel4[] = { { .iv = 0, .level = 33, @@ -4021,7 +4021,7 @@ const struct TrainerPartyMember2 gTrainerParty_Miguel4[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Miguel5[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Miguel5[] = { { .iv = 0, .level = 36, @@ -4030,7 +4030,7 @@ const struct TrainerPartyMember2 gTrainerParty_Miguel5[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Victoria[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Victoria[] = { { .iv = 50, .level = 17, @@ -4039,7 +4039,7 @@ const struct TrainerPartyMember2 gTrainerParty_Victoria[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Vanessa[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Vanessa[] = { { .iv = 0, .level = 31, @@ -4048,7 +4048,7 @@ const struct TrainerPartyMember2 gTrainerParty_Vanessa[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Marissa[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Marissa[] = { { .iv = 100, .level = 36, @@ -4069,7 +4069,7 @@ const struct TrainerPartyMember2 gTrainerParty_Marissa[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Isabel1[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel1[] = { { .iv = 0, .level = 15, @@ -4084,7 +4084,7 @@ const struct TrainerPartyMember2 gTrainerParty_Isabel1[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Isabel2[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel2[] = { { .iv = 10, .level = 26, @@ -4099,7 +4099,7 @@ const struct TrainerPartyMember2 gTrainerParty_Isabel2[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Isabel3[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel3[] = { { .iv = 20, .level = 29, @@ -4114,7 +4114,7 @@ const struct TrainerPartyMember2 gTrainerParty_Isabel3[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Isabel4[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel4[] = { { .iv = 30, .level = 32, @@ -4129,7 +4129,7 @@ const struct TrainerPartyMember2 gTrainerParty_Isabel4[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Isabel5[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Isabel5[] = { { .iv = 40, .level = 35, @@ -4144,7 +4144,7 @@ const struct TrainerPartyMember2 gTrainerParty_Isabel5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Timothy1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Timothy1[] = { { .iv = 200, .level = 28, @@ -4152,7 +4152,7 @@ const struct TrainerPartyMember0 gTrainerParty_Timothy1[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Timothy2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy2[] = { { .iv = 210, .level = 31, @@ -4161,7 +4161,7 @@ const struct TrainerPartyMember1 gTrainerParty_Timothy2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Timothy3[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy3[] = { { .iv = 220, .level = 34, @@ -4170,7 +4170,7 @@ const struct TrainerPartyMember1 gTrainerParty_Timothy3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Timothy4[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy4[] = { { .iv = 230, .level = 37, @@ -4179,7 +4179,7 @@ const struct TrainerPartyMember1 gTrainerParty_Timothy4[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Timothy5[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Timothy5[] = { { .iv = 240, .level = 40, @@ -4188,7 +4188,7 @@ const struct TrainerPartyMember1 gTrainerParty_Timothy5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Vicky[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Vicky[] = { { .iv = 200, .level = 18, @@ -4197,7 +4197,7 @@ const struct TrainerPartyMember1 gTrainerParty_Vicky[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shelby1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby1[] = { { .iv = 200, .level = 22, @@ -4210,7 +4210,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelby1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shelby2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby2[] = { { .iv = 210, .level = 30, @@ -4223,7 +4223,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelby2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shelby3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby3[] = { { .iv = 220, .level = 33, @@ -4236,7 +4236,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelby3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shelby4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby4[] = { { .iv = 230, .level = 36, @@ -4249,7 +4249,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelby4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Shelby5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Shelby5[] = { { .iv = 240, .level = 39, @@ -4262,7 +4262,7 @@ const struct TrainerPartyMember0 gTrainerParty_Shelby5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Calvin1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin1[] = { { .iv = 0, .level = 5, @@ -4270,7 +4270,7 @@ const struct TrainerPartyMember0 gTrainerParty_Calvin1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Billy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Billy[] = { { .iv = 0, .level = 6, @@ -4283,7 +4283,7 @@ const struct TrainerPartyMember0 gTrainerParty_Billy[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Josh[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Josh[] = { { .iv = 100, .level = 10, @@ -4304,7 +4304,7 @@ const struct TrainerPartyMember1 gTrainerParty_Josh[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tommy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tommy[] = { { .iv = 100, .level = 11, @@ -4312,7 +4312,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tommy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Joey[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Joey[] = { { .iv = 0, .level = 8, @@ -4325,7 +4325,7 @@ const struct TrainerPartyMember0 gTrainerParty_Joey[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Ben[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Ben[] = { { .iv = 100, .level = 19, @@ -4334,7 +4334,7 @@ const struct TrainerPartyMember1 gTrainerParty_Ben[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous5[] = { { .iv = 0, .level = 9, @@ -4347,7 +4347,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kevin[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kevin[] = { { .iv = 0, .level = 9, @@ -4360,7 +4360,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kevin[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Neal[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Neal[] = { { .iv = 0, .level = 18, @@ -4373,7 +4373,7 @@ const struct TrainerPartyMember0 gTrainerParty_Neal[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dillon[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dillon[] = { { .iv = 0, .level = 20, @@ -4381,7 +4381,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dillon[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Calvin2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin2[] = { { .iv = 10, .level = 27, @@ -4389,7 +4389,7 @@ const struct TrainerPartyMember0 gTrainerParty_Calvin2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Calvin3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin3[] = { { .iv = 20, .level = 28, @@ -4402,7 +4402,7 @@ const struct TrainerPartyMember0 gTrainerParty_Calvin3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Calvin4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin4[] = { { .iv = 30, .level = 31, @@ -4415,7 +4415,7 @@ const struct TrainerPartyMember0 gTrainerParty_Calvin4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Calvin5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Calvin5[] = { { .iv = 40, .level = 34, @@ -4433,7 +4433,7 @@ const struct TrainerPartyMember0 gTrainerParty_Calvin5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Eddie[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eddie[] = { { .iv = 0, .level = 14, @@ -4446,7 +4446,7 @@ const struct TrainerPartyMember0 gTrainerParty_Eddie[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Allen[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allen[] = { { .iv = 0, .level = 5, @@ -4459,7 +4459,7 @@ const struct TrainerPartyMember0 gTrainerParty_Allen[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Timmy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Timmy[] = { { .iv = 0, .level = 12, @@ -4477,7 +4477,7 @@ const struct TrainerPartyMember0 gTrainerParty_Timmy[] = { } }; -const struct TrainerPartyMember3 gTrainerParty_Steven[] = { +const struct TrainerMonItemCustomMoves gTrainerParty_Steven[] = { { .iv = 255, .level = 57, @@ -4522,7 +4522,7 @@ const struct TrainerPartyMember3 gTrainerParty_Steven[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Andrew[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andrew[] = { { .iv = 0, .level = 5, @@ -4540,7 +4540,7 @@ const struct TrainerPartyMember0 gTrainerParty_Andrew[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ivan[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ivan[] = { { .iv = 0, .level = 6, @@ -4558,7 +4558,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ivan[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Claude[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Claude[] = { { .iv = 0, .level = 16, @@ -4581,7 +4581,7 @@ const struct TrainerPartyMember0 gTrainerParty_Claude[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Elliot1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot1[] = { { .iv = 0, .level = 11, @@ -4599,7 +4599,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elliot1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ned[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ned[] = { { .iv = 0, .level = 12, @@ -4607,7 +4607,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ned[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dale[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dale[] = { { .iv = 0, .level = 12, @@ -4630,7 +4630,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dale[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nolan[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nolan[] = { { .iv = 0, .level = 20, @@ -4638,7 +4638,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nolan[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Barny[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Barny[] = { { .iv = 0, .level = 26, @@ -4651,7 +4651,7 @@ const struct TrainerPartyMember0 gTrainerParty_Barny[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Wade[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wade[] = { { .iv = 0, .level = 17, @@ -4659,7 +4659,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wade[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Carter[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carter[] = { { .iv = 0, .level = 23, @@ -4682,7 +4682,7 @@ const struct TrainerPartyMember0 gTrainerParty_Carter[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Elliot2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot2[] = { { .iv = 10, .level = 24, @@ -4700,7 +4700,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elliot2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Elliot3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot3[] = { { .iv = 20, .level = 29, @@ -4723,7 +4723,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elliot3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Elliot4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot4[] = { { .iv = 30, .level = 31, @@ -4746,7 +4746,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elliot4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Elliot5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Elliot5[] = { { .iv = 40, .level = 33, @@ -4769,7 +4769,7 @@ const struct TrainerPartyMember0 gTrainerParty_Elliot5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ronald[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ronald[] = { { .iv = 0, .level = 34, @@ -4802,7 +4802,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ronald[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jacob[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jacob[] = { { .iv = 0, .level = 7, @@ -4820,7 +4820,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jacob[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anthony[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anthony[] = { { .iv = 0, .level = 16, @@ -4833,7 +4833,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anthony[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Benjamin1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin1[] = { { .iv = 0, .level = 17, @@ -4841,7 +4841,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benjamin1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Benjamin2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin2[] = { { .iv = 10, .level = 28, @@ -4849,7 +4849,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benjamin2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Benjamin3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin3[] = { { .iv = 20, .level = 31, @@ -4857,7 +4857,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benjamin3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Benjamin4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin4[] = { { .iv = 30, .level = 34, @@ -4865,7 +4865,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benjamin4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Benjamin5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benjamin5[] = { { .iv = 40, .level = 37, @@ -4873,7 +4873,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benjamin5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Abigail1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail1[] = { { .iv = 0, .level = 17, @@ -4881,7 +4881,7 @@ const struct TrainerPartyMember0 gTrainerParty_Abigail1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jasmine[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jasmine[] = { { .iv = 80, .level = 15, @@ -4899,7 +4899,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jasmine[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Abigail2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail2[] = { { .iv = 10, .level = 28, @@ -4907,7 +4907,7 @@ const struct TrainerPartyMember0 gTrainerParty_Abigail2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Abigail3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail3[] = { { .iv = 20, .level = 31, @@ -4915,7 +4915,7 @@ const struct TrainerPartyMember0 gTrainerParty_Abigail3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Abigail4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail4[] = { { .iv = 30, .level = 34, @@ -4923,7 +4923,7 @@ const struct TrainerPartyMember0 gTrainerParty_Abigail4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Abigail5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Abigail5[] = { { .iv = 40, .level = 37, @@ -4931,7 +4931,7 @@ const struct TrainerPartyMember0 gTrainerParty_Abigail5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dylan1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan1[] = { { .iv = 0, .level = 18, @@ -4939,7 +4939,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dylan1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dylan2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan2[] = { { .iv = 10, .level = 28, @@ -4947,7 +4947,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dylan2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dylan3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan3[] = { { .iv = 20, .level = 31, @@ -4955,7 +4955,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dylan3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dylan4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan4[] = { { .iv = 30, .level = 34, @@ -4963,7 +4963,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dylan4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dylan5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dylan5[] = { { .iv = 40, .level = 37, @@ -4971,7 +4971,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dylan5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Maria1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria1[] = { { .iv = 0, .level = 18, @@ -4979,7 +4979,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maria1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Maria2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria2[] = { { .iv = 10, .level = 28, @@ -4987,7 +4987,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maria2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Maria3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria3[] = { { .iv = 20, .level = 31, @@ -4995,7 +4995,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maria3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Maria4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria4[] = { { .iv = 30, .level = 34, @@ -5003,7 +5003,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maria4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Maria5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maria5[] = { { .iv = 40, .level = 37, @@ -5011,7 +5011,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maria5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Caleb[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Caleb[] = { { .iv = 0, .level = 33, @@ -5034,7 +5034,7 @@ const struct TrainerPartyMember0 gTrainerParty_Caleb[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous6[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous6[] = { { .iv = 0, .level = 36, @@ -5042,7 +5042,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous6[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Isaiah1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah1[] = { { .iv = 0, .level = 36, @@ -5050,7 +5050,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaiah1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous7[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous7[] = { { .iv = 0, .level = 36, @@ -5058,7 +5058,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous7[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Chase[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chase[] = { { .iv = 0, .level = 27, @@ -5071,7 +5071,7 @@ const struct TrainerPartyMember0 gTrainerParty_Chase[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Isaiah2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah2[] = { { .iv = 10, .level = 39, @@ -5079,7 +5079,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaiah2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Isaiah3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah3[] = { { .iv = 20, .level = 42, @@ -5087,7 +5087,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaiah3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Isaiah4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah4[] = { { .iv = 30, .level = 45, @@ -5095,7 +5095,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaiah4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Isaiah5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaiah5[] = { { .iv = 40, .level = 48, @@ -5103,7 +5103,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaiah5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous8[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous8[] = { { .iv = 0, .level = 26, @@ -5121,7 +5121,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous8[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Connor[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Connor[] = { { .iv = 0, .level = 25, @@ -5144,7 +5144,7 @@ const struct TrainerPartyMember0 gTrainerParty_Connor[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous9[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous9[] = { { .iv = 0, .level = 36, @@ -5152,7 +5152,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous9[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Katelyn1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn1[] = { { .iv = 0, .level = 36, @@ -5160,7 +5160,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katelyn1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Allison[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Allison[] = { { .iv = 0, .level = 25, @@ -5183,7 +5183,7 @@ const struct TrainerPartyMember0 gTrainerParty_Allison[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Katelyn2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn2[] = { { .iv = 10, .level = 39, @@ -5191,7 +5191,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katelyn2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Katelyn3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn3[] = { { .iv = 20, .level = 42, @@ -5199,7 +5199,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katelyn3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Katelyn4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn4[] = { { .iv = 30, .level = 45, @@ -5207,7 +5207,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katelyn4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Katelyn5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katelyn5[] = { { .iv = 40, .level = 48, @@ -5215,7 +5215,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katelyn5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nicolas1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas1[] = { { .iv = 100, .level = 38, @@ -5228,7 +5228,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nicolas1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nicolas2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas2[] = { { .iv = 110, .level = 41, @@ -5241,7 +5241,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nicolas2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nicolas3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas3[] = { { .iv = 120, .level = 44, @@ -5254,7 +5254,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nicolas3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nicolas4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicolas4[] = { { .iv = 130, .level = 46, @@ -5272,7 +5272,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nicolas4[] = { } }; -const struct TrainerPartyMember2 gTrainerParty_Nicolas5[] = { +const struct TrainerMonItemDefaultMoves gTrainerParty_Nicolas5[] = { { .iv = 140, .level = 49, @@ -5293,7 +5293,7 @@ const struct TrainerPartyMember2 gTrainerParty_Nicolas5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Aaron[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Aaron[] = { { .iv = 100, .level = 35, @@ -5301,7 +5301,7 @@ const struct TrainerPartyMember0 gTrainerParty_Aaron[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Perry[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Perry[] = { { .iv = 0, .level = 27, @@ -5309,7 +5309,7 @@ const struct TrainerPartyMember0 gTrainerParty_Perry[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Hugh[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hugh[] = { { .iv = 0, .level = 27, @@ -5317,7 +5317,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hugh[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Phil[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Phil[] = { { .iv = 0, .level = 25, @@ -5335,7 +5335,7 @@ const struct TrainerPartyMember0 gTrainerParty_Phil[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jared[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jared[] = { { .iv = 100, .level = 30, @@ -5343,7 +5343,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jared[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous10[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous10[] = { { .iv = 100, .level = 29, @@ -5366,7 +5366,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous10[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tanner[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tanner[] = { { .iv = 100, .level = 30, @@ -5384,7 +5384,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tanner[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Will[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Will[] = { { .iv = 100, .level = 28, @@ -5402,7 +5402,7 @@ const struct TrainerPartyMember0 gTrainerParty_Will[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Colin[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Colin[] = { { .iv = 0, .level = 29, @@ -5415,7 +5415,7 @@ const struct TrainerPartyMember0 gTrainerParty_Colin[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Robert1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert1[] = { { .iv = 0, .level = 30, @@ -5423,7 +5423,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robert1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Benny[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Benny[] = { { .iv = 0, .level = 36, @@ -5441,7 +5441,7 @@ const struct TrainerPartyMember0 gTrainerParty_Benny[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Chester[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Chester[] = { { .iv = 0, .level = 26, @@ -5454,7 +5454,7 @@ const struct TrainerPartyMember0 gTrainerParty_Chester[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Robert2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert2[] = { { .iv = 10, .level = 32, @@ -5467,7 +5467,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robert2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Robert3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert3[] = { { .iv = 20, .level = 35, @@ -5480,7 +5480,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robert3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Robert4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert4[] = { { .iv = 30, .level = 38, @@ -5493,7 +5493,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robert4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Robert5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robert5[] = { { .iv = 40, .level = 41, @@ -5506,7 +5506,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robert5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Alex[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alex[] = { { .iv = 0, .level = 32, @@ -5529,7 +5529,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alex[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Beck[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beck[] = { { .iv = 0, .level = 34, @@ -5542,7 +5542,7 @@ const struct TrainerPartyMember0 gTrainerParty_Beck[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Yasu[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Yasu[] = { { .iv = 0, .level = 27, @@ -5550,7 +5550,7 @@ const struct TrainerPartyMember0 gTrainerParty_Yasu[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Takashi[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Takashi[] = { { .iv = 0, .level = 25, @@ -5568,7 +5568,7 @@ const struct TrainerPartyMember0 gTrainerParty_Takashi[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Makoto[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Makoto[] = { { .iv = 0, .level = 23, @@ -5576,7 +5576,7 @@ const struct TrainerPartyMember0 gTrainerParty_Makoto[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Hideo1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hideo1[] = { { .iv = 0, .level = 20, @@ -5599,7 +5599,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hideo1[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Lao1[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao1[] = { { .iv = 0, .level = 17, @@ -5626,7 +5626,7 @@ const struct TrainerPartyMember1 gTrainerParty_Lao1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lung[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lung[] = { { .iv = 0, .level = 19, @@ -5639,7 +5639,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lung[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Lao2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao2[] = { { .iv = 0, .level = 24, @@ -5666,7 +5666,7 @@ const struct TrainerPartyMember1 gTrainerParty_Lao2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Lao3[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao3[] = { { .iv = 20, .level = 27, @@ -5693,7 +5693,7 @@ const struct TrainerPartyMember1 gTrainerParty_Lao3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Lao4[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Lao4[] = { { .iv = 30, .level = 30, @@ -5720,7 +5720,7 @@ const struct TrainerPartyMember1 gTrainerParty_Lao4[] = { } }; -const struct TrainerPartyMember3 gTrainerParty_Lao5[] = { +const struct TrainerMonItemCustomMoves gTrainerParty_Lao5[] = { { .iv = 40, .level = 33, @@ -5751,7 +5751,7 @@ const struct TrainerPartyMember3 gTrainerParty_Lao5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tessa[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tessa[] = { { .iv = 100, .level = 12, @@ -5769,7 +5769,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tessa[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Laura[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Laura[] = { { .iv = 100, .level = 14, @@ -5777,7 +5777,7 @@ const struct TrainerPartyMember0 gTrainerParty_Laura[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cyndy1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy1[] = { { .iv = 100, .level = 19, @@ -5790,7 +5790,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cyndy1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cora[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cora[] = { { .iv = 100, .level = 27, @@ -5798,7 +5798,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cora[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jill[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jill[] = { { .iv = 100, .level = 27, @@ -5806,7 +5806,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jill[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cyndy2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy2[] = { { .iv = 110, .level = 26, @@ -5819,7 +5819,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cyndy2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cyndy3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy3[] = { { .iv = 120, .level = 29, @@ -5832,7 +5832,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cyndy3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cyndy4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy4[] = { { .iv = 130, .level = 32, @@ -5845,7 +5845,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cyndy4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Cyndy5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Cyndy5[] = { { .iv = 140, .level = 35, @@ -5858,7 +5858,7 @@ const struct TrainerPartyMember0 gTrainerParty_Cyndy5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Madeline1[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline1[] = { { .iv = 0, .level = 20, @@ -5867,7 +5867,7 @@ const struct TrainerPartyMember1 gTrainerParty_Madeline1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Clarissa[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clarissa[] = { { .iv = 0, .level = 29, @@ -5880,7 +5880,7 @@ const struct TrainerPartyMember0 gTrainerParty_Clarissa[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Angelica[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Angelica[] = { { .iv = 0, .level = 30, @@ -5888,7 +5888,7 @@ const struct TrainerPartyMember0 gTrainerParty_Angelica[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Madeline2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline2[] = { { .iv = 10, .level = 27, @@ -5897,7 +5897,7 @@ const struct TrainerPartyMember1 gTrainerParty_Madeline2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Madeline3[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline3[] = { { .iv = 20, .level = 30, @@ -5906,7 +5906,7 @@ const struct TrainerPartyMember1 gTrainerParty_Madeline3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Madeline4[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline4[] = { { .iv = 30, .level = 32, @@ -5921,7 +5921,7 @@ const struct TrainerPartyMember1 gTrainerParty_Madeline4[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Madeline5[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Madeline5[] = { { .iv = 40, .level = 35, @@ -5936,7 +5936,7 @@ const struct TrainerPartyMember1 gTrainerParty_Madeline5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Beverly[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beverly[] = { { .iv = 0, .level = 26, @@ -5949,7 +5949,7 @@ const struct TrainerPartyMember0 gTrainerParty_Beverly[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dawn[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dawn[] = { { .iv = 0, .level = 27, @@ -5957,7 +5957,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dawn[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nicole[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nicole[] = { { .iv = 0, .level = 27, @@ -5965,7 +5965,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nicole[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Denise[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Denise[] = { { .iv = 0, .level = 27, @@ -5973,7 +5973,7 @@ const struct TrainerPartyMember0 gTrainerParty_Denise[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Beth[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Beth[] = { { .iv = 0, .level = 25, @@ -5991,7 +5991,7 @@ const struct TrainerPartyMember0 gTrainerParty_Beth[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tara[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tara[] = { { .iv = 0, .level = 26, @@ -6004,7 +6004,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tara[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Missy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Missy[] = { { .iv = 0, .level = 24, @@ -6027,7 +6027,7 @@ const struct TrainerPartyMember0 gTrainerParty_Missy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Alice[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alice[] = { { .iv = 0, .level = 25, @@ -6045,7 +6045,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alice[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jenny1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny1[] = { { .iv = 0, .level = 35, @@ -6053,7 +6053,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenny1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grace[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grace[] = { { .iv = 0, .level = 33, @@ -6071,7 +6071,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grace[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tanya[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tanya[] = { { .iv = 0, .level = 35, @@ -6079,7 +6079,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tanya[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Sharon[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sharon[] = { { .iv = 0, .level = 34, @@ -6092,7 +6092,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sharon[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nikki[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nikki[] = { { .iv = 0, .level = 32, @@ -6110,7 +6110,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nikki[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brenda[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brenda[] = { { .iv = 0, .level = 35, @@ -6118,7 +6118,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brenda[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Katie[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Katie[] = { { .iv = 0, .level = 33, @@ -6136,7 +6136,7 @@ const struct TrainerPartyMember0 gTrainerParty_Katie[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Susie[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Susie[] = { { .iv = 0, .level = 33, @@ -6154,7 +6154,7 @@ const struct TrainerPartyMember0 gTrainerParty_Susie[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kara[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kara[] = { { .iv = 0, .level = 35, @@ -6162,7 +6162,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kara[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dana[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dana[] = { { .iv = 0, .level = 33, @@ -6180,7 +6180,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dana[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Erin[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Erin[] = { { .iv = 0, .level = 38, @@ -6188,7 +6188,7 @@ const struct TrainerPartyMember0 gTrainerParty_Erin[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Debra[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Debra[] = { { .iv = 0, .level = 34, @@ -6201,7 +6201,7 @@ const struct TrainerPartyMember0 gTrainerParty_Debra[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Linda[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Linda[] = { { .iv = 0, .level = 34, @@ -6214,7 +6214,7 @@ const struct TrainerPartyMember0 gTrainerParty_Linda[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kaylee[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kaylee[] = { { .iv = 0, .level = 34, @@ -6227,7 +6227,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kaylee[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Laurel[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Laurel[] = { { .iv = 0, .level = 33, @@ -6245,7 +6245,7 @@ const struct TrainerPartyMember0 gTrainerParty_Laurel[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Darcy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Darcy[] = { { .iv = 0, .level = 13, @@ -6253,7 +6253,7 @@ const struct TrainerPartyMember0 gTrainerParty_Darcy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jenny2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny2[] = { { .iv = 0, .level = 38, @@ -6261,7 +6261,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenny2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jenny3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny3[] = { { .iv = 0, .level = 41, @@ -6269,7 +6269,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenny3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jenny4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny4[] = { { .iv = 0, .level = 43, @@ -6282,7 +6282,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenny4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jenny5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenny5[] = { { .iv = 0, .level = 45, @@ -6300,7 +6300,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenny5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Heidi[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Heidi[] = { { .iv = 0, .level = 23, @@ -6315,7 +6315,7 @@ const struct TrainerPartyMember1 gTrainerParty_Heidi[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Becky[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Becky[] = { { .iv = 0, .level = 24, @@ -6324,7 +6324,7 @@ const struct TrainerPartyMember1 gTrainerParty_Becky[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Carol[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carol[] = { { .iv = 0, .level = 18, @@ -6337,7 +6337,7 @@ const struct TrainerPartyMember0 gTrainerParty_Carol[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nancy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nancy[] = { { .iv = 0, .level = 19, @@ -6350,7 +6350,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nancy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Martha[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Martha[] = { { .iv = 0, .level = 23, @@ -6363,7 +6363,7 @@ const struct TrainerPartyMember0 gTrainerParty_Martha[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Diana1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana1[] = { { .iv = 0, .level = 20, @@ -6381,7 +6381,7 @@ const struct TrainerPartyMember0 gTrainerParty_Diana1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Nina[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Nina[] = { { .iv = 0, .level = 9, @@ -6394,7 +6394,7 @@ const struct TrainerPartyMember0 gTrainerParty_Nina[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Irene[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Irene[] = { { .iv = 0, .level = 18, @@ -6407,7 +6407,7 @@ const struct TrainerPartyMember0 gTrainerParty_Irene[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Diana2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana2[] = { { .iv = 10, .level = 25, @@ -6425,7 +6425,7 @@ const struct TrainerPartyMember0 gTrainerParty_Diana2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Diana3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana3[] = { { .iv = 20, .level = 28, @@ -6443,7 +6443,7 @@ const struct TrainerPartyMember0 gTrainerParty_Diana3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Diana4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana4[] = { { .iv = 30, .level = 31, @@ -6461,7 +6461,7 @@ const struct TrainerPartyMember0 gTrainerParty_Diana4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Diana5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Diana5[] = { { .iv = 40, .level = 40, @@ -6479,7 +6479,7 @@ const struct TrainerPartyMember0 gTrainerParty_Diana5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv1[] = { { .iv = 0, .level = 16, @@ -6492,7 +6492,7 @@ const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv2[] = { { .iv = 10, .level = 27, @@ -6505,7 +6505,7 @@ const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_GinaAndMia1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_GinaAndMia1[] = { { .iv = 0, .level = 8, @@ -6518,7 +6518,7 @@ const struct TrainerPartyMember0 gTrainerParty_GinaAndMia1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_MiuAndYuki[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_MiuAndYuki[] = { { .iv = 0, .level = 27, @@ -6531,7 +6531,7 @@ const struct TrainerPartyMember0 gTrainerParty_MiuAndYuki[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv3[] = { { .iv = 0, .level = 9, @@ -6544,7 +6544,7 @@ const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_GinaAndMia2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_GinaAndMia2[] = { { .iv = 0, .level = 10, @@ -6559,7 +6559,7 @@ const struct TrainerPartyMember1 gTrainerParty_GinaAndMia2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_AmyAndLiv4[] = { { .iv = 20, .level = 30, @@ -6572,7 +6572,7 @@ const struct TrainerPartyMember0 gTrainerParty_AmyAndLiv4[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_AmyAndLiv5[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_AmyAndLiv5[] = { { .iv = 30, .level = 33, @@ -6587,7 +6587,7 @@ const struct TrainerPartyMember1 gTrainerParty_AmyAndLiv5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_AmyAndLiv6[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_AmyAndLiv6[] = { { .iv = 40, .level = 36, @@ -6602,7 +6602,7 @@ const struct TrainerPartyMember1 gTrainerParty_AmyAndLiv6[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Huey[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Huey[] = { { .iv = 0, .level = 14, @@ -6610,7 +6610,7 @@ const struct TrainerPartyMember0 gTrainerParty_Huey[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Edmond[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edmond[] = { { .iv = 0, .level = 12, @@ -6628,7 +6628,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edmond[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ernest1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest1[] = { { .iv = 0, .level = 33, @@ -6646,7 +6646,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ernest1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Dwayne[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Dwayne[] = { { .iv = 0, .level = 11, @@ -6664,7 +6664,7 @@ const struct TrainerPartyMember0 gTrainerParty_Dwayne[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Phillip[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Phillip[] = { { .iv = 0, .level = 44, @@ -6677,7 +6677,7 @@ const struct TrainerPartyMember0 gTrainerParty_Phillip[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Leonard[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Leonard[] = { { .iv = 0, .level = 43, @@ -6695,7 +6695,7 @@ const struct TrainerPartyMember0 gTrainerParty_Leonard[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Duncan[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Duncan[] = { { .iv = 0, .level = 26, @@ -6708,7 +6708,7 @@ const struct TrainerPartyMember0 gTrainerParty_Duncan[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ernest2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest2[] = { { .iv = 10, .level = 36, @@ -6726,7 +6726,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ernest2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ernest3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest3[] = { { .iv = 20, .level = 39, @@ -6744,7 +6744,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ernest3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ernest4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest4[] = { { .iv = 30, .level = 42, @@ -6762,7 +6762,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ernest4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ernest5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ernest5[] = { { .iv = 40, .level = 45, @@ -6780,7 +6780,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ernest5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous11[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous11[] = { { .iv = 0, .level = 22, @@ -6793,7 +6793,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous11[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous12[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous12[] = { { .iv = 0, .level = 21, @@ -6811,7 +6811,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous12[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous13[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous13[] = { { .iv = 0, .level = 23, @@ -6819,7 +6819,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous13[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Sonny[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sonny[] = { { .iv = 0, .level = 35, @@ -6827,7 +6827,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sonny[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Donovan[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Donovan[] = { { .iv = 0, .level = 34, @@ -6840,7 +6840,7 @@ const struct TrainerPartyMember0 gTrainerParty_Donovan[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Gerald[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Gerald[] = { { .iv = 0, .level = 33, @@ -6858,7 +6858,7 @@ const struct TrainerPartyMember0 gTrainerParty_Gerald[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kelvin[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kelvin[] = { { .iv = 0, .level = 34, @@ -6871,7 +6871,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kelvin[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kody[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kody[] = { { .iv = 0, .level = 33, @@ -6889,7 +6889,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kody[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tevin[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tevin[] = { { .iv = 0, .level = 35, @@ -6897,7 +6897,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tevin[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Damon[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Damon[] = { { .iv = 0, .level = 34, @@ -6910,7 +6910,7 @@ const struct TrainerPartyMember0 gTrainerParty_Damon[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Pablo[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Pablo[] = { { .iv = 0, .level = 35, @@ -6918,7 +6918,7 @@ const struct TrainerPartyMember0 gTrainerParty_Pablo[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Edwin1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin1[] = { { .iv = 0, .level = 14, @@ -6931,7 +6931,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edwin1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Hector1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hector1[] = { { .iv = 0, .level = 20, @@ -6939,7 +6939,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hector1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Hector2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Hector2[] = { { .iv = 0, .level = 20, @@ -6947,7 +6947,7 @@ const struct TrainerPartyMember0 gTrainerParty_Hector2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Edwin2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin2[] = { { .iv = 0, .level = 26, @@ -6960,7 +6960,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edwin2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Edwin3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin3[] = { { .iv = 0, .level = 29, @@ -6973,7 +6973,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edwin3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Edwin4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin4[] = { { .iv = 0, .level = 32, @@ -6986,7 +6986,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edwin4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Edwin5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Edwin5[] = { { .iv = 0, .level = 35, @@ -6999,7 +6999,7 @@ const struct TrainerPartyMember0 gTrainerParty_Edwin5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Wally1[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally1[] = { { .iv = 150, .level = 44, @@ -7032,7 +7032,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wally1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan1[] = { { .iv = 0, .level = 5, @@ -7040,7 +7040,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan2[] = { { .iv = 50, .level = 18, @@ -7058,7 +7058,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan3[] = { { .iv = 100, .level = 29, @@ -7076,7 +7076,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan4[] = { { .iv = 0, .level = 5, @@ -7084,7 +7084,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan5[] = { { .iv = 50, .level = 18, @@ -7102,7 +7102,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan6[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan6[] = { { .iv = 100, .level = 29, @@ -7120,7 +7120,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan6[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan7[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan7[] = { { .iv = 0, .level = 5, @@ -7128,7 +7128,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan7[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan8[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan8[] = { { .iv = 50, .level = 18, @@ -7146,7 +7146,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan8[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan9[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan9[] = { { .iv = 100, .level = 29, @@ -7164,7 +7164,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan9[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May1[] = { { .iv = 0, .level = 5, @@ -7172,7 +7172,7 @@ const struct TrainerPartyMember0 gTrainerParty_May1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May2[] = { { .iv = 50, .level = 18, @@ -7190,7 +7190,7 @@ const struct TrainerPartyMember0 gTrainerParty_May2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May3[] = { { .iv = 100, .level = 29, @@ -7208,7 +7208,7 @@ const struct TrainerPartyMember0 gTrainerParty_May3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May4[] = { { .iv = 0, .level = 5, @@ -7216,7 +7216,7 @@ const struct TrainerPartyMember0 gTrainerParty_May4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May5[] = { { .iv = 50, .level = 18, @@ -7234,7 +7234,7 @@ const struct TrainerPartyMember0 gTrainerParty_May5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May6[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May6[] = { { .iv = 100, .level = 29, @@ -7252,7 +7252,7 @@ const struct TrainerPartyMember0 gTrainerParty_May6[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May7[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May7[] = { { .iv = 0, .level = 5, @@ -7260,7 +7260,7 @@ const struct TrainerPartyMember0 gTrainerParty_May7[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May8[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May8[] = { { .iv = 50, .level = 18, @@ -7278,7 +7278,7 @@ const struct TrainerPartyMember0 gTrainerParty_May8[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May9[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May9[] = { { .iv = 100, .level = 29, @@ -7296,7 +7296,7 @@ const struct TrainerPartyMember0 gTrainerParty_May9[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Isaac1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac1[] = { { .iv = 0, .level = 12, @@ -7329,7 +7329,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaac1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Riley[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Riley[] = { { .iv = 0, .level = 15, @@ -7347,7 +7347,7 @@ const struct TrainerPartyMember0 gTrainerParty_Riley[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Aidan[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Aidan[] = { { .iv = 0, .level = 13, @@ -7360,7 +7360,7 @@ const struct TrainerPartyMember0 gTrainerParty_Aidan[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Isaac2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac2[] = { { .iv = 10, .level = 22, @@ -7393,7 +7393,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaac2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Isaac3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac3[] = { { .iv = 20, .level = 25, @@ -7426,7 +7426,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaac3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Isaac4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac4[] = { { .iv = 30, .level = 28, @@ -7459,7 +7459,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaac4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Isaac5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Isaac5[] = { { .iv = 40, .level = 31, @@ -7492,7 +7492,7 @@ const struct TrainerPartyMember0 gTrainerParty_Isaac5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lydia1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia1[] = { { .iv = 0, .level = 12, @@ -7525,7 +7525,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lydia1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Alexia[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexia[] = { { .iv = 0, .level = 13, @@ -7538,7 +7538,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alexia[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Danielle[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Danielle[] = { { .iv = 0, .level = 24, @@ -7546,7 +7546,7 @@ const struct TrainerPartyMember0 gTrainerParty_Danielle[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lydia2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia2[] = { { .iv = 10, .level = 22, @@ -7579,7 +7579,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lydia2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lydia3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia3[] = { { .iv = 20, .level = 25, @@ -7612,7 +7612,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lydia3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lydia4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia4[] = { { .iv = 30, .level = 28, @@ -7645,7 +7645,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lydia4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lydia5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lydia5[] = { { .iv = 40, .level = 31, @@ -7678,7 +7678,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lydia5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jackson1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson1[] = { { .iv = 50, .level = 28, @@ -7686,7 +7686,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jackson1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Carlos[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Carlos[] = { { .iv = 50, .level = 29, @@ -7704,7 +7704,7 @@ const struct TrainerPartyMember0 gTrainerParty_Carlos[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Sebastian[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sebastian[] = { { .iv = 50, .level = 39, @@ -7712,7 +7712,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sebastian[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jackson2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson2[] = { { .iv = 60, .level = 31, @@ -7720,7 +7720,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jackson2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jackson3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson3[] = { { .iv = 70, .level = 34, @@ -7728,7 +7728,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jackson3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jackson4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson4[] = { { .iv = 80, .level = 37, @@ -7736,7 +7736,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jackson4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jackson5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jackson5[] = { { .iv = 90, .level = 39, @@ -7749,7 +7749,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jackson5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Catherine1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine1[] = { { .iv = 50, .level = 27, @@ -7762,7 +7762,7 @@ const struct TrainerPartyMember0 gTrainerParty_Catherine1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jenna[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jenna[] = { { .iv = 50, .level = 29, @@ -7780,7 +7780,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jenna[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Sophia[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sophia[] = { { .iv = 50, .level = 38, @@ -7793,7 +7793,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sophia[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Catherine2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine2[] = { { .iv = 60, .level = 30, @@ -7806,7 +7806,7 @@ const struct TrainerPartyMember0 gTrainerParty_Catherine2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Catherine3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine3[] = { { .iv = 70, .level = 33, @@ -7819,7 +7819,7 @@ const struct TrainerPartyMember0 gTrainerParty_Catherine3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Catherine4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine4[] = { { .iv = 80, .level = 36, @@ -7832,7 +7832,7 @@ const struct TrainerPartyMember0 gTrainerParty_Catherine4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Catherine5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Catherine5[] = { { .iv = 90, .level = 39, @@ -7845,7 +7845,7 @@ const struct TrainerPartyMember0 gTrainerParty_Catherine5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Maxie1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie1[] = { { .iv = 0, .level = 17, @@ -7858,7 +7858,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maxie1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt28[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt28[] = { { .iv = 0, .level = 32, @@ -7871,7 +7871,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt28[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt29[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt29[] = { { .iv = 0, .level = 30, @@ -7894,7 +7894,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt29[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt30[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt30[] = { { .iv = 0, .level = 32, @@ -7907,7 +7907,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt30[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt31[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt31[] = { { .iv = 0, .level = 33, @@ -7915,7 +7915,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt31[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt32[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt32[] = { { .iv = 0, .level = 37, @@ -7928,7 +7928,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt32[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt33[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt33[] = { { .iv = 0, .level = 38, @@ -7936,7 +7936,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt33[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt34[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt34[] = { { .iv = 0, .level = 36, @@ -7954,7 +7954,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt34[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt35[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt35[] = { { .iv = 0, .level = 17, @@ -7962,7 +7962,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt35[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt36[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt36[] = { { .iv = 0, .level = 9, @@ -7970,7 +7970,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt36[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt37[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt37[] = { { .iv = 0, .level = 9, @@ -7983,7 +7983,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt37[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt38[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt38[] = { { .iv = 0, .level = 16, @@ -7996,7 +7996,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt38[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt39[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt39[] = { { .iv = 0, .level = 16, @@ -8009,7 +8009,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt39[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt40[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt40[] = { { .iv = 0, .level = 20, @@ -8022,7 +8022,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt40[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt41[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt41[] = { { .iv = 0, .level = 17, @@ -8035,7 +8035,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt41[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt42[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt42[] = { { .iv = 0, .level = 11, @@ -8043,7 +8043,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt42[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt43[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt43[] = { { .iv = 0, .level = 27, @@ -8056,7 +8056,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt43[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt44[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt44[] = { { .iv = 0, .level = 27, @@ -8069,7 +8069,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt44[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt45[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt45[] = { { .iv = 0, .level = 26, @@ -8087,7 +8087,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt45[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt46[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt46[] = { { .iv = 0, .level = 15, @@ -8095,7 +8095,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt46[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt47[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt47[] = { { .iv = 0, .level = 14, @@ -8108,7 +8108,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt47[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt48[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt48[] = { { .iv = 0, .level = 17, @@ -8116,7 +8116,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt48[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt49[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt49[] = { { .iv = 0, .level = 30, @@ -8134,7 +8134,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt49[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt50[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt50[] = { { .iv = 0, .level = 31, @@ -8147,7 +8147,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt50[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt51[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt51[] = { { .iv = 0, .level = 31, @@ -8160,7 +8160,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt51[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt52[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt52[] = { { .iv = 0, .level = 28, @@ -8168,7 +8168,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt52[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt53[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt53[] = { { .iv = 0, .level = 31, @@ -8186,7 +8186,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt53[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Grunt54[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Grunt54[] = { { .iv = 0, .level = 33, @@ -8194,7 +8194,7 @@ const struct TrainerPartyMember0 gTrainerParty_Grunt54[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous14[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous14[] = { { .iv = 50, .level = 30, @@ -8207,7 +8207,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous14[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous15[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous15[] = { { .iv = 50, .level = 30, @@ -8220,7 +8220,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous15[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tabitha1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha1[] = { { .iv = 50, .level = 32, @@ -8238,7 +8238,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tabitha1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tabitha2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tabitha2[] = { { .iv = 50, .level = 20, @@ -8256,7 +8256,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tabitha2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Anonymous16[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Anonymous16[] = { { .iv = 50, .level = 21, @@ -8269,7 +8269,7 @@ const struct TrainerPartyMember0 gTrainerParty_Anonymous16[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Courtney1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Courtney1[] = { { .iv = 50, .level = 28, @@ -8282,7 +8282,7 @@ const struct TrainerPartyMember0 gTrainerParty_Courtney1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Courtney2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Courtney2[] = { { .iv = 50, .level = 38, @@ -8295,7 +8295,7 @@ const struct TrainerPartyMember0 gTrainerParty_Courtney2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Maxie2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie2[] = { { .iv = 150, .level = 41, @@ -8313,7 +8313,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maxie2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Maxie3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Maxie3[] = { { .iv = 150, .level = 24, @@ -8331,7 +8331,7 @@ const struct TrainerPartyMember0 gTrainerParty_Maxie3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tiana[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tiana[] = { { .iv = 0, .level = 4, @@ -8344,7 +8344,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tiana[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Haley1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley1[] = { { .iv = 0, .level = 7, @@ -8357,7 +8357,7 @@ const struct TrainerPartyMember0 gTrainerParty_Haley1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Janice[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Janice[] = { { .iv = 0, .level = 10, @@ -8365,7 +8365,7 @@ const struct TrainerPartyMember0 gTrainerParty_Janice[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Vivi[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Vivi[] = { { .iv = 100, .level = 15, @@ -8383,7 +8383,7 @@ const struct TrainerPartyMember0 gTrainerParty_Vivi[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Haley2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley2[] = { { .iv = 10, .level = 26, @@ -8396,7 +8396,7 @@ const struct TrainerPartyMember0 gTrainerParty_Haley2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Haley3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley3[] = { { .iv = 20, .level = 29, @@ -8409,7 +8409,7 @@ const struct TrainerPartyMember0 gTrainerParty_Haley3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Haley4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley4[] = { { .iv = 30, .level = 32, @@ -8422,7 +8422,7 @@ const struct TrainerPartyMember0 gTrainerParty_Haley4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Haley5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Haley5[] = { { .iv = 40, .level = 34, @@ -8440,7 +8440,7 @@ const struct TrainerPartyMember0 gTrainerParty_Haley5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Sally[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Sally[] = { { .iv = 0, .level = 16, @@ -8448,7 +8448,7 @@ const struct TrainerPartyMember0 gTrainerParty_Sally[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Robin[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Robin[] = { { .iv = 0, .level = 14, @@ -8466,7 +8466,7 @@ const struct TrainerPartyMember0 gTrainerParty_Robin[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Andrea[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Andrea[] = { { .iv = 100, .level = 41, @@ -8474,7 +8474,7 @@ const struct TrainerPartyMember0 gTrainerParty_Andrea[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Crissy[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Crissy[] = { { .iv = 100, .level = 40, @@ -8487,7 +8487,7 @@ const struct TrainerPartyMember0 gTrainerParty_Crissy[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Rick[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Rick[] = { { .iv = 0, .level = 4, @@ -8500,7 +8500,7 @@ const struct TrainerPartyMember0 gTrainerParty_Rick[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lyle[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lyle[] = { { .iv = 0, .level = 3, @@ -8533,7 +8533,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lyle[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jose[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jose[] = { { .iv = 50, .level = 8, @@ -8551,7 +8551,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jose[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Doug[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Doug[] = { { .iv = 0, .level = 26, @@ -8564,7 +8564,7 @@ const struct TrainerPartyMember0 gTrainerParty_Doug[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Greg[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Greg[] = { { .iv = 0, .level = 26, @@ -8577,7 +8577,7 @@ const struct TrainerPartyMember0 gTrainerParty_Greg[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kent[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kent[] = { { .iv = 0, .level = 26, @@ -8585,7 +8585,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kent[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_James1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_James1[] = { { .iv = 0, .level = 8, @@ -8593,7 +8593,7 @@ const struct TrainerPartyMember0 gTrainerParty_James1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_James2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_James2[] = { { .iv = 10, .level = 27, @@ -8601,7 +8601,7 @@ const struct TrainerPartyMember0 gTrainerParty_James2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_James3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_James3[] = { { .iv = 20, .level = 29, @@ -8614,7 +8614,7 @@ const struct TrainerPartyMember0 gTrainerParty_James3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_James4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_James4[] = { { .iv = 30, .level = 31, @@ -8632,7 +8632,7 @@ const struct TrainerPartyMember0 gTrainerParty_James4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_James5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_James5[] = { { .iv = 40, .level = 33, @@ -8655,7 +8655,7 @@ const struct TrainerPartyMember0 gTrainerParty_James5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brice[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brice[] = { { .iv = 0, .level = 18, @@ -8668,7 +8668,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brice[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Trent1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent1[] = { { .iv = 0, .level = 16, @@ -8691,7 +8691,7 @@ const struct TrainerPartyMember0 gTrainerParty_Trent1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lenny[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lenny[] = { { .iv = 0, .level = 19, @@ -8704,7 +8704,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lenny[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Lucas1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Lucas1[] = { { .iv = 0, .level = 18, @@ -8722,7 +8722,7 @@ const struct TrainerPartyMember0 gTrainerParty_Lucas1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Alan[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alan[] = { { .iv = 0, .level = 22, @@ -8740,7 +8740,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alan[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Clark[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Clark[] = { { .iv = 0, .level = 8, @@ -8758,7 +8758,7 @@ const struct TrainerPartyMember0 gTrainerParty_Clark[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Eric[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eric[] = { { .iv = 0, .level = 21, @@ -8771,7 +8771,7 @@ const struct TrainerPartyMember0 gTrainerParty_Eric[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Lucas2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Lucas2[] = { { .iv = 0, .level = 9, @@ -8780,7 +8780,7 @@ const struct TrainerPartyMember1 gTrainerParty_Lucas2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Mike1[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Mike1[] = { { .iv = 0, .level = 10, @@ -8795,7 +8795,7 @@ const struct TrainerPartyMember1 gTrainerParty_Mike1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Mike2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Mike2[] = { { .iv = 0, .level = 16, @@ -8813,7 +8813,7 @@ const struct TrainerPartyMember0 gTrainerParty_Mike2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Trent2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent2[] = { { .iv = 10, .level = 24, @@ -8836,7 +8836,7 @@ const struct TrainerPartyMember0 gTrainerParty_Trent2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Trent3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent3[] = { { .iv = 20, .level = 27, @@ -8859,7 +8859,7 @@ const struct TrainerPartyMember0 gTrainerParty_Trent3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Trent4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent4[] = { { .iv = 30, .level = 30, @@ -8882,7 +8882,7 @@ const struct TrainerPartyMember0 gTrainerParty_Trent4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Trent5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Trent5[] = { { .iv = 40, .level = 33, @@ -8905,7 +8905,7 @@ const struct TrainerPartyMember0 gTrainerParty_Trent5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_DezAndLuke[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_DezAndLuke[] = { { .iv = 0, .level = 32, @@ -8918,7 +8918,7 @@ const struct TrainerPartyMember0 gTrainerParty_DezAndLuke[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_LeaAndJed[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_LeaAndJed[] = { { .iv = 0, .level = 45, @@ -8931,7 +8931,7 @@ const struct TrainerPartyMember0 gTrainerParty_LeaAndJed[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_LoisAndHal1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_LoisAndHal1[] = { { .iv = 0, .level = 27, @@ -8944,7 +8944,7 @@ const struct TrainerPartyMember0 gTrainerParty_LoisAndHal1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_LoisAndHal2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_LoisAndHal2[] = { { .iv = 10, .level = 30, @@ -8957,7 +8957,7 @@ const struct TrainerPartyMember0 gTrainerParty_LoisAndHal2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_LoisAndHal3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_LoisAndHal3[] = { { .iv = 20, .level = 33, @@ -8970,7 +8970,7 @@ const struct TrainerPartyMember0 gTrainerParty_LoisAndHal3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_LoisAndHal4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_LoisAndHal4[] = { { .iv = 30, .level = 36, @@ -8983,7 +8983,7 @@ const struct TrainerPartyMember0 gTrainerParty_LoisAndHal4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_LoisAndHal5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_LoisAndHal5[] = { { .iv = 40, .level = 39, @@ -8996,7 +8996,7 @@ const struct TrainerPartyMember0 gTrainerParty_LoisAndHal5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Johanna[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Johanna[] = { { .iv = 0, .level = 13, @@ -9004,7 +9004,7 @@ const struct TrainerPartyMember0 gTrainerParty_Johanna[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Zane[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Zane[] = { { .iv = 100, .level = 24, @@ -9013,7 +9013,7 @@ const struct TrainerPartyMember1 gTrainerParty_Zane[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Vivian[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Vivian[] = { { .iv = 100, .level = 19, @@ -9022,7 +9022,7 @@ const struct TrainerPartyMember1 gTrainerParty_Vivian[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Sadie[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Sadie[] = { { .iv = 100, .level = 24, @@ -9031,7 +9031,7 @@ const struct TrainerPartyMember1 gTrainerParty_Sadie[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Hideo2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Hideo2[] = { { .iv = 0, .level = 26, @@ -9046,7 +9046,7 @@ const struct TrainerPartyMember1 gTrainerParty_Hideo2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Keigo[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Keigo[] = { { .iv = 0, .level = 29, @@ -9061,7 +9061,7 @@ const struct TrainerPartyMember1 gTrainerParty_Keigo[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Tsunao[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Tsunao[] = { { .iv = 0, .level = 28, @@ -9082,7 +9082,7 @@ const struct TrainerPartyMember1 gTrainerParty_Tsunao[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Terrell[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Terrell[] = { { .iv = 100, .level = 29, @@ -9095,7 +9095,7 @@ const struct TrainerPartyMember0 gTrainerParty_Terrell[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Kylee[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Kylee[] = { { .iv = 100, .level = 30, @@ -9103,7 +9103,7 @@ const struct TrainerPartyMember0 gTrainerParty_Kylee[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Wally2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wally2[] = { { .iv = 30, .level = 16, @@ -9111,7 +9111,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wally2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Wally3[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally3[] = { { .iv = 150, .level = 47, @@ -9144,7 +9144,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wally3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Wally4[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally4[] = { { .iv = 150, .level = 50, @@ -9177,7 +9177,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wally4[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Wally5[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally5[] = { { .iv = 150, .level = 53, @@ -9210,7 +9210,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wally5[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_Wally6[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_Wally6[] = { { .iv = 150, .level = 56, @@ -9243,7 +9243,7 @@ const struct TrainerPartyMember1 gTrainerParty_Wally6[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan10[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan10[] = { { .iv = 150, .level = 31, @@ -9266,7 +9266,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan10[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan11[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan11[] = { { .iv = 150, .level = 31, @@ -9289,7 +9289,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan11[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Brendan12[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Brendan12[] = { { .iv = 150, .level = 31, @@ -9312,7 +9312,7 @@ const struct TrainerPartyMember0 gTrainerParty_Brendan12[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May10[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May10[] = { { .iv = 150, .level = 31, @@ -9335,7 +9335,7 @@ const struct TrainerPartyMember0 gTrainerParty_May10[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May11[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May11[] = { { .iv = 150, .level = 31, @@ -9358,7 +9358,7 @@ const struct TrainerPartyMember0 gTrainerParty_May11[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_May12[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_May12[] = { { .iv = 150, .level = 31, @@ -9381,7 +9381,7 @@ const struct TrainerPartyMember0 gTrainerParty_May12[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Jonah[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Jonah[] = { { .iv = 0, .level = 34, @@ -9404,7 +9404,7 @@ const struct TrainerPartyMember0 gTrainerParty_Jonah[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Henry[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Henry[] = { { .iv = 0, .level = 31, @@ -9422,7 +9422,7 @@ const struct TrainerPartyMember0 gTrainerParty_Henry[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Roger[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Roger[] = { { .iv = 0, .level = 15, @@ -9445,7 +9445,7 @@ const struct TrainerPartyMember0 gTrainerParty_Roger[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Alexa[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Alexa[] = { { .iv = 100, .level = 35, @@ -9458,7 +9458,7 @@ const struct TrainerPartyMember0 gTrainerParty_Alexa[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Ruben[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Ruben[] = { { .iv = 100, .level = 34, @@ -9476,7 +9476,7 @@ const struct TrainerPartyMember0 gTrainerParty_Ruben[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Koji[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Koji[] = { { .iv = 100, .level = 34, @@ -9489,7 +9489,7 @@ const struct TrainerPartyMember0 gTrainerParty_Koji[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Wayne[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Wayne[] = { { .iv = 0, .level = 30, @@ -9512,7 +9512,7 @@ const struct TrainerPartyMember0 gTrainerParty_Wayne[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Byron[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Byron[] = { { .iv = 0, .level = 34, @@ -9525,7 +9525,7 @@ const struct TrainerPartyMember0 gTrainerParty_Byron[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Reed[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Reed[] = { { .iv = 0, .level = 32, @@ -9548,7 +9548,7 @@ const struct TrainerPartyMember0 gTrainerParty_Reed[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Tisha[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Tisha[] = { { .iv = 0, .level = 33, @@ -9566,7 +9566,7 @@ const struct TrainerPartyMember0 gTrainerParty_Tisha[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_ToriAndTia[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_ToriAndTia[] = { { .iv = 0, .level = 20, @@ -9579,7 +9579,7 @@ const struct TrainerPartyMember0 gTrainerParty_ToriAndTia[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_KimAndIris[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_KimAndIris[] = { { .iv = 0, .level = 34, @@ -9594,7 +9594,7 @@ const struct TrainerPartyMember1 gTrainerParty_KimAndIris[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_TyraAndIvy[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_TyraAndIvy[] = { { .iv = 0, .level = 19, @@ -9609,7 +9609,7 @@ const struct TrainerPartyMember1 gTrainerParty_TyraAndIvy[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_MelAndPaul[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_MelAndPaul[] = { { .iv = 0, .level = 27, @@ -9624,7 +9624,7 @@ const struct TrainerPartyMember1 gTrainerParty_MelAndPaul[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_JohnAndJay1[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay1[] = { { .iv = 200, .level = 40, @@ -9639,7 +9639,7 @@ const struct TrainerPartyMember1 gTrainerParty_JohnAndJay1[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_JohnAndJay2[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay2[] = { { .iv = 210, .level = 43, @@ -9654,7 +9654,7 @@ const struct TrainerPartyMember1 gTrainerParty_JohnAndJay2[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_JohnAndJay3[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay3[] = { { .iv = 220, .level = 46, @@ -9669,7 +9669,7 @@ const struct TrainerPartyMember1 gTrainerParty_JohnAndJay3[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_JohnAndJay4[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay4[] = { { .iv = 230, .level = 49, @@ -9684,7 +9684,7 @@ const struct TrainerPartyMember1 gTrainerParty_JohnAndJay4[] = { } }; -const struct TrainerPartyMember1 gTrainerParty_JohnAndJay5[] = { +const struct TrainerMonNoItemCustomMoves gTrainerParty_JohnAndJay5[] = { { .iv = 240, .level = 52, @@ -9699,7 +9699,7 @@ const struct TrainerPartyMember1 gTrainerParty_JohnAndJay5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_ReliAndIan[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_ReliAndIan[] = { { .iv = 0, .level = 36, @@ -9712,7 +9712,7 @@ const struct TrainerPartyMember0 gTrainerParty_ReliAndIan[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_RitaAndSam1[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_RitaAndSam1[] = { { .iv = 0, .level = 36, @@ -9725,7 +9725,7 @@ const struct TrainerPartyMember0 gTrainerParty_RitaAndSam1[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_RitaAndSam2[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_RitaAndSam2[] = { { .iv = 0, .level = 42, @@ -9738,7 +9738,7 @@ const struct TrainerPartyMember0 gTrainerParty_RitaAndSam2[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_RitaAndSam3[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_RitaAndSam3[] = { { .iv = 0, .level = 45, @@ -9751,7 +9751,7 @@ const struct TrainerPartyMember0 gTrainerParty_RitaAndSam3[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_RitaAndSam4[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_RitaAndSam4[] = { { .iv = 0, .level = 48, @@ -9764,7 +9764,7 @@ const struct TrainerPartyMember0 gTrainerParty_RitaAndSam4[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_RitaAndSam5[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_RitaAndSam5[] = { { .iv = 0, .level = 51, @@ -9777,7 +9777,7 @@ const struct TrainerPartyMember0 gTrainerParty_RitaAndSam5[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_LisaAndRay[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_LisaAndRay[] = { { .iv = 0, .level = 28, @@ -9790,7 +9790,7 @@ const struct TrainerPartyMember0 gTrainerParty_LisaAndRay[] = { } }; -const struct TrainerPartyMember0 gTrainerParty_Eugene[] = { +const struct TrainerMonNoItemDefaultMoves gTrainerParty_Eugene[] = { { .iv = 0, .level = 30, diff --git a/src/data/trainers_de.h b/src/data/trainers_de.h index c7a0e7744..46d64d8dc 100644 --- a/src/data/trainers_de.h +++ b/src/data/trainers_de.h @@ -1,5 +1,5 @@ const struct Trainer gTrainers[] = { - [OPPONENT_NONE] = + [TRAINER_NONE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_1, @@ -10,10 +10,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 0, - .party = NULL + .party = {.NoItemDefaultMoves = NULL } }, - [OPPONENT_ARCHIE_1] = + [TRAINER_ARCHIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_LEADER, @@ -24,10 +24,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Archie1 + .party = {.NoItemDefaultMoves = gTrainerParty_Archie1 } }, - [OPPONENT_GRUNT_1] = + [TRAINER_GRUNT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -38,10 +38,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt1 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt1 } }, - [OPPONENT_GRUNT_2] = + [TRAINER_GRUNT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -52,10 +52,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Grunt2 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt2 } }, - [OPPONENT_GRUNT_3] = + [TRAINER_GRUNT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -66,10 +66,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt3 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt3 } }, - [OPPONENT_GRUNT_4] = + [TRAINER_GRUNT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -80,10 +80,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt4 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt4 } }, - [OPPONENT_GRUNT_5] = + [TRAINER_GRUNT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -94,10 +94,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt5 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt5 } }, - [OPPONENT_GRUNT_6] = + [TRAINER_GRUNT_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -108,10 +108,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt6 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt6 } }, - [OPPONENT_GRUNT_7] = + [TRAINER_GRUNT_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -122,10 +122,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt7 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt7 } }, - [OPPONENT_GRUNT_8] = + [TRAINER_GRUNT_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -136,10 +136,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt8 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt8 } }, - [OPPONENT_GRUNT_9] = + [TRAINER_GRUNT_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -150,10 +150,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt9 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt9 } }, - [OPPONENT_GRUNT_10] = + [TRAINER_GRUNT_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -164,10 +164,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt10 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt10 } }, - [OPPONENT_GRUNT_11] = + [TRAINER_GRUNT_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -178,10 +178,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt11 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt11 } }, - [OPPONENT_GRUNT_12] = + [TRAINER_GRUNT_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -192,10 +192,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt12 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt12 } }, - [OPPONENT_GRUNT_13] = + [TRAINER_GRUNT_13] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -206,10 +206,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt13 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt13 } }, - [OPPONENT_GRUNT_14] = + [TRAINER_GRUNT_14] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -220,10 +220,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt14 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt14 } }, - [OPPONENT_GRUNT_15] = + [TRAINER_GRUNT_15] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -234,10 +234,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt15 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt15 } }, - [OPPONENT_GRUNT_16] = + [TRAINER_GRUNT_16] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -248,10 +248,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt16 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt16 } }, - [OPPONENT_GRUNT_17] = + [TRAINER_GRUNT_17] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -262,10 +262,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt17 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt17 } }, - [OPPONENT_GRUNT_18] = + [TRAINER_GRUNT_18] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -276,10 +276,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt18 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt18 } }, - [OPPONENT_GRUNT_19] = + [TRAINER_GRUNT_19] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -290,10 +290,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt19 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt19 } }, - [OPPONENT_GRUNT_20] = + [TRAINER_GRUNT_20] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -304,10 +304,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt20 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt20 } }, - [OPPONENT_GRUNT_21] = + [TRAINER_GRUNT_21] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -318,10 +318,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt21 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt21 } }, - [OPPONENT_GRUNT_22] = + [TRAINER_GRUNT_22] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -332,10 +332,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt22 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt22 } }, - [OPPONENT_GRUNT_23] = + [TRAINER_GRUNT_23] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -346,10 +346,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt23 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt23 } }, - [OPPONENT_GRUNT_24] = + [TRAINER_GRUNT_24] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -360,10 +360,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt24 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt24 } }, - [OPPONENT_GRUNT_25] = + [TRAINER_GRUNT_25] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -374,10 +374,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt25 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt25 } }, - [OPPONENT_GRUNT_26] = + [TRAINER_GRUNT_26] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -388,10 +388,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt26 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt26 } }, - [OPPONENT_GRUNT_27] = + [TRAINER_GRUNT_27] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -402,10 +402,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt27 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt27 } }, - [OPPONENT_ANONYMOUS_1] = + [TRAINER_ANONYMOUS_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -416,10 +416,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Anonymous1 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous1 } }, - [OPPONENT_MATT_1] = + [TRAINER_MATT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -430,10 +430,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Matt1 + .party = {.NoItemDefaultMoves = gTrainerParty_Matt1 } }, - [OPPONENT_MATT_2] = + [TRAINER_MATT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -444,10 +444,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 3, - .party = gTrainerParty_Matt2 + .party = {.NoItemDefaultMoves = gTrainerParty_Matt2 } }, - [OPPONENT_SHELLY_1] = + [TRAINER_SHELLY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -458,10 +458,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelly1 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelly1 } }, - [OPPONENT_SHELLY_2] = + [TRAINER_SHELLY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -472,10 +472,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelly2 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelly2 } }, - [OPPONENT_ARCHIE_2] = + [TRAINER_ARCHIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_LEADER, @@ -486,10 +486,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Archie2 + .party = {.NoItemDefaultMoves = gTrainerParty_Archie2 } }, - [OPPONENT_ARCHIE_3] = + [TRAINER_ARCHIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_LEADER, @@ -500,10 +500,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Archie3 + .party = {.NoItemDefaultMoves = gTrainerParty_Archie3 } }, - [OPPONENT_DAISY] = + [TRAINER_DAISY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -514,10 +514,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Daisy + .party = {.NoItemDefaultMoves = gTrainerParty_Daisy } }, - [OPPONENT_ROSE_1] = + [TRAINER_ROSE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -528,10 +528,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Rose1 + .party = {.NoItemDefaultMoves = gTrainerParty_Rose1 } }, - [OPPONENT_LILY] = + [TRAINER_LILY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -542,10 +542,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lily + .party = {.NoItemDefaultMoves = gTrainerParty_Lily } }, - [OPPONENT_VIOLET] = + [TRAINER_VIOLET] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -556,10 +556,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Violet + .party = {.NoItemDefaultMoves = gTrainerParty_Violet } }, - [OPPONENT_ROSE_2] = + [TRAINER_ROSE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -570,10 +570,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Rose2 + .party = {.NoItemDefaultMoves = gTrainerParty_Rose2 } }, - [OPPONENT_ROSE_3] = + [TRAINER_ROSE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -584,10 +584,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Rose3 + .party = {.NoItemDefaultMoves = gTrainerParty_Rose3 } }, - [OPPONENT_ROSE_4] = + [TRAINER_ROSE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -598,10 +598,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Rose4 + .party = {.NoItemDefaultMoves = gTrainerParty_Rose4 } }, - [OPPONENT_ROSE_5] = + [TRAINER_ROSE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -612,10 +612,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Rose5 + .party = {.NoItemDefaultMoves = gTrainerParty_Rose5 } }, - [OPPONENT_DUSTY_1] = + [TRAINER_DUSTY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -626,10 +626,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dusty1 + .party = {.NoItemCustomMoves = gTrainerParty_Dusty1 } }, - [OPPONENT_CHIP] = + [TRAINER_CHIP] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -640,10 +640,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Chip + .party = {.NoItemCustomMoves = gTrainerParty_Chip } }, - [OPPONENT_FOSTER] = + [TRAINER_FOSTER] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -654,10 +654,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Foster + .party = {.NoItemCustomMoves = gTrainerParty_Foster } }, - [OPPONENT_DUSTY_2] = + [TRAINER_DUSTY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -668,10 +668,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dusty2 + .party = {.NoItemCustomMoves = gTrainerParty_Dusty2 } }, - [OPPONENT_DUSTY_3] = + [TRAINER_DUSTY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -682,10 +682,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dusty3 + .party = {.NoItemCustomMoves = gTrainerParty_Dusty3 } }, - [OPPONENT_DUSTY_4] = + [TRAINER_DUSTY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -696,10 +696,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dusty4 + .party = {.NoItemCustomMoves = gTrainerParty_Dusty4 } }, - [OPPONENT_DUSTY_5] = + [TRAINER_DUSTY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -710,10 +710,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dusty5 + .party = {.NoItemCustomMoves = gTrainerParty_Dusty5 } }, - [OPPONENT_GABBY_AND_TY_1] = + [TRAINER_GABBY_AND_TY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -724,10 +724,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy1 + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy1 } }, - [OPPONENT_GABBY_AND_TY_2] = + [TRAINER_GABBY_AND_TY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -738,10 +738,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy2 + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy2 } }, - [OPPONENT_GABBY_AND_TY_3] = + [TRAINER_GABBY_AND_TY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -752,10 +752,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy3 + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy3 } }, - [OPPONENT_GABBY_AND_TY_4] = + [TRAINER_GABBY_AND_TY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -766,10 +766,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy4 + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy4 } }, - [OPPONENT_GABBY_AND_TY_5] = + [TRAINER_GABBY_AND_TY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -780,10 +780,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy5 + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy5 } }, - [OPPONENT_GABBY_AND_TY_6] = + [TRAINER_GABBY_AND_TY_6] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -794,10 +794,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy6 + .party = {.NoItemCustomMoves = gTrainerParty_GabbyAndTy6 } }, - [OPPONENT_LOLA_1] = + [TRAINER_LOLA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -808,10 +808,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lola1 + .party = {.NoItemDefaultMoves = gTrainerParty_Lola1 } }, - [OPPONENT_CARMEN] = + [TRAINER_CARMEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -822,10 +822,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Carmen + .party = {.NoItemDefaultMoves = gTrainerParty_Carmen } }, - [OPPONENT_GWEN] = + [TRAINER_GWEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -836,10 +836,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Gwen + .party = {.NoItemDefaultMoves = gTrainerParty_Gwen } }, - [OPPONENT_LOLA_2] = + [TRAINER_LOLA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -850,10 +850,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lola2 + .party = {.NoItemDefaultMoves = gTrainerParty_Lola2 } }, - [OPPONENT_LOLA_3] = + [TRAINER_LOLA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -864,10 +864,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lola3 + .party = {.NoItemDefaultMoves = gTrainerParty_Lola3 } }, - [OPPONENT_LOLA_4] = + [TRAINER_LOLA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -878,10 +878,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lola4 + .party = {.NoItemDefaultMoves = gTrainerParty_Lola4 } }, - [OPPONENT_LOLA_5] = + [TRAINER_LOLA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -892,10 +892,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lola5 + .party = {.NoItemDefaultMoves = gTrainerParty_Lola5 } }, - [OPPONENT_RICKY_1] = + [TRAINER_RICKY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -906,10 +906,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ricky1 + .party = {.NoItemCustomMoves = gTrainerParty_Ricky1 } }, - [OPPONENT_SIMON] = + [TRAINER_SIMON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -920,10 +920,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Simon + .party = {.NoItemDefaultMoves = gTrainerParty_Simon } }, - [OPPONENT_CHARLIE] = + [TRAINER_CHARLIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -934,10 +934,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Charlie + .party = {.NoItemDefaultMoves = gTrainerParty_Charlie } }, - [OPPONENT_RICKY_2] = + [TRAINER_RICKY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -948,10 +948,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ricky2 + .party = {.NoItemCustomMoves = gTrainerParty_Ricky2 } }, - [OPPONENT_RICKY_3] = + [TRAINER_RICKY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -962,10 +962,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ricky3 + .party = {.NoItemCustomMoves = gTrainerParty_Ricky3 } }, - [OPPONENT_RICKY_4] = + [TRAINER_RICKY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -976,10 +976,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ricky4 + .party = {.NoItemCustomMoves = gTrainerParty_Ricky4 } }, - [OPPONENT_RICKY_5] = + [TRAINER_RICKY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -990,10 +990,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ricky5 + .party = {.NoItemCustomMoves = gTrainerParty_Ricky5 } }, - [OPPONENT_RANDALL] = + [TRAINER_RANDALL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1004,10 +1004,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Randall + .party = {.NoItemDefaultMoves = gTrainerParty_Randall } }, - [OPPONENT_PARKER] = + [TRAINER_PARKER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1018,10 +1018,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Parker + .party = {.NoItemDefaultMoves = gTrainerParty_Parker } }, - [OPPONENT_GEORGE] = + [TRAINER_GEORGE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1032,10 +1032,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_George + .party = {.NoItemDefaultMoves = gTrainerParty_George } }, - [OPPONENT_BERKE] = + [TRAINER_BERKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1046,10 +1046,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Berke + .party = {.NoItemDefaultMoves = gTrainerParty_Berke } }, - [OPPONENT_CLYDE] = + [TRAINER_CLYDE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1060,10 +1060,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Clyde + .party = {.NoItemCustomMoves = gTrainerParty_Clyde } }, - [OPPONENT_VINCENT] = + [TRAINER_VINCENT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1074,10 +1074,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Vincent + .party = {.NoItemDefaultMoves = gTrainerParty_Vincent } }, - [OPPONENT_LEROY] = + [TRAINER_LEROY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1088,10 +1088,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Leroy + .party = {.NoItemDefaultMoves = gTrainerParty_Leroy } }, - [OPPONENT_WILTON_1] = + [TRAINER_WILTON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1102,10 +1102,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wilton1 + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton1 } }, - [OPPONENT_EDGAR] = + [TRAINER_EDGAR] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1116,10 +1116,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Edgar + .party = {.NoItemDefaultMoves = gTrainerParty_Edgar } }, - [OPPONENT_ALBERT] = + [TRAINER_ALBERT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1130,10 +1130,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Albert + .party = {.NoItemDefaultMoves = gTrainerParty_Albert } }, - [OPPONENT_SAMUEL] = + [TRAINER_SAMUEL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1144,10 +1144,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Samuel + .party = {.NoItemDefaultMoves = gTrainerParty_Samuel } }, - [OPPONENT_VITO] = + [TRAINER_VITO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1158,10 +1158,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_Vito + .party = {.NoItemDefaultMoves = gTrainerParty_Vito } }, - [OPPONENT_OWEN] = + [TRAINER_OWEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1172,10 +1172,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Owen + .party = {.NoItemDefaultMoves = gTrainerParty_Owen } }, - [OPPONENT_WILTON_2] = + [TRAINER_WILTON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1186,10 +1186,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wilton2 + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton2 } }, - [OPPONENT_WILTON_3] = + [TRAINER_WILTON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1200,10 +1200,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wilton3 + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton3 } }, - [OPPONENT_WILTON_4] = + [TRAINER_WILTON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1214,10 +1214,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wilton4 + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton4 } }, - [OPPONENT_WILTON_5] = + [TRAINER_WILTON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1228,10 +1228,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wilton5 + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton5 } }, - [OPPONENT_WARREN] = + [TRAINER_WARREN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1242,10 +1242,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Warren + .party = {.NoItemDefaultMoves = gTrainerParty_Warren } }, - [OPPONENT_MARY] = + [TRAINER_MARY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1256,10 +1256,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Mary + .party = {.NoItemDefaultMoves = gTrainerParty_Mary } }, - [OPPONENT_LORI] = + [TRAINER_LORI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1270,10 +1270,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Lori + .party = {.NoItemDefaultMoves = gTrainerParty_Lori } }, - [OPPONENT_JODY] = + [TRAINER_JODY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1284,10 +1284,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 1, - .party = gTrainerParty_Jody + .party = {.NoItemDefaultMoves = gTrainerParty_Jody } }, - [OPPONENT_WENDY] = + [TRAINER_WENDY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1298,10 +1298,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 3, - .party = gTrainerParty_Wendy + .party = {.NoItemCustomMoves = gTrainerParty_Wendy } }, - [OPPONENT_ELAINE] = + [TRAINER_ELAINE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1312,10 +1312,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Elaine + .party = {.NoItemDefaultMoves = gTrainerParty_Elaine } }, - [OPPONENT_BROOKE_1] = + [TRAINER_BROOKE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1326,10 +1326,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brooke1 + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke1 } }, - [OPPONENT_JENNIFER] = + [TRAINER_JENNIFER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1340,10 +1340,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Jennifer + .party = {.NoItemDefaultMoves = gTrainerParty_Jennifer } }, - [OPPONENT_HOPE] = + [TRAINER_HOPE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1354,10 +1354,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Hope + .party = {.NoItemDefaultMoves = gTrainerParty_Hope } }, - [OPPONENT_SHANNON] = + [TRAINER_SHANNON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1368,10 +1368,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Shannon + .party = {.NoItemDefaultMoves = gTrainerParty_Shannon } }, - [OPPONENT_MICHELLE] = + [TRAINER_MICHELLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1382,10 +1382,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Michelle + .party = {.NoItemDefaultMoves = gTrainerParty_Michelle } }, - [OPPONENT_CAROLINE] = + [TRAINER_CAROLINE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1396,10 +1396,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Caroline + .party = {.NoItemDefaultMoves = gTrainerParty_Caroline } }, - [OPPONENT_JULIE] = + [TRAINER_JULIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1410,10 +1410,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Julie + .party = {.NoItemDefaultMoves = gTrainerParty_Julie } }, - [OPPONENT_BROOKE_2] = + [TRAINER_BROOKE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1424,10 +1424,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brooke2 + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke2 } }, - [OPPONENT_BROOKE_3] = + [TRAINER_BROOKE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1438,10 +1438,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brooke3 + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke3 } }, - [OPPONENT_BROOKE_4] = + [TRAINER_BROOKE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1452,10 +1452,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brooke4 + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke4 } }, - [OPPONENT_BROOKE_5] = + [TRAINER_BROOKE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1466,10 +1466,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brooke5 + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke5 } }, - [OPPONENT_PATRICIA] = + [TRAINER_PATRICIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1480,10 +1480,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Patricia + .party = {.NoItemDefaultMoves = gTrainerParty_Patricia } }, - [OPPONENT_KINDRA] = + [TRAINER_KINDRA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1494,10 +1494,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Kindra + .party = {.NoItemDefaultMoves = gTrainerParty_Kindra } }, - [OPPONENT_TAMMY] = + [TRAINER_TAMMY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1508,10 +1508,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tammy + .party = {.NoItemDefaultMoves = gTrainerParty_Tammy } }, - [OPPONENT_VALERIE_1] = + [TRAINER_VALERIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1522,10 +1522,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Valerie1 + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie1 } }, - [OPPONENT_TASHA] = + [TRAINER_TASHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1536,10 +1536,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tasha + .party = {.NoItemDefaultMoves = gTrainerParty_Tasha } }, - [OPPONENT_VALERIE_2] = + [TRAINER_VALERIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1550,10 +1550,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Valerie2 + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie2 } }, - [OPPONENT_VALERIE_3] = + [TRAINER_VALERIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1564,10 +1564,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Valerie3 + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie3 } }, - [OPPONENT_VALERIE_4] = + [TRAINER_VALERIE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1578,10 +1578,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Valerie4 + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie4 } }, - [OPPONENT_VALERIE_5] = + [TRAINER_VALERIE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1592,10 +1592,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Valerie5 + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie5 } }, - [OPPONENT_CINDY_1] = + [TRAINER_CINDY_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1606,10 +1606,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy1 + .party = {.ItemDefaultMoves = gTrainerParty_Cindy1 } }, - [OPPONENT_ANONYMOUS_2] = + [TRAINER_ANONYMOUS_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LADY, @@ -1620,10 +1620,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous2 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous2 } }, - [OPPONENT_BRIANNA_1] = + [TRAINER_BRIANNA_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LADY, @@ -1634,10 +1634,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Brianna1 + .party = {.NoItemCustomMoves = gTrainerParty_Brianna1 } }, - [OPPONENT_CINDY_2] = + [TRAINER_CINDY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LADY, @@ -1648,10 +1648,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy2 + .party = {.NoItemCustomMoves = gTrainerParty_Cindy2 } }, - [OPPONENT_BRIANNA_2] = + [TRAINER_BRIANNA_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1662,10 +1662,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Brianna2 + .party = {.ItemDefaultMoves = gTrainerParty_Brianna2 } }, - [OPPONENT_ANETTE] = + [TRAINER_ANETTE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1676,10 +1676,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anette + .party = {.ItemDefaultMoves = gTrainerParty_Anette } }, - [OPPONENT_CINDY_3] = + [TRAINER_CINDY_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1690,10 +1690,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy3 + .party = {.ItemDefaultMoves = gTrainerParty_Cindy3 } }, - [OPPONENT_CINDY_4] = + [TRAINER_CINDY_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1704,10 +1704,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy4 + .party = {.ItemDefaultMoves = gTrainerParty_Cindy4 } }, - [OPPONENT_CINDY_5] = + [TRAINER_CINDY_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1718,10 +1718,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy5 + .party = {.ItemDefaultMoves = gTrainerParty_Cindy5 } }, - [OPPONENT_CINDY_6] = + [TRAINER_CINDY_6] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LADY, @@ -1732,10 +1732,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy6 + .party = {.ItemCustomMoves = gTrainerParty_Cindy6 } }, - [OPPONENT_MELISSA] = + [TRAINER_MELISSA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1746,10 +1746,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Melissa + .party = {.NoItemDefaultMoves = gTrainerParty_Melissa } }, - [OPPONENT_SHEILA] = + [TRAINER_SHEILA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1760,10 +1760,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Sheila + .party = {.NoItemDefaultMoves = gTrainerParty_Sheila } }, - [OPPONENT_SHIRLEY] = + [TRAINER_SHIRLEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1774,10 +1774,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Shirley + .party = {.NoItemDefaultMoves = gTrainerParty_Shirley } }, - [OPPONENT_JESSICA_1] = + [TRAINER_JESSICA_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1788,10 +1788,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jessica1 + .party = {.NoItemCustomMoves = gTrainerParty_Jessica1 } }, - [OPPONENT_CONNIE] = + [TRAINER_CONNIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1802,10 +1802,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Connie + .party = {.NoItemDefaultMoves = gTrainerParty_Connie } }, - [OPPONENT_BRIDGET] = + [TRAINER_BRIDGET] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1816,10 +1816,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Bridget + .party = {.NoItemDefaultMoves = gTrainerParty_Bridget } }, - [OPPONENT_OLIVIA] = + [TRAINER_OLIVIA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1830,10 +1830,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Olivia + .party = {.NoItemCustomMoves = gTrainerParty_Olivia } }, - [OPPONENT_TIFFANY] = + [TRAINER_TIFFANY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1844,10 +1844,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Tiffany + .party = {.NoItemDefaultMoves = gTrainerParty_Tiffany } }, - [OPPONENT_JESSICA_2] = + [TRAINER_JESSICA_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1858,10 +1858,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jessica2 + .party = {.NoItemCustomMoves = gTrainerParty_Jessica2 } }, - [OPPONENT_JESSICA_3] = + [TRAINER_JESSICA_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1872,10 +1872,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jessica3 + .party = {.NoItemCustomMoves = gTrainerParty_Jessica3 } }, - [OPPONENT_JESSICA_4] = + [TRAINER_JESSICA_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1886,10 +1886,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jessica4 + .party = {.NoItemCustomMoves = gTrainerParty_Jessica4 } }, - [OPPONENT_JESSICA_5] = + [TRAINER_JESSICA_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1900,10 +1900,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jessica5 + .party = {.NoItemCustomMoves = gTrainerParty_Jessica5 } }, - [OPPONENT_WINSTON_1] = + [TRAINER_WINSTON_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1914,10 +1914,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Winston1 + .party = {.ItemDefaultMoves = gTrainerParty_Winston1 } }, - [OPPONENT_ANONYMOUS_3] = + [TRAINER_ANONYMOUS_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1928,10 +1928,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous3 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous3 } }, - [OPPONENT_GARRET] = + [TRAINER_GARRET] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1942,10 +1942,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Garret + .party = {.ItemDefaultMoves = gTrainerParty_Garret } }, - [OPPONENT_WINSTON_2] = + [TRAINER_WINSTON_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1956,10 +1956,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Winston2 + .party = {.ItemDefaultMoves = gTrainerParty_Winston2 } }, - [OPPONENT_WINSTON_3] = + [TRAINER_WINSTON_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1970,10 +1970,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Winston3 + .party = {.ItemDefaultMoves = gTrainerParty_Winston3 } }, - [OPPONENT_WINSTON_4] = + [TRAINER_WINSTON_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1984,10 +1984,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Winston4 + .party = {.ItemDefaultMoves = gTrainerParty_Winston4 } }, - [OPPONENT_WINSTON_5] = + [TRAINER_WINSTON_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1998,10 +1998,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Winston5 + .party = {.ItemCustomMoves = gTrainerParty_Winston5 } }, - [OPPONENT_STEVE_1] = + [TRAINER_STEVE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2012,10 +2012,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Steve1 + .party = {.NoItemDefaultMoves = gTrainerParty_Steve1 } }, - [OPPONENT_CHRIS] = + [TRAINER_CHRIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2026,10 +2026,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Chris + .party = {.NoItemDefaultMoves = gTrainerParty_Chris } }, - [OPPONENT_MARK] = + [TRAINER_MARK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2040,10 +2040,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Mark + .party = {.NoItemDefaultMoves = gTrainerParty_Mark } }, - [OPPONENT_KENN] = + [TRAINER_KENN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2054,10 +2054,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Kenn + .party = {.NoItemDefaultMoves = gTrainerParty_Kenn } }, - [OPPONENT_STEVE_2] = + [TRAINER_STEVE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2068,10 +2068,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Steve2 + .party = {.NoItemDefaultMoves = gTrainerParty_Steve2 } }, - [OPPONENT_STEVE_3] = + [TRAINER_STEVE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2082,10 +2082,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Steve3 + .party = {.NoItemDefaultMoves = gTrainerParty_Steve3 } }, - [OPPONENT_STEVE_4] = + [TRAINER_STEVE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2096,10 +2096,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Steve4 + .party = {.NoItemDefaultMoves = gTrainerParty_Steve4 } }, - [OPPONENT_STEVE_5] = + [TRAINER_STEVE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2110,10 +2110,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Steve5 + .party = {.NoItemDefaultMoves = gTrainerParty_Steve5 } }, - [OPPONENT_LUIS] = + [TRAINER_LUIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2124,10 +2124,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Luis + .party = {.NoItemDefaultMoves = gTrainerParty_Luis } }, - [OPPONENT_AUSTIN] = + [TRAINER_AUSTIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2138,10 +2138,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Austin + .party = {.NoItemDefaultMoves = gTrainerParty_Austin } }, - [OPPONENT_DOUGLAS] = + [TRAINER_DOUGLAS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2152,10 +2152,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Douglas + .party = {.NoItemDefaultMoves = gTrainerParty_Douglas } }, - [OPPONENT_DARRIN] = + [TRAINER_DARRIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2166,10 +2166,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Darrin + .party = {.NoItemDefaultMoves = gTrainerParty_Darrin } }, - [OPPONENT_TONY_1] = + [TRAINER_TONY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2180,10 +2180,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tony1 + .party = {.NoItemDefaultMoves = gTrainerParty_Tony1 } }, - [OPPONENT_JEROME] = + [TRAINER_JEROME] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2194,10 +2194,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jerome + .party = {.NoItemDefaultMoves = gTrainerParty_Jerome } }, - [OPPONENT_MATTHEW] = + [TRAINER_MATTHEW] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2208,10 +2208,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Matthew + .party = {.NoItemDefaultMoves = gTrainerParty_Matthew } }, - [OPPONENT_DAVID] = + [TRAINER_DAVID] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2222,10 +2222,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_David + .party = {.NoItemDefaultMoves = gTrainerParty_David } }, - [OPPONENT_SPENCER] = + [TRAINER_SPENCER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2236,10 +2236,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Spencer + .party = {.NoItemDefaultMoves = gTrainerParty_Spencer } }, - [OPPONENT_ROLAND] = + [TRAINER_ROLAND] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2250,10 +2250,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Roland + .party = {.NoItemDefaultMoves = gTrainerParty_Roland } }, - [OPPONENT_CODY] = + [TRAINER_CODY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2264,10 +2264,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cody + .party = {.NoItemDefaultMoves = gTrainerParty_Cody } }, - [OPPONENT_STAN] = + [TRAINER_STAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2278,10 +2278,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Stan + .party = {.NoItemDefaultMoves = gTrainerParty_Stan } }, - [OPPONENT_BARRY] = + [TRAINER_BARRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2292,10 +2292,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Barry + .party = {.NoItemDefaultMoves = gTrainerParty_Barry } }, - [OPPONENT_DEAN] = + [TRAINER_DEAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2306,10 +2306,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dean + .party = {.NoItemDefaultMoves = gTrainerParty_Dean } }, - [OPPONENT_RODNEY] = + [TRAINER_RODNEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2320,10 +2320,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Rodney + .party = {.NoItemDefaultMoves = gTrainerParty_Rodney } }, - [OPPONENT_RICHARD] = + [TRAINER_RICHARD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2334,10 +2334,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Richard + .party = {.NoItemDefaultMoves = gTrainerParty_Richard } }, - [OPPONENT_HERMAN] = + [TRAINER_HERMAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2348,10 +2348,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Herman + .party = {.NoItemDefaultMoves = gTrainerParty_Herman } }, - [OPPONENT_ANONYMOUS_4] = + [TRAINER_ANONYMOUS_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2362,10 +2362,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous4 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous4 } }, - [OPPONENT_GILBERT] = + [TRAINER_GILBERT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2376,10 +2376,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Gilbert + .party = {.NoItemDefaultMoves = gTrainerParty_Gilbert } }, - [OPPONENT_FRANKLIN] = + [TRAINER_FRANKLIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2390,10 +2390,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Franklin + .party = {.NoItemDefaultMoves = gTrainerParty_Franklin } }, - [OPPONENT_DANNY] = + [TRAINER_DANNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2404,10 +2404,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Danny + .party = {.NoItemDefaultMoves = gTrainerParty_Danny } }, - [OPPONENT_JACK] = + [TRAINER_JACK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2418,10 +2418,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jack + .party = {.NoItemDefaultMoves = gTrainerParty_Jack } }, - [OPPONENT_DUDLEY] = + [TRAINER_DUDLEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2432,10 +2432,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dudley + .party = {.NoItemDefaultMoves = gTrainerParty_Dudley } }, - [OPPONENT_CHAD] = + [TRAINER_CHAD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2446,10 +2446,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Chad + .party = {.NoItemDefaultMoves = gTrainerParty_Chad } }, - [OPPONENT_TONY_2] = + [TRAINER_TONY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2460,10 +2460,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tony2 + .party = {.NoItemDefaultMoves = gTrainerParty_Tony2 } }, - [OPPONENT_TONY_3] = + [TRAINER_TONY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2474,10 +2474,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tony3 + .party = {.NoItemDefaultMoves = gTrainerParty_Tony3 } }, - [OPPONENT_TONY_4] = + [TRAINER_TONY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2488,10 +2488,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tony4 + .party = {.NoItemDefaultMoves = gTrainerParty_Tony4 } }, - [OPPONENT_TONY_5] = + [TRAINER_TONY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2502,10 +2502,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tony5 + .party = {.NoItemDefaultMoves = gTrainerParty_Tony5 } }, - [OPPONENT_HIDEKI] = + [TRAINER_HIDEKI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2516,10 +2516,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Hideki + .party = {.NoItemDefaultMoves = gTrainerParty_Hideki } }, - [OPPONENT_HITOSHI] = + [TRAINER_HITOSHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2530,10 +2530,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Hitoshi + .party = {.NoItemDefaultMoves = gTrainerParty_Hitoshi } }, - [OPPONENT_KIYO] = + [TRAINER_KIYO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2544,10 +2544,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Kiyo + .party = {.NoItemDefaultMoves = gTrainerParty_Kiyo } }, - [OPPONENT_KOICHI] = + [TRAINER_KOICHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2558,10 +2558,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Koichi + .party = {.NoItemDefaultMoves = gTrainerParty_Koichi } }, - [OPPONENT_NOB_1] = + [TRAINER_NOB_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2572,10 +2572,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Nob1 + .party = {.NoItemDefaultMoves = gTrainerParty_Nob1 } }, - [OPPONENT_NOB_2] = + [TRAINER_NOB_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2586,10 +2586,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Nob2 + .party = {.NoItemDefaultMoves = gTrainerParty_Nob2 } }, - [OPPONENT_NOB_3] = + [TRAINER_NOB_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2600,10 +2600,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nob3 + .party = {.NoItemDefaultMoves = gTrainerParty_Nob3 } }, - [OPPONENT_NOB_4] = + [TRAINER_NOB_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2614,10 +2614,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Nob4 + .party = {.NoItemDefaultMoves = gTrainerParty_Nob4 } }, - [OPPONENT_NOB_5] = + [TRAINER_NOB_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2628,10 +2628,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Nob5 + .party = {.ItemDefaultMoves = gTrainerParty_Nob5 } }, - [OPPONENT_YUJI] = + [TRAINER_YUJI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2642,10 +2642,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Yuji + .party = {.NoItemDefaultMoves = gTrainerParty_Yuji } }, - [OPPONENT_DAISUKE] = + [TRAINER_DAISUKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2656,10 +2656,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Daisuke + .party = {.NoItemDefaultMoves = gTrainerParty_Daisuke } }, - [OPPONENT_ATSUSHI] = + [TRAINER_ATSUSHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2670,10 +2670,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Atsushi + .party = {.NoItemDefaultMoves = gTrainerParty_Atsushi } }, - [OPPONENT_KIRK] = + [TRAINER_KIRK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2684,10 +2684,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Kirk + .party = {.NoItemDefaultMoves = gTrainerParty_Kirk } }, - [OPPONENT_SCOTT] = + [TRAINER_SCOTT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2698,10 +2698,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Scott + .party = {.NoItemDefaultMoves = gTrainerParty_Scott } }, - [OPPONENT_HARVEY] = + [TRAINER_HARVEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2712,10 +2712,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Harvey + .party = {.NoItemDefaultMoves = gTrainerParty_Harvey } }, - [OPPONENT_SHAWN] = + [TRAINER_SHAWN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2726,10 +2726,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Shawn + .party = {.NoItemDefaultMoves = gTrainerParty_Shawn } }, - [OPPONENT_RANDY] = + [TRAINER_RANDY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2740,10 +2740,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Randy + .party = {.NoItemDefaultMoves = gTrainerParty_Randy } }, - [OPPONENT_DALTON_1] = + [TRAINER_DALTON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2754,10 +2754,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dalton1 + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton1 } }, - [OPPONENT_DALTON_2] = + [TRAINER_DALTON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2768,10 +2768,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dalton2 + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton2 } }, - [OPPONENT_DALTON_3] = + [TRAINER_DALTON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2782,10 +2782,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dalton3 + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton3 } }, - [OPPONENT_DALTON_4] = + [TRAINER_DALTON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2796,10 +2796,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dalton4 + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton4 } }, - [OPPONENT_DALTON_5] = + [TRAINER_DALTON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2810,10 +2810,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dalton5 + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton5 } }, - [OPPONENT_COLE] = + [TRAINER_COLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2824,10 +2824,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Cole + .party = {.NoItemDefaultMoves = gTrainerParty_Cole } }, - [OPPONENT_FLINT] = + [TRAINER_FLINT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2838,10 +2838,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Flint + .party = {.NoItemDefaultMoves = gTrainerParty_Flint } }, - [OPPONENT_AXLE] = + [TRAINER_AXLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2852,10 +2852,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Axle + .party = {.NoItemDefaultMoves = gTrainerParty_Axle } }, - [OPPONENT_JAKE] = + [TRAINER_JAKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2866,10 +2866,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jake + .party = {.NoItemDefaultMoves = gTrainerParty_Jake } }, - [OPPONENT_ANDY] = + [TRAINER_ANDY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2880,10 +2880,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Andy + .party = {.NoItemDefaultMoves = gTrainerParty_Andy } }, - [OPPONENT_BERNIE_1] = + [TRAINER_BERNIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2894,10 +2894,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Bernie1 + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie1 } }, - [OPPONENT_BERNIE_2] = + [TRAINER_BERNIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2908,10 +2908,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Bernie2 + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie2 } }, - [OPPONENT_BERNIE_3] = + [TRAINER_BERNIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2922,10 +2922,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Bernie3 + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie3 } }, - [OPPONENT_BERNIE_4] = + [TRAINER_BERNIE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2936,10 +2936,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Bernie4 + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie4 } }, - [OPPONENT_BERNIE_5] = + [TRAINER_BERNIE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2950,10 +2950,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Bernie5 + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie5 } }, - [OPPONENT_DREW] = + [TRAINER_DREW] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_CAMPER, @@ -2964,10 +2964,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Drew + .party = {.NoItemCustomMoves = gTrainerParty_Drew } }, - [OPPONENT_CLIFF] = + [TRAINER_CLIFF] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_CAMPER, @@ -2978,10 +2978,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Cliff + .party = {.NoItemCustomMoves = gTrainerParty_Cliff } }, - [OPPONENT_LARRY] = + [TRAINER_LARRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -2992,10 +2992,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Larry + .party = {.NoItemDefaultMoves = gTrainerParty_Larry } }, - [OPPONENT_SHANE] = + [TRAINER_SHANE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3006,10 +3006,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Shane + .party = {.NoItemDefaultMoves = gTrainerParty_Shane } }, - [OPPONENT_JUSTIN] = + [TRAINER_JUSTIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3020,10 +3020,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Justin + .party = {.NoItemDefaultMoves = gTrainerParty_Justin } }, - [OPPONENT_ETHAN_1] = + [TRAINER_ETHAN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3034,10 +3034,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Ethan1 + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan1 } }, - [OPPONENT_JEFF] = + [TRAINER_JEFF] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3048,10 +3048,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jeff + .party = {.NoItemDefaultMoves = gTrainerParty_Jeff } }, - [OPPONENT_TRAVIS] = + [TRAINER_TRAVIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3062,10 +3062,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Travis + .party = {.NoItemDefaultMoves = gTrainerParty_Travis } }, - [OPPONENT_ETHAN_2] = + [TRAINER_ETHAN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3076,10 +3076,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Ethan2 + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan2 } }, - [OPPONENT_ETHAN_3] = + [TRAINER_ETHAN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3090,10 +3090,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Ethan3 + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan3 } }, - [OPPONENT_ETHAN_4] = + [TRAINER_ETHAN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3104,10 +3104,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ethan4 + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan4 } }, - [OPPONENT_ETHAN_5] = + [TRAINER_ETHAN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3118,10 +3118,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ethan5 + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan5 } }, - [OPPONENT_BRENT] = + [TRAINER_BRENT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3132,10 +3132,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Brent + .party = {.NoItemDefaultMoves = gTrainerParty_Brent } }, - [OPPONENT_DONALD] = + [TRAINER_DONALD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3146,10 +3146,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Donald + .party = {.NoItemDefaultMoves = gTrainerParty_Donald } }, - [OPPONENT_TAYLOR] = + [TRAINER_TAYLOR] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3160,10 +3160,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Taylor + .party = {.NoItemDefaultMoves = gTrainerParty_Taylor } }, - [OPPONENT_BRANDON_1] = + [TRAINER_BRANDON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3174,10 +3174,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Brandon1 + .party = {.NoItemDefaultMoves = gTrainerParty_Brandon1 } }, - [OPPONENT_DEREK] = + [TRAINER_DEREK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3188,10 +3188,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Derek + .party = {.NoItemDefaultMoves = gTrainerParty_Derek } }, - [OPPONENT_BRANDON_2] = + [TRAINER_BRANDON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3202,10 +3202,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Brandon2 + .party = {.NoItemDefaultMoves = gTrainerParty_Brandon2 } }, - [OPPONENT_BRANDON_3] = + [TRAINER_BRANDON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3216,10 +3216,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Brandon3 + .party = {.NoItemDefaultMoves = gTrainerParty_Brandon3 } }, - [OPPONENT_BRANDON_4] = + [TRAINER_BRANDON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3230,10 +3230,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Brandon4 + .party = {.NoItemDefaultMoves = gTrainerParty_Brandon4 } }, - [OPPONENT_BRANDON_5] = + [TRAINER_BRANDON_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3244,10 +3244,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 5, - .party = gTrainerParty_Brandon5 + .party = {.ItemDefaultMoves = gTrainerParty_Brandon5 } }, - [OPPONENT_EDWARD] = + [TRAINER_EDWARD] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3258,10 +3258,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Edward + .party = {.NoItemCustomMoves = gTrainerParty_Edward } }, - [OPPONENT_PRESTON] = + [TRAINER_PRESTON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3272,10 +3272,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Preston + .party = {.NoItemDefaultMoves = gTrainerParty_Preston } }, - [OPPONENT_VIRGIL] = + [TRAINER_VIRGIL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3286,10 +3286,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Virgil + .party = {.NoItemDefaultMoves = gTrainerParty_Virgil } }, - [OPPONENT_FRITZ] = + [TRAINER_FRITZ] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3300,10 +3300,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Fritz + .party = {.NoItemDefaultMoves = gTrainerParty_Fritz } }, - [OPPONENT_WILLIAM] = + [TRAINER_WILLIAM] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3314,10 +3314,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_William + .party = {.NoItemDefaultMoves = gTrainerParty_William } }, - [OPPONENT_JOSHUA] = + [TRAINER_JOSHUA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3328,10 +3328,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Joshua + .party = {.NoItemDefaultMoves = gTrainerParty_Joshua } }, - [OPPONENT_CAMERON_1] = + [TRAINER_CAMERON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3342,10 +3342,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cameron1 + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron1 } }, - [OPPONENT_CAMERON_2] = + [TRAINER_CAMERON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3356,10 +3356,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cameron2 + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron2 } }, - [OPPONENT_CAMERON_3] = + [TRAINER_CAMERON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3370,10 +3370,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cameron3 + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron3 } }, - [OPPONENT_CAMERON_4] = + [TRAINER_CAMERON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3384,10 +3384,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cameron4 + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron4 } }, - [OPPONENT_CAMERON_5] = + [TRAINER_CAMERON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3398,10 +3398,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cameron5 + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron5 } }, - [OPPONENT_JACLYN] = + [TRAINER_JACLYN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3412,10 +3412,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jaclyn + .party = {.NoItemCustomMoves = gTrainerParty_Jaclyn } }, - [OPPONENT_HANNAH] = + [TRAINER_HANNAH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3426,10 +3426,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Hannah + .party = {.NoItemDefaultMoves = gTrainerParty_Hannah } }, - [OPPONENT_SAMANTHA] = + [TRAINER_SAMANTHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3440,10 +3440,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Samantha + .party = {.NoItemDefaultMoves = gTrainerParty_Samantha } }, - [OPPONENT_MAURA] = + [TRAINER_MAURA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3454,10 +3454,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Maura + .party = {.NoItemDefaultMoves = gTrainerParty_Maura } }, - [OPPONENT_KAYLA] = + [TRAINER_KAYLA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3468,10 +3468,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Kayla + .party = {.NoItemDefaultMoves = gTrainerParty_Kayla } }, - [OPPONENT_ALEXIS] = + [TRAINER_ALEXIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3482,10 +3482,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Alexis + .party = {.NoItemDefaultMoves = gTrainerParty_Alexis } }, - [OPPONENT_JACKI_1] = + [TRAINER_JACKI_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3496,10 +3496,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jacki1 + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki1 } }, - [OPPONENT_JACKI_2] = + [TRAINER_JACKI_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3510,10 +3510,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jacki2 + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki2 } }, - [OPPONENT_JACKI_3] = + [TRAINER_JACKI_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3524,10 +3524,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jacki3 + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki3 } }, - [OPPONENT_JACKI_4] = + [TRAINER_JACKI_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3538,10 +3538,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jacki4 + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki4 } }, - [OPPONENT_JACKI_5] = + [TRAINER_JACKI_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3552,10 +3552,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jacki5 + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki5 } }, - [OPPONENT_WALTER_1] = + [TRAINER_WALTER_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3566,10 +3566,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Walter1 + .party = {.NoItemDefaultMoves = gTrainerParty_Walter1 } }, - [OPPONENT_TUCKER] = + [TRAINER_TUCKER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3580,10 +3580,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tucker + .party = {.NoItemDefaultMoves = gTrainerParty_Tucker } }, - [OPPONENT_THOMAS] = + [TRAINER_THOMAS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3594,10 +3594,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Thomas + .party = {.NoItemDefaultMoves = gTrainerParty_Thomas } }, - [OPPONENT_WALTER_2] = + [TRAINER_WALTER_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3608,10 +3608,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Walter2 + .party = {.NoItemDefaultMoves = gTrainerParty_Walter2 } }, - [OPPONENT_WALTER_3] = + [TRAINER_WALTER_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3622,10 +3622,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Walter3 + .party = {.NoItemCustomMoves = gTrainerParty_Walter3 } }, - [OPPONENT_WALTER_4] = + [TRAINER_WALTER_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3636,10 +3636,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Walter4 + .party = {.NoItemCustomMoves = gTrainerParty_Walter4 } }, - [OPPONENT_WALTER_5] = + [TRAINER_WALTER_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3650,10 +3650,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Walter5 + .party = {.NoItemCustomMoves = gTrainerParty_Walter5 } }, - [OPPONENT_SIDNEY] = + [TRAINER_SIDNEY] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3664,10 +3664,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Sidney + .party = {.ItemCustomMoves = gTrainerParty_Sidney } }, - [OPPONENT_PHOEBE] = + [TRAINER_PHOEBE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3678,10 +3678,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Phoebe + .party = {.ItemCustomMoves = gTrainerParty_Phoebe } }, - [OPPONENT_GLACIA] = + [TRAINER_GLACIA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3692,10 +3692,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Glacia + .party = {.ItemCustomMoves = gTrainerParty_Glacia } }, - [OPPONENT_DRAKE] = + [TRAINER_DRAKE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3706,10 +3706,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Drake + .party = {.ItemCustomMoves = gTrainerParty_Drake } }, - [OPPONENT_ROXANNE] = + [TRAINER_ROXANNE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3720,10 +3720,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Roxanne + .party = {.NoItemCustomMoves = gTrainerParty_Roxanne } }, - [OPPONENT_BRAWLY] = + [TRAINER_BRAWLY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3734,10 +3734,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Brawly + .party = {.NoItemCustomMoves = gTrainerParty_Brawly } }, - [OPPONENT_WATTSON] = + [TRAINER_WATTSON] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3748,10 +3748,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wattson + .party = {.NoItemCustomMoves = gTrainerParty_Wattson } }, - [OPPONENT_FLANNERY] = + [TRAINER_FLANNERY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3762,10 +3762,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Flannery + .party = {.NoItemCustomMoves = gTrainerParty_Flannery } }, - [OPPONENT_NORMAN] = + [TRAINER_NORMAN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3776,10 +3776,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Norman + .party = {.NoItemCustomMoves = gTrainerParty_Norman } }, - [OPPONENT_WINONA] = + [TRAINER_WINONA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3790,10 +3790,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_Winona + .party = {.NoItemCustomMoves = gTrainerParty_Winona } }, - [OPPONENT_TATE_AND_LIZA] = + [TRAINER_TATE_AND_LIZA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3804,10 +3804,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_TateAndLiza + .party = {.ItemCustomMoves = gTrainerParty_TateAndLiza } }, - [OPPONENT_WALLACE] = + [TRAINER_WALLACE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3818,10 +3818,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wallace + .party = {.NoItemCustomMoves = gTrainerParty_Wallace } }, - [OPPONENT_JERRY_1] = + [TRAINER_JERRY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3832,10 +3832,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jerry1 + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry1 } }, - [OPPONENT_TED] = + [TRAINER_TED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3846,10 +3846,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ted + .party = {.NoItemDefaultMoves = gTrainerParty_Ted } }, - [OPPONENT_PAUL] = + [TRAINER_PAUL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3860,10 +3860,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Paul + .party = {.NoItemDefaultMoves = gTrainerParty_Paul } }, - [OPPONENT_JERRY_2] = + [TRAINER_JERRY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3874,10 +3874,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jerry2 + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry2 } }, - [OPPONENT_JERRY_3] = + [TRAINER_JERRY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3888,10 +3888,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jerry3 + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry3 } }, - [OPPONENT_JERRY_4] = + [TRAINER_JERRY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3902,10 +3902,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jerry4 + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry4 } }, - [OPPONENT_JERRY_5] = + [TRAINER_JERRY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3916,10 +3916,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Jerry5 + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry5 } }, - [OPPONENT_KAREN_1] = + [TRAINER_KAREN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3930,10 +3930,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Karen1 + .party = {.NoItemDefaultMoves = gTrainerParty_Karen1 } }, - [OPPONENT_GEORGIA] = + [TRAINER_GEORGIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3944,10 +3944,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Georgia + .party = {.NoItemDefaultMoves = gTrainerParty_Georgia } }, - [OPPONENT_KAREN_2] = + [TRAINER_KAREN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3958,10 +3958,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Karen2 + .party = {.NoItemDefaultMoves = gTrainerParty_Karen2 } }, - [OPPONENT_KAREN_3] = + [TRAINER_KAREN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3972,10 +3972,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Karen3 + .party = {.NoItemDefaultMoves = gTrainerParty_Karen3 } }, - [OPPONENT_KAREN_4] = + [TRAINER_KAREN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3986,10 +3986,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Karen4 + .party = {.NoItemDefaultMoves = gTrainerParty_Karen4 } }, - [OPPONENT_KAREN_5] = + [TRAINER_KAREN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -4000,10 +4000,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Karen5 + .party = {.NoItemDefaultMoves = gTrainerParty_Karen5 } }, - [OPPONENT_KATE_AND_JOY] = + [TRAINER_KATE_AND_JOY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4014,10 +4014,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_KateAndJoy + .party = {.NoItemCustomMoves = gTrainerParty_KateAndJoy } }, - [OPPONENT_ANNA_AND_MEG_1] = + [TRAINER_ANNA_AND_MEG_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4028,10 +4028,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AnnaAndMeg1 + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg1 } }, - [OPPONENT_ANNA_AND_MEG_2] = + [TRAINER_ANNA_AND_MEG_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4042,10 +4042,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AnnaAndMeg2 + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg2 } }, - [OPPONENT_ANNA_AND_MEG_3] = + [TRAINER_ANNA_AND_MEG_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4056,10 +4056,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AnnaAndMeg3 + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg3 } }, - [OPPONENT_ANNA_AND_MEG_4] = + [TRAINER_ANNA_AND_MEG_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4070,10 +4070,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AnnaAndMeg4 + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg4 } }, - [OPPONENT_ANNA_AND_MEG_5] = + [TRAINER_ANNA_AND_MEG_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4084,10 +4084,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AnnaAndMeg5 + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg5 } }, - [OPPONENT_VICTOR] = + [TRAINER_VICTOR] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -4098,10 +4098,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Victor + .party = {.ItemDefaultMoves = gTrainerParty_Victor } }, - [OPPONENT_MIGUEL_1] = + [TRAINER_MIGUEL_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4112,10 +4112,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Miguel1 + .party = {.ItemDefaultMoves = gTrainerParty_Miguel1 } }, - [OPPONENT_COLTON] = + [TRAINER_COLTON] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4126,10 +4126,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Colton + .party = {.ItemCustomMoves = gTrainerParty_Colton } }, - [OPPONENT_MIGUEL_2] = + [TRAINER_MIGUEL_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4140,10 +4140,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Miguel2 + .party = {.ItemDefaultMoves = gTrainerParty_Miguel2 } }, - [OPPONENT_MIGUEL_3] = + [TRAINER_MIGUEL_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4154,10 +4154,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Miguel3 + .party = {.ItemDefaultMoves = gTrainerParty_Miguel3 } }, - [OPPONENT_MIGUEL_4] = + [TRAINER_MIGUEL_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4168,10 +4168,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Miguel4 + .party = {.ItemDefaultMoves = gTrainerParty_Miguel4 } }, - [OPPONENT_MIGUEL_5] = + [TRAINER_MIGUEL_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4182,10 +4182,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Miguel5 + .party = {.ItemDefaultMoves = gTrainerParty_Miguel5 } }, - [OPPONENT_VICTORIA] = + [TRAINER_VICTORIA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -4196,10 +4196,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 1, - .party = gTrainerParty_Victoria + .party = {.ItemDefaultMoves = gTrainerParty_Victoria } }, - [OPPONENT_VANESSA] = + [TRAINER_VANESSA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4210,10 +4210,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Vanessa + .party = {.ItemDefaultMoves = gTrainerParty_Vanessa } }, - [OPPONENT_MARISSA] = + [TRAINER_MARISSA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4224,10 +4224,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Marissa + .party = {.ItemDefaultMoves = gTrainerParty_Marissa } }, - [OPPONENT_ISABEL_1] = + [TRAINER_ISABEL_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4238,10 +4238,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Isabel1 + .party = {.ItemDefaultMoves = gTrainerParty_Isabel1 } }, - [OPPONENT_ISABEL_2] = + [TRAINER_ISABEL_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4252,10 +4252,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Isabel2 + .party = {.ItemDefaultMoves = gTrainerParty_Isabel2 } }, - [OPPONENT_ISABEL_3] = + [TRAINER_ISABEL_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4266,10 +4266,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Isabel3 + .party = {.ItemDefaultMoves = gTrainerParty_Isabel3 } }, - [OPPONENT_ISABEL_4] = + [TRAINER_ISABEL_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4280,10 +4280,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Isabel4 + .party = {.ItemDefaultMoves = gTrainerParty_Isabel4 } }, - [OPPONENT_ISABEL_5] = + [TRAINER_ISABEL_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4294,10 +4294,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Isabel5 + .party = {.ItemDefaultMoves = gTrainerParty_Isabel5 } }, - [OPPONENT_TIMOTHY_1] = + [TRAINER_TIMOTHY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4308,10 +4308,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Timothy1 + .party = {.NoItemDefaultMoves = gTrainerParty_Timothy1 } }, - [OPPONENT_TIMOTHY_2] = + [TRAINER_TIMOTHY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4322,10 +4322,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Timothy2 + .party = {.NoItemCustomMoves = gTrainerParty_Timothy2 } }, - [OPPONENT_TIMOTHY_3] = + [TRAINER_TIMOTHY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4336,10 +4336,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Timothy3 + .party = {.NoItemCustomMoves = gTrainerParty_Timothy3 } }, - [OPPONENT_TIMOTHY_4] = + [TRAINER_TIMOTHY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4350,10 +4350,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Timothy4 + .party = {.NoItemCustomMoves = gTrainerParty_Timothy4 } }, - [OPPONENT_TIMOTHY_5] = + [TRAINER_TIMOTHY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4364,10 +4364,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Timothy5 + .party = {.NoItemCustomMoves = gTrainerParty_Timothy5 } }, - [OPPONENT_VICKY] = + [TRAINER_VICKY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -4378,10 +4378,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Vicky + .party = {.NoItemCustomMoves = gTrainerParty_Vicky } }, - [OPPONENT_SHELBY_1] = + [TRAINER_SHELBY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4392,10 +4392,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelby1 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby1 } }, - [OPPONENT_SHELBY_2] = + [TRAINER_SHELBY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4406,10 +4406,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelby2 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby2 } }, - [OPPONENT_SHELBY_3] = + [TRAINER_SHELBY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4420,10 +4420,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelby3 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby3 } }, - [OPPONENT_SHELBY_4] = + [TRAINER_SHELBY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4434,10 +4434,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelby4 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby4 } }, - [OPPONENT_SHELBY_5] = + [TRAINER_SHELBY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4448,10 +4448,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelby5 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby5 } }, - [OPPONENT_CALVIN_1] = + [TRAINER_CALVIN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4462,10 +4462,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Calvin1 + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin1 } }, - [OPPONENT_BILLY] = + [TRAINER_BILLY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4476,10 +4476,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Billy + .party = {.NoItemDefaultMoves = gTrainerParty_Billy } }, - [OPPONENT_JOSH] = + [TRAINER_JOSH] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4490,10 +4490,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Josh + .party = {.NoItemCustomMoves = gTrainerParty_Josh } }, - [OPPONENT_TOMMY] = + [TRAINER_TOMMY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4504,10 +4504,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tommy + .party = {.NoItemDefaultMoves = gTrainerParty_Tommy } }, - [OPPONENT_JOEY] = + [TRAINER_JOEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4518,10 +4518,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Joey + .party = {.NoItemDefaultMoves = gTrainerParty_Joey } }, - [OPPONENT_BEN] = + [TRAINER_BEN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4532,10 +4532,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ben + .party = {.NoItemCustomMoves = gTrainerParty_Ben } }, - [OPPONENT_ANONYMOUS_5] = + [TRAINER_ANONYMOUS_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4546,10 +4546,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Anonymous5 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous5 } }, - [OPPONENT_KEVIN] = + [TRAINER_KEVIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4560,10 +4560,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Kevin + .party = {.NoItemDefaultMoves = gTrainerParty_Kevin } }, - [OPPONENT_NEAL] = + [TRAINER_NEAL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4574,10 +4574,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Neal + .party = {.NoItemDefaultMoves = gTrainerParty_Neal } }, - [OPPONENT_DILLON] = + [TRAINER_DILLON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4588,10 +4588,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dillon + .party = {.NoItemDefaultMoves = gTrainerParty_Dillon } }, - [OPPONENT_CALVIN_2] = + [TRAINER_CALVIN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4602,10 +4602,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Calvin2 + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin2 } }, - [OPPONENT_CALVIN_3] = + [TRAINER_CALVIN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4616,10 +4616,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Calvin3 + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin3 } }, - [OPPONENT_CALVIN_4] = + [TRAINER_CALVIN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4630,10 +4630,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Calvin4 + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin4 } }, - [OPPONENT_CALVIN_5] = + [TRAINER_CALVIN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4644,10 +4644,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Calvin5 + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin5 } }, - [OPPONENT_EDDIE] = + [TRAINER_EDDIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4658,10 +4658,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Eddie + .party = {.NoItemDefaultMoves = gTrainerParty_Eddie } }, - [OPPONENT_ALLEN] = + [TRAINER_ALLEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4672,10 +4672,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Allen + .party = {.NoItemDefaultMoves = gTrainerParty_Allen } }, - [OPPONENT_TIMMY] = + [TRAINER_TIMMY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4686,10 +4686,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Timmy + .party = {.NoItemDefaultMoves = gTrainerParty_Timmy } }, - [OPPONENT_STEVEN] = + [TRAINER_STEVEN] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_CHAMPION, @@ -4700,10 +4700,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 6, - .party = gTrainerParty_Steven + .party = {.ItemCustomMoves = gTrainerParty_Steven } }, - [OPPONENT_ANDREW] = + [TRAINER_ANDREW] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4714,10 +4714,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Andrew + .party = {.NoItemDefaultMoves = gTrainerParty_Andrew } }, - [OPPONENT_IVAN] = + [TRAINER_IVAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4728,10 +4728,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ivan + .party = {.NoItemDefaultMoves = gTrainerParty_Ivan } }, - [OPPONENT_CLAUDE] = + [TRAINER_CLAUDE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4742,10 +4742,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Claude + .party = {.NoItemDefaultMoves = gTrainerParty_Claude } }, - [OPPONENT_ELLIOT_1] = + [TRAINER_ELLIOT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4756,10 +4756,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Elliot1 + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot1 } }, - [OPPONENT_NED] = + [TRAINER_NED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4770,10 +4770,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ned + .party = {.NoItemDefaultMoves = gTrainerParty_Ned } }, - [OPPONENT_DALE] = + [TRAINER_DALE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4784,10 +4784,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Dale + .party = {.NoItemDefaultMoves = gTrainerParty_Dale } }, - [OPPONENT_NOLAN] = + [TRAINER_NOLAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4798,10 +4798,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Nolan + .party = {.NoItemDefaultMoves = gTrainerParty_Nolan } }, - [OPPONENT_BARNY] = + [TRAINER_BARNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4812,10 +4812,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Barny + .party = {.NoItemDefaultMoves = gTrainerParty_Barny } }, - [OPPONENT_WADE] = + [TRAINER_WADE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4826,10 +4826,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Wade + .party = {.NoItemDefaultMoves = gTrainerParty_Wade } }, - [OPPONENT_CARTER] = + [TRAINER_CARTER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4840,10 +4840,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Carter + .party = {.NoItemDefaultMoves = gTrainerParty_Carter } }, - [OPPONENT_ELLIOT_2] = + [TRAINER_ELLIOT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4854,10 +4854,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Elliot2 + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot2 } }, - [OPPONENT_ELLIOT_3] = + [TRAINER_ELLIOT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4868,10 +4868,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Elliot3 + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot3 } }, - [OPPONENT_ELLIOT_4] = + [TRAINER_ELLIOT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4882,10 +4882,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Elliot4 + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot4 } }, - [OPPONENT_ELLIOT_5] = + [TRAINER_ELLIOT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4896,10 +4896,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 4, - .party = gTrainerParty_Elliot5 + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot5 } }, - [OPPONENT_RONALD] = + [TRAINER_RONALD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4910,10 +4910,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Ronald + .party = {.NoItemDefaultMoves = gTrainerParty_Ronald } }, - [OPPONENT_JACOB] = + [TRAINER_JACOB] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4924,10 +4924,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Jacob + .party = {.NoItemDefaultMoves = gTrainerParty_Jacob } }, - [OPPONENT_ANTHONY] = + [TRAINER_ANTHONY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4938,10 +4938,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Anthony + .party = {.NoItemDefaultMoves = gTrainerParty_Anthony } }, - [OPPONENT_BENJAMIN_1] = + [TRAINER_BENJAMIN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4952,10 +4952,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Benjamin1 + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin1 } }, - [OPPONENT_BENJAMIN_2] = + [TRAINER_BENJAMIN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4966,10 +4966,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Benjamin2 + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin2 } }, - [OPPONENT_BENJAMIN_3] = + [TRAINER_BENJAMIN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4980,10 +4980,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Benjamin3 + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin3 } }, - [OPPONENT_BENJAMIN_4] = + [TRAINER_BENJAMIN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4994,10 +4994,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Benjamin4 + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin4 } }, - [OPPONENT_BENJAMIN_5] = + [TRAINER_BENJAMIN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5008,10 +5008,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Benjamin5 + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin5 } }, - [OPPONENT_ABIGAIL_1] = + [TRAINER_ABIGAIL_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5022,10 +5022,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Abigail1 + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail1 } }, - [OPPONENT_JASMINE] = + [TRAINER_JASMINE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5036,10 +5036,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Jasmine + .party = {.NoItemDefaultMoves = gTrainerParty_Jasmine } }, - [OPPONENT_ABIGAIL_2] = + [TRAINER_ABIGAIL_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5050,10 +5050,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Abigail2 + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail2 } }, - [OPPONENT_ABIGAIL_3] = + [TRAINER_ABIGAIL_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5064,10 +5064,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Abigail3 + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail3 } }, - [OPPONENT_ABIGAIL_4] = + [TRAINER_ABIGAIL_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5078,10 +5078,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Abigail4 + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail4 } }, - [OPPONENT_ABIGAIL_5] = + [TRAINER_ABIGAIL_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5092,10 +5092,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Abigail5 + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail5 } }, - [OPPONENT_DYLAN_1] = + [TRAINER_DYLAN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5106,10 +5106,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dylan1 + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan1 } }, - [OPPONENT_DYLAN_2] = + [TRAINER_DYLAN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5120,10 +5120,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dylan2 + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan2 } }, - [OPPONENT_DYLAN_3] = + [TRAINER_DYLAN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5134,10 +5134,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dylan3 + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan3 } }, - [OPPONENT_DYLAN_4] = + [TRAINER_DYLAN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5148,10 +5148,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dylan4 + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan4 } }, - [OPPONENT_DYLAN_5] = + [TRAINER_DYLAN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5162,10 +5162,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dylan5 + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan5 } }, - [OPPONENT_MARIA_1] = + [TRAINER_MARIA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5176,10 +5176,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Maria1 + .party = {.NoItemDefaultMoves = gTrainerParty_Maria1 } }, - [OPPONENT_MARIA_2] = + [TRAINER_MARIA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5190,10 +5190,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Maria2 + .party = {.NoItemDefaultMoves = gTrainerParty_Maria2 } }, - [OPPONENT_MARIA_3] = + [TRAINER_MARIA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5204,10 +5204,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Maria3 + .party = {.NoItemDefaultMoves = gTrainerParty_Maria3 } }, - [OPPONENT_MARIA_4] = + [TRAINER_MARIA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5218,10 +5218,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Maria4 + .party = {.NoItemDefaultMoves = gTrainerParty_Maria4 } }, - [OPPONENT_MARIA_5] = + [TRAINER_MARIA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5232,10 +5232,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Maria5 + .party = {.NoItemDefaultMoves = gTrainerParty_Maria5 } }, - [OPPONENT_CALEB] = + [TRAINER_CALEB] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5246,10 +5246,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Caleb + .party = {.NoItemDefaultMoves = gTrainerParty_Caleb } }, - [OPPONENT_ANONYMOUS_6] = + [TRAINER_ANONYMOUS_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5260,10 +5260,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous6 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous6 } }, - [OPPONENT_ISAIAH_1] = + [TRAINER_ISAIAH_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5274,10 +5274,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Isaiah1 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah1 } }, - [OPPONENT_ANONYMOUS_7] = + [TRAINER_ANONYMOUS_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5288,10 +5288,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous7 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous7 } }, - [OPPONENT_CHASE] = + [TRAINER_CHASE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5302,10 +5302,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Chase + .party = {.NoItemDefaultMoves = gTrainerParty_Chase } }, - [OPPONENT_ISAIAH_2] = + [TRAINER_ISAIAH_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5316,10 +5316,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Isaiah2 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah2 } }, - [OPPONENT_ISAIAH_3] = + [TRAINER_ISAIAH_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5330,10 +5330,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Isaiah3 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah3 } }, - [OPPONENT_ISAIAH_4] = + [TRAINER_ISAIAH_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5344,10 +5344,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Isaiah4 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah4 } }, - [OPPONENT_ISAIAH_5] = + [TRAINER_ISAIAH_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5358,10 +5358,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Isaiah5 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah5 } }, - [OPPONENT_ANONYMOUS_8] = + [TRAINER_ANONYMOUS_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5372,10 +5372,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Anonymous8 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous8 } }, - [OPPONENT_CONNOR] = + [TRAINER_CONNOR] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5386,10 +5386,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Connor + .party = {.NoItemDefaultMoves = gTrainerParty_Connor } }, - [OPPONENT_ANONYMOUS_9] = + [TRAINER_ANONYMOUS_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5400,10 +5400,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous9 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous9 } }, - [OPPONENT_KATELYN_1] = + [TRAINER_KATELYN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5414,10 +5414,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Katelyn1 + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn1 } }, - [OPPONENT_ALLISON] = + [TRAINER_ALLISON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5428,10 +5428,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Allison + .party = {.NoItemDefaultMoves = gTrainerParty_Allison } }, - [OPPONENT_KATELYN_2] = + [TRAINER_KATELYN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5442,10 +5442,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Katelyn2 + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn2 } }, - [OPPONENT_KATELYN_3] = + [TRAINER_KATELYN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5456,10 +5456,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Katelyn3 + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn3 } }, - [OPPONENT_KATELYN_4] = + [TRAINER_KATELYN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5470,10 +5470,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Katelyn4 + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn4 } }, - [OPPONENT_KATELYN_5] = + [TRAINER_KATELYN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5484,10 +5484,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Katelyn5 + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn5 } }, - [OPPONENT_NICOLAS_1] = + [TRAINER_NICOLAS_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5498,10 +5498,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nicolas1 + .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas1 } }, - [OPPONENT_NICOLAS_2] = + [TRAINER_NICOLAS_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5512,10 +5512,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nicolas2 + .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas2 } }, - [OPPONENT_NICOLAS_3] = + [TRAINER_NICOLAS_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5526,10 +5526,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nicolas3 + .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas3 } }, - [OPPONENT_NICOLAS_4] = + [TRAINER_NICOLAS_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5540,10 +5540,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Nicolas4 + .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas4 } }, - [OPPONENT_NICOLAS_5] = + [TRAINER_NICOLAS_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5554,10 +5554,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Nicolas5 + .party = {.ItemDefaultMoves = gTrainerParty_Nicolas5 } }, - [OPPONENT_AARON] = + [TRAINER_AARON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5568,10 +5568,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Aaron + .party = {.NoItemDefaultMoves = gTrainerParty_Aaron } }, - [OPPONENT_PERRY] = + [TRAINER_PERRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5582,10 +5582,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Perry + .party = {.NoItemDefaultMoves = gTrainerParty_Perry } }, - [OPPONENT_HUGH] = + [TRAINER_HUGH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5596,10 +5596,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Hugh + .party = {.NoItemDefaultMoves = gTrainerParty_Hugh } }, - [OPPONENT_PHIL] = + [TRAINER_PHIL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5610,10 +5610,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Phil + .party = {.NoItemDefaultMoves = gTrainerParty_Phil } }, - [OPPONENT_JARED] = + [TRAINER_JARED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5624,10 +5624,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jared + .party = {.NoItemDefaultMoves = gTrainerParty_Jared } }, - [OPPONENT_ANONYMOUS_10] = + [TRAINER_ANONYMOUS_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5638,10 +5638,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Anonymous10 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous10 } }, - [OPPONENT_TANNER] = + [TRAINER_TANNER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5652,10 +5652,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Tanner + .party = {.NoItemDefaultMoves = gTrainerParty_Tanner } }, - [OPPONENT_WILL] = + [TRAINER_WILL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5666,10 +5666,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Will + .party = {.NoItemDefaultMoves = gTrainerParty_Will } }, - [OPPONENT_COLIN] = + [TRAINER_COLIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5680,10 +5680,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Colin + .party = {.NoItemDefaultMoves = gTrainerParty_Colin } }, - [OPPONENT_ROBERT_1] = + [TRAINER_ROBERT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5694,10 +5694,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Robert1 + .party = {.NoItemDefaultMoves = gTrainerParty_Robert1 } }, - [OPPONENT_BENNY] = + [TRAINER_BENNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5708,10 +5708,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Benny + .party = {.NoItemDefaultMoves = gTrainerParty_Benny } }, - [OPPONENT_CHESTER] = + [TRAINER_CHESTER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5722,10 +5722,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Chester + .party = {.NoItemDefaultMoves = gTrainerParty_Chester } }, - [OPPONENT_ROBERT_2] = + [TRAINER_ROBERT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5736,10 +5736,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Robert2 + .party = {.NoItemDefaultMoves = gTrainerParty_Robert2 } }, - [OPPONENT_ROBERT_3] = + [TRAINER_ROBERT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5750,10 +5750,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Robert3 + .party = {.NoItemDefaultMoves = gTrainerParty_Robert3 } }, - [OPPONENT_ROBERT_4] = + [TRAINER_ROBERT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5764,10 +5764,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Robert4 + .party = {.NoItemDefaultMoves = gTrainerParty_Robert4 } }, - [OPPONENT_ROBERT_5] = + [TRAINER_ROBERT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5778,10 +5778,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Robert5 + .party = {.NoItemDefaultMoves = gTrainerParty_Robert5 } }, - [OPPONENT_ALEX] = + [TRAINER_ALEX] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5792,10 +5792,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Alex + .party = {.NoItemDefaultMoves = gTrainerParty_Alex } }, - [OPPONENT_BECK] = + [TRAINER_BECK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5806,10 +5806,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Beck + .party = {.NoItemDefaultMoves = gTrainerParty_Beck } }, - [OPPONENT_YASU] = + [TRAINER_YASU] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5820,10 +5820,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 1, - .party = gTrainerParty_Yasu + .party = {.NoItemDefaultMoves = gTrainerParty_Yasu } }, - [OPPONENT_TAKASHI] = + [TRAINER_TAKASHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5834,10 +5834,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 3, - .party = gTrainerParty_Takashi + .party = {.NoItemDefaultMoves = gTrainerParty_Takashi } }, - [OPPONENT_MAKOTO] = + [TRAINER_MAKOTO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5848,10 +5848,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 1, - .party = gTrainerParty_Makoto + .party = {.NoItemDefaultMoves = gTrainerParty_Makoto } }, - [OPPONENT_HIDEO_1] = + [TRAINER_HIDEO_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5862,10 +5862,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Hideo1 + .party = {.NoItemDefaultMoves = gTrainerParty_Hideo1 } }, - [OPPONENT_LAO_1] = + [TRAINER_LAO_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5876,10 +5876,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Lao1 + .party = {.NoItemCustomMoves = gTrainerParty_Lao1 } }, - [OPPONENT_LUNG] = + [TRAINER_LUNG] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5890,10 +5890,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 2, - .party = gTrainerParty_Lung + .party = {.NoItemDefaultMoves = gTrainerParty_Lung } }, - [OPPONENT_LAO_2] = + [TRAINER_LAO_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5904,10 +5904,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Lao2 + .party = {.NoItemCustomMoves = gTrainerParty_Lao2 } }, - [OPPONENT_LAO_3] = + [TRAINER_LAO_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5918,10 +5918,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Lao3 + .party = {.NoItemCustomMoves = gTrainerParty_Lao3 } }, - [OPPONENT_LAO_4] = + [TRAINER_LAO_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5932,10 +5932,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Lao4 + .party = {.NoItemCustomMoves = gTrainerParty_Lao4 } }, - [OPPONENT_LAO_5] = + [TRAINER_LAO_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5946,10 +5946,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Lao5 + .party = {.ItemCustomMoves = gTrainerParty_Lao5 } }, - [OPPONENT_TESSA] = + [TRAINER_TESSA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -5960,10 +5960,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Tessa + .party = {.NoItemDefaultMoves = gTrainerParty_Tessa } }, - [OPPONENT_LAURA] = + [TRAINER_LAURA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -5974,10 +5974,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Laura + .party = {.NoItemDefaultMoves = gTrainerParty_Laura } }, - [OPPONENT_CYNDY_1] = + [TRAINER_CYNDY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -5988,10 +5988,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cyndy1 + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy1 } }, - [OPPONENT_CORA] = + [TRAINER_CORA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6002,10 +6002,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cora + .party = {.NoItemDefaultMoves = gTrainerParty_Cora } }, - [OPPONENT_JILL] = + [TRAINER_JILL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6016,10 +6016,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jill + .party = {.NoItemDefaultMoves = gTrainerParty_Jill } }, - [OPPONENT_CYNDY_2] = + [TRAINER_CYNDY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6030,10 +6030,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cyndy2 + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy2 } }, - [OPPONENT_CYNDY_3] = + [TRAINER_CYNDY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6044,10 +6044,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cyndy3 + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy3 } }, - [OPPONENT_CYNDY_4] = + [TRAINER_CYNDY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6058,10 +6058,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cyndy4 + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy4 } }, - [OPPONENT_CYNDY_5] = + [TRAINER_CYNDY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6072,10 +6072,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cyndy5 + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy5 } }, - [OPPONENT_MADELINE_1] = + [TRAINER_MADELINE_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6086,10 +6086,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Madeline1 + .party = {.NoItemCustomMoves = gTrainerParty_Madeline1 } }, - [OPPONENT_CLARISSA] = + [TRAINER_CLARISSA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6100,10 +6100,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Clarissa + .party = {.NoItemDefaultMoves = gTrainerParty_Clarissa } }, - [OPPONENT_ANGELICA] = + [TRAINER_ANGELICA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6114,10 +6114,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Angelica + .party = {.NoItemDefaultMoves = gTrainerParty_Angelica } }, - [OPPONENT_MADELINE_2] = + [TRAINER_MADELINE_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6128,10 +6128,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Madeline2 + .party = {.NoItemCustomMoves = gTrainerParty_Madeline2 } }, - [OPPONENT_MADELINE_3] = + [TRAINER_MADELINE_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6142,10 +6142,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Madeline3 + .party = {.NoItemCustomMoves = gTrainerParty_Madeline3 } }, - [OPPONENT_MADELINE_4] = + [TRAINER_MADELINE_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6156,10 +6156,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Madeline4 + .party = {.NoItemCustomMoves = gTrainerParty_Madeline4 } }, - [OPPONENT_MADELINE_5] = + [TRAINER_MADELINE_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6170,10 +6170,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Madeline5 + .party = {.NoItemCustomMoves = gTrainerParty_Madeline5 } }, - [OPPONENT_BEVERLY] = + [TRAINER_BEVERLY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6184,10 +6184,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Beverly + .party = {.NoItemDefaultMoves = gTrainerParty_Beverly } }, - [OPPONENT_DAWN] = + [TRAINER_DAWN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6198,10 +6198,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dawn + .party = {.NoItemDefaultMoves = gTrainerParty_Dawn } }, - [OPPONENT_NICOLE] = + [TRAINER_NICOLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6212,10 +6212,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Nicole + .party = {.NoItemDefaultMoves = gTrainerParty_Nicole } }, - [OPPONENT_DENISE] = + [TRAINER_DENISE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6226,10 +6226,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Denise + .party = {.NoItemDefaultMoves = gTrainerParty_Denise } }, - [OPPONENT_BETH] = + [TRAINER_BETH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6240,10 +6240,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Beth + .party = {.NoItemDefaultMoves = gTrainerParty_Beth } }, - [OPPONENT_TARA] = + [TRAINER_TARA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6254,10 +6254,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tara + .party = {.NoItemDefaultMoves = gTrainerParty_Tara } }, - [OPPONENT_MISSY] = + [TRAINER_MISSY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6268,10 +6268,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Missy + .party = {.NoItemDefaultMoves = gTrainerParty_Missy } }, - [OPPONENT_ALICE] = + [TRAINER_ALICE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6282,10 +6282,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Alice + .party = {.NoItemDefaultMoves = gTrainerParty_Alice } }, - [OPPONENT_JENNY_1] = + [TRAINER_JENNY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6296,10 +6296,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jenny1 + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny1 } }, - [OPPONENT_GRACE] = + [TRAINER_GRACE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6310,10 +6310,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grace + .party = {.NoItemDefaultMoves = gTrainerParty_Grace } }, - [OPPONENT_TANYA] = + [TRAINER_TANYA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6324,10 +6324,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tanya + .party = {.NoItemDefaultMoves = gTrainerParty_Tanya } }, - [OPPONENT_SHARON] = + [TRAINER_SHARON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6338,10 +6338,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Sharon + .party = {.NoItemDefaultMoves = gTrainerParty_Sharon } }, - [OPPONENT_NIKKI] = + [TRAINER_NIKKI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6352,10 +6352,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Nikki + .party = {.NoItemDefaultMoves = gTrainerParty_Nikki } }, - [OPPONENT_BRENDA] = + [TRAINER_BRENDA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6366,10 +6366,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Brenda + .party = {.NoItemDefaultMoves = gTrainerParty_Brenda } }, - [OPPONENT_KATIE] = + [TRAINER_KATIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6380,10 +6380,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Katie + .party = {.NoItemDefaultMoves = gTrainerParty_Katie } }, - [OPPONENT_SUSIE] = + [TRAINER_SUSIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6394,10 +6394,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Susie + .party = {.NoItemDefaultMoves = gTrainerParty_Susie } }, - [OPPONENT_KARA] = + [TRAINER_KARA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6408,10 +6408,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Kara + .party = {.NoItemDefaultMoves = gTrainerParty_Kara } }, - [OPPONENT_DANA] = + [TRAINER_DANA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6422,10 +6422,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dana + .party = {.NoItemDefaultMoves = gTrainerParty_Dana } }, - [OPPONENT_ERIN] = + [TRAINER_ERIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6436,10 +6436,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Erin + .party = {.NoItemDefaultMoves = gTrainerParty_Erin } }, - [OPPONENT_DEBRA] = + [TRAINER_DEBRA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6450,10 +6450,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Debra + .party = {.NoItemDefaultMoves = gTrainerParty_Debra } }, - [OPPONENT_LINDA] = + [TRAINER_LINDA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6464,10 +6464,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Linda + .party = {.NoItemDefaultMoves = gTrainerParty_Linda } }, - [OPPONENT_KAYLEE] = + [TRAINER_KAYLEE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6478,10 +6478,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Kaylee + .party = {.NoItemDefaultMoves = gTrainerParty_Kaylee } }, - [OPPONENT_LAUREL] = + [TRAINER_LAUREL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6492,10 +6492,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Laurel + .party = {.NoItemDefaultMoves = gTrainerParty_Laurel } }, - [OPPONENT_DARCY] = + [TRAINER_DARCY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6506,10 +6506,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Darcy + .party = {.NoItemDefaultMoves = gTrainerParty_Darcy } }, - [OPPONENT_JENNY_2] = + [TRAINER_JENNY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6520,10 +6520,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jenny2 + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny2 } }, - [OPPONENT_JENNY_3] = + [TRAINER_JENNY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6534,10 +6534,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jenny3 + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny3 } }, - [OPPONENT_JENNY_4] = + [TRAINER_JENNY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6548,10 +6548,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jenny4 + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny4 } }, - [OPPONENT_JENNY_5] = + [TRAINER_JENNY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6562,10 +6562,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Jenny5 + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny5 } }, - [OPPONENT_HEIDI] = + [TRAINER_HEIDI] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6576,10 +6576,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Heidi + .party = {.NoItemCustomMoves = gTrainerParty_Heidi } }, - [OPPONENT_BECKY] = + [TRAINER_BECKY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6590,10 +6590,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Becky + .party = {.NoItemCustomMoves = gTrainerParty_Becky } }, - [OPPONENT_CAROL] = + [TRAINER_CAROL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6604,10 +6604,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Carol + .party = {.NoItemDefaultMoves = gTrainerParty_Carol } }, - [OPPONENT_NANCY] = + [TRAINER_NANCY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6618,10 +6618,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nancy + .party = {.NoItemDefaultMoves = gTrainerParty_Nancy } }, - [OPPONENT_MARTHA] = + [TRAINER_MARTHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6632,10 +6632,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Martha + .party = {.NoItemDefaultMoves = gTrainerParty_Martha } }, - [OPPONENT_DIANA_1] = + [TRAINER_DIANA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6646,10 +6646,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Diana1 + .party = {.NoItemDefaultMoves = gTrainerParty_Diana1 } }, - [OPPONENT_NINA] = + [TRAINER_NINA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6660,10 +6660,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nina + .party = {.NoItemDefaultMoves = gTrainerParty_Nina } }, - [OPPONENT_IRENE] = + [TRAINER_IRENE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6674,10 +6674,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Irene + .party = {.NoItemDefaultMoves = gTrainerParty_Irene } }, - [OPPONENT_DIANA_2] = + [TRAINER_DIANA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6688,10 +6688,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Diana2 + .party = {.NoItemDefaultMoves = gTrainerParty_Diana2 } }, - [OPPONENT_DIANA_3] = + [TRAINER_DIANA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6702,10 +6702,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Diana3 + .party = {.NoItemDefaultMoves = gTrainerParty_Diana3 } }, - [OPPONENT_DIANA_4] = + [TRAINER_DIANA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6716,10 +6716,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Diana4 + .party = {.NoItemDefaultMoves = gTrainerParty_Diana4 } }, - [OPPONENT_DIANA_5] = + [TRAINER_DIANA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6730,10 +6730,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Diana5 + .party = {.NoItemDefaultMoves = gTrainerParty_Diana5 } }, - [OPPONENT_AMY_AND_LIV_1] = + [TRAINER_AMY_AND_LIV_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6744,10 +6744,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv1 + .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv1 } }, - [OPPONENT_AMY_AND_LIV_2] = + [TRAINER_AMY_AND_LIV_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6758,10 +6758,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv2 + .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv2 } }, - [OPPONENT_GINA_AND_MIA_1] = + [TRAINER_GINA_AND_MIA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6772,10 +6772,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GinaAndMia1 + .party = {.NoItemDefaultMoves = gTrainerParty_GinaAndMia1 } }, - [OPPONENT_MIU_AND_YUKI] = + [TRAINER_MIU_AND_YUKI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6786,10 +6786,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_MiuAndYuki + .party = {.NoItemDefaultMoves = gTrainerParty_MiuAndYuki } }, - [OPPONENT_AMY_AND_LIV_3] = + [TRAINER_AMY_AND_LIV_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6800,10 +6800,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv3 + .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv3 } }, - [OPPONENT_GINA_AND_MIA_2] = + [TRAINER_GINA_AND_MIA_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TWINS, @@ -6814,10 +6814,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GinaAndMia2 + .party = {.NoItemCustomMoves = gTrainerParty_GinaAndMia2 } }, - [OPPONENT_AMY_AND_LIV_4] = + [TRAINER_AMY_AND_LIV_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6828,10 +6828,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv4 + .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv4 } }, - [OPPONENT_AMY_AND_LIV_5] = + [TRAINER_AMY_AND_LIV_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TWINS, @@ -6842,10 +6842,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv5 + .party = {.NoItemCustomMoves = gTrainerParty_AmyAndLiv5 } }, - [OPPONENT_AMY_AND_LIV_6] = + [TRAINER_AMY_AND_LIV_6] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TWINS, @@ -6856,10 +6856,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv6 + .party = {.NoItemCustomMoves = gTrainerParty_AmyAndLiv6 } }, - [OPPONENT_HUEY] = + [TRAINER_HUEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6870,10 +6870,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Huey + .party = {.NoItemDefaultMoves = gTrainerParty_Huey } }, - [OPPONENT_EDMOND] = + [TRAINER_EDMOND] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6884,10 +6884,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Edmond + .party = {.NoItemDefaultMoves = gTrainerParty_Edmond } }, - [OPPONENT_ERNEST_1] = + [TRAINER_ERNEST_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6898,10 +6898,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ernest1 + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest1 } }, - [OPPONENT_DWAYNE] = + [TRAINER_DWAYNE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6912,10 +6912,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dwayne + .party = {.NoItemDefaultMoves = gTrainerParty_Dwayne } }, - [OPPONENT_PHILLIP] = + [TRAINER_PHILLIP] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6926,10 +6926,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Phillip + .party = {.NoItemDefaultMoves = gTrainerParty_Phillip } }, - [OPPONENT_LEONARD] = + [TRAINER_LEONARD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6940,10 +6940,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Leonard + .party = {.NoItemDefaultMoves = gTrainerParty_Leonard } }, - [OPPONENT_DUNCAN] = + [TRAINER_DUNCAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6954,10 +6954,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Duncan + .party = {.NoItemDefaultMoves = gTrainerParty_Duncan } }, - [OPPONENT_ERNEST_2] = + [TRAINER_ERNEST_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6968,10 +6968,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ernest2 + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest2 } }, - [OPPONENT_ERNEST_3] = + [TRAINER_ERNEST_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6982,10 +6982,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ernest3 + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest3 } }, - [OPPONENT_ERNEST_4] = + [TRAINER_ERNEST_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6996,10 +6996,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ernest4 + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest4 } }, - [OPPONENT_ERNEST_5] = + [TRAINER_ERNEST_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -7010,10 +7010,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ernest5 + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest5 } }, - [OPPONENT_ANONYMOUS_11] = + [TRAINER_ANONYMOUS_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7024,10 +7024,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Anonymous11 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous11 } }, - [OPPONENT_ANONYMOUS_12] = + [TRAINER_ANONYMOUS_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7038,10 +7038,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Anonymous12 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous12 } }, - [OPPONENT_ANONYMOUS_13] = + [TRAINER_ANONYMOUS_13] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7052,10 +7052,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous13 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous13 } }, - [OPPONENT_SONNY] = + [TRAINER_SONNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7066,10 +7066,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Sonny + .party = {.NoItemDefaultMoves = gTrainerParty_Sonny } }, - [OPPONENT_DONOVAN] = + [TRAINER_DONOVAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7080,10 +7080,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Donovan + .party = {.NoItemDefaultMoves = gTrainerParty_Donovan } }, - [OPPONENT_GERALD] = + [TRAINER_GERALD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7094,10 +7094,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Gerald + .party = {.NoItemDefaultMoves = gTrainerParty_Gerald } }, - [OPPONENT_KELVIN] = + [TRAINER_KELVIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7108,10 +7108,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Kelvin + .party = {.NoItemDefaultMoves = gTrainerParty_Kelvin } }, - [OPPONENT_KODY] = + [TRAINER_KODY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7122,10 +7122,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Kody + .party = {.NoItemDefaultMoves = gTrainerParty_Kody } }, - [OPPONENT_TEVIN] = + [TRAINER_TEVIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7136,10 +7136,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tevin + .party = {.NoItemDefaultMoves = gTrainerParty_Tevin } }, - [OPPONENT_DAMON] = + [TRAINER_DAMON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7150,10 +7150,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Damon + .party = {.NoItemDefaultMoves = gTrainerParty_Damon } }, - [OPPONENT_PABLO] = + [TRAINER_PABLO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7164,10 +7164,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Pablo + .party = {.NoItemDefaultMoves = gTrainerParty_Pablo } }, - [OPPONENT_EDWIN_1] = + [TRAINER_EDWIN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7178,10 +7178,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Edwin1 + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin1 } }, - [OPPONENT_HECTOR_1] = + [TRAINER_HECTOR_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7192,10 +7192,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Hector1 + .party = {.NoItemDefaultMoves = gTrainerParty_Hector1 } }, - [OPPONENT_HECTOR_2] = + [TRAINER_HECTOR_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7206,10 +7206,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Hector2 + .party = {.NoItemDefaultMoves = gTrainerParty_Hector2 } }, - [OPPONENT_EDWIN_2] = + [TRAINER_EDWIN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7220,10 +7220,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Edwin2 + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin2 } }, - [OPPONENT_EDWIN_3] = + [TRAINER_EDWIN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7234,10 +7234,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Edwin3 + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin3 } }, - [OPPONENT_EDWIN_4] = + [TRAINER_EDWIN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7248,10 +7248,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Edwin4 + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin4 } }, - [OPPONENT_EDWIN_5] = + [TRAINER_EDWIN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7262,10 +7262,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Edwin5 + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin5 } }, - [OPPONENT_WALLY_1] = + [TRAINER_WALLY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7276,10 +7276,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wally1 + .party = {.NoItemCustomMoves = gTrainerParty_Wally1 } }, - [OPPONENT_BRENDAN_1] = + [TRAINER_BRENDAN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7290,10 +7290,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Brendan1 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan1 } }, - [OPPONENT_BRENDAN_2] = + [TRAINER_BRENDAN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7304,10 +7304,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan2 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan2 } }, - [OPPONENT_BRENDAN_3] = + [TRAINER_BRENDAN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7318,10 +7318,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan3 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan3 } }, - [OPPONENT_BRENDAN_4] = + [TRAINER_BRENDAN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7332,10 +7332,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 1, - .party = gTrainerParty_Brendan4 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan4 } }, - [OPPONENT_BRENDAN_5] = + [TRAINER_BRENDAN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7346,10 +7346,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan5 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan5 } }, - [OPPONENT_BRENDAN_6] = + [TRAINER_BRENDAN_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7360,10 +7360,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan6 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan6 } }, - [OPPONENT_BRENDAN_7] = + [TRAINER_BRENDAN_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7374,10 +7374,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Brendan7 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan7 } }, - [OPPONENT_BRENDAN_8] = + [TRAINER_BRENDAN_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7388,10 +7388,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan8 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan8 } }, - [OPPONENT_BRENDAN_9] = + [TRAINER_BRENDAN_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7402,10 +7402,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan9 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan9 } }, - [OPPONENT_MAY_1] = + [TRAINER_MAY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7416,10 +7416,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_May1 + .party = {.NoItemDefaultMoves = gTrainerParty_May1 } }, - [OPPONENT_MAY_2] = + [TRAINER_MAY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7430,10 +7430,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May2 + .party = {.NoItemDefaultMoves = gTrainerParty_May2 } }, - [OPPONENT_MAY_3] = + [TRAINER_MAY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7444,10 +7444,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May3 + .party = {.NoItemDefaultMoves = gTrainerParty_May3 } }, - [OPPONENT_MAY_4] = + [TRAINER_MAY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7458,10 +7458,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_May4 + .party = {.NoItemDefaultMoves = gTrainerParty_May4 } }, - [OPPONENT_MAY_5] = + [TRAINER_MAY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7472,10 +7472,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May5 + .party = {.NoItemDefaultMoves = gTrainerParty_May5 } }, - [OPPONENT_MAY_6] = + [TRAINER_MAY_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7486,10 +7486,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May6 + .party = {.NoItemDefaultMoves = gTrainerParty_May6 } }, - [OPPONENT_MAY_7] = + [TRAINER_MAY_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7500,10 +7500,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_May7 + .party = {.NoItemDefaultMoves = gTrainerParty_May7 } }, - [OPPONENT_MAY_8] = + [TRAINER_MAY_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7514,10 +7514,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May8 + .party = {.NoItemDefaultMoves = gTrainerParty_May8 } }, - [OPPONENT_MAY_9] = + [TRAINER_MAY_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7528,10 +7528,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May9 + .party = {.NoItemDefaultMoves = gTrainerParty_May9 } }, - [OPPONENT_ISAAC_1] = + [TRAINER_ISAAC_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7542,10 +7542,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Isaac1 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac1 } }, - [OPPONENT_RILEY] = + [TRAINER_RILEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7556,10 +7556,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Riley + .party = {.NoItemDefaultMoves = gTrainerParty_Riley } }, - [OPPONENT_AIDAN] = + [TRAINER_AIDAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7570,10 +7570,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Aidan + .party = {.NoItemDefaultMoves = gTrainerParty_Aidan } }, - [OPPONENT_ISAAC_2] = + [TRAINER_ISAAC_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7584,10 +7584,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Isaac2 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac2 } }, - [OPPONENT_ISAAC_3] = + [TRAINER_ISAAC_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7598,10 +7598,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Isaac3 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac3 } }, - [OPPONENT_ISAAC_4] = + [TRAINER_ISAAC_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7612,10 +7612,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Isaac4 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac4 } }, - [OPPONENT_ISAAC_5] = + [TRAINER_ISAAC_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7626,10 +7626,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Isaac5 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac5 } }, - [OPPONENT_LYDIA_1] = + [TRAINER_LYDIA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7640,10 +7640,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lydia1 + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia1 } }, - [OPPONENT_ALEXIA] = + [TRAINER_ALEXIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7654,10 +7654,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Alexia + .party = {.NoItemDefaultMoves = gTrainerParty_Alexia } }, - [OPPONENT_DANIELLE] = + [TRAINER_DANIELLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7668,10 +7668,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Danielle + .party = {.NoItemDefaultMoves = gTrainerParty_Danielle } }, - [OPPONENT_LYDIA_2] = + [TRAINER_LYDIA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7682,10 +7682,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lydia2 + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia2 } }, - [OPPONENT_LYDIA_3] = + [TRAINER_LYDIA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7696,10 +7696,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lydia3 + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia3 } }, - [OPPONENT_LYDIA_4] = + [TRAINER_LYDIA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7710,10 +7710,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lydia4 + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia4 } }, - [OPPONENT_LYDIA_5] = + [TRAINER_LYDIA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7724,10 +7724,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lydia5 + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia5 } }, - [OPPONENT_JACKSON_1] = + [TRAINER_JACKSON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7738,10 +7738,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Jackson1 + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson1 } }, - [OPPONENT_CARLOS] = + [TRAINER_CARLOS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7752,10 +7752,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Carlos + .party = {.NoItemDefaultMoves = gTrainerParty_Carlos } }, - [OPPONENT_SEBASTIAN] = + [TRAINER_SEBASTIAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7766,10 +7766,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Sebastian + .party = {.NoItemDefaultMoves = gTrainerParty_Sebastian } }, - [OPPONENT_JACKSON_2] = + [TRAINER_JACKSON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7780,10 +7780,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 1, - .party = gTrainerParty_Jackson2 + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson2 } }, - [OPPONENT_JACKSON_3] = + [TRAINER_JACKSON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7794,10 +7794,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Jackson3 + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson3 } }, - [OPPONENT_JACKSON_4] = + [TRAINER_JACKSON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7808,10 +7808,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 1, - .party = gTrainerParty_Jackson4 + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson4 } }, - [OPPONENT_JACKSON_5] = + [TRAINER_JACKSON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7822,10 +7822,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Jackson5 + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson5 } }, - [OPPONENT_CATHERINE_1] = + [TRAINER_CATHERINE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7836,10 +7836,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Catherine1 + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine1 } }, - [OPPONENT_JENNA] = + [TRAINER_JENNA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7850,10 +7850,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 3, - .party = gTrainerParty_Jenna + .party = {.NoItemDefaultMoves = gTrainerParty_Jenna } }, - [OPPONENT_SOPHIA] = + [TRAINER_SOPHIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7864,10 +7864,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Sophia + .party = {.NoItemDefaultMoves = gTrainerParty_Sophia } }, - [OPPONENT_CATHERINE_2] = + [TRAINER_CATHERINE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7878,10 +7878,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Catherine2 + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine2 } }, - [OPPONENT_CATHERINE_3] = + [TRAINER_CATHERINE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7892,10 +7892,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Catherine3 + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine3 } }, - [OPPONENT_CATHERINE_4] = + [TRAINER_CATHERINE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7906,10 +7906,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Catherine4 + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine4 } }, - [OPPONENT_CATHERINE_5] = + [TRAINER_CATHERINE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7920,10 +7920,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Catherine5 + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine5 } }, - [OPPONENT_MAXIE_1] = + [TRAINER_MAXIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_LEADER, @@ -7934,10 +7934,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Maxie1 + .party = {.NoItemDefaultMoves = gTrainerParty_Maxie1 } }, - [OPPONENT_GRUNT_28] = + [TRAINER_GRUNT_28] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7948,10 +7948,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt28 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt28 } }, - [OPPONENT_GRUNT_29] = + [TRAINER_GRUNT_29] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7962,10 +7962,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Grunt29 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt29 } }, - [OPPONENT_GRUNT_30] = + [TRAINER_GRUNT_30] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7976,10 +7976,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt30 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt30 } }, - [OPPONENT_GRUNT_31] = + [TRAINER_GRUNT_31] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7990,10 +7990,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt31 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt31 } }, - [OPPONENT_GRUNT_32] = + [TRAINER_GRUNT_32] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8004,10 +8004,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt32 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt32 } }, - [OPPONENT_GRUNT_33] = + [TRAINER_GRUNT_33] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8018,10 +8018,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt33 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt33 } }, - [OPPONENT_GRUNT_34] = + [TRAINER_GRUNT_34] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8032,10 +8032,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt34 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt34 } }, - [OPPONENT_GRUNT_35] = + [TRAINER_GRUNT_35] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8046,10 +8046,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt35 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt35 } }, - [OPPONENT_GRUNT_36] = + [TRAINER_GRUNT_36] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8060,10 +8060,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt36 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt36 } }, - [OPPONENT_GRUNT_37] = + [TRAINER_GRUNT_37] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8074,10 +8074,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt37 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt37 } }, - [OPPONENT_GRUNT_38] = + [TRAINER_GRUNT_38] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8088,10 +8088,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt38 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt38 } }, - [OPPONENT_GRUNT_39] = + [TRAINER_GRUNT_39] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8102,10 +8102,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt39 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt39 } }, - [OPPONENT_GRUNT_40] = + [TRAINER_GRUNT_40] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8116,10 +8116,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt40 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt40 } }, - [OPPONENT_GRUNT_41] = + [TRAINER_GRUNT_41] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8130,10 +8130,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt41 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt41 } }, - [OPPONENT_GRUNT_42] = + [TRAINER_GRUNT_42] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8144,10 +8144,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt42 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt42 } }, - [OPPONENT_GRUNT_43] = + [TRAINER_GRUNT_43] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8158,10 +8158,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt43 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt43 } }, - [OPPONENT_GRUNT_44] = + [TRAINER_GRUNT_44] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8172,10 +8172,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt44 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt44 } }, - [OPPONENT_GRUNT_45] = + [TRAINER_GRUNT_45] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8186,10 +8186,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt45 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt45 } }, - [OPPONENT_GRUNT_46] = + [TRAINER_GRUNT_46] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8200,10 +8200,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt46 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt46 } }, - [OPPONENT_GRUNT_47] = + [TRAINER_GRUNT_47] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8214,10 +8214,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt47 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt47 } }, - [OPPONENT_GRUNT_48] = + [TRAINER_GRUNT_48] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8228,10 +8228,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt48 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt48 } }, - [OPPONENT_GRUNT_49] = + [TRAINER_GRUNT_49] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8242,10 +8242,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt49 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt49 } }, - [OPPONENT_GRUNT_50] = + [TRAINER_GRUNT_50] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8256,10 +8256,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt50 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt50 } }, - [OPPONENT_GRUNT_51] = + [TRAINER_GRUNT_51] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8270,10 +8270,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt51 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt51 } }, - [OPPONENT_GRUNT_52] = + [TRAINER_GRUNT_52] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8284,10 +8284,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt52 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt52 } }, - [OPPONENT_GRUNT_53] = + [TRAINER_GRUNT_53] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8298,10 +8298,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt53 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt53 } }, - [OPPONENT_GRUNT_54] = + [TRAINER_GRUNT_54] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8312,10 +8312,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt54 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt54 } }, - [OPPONENT_ANONYMOUS_14] = + [TRAINER_ANONYMOUS_14] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8326,10 +8326,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Anonymous14 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous14 } }, - [OPPONENT_ANONYMOUS_15] = + [TRAINER_ANONYMOUS_15] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8340,10 +8340,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Anonymous15 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous15 } }, - [OPPONENT_TABITHA_1] = + [TRAINER_TABITHA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8354,10 +8354,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 3, - .party = gTrainerParty_Tabitha1 + .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha1 } }, - [OPPONENT_TABITHA_2] = + [TRAINER_TABITHA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8368,10 +8368,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Tabitha2 + .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha2 } }, - [OPPONENT_ANONYMOUS_16] = + [TRAINER_ANONYMOUS_16] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8382,10 +8382,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Anonymous16 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous16 } }, - [OPPONENT_COURTNEY_1] = + [TRAINER_COURTNEY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8396,10 +8396,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Courtney1 + .party = {.NoItemDefaultMoves = gTrainerParty_Courtney1 } }, - [OPPONENT_COURTNEY_2] = + [TRAINER_COURTNEY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8410,10 +8410,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Courtney2 + .party = {.NoItemDefaultMoves = gTrainerParty_Courtney2 } }, - [OPPONENT_MAXIE_2] = + [TRAINER_MAXIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_LEADER, @@ -8424,10 +8424,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Maxie2 + .party = {.NoItemDefaultMoves = gTrainerParty_Maxie2 } }, - [OPPONENT_MAXIE_3] = + [TRAINER_MAXIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_LEADER, @@ -8438,10 +8438,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Maxie3 + .party = {.NoItemDefaultMoves = gTrainerParty_Maxie3 } }, - [OPPONENT_TIANA] = + [TRAINER_TIANA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8452,10 +8452,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tiana + .party = {.NoItemDefaultMoves = gTrainerParty_Tiana } }, - [OPPONENT_HALEY_1] = + [TRAINER_HALEY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8466,10 +8466,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Haley1 + .party = {.NoItemDefaultMoves = gTrainerParty_Haley1 } }, - [OPPONENT_JANICE] = + [TRAINER_JANICE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8480,10 +8480,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Janice + .party = {.NoItemDefaultMoves = gTrainerParty_Janice } }, - [OPPONENT_VIVI] = + [TRAINER_VIVI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -8494,10 +8494,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Vivi + .party = {.NoItemDefaultMoves = gTrainerParty_Vivi } }, - [OPPONENT_HALEY_2] = + [TRAINER_HALEY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8508,10 +8508,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Haley2 + .party = {.NoItemDefaultMoves = gTrainerParty_Haley2 } }, - [OPPONENT_HALEY_3] = + [TRAINER_HALEY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8522,10 +8522,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Haley3 + .party = {.NoItemDefaultMoves = gTrainerParty_Haley3 } }, - [OPPONENT_HALEY_4] = + [TRAINER_HALEY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8536,10 +8536,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Haley4 + .party = {.NoItemDefaultMoves = gTrainerParty_Haley4 } }, - [OPPONENT_HALEY_5] = + [TRAINER_HALEY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8550,10 +8550,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Haley5 + .party = {.NoItemDefaultMoves = gTrainerParty_Haley5 } }, - [OPPONENT_SALLY] = + [TRAINER_SALLY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8564,10 +8564,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Sally + .party = {.NoItemDefaultMoves = gTrainerParty_Sally } }, - [OPPONENT_ROBIN] = + [TRAINER_ROBIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8578,10 +8578,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Robin + .party = {.NoItemDefaultMoves = gTrainerParty_Robin } }, - [OPPONENT_ANDREA] = + [TRAINER_ANDREA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8592,10 +8592,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Andrea + .party = {.NoItemDefaultMoves = gTrainerParty_Andrea } }, - [OPPONENT_CRISSY] = + [TRAINER_CRISSY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8606,10 +8606,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Crissy + .party = {.NoItemDefaultMoves = gTrainerParty_Crissy } }, - [OPPONENT_RICK] = + [TRAINER_RICK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8620,10 +8620,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Rick + .party = {.NoItemDefaultMoves = gTrainerParty_Rick } }, - [OPPONENT_LYLE] = + [TRAINER_LYLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8634,10 +8634,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lyle + .party = {.NoItemDefaultMoves = gTrainerParty_Lyle } }, - [OPPONENT_JOSE] = + [TRAINER_JOSE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8648,10 +8648,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Jose + .party = {.NoItemDefaultMoves = gTrainerParty_Jose } }, - [OPPONENT_DOUG] = + [TRAINER_DOUG] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8662,10 +8662,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Doug + .party = {.NoItemDefaultMoves = gTrainerParty_Doug } }, - [OPPONENT_GREG] = + [TRAINER_GREG] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8676,10 +8676,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Greg + .party = {.NoItemDefaultMoves = gTrainerParty_Greg } }, - [OPPONENT_KENT] = + [TRAINER_KENT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8690,10 +8690,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Kent + .party = {.NoItemDefaultMoves = gTrainerParty_Kent } }, - [OPPONENT_JAMES_1] = + [TRAINER_JAMES_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8704,10 +8704,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_James1 + .party = {.NoItemDefaultMoves = gTrainerParty_James1 } }, - [OPPONENT_JAMES_2] = + [TRAINER_JAMES_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8718,10 +8718,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_James2 + .party = {.NoItemDefaultMoves = gTrainerParty_James2 } }, - [OPPONENT_JAMES_3] = + [TRAINER_JAMES_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8732,10 +8732,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_James3 + .party = {.NoItemDefaultMoves = gTrainerParty_James3 } }, - [OPPONENT_JAMES_4] = + [TRAINER_JAMES_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8746,10 +8746,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_James4 + .party = {.NoItemDefaultMoves = gTrainerParty_James4 } }, - [OPPONENT_JAMES_5] = + [TRAINER_JAMES_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8760,10 +8760,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_James5 + .party = {.NoItemDefaultMoves = gTrainerParty_James5 } }, - [OPPONENT_BRICE] = + [TRAINER_BRICE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8774,10 +8774,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Brice + .party = {.NoItemDefaultMoves = gTrainerParty_Brice } }, - [OPPONENT_TRENT_1] = + [TRAINER_TRENT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8788,10 +8788,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Trent1 + .party = {.NoItemDefaultMoves = gTrainerParty_Trent1 } }, - [OPPONENT_LENNY] = + [TRAINER_LENNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8802,10 +8802,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lenny + .party = {.NoItemDefaultMoves = gTrainerParty_Lenny } }, - [OPPONENT_LUCAS_1] = + [TRAINER_LUCAS_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8816,10 +8816,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Lucas1 + .party = {.NoItemDefaultMoves = gTrainerParty_Lucas1 } }, - [OPPONENT_ALAN] = + [TRAINER_ALAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8830,10 +8830,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Alan + .party = {.NoItemDefaultMoves = gTrainerParty_Alan } }, - [OPPONENT_CLARK] = + [TRAINER_CLARK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8844,10 +8844,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Clark + .party = {.NoItemDefaultMoves = gTrainerParty_Clark } }, - [OPPONENT_ERIC] = + [TRAINER_ERIC] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8858,10 +8858,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Eric + .party = {.NoItemDefaultMoves = gTrainerParty_Eric } }, - [OPPONENT_LUCAS_2] = + [TRAINER_LUCAS_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_HIKER, @@ -8872,10 +8872,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Lucas2 + .party = {.NoItemCustomMoves = gTrainerParty_Lucas2 } }, - [OPPONENT_MIKE_1] = + [TRAINER_MIKE_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_HIKER, @@ -8886,10 +8886,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Mike1 + .party = {.NoItemCustomMoves = gTrainerParty_Mike1 } }, - [OPPONENT_MIKE_2] = + [TRAINER_MIKE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8900,10 +8900,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Mike2 + .party = {.NoItemDefaultMoves = gTrainerParty_Mike2 } }, - [OPPONENT_TRENT_2] = + [TRAINER_TRENT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8914,10 +8914,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Trent2 + .party = {.NoItemDefaultMoves = gTrainerParty_Trent2 } }, - [OPPONENT_TRENT_3] = + [TRAINER_TRENT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8928,10 +8928,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Trent3 + .party = {.NoItemDefaultMoves = gTrainerParty_Trent3 } }, - [OPPONENT_TRENT_4] = + [TRAINER_TRENT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8942,10 +8942,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Trent4 + .party = {.NoItemDefaultMoves = gTrainerParty_Trent4 } }, - [OPPONENT_TRENT_5] = + [TRAINER_TRENT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8956,10 +8956,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Trent5 + .party = {.NoItemDefaultMoves = gTrainerParty_Trent5 } }, - [OPPONENT_DEZ_AND_LUKE] = + [TRAINER_DEZ_AND_LUKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -8970,10 +8970,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_DezAndLuke + .party = {.NoItemDefaultMoves = gTrainerParty_DezAndLuke } }, - [OPPONENT_LEA_AND_JED] = + [TRAINER_LEA_AND_JED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -8984,10 +8984,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LeaAndJed + .party = {.NoItemDefaultMoves = gTrainerParty_LeaAndJed } }, - [OPPONENT_LOIS_AND_HAL_1] = + [TRAINER_LOIS_AND_HAL_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -8998,10 +8998,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LoisAndHal1 + .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal1 } }, - [OPPONENT_LOIS_AND_HAL_2] = + [TRAINER_LOIS_AND_HAL_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9012,10 +9012,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LoisAndHal2 + .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal2 } }, - [OPPONENT_LOIS_AND_HAL_3] = + [TRAINER_LOIS_AND_HAL_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9026,10 +9026,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LoisAndHal3 + .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal3 } }, - [OPPONENT_LOIS_AND_HAL_4] = + [TRAINER_LOIS_AND_HAL_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9040,10 +9040,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LoisAndHal4 + .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal4 } }, - [OPPONENT_LOIS_AND_HAL_5] = + [TRAINER_LOIS_AND_HAL_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9054,10 +9054,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LoisAndHal5 + .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal5 } }, - [OPPONENT_JOHANNA] = + [TRAINER_JOHANNA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -9068,10 +9068,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Johanna + .party = {.NoItemDefaultMoves = gTrainerParty_Johanna } }, - [OPPONENT_ZANE] = + [TRAINER_ZANE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -9082,10 +9082,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Zane + .party = {.NoItemCustomMoves = gTrainerParty_Zane } }, - [OPPONENT_VIVIAN] = + [TRAINER_VIVIAN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -9096,10 +9096,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Vivian + .party = {.NoItemCustomMoves = gTrainerParty_Vivian } }, - [OPPONENT_SADIE] = + [TRAINER_SADIE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -9110,10 +9110,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Sadie + .party = {.NoItemCustomMoves = gTrainerParty_Sadie } }, - [OPPONENT_HIDEO_2] = + [TRAINER_HIDEO_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -9124,10 +9124,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 2, - .party = gTrainerParty_Hideo2 + .party = {.NoItemCustomMoves = gTrainerParty_Hideo2 } }, - [OPPONENT_KEIGO] = + [TRAINER_KEIGO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -9138,10 +9138,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 2, - .party = gTrainerParty_Keigo + .party = {.NoItemCustomMoves = gTrainerParty_Keigo } }, - [OPPONENT_TSUNAO] = + [TRAINER_TSUNAO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -9152,10 +9152,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 3, - .party = gTrainerParty_Tsunao + .party = {.NoItemCustomMoves = gTrainerParty_Tsunao } }, - [OPPONENT_TERRELL] = + [TRAINER_TERRELL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -9166,10 +9166,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Terrell + .party = {.NoItemDefaultMoves = gTrainerParty_Terrell } }, - [OPPONENT_KYLEE] = + [TRAINER_KYLEE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -9180,10 +9180,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Kylee + .party = {.NoItemDefaultMoves = gTrainerParty_Kylee } }, - [OPPONENT_WALLY_2] = + [TRAINER_WALLY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9194,10 +9194,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Wally2 + .party = {.NoItemDefaultMoves = gTrainerParty_Wally2 } }, - [OPPONENT_WALLY_3] = + [TRAINER_WALLY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9208,10 +9208,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wally3 + .party = {.NoItemCustomMoves = gTrainerParty_Wally3 } }, - [OPPONENT_WALLY_4] = + [TRAINER_WALLY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9222,10 +9222,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wally4 + .party = {.NoItemCustomMoves = gTrainerParty_Wally4 } }, - [OPPONENT_WALLY_5] = + [TRAINER_WALLY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9236,10 +9236,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wally5 + .party = {.NoItemCustomMoves = gTrainerParty_Wally5 } }, - [OPPONENT_WALLY_6] = + [TRAINER_WALLY_6] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9250,10 +9250,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wally6 + .party = {.NoItemCustomMoves = gTrainerParty_Wally6 } }, - [OPPONENT_BRENDAN_10] = + [TRAINER_BRENDAN_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9264,10 +9264,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_Brendan10 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan10 } }, - [OPPONENT_BRENDAN_11] = + [TRAINER_BRENDAN_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9278,10 +9278,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_Brendan11 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan11 } }, - [OPPONENT_BRENDAN_12] = + [TRAINER_BRENDAN_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9292,10 +9292,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_Brendan12 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan12 } }, - [OPPONENT_MAY_10] = + [TRAINER_MAY_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9306,10 +9306,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_May10 + .party = {.NoItemDefaultMoves = gTrainerParty_May10 } }, - [OPPONENT_MAY_11] = + [TRAINER_MAY_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9320,10 +9320,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_May11 + .party = {.NoItemDefaultMoves = gTrainerParty_May11 } }, - [OPPONENT_MAY_12] = + [TRAINER_MAY_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9334,10 +9334,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_May12 + .party = {.NoItemDefaultMoves = gTrainerParty_May12 } }, - [OPPONENT_JONAH] = + [TRAINER_JONAH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9348,10 +9348,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Jonah + .party = {.NoItemDefaultMoves = gTrainerParty_Jonah } }, - [OPPONENT_HENRY] = + [TRAINER_HENRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9362,10 +9362,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Henry + .party = {.NoItemDefaultMoves = gTrainerParty_Henry } }, - [OPPONENT_ROGER] = + [TRAINER_ROGER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9376,10 +9376,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Roger + .party = {.NoItemDefaultMoves = gTrainerParty_Roger } }, - [OPPONENT_ALEXA] = + [TRAINER_ALEXA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -9390,10 +9390,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Alexa + .party = {.NoItemDefaultMoves = gTrainerParty_Alexa } }, - [OPPONENT_RUBEN] = + [TRAINER_RUBEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -9404,10 +9404,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Ruben + .party = {.NoItemDefaultMoves = gTrainerParty_Ruben } }, - [OPPONENT_KOJI] = + [TRAINER_KOJI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -9418,10 +9418,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Koji + .party = {.NoItemDefaultMoves = gTrainerParty_Koji } }, - [OPPONENT_WAYNE] = + [TRAINER_WAYNE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9432,10 +9432,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Wayne + .party = {.NoItemDefaultMoves = gTrainerParty_Wayne } }, - [OPPONENT_BYRON] = + [TRAINER_BYRON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -9446,10 +9446,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Byron + .party = {.NoItemDefaultMoves = gTrainerParty_Byron } }, - [OPPONENT_REED] = + [TRAINER_REED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -9460,10 +9460,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Reed + .party = {.NoItemDefaultMoves = gTrainerParty_Reed } }, - [OPPONENT_TISHA] = + [TRAINER_TISHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -9474,10 +9474,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Tisha + .party = {.NoItemDefaultMoves = gTrainerParty_Tisha } }, - [OPPONENT_TORI_AND_TIA] = + [TRAINER_TORI_AND_TIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -9488,10 +9488,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_ToriAndTia + .party = {.NoItemDefaultMoves = gTrainerParty_ToriAndTia } }, - [OPPONENT_KIM_AND_IRIS] = + [TRAINER_KIM_AND_IRIS] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -9502,10 +9502,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_KimAndIris + .party = {.NoItemCustomMoves = gTrainerParty_KimAndIris } }, - [OPPONENT_TYRA_AND_IVY] = + [TRAINER_TYRA_AND_IVY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -9516,10 +9516,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_TyraAndIvy + .party = {.NoItemCustomMoves = gTrainerParty_TyraAndIvy } }, - [OPPONENT_MEL_AND_PAUL] = + [TRAINER_MEL_AND_PAUL] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9530,10 +9530,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_MelAndPaul + .party = {.NoItemCustomMoves = gTrainerParty_MelAndPaul } }, - [OPPONENT_JOHN_AND_JAY_1] = + [TRAINER_JOHN_AND_JAY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9544,10 +9544,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_JohnAndJay1 + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay1 } }, - [OPPONENT_JOHN_AND_JAY_2] = + [TRAINER_JOHN_AND_JAY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9558,10 +9558,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_JohnAndJay2 + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay2 } }, - [OPPONENT_JOHN_AND_JAY_3] = + [TRAINER_JOHN_AND_JAY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9572,10 +9572,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_JohnAndJay3 + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay3 } }, - [OPPONENT_JOHN_AND_JAY_4] = + [TRAINER_JOHN_AND_JAY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9586,10 +9586,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_JohnAndJay4 + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay4 } }, - [OPPONENT_JOHN_AND_JAY_5] = + [TRAINER_JOHN_AND_JAY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9600,10 +9600,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_JohnAndJay5 + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay5 } }, - [OPPONENT_RELI_AND_IAN] = + [TRAINER_RELI_AND_IAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9614,10 +9614,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_ReliAndIan + .party = {.NoItemDefaultMoves = gTrainerParty_ReliAndIan } }, - [OPPONENT_RITA_AND_SAM_1] = + [TRAINER_RITA_AND_SAM_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9628,10 +9628,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_RitaAndSam1 + .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam1 } }, - [OPPONENT_RITA_AND_SAM_2] = + [TRAINER_RITA_AND_SAM_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9642,10 +9642,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_RitaAndSam2 + .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam2 } }, - [OPPONENT_RITA_AND_SAM_3] = + [TRAINER_RITA_AND_SAM_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9656,10 +9656,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_RitaAndSam3 + .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam3 } }, - [OPPONENT_RITA_AND_SAM_4] = + [TRAINER_RITA_AND_SAM_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9670,10 +9670,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_RitaAndSam4 + .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam4 } }, - [OPPONENT_RITA_AND_SAM_5] = + [TRAINER_RITA_AND_SAM_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9684,10 +9684,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_RitaAndSam5 + .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam5 } }, - [OPPONENT_LISA_AND_RAY] = + [TRAINER_LISA_AND_RAY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9698,10 +9698,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LisaAndRay + .party = {.NoItemDefaultMoves = gTrainerParty_LisaAndRay } }, - [OPPONENT_EUGENE] = + [TRAINER_EUGENE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9712,6 +9712,6 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Eugene - } + .party = {.NoItemDefaultMoves = gTrainerParty_Eugene } + }, }; diff --git a/src/data/trainers_en.h b/src/data/trainers_en.h index fbcdd5a4e..621945db8 100644 --- a/src/data/trainers_en.h +++ b/src/data/trainers_en.h @@ -1,5 +1,5 @@ const struct Trainer gTrainers[] = { - [OPPONENT_NONE] = + [TRAINER_NONE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_1, @@ -10,10 +10,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 0, - .party = NULL + .party = {.NoItemDefaultMoves = NULL } }, - [OPPONENT_ARCHIE_1] = + [TRAINER_ARCHIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_LEADER, @@ -24,10 +24,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Archie1 + .party = {.NoItemDefaultMoves = gTrainerParty_Archie1 } }, - [OPPONENT_GRUNT_1] = + [TRAINER_GRUNT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -38,10 +38,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt1 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt1 } }, - [OPPONENT_GRUNT_2] = + [TRAINER_GRUNT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -52,10 +52,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Grunt2 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt2 } }, - [OPPONENT_GRUNT_3] = + [TRAINER_GRUNT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -66,10 +66,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt3 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt3 } }, - [OPPONENT_GRUNT_4] = + [TRAINER_GRUNT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -80,10 +80,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt4 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt4 } }, - [OPPONENT_GRUNT_5] = + [TRAINER_GRUNT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -94,10 +94,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt5 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt5 } }, - [OPPONENT_GRUNT_6] = + [TRAINER_GRUNT_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -108,10 +108,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt6 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt6 } }, - [OPPONENT_GRUNT_7] = + [TRAINER_GRUNT_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -122,10 +122,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt7 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt7 } }, - [OPPONENT_GRUNT_8] = + [TRAINER_GRUNT_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -136,10 +136,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt8 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt8 } }, - [OPPONENT_GRUNT_9] = + [TRAINER_GRUNT_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -150,10 +150,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt9 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt9 } }, - [OPPONENT_GRUNT_10] = + [TRAINER_GRUNT_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -164,10 +164,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt10 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt10 } }, - [OPPONENT_GRUNT_11] = + [TRAINER_GRUNT_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -178,10 +178,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt11 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt11 } }, - [OPPONENT_GRUNT_12] = + [TRAINER_GRUNT_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -192,10 +192,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt12 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt12 } }, - [OPPONENT_GRUNT_13] = + [TRAINER_GRUNT_13] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -206,10 +206,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt13 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt13 } }, - [OPPONENT_GRUNT_14] = + [TRAINER_GRUNT_14] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -220,10 +220,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt14 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt14 } }, - [OPPONENT_GRUNT_15] = + [TRAINER_GRUNT_15] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -234,10 +234,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt15 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt15 } }, - [OPPONENT_GRUNT_16] = + [TRAINER_GRUNT_16] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -248,10 +248,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt16 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt16 } }, - [OPPONENT_GRUNT_17] = + [TRAINER_GRUNT_17] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -262,10 +262,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt17 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt17 } }, - [OPPONENT_GRUNT_18] = + [TRAINER_GRUNT_18] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -276,10 +276,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt18 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt18 } }, - [OPPONENT_GRUNT_19] = + [TRAINER_GRUNT_19] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -290,10 +290,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt19 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt19 } }, - [OPPONENT_GRUNT_20] = + [TRAINER_GRUNT_20] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -304,10 +304,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt20 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt20 } }, - [OPPONENT_GRUNT_21] = + [TRAINER_GRUNT_21] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -318,10 +318,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt21 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt21 } }, - [OPPONENT_GRUNT_22] = + [TRAINER_GRUNT_22] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -332,10 +332,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt22 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt22 } }, - [OPPONENT_GRUNT_23] = + [TRAINER_GRUNT_23] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -346,10 +346,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt23 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt23 } }, - [OPPONENT_GRUNT_24] = + [TRAINER_GRUNT_24] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -360,10 +360,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt24 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt24 } }, - [OPPONENT_GRUNT_25] = + [TRAINER_GRUNT_25] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -374,10 +374,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt25 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt25 } }, - [OPPONENT_GRUNT_26] = + [TRAINER_GRUNT_26] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -388,10 +388,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt26 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt26 } }, - [OPPONENT_GRUNT_27] = + [TRAINER_GRUNT_27] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_AQUA, @@ -402,10 +402,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt27 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt27 } }, - [OPPONENT_ANONYMOUS_1] = + [TRAINER_ANONYMOUS_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -416,10 +416,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Anonymous1 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous1 } }, - [OPPONENT_MATT_1] = + [TRAINER_MATT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -430,10 +430,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Matt1 + .party = {.NoItemDefaultMoves = gTrainerParty_Matt1 } }, - [OPPONENT_MATT_2] = + [TRAINER_MATT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -444,10 +444,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 3, - .party = gTrainerParty_Matt2 + .party = {.NoItemDefaultMoves = gTrainerParty_Matt2 } }, - [OPPONENT_SHELLY_1] = + [TRAINER_SHELLY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -458,10 +458,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelly1 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelly1 } }, - [OPPONENT_SHELLY_2] = + [TRAINER_SHELLY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_ADMIN, @@ -472,10 +472,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelly2 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelly2 } }, - [OPPONENT_ARCHIE_2] = + [TRAINER_ARCHIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_LEADER, @@ -486,10 +486,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Archie2 + .party = {.NoItemDefaultMoves = gTrainerParty_Archie2 } }, - [OPPONENT_ARCHIE_3] = + [TRAINER_ARCHIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AQUA_LEADER, @@ -500,10 +500,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Archie3 + .party = {.NoItemDefaultMoves = gTrainerParty_Archie3 } }, - [OPPONENT_DAISY] = + [TRAINER_DAISY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -514,10 +514,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Daisy + .party = {.NoItemDefaultMoves = gTrainerParty_Daisy } }, - [OPPONENT_ROSE_1] = + [TRAINER_ROSE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -528,10 +528,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Rose1 + .party = {.NoItemDefaultMoves = gTrainerParty_Rose1 } }, - [OPPONENT_LILY] = + [TRAINER_LILY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -542,10 +542,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lily + .party = {.NoItemDefaultMoves = gTrainerParty_Lily } }, - [OPPONENT_VIOLET] = + [TRAINER_VIOLET] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -556,10 +556,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Violet + .party = {.NoItemDefaultMoves = gTrainerParty_Violet } }, - [OPPONENT_ROSE_2] = + [TRAINER_ROSE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -570,10 +570,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Rose2 + .party = {.NoItemDefaultMoves = gTrainerParty_Rose2 } }, - [OPPONENT_ROSE_3] = + [TRAINER_ROSE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -584,10 +584,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Rose3 + .party = {.NoItemDefaultMoves = gTrainerParty_Rose3 } }, - [OPPONENT_ROSE_4] = + [TRAINER_ROSE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -598,10 +598,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Rose4 + .party = {.NoItemDefaultMoves = gTrainerParty_Rose4 } }, - [OPPONENT_ROSE_5] = + [TRAINER_ROSE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_AROMA_LADY, @@ -612,10 +612,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Rose5 + .party = {.NoItemDefaultMoves = gTrainerParty_Rose5 } }, - [OPPONENT_DUSTY_1] = + [TRAINER_DUSTY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -626,10 +626,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dusty1 + .party = {.NoItemCustomMoves = gTrainerParty_Dusty1 } }, - [OPPONENT_CHIP] = + [TRAINER_CHIP] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -640,10 +640,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Chip + .party = {.NoItemCustomMoves = gTrainerParty_Chip } }, - [OPPONENT_FOSTER] = + [TRAINER_FOSTER] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -654,10 +654,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Foster + .party = {.NoItemCustomMoves = gTrainerParty_Foster } }, - [OPPONENT_DUSTY_2] = + [TRAINER_DUSTY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -668,10 +668,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dusty2 + .party = {.NoItemCustomMoves = gTrainerParty_Dusty2 } }, - [OPPONENT_DUSTY_3] = + [TRAINER_DUSTY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -682,10 +682,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dusty3 + .party = {.NoItemCustomMoves = gTrainerParty_Dusty3 } }, - [OPPONENT_DUSTY_4] = + [TRAINER_DUSTY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -696,10 +696,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dusty4 + .party = {.NoItemCustomMoves = gTrainerParty_Dusty4 } }, - [OPPONENT_DUSTY_5] = + [TRAINER_DUSTY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RUIN_MANIAC, @@ -710,10 +710,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dusty5 + .party = {.NoItemCustomMoves = gTrainerParty_Dusty5 } }, - [OPPONENT_GABBY_AND_TY_1] = + [TRAINER_GABBY_AND_TY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -724,10 +724,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy1 + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy1 } }, - [OPPONENT_GABBY_AND_TY_2] = + [TRAINER_GABBY_AND_TY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -738,10 +738,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy2 + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy2 } }, - [OPPONENT_GABBY_AND_TY_3] = + [TRAINER_GABBY_AND_TY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -752,10 +752,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy3 + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy3 } }, - [OPPONENT_GABBY_AND_TY_4] = + [TRAINER_GABBY_AND_TY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -766,10 +766,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy4 + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy4 } }, - [OPPONENT_GABBY_AND_TY_5] = + [TRAINER_GABBY_AND_TY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -780,10 +780,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy5 + .party = {.NoItemDefaultMoves = gTrainerParty_GabbyAndTy5 } }, - [OPPONENT_GABBY_AND_TY_6] = + [TRAINER_GABBY_AND_TY_6] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_INTERVIEWER, @@ -794,10 +794,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GabbyAndTy6 + .party = {.NoItemCustomMoves = gTrainerParty_GabbyAndTy6 } }, - [OPPONENT_LOLA_1] = + [TRAINER_LOLA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -808,10 +808,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lola1 + .party = {.NoItemDefaultMoves = gTrainerParty_Lola1 } }, - [OPPONENT_CARMEN] = + [TRAINER_CARMEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -822,10 +822,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Carmen + .party = {.NoItemDefaultMoves = gTrainerParty_Carmen } }, - [OPPONENT_GWEN] = + [TRAINER_GWEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -836,10 +836,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Gwen + .party = {.NoItemDefaultMoves = gTrainerParty_Gwen } }, - [OPPONENT_LOLA_2] = + [TRAINER_LOLA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -850,10 +850,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lola2 + .party = {.NoItemDefaultMoves = gTrainerParty_Lola2 } }, - [OPPONENT_LOLA_3] = + [TRAINER_LOLA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -864,10 +864,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lola3 + .party = {.NoItemDefaultMoves = gTrainerParty_Lola3 } }, - [OPPONENT_LOLA_4] = + [TRAINER_LOLA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -878,10 +878,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lola4 + .party = {.NoItemDefaultMoves = gTrainerParty_Lola4 } }, - [OPPONENT_LOLA_5] = + [TRAINER_LOLA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_F, @@ -892,10 +892,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lola5 + .party = {.NoItemDefaultMoves = gTrainerParty_Lola5 } }, - [OPPONENT_RICKY_1] = + [TRAINER_RICKY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -906,10 +906,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ricky1 + .party = {.NoItemCustomMoves = gTrainerParty_Ricky1 } }, - [OPPONENT_SIMON] = + [TRAINER_SIMON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -920,10 +920,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Simon + .party = {.NoItemDefaultMoves = gTrainerParty_Simon } }, - [OPPONENT_CHARLIE] = + [TRAINER_CHARLIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -934,10 +934,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Charlie + .party = {.NoItemDefaultMoves = gTrainerParty_Charlie } }, - [OPPONENT_RICKY_2] = + [TRAINER_RICKY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -948,10 +948,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ricky2 + .party = {.NoItemCustomMoves = gTrainerParty_Ricky2 } }, - [OPPONENT_RICKY_3] = + [TRAINER_RICKY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -962,10 +962,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ricky3 + .party = {.NoItemCustomMoves = gTrainerParty_Ricky3 } }, - [OPPONENT_RICKY_4] = + [TRAINER_RICKY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -976,10 +976,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ricky4 + .party = {.NoItemCustomMoves = gTrainerParty_Ricky4 } }, - [OPPONENT_RICKY_5] = + [TRAINER_RICKY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TUBER_M, @@ -990,10 +990,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ricky5 + .party = {.NoItemCustomMoves = gTrainerParty_Ricky5 } }, - [OPPONENT_RANDALL] = + [TRAINER_RANDALL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1004,10 +1004,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Randall + .party = {.NoItemDefaultMoves = gTrainerParty_Randall } }, - [OPPONENT_PARKER] = + [TRAINER_PARKER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1018,10 +1018,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Parker + .party = {.NoItemDefaultMoves = gTrainerParty_Parker } }, - [OPPONENT_GEORGE] = + [TRAINER_GEORGE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1032,10 +1032,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_George + .party = {.NoItemDefaultMoves = gTrainerParty_George } }, - [OPPONENT_BERKE] = + [TRAINER_BERKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1046,10 +1046,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Berke + .party = {.NoItemDefaultMoves = gTrainerParty_Berke } }, - [OPPONENT_CLYDE] = + [TRAINER_CLYDE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1060,10 +1060,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Clyde + .party = {.NoItemCustomMoves = gTrainerParty_Clyde } }, - [OPPONENT_VINCENT] = + [TRAINER_VINCENT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1074,10 +1074,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Vincent + .party = {.NoItemDefaultMoves = gTrainerParty_Vincent } }, - [OPPONENT_LEROY] = + [TRAINER_LEROY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1088,10 +1088,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Leroy + .party = {.NoItemDefaultMoves = gTrainerParty_Leroy } }, - [OPPONENT_WILTON_1] = + [TRAINER_WILTON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1102,10 +1102,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wilton1 + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton1 } }, - [OPPONENT_EDGAR] = + [TRAINER_EDGAR] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1116,10 +1116,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Edgar + .party = {.NoItemDefaultMoves = gTrainerParty_Edgar } }, - [OPPONENT_ALBERT] = + [TRAINER_ALBERT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1130,10 +1130,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Albert + .party = {.NoItemDefaultMoves = gTrainerParty_Albert } }, - [OPPONENT_SAMUEL] = + [TRAINER_SAMUEL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1144,10 +1144,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Samuel + .party = {.NoItemDefaultMoves = gTrainerParty_Samuel } }, - [OPPONENT_VITO] = + [TRAINER_VITO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1158,10 +1158,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_Vito + .party = {.NoItemDefaultMoves = gTrainerParty_Vito } }, - [OPPONENT_OWEN] = + [TRAINER_OWEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1172,10 +1172,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Owen + .party = {.NoItemDefaultMoves = gTrainerParty_Owen } }, - [OPPONENT_WILTON_2] = + [TRAINER_WILTON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1186,10 +1186,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wilton2 + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton2 } }, - [OPPONENT_WILTON_3] = + [TRAINER_WILTON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1200,10 +1200,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wilton3 + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton3 } }, - [OPPONENT_WILTON_4] = + [TRAINER_WILTON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1214,10 +1214,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wilton4 + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton4 } }, - [OPPONENT_WILTON_5] = + [TRAINER_WILTON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1228,10 +1228,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wilton5 + .party = {.NoItemDefaultMoves = gTrainerParty_Wilton5 } }, - [OPPONENT_WARREN] = + [TRAINER_WARREN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1242,10 +1242,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Warren + .party = {.NoItemDefaultMoves = gTrainerParty_Warren } }, - [OPPONENT_MARY] = + [TRAINER_MARY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1256,10 +1256,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Mary + .party = {.NoItemDefaultMoves = gTrainerParty_Mary } }, - [OPPONENT_LORI] = + [TRAINER_LORI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1270,10 +1270,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Lori + .party = {.NoItemDefaultMoves = gTrainerParty_Lori } }, - [OPPONENT_JODY] = + [TRAINER_JODY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1284,10 +1284,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 1, - .party = gTrainerParty_Jody + .party = {.NoItemDefaultMoves = gTrainerParty_Jody } }, - [OPPONENT_WENDY] = + [TRAINER_WENDY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1298,10 +1298,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 3, - .party = gTrainerParty_Wendy + .party = {.NoItemCustomMoves = gTrainerParty_Wendy } }, - [OPPONENT_ELAINE] = + [TRAINER_ELAINE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1312,10 +1312,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Elaine + .party = {.NoItemDefaultMoves = gTrainerParty_Elaine } }, - [OPPONENT_BROOKE_1] = + [TRAINER_BROOKE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1326,10 +1326,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brooke1 + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke1 } }, - [OPPONENT_JENNIFER] = + [TRAINER_JENNIFER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1340,10 +1340,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Jennifer + .party = {.NoItemDefaultMoves = gTrainerParty_Jennifer } }, - [OPPONENT_HOPE] = + [TRAINER_HOPE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1354,10 +1354,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Hope + .party = {.NoItemDefaultMoves = gTrainerParty_Hope } }, - [OPPONENT_SHANNON] = + [TRAINER_SHANNON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1368,10 +1368,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Shannon + .party = {.NoItemDefaultMoves = gTrainerParty_Shannon } }, - [OPPONENT_MICHELLE] = + [TRAINER_MICHELLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1382,10 +1382,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Michelle + .party = {.NoItemDefaultMoves = gTrainerParty_Michelle } }, - [OPPONENT_CAROLINE] = + [TRAINER_CAROLINE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1396,10 +1396,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Caroline + .party = {.NoItemDefaultMoves = gTrainerParty_Caroline } }, - [OPPONENT_JULIE] = + [TRAINER_JULIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1410,10 +1410,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Julie + .party = {.NoItemDefaultMoves = gTrainerParty_Julie } }, - [OPPONENT_BROOKE_2] = + [TRAINER_BROOKE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1424,10 +1424,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brooke2 + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke2 } }, - [OPPONENT_BROOKE_3] = + [TRAINER_BROOKE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1438,10 +1438,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brooke3 + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke3 } }, - [OPPONENT_BROOKE_4] = + [TRAINER_BROOKE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1452,10 +1452,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brooke4 + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke4 } }, - [OPPONENT_BROOKE_5] = + [TRAINER_BROOKE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -1466,10 +1466,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brooke5 + .party = {.NoItemDefaultMoves = gTrainerParty_Brooke5 } }, - [OPPONENT_PATRICIA] = + [TRAINER_PATRICIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1480,10 +1480,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Patricia + .party = {.NoItemDefaultMoves = gTrainerParty_Patricia } }, - [OPPONENT_KINDRA] = + [TRAINER_KINDRA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1494,10 +1494,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Kindra + .party = {.NoItemDefaultMoves = gTrainerParty_Kindra } }, - [OPPONENT_TAMMY] = + [TRAINER_TAMMY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1508,10 +1508,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tammy + .party = {.NoItemDefaultMoves = gTrainerParty_Tammy } }, - [OPPONENT_VALERIE_1] = + [TRAINER_VALERIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1522,10 +1522,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Valerie1 + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie1 } }, - [OPPONENT_TASHA] = + [TRAINER_TASHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1536,10 +1536,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tasha + .party = {.NoItemDefaultMoves = gTrainerParty_Tasha } }, - [OPPONENT_VALERIE_2] = + [TRAINER_VALERIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1550,10 +1550,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Valerie2 + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie2 } }, - [OPPONENT_VALERIE_3] = + [TRAINER_VALERIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1564,10 +1564,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Valerie3 + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie3 } }, - [OPPONENT_VALERIE_4] = + [TRAINER_VALERIE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1578,10 +1578,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Valerie4 + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie4 } }, - [OPPONENT_VALERIE_5] = + [TRAINER_VALERIE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HEX_MANIAC, @@ -1592,10 +1592,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Valerie5 + .party = {.NoItemDefaultMoves = gTrainerParty_Valerie5 } }, - [OPPONENT_CINDY_1] = + [TRAINER_CINDY_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1606,10 +1606,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy1 + .party = {.ItemDefaultMoves = gTrainerParty_Cindy1 } }, - [OPPONENT_ANONYMOUS_2] = + [TRAINER_ANONYMOUS_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LADY, @@ -1620,10 +1620,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous2 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous2 } }, - [OPPONENT_BRIANNA_1] = + [TRAINER_BRIANNA_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LADY, @@ -1634,10 +1634,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Brianna1 + .party = {.NoItemCustomMoves = gTrainerParty_Brianna1 } }, - [OPPONENT_CINDY_2] = + [TRAINER_CINDY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LADY, @@ -1648,10 +1648,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy2 + .party = {.NoItemCustomMoves = gTrainerParty_Cindy2 } }, - [OPPONENT_BRIANNA_2] = + [TRAINER_BRIANNA_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1662,10 +1662,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Brianna2 + .party = {.ItemDefaultMoves = gTrainerParty_Brianna2 } }, - [OPPONENT_ANETTE] = + [TRAINER_ANETTE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1676,10 +1676,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anette + .party = {.ItemDefaultMoves = gTrainerParty_Anette } }, - [OPPONENT_CINDY_3] = + [TRAINER_CINDY_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1690,10 +1690,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy3 + .party = {.ItemDefaultMoves = gTrainerParty_Cindy3 } }, - [OPPONENT_CINDY_4] = + [TRAINER_CINDY_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1704,10 +1704,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy4 + .party = {.ItemDefaultMoves = gTrainerParty_Cindy4 } }, - [OPPONENT_CINDY_5] = + [TRAINER_CINDY_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_LADY, @@ -1718,10 +1718,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy5 + .party = {.ItemDefaultMoves = gTrainerParty_Cindy5 } }, - [OPPONENT_CINDY_6] = + [TRAINER_CINDY_6] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LADY, @@ -1732,10 +1732,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cindy6 + .party = {.ItemCustomMoves = gTrainerParty_Cindy6 } }, - [OPPONENT_MELISSA] = + [TRAINER_MELISSA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1746,10 +1746,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Melissa + .party = {.NoItemDefaultMoves = gTrainerParty_Melissa } }, - [OPPONENT_SHEILA] = + [TRAINER_SHEILA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1760,10 +1760,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Sheila + .party = {.NoItemDefaultMoves = gTrainerParty_Sheila } }, - [OPPONENT_SHIRLEY] = + [TRAINER_SHIRLEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1774,10 +1774,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Shirley + .party = {.NoItemDefaultMoves = gTrainerParty_Shirley } }, - [OPPONENT_JESSICA_1] = + [TRAINER_JESSICA_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1788,10 +1788,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jessica1 + .party = {.NoItemCustomMoves = gTrainerParty_Jessica1 } }, - [OPPONENT_CONNIE] = + [TRAINER_CONNIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1802,10 +1802,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Connie + .party = {.NoItemDefaultMoves = gTrainerParty_Connie } }, - [OPPONENT_BRIDGET] = + [TRAINER_BRIDGET] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1816,10 +1816,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Bridget + .party = {.NoItemDefaultMoves = gTrainerParty_Bridget } }, - [OPPONENT_OLIVIA] = + [TRAINER_OLIVIA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1830,10 +1830,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Olivia + .party = {.NoItemCustomMoves = gTrainerParty_Olivia } }, - [OPPONENT_TIFFANY] = + [TRAINER_TIFFANY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1844,10 +1844,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Tiffany + .party = {.NoItemDefaultMoves = gTrainerParty_Tiffany } }, - [OPPONENT_JESSICA_2] = + [TRAINER_JESSICA_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1858,10 +1858,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jessica2 + .party = {.NoItemCustomMoves = gTrainerParty_Jessica2 } }, - [OPPONENT_JESSICA_3] = + [TRAINER_JESSICA_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1872,10 +1872,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jessica3 + .party = {.NoItemCustomMoves = gTrainerParty_Jessica3 } }, - [OPPONENT_JESSICA_4] = + [TRAINER_JESSICA_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1886,10 +1886,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jessica4 + .party = {.NoItemCustomMoves = gTrainerParty_Jessica4 } }, - [OPPONENT_JESSICA_5] = + [TRAINER_JESSICA_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -1900,10 +1900,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jessica5 + .party = {.NoItemCustomMoves = gTrainerParty_Jessica5 } }, - [OPPONENT_WINSTON_1] = + [TRAINER_WINSTON_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1914,10 +1914,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Winston1 + .party = {.ItemDefaultMoves = gTrainerParty_Winston1 } }, - [OPPONENT_ANONYMOUS_3] = + [TRAINER_ANONYMOUS_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1928,10 +1928,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous3 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous3 } }, - [OPPONENT_GARRET] = + [TRAINER_GARRET] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1942,10 +1942,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Garret + .party = {.ItemDefaultMoves = gTrainerParty_Garret } }, - [OPPONENT_WINSTON_2] = + [TRAINER_WINSTON_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1956,10 +1956,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Winston2 + .party = {.ItemDefaultMoves = gTrainerParty_Winston2 } }, - [OPPONENT_WINSTON_3] = + [TRAINER_WINSTON_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1970,10 +1970,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Winston3 + .party = {.ItemDefaultMoves = gTrainerParty_Winston3 } }, - [OPPONENT_WINSTON_4] = + [TRAINER_WINSTON_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1984,10 +1984,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Winston4 + .party = {.ItemDefaultMoves = gTrainerParty_Winston4 } }, - [OPPONENT_WINSTON_5] = + [TRAINER_WINSTON_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_RICH_BOY, @@ -1998,10 +1998,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Winston5 + .party = {.ItemCustomMoves = gTrainerParty_Winston5 } }, - [OPPONENT_STEVE_1] = + [TRAINER_STEVE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2012,10 +2012,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Steve1 + .party = {.NoItemDefaultMoves = gTrainerParty_Steve1 } }, - [OPPONENT_CHRIS] = + [TRAINER_CHRIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2026,10 +2026,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Chris + .party = {.NoItemDefaultMoves = gTrainerParty_Chris } }, - [OPPONENT_MARK] = + [TRAINER_MARK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2040,10 +2040,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Mark + .party = {.NoItemDefaultMoves = gTrainerParty_Mark } }, - [OPPONENT_KENN] = + [TRAINER_KENN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2054,10 +2054,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Kenn + .party = {.NoItemDefaultMoves = gTrainerParty_Kenn } }, - [OPPONENT_STEVE_2] = + [TRAINER_STEVE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2068,10 +2068,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Steve2 + .party = {.NoItemDefaultMoves = gTrainerParty_Steve2 } }, - [OPPONENT_STEVE_3] = + [TRAINER_STEVE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2082,10 +2082,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Steve3 + .party = {.NoItemDefaultMoves = gTrainerParty_Steve3 } }, - [OPPONENT_STEVE_4] = + [TRAINER_STEVE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2096,10 +2096,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Steve4 + .party = {.NoItemDefaultMoves = gTrainerParty_Steve4 } }, - [OPPONENT_STEVE_5] = + [TRAINER_STEVE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMANIAC, @@ -2110,10 +2110,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Steve5 + .party = {.NoItemDefaultMoves = gTrainerParty_Steve5 } }, - [OPPONENT_LUIS] = + [TRAINER_LUIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2124,10 +2124,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Luis + .party = {.NoItemDefaultMoves = gTrainerParty_Luis } }, - [OPPONENT_AUSTIN] = + [TRAINER_AUSTIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2138,10 +2138,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Austin + .party = {.NoItemDefaultMoves = gTrainerParty_Austin } }, - [OPPONENT_DOUGLAS] = + [TRAINER_DOUGLAS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2152,10 +2152,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Douglas + .party = {.NoItemDefaultMoves = gTrainerParty_Douglas } }, - [OPPONENT_DARRIN] = + [TRAINER_DARRIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2166,10 +2166,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Darrin + .party = {.NoItemDefaultMoves = gTrainerParty_Darrin } }, - [OPPONENT_TONY_1] = + [TRAINER_TONY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2180,10 +2180,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tony1 + .party = {.NoItemDefaultMoves = gTrainerParty_Tony1 } }, - [OPPONENT_JEROME] = + [TRAINER_JEROME] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2194,10 +2194,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jerome + .party = {.NoItemDefaultMoves = gTrainerParty_Jerome } }, - [OPPONENT_MATTHEW] = + [TRAINER_MATTHEW] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2208,10 +2208,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Matthew + .party = {.NoItemDefaultMoves = gTrainerParty_Matthew } }, - [OPPONENT_DAVID] = + [TRAINER_DAVID] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2222,10 +2222,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_David + .party = {.NoItemDefaultMoves = gTrainerParty_David } }, - [OPPONENT_SPENCER] = + [TRAINER_SPENCER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2236,10 +2236,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Spencer + .party = {.NoItemDefaultMoves = gTrainerParty_Spencer } }, - [OPPONENT_ROLAND] = + [TRAINER_ROLAND] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2250,10 +2250,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Roland + .party = {.NoItemDefaultMoves = gTrainerParty_Roland } }, - [OPPONENT_CODY] = + [TRAINER_CODY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2264,10 +2264,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cody + .party = {.NoItemDefaultMoves = gTrainerParty_Cody } }, - [OPPONENT_STAN] = + [TRAINER_STAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2278,10 +2278,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Stan + .party = {.NoItemDefaultMoves = gTrainerParty_Stan } }, - [OPPONENT_BARRY] = + [TRAINER_BARRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2292,10 +2292,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Barry + .party = {.NoItemDefaultMoves = gTrainerParty_Barry } }, - [OPPONENT_DEAN] = + [TRAINER_DEAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2306,10 +2306,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dean + .party = {.NoItemDefaultMoves = gTrainerParty_Dean } }, - [OPPONENT_RODNEY] = + [TRAINER_RODNEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2320,10 +2320,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Rodney + .party = {.NoItemDefaultMoves = gTrainerParty_Rodney } }, - [OPPONENT_RICHARD] = + [TRAINER_RICHARD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2334,10 +2334,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Richard + .party = {.NoItemDefaultMoves = gTrainerParty_Richard } }, - [OPPONENT_HERMAN] = + [TRAINER_HERMAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2348,10 +2348,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Herman + .party = {.NoItemDefaultMoves = gTrainerParty_Herman } }, - [OPPONENT_ANONYMOUS_4] = + [TRAINER_ANONYMOUS_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2362,10 +2362,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous4 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous4 } }, - [OPPONENT_GILBERT] = + [TRAINER_GILBERT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2376,10 +2376,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Gilbert + .party = {.NoItemDefaultMoves = gTrainerParty_Gilbert } }, - [OPPONENT_FRANKLIN] = + [TRAINER_FRANKLIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2390,10 +2390,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Franklin + .party = {.NoItemDefaultMoves = gTrainerParty_Franklin } }, - [OPPONENT_DANNY] = + [TRAINER_DANNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2404,10 +2404,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Danny + .party = {.NoItemDefaultMoves = gTrainerParty_Danny } }, - [OPPONENT_JACK] = + [TRAINER_JACK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2418,10 +2418,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jack + .party = {.NoItemDefaultMoves = gTrainerParty_Jack } }, - [OPPONENT_DUDLEY] = + [TRAINER_DUDLEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2432,10 +2432,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dudley + .party = {.NoItemDefaultMoves = gTrainerParty_Dudley } }, - [OPPONENT_CHAD] = + [TRAINER_CHAD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2446,10 +2446,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Chad + .party = {.NoItemDefaultMoves = gTrainerParty_Chad } }, - [OPPONENT_TONY_2] = + [TRAINER_TONY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2460,10 +2460,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tony2 + .party = {.NoItemDefaultMoves = gTrainerParty_Tony2 } }, - [OPPONENT_TONY_3] = + [TRAINER_TONY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2474,10 +2474,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tony3 + .party = {.NoItemDefaultMoves = gTrainerParty_Tony3 } }, - [OPPONENT_TONY_4] = + [TRAINER_TONY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2488,10 +2488,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tony4 + .party = {.NoItemDefaultMoves = gTrainerParty_Tony4 } }, - [OPPONENT_TONY_5] = + [TRAINER_TONY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -2502,10 +2502,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tony5 + .party = {.NoItemDefaultMoves = gTrainerParty_Tony5 } }, - [OPPONENT_HIDEKI] = + [TRAINER_HIDEKI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2516,10 +2516,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Hideki + .party = {.NoItemDefaultMoves = gTrainerParty_Hideki } }, - [OPPONENT_HITOSHI] = + [TRAINER_HITOSHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2530,10 +2530,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Hitoshi + .party = {.NoItemDefaultMoves = gTrainerParty_Hitoshi } }, - [OPPONENT_KIYO] = + [TRAINER_KIYO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2544,10 +2544,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Kiyo + .party = {.NoItemDefaultMoves = gTrainerParty_Kiyo } }, - [OPPONENT_KOICHI] = + [TRAINER_KOICHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2558,10 +2558,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Koichi + .party = {.NoItemDefaultMoves = gTrainerParty_Koichi } }, - [OPPONENT_NOB_1] = + [TRAINER_NOB_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2572,10 +2572,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Nob1 + .party = {.NoItemDefaultMoves = gTrainerParty_Nob1 } }, - [OPPONENT_NOB_2] = + [TRAINER_NOB_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2586,10 +2586,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Nob2 + .party = {.NoItemDefaultMoves = gTrainerParty_Nob2 } }, - [OPPONENT_NOB_3] = + [TRAINER_NOB_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2600,10 +2600,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nob3 + .party = {.NoItemDefaultMoves = gTrainerParty_Nob3 } }, - [OPPONENT_NOB_4] = + [TRAINER_NOB_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2614,10 +2614,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Nob4 + .party = {.NoItemDefaultMoves = gTrainerParty_Nob4 } }, - [OPPONENT_NOB_5] = + [TRAINER_NOB_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2628,10 +2628,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Nob5 + .party = {.ItemDefaultMoves = gTrainerParty_Nob5 } }, - [OPPONENT_YUJI] = + [TRAINER_YUJI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2642,10 +2642,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Yuji + .party = {.NoItemDefaultMoves = gTrainerParty_Yuji } }, - [OPPONENT_DAISUKE] = + [TRAINER_DAISUKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2656,10 +2656,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Daisuke + .party = {.NoItemDefaultMoves = gTrainerParty_Daisuke } }, - [OPPONENT_ATSUSHI] = + [TRAINER_ATSUSHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -2670,10 +2670,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Atsushi + .party = {.NoItemDefaultMoves = gTrainerParty_Atsushi } }, - [OPPONENT_KIRK] = + [TRAINER_KIRK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2684,10 +2684,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Kirk + .party = {.NoItemDefaultMoves = gTrainerParty_Kirk } }, - [OPPONENT_SCOTT] = + [TRAINER_SCOTT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2698,10 +2698,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Scott + .party = {.NoItemDefaultMoves = gTrainerParty_Scott } }, - [OPPONENT_HARVEY] = + [TRAINER_HARVEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2712,10 +2712,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Harvey + .party = {.NoItemDefaultMoves = gTrainerParty_Harvey } }, - [OPPONENT_SHAWN] = + [TRAINER_SHAWN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2726,10 +2726,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Shawn + .party = {.NoItemDefaultMoves = gTrainerParty_Shawn } }, - [OPPONENT_RANDY] = + [TRAINER_RANDY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2740,10 +2740,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Randy + .party = {.NoItemDefaultMoves = gTrainerParty_Randy } }, - [OPPONENT_DALTON_1] = + [TRAINER_DALTON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2754,10 +2754,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dalton1 + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton1 } }, - [OPPONENT_DALTON_2] = + [TRAINER_DALTON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2768,10 +2768,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dalton2 + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton2 } }, - [OPPONENT_DALTON_3] = + [TRAINER_DALTON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2782,10 +2782,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dalton3 + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton3 } }, - [OPPONENT_DALTON_4] = + [TRAINER_DALTON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2796,10 +2796,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dalton4 + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton4 } }, - [OPPONENT_DALTON_5] = + [TRAINER_DALTON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GUITARIST, @@ -2810,10 +2810,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dalton5 + .party = {.NoItemDefaultMoves = gTrainerParty_Dalton5 } }, - [OPPONENT_COLE] = + [TRAINER_COLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2824,10 +2824,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Cole + .party = {.NoItemDefaultMoves = gTrainerParty_Cole } }, - [OPPONENT_FLINT] = + [TRAINER_FLINT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2838,10 +2838,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Flint + .party = {.NoItemDefaultMoves = gTrainerParty_Flint } }, - [OPPONENT_AXLE] = + [TRAINER_AXLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2852,10 +2852,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Axle + .party = {.NoItemDefaultMoves = gTrainerParty_Axle } }, - [OPPONENT_JAKE] = + [TRAINER_JAKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2866,10 +2866,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jake + .party = {.NoItemDefaultMoves = gTrainerParty_Jake } }, - [OPPONENT_ANDY] = + [TRAINER_ANDY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2880,10 +2880,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Andy + .party = {.NoItemDefaultMoves = gTrainerParty_Andy } }, - [OPPONENT_BERNIE_1] = + [TRAINER_BERNIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2894,10 +2894,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Bernie1 + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie1 } }, - [OPPONENT_BERNIE_2] = + [TRAINER_BERNIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2908,10 +2908,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Bernie2 + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie2 } }, - [OPPONENT_BERNIE_3] = + [TRAINER_BERNIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2922,10 +2922,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Bernie3 + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie3 } }, - [OPPONENT_BERNIE_4] = + [TRAINER_BERNIE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2936,10 +2936,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Bernie4 + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie4 } }, - [OPPONENT_BERNIE_5] = + [TRAINER_BERNIE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_KINDLER, @@ -2950,10 +2950,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Bernie5 + .party = {.NoItemDefaultMoves = gTrainerParty_Bernie5 } }, - [OPPONENT_DREW] = + [TRAINER_DREW] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_CAMPER, @@ -2964,10 +2964,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Drew + .party = {.NoItemCustomMoves = gTrainerParty_Drew } }, - [OPPONENT_CLIFF] = + [TRAINER_CLIFF] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_CAMPER, @@ -2978,10 +2978,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Cliff + .party = {.NoItemCustomMoves = gTrainerParty_Cliff } }, - [OPPONENT_LARRY] = + [TRAINER_LARRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -2992,10 +2992,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Larry + .party = {.NoItemDefaultMoves = gTrainerParty_Larry } }, - [OPPONENT_SHANE] = + [TRAINER_SHANE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3006,10 +3006,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Shane + .party = {.NoItemDefaultMoves = gTrainerParty_Shane } }, - [OPPONENT_JUSTIN] = + [TRAINER_JUSTIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3020,10 +3020,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Justin + .party = {.NoItemDefaultMoves = gTrainerParty_Justin } }, - [OPPONENT_ETHAN_1] = + [TRAINER_ETHAN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3034,10 +3034,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Ethan1 + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan1 } }, - [OPPONENT_JEFF] = + [TRAINER_JEFF] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3048,10 +3048,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jeff + .party = {.NoItemDefaultMoves = gTrainerParty_Jeff } }, - [OPPONENT_TRAVIS] = + [TRAINER_TRAVIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3062,10 +3062,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Travis + .party = {.NoItemDefaultMoves = gTrainerParty_Travis } }, - [OPPONENT_ETHAN_2] = + [TRAINER_ETHAN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3076,10 +3076,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Ethan2 + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan2 } }, - [OPPONENT_ETHAN_3] = + [TRAINER_ETHAN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3090,10 +3090,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Ethan3 + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan3 } }, - [OPPONENT_ETHAN_4] = + [TRAINER_ETHAN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3104,10 +3104,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ethan4 + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan4 } }, - [OPPONENT_ETHAN_5] = + [TRAINER_ETHAN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -3118,10 +3118,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ethan5 + .party = {.NoItemDefaultMoves = gTrainerParty_Ethan5 } }, - [OPPONENT_BRENT] = + [TRAINER_BRENT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3132,10 +3132,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Brent + .party = {.NoItemDefaultMoves = gTrainerParty_Brent } }, - [OPPONENT_DONALD] = + [TRAINER_DONALD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3146,10 +3146,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Donald + .party = {.NoItemDefaultMoves = gTrainerParty_Donald } }, - [OPPONENT_TAYLOR] = + [TRAINER_TAYLOR] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3160,10 +3160,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Taylor + .party = {.NoItemDefaultMoves = gTrainerParty_Taylor } }, - [OPPONENT_BRANDON_1] = + [TRAINER_BRANDON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3174,10 +3174,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Brandon1 + .party = {.NoItemDefaultMoves = gTrainerParty_Brandon1 } }, - [OPPONENT_DEREK] = + [TRAINER_DEREK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3188,10 +3188,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Derek + .party = {.NoItemDefaultMoves = gTrainerParty_Derek } }, - [OPPONENT_BRANDON_2] = + [TRAINER_BRANDON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3202,10 +3202,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Brandon2 + .party = {.NoItemDefaultMoves = gTrainerParty_Brandon2 } }, - [OPPONENT_BRANDON_3] = + [TRAINER_BRANDON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3216,10 +3216,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Brandon3 + .party = {.NoItemDefaultMoves = gTrainerParty_Brandon3 } }, - [OPPONENT_BRANDON_4] = + [TRAINER_BRANDON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3230,10 +3230,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Brandon4 + .party = {.NoItemDefaultMoves = gTrainerParty_Brandon4 } }, - [OPPONENT_BRANDON_5] = + [TRAINER_BRANDON_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_BUG_MANIAC, @@ -3244,10 +3244,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 5, - .party = gTrainerParty_Brandon5 + .party = {.ItemDefaultMoves = gTrainerParty_Brandon5 } }, - [OPPONENT_EDWARD] = + [TRAINER_EDWARD] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3258,10 +3258,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Edward + .party = {.NoItemCustomMoves = gTrainerParty_Edward } }, - [OPPONENT_PRESTON] = + [TRAINER_PRESTON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3272,10 +3272,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Preston + .party = {.NoItemDefaultMoves = gTrainerParty_Preston } }, - [OPPONENT_VIRGIL] = + [TRAINER_VIRGIL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3286,10 +3286,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Virgil + .party = {.NoItemDefaultMoves = gTrainerParty_Virgil } }, - [OPPONENT_FRITZ] = + [TRAINER_FRITZ] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3300,10 +3300,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Fritz + .party = {.NoItemDefaultMoves = gTrainerParty_Fritz } }, - [OPPONENT_WILLIAM] = + [TRAINER_WILLIAM] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3314,10 +3314,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_William + .party = {.NoItemDefaultMoves = gTrainerParty_William } }, - [OPPONENT_JOSHUA] = + [TRAINER_JOSHUA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3328,10 +3328,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Joshua + .party = {.NoItemDefaultMoves = gTrainerParty_Joshua } }, - [OPPONENT_CAMERON_1] = + [TRAINER_CAMERON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3342,10 +3342,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cameron1 + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron1 } }, - [OPPONENT_CAMERON_2] = + [TRAINER_CAMERON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3356,10 +3356,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cameron2 + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron2 } }, - [OPPONENT_CAMERON_3] = + [TRAINER_CAMERON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3370,10 +3370,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cameron3 + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron3 } }, - [OPPONENT_CAMERON_4] = + [TRAINER_CAMERON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3384,10 +3384,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cameron4 + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron4 } }, - [OPPONENT_CAMERON_5] = + [TRAINER_CAMERON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3398,10 +3398,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cameron5 + .party = {.NoItemDefaultMoves = gTrainerParty_Cameron5 } }, - [OPPONENT_JACLYN] = + [TRAINER_JACLYN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3412,10 +3412,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jaclyn + .party = {.NoItemCustomMoves = gTrainerParty_Jaclyn } }, - [OPPONENT_HANNAH] = + [TRAINER_HANNAH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3426,10 +3426,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Hannah + .party = {.NoItemDefaultMoves = gTrainerParty_Hannah } }, - [OPPONENT_SAMANTHA] = + [TRAINER_SAMANTHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3440,10 +3440,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Samantha + .party = {.NoItemDefaultMoves = gTrainerParty_Samantha } }, - [OPPONENT_MAURA] = + [TRAINER_MAURA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3454,10 +3454,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Maura + .party = {.NoItemDefaultMoves = gTrainerParty_Maura } }, - [OPPONENT_KAYLA] = + [TRAINER_KAYLA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3468,10 +3468,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Kayla + .party = {.NoItemDefaultMoves = gTrainerParty_Kayla } }, - [OPPONENT_ALEXIS] = + [TRAINER_ALEXIS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3482,10 +3482,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Alexis + .party = {.NoItemDefaultMoves = gTrainerParty_Alexis } }, - [OPPONENT_JACKI_1] = + [TRAINER_JACKI_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3496,10 +3496,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jacki1 + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki1 } }, - [OPPONENT_JACKI_2] = + [TRAINER_JACKI_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3510,10 +3510,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jacki2 + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki2 } }, - [OPPONENT_JACKI_3] = + [TRAINER_JACKI_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3524,10 +3524,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jacki3 + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki3 } }, - [OPPONENT_JACKI_4] = + [TRAINER_JACKI_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3538,10 +3538,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jacki4 + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki4 } }, - [OPPONENT_JACKI_5] = + [TRAINER_JACKI_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PSYCHIC, @@ -3552,10 +3552,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jacki5 + .party = {.NoItemDefaultMoves = gTrainerParty_Jacki5 } }, - [OPPONENT_WALTER_1] = + [TRAINER_WALTER_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3566,10 +3566,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Walter1 + .party = {.NoItemDefaultMoves = gTrainerParty_Walter1 } }, - [OPPONENT_TUCKER] = + [TRAINER_TUCKER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3580,10 +3580,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tucker + .party = {.NoItemDefaultMoves = gTrainerParty_Tucker } }, - [OPPONENT_THOMAS] = + [TRAINER_THOMAS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3594,10 +3594,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Thomas + .party = {.NoItemDefaultMoves = gTrainerParty_Thomas } }, - [OPPONENT_WALTER_2] = + [TRAINER_WALTER_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3608,10 +3608,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Walter2 + .party = {.NoItemDefaultMoves = gTrainerParty_Walter2 } }, - [OPPONENT_WALTER_3] = + [TRAINER_WALTER_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3622,10 +3622,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Walter3 + .party = {.NoItemCustomMoves = gTrainerParty_Walter3 } }, - [OPPONENT_WALTER_4] = + [TRAINER_WALTER_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3636,10 +3636,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Walter4 + .party = {.NoItemCustomMoves = gTrainerParty_Walter4 } }, - [OPPONENT_WALTER_5] = + [TRAINER_WALTER_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_GENTLEMAN, @@ -3650,10 +3650,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Walter5 + .party = {.NoItemCustomMoves = gTrainerParty_Walter5 } }, - [OPPONENT_SIDNEY] = + [TRAINER_SIDNEY] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3664,10 +3664,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Sidney + .party = {.ItemCustomMoves = gTrainerParty_Sidney } }, - [OPPONENT_PHOEBE] = + [TRAINER_PHOEBE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3678,10 +3678,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Phoebe + .party = {.ItemCustomMoves = gTrainerParty_Phoebe } }, - [OPPONENT_GLACIA] = + [TRAINER_GLACIA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3692,10 +3692,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Glacia + .party = {.ItemCustomMoves = gTrainerParty_Glacia } }, - [OPPONENT_DRAKE] = + [TRAINER_DRAKE] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_ELITE_FOUR, @@ -3706,10 +3706,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Drake + .party = {.ItemCustomMoves = gTrainerParty_Drake } }, - [OPPONENT_ROXANNE] = + [TRAINER_ROXANNE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3720,10 +3720,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Roxanne + .party = {.NoItemCustomMoves = gTrainerParty_Roxanne } }, - [OPPONENT_BRAWLY] = + [TRAINER_BRAWLY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3734,10 +3734,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Brawly + .party = {.NoItemCustomMoves = gTrainerParty_Brawly } }, - [OPPONENT_WATTSON] = + [TRAINER_WATTSON] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3748,10 +3748,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Wattson + .party = {.NoItemCustomMoves = gTrainerParty_Wattson } }, - [OPPONENT_FLANNERY] = + [TRAINER_FLANNERY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3762,10 +3762,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Flannery + .party = {.NoItemCustomMoves = gTrainerParty_Flannery } }, - [OPPONENT_NORMAN] = + [TRAINER_NORMAN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3776,10 +3776,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Norman + .party = {.NoItemCustomMoves = gTrainerParty_Norman } }, - [OPPONENT_WINONA] = + [TRAINER_WINONA] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3790,10 +3790,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_Winona + .party = {.NoItemCustomMoves = gTrainerParty_Winona } }, - [OPPONENT_TATE_AND_LIZA] = + [TRAINER_TATE_AND_LIZA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3804,10 +3804,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_TateAndLiza + .party = {.ItemCustomMoves = gTrainerParty_TateAndLiza } }, - [OPPONENT_WALLACE] = + [TRAINER_WALLACE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_LEADER, @@ -3818,10 +3818,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wallace + .party = {.NoItemCustomMoves = gTrainerParty_Wallace } }, - [OPPONENT_JERRY_1] = + [TRAINER_JERRY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3832,10 +3832,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jerry1 + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry1 } }, - [OPPONENT_TED] = + [TRAINER_TED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3846,10 +3846,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ted + .party = {.NoItemDefaultMoves = gTrainerParty_Ted } }, - [OPPONENT_PAUL] = + [TRAINER_PAUL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3860,10 +3860,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Paul + .party = {.NoItemDefaultMoves = gTrainerParty_Paul } }, - [OPPONENT_JERRY_2] = + [TRAINER_JERRY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3874,10 +3874,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jerry2 + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry2 } }, - [OPPONENT_JERRY_3] = + [TRAINER_JERRY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3888,10 +3888,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jerry3 + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry3 } }, - [OPPONENT_JERRY_4] = + [TRAINER_JERRY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3902,10 +3902,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jerry4 + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry4 } }, - [OPPONENT_JERRY_5] = + [TRAINER_JERRY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3916,10 +3916,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Jerry5 + .party = {.NoItemDefaultMoves = gTrainerParty_Jerry5 } }, - [OPPONENT_KAREN_1] = + [TRAINER_KAREN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3930,10 +3930,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Karen1 + .party = {.NoItemDefaultMoves = gTrainerParty_Karen1 } }, - [OPPONENT_GEORGIA] = + [TRAINER_GEORGIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3944,10 +3944,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Georgia + .party = {.NoItemDefaultMoves = gTrainerParty_Georgia } }, - [OPPONENT_KAREN_2] = + [TRAINER_KAREN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3958,10 +3958,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Karen2 + .party = {.NoItemDefaultMoves = gTrainerParty_Karen2 } }, - [OPPONENT_KAREN_3] = + [TRAINER_KAREN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3972,10 +3972,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Karen3 + .party = {.NoItemDefaultMoves = gTrainerParty_Karen3 } }, - [OPPONENT_KAREN_4] = + [TRAINER_KAREN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -3986,10 +3986,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Karen4 + .party = {.NoItemDefaultMoves = gTrainerParty_Karen4 } }, - [OPPONENT_KAREN_5] = + [TRAINER_KAREN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SCHOOL_KID, @@ -4000,10 +4000,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Karen5 + .party = {.NoItemDefaultMoves = gTrainerParty_Karen5 } }, - [OPPONENT_KATE_AND_JOY] = + [TRAINER_KATE_AND_JOY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4014,10 +4014,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_KateAndJoy + .party = {.NoItemCustomMoves = gTrainerParty_KateAndJoy } }, - [OPPONENT_ANNA_AND_MEG_1] = + [TRAINER_ANNA_AND_MEG_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4028,10 +4028,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AnnaAndMeg1 + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg1 } }, - [OPPONENT_ANNA_AND_MEG_2] = + [TRAINER_ANNA_AND_MEG_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4042,10 +4042,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AnnaAndMeg2 + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg2 } }, - [OPPONENT_ANNA_AND_MEG_3] = + [TRAINER_ANNA_AND_MEG_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4056,10 +4056,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AnnaAndMeg3 + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg3 } }, - [OPPONENT_ANNA_AND_MEG_4] = + [TRAINER_ANNA_AND_MEG_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4070,10 +4070,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AnnaAndMeg4 + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg4 } }, - [OPPONENT_ANNA_AND_MEG_5] = + [TRAINER_ANNA_AND_MEG_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -4084,10 +4084,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AnnaAndMeg5 + .party = {.NoItemCustomMoves = gTrainerParty_AnnaAndMeg5 } }, - [OPPONENT_VICTOR] = + [TRAINER_VICTOR] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -4098,10 +4098,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Victor + .party = {.ItemDefaultMoves = gTrainerParty_Victor } }, - [OPPONENT_MIGUEL_1] = + [TRAINER_MIGUEL_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4112,10 +4112,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Miguel1 + .party = {.ItemDefaultMoves = gTrainerParty_Miguel1 } }, - [OPPONENT_COLTON] = + [TRAINER_COLTON] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4126,10 +4126,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Colton + .party = {.ItemCustomMoves = gTrainerParty_Colton } }, - [OPPONENT_MIGUEL_2] = + [TRAINER_MIGUEL_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4140,10 +4140,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Miguel2 + .party = {.ItemDefaultMoves = gTrainerParty_Miguel2 } }, - [OPPONENT_MIGUEL_3] = + [TRAINER_MIGUEL_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4154,10 +4154,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Miguel3 + .party = {.ItemDefaultMoves = gTrainerParty_Miguel3 } }, - [OPPONENT_MIGUEL_4] = + [TRAINER_MIGUEL_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4168,10 +4168,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Miguel4 + .party = {.ItemDefaultMoves = gTrainerParty_Miguel4 } }, - [OPPONENT_MIGUEL_5] = + [TRAINER_MIGUEL_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4182,10 +4182,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Miguel5 + .party = {.ItemDefaultMoves = gTrainerParty_Miguel5 } }, - [OPPONENT_VICTORIA] = + [TRAINER_VICTORIA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -4196,10 +4196,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 1, - .party = gTrainerParty_Victoria + .party = {.ItemDefaultMoves = gTrainerParty_Victoria } }, - [OPPONENT_VANESSA] = + [TRAINER_VANESSA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4210,10 +4210,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Vanessa + .party = {.ItemDefaultMoves = gTrainerParty_Vanessa } }, - [OPPONENT_MARISSA] = + [TRAINER_MARISSA] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4224,10 +4224,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Marissa + .party = {.ItemDefaultMoves = gTrainerParty_Marissa } }, - [OPPONENT_ISABEL_1] = + [TRAINER_ISABEL_1] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4238,10 +4238,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Isabel1 + .party = {.ItemDefaultMoves = gTrainerParty_Isabel1 } }, - [OPPONENT_ISABEL_2] = + [TRAINER_ISABEL_2] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4252,10 +4252,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Isabel2 + .party = {.ItemDefaultMoves = gTrainerParty_Isabel2 } }, - [OPPONENT_ISABEL_3] = + [TRAINER_ISABEL_3] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4266,10 +4266,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Isabel3 + .party = {.ItemDefaultMoves = gTrainerParty_Isabel3 } }, - [OPPONENT_ISABEL_4] = + [TRAINER_ISABEL_4] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4280,10 +4280,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Isabel4 + .party = {.ItemDefaultMoves = gTrainerParty_Isabel4 } }, - [OPPONENT_ISABEL_5] = + [TRAINER_ISABEL_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_POKEFAN, @@ -4294,10 +4294,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Isabel5 + .party = {.ItemDefaultMoves = gTrainerParty_Isabel5 } }, - [OPPONENT_TIMOTHY_1] = + [TRAINER_TIMOTHY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4308,10 +4308,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Timothy1 + .party = {.NoItemDefaultMoves = gTrainerParty_Timothy1 } }, - [OPPONENT_TIMOTHY_2] = + [TRAINER_TIMOTHY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4322,10 +4322,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Timothy2 + .party = {.NoItemCustomMoves = gTrainerParty_Timothy2 } }, - [OPPONENT_TIMOTHY_3] = + [TRAINER_TIMOTHY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4336,10 +4336,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Timothy3 + .party = {.NoItemCustomMoves = gTrainerParty_Timothy3 } }, - [OPPONENT_TIMOTHY_4] = + [TRAINER_TIMOTHY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4350,10 +4350,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Timothy4 + .party = {.NoItemCustomMoves = gTrainerParty_Timothy4 } }, - [OPPONENT_TIMOTHY_5] = + [TRAINER_TIMOTHY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4364,10 +4364,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Timothy5 + .party = {.NoItemCustomMoves = gTrainerParty_Timothy5 } }, - [OPPONENT_VICKY] = + [TRAINER_VICKY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -4378,10 +4378,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Vicky + .party = {.NoItemCustomMoves = gTrainerParty_Vicky } }, - [OPPONENT_SHELBY_1] = + [TRAINER_SHELBY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4392,10 +4392,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelby1 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby1 } }, - [OPPONENT_SHELBY_2] = + [TRAINER_SHELBY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4406,10 +4406,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelby2 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby2 } }, - [OPPONENT_SHELBY_3] = + [TRAINER_SHELBY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4420,10 +4420,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelby3 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby3 } }, - [OPPONENT_SHELBY_4] = + [TRAINER_SHELBY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4434,10 +4434,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelby4 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby4 } }, - [OPPONENT_SHELBY_5] = + [TRAINER_SHELBY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_EXPERT, @@ -4448,10 +4448,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Shelby5 + .party = {.NoItemDefaultMoves = gTrainerParty_Shelby5 } }, - [OPPONENT_CALVIN_1] = + [TRAINER_CALVIN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4462,10 +4462,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Calvin1 + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin1 } }, - [OPPONENT_BILLY] = + [TRAINER_BILLY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4476,10 +4476,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Billy + .party = {.NoItemDefaultMoves = gTrainerParty_Billy } }, - [OPPONENT_JOSH] = + [TRAINER_JOSH] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4490,10 +4490,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Josh + .party = {.NoItemCustomMoves = gTrainerParty_Josh } }, - [OPPONENT_TOMMY] = + [TRAINER_TOMMY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4504,10 +4504,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tommy + .party = {.NoItemDefaultMoves = gTrainerParty_Tommy } }, - [OPPONENT_JOEY] = + [TRAINER_JOEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4518,10 +4518,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Joey + .party = {.NoItemDefaultMoves = gTrainerParty_Joey } }, - [OPPONENT_BEN] = + [TRAINER_BEN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4532,10 +4532,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ben + .party = {.NoItemCustomMoves = gTrainerParty_Ben } }, - [OPPONENT_ANONYMOUS_5] = + [TRAINER_ANONYMOUS_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4546,10 +4546,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Anonymous5 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous5 } }, - [OPPONENT_KEVIN] = + [TRAINER_KEVIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4560,10 +4560,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Kevin + .party = {.NoItemDefaultMoves = gTrainerParty_Kevin } }, - [OPPONENT_NEAL] = + [TRAINER_NEAL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4574,10 +4574,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Neal + .party = {.NoItemDefaultMoves = gTrainerParty_Neal } }, - [OPPONENT_DILLON] = + [TRAINER_DILLON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4588,10 +4588,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dillon + .party = {.NoItemDefaultMoves = gTrainerParty_Dillon } }, - [OPPONENT_CALVIN_2] = + [TRAINER_CALVIN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4602,10 +4602,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Calvin2 + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin2 } }, - [OPPONENT_CALVIN_3] = + [TRAINER_CALVIN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4616,10 +4616,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Calvin3 + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin3 } }, - [OPPONENT_CALVIN_4] = + [TRAINER_CALVIN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4630,10 +4630,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Calvin4 + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin4 } }, - [OPPONENT_CALVIN_5] = + [TRAINER_CALVIN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4644,10 +4644,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Calvin5 + .party = {.NoItemDefaultMoves = gTrainerParty_Calvin5 } }, - [OPPONENT_EDDIE] = + [TRAINER_EDDIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4658,10 +4658,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Eddie + .party = {.NoItemDefaultMoves = gTrainerParty_Eddie } }, - [OPPONENT_ALLEN] = + [TRAINER_ALLEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4672,10 +4672,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Allen + .party = {.NoItemDefaultMoves = gTrainerParty_Allen } }, - [OPPONENT_TIMMY] = + [TRAINER_TIMMY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNGSTER, @@ -4686,10 +4686,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Timmy + .party = {.NoItemDefaultMoves = gTrainerParty_Timmy } }, - [OPPONENT_STEVEN] = + [TRAINER_STEVEN] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_CHAMPION, @@ -4700,10 +4700,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 6, - .party = gTrainerParty_Steven + .party = {.ItemCustomMoves = gTrainerParty_Steven } }, - [OPPONENT_ANDREW] = + [TRAINER_ANDREW] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4714,10 +4714,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Andrew + .party = {.NoItemDefaultMoves = gTrainerParty_Andrew } }, - [OPPONENT_IVAN] = + [TRAINER_IVAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4728,10 +4728,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ivan + .party = {.NoItemDefaultMoves = gTrainerParty_Ivan } }, - [OPPONENT_CLAUDE] = + [TRAINER_CLAUDE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4742,10 +4742,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Claude + .party = {.NoItemDefaultMoves = gTrainerParty_Claude } }, - [OPPONENT_ELLIOT_1] = + [TRAINER_ELLIOT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4756,10 +4756,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Elliot1 + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot1 } }, - [OPPONENT_NED] = + [TRAINER_NED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4770,10 +4770,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Ned + .party = {.NoItemDefaultMoves = gTrainerParty_Ned } }, - [OPPONENT_DALE] = + [TRAINER_DALE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4784,10 +4784,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Dale + .party = {.NoItemDefaultMoves = gTrainerParty_Dale } }, - [OPPONENT_NOLAN] = + [TRAINER_NOLAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4798,10 +4798,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Nolan + .party = {.NoItemDefaultMoves = gTrainerParty_Nolan } }, - [OPPONENT_BARNY] = + [TRAINER_BARNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4812,10 +4812,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Barny + .party = {.NoItemDefaultMoves = gTrainerParty_Barny } }, - [OPPONENT_WADE] = + [TRAINER_WADE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4826,10 +4826,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Wade + .party = {.NoItemDefaultMoves = gTrainerParty_Wade } }, - [OPPONENT_CARTER] = + [TRAINER_CARTER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4840,10 +4840,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Carter + .party = {.NoItemDefaultMoves = gTrainerParty_Carter } }, - [OPPONENT_ELLIOT_2] = + [TRAINER_ELLIOT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4854,10 +4854,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Elliot2 + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot2 } }, - [OPPONENT_ELLIOT_3] = + [TRAINER_ELLIOT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4868,10 +4868,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Elliot3 + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot3 } }, - [OPPONENT_ELLIOT_4] = + [TRAINER_ELLIOT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4882,10 +4882,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Elliot4 + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot4 } }, - [OPPONENT_ELLIOT_5] = + [TRAINER_ELLIOT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4896,10 +4896,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 4, - .party = gTrainerParty_Elliot5 + .party = {.NoItemDefaultMoves = gTrainerParty_Elliot5 } }, - [OPPONENT_RONALD] = + [TRAINER_RONALD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -4910,10 +4910,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Ronald + .party = {.NoItemDefaultMoves = gTrainerParty_Ronald } }, - [OPPONENT_JACOB] = + [TRAINER_JACOB] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4924,10 +4924,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Jacob + .party = {.NoItemDefaultMoves = gTrainerParty_Jacob } }, - [OPPONENT_ANTHONY] = + [TRAINER_ANTHONY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4938,10 +4938,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Anthony + .party = {.NoItemDefaultMoves = gTrainerParty_Anthony } }, - [OPPONENT_BENJAMIN_1] = + [TRAINER_BENJAMIN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4952,10 +4952,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Benjamin1 + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin1 } }, - [OPPONENT_BENJAMIN_2] = + [TRAINER_BENJAMIN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4966,10 +4966,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Benjamin2 + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin2 } }, - [OPPONENT_BENJAMIN_3] = + [TRAINER_BENJAMIN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4980,10 +4980,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Benjamin3 + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin3 } }, - [OPPONENT_BENJAMIN_4] = + [TRAINER_BENJAMIN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -4994,10 +4994,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Benjamin4 + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin4 } }, - [OPPONENT_BENJAMIN_5] = + [TRAINER_BENJAMIN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5008,10 +5008,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Benjamin5 + .party = {.NoItemDefaultMoves = gTrainerParty_Benjamin5 } }, - [OPPONENT_ABIGAIL_1] = + [TRAINER_ABIGAIL_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5022,10 +5022,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Abigail1 + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail1 } }, - [OPPONENT_JASMINE] = + [TRAINER_JASMINE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5036,10 +5036,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Jasmine + .party = {.NoItemDefaultMoves = gTrainerParty_Jasmine } }, - [OPPONENT_ABIGAIL_2] = + [TRAINER_ABIGAIL_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5050,10 +5050,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Abigail2 + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail2 } }, - [OPPONENT_ABIGAIL_3] = + [TRAINER_ABIGAIL_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5064,10 +5064,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Abigail3 + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail3 } }, - [OPPONENT_ABIGAIL_4] = + [TRAINER_ABIGAIL_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5078,10 +5078,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Abigail4 + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail4 } }, - [OPPONENT_ABIGAIL_5] = + [TRAINER_ABIGAIL_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5092,10 +5092,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Abigail5 + .party = {.NoItemDefaultMoves = gTrainerParty_Abigail5 } }, - [OPPONENT_DYLAN_1] = + [TRAINER_DYLAN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5106,10 +5106,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dylan1 + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan1 } }, - [OPPONENT_DYLAN_2] = + [TRAINER_DYLAN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5120,10 +5120,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dylan2 + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan2 } }, - [OPPONENT_DYLAN_3] = + [TRAINER_DYLAN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5134,10 +5134,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dylan3 + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan3 } }, - [OPPONENT_DYLAN_4] = + [TRAINER_DYLAN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5148,10 +5148,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dylan4 + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan4 } }, - [OPPONENT_DYLAN_5] = + [TRAINER_DYLAN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5162,10 +5162,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dylan5 + .party = {.NoItemDefaultMoves = gTrainerParty_Dylan5 } }, - [OPPONENT_MARIA_1] = + [TRAINER_MARIA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5176,10 +5176,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Maria1 + .party = {.NoItemDefaultMoves = gTrainerParty_Maria1 } }, - [OPPONENT_MARIA_2] = + [TRAINER_MARIA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5190,10 +5190,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Maria2 + .party = {.NoItemDefaultMoves = gTrainerParty_Maria2 } }, - [OPPONENT_MARIA_3] = + [TRAINER_MARIA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5204,10 +5204,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Maria3 + .party = {.NoItemDefaultMoves = gTrainerParty_Maria3 } }, - [OPPONENT_MARIA_4] = + [TRAINER_MARIA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5218,10 +5218,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Maria4 + .party = {.NoItemDefaultMoves = gTrainerParty_Maria4 } }, - [OPPONENT_MARIA_5] = + [TRAINER_MARIA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5232,10 +5232,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Maria5 + .party = {.NoItemDefaultMoves = gTrainerParty_Maria5 } }, - [OPPONENT_CALEB] = + [TRAINER_CALEB] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5246,10 +5246,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Caleb + .party = {.NoItemDefaultMoves = gTrainerParty_Caleb } }, - [OPPONENT_ANONYMOUS_6] = + [TRAINER_ANONYMOUS_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5260,10 +5260,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous6 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous6 } }, - [OPPONENT_ISAIAH_1] = + [TRAINER_ISAIAH_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5274,10 +5274,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Isaiah1 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah1 } }, - [OPPONENT_ANONYMOUS_7] = + [TRAINER_ANONYMOUS_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5288,10 +5288,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous7 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous7 } }, - [OPPONENT_CHASE] = + [TRAINER_CHASE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5302,10 +5302,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Chase + .party = {.NoItemDefaultMoves = gTrainerParty_Chase } }, - [OPPONENT_ISAIAH_2] = + [TRAINER_ISAIAH_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5316,10 +5316,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Isaiah2 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah2 } }, - [OPPONENT_ISAIAH_3] = + [TRAINER_ISAIAH_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5330,10 +5330,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Isaiah3 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah3 } }, - [OPPONENT_ISAIAH_4] = + [TRAINER_ISAIAH_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5344,10 +5344,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Isaiah4 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah4 } }, - [OPPONENT_ISAIAH_5] = + [TRAINER_ISAIAH_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5358,10 +5358,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Isaiah5 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaiah5 } }, - [OPPONENT_ANONYMOUS_8] = + [TRAINER_ANONYMOUS_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5372,10 +5372,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Anonymous8 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous8 } }, - [OPPONENT_CONNOR] = + [TRAINER_CONNOR] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5386,10 +5386,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Connor + .party = {.NoItemDefaultMoves = gTrainerParty_Connor } }, - [OPPONENT_ANONYMOUS_9] = + [TRAINER_ANONYMOUS_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5400,10 +5400,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous9 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous9 } }, - [OPPONENT_KATELYN_1] = + [TRAINER_KATELYN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5414,10 +5414,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Katelyn1 + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn1 } }, - [OPPONENT_ALLISON] = + [TRAINER_ALLISON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5428,10 +5428,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Allison + .party = {.NoItemDefaultMoves = gTrainerParty_Allison } }, - [OPPONENT_KATELYN_2] = + [TRAINER_KATELYN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5442,10 +5442,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Katelyn2 + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn2 } }, - [OPPONENT_KATELYN_3] = + [TRAINER_KATELYN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5456,10 +5456,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Katelyn3 + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn3 } }, - [OPPONENT_KATELYN_4] = + [TRAINER_KATELYN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5470,10 +5470,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Katelyn4 + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn4 } }, - [OPPONENT_KATELYN_5] = + [TRAINER_KATELYN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TRIATHLETE, @@ -5484,10 +5484,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Katelyn5 + .party = {.NoItemDefaultMoves = gTrainerParty_Katelyn5 } }, - [OPPONENT_NICOLAS_1] = + [TRAINER_NICOLAS_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5498,10 +5498,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nicolas1 + .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas1 } }, - [OPPONENT_NICOLAS_2] = + [TRAINER_NICOLAS_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5512,10 +5512,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nicolas2 + .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas2 } }, - [OPPONENT_NICOLAS_3] = + [TRAINER_NICOLAS_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5526,10 +5526,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nicolas3 + .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas3 } }, - [OPPONENT_NICOLAS_4] = + [TRAINER_NICOLAS_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5540,10 +5540,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Nicolas4 + .party = {.NoItemDefaultMoves = gTrainerParty_Nicolas4 } }, - [OPPONENT_NICOLAS_5] = + [TRAINER_NICOLAS_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5554,10 +5554,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Nicolas5 + .party = {.ItemDefaultMoves = gTrainerParty_Nicolas5 } }, - [OPPONENT_AARON] = + [TRAINER_AARON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_DRAGON_TAMER, @@ -5568,10 +5568,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Aaron + .party = {.NoItemDefaultMoves = gTrainerParty_Aaron } }, - [OPPONENT_PERRY] = + [TRAINER_PERRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5582,10 +5582,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Perry + .party = {.NoItemDefaultMoves = gTrainerParty_Perry } }, - [OPPONENT_HUGH] = + [TRAINER_HUGH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5596,10 +5596,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Hugh + .party = {.NoItemDefaultMoves = gTrainerParty_Hugh } }, - [OPPONENT_PHIL] = + [TRAINER_PHIL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5610,10 +5610,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Phil + .party = {.NoItemDefaultMoves = gTrainerParty_Phil } }, - [OPPONENT_JARED] = + [TRAINER_JARED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5624,10 +5624,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jared + .party = {.NoItemDefaultMoves = gTrainerParty_Jared } }, - [OPPONENT_ANONYMOUS_10] = + [TRAINER_ANONYMOUS_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5638,10 +5638,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Anonymous10 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous10 } }, - [OPPONENT_TANNER] = + [TRAINER_TANNER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5652,10 +5652,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Tanner + .party = {.NoItemDefaultMoves = gTrainerParty_Tanner } }, - [OPPONENT_WILL] = + [TRAINER_WILL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5666,10 +5666,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Will + .party = {.NoItemDefaultMoves = gTrainerParty_Will } }, - [OPPONENT_COLIN] = + [TRAINER_COLIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5680,10 +5680,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Colin + .party = {.NoItemDefaultMoves = gTrainerParty_Colin } }, - [OPPONENT_ROBERT_1] = + [TRAINER_ROBERT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5694,10 +5694,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Robert1 + .party = {.NoItemDefaultMoves = gTrainerParty_Robert1 } }, - [OPPONENT_BENNY] = + [TRAINER_BENNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5708,10 +5708,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Benny + .party = {.NoItemDefaultMoves = gTrainerParty_Benny } }, - [OPPONENT_CHESTER] = + [TRAINER_CHESTER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5722,10 +5722,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Chester + .party = {.NoItemDefaultMoves = gTrainerParty_Chester } }, - [OPPONENT_ROBERT_2] = + [TRAINER_ROBERT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5736,10 +5736,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Robert2 + .party = {.NoItemDefaultMoves = gTrainerParty_Robert2 } }, - [OPPONENT_ROBERT_3] = + [TRAINER_ROBERT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5750,10 +5750,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Robert3 + .party = {.NoItemDefaultMoves = gTrainerParty_Robert3 } }, - [OPPONENT_ROBERT_4] = + [TRAINER_ROBERT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5764,10 +5764,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Robert4 + .party = {.NoItemDefaultMoves = gTrainerParty_Robert4 } }, - [OPPONENT_ROBERT_5] = + [TRAINER_ROBERT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5778,10 +5778,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Robert5 + .party = {.NoItemDefaultMoves = gTrainerParty_Robert5 } }, - [OPPONENT_ALEX] = + [TRAINER_ALEX] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5792,10 +5792,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Alex + .party = {.NoItemDefaultMoves = gTrainerParty_Alex } }, - [OPPONENT_BECK] = + [TRAINER_BECK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -5806,10 +5806,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Beck + .party = {.NoItemDefaultMoves = gTrainerParty_Beck } }, - [OPPONENT_YASU] = + [TRAINER_YASU] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5820,10 +5820,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 1, - .party = gTrainerParty_Yasu + .party = {.NoItemDefaultMoves = gTrainerParty_Yasu } }, - [OPPONENT_TAKASHI] = + [TRAINER_TAKASHI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5834,10 +5834,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 3, - .party = gTrainerParty_Takashi + .party = {.NoItemDefaultMoves = gTrainerParty_Takashi } }, - [OPPONENT_MAKOTO] = + [TRAINER_MAKOTO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5848,10 +5848,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 1, - .party = gTrainerParty_Makoto + .party = {.NoItemDefaultMoves = gTrainerParty_Makoto } }, - [OPPONENT_HIDEO_1] = + [TRAINER_HIDEO_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5862,10 +5862,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Hideo1 + .party = {.NoItemDefaultMoves = gTrainerParty_Hideo1 } }, - [OPPONENT_LAO_1] = + [TRAINER_LAO_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5876,10 +5876,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Lao1 + .party = {.NoItemCustomMoves = gTrainerParty_Lao1 } }, - [OPPONENT_LUNG] = + [TRAINER_LUNG] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5890,10 +5890,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 2, - .party = gTrainerParty_Lung + .party = {.NoItemDefaultMoves = gTrainerParty_Lung } }, - [OPPONENT_LAO_2] = + [TRAINER_LAO_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5904,10 +5904,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Lao2 + .party = {.NoItemCustomMoves = gTrainerParty_Lao2 } }, - [OPPONENT_LAO_3] = + [TRAINER_LAO_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5918,10 +5918,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Lao3 + .party = {.NoItemCustomMoves = gTrainerParty_Lao3 } }, - [OPPONENT_LAO_4] = + [TRAINER_LAO_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5932,10 +5932,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Lao4 + .party = {.NoItemCustomMoves = gTrainerParty_Lao4 } }, - [OPPONENT_LAO_5] = + [TRAINER_LAO_5] = { .partyFlags = F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -5946,10 +5946,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x0, .partySize = 4, - .party = gTrainerParty_Lao5 + .party = {.ItemCustomMoves = gTrainerParty_Lao5 } }, - [OPPONENT_TESSA] = + [TRAINER_TESSA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -5960,10 +5960,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Tessa + .party = {.NoItemDefaultMoves = gTrainerParty_Tessa } }, - [OPPONENT_LAURA] = + [TRAINER_LAURA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -5974,10 +5974,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Laura + .party = {.NoItemDefaultMoves = gTrainerParty_Laura } }, - [OPPONENT_CYNDY_1] = + [TRAINER_CYNDY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -5988,10 +5988,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cyndy1 + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy1 } }, - [OPPONENT_CORA] = + [TRAINER_CORA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6002,10 +6002,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Cora + .party = {.NoItemDefaultMoves = gTrainerParty_Cora } }, - [OPPONENT_JILL] = + [TRAINER_JILL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6016,10 +6016,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jill + .party = {.NoItemDefaultMoves = gTrainerParty_Jill } }, - [OPPONENT_CYNDY_2] = + [TRAINER_CYNDY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6030,10 +6030,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cyndy2 + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy2 } }, - [OPPONENT_CYNDY_3] = + [TRAINER_CYNDY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6044,10 +6044,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cyndy3 + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy3 } }, - [OPPONENT_CYNDY_4] = + [TRAINER_CYNDY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6058,10 +6058,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cyndy4 + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy4 } }, - [OPPONENT_CYNDY_5] = + [TRAINER_CYNDY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -6072,10 +6072,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Cyndy5 + .party = {.NoItemDefaultMoves = gTrainerParty_Cyndy5 } }, - [OPPONENT_MADELINE_1] = + [TRAINER_MADELINE_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6086,10 +6086,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Madeline1 + .party = {.NoItemCustomMoves = gTrainerParty_Madeline1 } }, - [OPPONENT_CLARISSA] = + [TRAINER_CLARISSA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6100,10 +6100,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Clarissa + .party = {.NoItemDefaultMoves = gTrainerParty_Clarissa } }, - [OPPONENT_ANGELICA] = + [TRAINER_ANGELICA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6114,10 +6114,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Angelica + .party = {.NoItemDefaultMoves = gTrainerParty_Angelica } }, - [OPPONENT_MADELINE_2] = + [TRAINER_MADELINE_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6128,10 +6128,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Madeline2 + .party = {.NoItemCustomMoves = gTrainerParty_Madeline2 } }, - [OPPONENT_MADELINE_3] = + [TRAINER_MADELINE_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6142,10 +6142,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Madeline3 + .party = {.NoItemCustomMoves = gTrainerParty_Madeline3 } }, - [OPPONENT_MADELINE_4] = + [TRAINER_MADELINE_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6156,10 +6156,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Madeline4 + .party = {.NoItemCustomMoves = gTrainerParty_Madeline4 } }, - [OPPONENT_MADELINE_5] = + [TRAINER_MADELINE_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PARASOL_LADY, @@ -6170,10 +6170,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Madeline5 + .party = {.NoItemCustomMoves = gTrainerParty_Madeline5 } }, - [OPPONENT_BEVERLY] = + [TRAINER_BEVERLY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6184,10 +6184,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Beverly + .party = {.NoItemDefaultMoves = gTrainerParty_Beverly } }, - [OPPONENT_DAWN] = + [TRAINER_DAWN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6198,10 +6198,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Dawn + .party = {.NoItemDefaultMoves = gTrainerParty_Dawn } }, - [OPPONENT_NICOLE] = + [TRAINER_NICOLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6212,10 +6212,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Nicole + .party = {.NoItemDefaultMoves = gTrainerParty_Nicole } }, - [OPPONENT_DENISE] = + [TRAINER_DENISE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6226,10 +6226,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Denise + .party = {.NoItemDefaultMoves = gTrainerParty_Denise } }, - [OPPONENT_BETH] = + [TRAINER_BETH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6240,10 +6240,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Beth + .party = {.NoItemDefaultMoves = gTrainerParty_Beth } }, - [OPPONENT_TARA] = + [TRAINER_TARA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6254,10 +6254,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tara + .party = {.NoItemDefaultMoves = gTrainerParty_Tara } }, - [OPPONENT_MISSY] = + [TRAINER_MISSY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6268,10 +6268,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Missy + .party = {.NoItemDefaultMoves = gTrainerParty_Missy } }, - [OPPONENT_ALICE] = + [TRAINER_ALICE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6282,10 +6282,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Alice + .party = {.NoItemDefaultMoves = gTrainerParty_Alice } }, - [OPPONENT_JENNY_1] = + [TRAINER_JENNY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6296,10 +6296,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jenny1 + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny1 } }, - [OPPONENT_GRACE] = + [TRAINER_GRACE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6310,10 +6310,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grace + .party = {.NoItemDefaultMoves = gTrainerParty_Grace } }, - [OPPONENT_TANYA] = + [TRAINER_TANYA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6324,10 +6324,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tanya + .party = {.NoItemDefaultMoves = gTrainerParty_Tanya } }, - [OPPONENT_SHARON] = + [TRAINER_SHARON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6338,10 +6338,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Sharon + .party = {.NoItemDefaultMoves = gTrainerParty_Sharon } }, - [OPPONENT_NIKKI] = + [TRAINER_NIKKI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6352,10 +6352,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Nikki + .party = {.NoItemDefaultMoves = gTrainerParty_Nikki } }, - [OPPONENT_BRENDA] = + [TRAINER_BRENDA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6366,10 +6366,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Brenda + .party = {.NoItemDefaultMoves = gTrainerParty_Brenda } }, - [OPPONENT_KATIE] = + [TRAINER_KATIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6380,10 +6380,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Katie + .party = {.NoItemDefaultMoves = gTrainerParty_Katie } }, - [OPPONENT_SUSIE] = + [TRAINER_SUSIE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6394,10 +6394,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Susie + .party = {.NoItemDefaultMoves = gTrainerParty_Susie } }, - [OPPONENT_KARA] = + [TRAINER_KARA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6408,10 +6408,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Kara + .party = {.NoItemDefaultMoves = gTrainerParty_Kara } }, - [OPPONENT_DANA] = + [TRAINER_DANA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6422,10 +6422,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dana + .party = {.NoItemDefaultMoves = gTrainerParty_Dana } }, - [OPPONENT_ERIN] = + [TRAINER_ERIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6436,10 +6436,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Erin + .party = {.NoItemDefaultMoves = gTrainerParty_Erin } }, - [OPPONENT_DEBRA] = + [TRAINER_DEBRA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6450,10 +6450,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Debra + .party = {.NoItemDefaultMoves = gTrainerParty_Debra } }, - [OPPONENT_LINDA] = + [TRAINER_LINDA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6464,10 +6464,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Linda + .party = {.NoItemDefaultMoves = gTrainerParty_Linda } }, - [OPPONENT_KAYLEE] = + [TRAINER_KAYLEE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6478,10 +6478,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Kaylee + .party = {.NoItemDefaultMoves = gTrainerParty_Kaylee } }, - [OPPONENT_LAUREL] = + [TRAINER_LAUREL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6492,10 +6492,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Laurel + .party = {.NoItemDefaultMoves = gTrainerParty_Laurel } }, - [OPPONENT_DARCY] = + [TRAINER_DARCY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6506,10 +6506,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Darcy + .party = {.NoItemDefaultMoves = gTrainerParty_Darcy } }, - [OPPONENT_JENNY_2] = + [TRAINER_JENNY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6520,10 +6520,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jenny2 + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny2 } }, - [OPPONENT_JENNY_3] = + [TRAINER_JENNY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6534,10 +6534,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Jenny3 + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny3 } }, - [OPPONENT_JENNY_4] = + [TRAINER_JENNY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6548,10 +6548,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Jenny4 + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny4 } }, - [OPPONENT_JENNY_5] = + [TRAINER_JENNY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -6562,10 +6562,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Jenny5 + .party = {.NoItemDefaultMoves = gTrainerParty_Jenny5 } }, - [OPPONENT_HEIDI] = + [TRAINER_HEIDI] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6576,10 +6576,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Heidi + .party = {.NoItemCustomMoves = gTrainerParty_Heidi } }, - [OPPONENT_BECKY] = + [TRAINER_BECKY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6590,10 +6590,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Becky + .party = {.NoItemCustomMoves = gTrainerParty_Becky } }, - [OPPONENT_CAROL] = + [TRAINER_CAROL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6604,10 +6604,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Carol + .party = {.NoItemDefaultMoves = gTrainerParty_Carol } }, - [OPPONENT_NANCY] = + [TRAINER_NANCY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6618,10 +6618,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nancy + .party = {.NoItemDefaultMoves = gTrainerParty_Nancy } }, - [OPPONENT_MARTHA] = + [TRAINER_MARTHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6632,10 +6632,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Martha + .party = {.NoItemDefaultMoves = gTrainerParty_Martha } }, - [OPPONENT_DIANA_1] = + [TRAINER_DIANA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6646,10 +6646,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Diana1 + .party = {.NoItemDefaultMoves = gTrainerParty_Diana1 } }, - [OPPONENT_NINA] = + [TRAINER_NINA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6660,10 +6660,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Nina + .party = {.NoItemDefaultMoves = gTrainerParty_Nina } }, - [OPPONENT_IRENE] = + [TRAINER_IRENE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6674,10 +6674,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Irene + .party = {.NoItemDefaultMoves = gTrainerParty_Irene } }, - [OPPONENT_DIANA_2] = + [TRAINER_DIANA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6688,10 +6688,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Diana2 + .party = {.NoItemDefaultMoves = gTrainerParty_Diana2 } }, - [OPPONENT_DIANA_3] = + [TRAINER_DIANA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6702,10 +6702,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Diana3 + .party = {.NoItemDefaultMoves = gTrainerParty_Diana3 } }, - [OPPONENT_DIANA_4] = + [TRAINER_DIANA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6716,10 +6716,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Diana4 + .party = {.NoItemDefaultMoves = gTrainerParty_Diana4 } }, - [OPPONENT_DIANA_5] = + [TRAINER_DIANA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -6730,10 +6730,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Diana5 + .party = {.NoItemDefaultMoves = gTrainerParty_Diana5 } }, - [OPPONENT_AMY_AND_LIV_1] = + [TRAINER_AMY_AND_LIV_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6744,10 +6744,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv1 + .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv1 } }, - [OPPONENT_AMY_AND_LIV_2] = + [TRAINER_AMY_AND_LIV_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6758,10 +6758,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv2 + .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv2 } }, - [OPPONENT_GINA_AND_MIA_1] = + [TRAINER_GINA_AND_MIA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6772,10 +6772,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GinaAndMia1 + .party = {.NoItemDefaultMoves = gTrainerParty_GinaAndMia1 } }, - [OPPONENT_MIU_AND_YUKI] = + [TRAINER_MIU_AND_YUKI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6786,10 +6786,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_MiuAndYuki + .party = {.NoItemDefaultMoves = gTrainerParty_MiuAndYuki } }, - [OPPONENT_AMY_AND_LIV_3] = + [TRAINER_AMY_AND_LIV_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6800,10 +6800,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv3 + .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv3 } }, - [OPPONENT_GINA_AND_MIA_2] = + [TRAINER_GINA_AND_MIA_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TWINS, @@ -6814,10 +6814,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_GinaAndMia2 + .party = {.NoItemCustomMoves = gTrainerParty_GinaAndMia2 } }, - [OPPONENT_AMY_AND_LIV_4] = + [TRAINER_AMY_AND_LIV_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -6828,10 +6828,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv4 + .party = {.NoItemDefaultMoves = gTrainerParty_AmyAndLiv4 } }, - [OPPONENT_AMY_AND_LIV_5] = + [TRAINER_AMY_AND_LIV_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TWINS, @@ -6842,10 +6842,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv5 + .party = {.NoItemCustomMoves = gTrainerParty_AmyAndLiv5 } }, - [OPPONENT_AMY_AND_LIV_6] = + [TRAINER_AMY_AND_LIV_6] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_TWINS, @@ -6856,10 +6856,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_AmyAndLiv6 + .party = {.NoItemCustomMoves = gTrainerParty_AmyAndLiv6 } }, - [OPPONENT_HUEY] = + [TRAINER_HUEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6870,10 +6870,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Huey + .party = {.NoItemDefaultMoves = gTrainerParty_Huey } }, - [OPPONENT_EDMOND] = + [TRAINER_EDMOND] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6884,10 +6884,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Edmond + .party = {.NoItemDefaultMoves = gTrainerParty_Edmond } }, - [OPPONENT_ERNEST_1] = + [TRAINER_ERNEST_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6898,10 +6898,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ernest1 + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest1 } }, - [OPPONENT_DWAYNE] = + [TRAINER_DWAYNE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6912,10 +6912,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Dwayne + .party = {.NoItemDefaultMoves = gTrainerParty_Dwayne } }, - [OPPONENT_PHILLIP] = + [TRAINER_PHILLIP] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6926,10 +6926,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Phillip + .party = {.NoItemDefaultMoves = gTrainerParty_Phillip } }, - [OPPONENT_LEONARD] = + [TRAINER_LEONARD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6940,10 +6940,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Leonard + .party = {.NoItemDefaultMoves = gTrainerParty_Leonard } }, - [OPPONENT_DUNCAN] = + [TRAINER_DUNCAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6954,10 +6954,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Duncan + .party = {.NoItemDefaultMoves = gTrainerParty_Duncan } }, - [OPPONENT_ERNEST_2] = + [TRAINER_ERNEST_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6968,10 +6968,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ernest2 + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest2 } }, - [OPPONENT_ERNEST_3] = + [TRAINER_ERNEST_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6982,10 +6982,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ernest3 + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest3 } }, - [OPPONENT_ERNEST_4] = + [TRAINER_ERNEST_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -6996,10 +6996,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ernest4 + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest4 } }, - [OPPONENT_ERNEST_5] = + [TRAINER_ERNEST_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SAILOR, @@ -7010,10 +7010,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Ernest5 + .party = {.NoItemDefaultMoves = gTrainerParty_Ernest5 } }, - [OPPONENT_ANONYMOUS_11] = + [TRAINER_ANONYMOUS_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7024,10 +7024,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Anonymous11 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous11 } }, - [OPPONENT_ANONYMOUS_12] = + [TRAINER_ANONYMOUS_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7038,10 +7038,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Anonymous12 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous12 } }, - [OPPONENT_ANONYMOUS_13] = + [TRAINER_ANONYMOUS_13] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7052,10 +7052,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Anonymous13 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous13 } }, - [OPPONENT_SONNY] = + [TRAINER_SONNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7066,10 +7066,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Sonny + .party = {.NoItemDefaultMoves = gTrainerParty_Sonny } }, - [OPPONENT_DONOVAN] = + [TRAINER_DONOVAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7080,10 +7080,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Donovan + .party = {.NoItemDefaultMoves = gTrainerParty_Donovan } }, - [OPPONENT_GERALD] = + [TRAINER_GERALD] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7094,10 +7094,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Gerald + .party = {.NoItemDefaultMoves = gTrainerParty_Gerald } }, - [OPPONENT_KELVIN] = + [TRAINER_KELVIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7108,10 +7108,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Kelvin + .party = {.NoItemDefaultMoves = gTrainerParty_Kelvin } }, - [OPPONENT_KODY] = + [TRAINER_KODY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7122,10 +7122,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Kody + .party = {.NoItemDefaultMoves = gTrainerParty_Kody } }, - [OPPONENT_TEVIN] = + [TRAINER_TEVIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7136,10 +7136,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Tevin + .party = {.NoItemDefaultMoves = gTrainerParty_Tevin } }, - [OPPONENT_DAMON] = + [TRAINER_DAMON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7150,10 +7150,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Damon + .party = {.NoItemDefaultMoves = gTrainerParty_Damon } }, - [OPPONENT_PABLO] = + [TRAINER_PABLO] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BOARDER, @@ -7164,10 +7164,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Pablo + .party = {.NoItemDefaultMoves = gTrainerParty_Pablo } }, - [OPPONENT_EDWIN_1] = + [TRAINER_EDWIN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7178,10 +7178,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Edwin1 + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin1 } }, - [OPPONENT_HECTOR_1] = + [TRAINER_HECTOR_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7192,10 +7192,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Hector1 + .party = {.NoItemDefaultMoves = gTrainerParty_Hector1 } }, - [OPPONENT_HECTOR_2] = + [TRAINER_HECTOR_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7206,10 +7206,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Hector2 + .party = {.NoItemDefaultMoves = gTrainerParty_Hector2 } }, - [OPPONENT_EDWIN_2] = + [TRAINER_EDWIN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7220,10 +7220,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Edwin2 + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin2 } }, - [OPPONENT_EDWIN_3] = + [TRAINER_EDWIN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7234,10 +7234,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Edwin3 + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin3 } }, - [OPPONENT_EDWIN_4] = + [TRAINER_EDWIN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7248,10 +7248,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Edwin4 + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin4 } }, - [OPPONENT_EDWIN_5] = + [TRAINER_EDWIN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COLLECTOR, @@ -7262,10 +7262,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Edwin5 + .party = {.NoItemDefaultMoves = gTrainerParty_Edwin5 } }, - [OPPONENT_WALLY_1] = + [TRAINER_WALLY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7276,10 +7276,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wally1 + .party = {.NoItemCustomMoves = gTrainerParty_Wally1 } }, - [OPPONENT_BRENDAN_1] = + [TRAINER_BRENDAN_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7290,10 +7290,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Brendan1 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan1 } }, - [OPPONENT_BRENDAN_2] = + [TRAINER_BRENDAN_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7304,10 +7304,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan2 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan2 } }, - [OPPONENT_BRENDAN_3] = + [TRAINER_BRENDAN_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7318,10 +7318,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan3 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan3 } }, - [OPPONENT_BRENDAN_4] = + [TRAINER_BRENDAN_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7332,10 +7332,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 1, - .party = gTrainerParty_Brendan4 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan4 } }, - [OPPONENT_BRENDAN_5] = + [TRAINER_BRENDAN_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7346,10 +7346,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan5 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan5 } }, - [OPPONENT_BRENDAN_6] = + [TRAINER_BRENDAN_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7360,10 +7360,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan6 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan6 } }, - [OPPONENT_BRENDAN_7] = + [TRAINER_BRENDAN_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7374,10 +7374,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Brendan7 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan7 } }, - [OPPONENT_BRENDAN_8] = + [TRAINER_BRENDAN_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7388,10 +7388,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan8 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan8 } }, - [OPPONENT_BRENDAN_9] = + [TRAINER_BRENDAN_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7402,10 +7402,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Brendan9 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan9 } }, - [OPPONENT_MAY_1] = + [TRAINER_MAY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7416,10 +7416,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_May1 + .party = {.NoItemDefaultMoves = gTrainerParty_May1 } }, - [OPPONENT_MAY_2] = + [TRAINER_MAY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7430,10 +7430,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May2 + .party = {.NoItemDefaultMoves = gTrainerParty_May2 } }, - [OPPONENT_MAY_3] = + [TRAINER_MAY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7444,10 +7444,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May3 + .party = {.NoItemDefaultMoves = gTrainerParty_May3 } }, - [OPPONENT_MAY_4] = + [TRAINER_MAY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7458,10 +7458,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_May4 + .party = {.NoItemDefaultMoves = gTrainerParty_May4 } }, - [OPPONENT_MAY_5] = + [TRAINER_MAY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7472,10 +7472,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May5 + .party = {.NoItemDefaultMoves = gTrainerParty_May5 } }, - [OPPONENT_MAY_6] = + [TRAINER_MAY_6] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7486,10 +7486,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May6 + .party = {.NoItemDefaultMoves = gTrainerParty_May6 } }, - [OPPONENT_MAY_7] = + [TRAINER_MAY_7] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7500,10 +7500,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_May7 + .party = {.NoItemDefaultMoves = gTrainerParty_May7 } }, - [OPPONENT_MAY_8] = + [TRAINER_MAY_8] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7514,10 +7514,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May8 + .party = {.NoItemDefaultMoves = gTrainerParty_May8 } }, - [OPPONENT_MAY_9] = + [TRAINER_MAY_9] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -7528,10 +7528,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_May9 + .party = {.NoItemDefaultMoves = gTrainerParty_May9 } }, - [OPPONENT_ISAAC_1] = + [TRAINER_ISAAC_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7542,10 +7542,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Isaac1 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac1 } }, - [OPPONENT_RILEY] = + [TRAINER_RILEY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7556,10 +7556,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Riley + .party = {.NoItemDefaultMoves = gTrainerParty_Riley } }, - [OPPONENT_AIDAN] = + [TRAINER_AIDAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7570,10 +7570,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Aidan + .party = {.NoItemDefaultMoves = gTrainerParty_Aidan } }, - [OPPONENT_ISAAC_2] = + [TRAINER_ISAAC_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7584,10 +7584,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Isaac2 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac2 } }, - [OPPONENT_ISAAC_3] = + [TRAINER_ISAAC_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7598,10 +7598,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Isaac3 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac3 } }, - [OPPONENT_ISAAC_4] = + [TRAINER_ISAAC_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7612,10 +7612,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Isaac4 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac4 } }, - [OPPONENT_ISAAC_5] = + [TRAINER_ISAAC_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7626,10 +7626,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Isaac5 + .party = {.NoItemDefaultMoves = gTrainerParty_Isaac5 } }, - [OPPONENT_LYDIA_1] = + [TRAINER_LYDIA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7640,10 +7640,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lydia1 + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia1 } }, - [OPPONENT_ALEXIA] = + [TRAINER_ALEXIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7654,10 +7654,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Alexia + .party = {.NoItemDefaultMoves = gTrainerParty_Alexia } }, - [OPPONENT_DANIELLE] = + [TRAINER_DANIELLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7668,10 +7668,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Danielle + .party = {.NoItemDefaultMoves = gTrainerParty_Danielle } }, - [OPPONENT_LYDIA_2] = + [TRAINER_LYDIA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7682,10 +7682,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lydia2 + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia2 } }, - [OPPONENT_LYDIA_3] = + [TRAINER_LYDIA_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7696,10 +7696,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lydia3 + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia3 } }, - [OPPONENT_LYDIA_4] = + [TRAINER_LYDIA_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7710,10 +7710,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lydia4 + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia4 } }, - [OPPONENT_LYDIA_5] = + [TRAINER_LYDIA_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_BREEDER, @@ -7724,10 +7724,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lydia5 + .party = {.NoItemDefaultMoves = gTrainerParty_Lydia5 } }, - [OPPONENT_JACKSON_1] = + [TRAINER_JACKSON_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7738,10 +7738,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Jackson1 + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson1 } }, - [OPPONENT_CARLOS] = + [TRAINER_CARLOS] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7752,10 +7752,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Carlos + .party = {.NoItemDefaultMoves = gTrainerParty_Carlos } }, - [OPPONENT_SEBASTIAN] = + [TRAINER_SEBASTIAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7766,10 +7766,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Sebastian + .party = {.NoItemDefaultMoves = gTrainerParty_Sebastian } }, - [OPPONENT_JACKSON_2] = + [TRAINER_JACKSON_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7780,10 +7780,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 1, - .party = gTrainerParty_Jackson2 + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson2 } }, - [OPPONENT_JACKSON_3] = + [TRAINER_JACKSON_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7794,10 +7794,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Jackson3 + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson3 } }, - [OPPONENT_JACKSON_4] = + [TRAINER_JACKSON_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7808,10 +7808,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 1, - .party = gTrainerParty_Jackson4 + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson4 } }, - [OPPONENT_JACKSON_5] = + [TRAINER_JACKSON_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7822,10 +7822,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Jackson5 + .party = {.NoItemDefaultMoves = gTrainerParty_Jackson5 } }, - [OPPONENT_CATHERINE_1] = + [TRAINER_CATHERINE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7836,10 +7836,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Catherine1 + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine1 } }, - [OPPONENT_JENNA] = + [TRAINER_JENNA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7850,10 +7850,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 3, - .party = gTrainerParty_Jenna + .party = {.NoItemDefaultMoves = gTrainerParty_Jenna } }, - [OPPONENT_SOPHIA] = + [TRAINER_SOPHIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7864,10 +7864,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Sophia + .party = {.NoItemDefaultMoves = gTrainerParty_Sophia } }, - [OPPONENT_CATHERINE_2] = + [TRAINER_CATHERINE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7878,10 +7878,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Catherine2 + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine2 } }, - [OPPONENT_CATHERINE_3] = + [TRAINER_CATHERINE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7892,10 +7892,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Catherine3 + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine3 } }, - [OPPONENT_CATHERINE_4] = + [TRAINER_CATHERINE_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7906,10 +7906,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Catherine4 + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine4 } }, - [OPPONENT_CATHERINE_5] = + [TRAINER_CATHERINE_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_RANGER, @@ -7920,10 +7920,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Catherine5 + .party = {.NoItemDefaultMoves = gTrainerParty_Catherine5 } }, - [OPPONENT_MAXIE_1] = + [TRAINER_MAXIE_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_LEADER, @@ -7934,10 +7934,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Maxie1 + .party = {.NoItemDefaultMoves = gTrainerParty_Maxie1 } }, - [OPPONENT_GRUNT_28] = + [TRAINER_GRUNT_28] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7948,10 +7948,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt28 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt28 } }, - [OPPONENT_GRUNT_29] = + [TRAINER_GRUNT_29] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7962,10 +7962,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Grunt29 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt29 } }, - [OPPONENT_GRUNT_30] = + [TRAINER_GRUNT_30] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7976,10 +7976,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt30 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt30 } }, - [OPPONENT_GRUNT_31] = + [TRAINER_GRUNT_31] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -7990,10 +7990,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt31 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt31 } }, - [OPPONENT_GRUNT_32] = + [TRAINER_GRUNT_32] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8004,10 +8004,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt32 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt32 } }, - [OPPONENT_GRUNT_33] = + [TRAINER_GRUNT_33] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8018,10 +8018,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt33 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt33 } }, - [OPPONENT_GRUNT_34] = + [TRAINER_GRUNT_34] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8032,10 +8032,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt34 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt34 } }, - [OPPONENT_GRUNT_35] = + [TRAINER_GRUNT_35] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8046,10 +8046,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt35 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt35 } }, - [OPPONENT_GRUNT_36] = + [TRAINER_GRUNT_36] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8060,10 +8060,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt36 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt36 } }, - [OPPONENT_GRUNT_37] = + [TRAINER_GRUNT_37] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8074,10 +8074,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt37 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt37 } }, - [OPPONENT_GRUNT_38] = + [TRAINER_GRUNT_38] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8088,10 +8088,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt38 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt38 } }, - [OPPONENT_GRUNT_39] = + [TRAINER_GRUNT_39] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8102,10 +8102,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt39 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt39 } }, - [OPPONENT_GRUNT_40] = + [TRAINER_GRUNT_40] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8116,10 +8116,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt40 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt40 } }, - [OPPONENT_GRUNT_41] = + [TRAINER_GRUNT_41] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8130,10 +8130,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt41 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt41 } }, - [OPPONENT_GRUNT_42] = + [TRAINER_GRUNT_42] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8144,10 +8144,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt42 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt42 } }, - [OPPONENT_GRUNT_43] = + [TRAINER_GRUNT_43] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8158,10 +8158,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt43 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt43 } }, - [OPPONENT_GRUNT_44] = + [TRAINER_GRUNT_44] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8172,10 +8172,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt44 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt44 } }, - [OPPONENT_GRUNT_45] = + [TRAINER_GRUNT_45] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8186,10 +8186,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt45 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt45 } }, - [OPPONENT_GRUNT_46] = + [TRAINER_GRUNT_46] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8200,10 +8200,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt46 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt46 } }, - [OPPONENT_GRUNT_47] = + [TRAINER_GRUNT_47] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8214,10 +8214,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt47 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt47 } }, - [OPPONENT_GRUNT_48] = + [TRAINER_GRUNT_48] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8228,10 +8228,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt48 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt48 } }, - [OPPONENT_GRUNT_49] = + [TRAINER_GRUNT_49] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8242,10 +8242,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt49 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt49 } }, - [OPPONENT_GRUNT_50] = + [TRAINER_GRUNT_50] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8256,10 +8256,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt50 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt50 } }, - [OPPONENT_GRUNT_51] = + [TRAINER_GRUNT_51] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8270,10 +8270,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Grunt51 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt51 } }, - [OPPONENT_GRUNT_52] = + [TRAINER_GRUNT_52] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8284,10 +8284,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt52 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt52 } }, - [OPPONENT_GRUNT_53] = + [TRAINER_GRUNT_53] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8298,10 +8298,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Grunt53 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt53 } }, - [OPPONENT_GRUNT_54] = + [TRAINER_GRUNT_54] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TEAM_MAGMA, @@ -8312,10 +8312,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Grunt54 + .party = {.NoItemDefaultMoves = gTrainerParty_Grunt54 } }, - [OPPONENT_ANONYMOUS_14] = + [TRAINER_ANONYMOUS_14] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8326,10 +8326,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Anonymous14 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous14 } }, - [OPPONENT_ANONYMOUS_15] = + [TRAINER_ANONYMOUS_15] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8340,10 +8340,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Anonymous15 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous15 } }, - [OPPONENT_TABITHA_1] = + [TRAINER_TABITHA_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8354,10 +8354,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 3, - .party = gTrainerParty_Tabitha1 + .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha1 } }, - [OPPONENT_TABITHA_2] = + [TRAINER_TABITHA_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8368,10 +8368,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Tabitha2 + .party = {.NoItemDefaultMoves = gTrainerParty_Tabitha2 } }, - [OPPONENT_ANONYMOUS_16] = + [TRAINER_ANONYMOUS_16] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8382,10 +8382,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Anonymous16 + .party = {.NoItemDefaultMoves = gTrainerParty_Anonymous16 } }, - [OPPONENT_COURTNEY_1] = + [TRAINER_COURTNEY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8396,10 +8396,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Courtney1 + .party = {.NoItemDefaultMoves = gTrainerParty_Courtney1 } }, - [OPPONENT_COURTNEY_2] = + [TRAINER_COURTNEY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_ADMIN, @@ -8410,10 +8410,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_Courtney2 + .party = {.NoItemDefaultMoves = gTrainerParty_Courtney2 } }, - [OPPONENT_MAXIE_2] = + [TRAINER_MAXIE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_LEADER, @@ -8424,10 +8424,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Maxie2 + .party = {.NoItemDefaultMoves = gTrainerParty_Maxie2 } }, - [OPPONENT_MAXIE_3] = + [TRAINER_MAXIE_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_MAGMA_LEADER, @@ -8438,10 +8438,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Maxie3 + .party = {.NoItemDefaultMoves = gTrainerParty_Maxie3 } }, - [OPPONENT_TIANA] = + [TRAINER_TIANA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8452,10 +8452,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Tiana + .party = {.NoItemDefaultMoves = gTrainerParty_Tiana } }, - [OPPONENT_HALEY_1] = + [TRAINER_HALEY_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8466,10 +8466,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Haley1 + .party = {.NoItemDefaultMoves = gTrainerParty_Haley1 } }, - [OPPONENT_JANICE] = + [TRAINER_JANICE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8480,10 +8480,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Janice + .party = {.NoItemDefaultMoves = gTrainerParty_Janice } }, - [OPPONENT_VIVI] = + [TRAINER_VIVI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_WINSTRATE, @@ -8494,10 +8494,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Vivi + .party = {.NoItemDefaultMoves = gTrainerParty_Vivi } }, - [OPPONENT_HALEY_2] = + [TRAINER_HALEY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8508,10 +8508,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Haley2 + .party = {.NoItemDefaultMoves = gTrainerParty_Haley2 } }, - [OPPONENT_HALEY_3] = + [TRAINER_HALEY_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8522,10 +8522,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Haley3 + .party = {.NoItemDefaultMoves = gTrainerParty_Haley3 } }, - [OPPONENT_HALEY_4] = + [TRAINER_HALEY_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8536,10 +8536,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Haley4 + .party = {.NoItemDefaultMoves = gTrainerParty_Haley4 } }, - [OPPONENT_HALEY_5] = + [TRAINER_HALEY_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8550,10 +8550,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Haley5 + .party = {.NoItemDefaultMoves = gTrainerParty_Haley5 } }, - [OPPONENT_SALLY] = + [TRAINER_SALLY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8564,10 +8564,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Sally + .party = {.NoItemDefaultMoves = gTrainerParty_Sally } }, - [OPPONENT_ROBIN] = + [TRAINER_ROBIN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8578,10 +8578,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Robin + .party = {.NoItemDefaultMoves = gTrainerParty_Robin } }, - [OPPONENT_ANDREA] = + [TRAINER_ANDREA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8592,10 +8592,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Andrea + .party = {.NoItemDefaultMoves = gTrainerParty_Andrea } }, - [OPPONENT_CRISSY] = + [TRAINER_CRISSY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_LASS, @@ -8606,10 +8606,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Crissy + .party = {.NoItemDefaultMoves = gTrainerParty_Crissy } }, - [OPPONENT_RICK] = + [TRAINER_RICK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8620,10 +8620,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Rick + .party = {.NoItemDefaultMoves = gTrainerParty_Rick } }, - [OPPONENT_LYLE] = + [TRAINER_LYLE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8634,10 +8634,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 6, - .party = gTrainerParty_Lyle + .party = {.NoItemDefaultMoves = gTrainerParty_Lyle } }, - [OPPONENT_JOSE] = + [TRAINER_JOSE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8648,10 +8648,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Jose + .party = {.NoItemDefaultMoves = gTrainerParty_Jose } }, - [OPPONENT_DOUG] = + [TRAINER_DOUG] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8662,10 +8662,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Doug + .party = {.NoItemDefaultMoves = gTrainerParty_Doug } }, - [OPPONENT_GREG] = + [TRAINER_GREG] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8676,10 +8676,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Greg + .party = {.NoItemDefaultMoves = gTrainerParty_Greg } }, - [OPPONENT_KENT] = + [TRAINER_KENT] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8690,10 +8690,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Kent + .party = {.NoItemDefaultMoves = gTrainerParty_Kent } }, - [OPPONENT_JAMES_1] = + [TRAINER_JAMES_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8704,10 +8704,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_James1 + .party = {.NoItemDefaultMoves = gTrainerParty_James1 } }, - [OPPONENT_JAMES_2] = + [TRAINER_JAMES_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8718,10 +8718,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_James2 + .party = {.NoItemDefaultMoves = gTrainerParty_James2 } }, - [OPPONENT_JAMES_3] = + [TRAINER_JAMES_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8732,10 +8732,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_James3 + .party = {.NoItemDefaultMoves = gTrainerParty_James3 } }, - [OPPONENT_JAMES_4] = + [TRAINER_JAMES_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8746,10 +8746,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_James4 + .party = {.NoItemDefaultMoves = gTrainerParty_James4 } }, - [OPPONENT_JAMES_5] = + [TRAINER_JAMES_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BUG_CATCHER, @@ -8760,10 +8760,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_James5 + .party = {.NoItemDefaultMoves = gTrainerParty_James5 } }, - [OPPONENT_BRICE] = + [TRAINER_BRICE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8774,10 +8774,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Brice + .party = {.NoItemDefaultMoves = gTrainerParty_Brice } }, - [OPPONENT_TRENT_1] = + [TRAINER_TRENT_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8788,10 +8788,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Trent1 + .party = {.NoItemDefaultMoves = gTrainerParty_Trent1 } }, - [OPPONENT_LENNY] = + [TRAINER_LENNY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8802,10 +8802,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Lenny + .party = {.NoItemDefaultMoves = gTrainerParty_Lenny } }, - [OPPONENT_LUCAS_1] = + [TRAINER_LUCAS_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8816,10 +8816,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Lucas1 + .party = {.NoItemDefaultMoves = gTrainerParty_Lucas1 } }, - [OPPONENT_ALAN] = + [TRAINER_ALAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8830,10 +8830,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Alan + .party = {.NoItemDefaultMoves = gTrainerParty_Alan } }, - [OPPONENT_CLARK] = + [TRAINER_CLARK] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8844,10 +8844,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Clark + .party = {.NoItemDefaultMoves = gTrainerParty_Clark } }, - [OPPONENT_ERIC] = + [TRAINER_ERIC] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8858,10 +8858,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Eric + .party = {.NoItemDefaultMoves = gTrainerParty_Eric } }, - [OPPONENT_LUCAS_2] = + [TRAINER_LUCAS_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_HIKER, @@ -8872,10 +8872,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Lucas2 + .party = {.NoItemCustomMoves = gTrainerParty_Lucas2 } }, - [OPPONENT_MIKE_1] = + [TRAINER_MIKE_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_HIKER, @@ -8886,10 +8886,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Mike1 + .party = {.NoItemCustomMoves = gTrainerParty_Mike1 } }, - [OPPONENT_MIKE_2] = + [TRAINER_MIKE_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8900,10 +8900,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Mike2 + .party = {.NoItemDefaultMoves = gTrainerParty_Mike2 } }, - [OPPONENT_TRENT_2] = + [TRAINER_TRENT_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8914,10 +8914,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Trent2 + .party = {.NoItemDefaultMoves = gTrainerParty_Trent2 } }, - [OPPONENT_TRENT_3] = + [TRAINER_TRENT_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8928,10 +8928,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Trent3 + .party = {.NoItemDefaultMoves = gTrainerParty_Trent3 } }, - [OPPONENT_TRENT_4] = + [TRAINER_TRENT_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8942,10 +8942,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Trent4 + .party = {.NoItemDefaultMoves = gTrainerParty_Trent4 } }, - [OPPONENT_TRENT_5] = + [TRAINER_TRENT_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_HIKER, @@ -8956,10 +8956,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Trent5 + .party = {.NoItemDefaultMoves = gTrainerParty_Trent5 } }, - [OPPONENT_DEZ_AND_LUKE] = + [TRAINER_DEZ_AND_LUKE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -8970,10 +8970,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_DezAndLuke + .party = {.NoItemDefaultMoves = gTrainerParty_DezAndLuke } }, - [OPPONENT_LEA_AND_JED] = + [TRAINER_LEA_AND_JED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -8984,10 +8984,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LeaAndJed + .party = {.NoItemDefaultMoves = gTrainerParty_LeaAndJed } }, - [OPPONENT_LOIS_AND_HAL_1] = + [TRAINER_LOIS_AND_HAL_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -8998,10 +8998,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LoisAndHal1 + .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal1 } }, - [OPPONENT_LOIS_AND_HAL_2] = + [TRAINER_LOIS_AND_HAL_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9012,10 +9012,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LoisAndHal2 + .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal2 } }, - [OPPONENT_LOIS_AND_HAL_3] = + [TRAINER_LOIS_AND_HAL_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9026,10 +9026,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LoisAndHal3 + .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal3 } }, - [OPPONENT_LOIS_AND_HAL_4] = + [TRAINER_LOIS_AND_HAL_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9040,10 +9040,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LoisAndHal4 + .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal4 } }, - [OPPONENT_LOIS_AND_HAL_5] = + [TRAINER_LOIS_AND_HAL_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9054,10 +9054,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LoisAndHal5 + .party = {.NoItemDefaultMoves = gTrainerParty_LoisAndHal5 } }, - [OPPONENT_JOHANNA] = + [TRAINER_JOHANNA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BEAUTY, @@ -9068,10 +9068,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Johanna + .party = {.NoItemDefaultMoves = gTrainerParty_Johanna } }, - [OPPONENT_ZANE] = + [TRAINER_ZANE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -9082,10 +9082,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Zane + .party = {.NoItemCustomMoves = gTrainerParty_Zane } }, - [OPPONENT_VIVIAN] = + [TRAINER_VIVIAN] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -9096,10 +9096,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Vivian + .party = {.NoItemCustomMoves = gTrainerParty_Vivian } }, - [OPPONENT_SADIE] = + [TRAINER_SADIE] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_BATTLE_GIRL, @@ -9110,10 +9110,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Sadie + .party = {.NoItemCustomMoves = gTrainerParty_Sadie } }, - [OPPONENT_HIDEO_2] = + [TRAINER_HIDEO_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -9124,10 +9124,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 2, - .party = gTrainerParty_Hideo2 + .party = {.NoItemCustomMoves = gTrainerParty_Hideo2 } }, - [OPPONENT_KEIGO] = + [TRAINER_KEIGO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -9138,10 +9138,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 2, - .party = gTrainerParty_Keigo + .party = {.NoItemCustomMoves = gTrainerParty_Keigo } }, - [OPPONENT_TSUNAO] = + [TRAINER_TSUNAO] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_NINJA_BOY, @@ -9152,10 +9152,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x3, .partySize = 3, - .party = gTrainerParty_Tsunao + .party = {.NoItemCustomMoves = gTrainerParty_Tsunao } }, - [OPPONENT_TERRELL] = + [TRAINER_TERRELL] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_CAMPER, @@ -9166,10 +9166,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Terrell + .party = {.NoItemDefaultMoves = gTrainerParty_Terrell } }, - [OPPONENT_KYLEE] = + [TRAINER_KYLEE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_PICNICKER, @@ -9180,10 +9180,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 1, - .party = gTrainerParty_Kylee + .party = {.NoItemDefaultMoves = gTrainerParty_Kylee } }, - [OPPONENT_WALLY_2] = + [TRAINER_WALLY_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9194,10 +9194,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 1, - .party = gTrainerParty_Wally2 + .party = {.NoItemDefaultMoves = gTrainerParty_Wally2 } }, - [OPPONENT_WALLY_3] = + [TRAINER_WALLY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9208,10 +9208,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wally3 + .party = {.NoItemCustomMoves = gTrainerParty_Wally3 } }, - [OPPONENT_WALLY_4] = + [TRAINER_WALLY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9222,10 +9222,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wally4 + .party = {.NoItemCustomMoves = gTrainerParty_Wally4 } }, - [OPPONENT_WALLY_5] = + [TRAINER_WALLY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9236,10 +9236,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wally5 + .party = {.NoItemCustomMoves = gTrainerParty_Wally5 } }, - [OPPONENT_WALLY_6] = + [TRAINER_WALLY_6] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9250,10 +9250,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 5, - .party = gTrainerParty_Wally6 + .party = {.NoItemCustomMoves = gTrainerParty_Wally6 } }, - [OPPONENT_BRENDAN_10] = + [TRAINER_BRENDAN_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9264,10 +9264,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_Brendan10 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan10 } }, - [OPPONENT_BRENDAN_11] = + [TRAINER_BRENDAN_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9278,10 +9278,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_Brendan11 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan11 } }, - [OPPONENT_BRENDAN_12] = + [TRAINER_BRENDAN_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9292,10 +9292,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_Brendan12 + .party = {.NoItemDefaultMoves = gTrainerParty_Brendan12 } }, - [OPPONENT_MAY_10] = + [TRAINER_MAY_10] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9306,10 +9306,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_May10 + .party = {.NoItemDefaultMoves = gTrainerParty_May10 } }, - [OPPONENT_MAY_11] = + [TRAINER_MAY_11] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9320,10 +9320,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_May11 + .party = {.NoItemDefaultMoves = gTrainerParty_May11 } }, - [OPPONENT_MAY_12] = + [TRAINER_MAY_12] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_POKEMON_TRAINER_3, @@ -9334,10 +9334,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 4, - .party = gTrainerParty_May12 + .party = {.NoItemDefaultMoves = gTrainerParty_May12 } }, - [OPPONENT_JONAH] = + [TRAINER_JONAH] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9348,10 +9348,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Jonah + .party = {.NoItemDefaultMoves = gTrainerParty_Jonah } }, - [OPPONENT_HENRY] = + [TRAINER_HENRY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9362,10 +9362,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Henry + .party = {.NoItemDefaultMoves = gTrainerParty_Henry } }, - [OPPONENT_ROGER] = + [TRAINER_ROGER] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9376,10 +9376,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Roger + .party = {.NoItemDefaultMoves = gTrainerParty_Roger } }, - [OPPONENT_ALEXA] = + [TRAINER_ALEXA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -9390,10 +9390,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_Alexa + .party = {.NoItemDefaultMoves = gTrainerParty_Alexa } }, - [OPPONENT_RUBEN] = + [TRAINER_RUBEN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_COOL_TRAINER, @@ -9404,10 +9404,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x7, .partySize = 3, - .party = gTrainerParty_Ruben + .party = {.NoItemDefaultMoves = gTrainerParty_Ruben } }, - [OPPONENT_KOJI] = + [TRAINER_KOJI] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BLACK_BELT, @@ -9418,10 +9418,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Koji + .party = {.NoItemDefaultMoves = gTrainerParty_Koji } }, - [OPPONENT_WAYNE] = + [TRAINER_WAYNE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9432,10 +9432,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Wayne + .party = {.NoItemDefaultMoves = gTrainerParty_Wayne } }, - [OPPONENT_BYRON] = + [TRAINER_BYRON] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_BIRD_KEEPER, @@ -9446,10 +9446,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_Byron + .party = {.NoItemDefaultMoves = gTrainerParty_Byron } }, - [OPPONENT_REED] = + [TRAINER_REED] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_M, @@ -9460,10 +9460,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Reed + .party = {.NoItemDefaultMoves = gTrainerParty_Reed } }, - [OPPONENT_TISHA] = + [TRAINER_TISHA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SWIMMER_F, @@ -9474,10 +9474,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 3, - .party = gTrainerParty_Tisha + .party = {.NoItemDefaultMoves = gTrainerParty_Tisha } }, - [OPPONENT_TORI_AND_TIA] = + [TRAINER_TORI_AND_TIA] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_TWINS, @@ -9488,10 +9488,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_ToriAndTia + .party = {.NoItemDefaultMoves = gTrainerParty_ToriAndTia } }, - [OPPONENT_KIM_AND_IRIS] = + [TRAINER_KIM_AND_IRIS] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -9502,10 +9502,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_KimAndIris + .party = {.NoItemCustomMoves = gTrainerParty_KimAndIris } }, - [OPPONENT_TYRA_AND_IVY] = + [TRAINER_TYRA_AND_IVY] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_SR_AND_JR, @@ -9516,10 +9516,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_TyraAndIvy + .party = {.NoItemCustomMoves = gTrainerParty_TyraAndIvy } }, - [OPPONENT_MEL_AND_PAUL] = + [TRAINER_MEL_AND_PAUL] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_YOUNG_COUPLE, @@ -9530,10 +9530,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_MelAndPaul + .party = {.NoItemCustomMoves = gTrainerParty_MelAndPaul } }, - [OPPONENT_JOHN_AND_JAY_1] = + [TRAINER_JOHN_AND_JAY_1] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9544,10 +9544,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_JohnAndJay1 + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay1 } }, - [OPPONENT_JOHN_AND_JAY_2] = + [TRAINER_JOHN_AND_JAY_2] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9558,10 +9558,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_JohnAndJay2 + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay2 } }, - [OPPONENT_JOHN_AND_JAY_3] = + [TRAINER_JOHN_AND_JAY_3] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9572,10 +9572,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_JohnAndJay3 + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay3 } }, - [OPPONENT_JOHN_AND_JAY_4] = + [TRAINER_JOHN_AND_JAY_4] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9586,10 +9586,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0xb, .partySize = 2, - .party = gTrainerParty_JohnAndJay4 + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay4 } }, - [OPPONENT_JOHN_AND_JAY_5] = + [TRAINER_JOHN_AND_JAY_5] = { .partyFlags = F_TRAINER_PARTY_CUSTOM_MOVESET, .trainerClass = TRAINER_CLASS_OLD_COUPLE, @@ -9600,10 +9600,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x7, .partySize = 2, - .party = gTrainerParty_JohnAndJay5 + .party = {.NoItemCustomMoves = gTrainerParty_JohnAndJay5 } }, - [OPPONENT_RELI_AND_IAN] = + [TRAINER_RELI_AND_IAN] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9614,10 +9614,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_ReliAndIan + .party = {.NoItemDefaultMoves = gTrainerParty_ReliAndIan } }, - [OPPONENT_RITA_AND_SAM_1] = + [TRAINER_RITA_AND_SAM_1] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9628,10 +9628,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_RitaAndSam1 + .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam1 } }, - [OPPONENT_RITA_AND_SAM_2] = + [TRAINER_RITA_AND_SAM_2] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9642,10 +9642,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_RitaAndSam2 + .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam2 } }, - [OPPONENT_RITA_AND_SAM_3] = + [TRAINER_RITA_AND_SAM_3] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9656,10 +9656,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_RitaAndSam3 + .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam3 } }, - [OPPONENT_RITA_AND_SAM_4] = + [TRAINER_RITA_AND_SAM_4] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9670,10 +9670,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_RitaAndSam4 + .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam4 } }, - [OPPONENT_RITA_AND_SAM_5] = + [TRAINER_RITA_AND_SAM_5] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9684,10 +9684,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_RitaAndSam5 + .party = {.NoItemDefaultMoves = gTrainerParty_RitaAndSam5 } }, - [OPPONENT_LISA_AND_RAY] = + [TRAINER_LISA_AND_RAY] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_SIS_AND_BRO, @@ -9698,10 +9698,10 @@ const struct Trainer gTrainers[] = { .doubleBattle = TRUE, .aiFlags = 0x1, .partySize = 2, - .party = gTrainerParty_LisaAndRay + .party = {.NoItemDefaultMoves = gTrainerParty_LisaAndRay } }, - [OPPONENT_EUGENE] = + [TRAINER_EUGENE] = { .partyFlags = 0, .trainerClass = TRAINER_CLASS_FISHERMAN, @@ -9712,6 +9712,6 @@ const struct Trainer gTrainers[] = { .doubleBattle = FALSE, .aiFlags = 0x1, .partySize = 4, - .party = gTrainerParty_Eugene + .party = {.NoItemDefaultMoves = gTrainerParty_Eugene } }, }; diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c index c5f6fc0ec..6b30fe5fe 100644 --- a/src/debug/taya_debug_window.c +++ b/src/debug/taya_debug_window.c @@ -707,19 +707,19 @@ bool8 TayaDebugMenu_Trainer(void) for (i = 0; i < ARRAY_COUNT(gTrainerEyeTrainers); i++) SetTrainerFlag(gTrainerEyeTrainers[i].opponentIDs[0]); - SetTrainerFlag(OPPONENT_ROXANNE); - SetTrainerFlag(OPPONENT_BRAWLY); - SetTrainerFlag(OPPONENT_WATTSON); - SetTrainerFlag(OPPONENT_FLANNERY); - SetTrainerFlag(OPPONENT_NORMAN); - SetTrainerFlag(OPPONENT_WINONA); - SetTrainerFlag(OPPONENT_TATE_AND_LIZA); - SetTrainerFlag(OPPONENT_WALLACE); - SetTrainerFlag(OPPONENT_SIDNEY); - SetTrainerFlag(OPPONENT_PHOEBE); - SetTrainerFlag(OPPONENT_GLACIA); - SetTrainerFlag(OPPONENT_DRAKE); - SetTrainerFlag(OPPONENT_STEVEN); + SetTrainerFlag(TRAINER_ROXANNE); + SetTrainerFlag(TRAINER_BRAWLY); + SetTrainerFlag(TRAINER_WATTSON); + SetTrainerFlag(TRAINER_FLANNERY); + SetTrainerFlag(TRAINER_NORMAN); + SetTrainerFlag(TRAINER_WINONA); + SetTrainerFlag(TRAINER_TATE_AND_LIZA); + SetTrainerFlag(TRAINER_WALLACE); + SetTrainerFlag(TRAINER_SIDNEY); + SetTrainerFlag(TRAINER_PHOEBE); + SetTrainerFlag(TRAINER_GLACIA); + SetTrainerFlag(TRAINER_DRAKE); + SetTrainerFlag(TRAINER_STEVEN); CloseMenu(); return TRUE; } diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 580ec6886..6dc55ef28 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -7,6 +7,7 @@ #include "constants/items.h" #include "main.h" #include "menu.h" +#include "name_string_util.h" #include "naming_screen.h" #include "overworld.h" #include "palette.h" @@ -310,88 +311,29 @@ void ScriptHatchMon(void) AddHatchedMonToParty(gSpecialVar_0x8004); } -#ifdef NONMATCHING -static bool8 sub_8042ABC(void* a, u8 b) +static bool8 DaycareMonReceivedMail_(struct DayCare *daycare, u8 slot) { + u8 monNickname[32]; + GetBoxMonNick(&daycare->mons[slot], monNickname); + if (daycare->misc.mail[slot].message.itemId != ITEM_NONE) + { + if (StringCompareWithoutExtCtrlCodes(monNickname, daycare->misc.mail[slot].names + 8) + || StringCompareWithoutExtCtrlCodes(gSaveBlock2.playerName, daycare->misc.mail[slot].names)) + { + StringCopy(gStringVar1, monNickname); + StringCopy(gStringVar2, daycare->misc.mail[slot].names); + StringCopy(gStringVar3, daycare->misc.mail[slot].names + 8); + SanitizeNameString(gStringVar2); + return TRUE; + } + } + return FALSE; } -#else -NAKED -static bool8 sub_8042ABC(void* a, u8 b) -{ - asm(".syntax unified\n\ - push {r4-r6,lr}\n\ - sub sp, 0x20\n\ - adds r5, r0, 0\n\ - lsls r4, r1, 24\n\ - lsrs r4, 24\n\ - lsls r0, r4, 2\n\ - adds r0, r4\n\ - lsls r0, 4\n\ - adds r0, r5, r0\n\ - mov r1, sp\n\ - bl GetBoxMonNick\n\ - lsls r0, r4, 3\n\ - subs r0, r4\n\ - lsls r1, r0, 3\n\ - adds r0, r5, r1\n\ - adds r0, 0xC0\n\ - ldrh r0, [r0]\n\ - cmp r0, 0\n\ - beq _08042B40\n\ - adds r0, r1, 0\n\ - adds r0, 0xA0\n\ - adds r5, r0\n\ - adds r6, r5, 0\n\ - adds r6, 0x2C\n\ - mov r0, sp\n\ - adds r1, r6, 0\n\ - bl StringCompareWithoutExtCtrlCodes\n\ - cmp r0, 0\n\ - bne _08042B08\n\ - ldr r0, _08042B30 @ =gSaveBlock2\n\ - adds r1, r5, 0\n\ - adds r1, 0x24\n\ - bl StringCompareWithoutExtCtrlCodes\n\ - cmp r0, 0\n\ - beq _08042B40\n\ -_08042B08:\n\ - ldr r0, _08042B34 @ =gStringVar1\n\ - mov r1, sp\n\ - bl StringCopy\n\ - ldr r4, _08042B38 @ =gStringVar2\n\ - adds r1, r5, 0\n\ - adds r1, 0x24\n\ - adds r0, r4, 0\n\ - bl StringCopy\n\ - ldr r0, _08042B3C @ =gStringVar3\n\ - adds r1, r6, 0\n\ - bl StringCopy\n\ - adds r0, r4, 0\n\ - bl SanitizeNameString\n\ - movs r0, 0x1\n\ - b _08042B42\n\ - .align 2, 0\n\ -_08042B30: .4byte gSaveBlock2\n\ -_08042B34: .4byte gStringVar1\n\ -_08042B38: .4byte gStringVar2\n\ -_08042B3C: .4byte gStringVar3\n\ -_08042B40:\n\ - movs r0, 0\n\ -_08042B42:\n\ - add sp, 0x20\n\ - pop {r4-r6}\n\ - pop {r1}\n\ - bx r1\n\ - .syntax divided"); -} - -#endif // NONMATCHING - -bool8 sub_8042B4C(void) +bool8 DaycareMonReceivedMail(void) { - return sub_8042ABC(&gSaveBlock1.daycare, gSpecialVar_0x8004); + return DaycareMonReceivedMail_(&gSaveBlock1.daycare, gSpecialVar_0x8004); } static u8 EggHatchCreateMonSprite(u8 a0, u8 switchID, u8 pokeID) diff --git a/src/item_menu.c b/src/item_menu.c index 71516c0a4..12d02ebd8 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -538,7 +538,7 @@ static bool8 LoadBagGraphicsMultistep(void) ewramBagSetupStep++; break; case 1: - CpuCopy16(gUnknown_08E77004, gBGTilemapBuffers[2], 0x800); + CpuCopy16(gBagScreen_Tilemap, gBGTilemapBuffers[2], 0x800); ewramBagSetupStep++; break; case 2: @@ -742,7 +742,7 @@ static void sub_80A37F8(u8 taskId) static void sub_80A3954(u16 *a) { - CpuCopy16(gUnknown_08E77004, a, 0x800); + CpuCopy16(gBagScreen_Tilemap, a, 0x800); } static void sub_80A396C(u16 *a, u8 b, u8 c, u8 d) @@ -762,7 +762,7 @@ static void sub_80A39B8(u16 *a, u8 b) { u8 var = b * 2; - sub_809D104(a, 4, 10, gUnknown_08E96EC8, 0, var, 8, 2); + sub_809D104(a, 4, 10, gBagScreenLabels_Tilemap, 0, var, 8, 2); } static void sub_80A39E4(u16 *a, u8 b, u8 c, s8 d) @@ -776,8 +776,8 @@ static void sub_80A39E4(u16 *a, u8 b, u8 c, s8 d) if (b == 5) r7 = 2; - sub_809D104(a, 4, 10, gUnknown_08E96EC8, 8 - c, r2, c, 2); - sub_809D104(a, c + 4, 10, gUnknown_08E96EC8, 0, r7, 8 - c, 2); + sub_809D104(a, 4, 10, gBagScreenLabels_Tilemap, 8 - c, r2, c, 2); + sub_809D104(a, c + 4, 10, gBagScreenLabels_Tilemap, 0, r7, 8 - c, 2); } else if (d == 1) { @@ -785,8 +785,8 @@ static void sub_80A39E4(u16 *a, u8 b, u8 c, s8 d) if (b == 1) r7 = 10; - sub_809D104(a, 4, 10, gUnknown_08E96EC8, c, r7, 8 - c, 2); - sub_809D104(a, 12 - c, 10, gUnknown_08E96EC8, 0, r2, c, 2); + sub_809D104(a, 4, 10, gBagScreenLabels_Tilemap, c, r7, 8 - c, 2); + sub_809D104(a, 12 - c, 10, gBagScreenLabels_Tilemap, 0, r2, c, 2); } } @@ -4024,7 +4024,7 @@ static int sub_80A7988(void) } static const u16 gPalette_83C170C[] = INCBIN_U16("graphics/unknown/83C170C.gbapal"); -static const u8 gSpriteImage_83C172C[] = INCBIN_U8("graphics/unknown_sprites/83C172C.4bpp"); +static const u8 gSpriteImage_BagSpinner[] = INCBIN_U8("graphics/interface/bag_spinner.4bpp"); const u8 gSpriteImage_UnusedCherry[] = INCBIN_U8("graphics/unused/cherry.4bpp"); const u16 gSpritePalette_UnusedCherry[] = INCBIN_U16("graphics/unused/cherry.gbapal"); @@ -4258,7 +4258,7 @@ static const union AffineAnimCmd *const gSpriteAffineAnimTable_83C1D20[] = static const struct SpriteFrameImage gSpriteImageTable_83C1D28[] = { - {gSpriteImage_83C172C, sizeof(gSpriteImage_83C172C)}, + {gSpriteImage_BagSpinner, sizeof(gSpriteImage_BagSpinner)}, }; static const struct SpritePalette sPokeballSpritePalette = {gPalette_83C170C, 8}; diff --git a/src/pokemon_1.c b/src/pokemon_1.c index 4f5094024..1883c8754 100644 --- a/src/pokemon_1.c +++ b/src/pokemon_1.c @@ -24,9 +24,1253 @@ struct Pokemon gPlayerParty[6]; u8 gEnemyPartyCount; struct Pokemon gEnemyParty[6]; -const u16 gSpeciesToHoennPokedexNum[] = {203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 156, 157, 112, 113, 227, 228, 229, 230, 231, 232, 233, 234, 153, 154, 138, 139, 63, 64, 88, 89, 90, 235, 236, 237, 238, 239, 240, 241, 242, 158, 159, 243, 244, 245, 246, 247, 248, 249, 39, 40, 41, 73, 74, 75, 250, 251, 252, 66, 67, 57, 58, 59, 253, 254, 255, 256, 82, 83, 257, 92, 93, 258, 259, 106, 107, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 84, 85, 270, 271, 272, 273, 274, 275, 276, 108, 109, 169, 170, 277, 278, 279, 184, 185, 50, 51, 143, 144, 280, 281, 282, 283, 284, 167, 285, 52, 53, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 65, 181, 182, 155, 324, 137, 325, 326, 162, 163, 327, 328, 329, 91, 55, 56, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 161, 164, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 168, 357, 358, 359, 103, 104, 360, 361, 180, 362, 363, 364, 365, 115, 366, 367, 186, 165, 166, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 42, 43, 44, 25, 26, 34, 35, 114, 27, 28, 32, 33, 99, 100, 61, 62, 145, 131, 132, 60, 105, 68, 127, 128, 183, 129, 130, 140, 141, 97, 98, 116, 117, 118, 48, 49, 78, 79, 101, 102, 173, 174, 175, 119, 120, 171, 172, 125, 126, 54, 110, 111, 80, 81, 69, 76, 77, 121, 122, 160, 148, 149, 94, 36, 37, 38, 95, 96, 150, 45, 46, 47, 176, 177, 178, 152, 146, 147, 124, 123, 179, 70, 71, 72, 142, 86, 87, 133, 134, 135, 136, 29, 30, 31, 187, 188, 189, 190, 191, 192, 193, 194, 195, 198, 199, 200, 196, 197, 201, 202, 151}; -const u16 gSpeciesToNationalPokedexNum[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 290, 291, 292, 276, 277, 285, 286, 327, 278, 279, 283, 284, 320, 321, 300, 301, 352, 343, 344, 299, 324, 302, 339, 340, 370, 341, 342, 349, 350, 318, 319, 328, 329, 330, 296, 297, 309, 310, 322, 323, 363, 364, 365, 331, 332, 361, 362, 337, 338, 298, 325, 326, 311, 312, 303, 307, 308, 333, 334, 360, 355, 356, 315, 287, 288, 289, 316, 317, 357, 293, 294, 295, 366, 367, 368, 359, 353, 354, 336, 335, 369, 304, 305, 306, 351, 313, 314, 345, 346, 347, 348, 280, 281, 282, 371, 372, 373, 374, 375, 376, 377, 378, 379, 382, 383, 384, 380, 381, 385, 386, 358}; -const u16 gHoennToNationalOrder[] = {252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 63, 64, 65, 290, 291, 292, 293, 294, 295, 296, 297, 118, 119, 129, 130, 298, 183, 184, 74, 75, 76, 299, 300, 301, 41, 42, 169, 72, 73, 302, 303, 304, 305, 306, 66, 67, 68, 307, 308, 309, 310, 311, 312, 81, 82, 100, 101, 313, 314, 43, 44, 45, 182, 84, 85, 315, 316, 317, 318, 319, 320, 321, 322, 323, 218, 219, 324, 88, 89, 109, 110, 325, 326, 27, 28, 327, 227, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 174, 39, 40, 349, 350, 351, 120, 121, 352, 353, 354, 355, 356, 357, 358, 359, 37, 38, 172, 25, 26, 54, 55, 360, 202, 177, 178, 203, 231, 232, 127, 214, 111, 112, 361, 362, 363, 364, 365, 366, 367, 368, 369, 222, 170, 171, 370, 116, 117, 230, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, 385, 386, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 29, 30, 31, 32, 33, 34, 35, 36, 46, 47, 48, 49, 50, 51, 52, 53, 56, 57, 58, 59, 60, 61, 62, 69, 70, 71, 77, 78, 79, 80, 83, 86, 87, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 102, 103, 104, 105, 106, 107, 108, 113, 114, 115, 122, 123, 124, 125, 126, 128, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 173, 175, 176, 179, 180, 181, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 215, 216, 217, 220, 221, 223, 224, 225, 226, 228, 229, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411}; +const u16 gSpeciesToHoennPokedexNum[] = // Assigns all species to the Hoenn Dex Index (Summary No. for Hoenn Dex) +{ + // SPECIES_NONE + HOENN_DEX_BULBASAUR, // SPECIES_BULBASAUR + HOENN_DEX_IVYSAUR, // SPECIES_IVYSAUR + HOENN_DEX_VENUSAUR, // SPECIES_VENUSAUR + HOENN_DEX_CHARMANDER, // SPECIES_CHARMANDER + HOENN_DEX_CHARMELEON, // SPECIES_CHARMELEON + HOENN_DEX_CHARIZARD, // SPECIES_CHARIZARD + HOENN_DEX_SQUIRTLE, // SPECIES_SQUIRTLE + HOENN_DEX_WARTORTLE, // SPECIES_WARTORTLE + HOENN_DEX_BLASTOISE, // SPECIES_BLASTOISE + HOENN_DEX_CATERPIE, // SPECIES_CATERPIE + HOENN_DEX_METAPOD, // SPECIES_METAPOD + HOENN_DEX_BUTTERFREE, // SPECIES_BUTTERFREE + HOENN_DEX_WEEDLE, // SPECIES_WEEDLE + HOENN_DEX_KAKUNA, // SPECIES_KAKUNA + HOENN_DEX_BEEDRILL, // SPECIES_BEEDRILL + HOENN_DEX_PIDGEY, // SPECIES_PIDGEY + HOENN_DEX_PIDGEOTTO, // SPECIES_PIDGEOTTO + HOENN_DEX_PIDGEOT, // SPECIES_PIDGEOT + HOENN_DEX_RATTATA, // SPECIES_RATTATA + HOENN_DEX_RATICATE, // SPECIES_RATICATE + HOENN_DEX_SPEAROW, // SPECIES_SPEAROW + HOENN_DEX_FEAROW, // SPECIES_FEAROW + HOENN_DEX_EKANS, // SPECIES_EKANS + HOENN_DEX_ARBOK, // SPECIES_ARBOK + HOENN_DEX_PIKACHU, // SPECIES_PIKACHU + HOENN_DEX_RAICHU, // SPECIES_RAICHU + HOENN_DEX_SANDSHREW, // SPECIES_SANDSHREW + HOENN_DEX_SANDSLASH, // SPECIES_SANDSLASH + HOENN_DEX_NIDORAN_F, // SPECIES_NIDORAN_F + HOENN_DEX_NIDORINA, // SPECIES_NIDORINA + HOENN_DEX_NIDOQUEEN, // SPECIES_NIDOQUEEN + HOENN_DEX_NIDORAN_M, // SPECIES_NIDORAN_M + HOENN_DEX_NIDORINO, // SPECIES_NIDORINO + HOENN_DEX_NIDOKING, // SPECIES_NIDOKING + HOENN_DEX_CLEFAIRY, // SPECIES_CLEFAIRY + HOENN_DEX_CLEFABLE, // SPECIES_CLEFABLE + HOENN_DEX_VULPIX, // SPECIES_VULPIX + HOENN_DEX_NINETALES, // SPECIES_NINETALES + HOENN_DEX_JIGGLYPUFF, // SPECIES_JIGGLYPUFF + HOENN_DEX_WIGGLYTUFF, // SPECIES_WIGGLYTUFF + HOENN_DEX_ZUBAT, // SPECIES_ZUBAT + HOENN_DEX_GOLBAT, // SPECIES_GOLBAT + HOENN_DEX_ODDISH, // SPECIES_ODDISH + HOENN_DEX_GLOOM, // SPECIES_GLOOM + HOENN_DEX_VILEPLUME, // SPECIES_VILEPLUME + HOENN_DEX_PARAS, // SPECIES_PARAS + HOENN_DEX_PARASECT, // SPECIES_PARASECT + HOENN_DEX_VENONAT, // SPECIES_VENONAT + HOENN_DEX_VENOMOTH, // SPECIES_VENOMOTH + HOENN_DEX_DIGLETT, // SPECIES_DIGLETT + HOENN_DEX_DUGTRIO, // SPECIES_DUGTRIO + HOENN_DEX_MEOWTH, // SPECIES_MEOWTH + HOENN_DEX_PERSIAN, // SPECIES_PERSIAN + HOENN_DEX_PSYDUCK, // SPECIES_PSYDUCK + HOENN_DEX_GOLDUCK, // SPECIES_GOLDUCK + HOENN_DEX_MANKEY, // SPECIES_MANKEY + HOENN_DEX_PRIMEAPE, // SPECIES_PRIMEAPE + HOENN_DEX_GROWLITHE, // SPECIES_GROWLITHE + HOENN_DEX_ARCANINE, // SPECIES_ARCANINE + HOENN_DEX_POLIWAG, // SPECIES_POLIWAG + HOENN_DEX_POLIWHIRL, // SPECIES_POLIWHIRL + HOENN_DEX_POLIWRATH, // SPECIES_POLIWRATH + HOENN_DEX_ABRA, // SPECIES_ABRA + HOENN_DEX_KADABRA, // SPECIES_KADABRA + HOENN_DEX_ALAKAZAM, // SPECIES_ALAKAZAM + HOENN_DEX_MACHOP, // SPECIES_MACHOP + HOENN_DEX_MACHOKE, // SPECIES_MACHOKE + HOENN_DEX_MACHAMP, // SPECIES_MACHAMP + HOENN_DEX_BELLSPROUT, // SPECIES_BELLSPROUT + HOENN_DEX_WEEPINBELL, // SPECIES_WEEPINBELL + HOENN_DEX_VICTREEBEL, // SPECIES_VICTREEBEL + HOENN_DEX_TENTACOOL, // SPECIES_TENTACOOL + HOENN_DEX_TENTACRUEL, // SPECIES_TENTACRUEL + HOENN_DEX_GEODUDE, // SPECIES_GEODUDE + HOENN_DEX_GRAVELER, // SPECIES_GRAVELER + HOENN_DEX_GOLEM, // SPECIES_GOLEM + HOENN_DEX_PONYTA, // SPECIES_PONYTA + HOENN_DEX_RAPIDASH, // SPECIES_RAPIDASH + HOENN_DEX_SLOWPOKE, // SPECIES_SLOWPOKE + HOENN_DEX_SLOWBRO, // SPECIES_SLOWBRO + HOENN_DEX_MAGNEMITE, // SPECIES_MAGNEMITE + HOENN_DEX_MAGNETON, // SPECIES_MAGNETON + HOENN_DEX_FARFETCHD, // SPECIES_FARFETCHD + HOENN_DEX_DODUO, // SPECIES_DODUO + HOENN_DEX_DODRIO, // SPECIES_DODRIO + HOENN_DEX_SEEL, // SPECIES_SEEL + HOENN_DEX_DEWGONG, // SPECIES_DEWGONG + HOENN_DEX_GRIMER, // SPECIES_GRIMER + HOENN_DEX_MUK, // SPECIES_MUK + HOENN_DEX_SHELLDER, // SPECIES_SHELLDER + HOENN_DEX_CLOYSTER, // SPECIES_CLOYSTER + HOENN_DEX_GASTLY, // SPECIES_GASTLY + HOENN_DEX_HAUNTER, // SPECIES_HAUNTER + HOENN_DEX_GENGAR, // SPECIES_GENGAR + HOENN_DEX_ONIX, // SPECIES_ONIX + HOENN_DEX_DROWZEE, // SPECIES_DROWZEE + HOENN_DEX_HYPNO, // SPECIES_HYPNO + HOENN_DEX_KRABBY, // SPECIES_KRABBY + HOENN_DEX_KINGLER, // SPECIES_KINGLER + HOENN_DEX_VOLTORB, // SPECIES_VOLTORB + HOENN_DEX_ELECTRODE, // SPECIES_ELECTRODE + HOENN_DEX_EXEGGCUTE, // SPECIES_EXEGGCUTE + HOENN_DEX_EXEGGUTOR, // SPECIES_EXEGGUTOR + HOENN_DEX_CUBONE, // SPECIES_CUBONE + HOENN_DEX_MAROWAK, // SPECIES_MAROWAK + HOENN_DEX_HITMONLEE, // SPECIES_HITMONLEE + HOENN_DEX_HITMONCHAN, // SPECIES_HITMONCHAN + HOENN_DEX_LICKITUNG, // SPECIES_LICKITUNG + HOENN_DEX_KOFFING, // SPECIES_KOFFING + HOENN_DEX_WEEZING, // SPECIES_WEEZING + HOENN_DEX_RHYHORN, // SPECIES_RHYHORN + HOENN_DEX_RHYDON, // SPECIES_RHYDON + HOENN_DEX_CHANSEY, // SPECIES_CHANSEY + HOENN_DEX_TANGELA, // SPECIES_TANGELA + HOENN_DEX_KANGASKHAN, // SPECIES_KANGASKHAN + HOENN_DEX_HORSEA, // SPECIES_HORSEA + HOENN_DEX_SEADRA, // SPECIES_SEADRA + HOENN_DEX_GOLDEEN, // SPECIES_GOLDEEN + HOENN_DEX_SEAKING, // SPECIES_SEAKING + HOENN_DEX_STARYU, // SPECIES_STARYU + HOENN_DEX_STARMIE, // SPECIES_STARMIE + HOENN_DEX_MR_MIME, // SPECIES_MR_MIME + HOENN_DEX_SCYTHER, // SPECIES_SCYTHER + HOENN_DEX_JYNX, // SPECIES_JYNX + HOENN_DEX_ELECTABUZZ, // SPECIES_ELECTABUZZ + HOENN_DEX_MAGMAR, // SPECIES_MAGMAR + HOENN_DEX_PINSIR, // SPECIES_PINSIR + HOENN_DEX_TAUROS, // SPECIES_TAUROS + HOENN_DEX_MAGIKARP, // SPECIES_MAGIKARP + HOENN_DEX_GYARADOS, // SPECIES_GYARADOS + HOENN_DEX_LAPRAS, // SPECIES_LAPRAS + HOENN_DEX_DITTO, // SPECIES_DITTO + HOENN_DEX_EEVEE, // SPECIES_EEVEE + HOENN_DEX_VAPOREON, // SPECIES_VAPOREON + HOENN_DEX_JOLTEON, // SPECIES_JOLTEON + HOENN_DEX_FLAREON, // SPECIES_FLAREON + HOENN_DEX_PORYGON, // SPECIES_PORYGON + HOENN_DEX_OMANYTE, // SPECIES_OMANYTE + HOENN_DEX_OMASTAR, // SPECIES_OMASTAR + HOENN_DEX_KABUTO, // SPECIES_KABUTO + HOENN_DEX_KABUTOPS, // SPECIES_KABUTOPS + HOENN_DEX_AERODACTYL, // SPECIES_AERODACTYL + HOENN_DEX_SNORLAX, // SPECIES_SNORLAX + HOENN_DEX_ARTICUNO, // SPECIES_ARTICUNO + HOENN_DEX_ZAPDOS, // SPECIES_ZAPDOS + HOENN_DEX_MOLTRES, // SPECIES_MOLTRES + HOENN_DEX_DRATINI, // SPECIES_DRATINI + HOENN_DEX_DRAGONAIR, // SPECIES_DRAGONAIR + HOENN_DEX_DRAGONITE, // SPECIES_DRAGONITE + HOENN_DEX_MEWTWO, // SPECIES_MEWTWO + HOENN_DEX_MEW, // SPECIES_MEW + HOENN_DEX_CHIKORITA, // SPECIES_CHIKORITA + HOENN_DEX_BAYLEEF, // SPECIES_BAYLEEF + HOENN_DEX_MEGANIUM, // SPECIES_MEGANIUM + HOENN_DEX_CYNDAQUIL, // SPECIES_CYNDAQUIL + HOENN_DEX_QUILAVA, // SPECIES_QUILAVA + HOENN_DEX_TYPHLOSION, // SPECIES_TYPHLOSION + HOENN_DEX_TOTODILE, // SPECIES_TOTODILE + HOENN_DEX_CROCONAW, // SPECIES_CROCONAW + HOENN_DEX_FERALIGATR, // SPECIES_FERALIGATR + HOENN_DEX_SENTRET, // SPECIES_SENTRET + HOENN_DEX_FURRET, // SPECIES_FURRET + HOENN_DEX_HOOTHOOT, // SPECIES_HOOTHOOT + HOENN_DEX_NOCTOWL, // SPECIES_NOCTOWL + HOENN_DEX_LEDYBA, // SPECIES_LEDYBA + HOENN_DEX_LEDIAN, // SPECIES_LEDIAN + HOENN_DEX_SPINARAK, // SPECIES_SPINARAK + HOENN_DEX_ARIADOS, // SPECIES_ARIADOS + HOENN_DEX_CROBAT, // SPECIES_CROBAT + HOENN_DEX_CHINCHOU, // SPECIES_CHINCHOU + HOENN_DEX_LANTURN, // SPECIES_LANTURN + HOENN_DEX_PICHU, // SPECIES_PICHU + HOENN_DEX_CLEFFA, // SPECIES_CLEFFA + HOENN_DEX_IGGLYBUFF, // SPECIES_IGGLYBUFF + HOENN_DEX_TOGEPI, // SPECIES_TOGEPI + HOENN_DEX_TOGETIC, // SPECIES_TOGETIC + HOENN_DEX_NATU, // SPECIES_NATU + HOENN_DEX_XATU, // SPECIES_XATU + HOENN_DEX_MAREEP, // SPECIES_MAREEP + HOENN_DEX_FLAAFFY, // SPECIES_FLAAFFY + HOENN_DEX_AMPHAROS, // SPECIES_AMPHAROS + HOENN_DEX_BELLOSSOM, // SPECIES_BELLOSSOM + HOENN_DEX_MARILL, // SPECIES_MARILL + HOENN_DEX_AZUMARILL, // SPECIES_AZUMARILL + HOENN_DEX_SUDOWOODO, // SPECIES_SUDOWOODO + HOENN_DEX_POLITOED, // SPECIES_POLITOED + HOENN_DEX_HOPPIP, // SPECIES_HOPPIP + HOENN_DEX_SKIPLOOM, // SPECIES_SKIPLOOM + HOENN_DEX_JUMPLUFF, // SPECIES_JUMPLUFF + HOENN_DEX_AIPOM, // SPECIES_AIPOM + HOENN_DEX_SUNKERN, // SPECIES_SUNKERN + HOENN_DEX_SUNFLORA, // SPECIES_SUNFLORA + HOENN_DEX_YANMA, // SPECIES_YANMA + HOENN_DEX_WOOPER, // SPECIES_WOOPER + HOENN_DEX_QUAGSIRE, // SPECIES_QUAGSIRE + HOENN_DEX_ESPEON, // SPECIES_ESPEON + HOENN_DEX_UMBREON, // SPECIES_UMBREON + HOENN_DEX_MURKROW, // SPECIES_MURKROW + HOENN_DEX_SLOWKING, // SPECIES_SLOWKING + HOENN_DEX_MISDREAVUS, // SPECIES_MISDREAVUS + HOENN_DEX_UNOWN, // SPECIES_UNOWN + HOENN_DEX_WOBBUFFET, // SPECIES_WOBBUFFET + HOENN_DEX_GIRAFARIG, // SPECIES_GIRAFARIG + HOENN_DEX_PINECO, // SPECIES_PINECO + HOENN_DEX_FORRETRESS, // SPECIES_FORRETRESS + HOENN_DEX_DUNSPARCE, // SPECIES_DUNSPARCE + HOENN_DEX_GLIGAR, // SPECIES_GLIGAR + HOENN_DEX_STEELIX, // SPECIES_STEELIX + HOENN_DEX_SNUBBULL, // SPECIES_SNUBBULL + HOENN_DEX_GRANBULL, // SPECIES_GRANBULL + HOENN_DEX_QWILFISH, // SPECIES_QWILFISH + HOENN_DEX_SCIZOR, // SPECIES_SCIZOR + HOENN_DEX_SHUCKLE, // SPECIES_SHUCKLE + HOENN_DEX_HERACROSS, // SPECIES_HERACROSS + HOENN_DEX_SNEASEL, // SPECIES_SNEASEL + HOENN_DEX_TEDDIURSA, // SPECIES_TEDDIURSA + HOENN_DEX_URSARING, // SPECIES_URSARING + HOENN_DEX_SLUGMA, // SPECIES_SLUGMA + HOENN_DEX_MAGCARGO, // SPECIES_MAGCARGO + HOENN_DEX_SWINUB, // SPECIES_SWINUB + HOENN_DEX_PILOSWINE, // SPECIES_PILOSWINE + HOENN_DEX_CORSOLA, // SPECIES_CORSOLA + HOENN_DEX_REMORAID, // SPECIES_REMORAID + HOENN_DEX_OCTILLERY, // SPECIES_OCTILLERY + HOENN_DEX_DELIBIRD, // SPECIES_DELIBIRD + HOENN_DEX_MANTINE, // SPECIES_MANTINE + HOENN_DEX_SKARMORY, // SPECIES_SKARMORY + HOENN_DEX_HOUNDOUR, // SPECIES_HOUNDOUR + HOENN_DEX_HOUNDOOM, // SPECIES_HOUNDOOM + HOENN_DEX_KINGDRA, // SPECIES_KINGDRA + HOENN_DEX_PHANPY, // SPECIES_PHANPY + HOENN_DEX_DONPHAN, // SPECIES_DONPHAN + HOENN_DEX_PORYGON2, // SPECIES_PORYGON2 + HOENN_DEX_STANTLER, // SPECIES_STANTLER + HOENN_DEX_SMEARGLE, // SPECIES_SMEARGLE + HOENN_DEX_TYROGUE, // SPECIES_TYROGUE + HOENN_DEX_HITMONTOP, // SPECIES_HITMONTOP + HOENN_DEX_SMOOCHUM, // SPECIES_SMOOCHUM + HOENN_DEX_ELEKID, // SPECIES_ELEKID + HOENN_DEX_MAGBY, // SPECIES_MAGBY + HOENN_DEX_MILTANK, // SPECIES_MILTANK + HOENN_DEX_BLISSEY, // SPECIES_BLISSEY + HOENN_DEX_RAIKOU, // SPECIES_RAIKOU + HOENN_DEX_ENTEI, // SPECIES_ENTEI + HOENN_DEX_SUICUNE, // SPECIES_SUICUNE + HOENN_DEX_LARVITAR, // SPECIES_LARVITAR + HOENN_DEX_PUPITAR, // SPECIES_PUPITAR + HOENN_DEX_TYRANITAR, // SPECIES_TYRANITAR + HOENN_DEX_LUGIA, // SPECIES_LUGIA + HOENN_DEX_HO_OH, // SPECIES_HO-OH + HOENN_DEX_CELEBI, // SPECIES_CELEBI + HOENN_DEX_OLD_UNOWN_B, // SPECIES_OLD_UNOWN_B + HOENN_DEX_OLD_UNOWN_C, // SPECIES_OLD_UNOWN_C + HOENN_DEX_OLD_UNOWN_D, // SPECIES_OLD_UNOWN_D + HOENN_DEX_OLD_UNOWN_E, // SPECIES_OLD_UNOWN_E + HOENN_DEX_OLD_UNOWN_F, // SPECIES_OLD_UNOWN_F + HOENN_DEX_OLD_UNOWN_G, // SPECIES_OLD_UNOWN_G + HOENN_DEX_OLD_UNOWN_H, // SPECIES_OLD_UNOWN_H + HOENN_DEX_OLD_UNOWN_I, // SPECIES_OLD_UNOWN_I + HOENN_DEX_OLD_UNOWN_J, // SPECIES_OLD_UNOWN_J + HOENN_DEX_OLD_UNOWN_K, // SPECIES_OLD_UNOWN_K + HOENN_DEX_OLD_UNOWN_L, // SPECIES_OLD_UNOWN_L + HOENN_DEX_OLD_UNOWN_M, // SPECIES_OLD_UNOWN_M + HOENN_DEX_OLD_UNOWN_N, // SPECIES_OLD_UNOWN_N + HOENN_DEX_OLD_UNOWN_O, // SPECIES_OLD_UNOWN_O + HOENN_DEX_OLD_UNOWN_P, // SPECIES_OLD_UNOWN_P + HOENN_DEX_OLD_UNOWN_Q, // SPECIES_OLD_UNOWN_Q + HOENN_DEX_OLD_UNOWN_R, // SPECIES_OLD_UNOWN_R + HOENN_DEX_OLD_UNOWN_S, // SPECIES_OLD_UNOWN_S + HOENN_DEX_OLD_UNOWN_T, // SPECIES_OLD_UNOWN_T + HOENN_DEX_OLD_UNOWN_U, // SPECIES_OLD_UNOWN_U + HOENN_DEX_OLD_UNOWN_V, // SPECIES_OLD_UNOWN_V + HOENN_DEX_OLD_UNOWN_W, // SPECIES_OLD_UNOWN_W + HOENN_DEX_OLD_UNOWN_X, // SPECIES_OLD_UNOWN_X + HOENN_DEX_OLD_UNOWN_Y, // SPECIES_OLD_UNOWN_Y + HOENN_DEX_OLD_UNOWN_Z, // SPECIES_OLD_UNOWN_Z + HOENN_DEX_TREECKO, // SPECIES_TREECKO + HOENN_DEX_GROVYLE, // SPECIES_GROVYLE + HOENN_DEX_SCEPTILE, // SPECIES_SCEPTILE + HOENN_DEX_TORCHIC, // SPECIES_TORCHIC + HOENN_DEX_COMBUSKEN, // SPECIES_COMBUSKEN + HOENN_DEX_BLAZIKEN, // SPECIES_BLAZIKEN + HOENN_DEX_MUDKIP, // SPECIES_MUDKIP + HOENN_DEX_MARSHTOMP, // SPECIES_MARSHTOMP + HOENN_DEX_SWAMPERT, // SPECIES_SWAMPERT + HOENN_DEX_POOCHYENA, // SPECIES_POOCHYENA + HOENN_DEX_MIGHTYENA, // SPECIES_MIGHTYENA + HOENN_DEX_ZIGZAGOON, // SPECIES_ZIGZAGOON + HOENN_DEX_LINOONE, // SPECIES_LINOONE + HOENN_DEX_WURMPLE, // SPECIES_WURMPLE + HOENN_DEX_SILCOON, // SPECIES_SILCOON + HOENN_DEX_BEAUTIFLY, // SPECIES_BEAUTIFLY + HOENN_DEX_CASCOON, // SPECIES_CASCOON + HOENN_DEX_DUSTOX, // SPECIES_DUSTOX + HOENN_DEX_LOTAD, // SPECIES_LOTAD + HOENN_DEX_LOMBRE, // SPECIES_LOMBRE + HOENN_DEX_LUDICOLO, // SPECIES_LUDICOLO + HOENN_DEX_SEEDOT, // SPECIES_SEEDOT + HOENN_DEX_NUZLEAF, // SPECIES_NUZLEAF + HOENN_DEX_SHIFTRY, // SPECIES_SHIFTRY + HOENN_DEX_NINCADA, // SPECIES_NINCADA + HOENN_DEX_NINJASK, // SPECIES_NINJASK + HOENN_DEX_SHEDINJA, // SPECIES_SHEDINJA + HOENN_DEX_TAILLOW, // SPECIES_TAILLOW + HOENN_DEX_SWELLOW, // SPECIES_SWELLOW + HOENN_DEX_SHROOMISH, // SPECIES_SHROOMISH + HOENN_DEX_BRELOOM, // SPECIES_BRELOOM + HOENN_DEX_SPINDA, // SPECIES_SPINDA + HOENN_DEX_WINGULL, // SPECIES_WINGULL + HOENN_DEX_PELIPPER, // SPECIES_PELIPPER + HOENN_DEX_SURSKIT, // SPECIES_SURSKIT + HOENN_DEX_MASQUERAIN, // SPECIES_MASQUERAIN + HOENN_DEX_WAILMER, // SPECIES_WAILMER + HOENN_DEX_WAILORD, // SPECIES_WAILORD + HOENN_DEX_SKITTY, // SPECIES_SKITTY + HOENN_DEX_DELCATTY, // SPECIES_DELCATTY + HOENN_DEX_KECLEON, // SPECIES_KECLEON + HOENN_DEX_BALTOY, // SPECIES_BALTOY + HOENN_DEX_CLAYDOL, // SPECIES_CLAYDOL + HOENN_DEX_NOSEPASS, // SPECIES_NOSEPASS + HOENN_DEX_TORKOAL, // SPECIES_TORKOAL + HOENN_DEX_SABLEYE, // SPECIES_SABLEYE + HOENN_DEX_BARBOACH, // SPECIES_BARBOACH + HOENN_DEX_WHISCASH, // SPECIES_WHISCASH + HOENN_DEX_LUVDISC, // SPECIES_LUVDISC + HOENN_DEX_CORPHISH, // SPECIES_CORPHISH + HOENN_DEX_CRAWDAUNT, // SPECIES_CRAWDAUNT + HOENN_DEX_FEEBAS, // SPECIES_FEEBAS + HOENN_DEX_MILOTIC, // SPECIES_MILOTIC + HOENN_DEX_CARVANHA, // SPECIES_CARVANHA + HOENN_DEX_SHARPEDO, // SPECIES_SHARPEDO + HOENN_DEX_TRAPINCH, // SPECIES_TRAPINCH + HOENN_DEX_VIBRAVA, // SPECIES_VIBRAVA + HOENN_DEX_FLYGON, // SPECIES_FLYGON + HOENN_DEX_MAKUHITA, // SPECIES_MAKUHITA + HOENN_DEX_HARIYAMA, // SPECIES_HARIYAMA + HOENN_DEX_ELECTRIKE, // SPECIES_ELECTRIKE + HOENN_DEX_MANECTRIC, // SPECIES_MANECTRIC + HOENN_DEX_NUMEL, // SPECIES_NUMEL + HOENN_DEX_CAMERUPT, // SPECIES_CAMERUPT + HOENN_DEX_SPHEAL, // SPECIES_SPHEAL + HOENN_DEX_SEALEO, // SPECIES_SEALEO + HOENN_DEX_WALREIN, // SPECIES_WALREIN + HOENN_DEX_CACNEA, // SPECIES_CACNEA + HOENN_DEX_CACTURNE, // SPECIES_CACTURNE + HOENN_DEX_SNORUNT, // SPECIES_SNORUNT + HOENN_DEX_GLALIE, // SPECIES_GLALIE + HOENN_DEX_LUNATONE, // SPECIES_LUNATONE + HOENN_DEX_SOLROCK, // SPECIES_SOLROCK + HOENN_DEX_AZURILL, // SPECIES_AZURILL + HOENN_DEX_SPOINK, // SPECIES_SPOINK + HOENN_DEX_GRUMPIG, // SPECIES_GRUMPIG + HOENN_DEX_PLUSLE, // SPECIES_PLUSLE + HOENN_DEX_MINUN, // SPECIES_MINUN + HOENN_DEX_MAWILE, // SPECIES_MAWILE + HOENN_DEX_MEDITITE, // SPECIES_MEDITITE + HOENN_DEX_MEDICHAM, // SPECIES_MEDICHAM + HOENN_DEX_SWABLU, // SPECIES_SWABLU + HOENN_DEX_ALTARIA, // SPECIES_ALTARIA + HOENN_DEX_WYNAUT, // SPECIES_WYNAUT + HOENN_DEX_DUSKULL, // SPECIES_DUSKULL + HOENN_DEX_DUSCLOPS, // SPECIES_DUSCLOPS + HOENN_DEX_ROSELIA, // SPECIES_ROSELIA + HOENN_DEX_SLAKOTH, // SPECIES_SLAKOTH + HOENN_DEX_VIGOROTH, // SPECIES_VIGOROTH + HOENN_DEX_SLAKING, // SPECIES_SLAKING + HOENN_DEX_GULPIN, // SPECIES_GULPIN + HOENN_DEX_SWALOT, // SPECIES_SWALOT + HOENN_DEX_TROPIUS, // SPECIES_TROPIUS + HOENN_DEX_WHISMUR, // SPECIES_WHISMUR + HOENN_DEX_LOUDRED, // SPECIES_LOUDRED + HOENN_DEX_EXPLOUD, // SPECIES_EXPLOUD + HOENN_DEX_CLAMPERL, // SPECIES_CLAMPERL + HOENN_DEX_HUNTAIL, // SPECIES_HUNTAIL + HOENN_DEX_GOREBYSS, // SPECIES_GOREBYSS + HOENN_DEX_ABSOL, // SPECIES_ABSOL + HOENN_DEX_SHUPPET, // SPECIES_SHUPPET + HOENN_DEX_BANETTE, // SPECIES_BANETTE + HOENN_DEX_SEVIPER, // SPECIES_SEVIPER + HOENN_DEX_ZANGOOSE, // SPECIES_ZANGOOSE + HOENN_DEX_RELICANTH, // SPECIES_RELICANTH + HOENN_DEX_ARON, // SPECIES_ARON + HOENN_DEX_LAIRON, // SPECIES_LAIRON + HOENN_DEX_AGGRON, // SPECIES_AGGRON + HOENN_DEX_CASTFORM, // SPECIES_CASTFORM + HOENN_DEX_VOLBEAT, // SPECIES_VOLBEAT + HOENN_DEX_ILLUMISE, // SPECIES_ILLUMISE + HOENN_DEX_LILEEP, // SPECIES_LILEEP + HOENN_DEX_CRADILY, // SPECIES_CRADILY + HOENN_DEX_ANORITH, // SPECIES_ANORITH + HOENN_DEX_ARMALDO, // SPECIES_ARMALDO + HOENN_DEX_RALTS, // SPECIES_RALTS + HOENN_DEX_KIRLIA, // SPECIES_KIRLIA + HOENN_DEX_GARDEVOIR, // SPECIES_GARDEVOIR + HOENN_DEX_BAGON, // SPECIES_BAGON + HOENN_DEX_SHELGON, // SPECIES_SHELGON + HOENN_DEX_SALAMENCE, // SPECIES_SALAMENCE + HOENN_DEX_BELDUM, // SPECIES_BELDUM + HOENN_DEX_METANG, // SPECIES_METANG + HOENN_DEX_METAGROSS, // SPECIES_METAGROSS + HOENN_DEX_REGIROCK, // SPECIES_REGIROCK + HOENN_DEX_REGICE, // SPECIES_REGICE + HOENN_DEX_REGISTEEL, // SPECIES_REGISTEEL + HOENN_DEX_KYOGRE, // SPECIES_KYOGRE + HOENN_DEX_GROUDON, // SPECIES_GROUDON + HOENN_DEX_RAYQUAZA, // SPECIES_RAYQUAZA + HOENN_DEX_LATIAS, // SPECIES_LATIAS + HOENN_DEX_LATIOS, // SPECIES_LATIOS + HOENN_DEX_JIRACHI, // SPECIES_JIRACHI + HOENN_DEX_DEOXYS, // SPECIES_DEOXYS + HOENN_DEX_CHIMECHO // SPECIES_CHIMECHO +}; + +const u16 gSpeciesToNationalPokedexNum[] = // Assigns all species to the National Dex Index (Summary No. for National Dex) +{ + // SPECIES_NONE + NATIONAL_DEX_BULBASAUR, // SPECIES_BULBASAUR + NATIONAL_DEX_IVYSAUR, // SPECIES_IVYSAUR + NATIONAL_DEX_VENUSAUR, // SPECIES_VENUSAUR + NATIONAL_DEX_CHARMANDER, // SPECIES_CHARMANDER + NATIONAL_DEX_CHARMELEON, // SPECIES_CHARMELEON + NATIONAL_DEX_CHARIZARD, // SPECIES_CHARIZARD + NATIONAL_DEX_SQUIRTLE, // SPECIES_SQUIRTLE + NATIONAL_DEX_WARTORTLE, // SPECIES_WARTORTLE + NATIONAL_DEX_BLASTOISE, // SPECIES_BLASTOISE + NATIONAL_DEX_CATERPIE, // SPECIES_CATERPIE + NATIONAL_DEX_METAPOD, // SPECIES_METAPOD + NATIONAL_DEX_BUTTERFREE, // SPECIES_BUTTERFREE + NATIONAL_DEX_WEEDLE, // SPECIES_WEEDLE + NATIONAL_DEX_KAKUNA, // SPECIES_KAKUNA + NATIONAL_DEX_BEEDRILL, // SPECIES_BEEDRILL + NATIONAL_DEX_PIDGEY, // SPECIES_PIDGEY + NATIONAL_DEX_PIDGEOTTO, // SPECIES_PIDGEOTTO + NATIONAL_DEX_PIDGEOT, // SPECIES_PIDGEOT + NATIONAL_DEX_RATTATA, // SPECIES_RATTATA + NATIONAL_DEX_RATICATE, // SPECIES_RATICATE + NATIONAL_DEX_SPEAROW, // SPECIES_SPEAROW + NATIONAL_DEX_FEAROW, // SPECIES_FEAROW + NATIONAL_DEX_EKANS, // SPECIES_EKANS + NATIONAL_DEX_ARBOK, // SPECIES_ARBOK + NATIONAL_DEX_PIKACHU, // SPECIES_PIKACHU + NATIONAL_DEX_RAICHU, // SPECIES_RAICHU + NATIONAL_DEX_SANDSHREW, // SPECIES_SANDSHREW + NATIONAL_DEX_SANDSLASH, // SPECIES_SANDSLASH + NATIONAL_DEX_NIDORAN_F, // SPECIES_NIDORAN_F + NATIONAL_DEX_NIDORINA, // SPECIES_NIDORINA + NATIONAL_DEX_NIDOQUEEN, // SPECIES_NIDOQUEEN + NATIONAL_DEX_NIDORAN_M, // SPECIES_NIDORAN_M + NATIONAL_DEX_NIDORINO, // SPECIES_NIDORINO + NATIONAL_DEX_NIDOKING, // SPECIES_NIDOKING + NATIONAL_DEX_CLEFAIRY, // SPECIES_CLEFAIRY + NATIONAL_DEX_CLEFABLE, // SPECIES_CLEFABLE + NATIONAL_DEX_VULPIX, // SPECIES_VULPIX + NATIONAL_DEX_NINETALES, // SPECIES_NINETALES + NATIONAL_DEX_JIGGLYPUFF, // SPECIES_JIGGLYPUFF + NATIONAL_DEX_WIGGLYTUFF, // SPECIES_WIGGLYTUFF + NATIONAL_DEX_ZUBAT, // SPECIES_ZUBAT + NATIONAL_DEX_GOLBAT, // SPECIES_GOLBAT + NATIONAL_DEX_ODDISH, // SPECIES_ODDISH + NATIONAL_DEX_GLOOM, // SPECIES_GLOOM + NATIONAL_DEX_VILEPLUME, // SPECIES_VILEPLUME + NATIONAL_DEX_PARAS, // SPECIES_PARAS + NATIONAL_DEX_PARASECT, // SPECIES_PARASECT + NATIONAL_DEX_VENONAT, // SPECIES_VENONAT + NATIONAL_DEX_VENOMOTH, // SPECIES_VENOMOTH + NATIONAL_DEX_DIGLETT, // SPECIES_DIGLETT + NATIONAL_DEX_DUGTRIO, // SPECIES_DUGTRIO + NATIONAL_DEX_MEOWTH, // SPECIES_MEOWTH + NATIONAL_DEX_PERSIAN, // SPECIES_PERSIAN + NATIONAL_DEX_PSYDUCK, // SPECIES_PSYDUCK + NATIONAL_DEX_GOLDUCK, // SPECIES_GOLDUCK + NATIONAL_DEX_MANKEY, // SPECIES_MANKEY + NATIONAL_DEX_PRIMEAPE, // SPECIES_PRIMEAPE + NATIONAL_DEX_GROWLITHE, // SPECIES_GROWLITHE + NATIONAL_DEX_ARCANINE, // SPECIES_ARCANINE + NATIONAL_DEX_POLIWAG, // SPECIES_POLIWAG + NATIONAL_DEX_POLIWHIRL, // SPECIES_POLIWHIRL + NATIONAL_DEX_POLIWRATH, // SPECIES_POLIWRATH + NATIONAL_DEX_ABRA, // SPECIES_ABRA + NATIONAL_DEX_KADABRA, // SPECIES_KADABRA + NATIONAL_DEX_ALAKAZAM, // SPECIES_ALAKAZAM + NATIONAL_DEX_MACHOP, // SPECIES_MACHOP + NATIONAL_DEX_MACHOKE, // SPECIES_MACHOKE + NATIONAL_DEX_MACHAMP, // SPECIES_MACHAMP + NATIONAL_DEX_BELLSPROUT, // SPECIES_BELLSPROUT + NATIONAL_DEX_WEEPINBELL, // SPECIES_WEEPINBELL + NATIONAL_DEX_VICTREEBEL, // SPECIES_VICTREEBEL + NATIONAL_DEX_TENTACOOL, // SPECIES_TENTACOOL + NATIONAL_DEX_TENTACRUEL, // SPECIES_TENTACRUEL + NATIONAL_DEX_GEODUDE, // SPECIES_GEODUDE + NATIONAL_DEX_GRAVELER, // SPECIES_GRAVELER + NATIONAL_DEX_GOLEM, // SPECIES_GOLEM + NATIONAL_DEX_PONYTA, // SPECIES_PONYTA + NATIONAL_DEX_RAPIDASH, // SPECIES_RAPIDASH + NATIONAL_DEX_SLOWPOKE, // SPECIES_SLOWPOKE + NATIONAL_DEX_SLOWBRO, // SPECIES_SLOWBRO + NATIONAL_DEX_MAGNEMITE, // SPECIES_MAGNEMITE + NATIONAL_DEX_MAGNETON, // SPECIES_MAGNETON + NATIONAL_DEX_FARFETCHD, // SPECIES_FARFETCHD + NATIONAL_DEX_DODUO, // SPECIES_DODUO + NATIONAL_DEX_DODRIO, // SPECIES_DODRIO + NATIONAL_DEX_SEEL, // SPECIES_SEEL + NATIONAL_DEX_DEWGONG, // SPECIES_DEWGONG + NATIONAL_DEX_GRIMER, // SPECIES_GRIMER + NATIONAL_DEX_MUK, // SPECIES_MUK + NATIONAL_DEX_SHELLDER, // SPECIES_SHELLDER + NATIONAL_DEX_CLOYSTER, // SPECIES_CLOYSTER + NATIONAL_DEX_GASTLY, // SPECIES_GASTLY + NATIONAL_DEX_HAUNTER, // SPECIES_HAUNTER + NATIONAL_DEX_GENGAR, // SPECIES_GENGAR + NATIONAL_DEX_ONIX, // SPECIES_ONIX + NATIONAL_DEX_DROWZEE, // SPECIES_DROWZEE + NATIONAL_DEX_HYPNO, // SPECIES_HYPNO + NATIONAL_DEX_KRABBY, // SPECIES_KRABBY + NATIONAL_DEX_KINGLER, // SPECIES_KINGLER + NATIONAL_DEX_VOLTORB, // SPECIES_VOLTORB + NATIONAL_DEX_ELECTRODE, // SPECIES_ELECTRODE + NATIONAL_DEX_EXEGGCUTE, // SPECIES_EXEGGCUTE + NATIONAL_DEX_EXEGGUTOR, // SPECIES_EXEGGUTOR + NATIONAL_DEX_CUBONE, // SPECIES_CUBONE + NATIONAL_DEX_MAROWAK, // SPECIES_MAROWAK + NATIONAL_DEX_HITMONLEE, // SPECIES_HITMONLEE + NATIONAL_DEX_HITMONCHAN, // SPECIES_HITMONCHAN + NATIONAL_DEX_LICKITUNG, // SPECIES_LICKITUNG + NATIONAL_DEX_KOFFING, // SPECIES_KOFFING + NATIONAL_DEX_WEEZING, // SPECIES_WEEZING + NATIONAL_DEX_RHYHORN, // SPECIES_RHYHORN + NATIONAL_DEX_RHYDON, // SPECIES_RHYDON + NATIONAL_DEX_CHANSEY, // SPECIES_CHANSEY + NATIONAL_DEX_TANGELA, // SPECIES_TANGELA + NATIONAL_DEX_KANGASKHAN, // SPECIES_KANGASKHAN + NATIONAL_DEX_HORSEA, // SPECIES_HORSEA + NATIONAL_DEX_SEADRA, // SPECIES_SEADRA + NATIONAL_DEX_GOLDEEN, // SPECIES_GOLDEEN + NATIONAL_DEX_SEAKING, // SPECIES_SEAKING + NATIONAL_DEX_STARYU, // SPECIES_STARYU + NATIONAL_DEX_STARMIE, // SPECIES_STARMIE + NATIONAL_DEX_MR_MIME, // SPECIES_MR_MIME + NATIONAL_DEX_SCYTHER, // SPECIES_SCYTHER + NATIONAL_DEX_JYNX, // SPECIES_JYNX + NATIONAL_DEX_ELECTABUZZ, // SPECIES_ELECTABUZZ + NATIONAL_DEX_MAGMAR, // SPECIES_MAGMAR + NATIONAL_DEX_PINSIR, // SPECIES_PINSIR + NATIONAL_DEX_TAUROS, // SPECIES_TAUROS + NATIONAL_DEX_MAGIKARP, // SPECIES_MAGIKARP + NATIONAL_DEX_GYARADOS, // SPECIES_GYARADOS + NATIONAL_DEX_LAPRAS, // SPECIES_LAPRAS + NATIONAL_DEX_DITTO, // SPECIES_DITTO + NATIONAL_DEX_EEVEE, // SPECIES_EEVEE + NATIONAL_DEX_VAPOREON, // SPECIES_VAPOREON + NATIONAL_DEX_JOLTEON, // SPECIES_JOLTEON + NATIONAL_DEX_FLAREON, // SPECIES_FLAREON + NATIONAL_DEX_PORYGON, // SPECIES_PORYGON + NATIONAL_DEX_OMANYTE, // SPECIES_OMANYTE + NATIONAL_DEX_OMASTAR, // SPECIES_OMASTAR + NATIONAL_DEX_KABUTO, // SPECIES_KABUTO + NATIONAL_DEX_KABUTOPS, // SPECIES_KABUTOPS + NATIONAL_DEX_AERODACTYL, // SPECIES_AERODACTYL + NATIONAL_DEX_SNORLAX, // SPECIES_SNORLAX + NATIONAL_DEX_ARTICUNO, // SPECIES_ARTICUNO + NATIONAL_DEX_ZAPDOS, // SPECIES_ZAPDOS + NATIONAL_DEX_MOLTRES, // SPECIES_MOLTRES + NATIONAL_DEX_DRATINI, // SPECIES_DRATINI + NATIONAL_DEX_DRAGONAIR, // SPECIES_DRAGONAIR + NATIONAL_DEX_DRAGONITE, // SPECIES_DRAGONITE + NATIONAL_DEX_MEWTWO, // SPECIES_MEWTWO + NATIONAL_DEX_MEW, // SPECIES_MEW + NATIONAL_DEX_CHIKORITA, // SPECIES_CHIKORITA + NATIONAL_DEX_BAYLEEF, // SPECIES_BAYLEEF + NATIONAL_DEX_MEGANIUM, // SPECIES_MEGANIUM + NATIONAL_DEX_CYNDAQUIL, // SPECIES_CYNDAQUIL + NATIONAL_DEX_QUILAVA, // SPECIES_QUILAVA + NATIONAL_DEX_TYPHLOSION, // SPECIES_TYPHLOSION + NATIONAL_DEX_TOTODILE, // SPECIES_TOTODILE + NATIONAL_DEX_CROCONAW, // SPECIES_CROCONAW + NATIONAL_DEX_FERALIGATR, // SPECIES_FERALIGATR + NATIONAL_DEX_SENTRET, // SPECIES_SENTRET + NATIONAL_DEX_FURRET, // SPECIES_FURRET + NATIONAL_DEX_HOOTHOOT, // SPECIES_HOOTHOOT + NATIONAL_DEX_NOCTOWL, // SPECIES_NOCTOWL + NATIONAL_DEX_LEDYBA, // SPECIES_LEDYBA + NATIONAL_DEX_LEDIAN, // SPECIES_LEDIAN + NATIONAL_DEX_SPINARAK, // SPECIES_SPINARAK + NATIONAL_DEX_ARIADOS, // SPECIES_ARIADOS + NATIONAL_DEX_CROBAT, // SPECIES_CROBAT + NATIONAL_DEX_CHINCHOU, // SPECIES_CHINCHOU + NATIONAL_DEX_LANTURN, // SPECIES_LANTURN + NATIONAL_DEX_PICHU, // SPECIES_PICHU + NATIONAL_DEX_CLEFFA, // SPECIES_CLEFFA + NATIONAL_DEX_IGGLYBUFF, // SPECIES_IGGLYBUFF + NATIONAL_DEX_TOGEPI, // SPECIES_TOGEPI + NATIONAL_DEX_TOGETIC, // SPECIES_TOGETIC + NATIONAL_DEX_NATU, // SPECIES_NATU + NATIONAL_DEX_XATU, // SPECIES_XATU + NATIONAL_DEX_MAREEP, // SPECIES_MAREEP + NATIONAL_DEX_FLAAFFY, // SPECIES_FLAAFFY + NATIONAL_DEX_AMPHAROS, // SPECIES_AMPHAROS + NATIONAL_DEX_BELLOSSOM, // SPECIES_BELLOSSOM + NATIONAL_DEX_MARILL, // SPECIES_MARILL + NATIONAL_DEX_AZUMARILL, // SPECIES_AZUMARILL + NATIONAL_DEX_SUDOWOODO, // SPECIES_SUDOWOODO + NATIONAL_DEX_POLITOED, // SPECIES_POLITOED + NATIONAL_DEX_HOPPIP, // SPECIES_HOPPIP + NATIONAL_DEX_SKIPLOOM, // SPECIES_SKIPLOOM + NATIONAL_DEX_JUMPLUFF, // SPECIES_JUMPLUFF + NATIONAL_DEX_AIPOM, // SPECIES_AIPOM + NATIONAL_DEX_SUNKERN, // SPECIES_SUNKERN + NATIONAL_DEX_SUNFLORA, // SPECIES_SUNFLORA + NATIONAL_DEX_YANMA, // SPECIES_YANMA + NATIONAL_DEX_WOOPER, // SPECIES_WOOPER + NATIONAL_DEX_QUAGSIRE, // SPECIES_QUAGSIRE + NATIONAL_DEX_ESPEON, // SPECIES_ESPEON + NATIONAL_DEX_UMBREON, // SPECIES_UMBREON + NATIONAL_DEX_MURKROW, // SPECIES_MURKROW + NATIONAL_DEX_SLOWKING, // SPECIES_SLOWKING + NATIONAL_DEX_MISDREAVUS, // SPECIES_MISDREAVUS + NATIONAL_DEX_UNOWN, // SPECIES_UNOWN + NATIONAL_DEX_WOBBUFFET, // SPECIES_WOBBUFFET + NATIONAL_DEX_GIRAFARIG, // SPECIES_GIRAFARIG + NATIONAL_DEX_PINECO, // SPECIES_PINECO + NATIONAL_DEX_FORRETRESS, // SPECIES_FORRETRESS + NATIONAL_DEX_DUNSPARCE, // SPECIES_DUNSPARCE + NATIONAL_DEX_GLIGAR, // SPECIES_GLIGAR + NATIONAL_DEX_STEELIX, // SPECIES_STEELIX + NATIONAL_DEX_SNUBBULL, // SPECIES_SNUBBULL + NATIONAL_DEX_GRANBULL, // SPECIES_GRANBULL + NATIONAL_DEX_QWILFISH, // SPECIES_QWILFISH + NATIONAL_DEX_SCIZOR, // SPECIES_SCIZOR + NATIONAL_DEX_SHUCKLE, // SPECIES_SHUCKLE + NATIONAL_DEX_HERACROSS, // SPECIES_HERACROSS + NATIONAL_DEX_SNEASEL, // SPECIES_SNEASEL + NATIONAL_DEX_TEDDIURSA, // SPECIES_TEDDIURSA + NATIONAL_DEX_URSARING, // SPECIES_URSARING + NATIONAL_DEX_SLUGMA, // SPECIES_SLUGMA + NATIONAL_DEX_MAGCARGO, // SPECIES_MAGCARGO + NATIONAL_DEX_SWINUB, // SPECIES_SWINUB + NATIONAL_DEX_PILOSWINE, // SPECIES_PILOSWINE + NATIONAL_DEX_CORSOLA, // SPECIES_CORSOLA + NATIONAL_DEX_REMORAID, // SPECIES_REMORAID + NATIONAL_DEX_OCTILLERY, // SPECIES_OCTILLERY + NATIONAL_DEX_DELIBIRD, // SPECIES_DELIBIRD + NATIONAL_DEX_MANTINE, // SPECIES_MANTINE + NATIONAL_DEX_SKARMORY, // SPECIES_SKARMORY + NATIONAL_DEX_HOUNDOUR, // SPECIES_HOUNDOUR + NATIONAL_DEX_HOUNDOOM, // SPECIES_HOUNDOOM + NATIONAL_DEX_KINGDRA, // SPECIES_KINGDRA + NATIONAL_DEX_PHANPY, // SPECIES_PHANPY + NATIONAL_DEX_DONPHAN, // SPECIES_DONPHAN + NATIONAL_DEX_PORYGON2, // SPECIES_PORYGON2 + NATIONAL_DEX_STANTLER, // SPECIES_STANTLER + NATIONAL_DEX_SMEARGLE, // SPECIES_SMEARGLE + NATIONAL_DEX_TYROGUE, // SPECIES_TYROGUE + NATIONAL_DEX_HITMONTOP, // SPECIES_HITMONTOP + NATIONAL_DEX_SMOOCHUM, // SPECIES_SMOOCHUM + NATIONAL_DEX_ELEKID, // SPECIES_ELEKID + NATIONAL_DEX_MAGBY, // SPECIES_MAGBY + NATIONAL_DEX_MILTANK, // SPECIES_MILTANK + NATIONAL_DEX_BLISSEY, // SPECIES_BLISSEY + NATIONAL_DEX_RAIKOU, // SPECIES_RAIKOU + NATIONAL_DEX_ENTEI, // SPECIES_ENTEI + NATIONAL_DEX_SUICUNE, // SPECIES_SUICUNE + NATIONAL_DEX_LARVITAR, // SPECIES_LARVITAR + NATIONAL_DEX_PUPITAR, // SPECIES_PUPITAR + NATIONAL_DEX_TYRANITAR, // SPECIES_TYRANITAR + NATIONAL_DEX_LUGIA, // SPECIES_LUGIA + NATIONAL_DEX_HO_OH, // SPECIES_HO-OH + NATIONAL_DEX_CELEBI, // SPECIES_CELEBI + NATIONAL_DEX_OLD_UNOWN_B, // SPECIES_OLD_UNOWN_B + NATIONAL_DEX_OLD_UNOWN_C, // SPECIES_OLD_UNOWN_C + NATIONAL_DEX_OLD_UNOWN_D, // SPECIES_OLD_UNOWN_D + NATIONAL_DEX_OLD_UNOWN_E, // SPECIES_OLD_UNOWN_E + NATIONAL_DEX_OLD_UNOWN_F, // SPECIES_OLD_UNOWN_F + NATIONAL_DEX_OLD_UNOWN_G, // SPECIES_OLD_UNOWN_G + NATIONAL_DEX_OLD_UNOWN_H, // SPECIES_OLD_UNOWN_H + NATIONAL_DEX_OLD_UNOWN_I, // SPECIES_OLD_UNOWN_I + NATIONAL_DEX_OLD_UNOWN_J, // SPECIES_OLD_UNOWN_J + NATIONAL_DEX_OLD_UNOWN_K, // SPECIES_OLD_UNOWN_K + NATIONAL_DEX_OLD_UNOWN_L, // SPECIES_OLD_UNOWN_L + NATIONAL_DEX_OLD_UNOWN_M, // SPECIES_OLD_UNOWN_M + NATIONAL_DEX_OLD_UNOWN_N, // SPECIES_OLD_UNOWN_N + NATIONAL_DEX_OLD_UNOWN_O, // SPECIES_OLD_UNOWN_O + NATIONAL_DEX_OLD_UNOWN_P, // SPECIES_OLD_UNOWN_P + NATIONAL_DEX_OLD_UNOWN_Q, // SPECIES_OLD_UNOWN_Q + NATIONAL_DEX_OLD_UNOWN_R, // SPECIES_OLD_UNOWN_R + NATIONAL_DEX_OLD_UNOWN_S, // SPECIES_OLD_UNOWN_S + NATIONAL_DEX_OLD_UNOWN_T, // SPECIES_OLD_UNOWN_T + NATIONAL_DEX_OLD_UNOWN_U, // SPECIES_OLD_UNOWN_U + NATIONAL_DEX_OLD_UNOWN_V, // SPECIES_OLD_UNOWN_V + NATIONAL_DEX_OLD_UNOWN_W, // SPECIES_OLD_UNOWN_W + NATIONAL_DEX_OLD_UNOWN_X, // SPECIES_OLD_UNOWN_X + NATIONAL_DEX_OLD_UNOWN_Y, // SPECIES_OLD_UNOWN_Y + NATIONAL_DEX_OLD_UNOWN_Z, // SPECIES_OLD_UNOWN_Z + NATIONAL_DEX_TREECKO, // SPECIES_TREECKO + NATIONAL_DEX_GROVYLE, // SPECIES_GROVYLE + NATIONAL_DEX_SCEPTILE, // SPECIES_SCEPTILE + NATIONAL_DEX_TORCHIC, // SPECIES_TORCHIC + NATIONAL_DEX_COMBUSKEN, // SPECIES_COMBUSKEN + NATIONAL_DEX_BLAZIKEN, // SPECIES_BLAZIKEN + NATIONAL_DEX_MUDKIP, // SPECIES_MUDKIP + NATIONAL_DEX_MARSHTOMP, // SPECIES_MARSHTOMP + NATIONAL_DEX_SWAMPERT, // SPECIES_SWAMPERT + NATIONAL_DEX_POOCHYENA, // SPECIES_POOCHYENA + NATIONAL_DEX_MIGHTYENA, // SPECIES_MIGHTYENA + NATIONAL_DEX_ZIGZAGOON, // SPECIES_ZIGZAGOON + NATIONAL_DEX_LINOONE, // SPECIES_LINOONE + NATIONAL_DEX_WURMPLE, // SPECIES_WURMPLE + NATIONAL_DEX_SILCOON, // SPECIES_SILCOON + NATIONAL_DEX_BEAUTIFLY, // SPECIES_BEAUTIFLY + NATIONAL_DEX_CASCOON, // SPECIES_CASCOON + NATIONAL_DEX_DUSTOX, // SPECIES_DUSTOX + NATIONAL_DEX_LOTAD, // SPECIES_LOTAD + NATIONAL_DEX_LOMBRE, // SPECIES_LOMBRE + NATIONAL_DEX_LUDICOLO, // SPECIES_LUDICOLO + NATIONAL_DEX_SEEDOT, // SPECIES_SEEDOT + NATIONAL_DEX_NUZLEAF, // SPECIES_NUZLEAF + NATIONAL_DEX_SHIFTRY, // SPECIES_SHIFTRY + NATIONAL_DEX_NINCADA, // SPECIES_NINCADA + NATIONAL_DEX_NINJASK, // SPECIES_NINJASK + NATIONAL_DEX_SHEDINJA, // SPECIES_SHEDINJA + NATIONAL_DEX_TAILLOW, // SPECIES_TAILLOW + NATIONAL_DEX_SWELLOW, // SPECIES_SWELLOW + NATIONAL_DEX_SHROOMISH, // SPECIES_SHROOMISH + NATIONAL_DEX_BRELOOM, // SPECIES_BRELOOM + NATIONAL_DEX_SPINDA, // SPECIES_SPINDA + NATIONAL_DEX_WINGULL, // SPECIES_WINGULL + NATIONAL_DEX_PELIPPER, // SPECIES_PELIPPER + NATIONAL_DEX_SURSKIT, // SPECIES_SURSKIT + NATIONAL_DEX_MASQUERAIN, // SPECIES_MASQUERAIN + NATIONAL_DEX_WAILMER, // SPECIES_WAILMER + NATIONAL_DEX_WAILORD, // SPECIES_WAILORD + NATIONAL_DEX_SKITTY, // SPECIES_SKITTY + NATIONAL_DEX_DELCATTY, // SPECIES_DELCATTY + NATIONAL_DEX_KECLEON, // SPECIES_KECLEON + NATIONAL_DEX_BALTOY, // SPECIES_BALTOY + NATIONAL_DEX_CLAYDOL, // SPECIES_CLAYDOL + NATIONAL_DEX_NOSEPASS, // SPECIES_NOSEPASS + NATIONAL_DEX_TORKOAL, // SPECIES_TORKOAL + NATIONAL_DEX_SABLEYE, // SPECIES_SABLEYE + NATIONAL_DEX_BARBOACH, // SPECIES_BARBOACH + NATIONAL_DEX_WHISCASH, // SPECIES_WHISCASH + NATIONAL_DEX_LUVDISC, // SPECIES_LUVDISC + NATIONAL_DEX_CORPHISH, // SPECIES_CORPHISH + NATIONAL_DEX_CRAWDAUNT, // SPECIES_CRAWDAUNT + NATIONAL_DEX_FEEBAS, // SPECIES_FEEBAS + NATIONAL_DEX_MILOTIC, // SPECIES_MILOTIC + NATIONAL_DEX_CARVANHA, // SPECIES_CARVANHA + NATIONAL_DEX_SHARPEDO, // SPECIES_SHARPEDO + NATIONAL_DEX_TRAPINCH, // SPECIES_TRAPINCH + NATIONAL_DEX_VIBRAVA, // SPECIES_VIBRAVA + NATIONAL_DEX_FLYGON, // SPECIES_FLYGON + NATIONAL_DEX_MAKUHITA, // SPECIES_MAKUHITA + NATIONAL_DEX_HARIYAMA, // SPECIES_HARIYAMA + NATIONAL_DEX_ELECTRIKE, // SPECIES_ELECTRIKE + NATIONAL_DEX_MANECTRIC, // SPECIES_MANECTRIC + NATIONAL_DEX_NUMEL, // SPECIES_NUMEL + NATIONAL_DEX_CAMERUPT, // SPECIES_CAMERUPT + NATIONAL_DEX_SPHEAL, // SPECIES_SPHEAL + NATIONAL_DEX_SEALEO, // SPECIES_SEALEO + NATIONAL_DEX_WALREIN, // SPECIES_WALREIN + NATIONAL_DEX_CACNEA, // SPECIES_CACNEA + NATIONAL_DEX_CACTURNE, // SPECIES_CACTURNE + NATIONAL_DEX_SNORUNT, // SPECIES_SNORUNT + NATIONAL_DEX_GLALIE, // SPECIES_GLALIE + NATIONAL_DEX_LUNATONE, // SPECIES_LUNATONE + NATIONAL_DEX_SOLROCK, // SPECIES_SOLROCK + NATIONAL_DEX_AZURILL, // SPECIES_AZURILL + NATIONAL_DEX_SPOINK, // SPECIES_SPOINK + NATIONAL_DEX_GRUMPIG, // SPECIES_GRUMPIG + NATIONAL_DEX_PLUSLE, // SPECIES_PLUSLE + NATIONAL_DEX_MINUN, // SPECIES_MINUN + NATIONAL_DEX_MAWILE, // SPECIES_MAWILE + NATIONAL_DEX_MEDITITE, // SPECIES_MEDITITE + NATIONAL_DEX_MEDICHAM, // SPECIES_MEDICHAM + NATIONAL_DEX_SWABLU, // SPECIES_SWABLU + NATIONAL_DEX_ALTARIA, // SPECIES_ALTARIA + NATIONAL_DEX_WYNAUT, // SPECIES_WYNAUT + NATIONAL_DEX_DUSKULL, // SPECIES_DUSKULL + NATIONAL_DEX_DUSCLOPS, // SPECIES_DUSCLOPS + NATIONAL_DEX_ROSELIA, // SPECIES_ROSELIA + NATIONAL_DEX_SLAKOTH, // SPECIES_SLAKOTH + NATIONAL_DEX_VIGOROTH, // SPECIES_VIGOROTH + NATIONAL_DEX_SLAKING, // SPECIES_SLAKING + NATIONAL_DEX_GULPIN, // SPECIES_GULPIN + NATIONAL_DEX_SWALOT, // SPECIES_SWALOT + NATIONAL_DEX_TROPIUS, // SPECIES_TROPIUS + NATIONAL_DEX_WHISMUR, // SPECIES_WHISMUR + NATIONAL_DEX_LOUDRED, // SPECIES_LOUDRED + NATIONAL_DEX_EXPLOUD, // SPECIES_EXPLOUD + NATIONAL_DEX_CLAMPERL, // SPECIES_CLAMPERL + NATIONAL_DEX_HUNTAIL, // SPECIES_HUNTAIL + NATIONAL_DEX_GOREBYSS, // SPECIES_GOREBYSS + NATIONAL_DEX_ABSOL, // SPECIES_ABSOL + NATIONAL_DEX_SHUPPET, // SPECIES_SHUPPET + NATIONAL_DEX_BANETTE, // SPECIES_BANETTE + NATIONAL_DEX_SEVIPER, // SPECIES_SEVIPER + NATIONAL_DEX_ZANGOOSE, // SPECIES_ZANGOOSE + NATIONAL_DEX_RELICANTH, // SPECIES_RELICANTH + NATIONAL_DEX_ARON, // SPECIES_ARON + NATIONAL_DEX_LAIRON, // SPECIES_LAIRON + NATIONAL_DEX_AGGRON, // SPECIES_AGGRON + NATIONAL_DEX_CASTFORM, // SPECIES_CASTFORM + NATIONAL_DEX_VOLBEAT, // SPECIES_VOLBEAT + NATIONAL_DEX_ILLUMISE, // SPECIES_ILLUMISE + NATIONAL_DEX_LILEEP, // SPECIES_LILEEP + NATIONAL_DEX_CRADILY, // SPECIES_CRADILY + NATIONAL_DEX_ANORITH, // SPECIES_ANORITH + NATIONAL_DEX_ARMALDO, // SPECIES_ARMALDO + NATIONAL_DEX_RALTS, // SPECIES_RALTS + NATIONAL_DEX_KIRLIA, // SPECIES_KIRLIA + NATIONAL_DEX_GARDEVOIR, // SPECIES_GARDEVOIR + NATIONAL_DEX_BAGON, // SPECIES_BAGON + NATIONAL_DEX_SHELGON, // SPECIES_SHELGON + NATIONAL_DEX_SALAMENCE, // SPECIES_SALAMENCE + NATIONAL_DEX_BELDUM, // SPECIES_BELDUM + NATIONAL_DEX_METANG, // SPECIES_METANG + NATIONAL_DEX_METAGROSS, // SPECIES_METAGROSS + NATIONAL_DEX_REGIROCK, // SPECIES_REGIROCK + NATIONAL_DEX_REGICE, // SPECIES_REGICE + NATIONAL_DEX_REGISTEEL, // SPECIES_REGISTEEL + NATIONAL_DEX_KYOGRE, // SPECIES_KYOGRE + NATIONAL_DEX_GROUDON, // SPECIES_GROUDON + NATIONAL_DEX_RAYQUAZA, // SPECIES_RAYQUAZA + NATIONAL_DEX_LATIAS, // SPECIES_LATIAS + NATIONAL_DEX_LATIOS, // SPECIES_LATIOS + NATIONAL_DEX_JIRACHI, // SPECIES_JIRACHI + NATIONAL_DEX_DEOXYS, // SPECIES_DEOXYS + NATIONAL_DEX_CHIMECHO // SPECIES_CHIMECHO +}; + +const u16 gHoennToNationalOrder[] = // Assigns Hoenn Dex Pokémon (Using National Dex Index) +{ + // 0 + NATIONAL_DEX_TREECKO, // HOENN_DEX_TREECKO + NATIONAL_DEX_GROVYLE, // HOENN_DEX_GROVYLE + NATIONAL_DEX_SCEPTILE, // HOENN_DEX_SCEPTILE + NATIONAL_DEX_TORCHIC, // HOENN_DEX_TORCHIC + NATIONAL_DEX_COMBUSKEN, // HOENN_DEX_COMBUSKEN + NATIONAL_DEX_BLAZIKEN, // HOENN_DEX_BLAZIKEN + NATIONAL_DEX_MUDKIP, // HOENN_DEX_MUDKIP + NATIONAL_DEX_MARSHTOMP, // HOENN_DEX_MARSHTOMP + NATIONAL_DEX_SWAMPERT, // HOENN_DEX_SWAMPERT + NATIONAL_DEX_POOCHYENA, // HOENN_DEX_POOCHYENA + NATIONAL_DEX_MIGHTYENA, // HOENN_DEX_MIGHTYENA + NATIONAL_DEX_ZIGZAGOON, // HOENN_DEX_ZIGZAGOON + NATIONAL_DEX_LINOONE, // HOENN_DEX_LINOONE + NATIONAL_DEX_WURMPLE, // HOENN_DEX_WURMPLE + NATIONAL_DEX_SILCOON, // HOENN_DEX_SILCOON + NATIONAL_DEX_BEAUTIFLY, // HOENN_DEX_BEAUTIFLY + NATIONAL_DEX_CASCOON, // HOENN_DEX_CASCOON + NATIONAL_DEX_DUSTOX, // HOENN_DEX_DUSTOX + NATIONAL_DEX_LOTAD, // HOENN_DEX_LOTAD + NATIONAL_DEX_LOMBRE, // HOENN_DEX_LOMBRE + NATIONAL_DEX_LUDICOLO, // HOENN_DEX_LUDICOLO + NATIONAL_DEX_SEEDOT, // HOENN_DEX_SEEDOT + NATIONAL_DEX_NUZLEAF, // HOENN_DEX_NUZLEAF + NATIONAL_DEX_SHIFTRY, // HOENN_DEX_SHIFTRY + NATIONAL_DEX_TAILLOW, // HOENN_DEX_TAILLOW + NATIONAL_DEX_SWELLOW, // HOENN_DEX_SWELLOW + NATIONAL_DEX_WINGULL, // HOENN_DEX_WINGULL + NATIONAL_DEX_PELIPPER, // HOENN_DEX_PELIPPER + NATIONAL_DEX_RALTS, // HOENN_DEX_RALTS + NATIONAL_DEX_KIRLIA, // HOENN_DEX_KIRLIA + NATIONAL_DEX_GARDEVOIR, // HOENN_DEX_GARDEVOIR + NATIONAL_DEX_SURSKIT, // HOENN_DEX_SURSKIT + NATIONAL_DEX_MASQUERAIN, // HOENN_DEX_MASQUERAIN + NATIONAL_DEX_SHROOMISH, // HOENN_DEX_SHROOMISH + NATIONAL_DEX_BRELOOM, // HOENN_DEX_BRELOOM + NATIONAL_DEX_SLAKOTH, // HOENN_DEX_SLAKOTH + NATIONAL_DEX_VIGOROTH, // HOENN_DEX_VIGOROTH + NATIONAL_DEX_SLAKING, // HOENN_DEX_SLAKING + NATIONAL_DEX_ABRA, // HOENN_DEX_ABRA + NATIONAL_DEX_KADABRA, // HOENN_DEX_KADABRA + NATIONAL_DEX_ALAKAZAM, // HOENN_DEX_ALAKAZAM + NATIONAL_DEX_NINCADA, // HOENN_DEX_NINCADA + NATIONAL_DEX_NINJASK, // HOENN_DEX_NINJASK + NATIONAL_DEX_SHEDINJA, // HOENN_DEX_SHEDINJA + NATIONAL_DEX_WHISMUR, // HOENN_DEX_WHISMUR + NATIONAL_DEX_LOUDRED, // HOENN_DEX_LOUDRED + NATIONAL_DEX_EXPLOUD, // HOENN_DEX_EXPLOUD + NATIONAL_DEX_MAKUHITA, // HOENN_DEX_MAKUHITA + NATIONAL_DEX_HARIYAMA, // HOENN_DEX_HARIYAMA + NATIONAL_DEX_GOLDEEN, // HOENN_DEX_GOLDEEN + NATIONAL_DEX_SEAKING, // HOENN_DEX_SEAKING + NATIONAL_DEX_MAGIKARP, // HOENN_DEX_MAGIKARP + NATIONAL_DEX_GYARADOS, // HOENN_DEX_GYARADOS + NATIONAL_DEX_AZURILL, // HOENN_DEX_AZURILL + NATIONAL_DEX_MARILL, // HOENN_DEX_MARILL + NATIONAL_DEX_AZUMARILL, // HOENN_DEX_AZUMARILL + NATIONAL_DEX_GEODUDE, // HOENN_DEX_GEODUDE + NATIONAL_DEX_GRAVELER, // HOENN_DEX_GRAVELER + NATIONAL_DEX_GOLEM, // HOENN_DEX_GOLEM + NATIONAL_DEX_NOSEPASS, // HOENN_DEX_NOSEPASS + NATIONAL_DEX_SKITTY, // HOENN_DEX_SKITTY + NATIONAL_DEX_DELCATTY, // HOENN_DEX_DELCATTY + NATIONAL_DEX_ZUBAT, // HOENN_DEX_ZUBAT + NATIONAL_DEX_GOLBAT, // HOENN_DEX_GOLBAT + NATIONAL_DEX_CROBAT, // HOENN_DEX_CROBAT + NATIONAL_DEX_TENTACOOL, // HOENN_DEX_TENTACOOL + NATIONAL_DEX_TENTACRUEL, // HOENN_DEX_TENTACRUEL + NATIONAL_DEX_SABLEYE, // HOENN_DEX_SABLEYE + NATIONAL_DEX_MAWILE, // HOENN_DEX_MAWILE + NATIONAL_DEX_ARON, // HOENN_DEX_ARON + NATIONAL_DEX_LAIRON, // HOENN_DEX_LAIRON + NATIONAL_DEX_AGGRON, // HOENN_DEX_AGGRON + NATIONAL_DEX_MACHOP, // HOENN_DEX_MACHOP + NATIONAL_DEX_MACHOKE, // HOENN_DEX_MACHOKE + NATIONAL_DEX_MACHAMP, // HOENN_DEX_MACHAMP + NATIONAL_DEX_MEDITITE, // HOENN_DEX_MEDITITE + NATIONAL_DEX_MEDICHAM, // HOENN_DEX_MEDICHAM + NATIONAL_DEX_ELECTRIKE, // HOENN_DEX_ELECTRIKE + NATIONAL_DEX_MANECTRIC, // HOENN_DEX_MANECTRIC + NATIONAL_DEX_PLUSLE, // HOENN_DEX_PLUSLE + NATIONAL_DEX_MINUN, // HOENN_DEX_MINUN + NATIONAL_DEX_MAGNEMITE, // HOENN_DEX_MAGNEMITE + NATIONAL_DEX_MAGNETON, // HOENN_DEX_MAGNETON + NATIONAL_DEX_VOLTORB, // HOENN_DEX_VOLTORB + NATIONAL_DEX_ELECTRODE, // HOENN_DEX_ELECTRODE + NATIONAL_DEX_VOLBEAT, // HOENN_DEX_VOLBEAT + NATIONAL_DEX_ILLUMISE, // HOENN_DEX_ILLUMISE + NATIONAL_DEX_ODDISH, // HOENN_DEX_ODDISH + NATIONAL_DEX_GLOOM, // HOENN_DEX_GLOOM + NATIONAL_DEX_VILEPLUME, // HOENN_DEX_VILEPLUME + NATIONAL_DEX_BELLOSSOM, // HOENN_DEX_BELLOSSOM + NATIONAL_DEX_DODUO, // HOENN_DEX_DODUO + NATIONAL_DEX_DODRIO, // HOENN_DEX_DODRIO + NATIONAL_DEX_ROSELIA, // HOENN_DEX_ROSELIA + NATIONAL_DEX_GULPIN, // HOENN_DEX_GULPIN + NATIONAL_DEX_SWALOT, // HOENN_DEX_SWALOT + NATIONAL_DEX_CARVANHA, // HOENN_DEX_CARVANHA + NATIONAL_DEX_SHARPEDO, // HOENN_DEX_SHARPEDO + NATIONAL_DEX_WAILMER, // HOENN_DEX_WAILMER + NATIONAL_DEX_WAILORD, // HOENN_DEX_WAILORD + NATIONAL_DEX_NUMEL, // HOENN_DEX_NUMEL + NATIONAL_DEX_CAMERUPT, // HOENN_DEX_CAMERUPT + NATIONAL_DEX_SLUGMA, // HOENN_DEX_SLUGMA + NATIONAL_DEX_MAGCARGO, // HOENN_DEX_MAGCARGO + NATIONAL_DEX_TORKOAL, // HOENN_DEX_TORKOAL + NATIONAL_DEX_GRIMER, // HOENN_DEX_GRIMER + NATIONAL_DEX_MUK, // HOENN_DEX_MUK + NATIONAL_DEX_KOFFING, // HOENN_DEX_KOFFING + NATIONAL_DEX_WEEZING, // HOENN_DEX_WEEZING + NATIONAL_DEX_SPOINK, // HOENN_DEX_SPOINK + NATIONAL_DEX_GRUMPIG, // HOENN_DEX_GRUMPIG + NATIONAL_DEX_SANDSHREW, // HOENN_DEX_SANDSHREW + NATIONAL_DEX_SANDSLASH, // HOENN_DEX_SANDSLASH + NATIONAL_DEX_SPINDA, // HOENN_DEX_SPINDA + NATIONAL_DEX_SKARMORY, // HOENN_DEX_SKARMORY + NATIONAL_DEX_TRAPINCH, // HOENN_DEX_TRAPINCH + NATIONAL_DEX_VIBRAVA, // HOENN_DEX_VIBRAVA + NATIONAL_DEX_FLYGON, // HOENN_DEX_FLYGON + NATIONAL_DEX_CACNEA, // HOENN_DEX_CACNEA + NATIONAL_DEX_CACTURNE, // HOENN_DEX_CACTURNE + NATIONAL_DEX_SWABLU, // HOENN_DEX_SWABLU + NATIONAL_DEX_ALTARIA, // HOENN_DEX_ALTARIA + NATIONAL_DEX_ZANGOOSE, // HOENN_DEX_ZANGOOSE + NATIONAL_DEX_SEVIPER, // HOENN_DEX_SEVIPER + NATIONAL_DEX_LUNATONE, // HOENN_DEX_LUNATONE + NATIONAL_DEX_SOLROCK, // HOENN_DEX_SOLROCK + NATIONAL_DEX_BARBOACH, // HOENN_DEX_BARBOACH + NATIONAL_DEX_WHISCASH, // HOENN_DEX_WHISCASH + NATIONAL_DEX_CORPHISH, // HOENN_DEX_CORPHISH + NATIONAL_DEX_CRAWDAUNT, // HOENN_DEX_CRAWDAUNT + NATIONAL_DEX_BALTOY, // HOENN_DEX_BALTOY + NATIONAL_DEX_CLAYDOL, // HOENN_DEX_CLAYDOL + NATIONAL_DEX_LILEEP, // HOENN_DEX_LILEEP + NATIONAL_DEX_CRADILY, // HOENN_DEX_CRADILY + NATIONAL_DEX_ANORITH, // HOENN_DEX_ANORITH + NATIONAL_DEX_ARMALDO, // HOENN_DEX_ARMALDO + NATIONAL_DEX_IGGLYBUFF, // HOENN_DEX_IGGLYBUFF + NATIONAL_DEX_JIGGLYPUFF, // HOENN_DEX_JIGGLYPUFF + NATIONAL_DEX_WIGGLYTUFF, // HOENN_DEX_WIGGLYTUFF + NATIONAL_DEX_FEEBAS, // HOENN_DEX_FEEBAS + NATIONAL_DEX_MILOTIC, // HOENN_DEX_MILOTIC + NATIONAL_DEX_CASTFORM, // HOENN_DEX_CASTFORM + NATIONAL_DEX_STARYU, // HOENN_DEX_STARYU + NATIONAL_DEX_STARMIE, // HOENN_DEX_STARMIE + NATIONAL_DEX_KECLEON, // HOENN_DEX_KECLEON + NATIONAL_DEX_SHUPPET, // HOENN_DEX_SHUPPET + NATIONAL_DEX_BANETTE, // HOENN_DEX_BANETTE + NATIONAL_DEX_DUSKULL, // HOENN_DEX_DUSKULL + NATIONAL_DEX_DUSCLOPS, // HOENN_DEX_DUSCLOPS + NATIONAL_DEX_TROPIUS, // HOENN_DEX_TROPIUS + NATIONAL_DEX_CHIMECHO, // HOENN_DEX_CHIMECHO + NATIONAL_DEX_ABSOL, // HOENN_DEX_ABSOL + NATIONAL_DEX_VULPIX, // HOENN_DEX_VULPIX + NATIONAL_DEX_NINETALES, // HOENN_DEX_NINETALES + NATIONAL_DEX_PICHU, // HOENN_DEX_PICHU + NATIONAL_DEX_PIKACHU, // HOENN_DEX_PIKACHU + NATIONAL_DEX_RAICHU, // HOENN_DEX_RAICHU + NATIONAL_DEX_PSYDUCK, // HOENN_DEX_PSYDUCK + NATIONAL_DEX_GOLDUCK, // HOENN_DEX_GOLDUCK + NATIONAL_DEX_WYNAUT, // HOENN_DEX_WYNAUT + NATIONAL_DEX_WOBBUFFET, // HOENN_DEX_WOBBUFFET + NATIONAL_DEX_NATU, // HOENN_DEX_NATU + NATIONAL_DEX_XATU, // HOENN_DEX_XATU + NATIONAL_DEX_GIRAFARIG, // HOENN_DEX_GIRAFARIG + NATIONAL_DEX_PHANPY, // HOENN_DEX_PHANPY + NATIONAL_DEX_DONPHAN, // HOENN_DEX_DONPHAN + NATIONAL_DEX_PINSIR, // HOENN_DEX_PINSIR + NATIONAL_DEX_HERACROSS, // HOENN_DEX_HERACROSS + NATIONAL_DEX_RHYHORN, // HOENN_DEX_RHYHORN + NATIONAL_DEX_RHYDON, // HOENN_DEX_RHYDON + NATIONAL_DEX_SNORUNT, // HOENN_DEX_SNORUNT + NATIONAL_DEX_GLALIE, // HOENN_DEX_GLALIE + NATIONAL_DEX_SPHEAL, // HOENN_DEX_SPHEAL + NATIONAL_DEX_SEALEO, // HOENN_DEX_SEALEO + NATIONAL_DEX_WALREIN, // HOENN_DEX_WALREIN + NATIONAL_DEX_CLAMPERL, // HOENN_DEX_CLAMPERL + NATIONAL_DEX_HUNTAIL, // HOENN_DEX_HUNTAIL + NATIONAL_DEX_GOREBYSS, // HOENN_DEX_GOREBYSS + NATIONAL_DEX_RELICANTH, // HOENN_DEX_RELICANTH + NATIONAL_DEX_CORSOLA, // HOENN_DEX_CORSOLA + NATIONAL_DEX_CHINCHOU, // HOENN_DEX_CHINCHOU + NATIONAL_DEX_LANTURN, // HOENN_DEX_LANTURN + NATIONAL_DEX_LUVDISC, // HOENN_DEX_LUVDISC + NATIONAL_DEX_HORSEA, // HOENN_DEX_HORSEA + NATIONAL_DEX_SEADRA, // HOENN_DEX_SEADRA + NATIONAL_DEX_KINGDRA, // HOENN_DEX_KINGDRA + NATIONAL_DEX_BAGON, // HOENN_DEX_BAGON + NATIONAL_DEX_SHELGON, // HOENN_DEX_SHELGON + NATIONAL_DEX_SALAMENCE, // HOENN_DEX_SALAMENCE + NATIONAL_DEX_BELDUM, // HOENN_DEX_BELDUM + NATIONAL_DEX_METANG, // HOENN_DEX_METANG + NATIONAL_DEX_METAGROSS, // HOENN_DEX_METAGROSS + NATIONAL_DEX_REGIROCK, // HOENN_DEX_REGIROCK + NATIONAL_DEX_REGICE, // HOENN_DEX_REGICE + NATIONAL_DEX_REGISTEEL, // HOENN_DEX_REGISTEEL + NATIONAL_DEX_LATIAS, // HOENN_DEX_LATIAS + NATIONAL_DEX_LATIOS, // HOENN_DEX_LATIOS + NATIONAL_DEX_KYOGRE, // HOENN_DEX_KYOGRE + NATIONAL_DEX_GROUDON, // HOENN_DEX_GROUDON + NATIONAL_DEX_RAYQUAZA, // HOENN_DEX_RAYQUAZA + NATIONAL_DEX_JIRACHI, // HOENN_DEX_JIRACHI + NATIONAL_DEX_DEOXYS, // HOENN_DEX_DEOXYS + NATIONAL_DEX_BULBASAUR, // HOENN_DEX_BULBASAUR - Pokémon from here onwards are UNSEEN in the Hoenn Dex. + NATIONAL_DEX_IVYSAUR, // HOENN_DEX_IVYSAUR + NATIONAL_DEX_VENUSAUR, // HOENN_DEX_VENUSAUR + NATIONAL_DEX_CHARMANDER, // HOENN_DEX_CHARMANDER + NATIONAL_DEX_CHARMELEON, // HOENN_DEX_CHARMELEON + NATIONAL_DEX_CHARIZARD, // HOENN_DEX_CHARIZARD + NATIONAL_DEX_SQUIRTLE, // HOENN_DEX_SQUIRTLE + NATIONAL_DEX_WARTORTLE, // HOENN_DEX_WARTORTLE + NATIONAL_DEX_BLASTOISE, // HOENN_DEX_BLASTOISE + NATIONAL_DEX_CATERPIE, // HOENN_DEX_CATERPIE + NATIONAL_DEX_METAPOD, // HOENN_DEX_METAPOD + NATIONAL_DEX_BUTTERFREE, // HOENN_DEX_BUTTERFREE + NATIONAL_DEX_WEEDLE, // HOENN_DEX_WEEDLE + NATIONAL_DEX_KAKUNA, // HOENN_DEX_KAKUNA + NATIONAL_DEX_BEEDRILL, // HOENN_DEX_BEEDRILL + NATIONAL_DEX_PIDGEY, // HOENN_DEX_PIDGEY + NATIONAL_DEX_PIDGEOTTO, // HOENN_DEX_PIDGEOTTO + NATIONAL_DEX_PIDGEOT, // HOENN_DEX_PIDGEOT + NATIONAL_DEX_RATTATA, // HOENN_DEX_RATTATA + NATIONAL_DEX_RATICATE, // HOENN_DEX_RATICATE + NATIONAL_DEX_SPEAROW, // HOENN_DEX_SPEAROW + NATIONAL_DEX_FEAROW, // HOENN_DEX_FEAROW + NATIONAL_DEX_EKANS, // HOENN_DEX_EKANS + NATIONAL_DEX_ARBOK, // HOENN_DEX_ARBOK + NATIONAL_DEX_NIDORAN_F, // HOENN_DEX_NIDORAN♀ + NATIONAL_DEX_NIDORINA, // HOENN_DEX_NIDORINA + NATIONAL_DEX_NIDOQUEEN, // HOENN_DEX_NIDOQUEEN + NATIONAL_DEX_NIDORAN_M, // HOENN_DEX_NIDORAN♂ + NATIONAL_DEX_NIDORINO, // HOENN_DEX_NIDORINO + NATIONAL_DEX_NIDOKING, // HOENN_DEX_NIDOKING + NATIONAL_DEX_CLEFAIRY, // HOENN_DEX_CLEFAIRY + NATIONAL_DEX_CLEFABLE, // HOENN_DEX_CLEFABLE + NATIONAL_DEX_PARAS, // HOENN_DEX_PARAS + NATIONAL_DEX_PARASECT, // HOENN_DEX_PARASECT + NATIONAL_DEX_VENONAT, // HOENN_DEX_VENONAT + NATIONAL_DEX_VENOMOTH, // HOENN_DEX_VENOMOTH + NATIONAL_DEX_DIGLETT, // HOENN_DEX_DIGLETT + NATIONAL_DEX_DUGTRIO, // HOENN_DEX_DUGTRIO + NATIONAL_DEX_MEOWTH, // HOENN_DEX_MEOWTH + NATIONAL_DEX_PERSIAN, // HOENN_DEX_PERSIAN + NATIONAL_DEX_MANKEY, // HOENN_DEX_MANKEY + NATIONAL_DEX_PRIMEAPE, // HOENN_DEX_PRIMEAPE + NATIONAL_DEX_GROWLITHE, // HOENN_DEX_GROWLITHE + NATIONAL_DEX_ARCANINE, // HOENN_DEX_ARCANINE + NATIONAL_DEX_POLIWAG, // HOENN_DEX_POLIWAG + NATIONAL_DEX_POLIWHIRL, // HOENN_DEX_POLIWHIRL + NATIONAL_DEX_POLIWRATH, // HOENN_DEX_POLIWRATH + NATIONAL_DEX_BELLSPROUT, // HOENN_DEX_BELLSPROUT + NATIONAL_DEX_WEEPINBELL, // HOENN_DEX_WEEPINBELL + NATIONAL_DEX_VICTREEBEL, // HOENN_DEX_VICTREEBEL + NATIONAL_DEX_PONYTA, // HOENN_DEX_PONYTA + NATIONAL_DEX_RAPIDASH, // HOENN_DEX_RAPIDASH + NATIONAL_DEX_SLOWPOKE, // HOENN_DEX_SLOWPOKE + NATIONAL_DEX_SLOWBRO, // HOENN_DEX_SLOWBRO + NATIONAL_DEX_FARFETCHD, // HOENN_DEX_FARFETCH'D + NATIONAL_DEX_SEEL, // HOENN_DEX_SEEL + NATIONAL_DEX_DEWGONG, // HOENN_DEX_DEWGONG + NATIONAL_DEX_SHELLDER, // HOENN_DEX_SHELLDER + NATIONAL_DEX_CLOYSTER, // HOENN_DEX_CLOYSTER + NATIONAL_DEX_GASTLY, // HOENN_DEX_GASTLY + NATIONAL_DEX_HAUNTER, // HOENN_DEX_HAUNTER + NATIONAL_DEX_GENGAR, // HOENN_DEX_GENGAR + NATIONAL_DEX_ONIX, // HOENN_DEX_ONIX + NATIONAL_DEX_DROWZEE, // HOENN_DEX_DROWZEE + NATIONAL_DEX_HYPNO, // HOENN_DEX_HYPNO + NATIONAL_DEX_KRABBY, // HOENN_DEX_KRABBY + NATIONAL_DEX_KINGLER, // HOENN_DEX_KINGLER + NATIONAL_DEX_EXEGGCUTE, // HOENN_DEX_EXEGGCUTE + NATIONAL_DEX_EXEGGUTOR, // HOENN_DEX_EXEGGUTOR + NATIONAL_DEX_CUBONE, // HOENN_DEX_CUBONE + NATIONAL_DEX_MAROWAK, // HOENN_DEX_MAROWAK + NATIONAL_DEX_HITMONLEE, // HOENN_DEX_HITMONLEE + NATIONAL_DEX_HITMONCHAN, // HOENN_DEX_HITMONCHAN + NATIONAL_DEX_LICKITUNG, // HOENN_DEX_LICKITUNG + NATIONAL_DEX_CHANSEY, // HOENN_DEX_CHANSEY + NATIONAL_DEX_TANGELA, // HOENN_DEX_TANGELA + NATIONAL_DEX_KANGASKHAN, // HOENN_DEX_KANGASKHAN + NATIONAL_DEX_MR_MIME, // HOENN_DEX_MR. MIME + NATIONAL_DEX_SCYTHER, // HOENN_DEX_SCYTHER + NATIONAL_DEX_JYNX, // HOENN_DEX_JYNX + NATIONAL_DEX_ELECTABUZZ, // HOENN_DEX_ELECTABUZZ + NATIONAL_DEX_MAGMAR, // HOENN_DEX_MAGMAR + NATIONAL_DEX_TAUROS, // HOENN_DEX_TAUROS + NATIONAL_DEX_LAPRAS, // HOENN_DEX_LAPRAS + NATIONAL_DEX_DITTO, // HOENN_DEX_DITTO + NATIONAL_DEX_EEVEE, // HOENN_DEX_EEVEE + NATIONAL_DEX_VAPOREON, // HOENN_DEX_VAPOREON + NATIONAL_DEX_JOLTEON, // HOENN_DEX_JOLTEON + NATIONAL_DEX_FLAREON, // HOENN_DEX_FLAREON + NATIONAL_DEX_PORYGON, // HOENN_DEX_PORYGON + NATIONAL_DEX_OMANYTE, // HOENN_DEX_OMANYTE + NATIONAL_DEX_OMASTAR, // HOENN_DEX_OMASTAR + NATIONAL_DEX_KABUTO, // HOENN_DEX_KABUTO + NATIONAL_DEX_KABUTOPS, // HOENN_DEX_KABUTOPS + NATIONAL_DEX_AERODACTYL, // HOENN_DEX_AERODACTYL + NATIONAL_DEX_SNORLAX, // HOENN_DEX_SNORLAX + NATIONAL_DEX_ARTICUNO, // HOENN_DEX_ARTICUNO + NATIONAL_DEX_ZAPDOS, // HOENN_DEX_ZAPDOS + NATIONAL_DEX_MOLTRES, // HOENN_DEX_MOLTRES + NATIONAL_DEX_DRATINI, // HOENN_DEX_DRATINI + NATIONAL_DEX_DRAGONAIR, // HOENN_DEX_DRAGONAIR + NATIONAL_DEX_DRAGONITE, // HOENN_DEX_DRAGONITE + NATIONAL_DEX_MEWTWO, // HOENN_DEX_MEWTWO + NATIONAL_DEX_MEW, // HOENN_DEX_MEW + NATIONAL_DEX_CHIKORITA, // HOENN_DEX_CHIKORITA + NATIONAL_DEX_BAYLEEF, // HOENN_DEX_BAYLEEF + NATIONAL_DEX_MEGANIUM, // HOENN_DEX_MEGANIUM + NATIONAL_DEX_CYNDAQUIL, // HOENN_DEX_CYNDAQUIL + NATIONAL_DEX_QUILAVA, // HOENN_DEX_QUILAVA + NATIONAL_DEX_TYPHLOSION, // HOENN_DEX_TYPHLOSION + NATIONAL_DEX_TOTODILE, // HOENN_DEX_TOTODILE + NATIONAL_DEX_CROCONAW, // HOENN_DEX_CROCONAW + NATIONAL_DEX_FERALIGATR, // HOENN_DEX_FERALIGATR + NATIONAL_DEX_SENTRET, // HOENN_DEX_SENTRET + NATIONAL_DEX_FURRET, // HOENN_DEX_FURRET + NATIONAL_DEX_HOOTHOOT, // HOENN_DEX_HOOTHOOT + NATIONAL_DEX_NOCTOWL, // HOENN_DEX_NOCTOWL + NATIONAL_DEX_LEDYBA, // HOENN_DEX_LEDYBA + NATIONAL_DEX_LEDIAN, // HOENN_DEX_LEDIAN + NATIONAL_DEX_SPINARAK, // HOENN_DEX_SPINARAK + NATIONAL_DEX_ARIADOS, // HOENN_DEX_ARIADOS + NATIONAL_DEX_CLEFFA, // HOENN_DEX_CLEFFA + NATIONAL_DEX_TOGEPI, // HOENN_DEX_TOGEPI + NATIONAL_DEX_TOGETIC, // HOENN_DEX_TOGETIC + NATIONAL_DEX_MAREEP, // HOENN_DEX_MAREEP + NATIONAL_DEX_FLAAFFY, // HOENN_DEX_FLAAFFY + NATIONAL_DEX_AMPHAROS, // HOENN_DEX_AMPHAROS + NATIONAL_DEX_SUDOWOODO, // HOENN_DEX_SUDOWOODO + NATIONAL_DEX_POLITOED, // HOENN_DEX_POLITOED + NATIONAL_DEX_HOPPIP, // HOENN_DEX_HOPPIP + NATIONAL_DEX_SKIPLOOM, // HOENN_DEX_SKIPLOOM + NATIONAL_DEX_JUMPLUFF, // HOENN_DEX_JUMPLUFF + NATIONAL_DEX_AIPOM, // HOENN_DEX_AIPOM + NATIONAL_DEX_SUNKERN, // HOENN_DEX_SUNKERN + NATIONAL_DEX_SUNFLORA, // HOENN_DEX_SUNFLORA + NATIONAL_DEX_YANMA, // HOENN_DEX_YANMA + NATIONAL_DEX_WOOPER, // HOENN_DEX_WOOPER + NATIONAL_DEX_QUAGSIRE, // HOENN_DEX_QUAGSIRE + NATIONAL_DEX_ESPEON, // HOENN_DEX_ESPEON + NATIONAL_DEX_UMBREON, // HOENN_DEX_UMBREON + NATIONAL_DEX_MURKROW, // HOENN_DEX_MURKROW + NATIONAL_DEX_SLOWKING, // HOENN_DEX_SLOWKING + NATIONAL_DEX_MISDREAVUS, // HOENN_DEX_MISDREAVUS + NATIONAL_DEX_UNOWN, // HOENN_DEX_UNOWN + NATIONAL_DEX_PINECO, // HOENN_DEX_PINECO + NATIONAL_DEX_FORRETRESS, // HOENN_DEX_FORRETRESS + NATIONAL_DEX_DUNSPARCE, // HOENN_DEX_DUNSPARCE + NATIONAL_DEX_GLIGAR, // HOENN_DEX_GLIGAR + NATIONAL_DEX_STEELIX, // HOENN_DEX_STEELIX + NATIONAL_DEX_SNUBBULL, // HOENN_DEX_SNUBBULL + NATIONAL_DEX_GRANBULL, // HOENN_DEX_GRANBULL + NATIONAL_DEX_QWILFISH, // HOENN_DEX_QWILFISH + NATIONAL_DEX_SCIZOR, // HOENN_DEX_SCIZOR + NATIONAL_DEX_SHUCKLE, // HOENN_DEX_SHUCKLE + NATIONAL_DEX_SNEASEL, // HOENN_DEX_SNEASEL + NATIONAL_DEX_TEDDIURSA, // HOENN_DEX_TEDDIURSA + NATIONAL_DEX_URSARING, // HOENN_DEX_URSARING + NATIONAL_DEX_SWINUB, // HOENN_DEX_SWINUB + NATIONAL_DEX_PILOSWINE, // HOENN_DEX_PILOSWINE + NATIONAL_DEX_REMORAID, // HOENN_DEX_REMORAID + NATIONAL_DEX_OCTILLERY, // HOENN_DEX_OCTILLERY + NATIONAL_DEX_DELIBIRD, // HOENN_DEX_DELIBIRD + NATIONAL_DEX_MANTINE, // HOENN_DEX_MANTINE + NATIONAL_DEX_HOUNDOUR, // HOENN_DEX_HOUNDOUR + NATIONAL_DEX_HOUNDOOM, // HOENN_DEX_HOUNDOOM + NATIONAL_DEX_PORYGON2, // HOENN_DEX_PORYGON2 + NATIONAL_DEX_STANTLER, // HOENN_DEX_STANTLER + NATIONAL_DEX_SMEARGLE, // HOENN_DEX_SMEARGLE + NATIONAL_DEX_TYROGUE, // HOENN_DEX_TYROGUE + NATIONAL_DEX_HITMONTOP, // HOENN_DEX_HITMONTOP + NATIONAL_DEX_SMOOCHUM, // HOENN_DEX_SMOOCHUM + NATIONAL_DEX_ELEKID, // HOENN_DEX_ELEKID + NATIONAL_DEX_MAGBY, // HOENN_DEX_MAGBY + NATIONAL_DEX_MILTANK, // HOENN_DEX_MILTANK + NATIONAL_DEX_BLISSEY, // HOENN_DEX_BLISSEY + NATIONAL_DEX_RAIKOU, // HOENN_DEX_RAIKOU + NATIONAL_DEX_ENTEI, // HOENN_DEX_ENTEI + NATIONAL_DEX_SUICUNE, // HOENN_DEX_SUICUNE + NATIONAL_DEX_LARVITAR, // HOENN_DEX_LARVITAR + NATIONAL_DEX_PUPITAR, // HOENN_DEX_PUPITAR + NATIONAL_DEX_TYRANITAR, // HOENN_DEX_TYRANITAR + NATIONAL_DEX_LUGIA, // HOENN_DEX_LUGIA + NATIONAL_DEX_HO_OH, // HOENN_DEX_HO-OH + NATIONAL_DEX_CELEBI, // HOENN_DEX_CELEBI + NATIONAL_DEX_OLD_UNOWN_B, // HOENN_DEX_OLD_UNOWN_B + NATIONAL_DEX_OLD_UNOWN_C, // HOENN_DEX_OLD_UNOWN_C + NATIONAL_DEX_OLD_UNOWN_D, // HOENN_DEX_OLD_UNOWN_D + NATIONAL_DEX_OLD_UNOWN_E, // HOENN_DEX_OLD_UNOWN_E + NATIONAL_DEX_OLD_UNOWN_F, // HOENN_DEX_OLD_UNOWN_F + NATIONAL_DEX_OLD_UNOWN_G, // HOENN_DEX_OLD_UNOWN_G + NATIONAL_DEX_OLD_UNOWN_H, // HOENN_DEX_OLD_UNOWN_H + NATIONAL_DEX_OLD_UNOWN_I, // HOENN_DEX_OLD_UNOWN_I + NATIONAL_DEX_OLD_UNOWN_J, // HOENN_DEX_OLD_UNOWN_J + NATIONAL_DEX_OLD_UNOWN_K, // HOENN_DEX_OLD_UNOWN_K + NATIONAL_DEX_OLD_UNOWN_L, // HOENN_DEX_OLD_UNOWN_L + NATIONAL_DEX_OLD_UNOWN_M, // HOENN_DEX_OLD_UNOWN_M + NATIONAL_DEX_OLD_UNOWN_N, // HOENN_DEX_OLD_UNOWN_N + NATIONAL_DEX_OLD_UNOWN_O, // HOENN_DEX_OLD_UNOWN_O + NATIONAL_DEX_OLD_UNOWN_P, // HOENN_DEX_OLD_UNOWN_P + NATIONAL_DEX_OLD_UNOWN_Q, // HOENN_DEX_OLD_UNOWN_Q + NATIONAL_DEX_OLD_UNOWN_R, // HOENN_DEX_OLD_UNOWN_R + NATIONAL_DEX_OLD_UNOWN_S, // HOENN_DEX_OLD_UNOWN_S + NATIONAL_DEX_OLD_UNOWN_T, // HOENN_DEX_OLD_UNOWN_T + NATIONAL_DEX_OLD_UNOWN_U, // HOENN_DEX_OLD_UNOWN_U + NATIONAL_DEX_OLD_UNOWN_V, // HOENN_DEX_OLD_UNOWN_V + NATIONAL_DEX_OLD_UNOWN_W, // HOENN_DEX_OLD_UNOWN_W + NATIONAL_DEX_OLD_UNOWN_X, // HOENN_DEX_OLD_UNOWN_X + NATIONAL_DEX_OLD_UNOWN_Y, // HOENN_DEX_OLD_UNOWN_Y + NATIONAL_DEX_OLD_UNOWN_Z, // HOENN_DEX_OLD_UNOWN_Z +}; const struct SpindaSpot gSpindaSpotGraphics[] = { diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c index 2cd1a59c6..6ebb8ff8a 100644 --- a/src/pokemon_storage_system_2.c +++ b/src/pokemon_storage_system_2.c @@ -337,7 +337,7 @@ void debug_sub_80A4300(void) extern void (*unk_2038794)(void); extern struct Pokemon * unk_2038798; -extern void debug_sub_809CB94(struct Pokemon *); +extern void sub_809CB94(struct Pokemon *); void debug_sub_80A433C(struct Pokemon * a, void (*b)(void)) { @@ -351,7 +351,7 @@ void debug_sub_80A435C(void) switch (gPokemonStorageSystemPtr->unk_0004) { case 0: - debug_sub_809CB94(unk_2038798); + sub_809CB94(unk_2038798); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); gPokemonStorageSystemPtr->unk_0004++; break; diff --git a/src/pokemon_storage_system_3.c b/src/pokemon_storage_system_3.c index da26c6fc5..cbac7a504 100644 --- a/src/pokemon_storage_system_3.c +++ b/src/pokemon_storage_system_3.c @@ -23,6 +23,35 @@ static void PSS_DestroyMonIconSprite(struct Sprite *sprite); // .rodata const struct OamData gOamData_83B6F2C; +const struct SpriteTemplate gSpriteTemplate_83B6F14 = { + 0x000f, + 0xdac0, + &gOamData_83B6F2C, + gDummySpriteAnimTable, + NULL, + gDummySpriteAffineAnimTable, + SpriteCallbackDummy +}; + +const struct OamData gOamData_83B6F2C = { + .size = 2 +}; + +const union AffineAnimCmd gSpriteAffineAnim_83B6F34[] = { + AFFINEANIMCMD_FRAME(-2, -2, 0, 120), + AFFINEANIMCMD_END +}; + +const union AffineAnimCmd gSpriteAffineAnim_83B6F44[] = { + AFFINEANIMCMD_FRAME(16, 16, 0, 0), + AFFINEANIMCMD_FRAME(16, 16, 0, 15), + AFFINEANIMCMD_END +}; + +const union AffineAnimCmd *const gSpriteAffineAnimTable_83B6F5C[] = { + gSpriteAffineAnim_83B6F34, + gSpriteAffineAnim_83B6F44 +}; // .text @@ -481,8 +510,6 @@ bool8 sub_809971C(void) return TRUE; } -const union AffineAnimCmd *const gSpriteAffineAnimTable_83B6F5C[]; - void sub_809981C(u8 mode, u8 idx) { switch (mode) @@ -599,15 +626,7 @@ static void PSS_ForgetSpeciesIcon(u16 a0) static struct Sprite *PSS_SpawnMonIconSprite(u16 species, u32 personality, s16 x, s16 y, u8 priority, u8 subpriority) { - struct SpriteTemplate template = { - 0x000f, - 0xdac0, - &gOamData_83B6F2C, - gDummySpriteAnimTable, - NULL, - gDummySpriteAffineAnimTable, - SpriteCallbackDummy - }; + struct SpriteTemplate template = gSpriteTemplate_83B6F14; u16 tileNum; u8 spriteId; @@ -633,23 +652,3 @@ static void PSS_DestroyMonIconSprite(struct Sprite *sprite) PSS_ForgetSpeciesIcon(sprite->data[0]); DestroySprite(sprite); } - -const struct OamData gOamData_83B6F2C = { - .size = 2 -}; - -const union AffineAnimCmd gSpriteAffineAnim_83B6F34[] = { - AFFINEANIMCMD_FRAME(-2, -2, 0, 120), - AFFINEANIMCMD_END -}; - -const union AffineAnimCmd gSpriteAffineAnim_83B6F44[] = { - AFFINEANIMCMD_FRAME(16, 16, 0, 0), - AFFINEANIMCMD_FRAME(16, 16, 0, 15), - AFFINEANIMCMD_END -}; - -const union AffineAnimCmd *const gSpriteAffineAnimTable_83B6F5C[] = { - gSpriteAffineAnim_83B6F34, - gSpriteAffineAnim_83B6F44 -}; diff --git a/src/pokemon_storage_system_4.c b/src/pokemon_storage_system_4.c index 2d156c159..fff545492 100644 --- a/src/pokemon_storage_system_4.c +++ b/src/pokemon_storage_system_4.c @@ -26,7 +26,7 @@ struct WallpaperTable { EWRAM_DATA struct Pokemon gUnknown_02038480 = {}; #if DEBUG -EWRAM_DATA u32 unk_2038790 = 0; +EWRAM_DATA u8 unk_2038790 = 0; EWRAM_DATA u32 unk_2038794 = 0; EWRAM_DATA u32 unk_2038798 = 0; #endif @@ -37,6 +37,7 @@ EWRAM_DATA u8 gUnknown_020384E7 = 0; EWRAM_DATA u8 gUnknown_020384E8 = 0; EWRAM_DATA u8 gUnknown_020384E9 = 0; EWRAM_DATA u8 gUnknown_020384EA = 0; +EWRAM_DATA struct UnkStruct_2000020 *gUnknown_020384EC = NULL; // Static ROM declarations @@ -76,6 +77,9 @@ bool8 sub_809CAB0(void); void sub_809CC04(void); void sub_809CD88(void); s8 sub_809CE4C(u8 a0); +void sub_809CA8C(void); +void sub_809D0BC(struct UnkStruct_2000028*); +void sub_809D1C4(struct UnkStruct_2000028*); // .rodata @@ -325,6 +329,14 @@ bool8 (*const gUnknown_083BBBC8[])(void) = { sub_809B1D8, sub_809B24C }; + +extern const struct SpriteSheet gHandCursorSpriteSheets[3]; +extern const struct SpritePalette gHandCursorSpritePalettes[3]; +extern const struct SpriteTemplate gSpriteTemplate_83BBC70; +extern const struct SpriteTemplate gSpriteTemplate_83BBC88; +extern const u8 *const gUnknown_083BBCA0[]; +extern struct PokemonStorageSystemFunc gUnknown_083BBBD4[]; + // .text void sub_8099BF8(u8 boxId) @@ -2847,3 +2859,744 @@ NAKED u8 sub_809C664(void) "\tbx r1"); } #endif + +u8 sub_809C85C(void) +{ + u8 retVal; + s8 var0; + register s8 var1 asm("r5"); // FAKEMATCHING: r5 and r6 become swapped without this register hack + + gPokemonStorageSystemPtr->unk_11df = 0; + gPokemonStorageSystemPtr->unk_11de = 0; + gPokemonStorageSystemPtr->unk_11e3 = 0; + + if (!(gMain.newAndRepeatedKeys & DPAD_UP)) + { + if (gMain.newAndRepeatedKeys & DPAD_DOWN) + { + retVal = 1; + var0 = 0; + var1 = 2; + } + else + { + if (gMain.heldKeys & DPAD_LEFT) + return 10; + if (gMain.heldKeys & DPAD_RIGHT) + return 9; + if (gSaveBlock2.optionsButtonMode == OPTIONS_BUTTON_MODE_LR) + { + if (gMain.heldKeys & L_BUTTON) + return 10; + if (gMain.heldKeys & R_BUTTON) + return 9; + } + + if (gMain.newKeys & A_BUTTON) + { + sub_809A860(0); + sub_809CA8C(); + return 7; + } + + if (gMain.newKeys & B_BUTTON) + return 16; + + if (gMain.newKeys & SELECT_BUTTON) + { + sub_809CD88(); + return 0; + } + + retVal = 0; + } + } + else + { + retVal = 1; + var0 = 3; + var1 = 0; + gPokemonStorageSystemPtr->unk_11e3 = 1; + } + + if (retVal) + { + if (var0 != 2) + sub_809A860(0); + sub_809AF18(var0, var1); + return retVal; + } + + return retVal; +} + +#ifdef NONMATCHING +u8 sub_809C944(void) +{ + u8 r6; + s8 var0 = gUnknown_020384E4; + s8 var1 = gUnknown_020384E5; + + gPokemonStorageSystemPtr->unk_11df = 0; + gPokemonStorageSystemPtr->unk_11de = 0; + gPokemonStorageSystemPtr->unk_11e3 = 0; + + if (!(gMain.newAndRepeatedKeys & DPAD_UP)) + { + if (gMain.newAndRepeatedKeys & (DPAD_DOWN | START_BUTTON)) + { + r6 = 1; + var0 = 2; + var1 = 0; + gPokemonStorageSystemPtr->unk_11e3 = 1; + } + else if (gMain.newAndRepeatedKeys & DPAD_LEFT) + { + r6 = 1; + var1 -= 1; + if (var1 < 0) + { + gPokemonStorageSystemPtr->unk_11df = -1; + var1 = 1; + } + } + else if (gMain.newAndRepeatedKeys & DPAD_RIGHT) + { + r6 = 1; + var1 += 1; + if (var1 > 1) + { + gPokemonStorageSystemPtr->unk_11df = 1; + var1 = 0; + } + } + else if (gMain.newKeys & A_BUTTON) + { + return var1 == 0 ? 5 : 4; + } + else if (gMain.newKeys & B_BUTTON) + { + return 16; + } + else if (gMain.newKeys & SELECT_BUTTON) + { + sub_809CD88(); + return 0; + } + else + { + r6 = 0; + } + } + else + { + r6 = 1; + var0 = 0; + gPokemonStorageSystemPtr->unk_11de = -1; + var1 = !gUnknown_020384E5 ? 24 : 29; + gPokemonStorageSystemPtr->unk_11e3 = 1; + } + + if (r6) + { + sub_809AF18(var0, var1); + } + + return r6; +} +#else +NAKED +u8 sub_809C944(void) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + ldr r0, _0809C988 @ =gUnknown_020384E4\n\ + ldrb r0, [r0]\n\ + mov r12, r0\n\ + ldr r7, _0809C98C @ =gUnknown_020384E5\n\ + ldrb r3, [r7]\n\ + ldr r0, _0809C990 @ =gPokemonStorageSystemPtr\n\ + ldr r1, [r0]\n\ + ldr r0, _0809C994 @ =0x000011df\n\ + adds r5, r1, r0\n\ + movs r0, 0\n\ + strb r0, [r5]\n\ + ldr r2, _0809C998 @ =0x000011de\n\ + adds r4, r1, r2\n\ + strb r0, [r4]\n\ + adds r2, 0x5\n\ + adds r1, r2\n\ + strb r0, [r1]\n\ + ldr r6, _0809C99C @ =gMain\n\ + ldrh r2, [r6, 0x30]\n\ + movs r0, 0x40\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + bne _0809CA14\n\ + movs r0, 0x88\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _0809C9A0\n\ + movs r6, 0x1\n\ + movs r0, 0x2\n\ + mov r12, r0\n\ + movs r3, 0\n\ + b _0809CA2A\n\ + .align 2, 0\n\ +_0809C988: .4byte gUnknown_020384E4\n\ +_0809C98C: .4byte gUnknown_020384E5\n\ +_0809C990: .4byte gPokemonStorageSystemPtr\n\ +_0809C994: .4byte 0x000011df\n\ +_0809C998: .4byte 0x000011de\n\ +_0809C99C: .4byte gMain\n\ +_0809C9A0:\n\ + movs r0, 0x20\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _0809C9C0\n\ + movs r6, 0x1\n\ + lsls r0, r3, 24\n\ + movs r1, 0xFF\n\ + lsls r1, 24\n\ + adds r0, r1\n\ + lsrs r3, r0, 24\n\ + cmp r0, 0\n\ + bge _0809CA2C\n\ + movs r0, 0xFF\n\ + strb r0, [r5]\n\ + movs r3, 0x1\n\ + b _0809CA2C\n\ +_0809C9C0:\n\ + movs r0, 0x10\n\ + ands r0, r2\n\ + cmp r0, 0\n\ + beq _0809C9E0\n\ + movs r6, 0x1\n\ + lsls r0, r3, 24\n\ + movs r2, 0x80\n\ + lsls r2, 17\n\ + adds r0, r2\n\ + lsrs r3, r0, 24\n\ + asrs r0, 24\n\ + cmp r0, 0x1\n\ + ble _0809CA2C\n\ + strb r6, [r5]\n\ + movs r3, 0\n\ + b _0809CA2C\n\ +_0809C9E0:\n\ + ldrh r1, [r6, 0x2E]\n\ + movs r0, 0x1\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0809C9F4\n\ + movs r0, 0x4\n\ + cmp r3, 0\n\ + bne _0809CA3A\n\ + movs r0, 0x5\n\ + b _0809CA3A\n\ +_0809C9F4:\n\ + movs r0, 0x2\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0809CA00\n\ + movs r0, 0x10\n\ + b _0809CA3A\n\ +_0809CA00:\n\ + movs r0, 0x4\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0809CA10\n\ + bl sub_809CD88\n\ + movs r0, 0\n\ + b _0809CA3A\n\ +_0809CA10:\n\ + movs r6, 0\n\ + b _0809CA38\n\ +_0809CA14:\n\ + movs r6, 0x1\n\ + movs r0, 0\n\ + mov r12, r0\n\ + movs r0, 0xFF\n\ + strb r0, [r4]\n\ + movs r0, 0\n\ + ldrsb r0, [r7, r0]\n\ + movs r3, 0x1D\n\ + cmp r0, 0\n\ + bne _0809CA2A\n\ + movs r3, 0x18\n\ +_0809CA2A:\n\ + strb r6, [r1]\n\ +_0809CA2C:\n\ + cmp r6, 0\n\ + beq _0809CA38\n\ + mov r0, r12\n\ + adds r1, r3, 0\n\ + bl sub_809AF18\n\ +_0809CA38:\n\ + adds r0, r6, 0\n\ +_0809CA3A:\n\ + pop {r4-r7}\n\ + pop {r1}\n\ + bx r1\n\ + .syntax divided\n"); +} +#endif // NONMATCHING + +u8 sub_809CA40(void) +{ + u16 i = 0; + while (gUnknown_083BBBD4[i].func != NULL) + { + if (gUnknown_083BBBD4[i].unk4 == gUnknown_020384E4) + return gUnknown_083BBBD4[i].func(); + i++; + } + + return 0; +} + +void sub_809CA8C(void) +{ + sub_809CDCC(); + sub_809CDEC(9); + sub_809CDEC(10); + sub_809CDEC(11); + sub_809CDEC(0); +} + +#if DEBUG +u8 debug_sub_80AA40C(void) +{ + if (!sub_809AB8C()) + return 0; + + sub_809CDCC(); + sub_809CDEC(32); + sub_809CDEC(6); + return 1; +} +#endif + +bool8 sub_809CAB0(void) +{ + u16 var0; + +#if DEBUG + if (unk_2038790) + return debug_sub_80AA40C(); +#endif + + sub_809CDCC(); + var0 = sub_809AB8C(); + + switch (gPokemonStorageSystemPtr->unk_0005) + { + case 1: + if (var0) + sub_809CDEC(1); + else + return 0; + break; + case 0: + if (var0) + sub_809CDEC(2); + else + return 0; + break; + case 2: + if (gUnknown_020384E6) + { + if (var0) + sub_809CDEC(4); + else + sub_809CDEC(5); + } + else + { + if (var0) + sub_809CDEC(3); + else + return 0; + } + break; + default: + return 0; + } + + sub_809CDEC(6); + if (gPokemonStorageSystemPtr->unk_0005 == 2) + { + if (!gUnknown_020384E4) + sub_809CDEC(2); + else + sub_809CDEC(1); + } + + sub_809CDEC(8); + sub_809CDEC(7); + sub_809CDEC(0); + return 1; +} + +void sub_809CB74(struct Sprite *sprite) +{ + sprite->pos1.x = gPokemonStorageSystemPtr->unk_11c0->pos1.x; + sprite->pos1.y = gPokemonStorageSystemPtr->unk_11c0->pos1.y + 20; +} + +void sub_809CB94(struct Pokemon *mon) +{ + if (gUnknown_020384E4 == 1) + { + mon->box = gPlayerParty[gUnknown_020384E5].box; + } + else + { + u8 boxId = get_preferred_box(); + mon->box = gPokemonStorage.boxes[boxId][gUnknown_020384E5]; + } +} + +void sub_809CC04(void) +{ + u16 x, y; + u8 spriteId; + int priority, subpriority; + struct SpriteSheet spriteSheets[3]; + struct SpritePalette spritePalettes[3]; + + memcpy(spriteSheets, gHandCursorSpriteSheets, 24); + memcpy(spritePalettes, gHandCursorSpritePalettes, 24); + LoadSpriteSheets(spriteSheets); + LoadSpritePalettes(spritePalettes); + gPokemonStorageSystemPtr->unk_11e4[0] = IndexOfSpritePaletteTag(0xDAC6); + gPokemonStorageSystemPtr->unk_11e4[1] = IndexOfSpritePaletteTag(0xDAD1); + + sub_809AACC(gUnknown_020384E4, gUnknown_020384E5, &x, &y); + spriteId = CreateSprite(&gSpriteTemplate_83BBC70, x, y, 6); + if (spriteId != MAX_SPRITES) + { + gPokemonStorageSystemPtr->unk_11c0 = &gSprites[spriteId]; + gPokemonStorageSystemPtr->unk_11c0->oam.paletteNum = gPokemonStorageSystemPtr->unk_11e4[gUnknown_020384E9]; + if (gUnknown_020384E6) + StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 3); + } + else + { + gPokemonStorageSystemPtr->unk_11c0 = NULL; + } + + if (gUnknown_020384E4 == 1) + { + subpriority = 12; + priority = 1; + } + else + { + subpriority = 20; + priority = 2; + } + + spriteId = CreateSprite(&gSpriteTemplate_83BBC88, 0, 0, subpriority); + if (spriteId != MAX_SPRITES) + { + gPokemonStorageSystemPtr->unk_11c4 = &gSprites[spriteId]; + gPokemonStorageSystemPtr->unk_11c4->oam.priority = priority; + if (gUnknown_020384E4) + gPokemonStorageSystemPtr->unk_11c4->invisible = 1; + } + else + { + gPokemonStorageSystemPtr->unk_11c4 = NULL; + } +} + +void sub_809CD88(void) +{ + gUnknown_020384E9 = !gUnknown_020384E9; + gPokemonStorageSystemPtr->unk_11c0->oam.paletteNum = gPokemonStorageSystemPtr->unk_11e4[gUnknown_020384E9]; +} + +void sub_809CDCC(void) +{ + gPokemonStorageSystemPtr->unk_11b8 = 0; + gPokemonStorageSystemPtr->unk_11b9 = 0; +} + +void sub_809CDEC(u8 arg0) +{ + u8 width; + u8 var0; + + if (gPokemonStorageSystemPtr->unk_11b8 < 7) + { + struct StorageText *storageText = &gPokemonStorageSystemPtr->unk_1180[gPokemonStorageSystemPtr->unk_11b8]; + storageText->text = gUnknown_083BBCA0[arg0]; + storageText->textId = arg0; + width = GetStringWidthInMenuWindow(storageText->text); + var0 = (width + 7) / 8; + if (var0 > gPokemonStorageSystemPtr->unk_11b9) + gPokemonStorageSystemPtr->unk_11b9 = var0; + + gPokemonStorageSystemPtr->unk_11b8++; + } +} + +s8 sub_809CE4C(u8 arg0) +{ + if (arg0 >= gPokemonStorageSystemPtr->unk_11b8) + return -1; + else + return gPokemonStorageSystemPtr->unk_1180[arg0].textId; +} + +void sub_809CE84(void) +{ + gPokemonStorageSystemPtr->unk_11bc = 14 - gPokemonStorageSystemPtr->unk_11b8 * 2; + gPokemonStorageSystemPtr->unk_11ba = 28 - gPokemonStorageSystemPtr->unk_11b9; + Menu_DrawStdWindowFrame(gPokemonStorageSystemPtr->unk_11ba, gPokemonStorageSystemPtr->unk_11bc, 29, 15); + Menu_PrintItems( + gPokemonStorageSystemPtr->unk_11ba + 1, + gPokemonStorageSystemPtr->unk_11bc + 1, + gPokemonStorageSystemPtr->unk_11b8, + gPokemonStorageSystemPtr->unk_1180); + InitMenu( + 0, + gPokemonStorageSystemPtr->unk_11ba + 1, + gPokemonStorageSystemPtr->unk_11bc + 1, + gPokemonStorageSystemPtr->unk_11b8, + 0, + gPokemonStorageSystemPtr->unk_11b9); +} + +#ifdef NONMATCHING // r4 and r5 are swapped throughout the entire function. +s16 sub_809CF30(void) +{ + int textId = -2; + + if (!(gMain.newKeys & A_BUTTON)) + { + if (gMain.newKeys & B_BUTTON) + { + PlaySE(5); + textId++; + } + + if (gMain.newKeys & DPAD_UP) + { + PlaySE(5); + Menu_MoveCursor(-1); + } + else if (gMain.newKeys & DPAD_DOWN) + { + PlaySE(5); + Menu_MoveCursor(1); + } + } + else + { + textId = Menu_GetCursorPos(); + } + + if (textId != -2) + { + Menu_DestroyCursor(); + Menu_EraseWindowRect( + gPokemonStorageSystemPtr->unk_11ba, + gPokemonStorageSystemPtr->unk_11bc, + 29, + 15); + } + + if (textId >= 0) + { + textId = gPokemonStorageSystemPtr->unk_1180[textId].textId; + } + + return textId; +} +#else +NAKED +s16 sub_809CF30(void) +{ + asm(".syntax unified\n\ + push {r4,r5,lr}\n\ + movs r5, 0x2\n\ + negs r5, r5\n\ + ldr r4, _0809CF6C @ =gMain\n\ + ldrh r1, [r4, 0x2E]\n\ + movs r0, 0x1\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + bne _0809CF86\n\ + movs r0, 0x2\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0809CF52\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + adds r5, 0x1\n\ +_0809CF52:\n\ + ldrh r1, [r4, 0x2E]\n\ + movs r0, 0x40\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0809CF70\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + movs r0, 0x1\n\ + negs r0, r0\n\ + bl Menu_MoveCursor\n\ + b _0809CF8E\n\ + .align 2, 0\n\ +_0809CF6C: .4byte gMain\n\ +_0809CF70:\n\ + movs r0, 0x80\n\ + ands r0, r1\n\ + cmp r0, 0\n\ + beq _0809CF8E\n\ + movs r0, 0x5\n\ + bl PlaySE\n\ + movs r0, 0x1\n\ + bl Menu_MoveCursor\n\ + b _0809CF8E\n\ +_0809CF86:\n\ + bl Menu_GetCursorPos\n\ + lsls r0, 24\n\ + lsrs r5, r0, 24\n\ +_0809CF8E:\n\ + movs r0, 0x2\n\ + negs r0, r0\n\ + cmp r5, r0\n\ + beq _0809CFB2\n\ + bl Menu_DestroyCursor\n\ + ldr r0, _0809CFD0 @ =gPokemonStorageSystemPtr\n\ + ldr r1, [r0]\n\ + ldr r2, _0809CFD4 @ =0x000011ba\n\ + adds r0, r1, r2\n\ + ldrb r0, [r0]\n\ + adds r2, 0x2\n\ + adds r1, r2\n\ + ldrb r1, [r1]\n\ + movs r2, 0x1D\n\ + movs r3, 0xF\n\ + bl Menu_EraseWindowRect\n\ +_0809CFB2:\n\ + cmp r5, 0\n\ + blt _0809CFC4\n\ + ldr r0, _0809CFD0 @ =gPokemonStorageSystemPtr\n\ + ldr r0, [r0]\n\ + lsls r1, r5, 3\n\ + ldr r2, _0809CFD8 @ =0x00001184\n\ + adds r0, r2\n\ + adds r0, r1\n\ + ldr r5, [r0]\n\ +_0809CFC4:\n\ + lsls r0, r5, 16\n\ + asrs r0, 16\n\ + pop {r4,r5}\n\ + pop {r1}\n\ + bx r1\n\ + .align 2, 0\n\ +_0809CFD0: .4byte gPokemonStorageSystemPtr\n\ +_0809CFD4: .4byte 0x000011ba\n\ +_0809CFD8: .4byte 0x00001184\n\ + .syntax divided\n"); +} +#endif // NONMATCHING + +void sub_809CFDC(struct UnkStruct_2000020 *arg0, struct UnkStruct_2000028 *arg1, u8 arg2) +{ + gUnknown_020384EC = arg0; + arg0->unk_00 = arg1; + arg0->unk_05 = arg2; + arg0->unk_04 = 0; +} + +void sub_809CFF0(void) +{ + u16 i; + struct UnkStruct_2000028 *unkStruct; + + if (gUnknown_020384EC->unk_04) + { + for (i = 0; i < gUnknown_020384EC->unk_04; i++) + { + unkStruct = &gUnknown_020384EC->unk_00[i]; + unkStruct->unk_0c(unkStruct); + } + + gUnknown_020384EC->unk_04 = 0; + } +} + +bool8 sub_809D034(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft, u16 sTop, u16 width, u16 height) +{ + struct UnkStruct_2000028 *unkStruct; + + if (gUnknown_020384EC->unk_04 >= gUnknown_020384EC->unk_05) + return FALSE; + + unkStruct = &gUnknown_020384EC->unk_00[gUnknown_020384EC->unk_04++]; + unkStruct->unk_08 = width * 2; + unkStruct->unk_04 = dest + (dTop * 64) + (dLeft * 2); + unkStruct->unk_00 = src + (sTop * 64) + (sLeft * 2); + unkStruct->unk_0a = height; + unkStruct->unk_0c = sub_809D0BC; + return TRUE; +} + +void sub_809D0BC(struct UnkStruct_2000028 *unkStruct) +{ + u32 i; + const u8 *src = unkStruct->unk_00; + u8 *dest = unkStruct->unk_04; + int height = unkStruct->unk_0a; + int width = unkStruct->unk_08; + for (i = 0; i < height; i++) + { + CpuSet(src, dest, (width / 2) & 0x1FFFFF); + dest += 64; + src += 64; + } +} + +void sub_809D104(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft, u16 sTop, u16 width, u16 height) +{ + const u8 *from = src + (sTop * 64) + (sLeft * 2); + u8 *to = dest + (dTop * 64) + (dLeft * 2); + u8 *end = dest + (dTop + height) * 64; + int width2 = width * 2; + while (to < end) + { + CpuSet(from, to, (width2 / 2) & 0x1FFFFF); + to += 64; + from += 64; + } +} + +bool8 sub_809D16C(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height) +{ + struct UnkStruct_2000028 *unkStruct; + + if (gUnknown_020384EC->unk_04 >= gUnknown_020384EC->unk_05) + return FALSE; + + unkStruct = &gUnknown_020384EC->unk_00[gUnknown_020384EC->unk_04++]; + unkStruct->unk_08 = width * 2; + unkStruct->unk_04 = dest + ((dTop * 32) + dLeft) * 2; + unkStruct->unk_0a = height; + unkStruct->unk_0c = sub_809D1C4; + return TRUE; +} + +void sub_809D1C4(struct UnkStruct_2000028 *unkStruct) +{ + u16 i; + + for (i = 0; i < unkStruct->unk_0a; i++) + { + Dma3FillLarge_(0, unkStruct->unk_04, unkStruct->unk_08, 16); + unkStruct->unk_04 += 64; + } +} diff --git a/src/pokemon_storage_system_5.c b/src/pokemon_storage_system_5.c deleted file mode 100644 index b7c3d42f5..000000000 --- a/src/pokemon_storage_system_5.c +++ /dev/null @@ -1,16 +0,0 @@ - -// Includes -#include "global.h" -#include "pokemon_storage_system.h" - -// Static type declarations - -// Static RAM declarations - -EWRAM_DATA struct UnkStruct_2000020 *gUnknown_020384EC = NULL; - -// Static ROM declarations - -// .rodata - -// .text diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 49df4863e..21394f348 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -19,6 +19,7 @@ #include "task.h" #include "text.h" #include "scanline_effect.h" +#include "pokemon_storage_system.h" struct UnknownPokenav0 { @@ -189,7 +190,6 @@ extern void sub_80EFC3C(void); extern void sub_80EF624(const u16 *, const u16 *, u8, u8, u16 *); extern void sub_80EF7D4(void); extern void sub_80EF54C(u8); -extern void sub_809D104(u16 *, u16, u16, const u8 *, u16, u16, u16, u16); extern void sub_80EF58C(u8); extern void sub_80F6FFC(); extern void sub_80F3294(); diff --git a/src/record_mixing.c b/src/record_mixing.c index 0eb13899e..50ef21139 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -26,7 +26,7 @@ #include "tv.h" #include "ewram.h" -EWRAM_DATA struct RecordMixingDayCareMail gUnknown_02038738 = {0}; +EWRAM_DATA struct RecordMixingDayCareMail gDayCareMailRecord = {0}; extern u16 gSpecialVar_0x8005; u32 gUnknown_03005D2C; @@ -39,8 +39,8 @@ void *recordMixingTvShows = &gSaveBlock1.tvShows; void *gUnknown_083D0274 = &gSaveBlock1.pokeNews; void *gUnknown_083D0278 = &gSaveBlock1.mauvilleMan; void *recordMixingEasyChatPairs = &gSaveBlock1.easyChatPairs; -struct RecordMixingDayCareMail *gUnknown_083D0280 = &gUnknown_02038738; -void *gBattleTowerPlayerRecord = &gSaveBlock2.battleTower.playerRecord; +struct RecordMixingDayCareMail *gDayCareMailPlayerRecord = &gDayCareMailRecord; +struct BattleTowerRecord *gBattleTowerPlayerRecord = &gSaveBlock2.battleTower.playerRecord; #define BUFFER_CHUNK_SIZE 200 @@ -56,14 +56,14 @@ struct PlayerRecords u8 filler1004[0x40]; u8 filler1044[0x40]; struct EasyChatPair easyChatPairs[5]; - struct RecordMixingDayCareMail filler10AC; + struct RecordMixingDayCareMail daycareMailRecord; struct BattleTowerRecord battleTowerRecord; u16 filler11C8[0x34]; }; void RecordMixing_PrepareExchangePacket(void) { - sub_80BC300(); + SetPlayerSecretBaseRecordMixingParty(); sub_80C045C(); memcpy(ewram_2018000.secretBases, recordMixingSecretBases, sizeof(ewram_2018000.secretBases)); @@ -71,10 +71,10 @@ void RecordMixing_PrepareExchangePacket(void) memcpy(ewram_2018000.filler1004, gUnknown_083D0274, sizeof(ewram_2008000.filler1004)); memcpy(ewram_2018000.filler1044, gUnknown_083D0278, sizeof(ewram_2008000.filler1044)); memcpy(ewram_2018000.easyChatPairs, recordMixingEasyChatPairs, sizeof(ewram_2018000.easyChatPairs)); - gUnknown_02038738.mail[0] = gSaveBlock1.daycare.misc.mail[0]; - gUnknown_02038738.mail[1] = gSaveBlock1.daycare.misc.mail[1]; - InitDaycareMailRecordMixing(gSaveBlock1.daycare.mons, &gUnknown_02038738); - memcpy(&ewram_2018000.filler10AC, gUnknown_083D0280, sizeof(struct RecordMixingDayCareMail)); + gDayCareMailRecord.mail[0] = gSaveBlock1.daycare.misc.mail[0]; + gDayCareMailRecord.mail[1] = gSaveBlock1.daycare.misc.mail[1]; + InitDaycareMailRecordMixing(gSaveBlock1.daycare.mons, &gDayCareMailRecord); + memcpy(&ewram_2018000.daycareMailRecord, gDayCareMailPlayerRecord, sizeof(struct RecordMixingDayCareMail)); memcpy(&ewram_2018000.battleTowerRecord, gBattleTowerPlayerRecord, sizeof(struct BattleTowerRecord)); if (GetMultiplayerId() == 0) @@ -88,7 +88,7 @@ void RecordMixing_ReceiveExchangePacket(u32 a) sub_80C0514(ewram_2008000.filler1004, sizeof(struct PlayerRecords), a); sub_80B9B1C(ewram_2008000.filler1044, sizeof(struct PlayerRecords), a); sub_80FA4E4(ewram_2008000.easyChatPairs, sizeof(struct PlayerRecords), a); - sub_80B9C6C((u8 *)&ewram_2008000.filler10AC, sizeof(struct PlayerRecords), a, ewram_2008000.tvShows); + sub_80B9C6C((u8 *)&ewram_2008000.daycareMailRecord, sizeof(struct PlayerRecords), a, ewram_2008000.tvShows); sub_80B9B70(&ewram_2008000.battleTowerRecord, sizeof(struct PlayerRecords), a); sub_80B9F3C(ewram_2008000.filler11C8, a); } diff --git a/src/secret_base.c b/src/secret_base.c index ca5f0c31f..0892016d9 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -653,7 +653,7 @@ bool8 sub_80BC268(u8 i) return FALSE; } -u8 sub_80BC298(struct Pokemon *mon) +static u8 CalculateMonAverageEVs(struct Pokemon *mon) { u16 evsum = GetMonData(mon, MON_DATA_HP_EV); evsum += GetMonData(mon, MON_DATA_ATK_EV); @@ -664,192 +664,37 @@ u8 sub_80BC298(struct Pokemon *mon) return (u8)(evsum / 6); } -#ifdef NONMATCHING -// So much is wrong with this function. -// The compiler likes to store pointers in temp variables. That's not what it's supposed to do. -void sub_80BC300(void) +void SetPlayerSecretBaseRecordMixingParty(void) { - u16 partyidx; - u16 moveidx; - u16 sbpartyidx = 0; - for (partyidx=0; partyidx<PARTY_SIZE; partyidx++) + u16 i; + u16 secretBasePartyIndex = 0; + struct SecretBaseRecord *record = &gSaveBlock1.secretBases[0]; + for (i = 0; i < PARTY_SIZE; i++) { - for (moveidx=0; moveidx<4; moveidx++) - gSaveBlock1.secretBases[0].partyMoves[partyidx * 4 + moveidx] = MOVE_NONE; - gSaveBlock1.secretBases[0].partySpecies[partyidx] = SPECIES_NONE; - gSaveBlock1.secretBases[0].partyHeldItems[partyidx] = ITEM_NONE; - gSaveBlock1.secretBases[0].partyLevels[partyidx] = 0; - gSaveBlock1.secretBases[0].partyPersonality[partyidx] = 0; - gSaveBlock1.secretBases[0].partyEVs[partyidx] = 0; - if (GetMonData(&(gPlayerParty[partyidx]), MON_DATA_SPECIES) != SPECIES_NONE && !GetMonData(&(gPlayerParty[partyidx]), MON_DATA_IS_EGG)) { - for (moveidx=0; moveidx<4; moveidx++) - gSaveBlock1.secretBases[0].partyMoves[sbpartyidx * 4 + moveidx] = GetMonData(&(gPlayerParty[partyidx]), MON_DATA_MOVE1 + moveidx); - gSaveBlock1.secretBases[0].partySpecies[sbpartyidx] = GetMonData(&(gPlayerParty[partyidx]), MON_DATA_SPECIES); - gSaveBlock1.secretBases[0].partyHeldItems[sbpartyidx] = GetMonData(&(gPlayerParty[partyidx]), MON_DATA_HELD_ITEM); - gSaveBlock1.secretBases[0].partyLevels[sbpartyidx] = GetMonData(&(gPlayerParty[partyidx]), MON_DATA_LEVEL); - gSaveBlock1.secretBases[0].partyPersonality[sbpartyidx] = GetMonData(&(gPlayerParty[partyidx]), MON_DATA_PERSONALITY); - gSaveBlock1.secretBases[0].partyEVs[sbpartyidx] = sub_80BC298(&(gPlayerParty[partyidx])); - sbpartyidx ++; + u16 j; + for (j = 0; j < 4; j++) + record->partyMoves[i * 4 + j] = MOVE_NONE; + + record->partySpecies[i] = SPECIES_NONE; + record->partyHeldItems[i] = ITEM_NONE; + record->partyLevels[i] = 0; + record->partyPersonality[i] = 0; + record->partyEVs[i] = 0; + + if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) != SPECIES_NONE && !GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG)) + { + for (j = 0; j < 4; j++) + record->partyMoves[secretBasePartyIndex * 4 + j] = GetMonData(&gPlayerParty[i], MON_DATA_MOVE1 + j); + + record->partySpecies[secretBasePartyIndex] = GetMonData(&(gPlayerParty[i]), MON_DATA_SPECIES); + record->partyHeldItems[secretBasePartyIndex] = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM); + record->partyLevels[secretBasePartyIndex] = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL); + record->partyPersonality[secretBasePartyIndex] = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY); + record->partyEVs[secretBasePartyIndex] = CalculateMonAverageEVs(&gPlayerParty[i]); + secretBasePartyIndex++; } } } -#else -NAKED -void sub_80BC300(void) -{ - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ - mov r7, r10\n\ - mov r6, r9\n\ - mov r5, r8\n\ - push {r5-r7}\n\ - sub sp, 0xC\n\ - movs r0, 0\n\ - mov r10, r0\n\ - movs r6, 0\n\ - mov r9, r6\n\ -_080BC314:\n\ - movs r4, 0\n\ - lsls r3, r6, 2\n\ - lsls r2, r6, 1\n\ - ldr r7, _080BC424 @ =gPlayerParty\n\ - adds r1, r6, 0x1\n\ - str r1, [sp]\n\ - adds r1, r3, 0\n\ -_080BC322:\n\ - adds r0, r1, r4\n\ - lsls r0, 1\n\ - ldr r5, _080BC428 @ =gSaveBlock1 + 0x1A54\n\ - adds r0, r5, r0\n\ - mov r5, r9\n\ - strh r5, [r0]\n\ - adds r0, r4, 0x1\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ - cmp r4, 0x3\n\ - bls _080BC322\n\ - ldr r1, _080BC42C @ =gSaveBlock1 + 0x1A84\n\ - adds r0, r1, r2\n\ - strh r5, [r0]\n\ - ldr r5, _080BC430 @ =gSaveBlock1 + 0x1A90\n\ - adds r0, r5, r2\n\ - mov r1, r9\n\ - strh r1, [r0]\n\ - ldr r2, _080BC434 @ =gSaveBlock1 + 0x1A9C\n\ - adds r0, r2, r6\n\ - mov r5, r9\n\ - strb r5, [r0]\n\ - ldr r1, _080BC438 @ =gSaveBlock1 + 0x1A3C\n\ - adds r0, r1, r3\n\ - mov r2, r9\n\ - str r2, [r0]\n\ - ldr r3, _080BC43C @ =gSaveBlock1 + 0x1AA2\n\ - adds r0, r3, r6\n\ - strb r2, [r0]\n\ - movs r0, 0x64\n\ - adds r5, r6, 0\n\ - muls r5, r0\n\ - adds r4, r5, r7\n\ - adds r0, r4, 0\n\ - movs r1, 0xB\n\ - bl GetMonData\n\ - cmp r0, 0\n\ - beq _080BC408\n\ - adds r0, r4, 0\n\ - movs r1, 0x2D\n\ - bl GetMonData\n\ - cmp r0, 0\n\ - bne _080BC408\n\ - movs r4, 0\n\ - mov r0, r10\n\ - lsls r0, 2\n\ - mov r8, r0\n\ - mov r1, r10\n\ - lsls r7, r1, 1\n\ - adds r1, 0x1\n\ - str r1, [sp, 0x4]\n\ - ldr r2, _080BC424 @ =gPlayerParty\n\ -_080BC38E:\n\ - adds r1, r4, 0\n\ - adds r1, 0xD\n\ - adds r0, r5, r2\n\ - str r2, [sp, 0x8]\n\ - bl GetMonData\n\ - mov r3, r8\n\ - adds r1, r3, r4\n\ - lsls r1, 1\n\ - ldr r3, _080BC428 @ =gSaveBlock1 + 0x1A54\n\ - adds r1, r3, r1\n\ - strh r0, [r1]\n\ - adds r0, r4, 0x1\n\ - lsls r0, 16\n\ - lsrs r4, r0, 16\n\ - ldr r2, [sp, 0x8]\n\ - cmp r4, 0x3\n\ - bls _080BC38E\n\ - movs r0, 0x64\n\ - adds r4, r6, 0\n\ - muls r4, r0\n\ - ldr r0, _080BC424 @ =gPlayerParty\n\ - adds r4, r0\n\ - adds r0, r4, 0\n\ - movs r1, 0xB\n\ - bl GetMonData\n\ - ldr r5, _080BC42C @ =gSaveBlock1 + 0x1A84\n\ - adds r1, r5, r7\n\ - strh r0, [r1]\n\ - adds r0, r4, 0\n\ - movs r1, 0xC\n\ - bl GetMonData\n\ - ldr r2, _080BC430 @ =gSaveBlock1 + 0x1A90\n\ - adds r1, r2, r7\n\ - strh r0, [r1]\n\ - adds r0, r4, 0\n\ - movs r1, 0x38\n\ - bl GetMonData\n\ - ldr r1, _080BC434 @ =gSaveBlock1 + 0x1A9C\n\ - add r1, r10\n\ - strb r0, [r1]\n\ - adds r0, r4, 0\n\ - movs r1, 0\n\ - bl GetMonData\n\ - ldr r1, _080BC438 @ =gSaveBlock1 + 0x1A3C\n\ - add r1, r8\n\ - str r0, [r1]\n\ - adds r0, r4, 0\n\ - bl sub_80BC298\n\ - ldr r1, _080BC43C @ =gSaveBlock1 + 0x1AA2\n\ - add r1, r10\n\ - strb r0, [r1]\n\ - ldr r3, [sp, 0x4]\n\ - lsls r0, r3, 16\n\ - lsrs r0, 16\n\ - mov r10, r0\n\ -_080BC408:\n\ - ldr r5, [sp]\n\ - lsls r0, r5, 16\n\ - lsrs r6, r0, 16\n\ - cmp r6, 0x5\n\ - bls _080BC314\n\ - add sp, 0xC\n\ - pop {r3-r5}\n\ - mov r8, r3\n\ - mov r9, r4\n\ - mov r10, r5\n\ - pop {r4-r7}\n\ - pop {r0}\n\ - bx r0\n\ - .align 2, 0\n\ -_080BC424: .4byte gPlayerParty\n\ -_080BC428: .4byte gSaveBlock1 + 0x1A54\n\ -_080BC42C: .4byte gSaveBlock1 + 0x1A84\n\ -_080BC430: .4byte gSaveBlock1 + 0x1A90\n\ -_080BC434: .4byte gSaveBlock1 + 0x1A9C\n\ -_080BC438: .4byte gSaveBlock1 + 0x1A3C\n\ -_080BC43C: .4byte gSaveBlock1 + 0x1AA2\n\ -.syntax divided\n"); -} -#endif void sub_80BC440(void) { diff --git a/sym_ewram.txt b/sym_ewram.txt index de0d1b1aa..20a845653 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -339,7 +339,6 @@ gBattleMonForms = .; /* 2024E84 */ . = ALIGN(4); src/pokemon_storage_system_2.o(ewram_data); . = ALIGN(4); src/pokemon_storage_system_3.o(ewram_data); . = ALIGN(4); src/pokemon_storage_system_4.o(ewram_data); -. = ALIGN(4); src/pokemon_storage_system_5.o(ewram_data); . = ALIGN(4); src/pokemon_summary_screen.o(ewram_data); . = ALIGN(4); src/script_movement.o(ewram_data); . = ALIGN(4); src/map_name_popup.o(ewram_data); |
