diff options
469 files changed, 29378 insertions, 30861 deletions
diff --git a/INSTALL.md b/INSTALL.md index 64c35d5ed..954bd1d97 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -8,6 +8,6 @@ TBD Install [**devkitARM**](http://devkitpro.org/wiki/Getting_Started/devkitARM). -Then get the compiled tools from https://github.com/YamaArashi/pokeruby-tools. Copy the "tools" folder over the "tools" folder in your pokeemerald directory. +Then download [**pokeruby-tools**](https://github.com/pret/pokeruby-tools). Copy the `tools/` folder with the compiled `exe`s to the `tools/` folder in your `pokeemerald/` directory. -You can then build pokeemerald using "make" in the MSYS environment provided with devkitARM. +You can then build pokeemerald using `make` in the MSYS environment provided with devkitARM. diff --git a/asm/battle_1.s b/asm/battle_1.s deleted file mode 100644 index 9665b0d11..000000000 --- a/asm/battle_1.s +++ /dev/null @@ -1,3065 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_8034C54 -sub_8034C54: @ 8034C54 - push {r4-r7,lr} - adds r4, r0, 0 - ldr r5, =gUnknown_02022E10 - ldr r0, [r5] - cmp r0, 0 - beq _08034C64 - bl sub_8034CC8 -_08034C64: - movs r0, 0x8 - bl Alloc - str r0, [r5] - cmp r0, 0 - bne _08034C78 - movs r0, 0 - b _08034CC0 - .pool -_08034C78: - lsls r0, r4, 3 - subs r0, r4 - lsls r0, 2 - bl Alloc - ldr r1, [r5] - str r0, [r1, 0x4] - cmp r0, 0 - bne _08034C94 - adds r0, r1, 0 - bl Free - movs r0, 0 - b _08034CC0 -_08034C94: - str r4, [r1] - movs r3, 0 - cmp r3, r4 - bcs _08034CBE - movs r7, 0 - movs r6, 0xFF - movs r2, 0 -_08034CA2: - ldr r0, [r5] - ldr r0, [r0, 0x4] - adds r0, r2, r0 - strb r7, [r0] - ldr r0, [r5] - ldr r1, [r0, 0x4] - adds r1, r2, r1 - ldrb r0, [r1, 0x1] - orrs r0, r6 - strb r0, [r1, 0x1] - adds r2, 0x1C - adds r3, 0x1 - cmp r3, r4 - bcc _08034CA2 -_08034CBE: - movs r0, 0x1 -_08034CC0: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_8034C54 - - thumb_func_start sub_8034CC8 -sub_8034CC8: @ 8034CC8 - push {r4,r5,lr} - ldr r2, =gUnknown_02022E10 - ldr r1, [r2] - cmp r1, 0 - beq _08034D08 - ldr r0, [r1, 0x4] - cmp r0, 0 - beq _08034CFC - movs r4, 0 - ldr r0, [r1] - cmp r4, r0 - bcs _08034CF2 - adds r5, r2, 0 -_08034CE2: - adds r0, r4, 0 - bl sub_80353DC - adds r4, 0x1 - ldr r0, [r5] - ldr r0, [r0] - cmp r4, r0 - bcc _08034CE2 -_08034CF2: - ldr r0, =gUnknown_02022E10 - ldr r0, [r0] - ldr r0, [r0, 0x4] - bl Free -_08034CFC: - ldr r4, =gUnknown_02022E10 - ldr r0, [r4] - bl Free - movs r0, 0 - str r0, [r4] -_08034D08: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8034CC8 - - thumb_func_start sub_8034D14 -sub_8034D14: @ 8034D14 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - mov r8, r0 - mov r10, r1 - adds r5, r2, 0 - ldr r6, =gUnknown_02022E10 - ldr r0, [r6] - cmp r0, 0 - beq _08034DD4 - ldr r1, [r0, 0x4] - mov r0, r8 - lsls r2, r0, 3 - subs r0, r2, r0 - lsls r4, r0, 2 - adds r1, r4, r1 - ldrb r0, [r1] - mov r9, r2 - cmp r0, 0 - bne _08034DD4 - ldrb r0, [r5, 0x1] - bl sub_8035518 - ldr r1, [r6] - ldr r1, [r1, 0x4] - adds r1, r4, r1 - strb r0, [r1, 0x1] - ldr r0, [r6] - ldr r0, [r0, 0x4] - adds r0, r4, r0 - ldrb r0, [r0, 0x1] - cmp r0, 0xFF - beq _08034DD4 - ldr r0, [r5, 0x8] - ldrh r0, [r0, 0x6] - bl GetSpriteTileStartByTag - ldr r2, [r6] - ldr r1, [r2, 0x4] - adds r1, r4, r1 - strh r0, [r1, 0xA] - ldr r0, [r2, 0x4] - adds r0, r4, r0 - ldrh r1, [r0, 0xA] - ldr r7, =0xffff0000 - lsrs r0, r7, 16 - cmp r1, r0 - bne _08034DE0 - ldr r2, [r5, 0x8] - ldrh r0, [r2, 0x4] - adds r1, r2, 0 - cmp r0, 0 - beq _08034D94 - adds r0, r1, 0 - bl LoadSpriteSheet - b _08034DB4 - .pool -_08034D94: - ldr r0, [r2] - ldr r1, [r2, 0x4] - str r0, [sp] - str r1, [sp, 0x4] - ldr r0, [r2] - bl sub_8034974 - lsls r0, 16 - lsrs r0, 16 - ldr r1, [sp, 0x4] - ands r1, r7 - orrs r1, r0 - str r1, [sp, 0x4] - mov r0, sp - bl LoadCompressedObjectPic -_08034DB4: - ldr r1, [r6] - ldr r1, [r1, 0x4] - adds r1, r4, r1 - strh r0, [r1, 0xA] - ldr r0, =gUnknown_02022E10 - ldr r0, [r0] - ldr r1, [r0, 0x4] - mov r2, r9 - mov r3, r8 - subs r0, r2, r3 - lsls r0, 2 - adds r0, r1 - ldrh r1, [r0, 0xA] - ldr r0, =0x0000ffff - cmp r1, r0 - bne _08034DE0 -_08034DD4: - movs r0, 0 - b _08034EE8 - .pool -_08034DE0: - ldr r0, [r5, 0xC] - ldrh r0, [r0, 0x4] - bl IndexOfSpritePaletteTag - ldr r6, =gUnknown_02022E10 - ldr r1, [r6] - ldr r1, [r1, 0x4] - mov r4, r9 - mov r3, r8 - subs r2, r4, r3 - lsls r4, r2, 2 - adds r1, r4, r1 - strb r0, [r1, 0x4] - ldr r0, [r6] - ldr r0, [r0, 0x4] - adds r0, r4, r0 - ldrb r0, [r0, 0x4] - cmp r0, 0xFF - bne _08034E14 - ldr r0, [r5, 0xC] - bl LoadSpritePalette - ldr r1, [r6] - ldr r1, [r1, 0x4] - adds r1, r4, r1 - strb r0, [r1, 0x4] -_08034E14: - ldr r0, [r6] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrb r0, [r5] - lsls r0, 30 - lsrs r0, 30 - strb r0, [r1, 0x2] - ldr r0, [r6] - ldr r0, [r0, 0x4] - adds r0, r4, r0 - ldrb r1, [r5, 0x1] - strb r1, [r0, 0x3] - ldr r2, [r6] - ldr r0, [r2, 0x4] - adds r0, r4, r0 - ldrh r1, [r5, 0x4] - strh r1, [r0, 0xC] - ldr r0, [r2, 0x4] - adds r0, r4, r0 - ldrh r1, [r5, 0x6] - strh r1, [r0, 0xE] - ldr r1, [r2, 0x4] - adds r1, r4, r1 - ldrb r0, [r5] - lsls r0, 28 - lsrs r0, 30 - strb r0, [r1, 0x6] - ldr r0, [r6] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrb r0, [r5] - lsls r0, 26 - lsrs r0, 30 - strb r0, [r1, 0x5] - ldr r0, [r6] - ldr r1, [r0, 0x4] - adds r1, r4, r1 - ldrb r0, [r5] - lsrs r0, 6 - strb r0, [r1, 0x7] - ldr r0, [r6] - ldr r0, [r0, 0x4] - adds r0, r4, r0 - ldrb r1, [r5, 0x2] - strb r1, [r0, 0x8] - ldrb r1, [r5] - lsls r0, r1, 28 - lsrs r0, 30 - lsls r1, 26 - lsrs r1, 30 - bl sub_80355F8 - ldr r1, [r6] - ldr r1, [r1, 0x4] - adds r1, r4, r1 - strb r0, [r1, 0x9] - ldr r2, [r6] - ldr r0, [r2, 0x4] - adds r0, r4, r0 - ldr r1, [r5, 0x8] - ldrh r1, [r1, 0x6] - strh r1, [r0, 0x10] - ldr r0, [r2, 0x4] - adds r0, r4, r0 - ldr r1, [r5, 0xC] - ldrh r1, [r1, 0x4] - strh r1, [r0, 0x12] - ldr r0, [r2, 0x4] - adds r0, r4, r0 - movs r1, 0x1 - strb r1, [r0] - ldr r0, [r6] - ldr r0, [r0, 0x4] - adds r0, r4, r0 - str r1, [r0, 0x14] - movs r3, 0x1 - ldrb r0, [r5, 0x1] - cmp r3, r0 - bcs _08034ECA -_08034EB2: - ldr r0, [r6] - ldr r2, [r0, 0x4] - adds r2, r4, r2 - ldr r1, [r2, 0x14] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 1 - str r0, [r2, 0x14] - adds r3, 0x1 - ldrb r2, [r5, 0x1] - cmp r3, r2 - bcc _08034EB2 -_08034ECA: - ldr r0, =gUnknown_02022E10 - ldr r0, [r0] - mov r3, r9 - mov r4, r8 - subs r1, r3, r4 - lsls r1, 2 - ldr r0, [r0, 0x4] - adds r0, r1 - bl sub_8034EFC - mov r0, r8 - mov r1, r10 - bl sub_8035044 - movs r0, 0x1 -_08034EE8: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8034D14 - - thumb_func_start sub_8034EFC -sub_8034EFC: @ 8034EFC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - adds r4, r0, 0 - ldrb r5, [r4, 0x1] - movs r0, 0xC - ldrsh r7, [r4, r0] - ldrb r0, [r4, 0x3] - adds r0, 0x1 - mov r8, r0 - mov r1, sp - movs r0, 0 - strh r0, [r1] - lsls r1, r5, 3 - ldr r2, =gUnknown_030022F8 - mov r9, r2 - add r1, r9 - mov r0, r8 - lsls r2, r0, 2 - movs r0, 0x80 - lsls r0, 17 - orrs r2, r0 - mov r0, sp - bl CpuSet - movs r6, 0 - ldrb r5, [r4, 0x1] - cmp r6, r8 - bcs _08034FCE - movs r1, 0x3F - mov r10, r1 - movs r2, 0xD - negs r2, r2 - mov r9, r2 -_08034F46: - lsls r0, r5, 3 - ldr r1, =gMain - adds r3, r0, r1 - ldrh r1, [r4, 0xE] - adds r0, r3, 0 - adds r0, 0x38 - strb r1, [r0] - ldr r2, =0x000001ff - adds r0, r2, 0 - adds r1, r7, 0 - ands r1, r0 - ldrh r2, [r3, 0x3A] - ldr r0, =0xfffffe00 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x3A] - ldrb r1, [r4, 0x6] - movs r0, 0x39 - adds r0, r3 - mov r12, r0 - lsls r1, 6 - ldrb r2, [r0] - mov r0, r10 - ands r0, r2 - orrs r0, r1 - mov r1, r12 - strb r0, [r1] - ldrb r1, [r4, 0x5] - movs r2, 0x3B - adds r2, r3 - mov r12, r2 - lsls r1, 6 - ldrb r2, [r2] - mov r0, r10 - ands r0, r2 - orrs r0, r1 - mov r1, r12 - strb r0, [r1] - ldrh r0, [r4, 0xA] - ldr r1, =0x000003ff - ands r1, r0 - ldrh r2, [r3, 0x3C] - ldr r0, =0xfffffc00 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x3C] - adds r3, 0x3D - movs r0, 0x3 - ldrb r1, [r4, 0x7] - ands r1, r0 - lsls r1, 2 - ldrb r2, [r3] - mov r0, r9 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - ldrb r2, [r4, 0x4] - lsls r2, 4 - movs r1, 0xF - ands r0, r1 - orrs r0, r2 - strb r0, [r3] - ldrb r0, [r4, 0x8] - adds r7, r0 - adds r6, 0x1 - adds r5, 0x1 - cmp r6, r8 - bcc _08034F46 -_08034FCE: - subs r5, 0x1 - ldr r0, =gMain - lsls r3, r5, 3 - adds r3, r0 - movs r2, 0xC - ldrsh r1, [r4, r2] - ldrb r0, [r4, 0x8] - subs r1, r0 - ldr r2, =0x000001ff - adds r0, r2, 0 - ands r1, r0 - ldrh r2, [r3, 0x3A] - ldr r0, =0xfffffe00 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x3A] - adds r2, r3, 0 - adds r2, 0x39 - ldrb r1, [r2] - movs r0, 0x4 - negs r0, r0 - ands r0, r1 - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2] - ldrb r0, [r4, 0x9] - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 1 - ldrh r4, [r4, 0xA] - adds r1, r4 - ldr r2, =0x000003ff - adds r0, r2, 0 - ands r1, r0 - ldrh r2, [r3, 0x3C] - ldr r0, =0xfffffc00 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x3C] - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8034EFC - - thumb_func_start sub_8035044 -sub_8035044: @ 8035044 - push {r4-r6,lr} - adds r3, r0, 0 - adds r4, r1, 0 - ldr r0, =gUnknown_02022E10 - ldr r1, [r0] - adds r6, r0, 0 - cmp r1, 0 - beq _080350A8 - ldr r2, [r1, 0x4] - lsls r1, r3, 3 - subs r0, r1, r3 - lsls r0, 2 - adds r2, r0, r2 - ldrb r0, [r2] - adds r5, r1, 0 - cmp r0, 0 - beq _080350A8 - str r4, [r2, 0x18] - cmp r4, 0 - bge _08035078 - movs r2, 0x1 - negs r4, r4 - b _0803507A - .pool -_08035078: - movs r2, 0 -_0803507A: - ldr r0, [r6] - ldr r1, [r0, 0x4] - subs r0, r5, r3 - lsls r0, 2 - adds r0, r1 - ldrb r3, [r0, 0x2] - cmp r3, 0x1 - beq _0803509A - cmp r3, 0x1 - ble _08035092 - cmp r3, 0x2 - beq _080350A2 -_08035092: - adds r1, r4, 0 - bl sub_80350B0 - b _080350A8 -_0803509A: - adds r1, r4, 0 - bl sub_8035164 - b _080350A8 -_080350A2: - adds r1, r4, 0 - bl sub_80352C0 -_080350A8: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8035044 - - thumb_func_start sub_80350B0 -sub_80350B0: @ 80350B0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - mov r8, r0 - mov r9, r1 - str r2, [sp] - ldr r5, [r0, 0x14] - ldrb r7, [r0, 0x1] - ldr r0, =gMain - mov r10, r0 - cmp r5, 0 - beq _0803511A - lsls r0, r7, 3 - adds r0, 0x3C - mov r1, r10 - adds r6, r0, r1 -_080350D6: - mov r0, r9 - adds r1, r5, 0 - bl __udivsi3 - adds r4, r0, 0 - adds r0, r4, 0 - muls r0, r5 - mov r2, r9 - subs r2, r0 - mov r9, r2 - adds r0, r5, 0 - movs r1, 0xA - bl __udivsi3 - adds r5, r0, 0 - mov r1, r8 - ldrb r0, [r1, 0x9] - adds r1, r4, 0 - muls r1, r0 - mov r2, r8 - ldrh r2, [r2, 0xA] - adds r1, r2 - ldr r2, =0x000003ff - adds r0, r2, 0 - ands r1, r0 - ldrh r0, [r6] - ldr r2, =0xfffffc00 - ands r0, r2 - orrs r0, r1 - strh r0, [r6] - adds r6, 0x8 - adds r7, 0x1 - cmp r5, 0 - bne _080350D6 -_0803511A: - ldr r0, [sp] - cmp r0, 0 - beq _08035140 - lsls r0, r7, 3 - add r0, r10 - adds r0, 0x39 - ldrb r2, [r0] - movs r1, 0x4 - negs r1, r1 - ands r1, r2 - strb r1, [r0] - b _08035154 - .pool -_08035140: - lsls r2, r7, 3 - add r2, r10 - adds r2, 0x39 - ldrb r1, [r2] - movs r0, 0x4 - negs r0, r0 - ands r0, r1 - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2] -_08035154: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80350B0 - - thumb_func_start sub_8035164 -sub_8035164: @ 8035164 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - adds r6, r0, 0 - mov r8, r1 - str r2, [sp] - ldr r5, [r6, 0x14] - ldr r3, =gUnknown_03000DD4 - ldrb r0, [r6, 0x1] - str r0, [r3] - ldr r2, =gUnknown_03000DD8 - movs r0, 0 - str r0, [r2] - ldr r1, =gUnknown_03000DDC - subs r0, 0x1 - str r0, [r1] - adds r7, r3, 0 - mov r10, r1 - ldr r0, =gMain - mov r9, r0 - cmp r5, 0 - beq _0803524C -_08035196: - mov r0, r8 - adds r1, r5, 0 - bl __udivsi3 - adds r4, r0, 0 - adds r0, r4, 0 - muls r0, r5 - mov r1, r8 - subs r1, r0 - mov r8, r1 - adds r0, r5, 0 - movs r1, 0xA - bl __udivsi3 - adds r5, r0, 0 - cmp r4, 0 - bne _080351C8 - mov r2, r10 - ldr r1, [r2] - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - bne _080351C8 - cmp r5, 0 - bne _08035224 -_080351C8: - ldr r2, [r7] - lsls r2, 3 - add r2, r9 - ldrb r0, [r6, 0x9] - adds r3, r4, 0 - muls r3, r0 - ldrh r4, [r6, 0xA] - adds r3, r4 - ldr r1, =0x000003ff - adds r0, r1, 0 - ands r3, r0 - ldrh r0, [r2, 0x3C] - ldr r4, =0xfffffc00 - adds r1, r4, 0 - ands r0, r1 - orrs r0, r3 - strh r0, [r2, 0x3C] - adds r2, 0x39 - ldrb r0, [r2] - movs r1, 0x4 - negs r1, r1 - ands r0, r1 - strb r0, [r2] - mov r2, r10 - ldr r1, [r2] - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - bne _0803523A - ldr r4, =gUnknown_03000DD8 - ldr r0, [r4] - str r0, [r2] - b _0803523A - .pool -_08035224: - ldr r0, [r7] - lsls r0, 3 - add r0, r9 - adds r0, 0x39 - ldrb r1, [r0] - movs r2, 0x4 - negs r2, r2 - ands r1, r2 - movs r2, 0x2 - orrs r1, r2 - strb r1, [r0] -_0803523A: - ldr r0, [r7] - adds r0, 0x1 - str r0, [r7] - ldr r4, =gUnknown_03000DD8 - ldr r0, [r4] - adds r0, 0x1 - str r0, [r4] - cmp r5, 0 - bne _08035196 -_0803524C: - ldr r0, [sp] - cmp r0, 0 - beq _08035298 - ldr r1, [r7] - lsls r1, 3 - add r1, r9 - adds r1, 0x39 - ldrb r2, [r1] - movs r0, 0x4 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - ldr r3, [r7] - lsls r3, 3 - add r3, r9 - movs r1, 0xC - ldrsh r2, [r6, r1] - mov r4, r10 - ldr r0, [r4] - subs r0, 0x1 - ldrb r1, [r6, 0x8] - muls r0, r1 - adds r2, r0 - ldr r1, =0x000001ff - adds r0, r1, 0 - ands r2, r0 - ldrh r1, [r3, 0x3A] - ldr r0, =0xfffffe00 - ands r0, r1 - orrs r0, r2 - strh r0, [r3, 0x3A] - b _080352AE - .pool -_08035298: - ldr r0, [r7] - lsls r0, 3 - add r0, r9 - adds r0, 0x39 - ldrb r2, [r0] - movs r1, 0x4 - negs r1, r1 - ands r1, r2 - movs r2, 0x2 - orrs r1, r2 - strb r1, [r0] -_080352AE: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8035164 - - thumb_func_start sub_80352C0 -sub_80352C0: @ 80352C0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - mov r8, r0 - mov r10, r1 - str r2, [sp] - ldr r5, [r0, 0x14] - ldrb r3, [r0, 0x1] - movs r0, 0 - str r0, [sp, 0x4] - mov r9, r0 - cmp r5, 0 - beq _0803535A -_080352E0: - lsls r0, r3, 3 - adds r1, r0, 0 - adds r1, 0x39 - ldr r2, =gMain - adds r7, r1, r2 - adds r0, 0x3C - adds r6, r0, r2 -_080352EE: - mov r0, r10 - adds r1, r5, 0 - str r3, [sp, 0x8] - bl __udivsi3 - adds r4, r0, 0 - adds r0, r4, 0 - muls r0, r5 - mov r1, r10 - subs r1, r0 - mov r10, r1 - adds r0, r5, 0 - movs r1, 0xA - bl __udivsi3 - adds r5, r0, 0 - ldr r3, [sp, 0x8] - cmp r4, 0 - bne _0803531E - ldr r2, [sp, 0x4] - cmp r2, 0 - bne _0803531E - cmp r5, 0 - bne _080352E0 -_0803531E: - movs r0, 0x1 - str r0, [sp, 0x4] - mov r1, r8 - ldrb r0, [r1, 0x9] - adds r2, r4, 0 - muls r2, r0 - ldrh r4, [r1, 0xA] - adds r2, r4 - ldr r1, =0x000003ff - adds r0, r1, 0 - ands r2, r0 - ldrh r0, [r6] - ldr r4, =0xfffffc00 - adds r1, r4, 0 - ands r0, r1 - orrs r0, r2 - strh r0, [r6] - ldrb r0, [r7] - movs r2, 0x4 - negs r2, r2 - adds r1, r2, 0 - ands r0, r1 - strb r0, [r7] - adds r7, 0x8 - adds r6, 0x8 - adds r3, 0x1 - movs r4, 0x1 - add r9, r4 - cmp r5, 0 - bne _080352EE -_0803535A: - mov r0, r8 - ldrb r0, [r0, 0x3] - cmp r9, r0 - bge _0803538A - ldr r1, =gMain - movs r5, 0x4 - negs r5, r5 - movs r4, 0x2 - lsls r0, r3, 3 - adds r0, 0x39 - adds r2, r0, r1 -_08035370: - ldrb r1, [r2] - adds r0, r5, 0 - ands r0, r1 - orrs r0, r4 - strb r0, [r2] - adds r2, 0x8 - adds r3, 0x1 - movs r1, 0x1 - add r9, r1 - mov r0, r8 - ldrb r0, [r0, 0x3] - cmp r9, r0 - blt _08035370 -_0803538A: - ldr r1, [sp] - cmp r1, 0 - beq _080353B0 - lsls r0, r3, 3 - ldr r2, =gMain - adds r0, r2 - adds r0, 0x39 - ldrb r2, [r0] - movs r1, 0x4 - negs r1, r1 - ands r1, r2 - strb r1, [r0] - b _080353C6 - .pool -_080353B0: - lsls r2, r3, 3 - ldr r4, =gMain - adds r2, r4 - adds r2, 0x39 - ldrb r1, [r2] - movs r0, 0x4 - negs r0, r0 - ands r0, r1 - movs r1, 0x2 - orrs r0, r1 - strb r0, [r2] -_080353C6: - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80352C0 - - thumb_func_start sub_80353DC -sub_80353DC: @ 80353DC - push {r4-r7,lr} - adds r4, r0, 0 - ldr r0, =gUnknown_02022E10 - ldr r0, [r0] - cmp r0, 0 - beq _0803546E - ldr r2, [r0, 0x4] - lsls r1, r4, 3 - subs r0, r1, r4 - lsls r0, 2 - adds r2, r0, r2 - ldrb r0, [r2] - adds r5, r1, 0 - cmp r0, 0 - beq _0803546E - ldrb r3, [r2, 0x3] - adds r0, r3, 0x1 - ldrb r2, [r2, 0x1] - cmp r0, 0 - beq _08035426 - ldr r1, =gMain - movs r7, 0x4 - negs r7, r7 - movs r6, 0x2 - adds r3, r0, 0 - lsls r0, r2, 3 - adds r0, 0x39 - adds r2, r0, r1 -_08035414: - ldrb r1, [r2] - adds r0, r7, 0 - ands r0, r1 - orrs r0, r6 - strb r0, [r2] - subs r3, 0x1 - adds r2, 0x8 - cmp r3, 0 - bne _08035414 -_08035426: - adds r0, r4, 0 - bl sub_8035570 - cmp r0, 0 - bne _08035442 - ldr r0, =gUnknown_02022E10 - ldr r0, [r0] - ldr r1, [r0, 0x4] - subs r0, r5, r4 - lsls r0, 2 - adds r0, r1 - ldrh r0, [r0, 0x10] - bl FreeSpriteTilesByTag -_08035442: - adds r0, r4, 0 - bl sub_80355B4 - cmp r0, 0 - bne _0803545E - ldr r0, =gUnknown_02022E10 - ldr r0, [r0] - ldr r1, [r0, 0x4] - subs r0, r5, r4 - lsls r0, 2 - adds r0, r1 - ldrh r0, [r0, 0x12] - bl FreeSpritePaletteByTag -_0803545E: - ldr r0, =gUnknown_02022E10 - ldr r0, [r0] - ldr r1, [r0, 0x4] - subs r0, r5, r4 - lsls r0, 2 - adds r0, r1 - movs r1, 0 - strb r1, [r0] -_0803546E: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80353DC - - thumb_func_start sub_803547C -sub_803547C: @ 803547C - push {r4-r7,lr} - adds r4, r0, 0 - adds r5, r1, 0 - ldr r0, =gUnknown_02022E10 - ldr r1, [r0] - adds r7, r0, 0 - cmp r1, 0 - beq _0803550C - ldr r2, [r1, 0x4] - lsls r1, r4, 3 - subs r0, r1, r4 - lsls r0, 2 - adds r2, r0, r2 - ldrb r0, [r2] - adds r6, r1, 0 - cmp r0, 0 - beq _0803550C - ldrb r3, [r2, 0x3] - adds r1, r3, 0x1 - ldrb r0, [r2, 0x1] - cmp r5, 0 - beq _080354D8 - cmp r1, 0 - beq _0803550C - ldr r1, =gMain - movs r5, 0x4 - negs r5, r5 - movs r4, 0x2 - adds r3, 0x1 - lsls r0, 3 - adds r0, 0x39 - adds r2, r0, r1 -_080354BC: - ldrb r1, [r2] - adds r0, r5, 0 - ands r0, r1 - orrs r0, r4 - strb r0, [r2] - subs r3, 0x1 - adds r2, 0x8 - cmp r3, 0 - bne _080354BC - b _0803550C - .pool -_080354D8: - cmp r1, 0 - beq _080354FA - ldr r1, =gMain - movs r5, 0x4 - negs r5, r5 - adds r3, 0x1 - lsls r0, 3 - adds r0, 0x39 - adds r2, r0, r1 -_080354EA: - ldrb r1, [r2] - adds r0, r5, 0 - ands r0, r1 - strb r0, [r2] - subs r3, 0x1 - adds r2, 0x8 - cmp r3, 0 - bne _080354EA -_080354FA: - ldr r0, [r7] - ldr r1, [r0, 0x4] - subs r0, r6, r4 - lsls r0, 2 - adds r0, r1 - ldr r1, [r0, 0x18] - adds r0, r4, 0 - bl sub_8035044 -_0803550C: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_803547C - - thumb_func_start sub_8035518 -sub_8035518: @ 8035518 - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - movs r5, 0x40 - movs r3, 0 - ldr r0, =gUnknown_02022E10 - ldr r0, [r0] - ldr r2, [r0] - cmp r3, r2 - bcs _0803555A - ldr r1, [r0, 0x4] -_0803552E: - ldrb r0, [r1] - cmp r0, 0 - bne _08035548 - ldrb r0, [r1, 0x1] - cmp r0, 0xFF - beq _08035552 - ldrb r0, [r1, 0x3] - cmp r0, r4 - bhi _08035552 - ldrb r0, [r1, 0x1] - b _0803556A - .pool -_08035548: - adds r0, r5, 0x1 - ldrb r5, [r1, 0x3] - adds r0, r5 - lsls r0, 16 - lsrs r5, r0, 16 -_08035552: - adds r1, 0x1C - adds r3, 0x1 - cmp r3, r2 - bcc _0803552E -_0803555A: - adds r0, r5, r4 - adds r0, 0x1 - cmp r0, 0x80 - bgt _08035568 - lsls r0, r5, 24 - lsrs r0, 24 - b _0803556A -_08035568: - movs r0, 0xFF -_0803556A: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8035518 - - thumb_func_start sub_8035570 -sub_8035570: @ 8035570 - push {r4-r6,lr} - adds r3, r0, 0 - movs r2, 0 - ldr r0, =gUnknown_02022E10 - ldr r0, [r0] - ldr r4, [r0] - cmp r2, r4 - bcs _080355AC - ldr r1, [r0, 0x4] - lsls r0, r3, 3 - subs r0, r3 - lsls r0, 2 - adds r5, r0, r1 -_0803558A: - ldrb r0, [r1] - cmp r0, 0 - beq _080355A4 - cmp r2, r3 - beq _080355A4 - ldrh r0, [r1, 0x10] - ldrh r6, [r5, 0x10] - cmp r0, r6 - bne _080355A4 - movs r0, 0x1 - b _080355AE - .pool -_080355A4: - adds r1, 0x1C - adds r2, 0x1 - cmp r2, r4 - bcc _0803558A -_080355AC: - movs r0, 0 -_080355AE: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8035570 - - thumb_func_start sub_80355B4 -sub_80355B4: @ 80355B4 - push {r4-r6,lr} - adds r3, r0, 0 - movs r2, 0 - ldr r0, =gUnknown_02022E10 - ldr r0, [r0] - ldr r4, [r0] - cmp r2, r4 - bcs _080355F0 - ldr r1, [r0, 0x4] - lsls r0, r3, 3 - subs r0, r3 - lsls r0, 2 - adds r5, r0, r1 -_080355CE: - ldrb r0, [r1] - cmp r0, 0 - beq _080355E8 - cmp r2, r3 - beq _080355E8 - ldrh r0, [r1, 0x12] - ldrh r6, [r5, 0x12] - cmp r0, r6 - bne _080355E8 - movs r0, 0x1 - b _080355F2 - .pool -_080355E8: - adds r1, 0x1C - adds r2, 0x1 - cmp r2, r4 - bcc _080355CE -_080355F0: - movs r0, 0 -_080355F2: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80355B4 - - thumb_func_start sub_80355F8 -sub_80355F8: @ 80355F8 - ldr r2, =gUnknown_082FF1C8 - lsls r0, 2 - adds r1, r0 - adds r1, r2 - ldrb r0, [r1] - bx lr - .pool - thumb_func_end sub_80355F8 - - thumb_func_start sub_8035608 -sub_8035608: @ 8035608 - push {lr} - bl ResetSpriteData - ldr r0, =gUnknown_0831AC88 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gSprites - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - adds r1, 0x3E - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1] - ldr r0, =sub_8035648 - bl SetMainCallback2 - pop {r0} - bx r0 - .pool - thumb_func_end sub_8035608 - - thumb_func_start sub_8035648 -sub_8035648: @ 8035648 - push {lr} - bl AnimateSprites - bl BuildOamBuffer - pop {r0} - bx r0 - thumb_func_end sub_8035648 - - thumb_func_start trs_config -trs_config: @ 8035658 - push {r4,lr} - movs r0, 0 - bl ResetBgsAndClearDma3BusyFlags - ldr r1, =gUnknown_0831AA08 - movs r0, 0 - movs r2, 0x4 - bl InitBgsFromTemplates - ldr r0, =gBattleTypeFlags - ldr r1, [r0] - movs r0, 0x80 - lsls r0, 11 - ands r1, r0 - cmp r1, 0 - beq _080356A4 - ldr r0, =gBattleScripting - adds r0, 0x24 - movs r1, 0x1 - strb r1, [r0] - ldr r4, =gUnknown_02023060 - ldr r1, [r4] - movs r0, 0x1 - bl SetBgTilemapBuffer - ldr r1, [r4] - movs r0, 0x2 - bl SetBgTilemapBuffer - b _080356AA - .pool -_080356A4: - ldr r0, =gBattleScripting - adds r0, 0x24 - strb r1, [r0] -_080356AA: - ldr r1, =gUnknown_0831ABA0 - ldr r0, =gBattleScripting - adds r0, 0x24 - ldrb r0, [r0] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bl InitWindows - bl DeactivateAllTextPrinters - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end trs_config - - thumb_func_start sub_80356D0 -sub_80356D0: @ 80356D0 - push {lr} - movs r0, 0x2 - bl DisableInterrupts - movs r0, 0xC5 - bl EnableInterrupts - bl trs_config - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg - movs r0, 0x54 - movs r1, 0 - bl SetGpuReg - ldr r1, =0x0000b040 - movs r0, 0 - bl SetGpuReg - pop {r0} - bx r0 - .pool - thumb_func_end sub_80356D0 - - thumb_func_start ApplyPlayerChosenFrameToBattleMenu -ApplyPlayerChosenFrameToBattleMenu: @ 803570C - push {lr} - movs r0, 0x2 - movs r1, 0x12 - movs r2, 0x10 - bl sub_809882C - movs r0, 0x2 - movs r1, 0x22 - movs r2, 0x10 - bl sub_809882C - ldr r0, =gUnknown_08D85600 - movs r1, 0x50 - movs r2, 0x20 - bl LoadCompressedPalette - ldr r0, =gBattleTypeFlags - ldr r0, [r0] - movs r1, 0x80 - lsls r1, 11 - ands r0, r1 - cmp r0, 0 - beq _0803575A - movs r0, 0x70 - bl sub_81978B0 - movs r0, 0 - movs r1, 0x30 - movs r2, 0x70 - bl copy_textbox_border_tile_patterns_to_vram - ldr r0, =gPlttBufferUnfaded - adds r0, 0xEC - movs r1, 0 - strh r1, [r0] - ldr r1, =gPlttBufferFaded + 0xEC - movs r2, 0x1 - bl CpuSet -_0803575A: - pop {r0} - bx r0 - .pool - thumb_func_end ApplyPlayerChosenFrameToBattleMenu - - thumb_func_start DrawMainBattleBackground -DrawMainBattleBackground: @ 8035770 - push {r4,r5,lr} - ldr r0, =gBattleTypeFlags - ldr r1, [r0] - ldr r0, =0x023f0902 - ands r0, r1 - cmp r0, 0 - beq _080357B0 - ldr r0, =gUnknown_08D7C440 - ldr r1, =0x06008000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7CA28 - ldr r1, =0x0600d000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7C9EC - b _08035A52 - .pool -_080357B0: - movs r0, 0x80 - lsls r0, 21 - ands r0, r1 - cmp r0, 0 - beq _080357E4 - ldr r0, =gUnknown_08D7BB14 - ldr r1, =0x06008000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7C154 - ldr r1, =0x0600d000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7DF30 - b _08035A52 - .pool -_080357E4: - movs r0, 0x80 - lsls r0, 22 - ands r0, r1 - cmp r0, 0 - beq _08035818 - ldr r0, =gUnknown_08D7A108 - ldr r1, =0x06008000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7A720 - ldr r1, =0x0600d000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7DEF4 - b _08035A52 - .pool -_08035818: - movs r0, 0x80 - lsls r0, 23 - ands r0, r1 - cmp r0, 0 - beq _0803584C - ldr r0, =gUnknown_08D7D590 - ldr r1, =0x06008000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7DC04 - ldr r1, =0x0600d000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7E234 - b _08035A52 - .pool -_0803584C: - movs r0, 0x8 - ands r1, r0 - cmp r1, 0 - beq _080358C4 - ldr r2, =gTrainers - ldr r0, =gTrainerBattleOpponent_A - ldrh r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - ldrb r0, [r0, 0x1] - cmp r0, 0x20 - bne _08035898 - ldr r0, =gUnknown_08D7C440 - ldr r1, =0x06008000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7CA28 - ldr r1, =0x0600d000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7DFC4 - b _08035A52 - .pool -_08035898: - cmp r0, 0x26 - bne _080358C4 - ldr r0, =gUnknown_08D7CCD8 - ldr r1, =0x06008000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7D2E0 - ldr r1, =0x0600d000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7E1F8 - b _08035A52 - .pool -_080358C4: - bl sav1_map_get_battletype - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x8 - bhi _08035904 - lsls r0, 2 - ldr r1, =_080358E0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080358E0: - .4byte _08035904 - .4byte _08035950 - .4byte _08035978 - .4byte _080359A0 - .4byte _080359C8 - .4byte _080359F0 - .4byte _08035A18 - .4byte _08035A40 - .4byte _08035A70 -_08035904: - ldr r4, =gBattleTerrainTable - ldr r5, =gBattleTerrain - ldrb r1, [r5] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - ldr r0, [r0] - ldr r1, =0x06008000 - bl LZDecompressVram - ldrb r1, [r5] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r1, r4, 0x4 - adds r0, r1 - ldr r0, [r0] - ldr r1, =0x0600d000 - bl LZDecompressVram - ldrb r1, [r5] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r4, 0x10 - adds r0, r4 - ldr r0, [r0] - b _08035A52 - .pool -_08035950: - ldr r0, =gUnknown_08D7C440 - ldr r1, =0x06008000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7CA28 - ldr r1, =0x0600d000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7DF88 - b _08035A52 - .pool -_08035978: - ldr r0, =gUnknown_08D7CCD8 - ldr r1, =0x06008000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7D2E0 - ldr r1, =0x0600d000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7E060 - b _08035A52 - .pool -_080359A0: - ldr r0, =gUnknown_08D7CCD8 - ldr r1, =0x06008000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7D2E0 - ldr r1, =0x0600d000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7E000 - b _08035A52 - .pool -_080359C8: - ldr r0, =gUnknown_08D7CCD8 - ldr r1, =0x06008000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7D2E0 - ldr r1, =0x0600d000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7E0CC - b _08035A52 - .pool -_080359F0: - ldr r0, =gUnknown_08D7CCD8 - ldr r1, =0x06008000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7D2E0 - ldr r1, =0x0600d000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7E11C - b _08035A52 - .pool -_08035A18: - ldr r0, =gUnknown_08D7CCD8 - ldr r1, =0x06008000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7D2E0 - ldr r1, =0x0600d000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7E164 - b _08035A52 - .pool -_08035A40: - ldr r0, =gUnknown_08D7CCD8 - ldr r1, =0x06008000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7D2E0 - ldr r1, =0x0600d000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7E1A8 -_08035A52: - movs r1, 0x20 - movs r2, 0x60 - bl LoadCompressedPalette - b _08035A8A - .pool -_08035A70: - ldr r0, =gUnknown_08D7C440 - ldr r1, =0x06008000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7CA28 - ldr r1, =0x0600d000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7C9EC - movs r1, 0x20 - movs r2, 0x60 - bl LoadCompressedPalette -_08035A8A: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end DrawMainBattleBackground - - thumb_func_start LoadBattleTextboxAndBackground -LoadBattleTextboxAndBackground: @ 8035AA4 - push {lr} - ldr r0, =gUnknown_08C00000 - movs r1, 0xC0 - lsls r1, 19 - bl LZDecompressVram - ldr r1, =gUnknown_08C00524 - movs r0, 0 - movs r2, 0 - movs r3, 0 - bl CopyToBgTilemapBuffer - movs r0, 0 - bl CopyBgTilemapBufferToVram - ldr r0, =gUnknown_08C004E0 - movs r1, 0 - movs r2, 0x40 - bl LoadCompressedPalette - bl ApplyPlayerChosenFrameToBattleMenu - bl DrawMainBattleBackground - pop {r0} - bx r0 - .pool - thumb_func_end LoadBattleTextboxAndBackground - - thumb_func_start sub_8035AE4 -sub_8035AE4: @ 8035AE4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x18 - ldr r4, [sp, 0x34] - lsls r0, 24 - lsrs r6, r0, 24 - adds r7, r6, 0 - lsls r1, 24 - lsrs r5, r1, 24 - lsls r2, 24 - lsrs r2, 24 - mov r8, r2 - lsls r3, 24 - lsrs r3, 24 - mov r12, r3 - lsls r4, 24 - lsrs r4, 24 - mov r9, r4 - movs r4, 0 - ldr r0, =gBattleTypeFlags - ldr r0, [r0] - movs r1, 0x40 - ands r0, r1 - cmp r0, 0 - beq _08035BCC - ldr r0, =gTasks - lsls r1, r6, 2 - adds r1, r6 - lsls r1, 3 - adds r1, r0 - movs r2, 0x12 - ldrsh r0, [r1, r2] - cmp r0, 0 - beq _08035B56 - cmp r5, 0x1 - beq _08035B7E - cmp r5, 0x1 - bgt _08035B44 - cmp r5, 0 - beq _08035B4E - b _08035B88 - .pool -_08035B44: - cmp r5, 0x2 - beq _08035B52 - cmp r5, 0x3 - beq _08035B72 - b _08035B88 -_08035B4E: - ldrh r0, [r1, 0xE] - b _08035B74 -_08035B52: - ldrh r1, [r1, 0xE] - b _08035B80 -_08035B56: - cmp r5, 0x1 - beq _08035B72 - cmp r5, 0x1 - bgt _08035B64 - cmp r5, 0 - beq _08035B6E - b _08035B88 -_08035B64: - cmp r5, 0x2 - beq _08035B7A - cmp r5, 0x3 - beq _08035B7E - b _08035B88 -_08035B6E: - ldrh r0, [r1, 0xE] - b _08035B74 -_08035B72: - ldrh r0, [r1, 0x10] -_08035B74: - movs r4, 0x3F - ands r4, r0 - b _08035B88 -_08035B7A: - ldrh r1, [r1, 0xE] - b _08035B80 -_08035B7E: - ldrh r1, [r1, 0x10] -_08035B80: - movs r0, 0xFC - lsls r0, 4 - ands r0, r1 - lsrs r4, r0, 6 -_08035B88: - movs r2, 0 - movs r6, 0x3 - ldr r0, =0x00006001 - adds r5, r0, 0 - add r3, sp, 0xC -_08035B92: - lsls r1, r2, 1 - adds r0, r6, 0 - lsls r0, r1 - ands r0, r4 - asrs r0, r1 - adds r0, r5 - strh r0, [r3] - adds r3, 0x2 - adds r2, 0x1 - cmp r2, 0x2 - ble _08035B92 - movs r0, 0x3 - str r0, [sp] - movs r0, 0x1 - str r0, [sp, 0x4] - movs r0, 0x11 - str r0, [sp, 0x8] - mov r0, r8 - add r1, sp, 0xC - mov r2, r12 - mov r3, r9 - bl CopyToBgTilemapBufferRect_ChangePalette - mov r0, r8 - bl CopyBgTilemapBufferToVram - b _08035C36 - .pool -_08035BCC: - ldr r0, =gBattleScripting - adds r0, 0x25 - ldrb r0, [r0] - cmp r5, r0 - bne _08035BEC - ldr r1, =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r0, r1 - ldrh r4, [r0, 0xE] - b _08035BF8 - .pool -_08035BEC: - ldr r1, =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r0, r1 - ldrh r4, [r0, 0x10] -_08035BF8: - movs r2, 0 - movs r6, 0x3 - ldr r0, =0x00006001 - adds r5, r0, 0 - add r3, sp, 0xC -_08035C02: - lsls r1, r2, 1 - adds r0, r6, 0 - lsls r0, r1 - ands r0, r4 - asrs r0, r1 - adds r0, r5 - strh r0, [r3] - adds r3, 0x2 - adds r2, 0x1 - cmp r2, 0x5 - ble _08035C02 - movs r0, 0x6 - str r0, [sp] - movs r0, 0x1 - str r0, [sp, 0x4] - movs r0, 0x11 - str r0, [sp, 0x8] - mov r0, r8 - add r1, sp, 0xC - mov r2, r12 - mov r3, r9 - bl CopyToBgTilemapBufferRect_ChangePalette - mov r0, r8 - bl CopyBgTilemapBufferToVram -_08035C36: - add sp, 0x18 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8035AE4 - - thumb_func_start sub_8035C4C -sub_8035C4C: @ 8035C4C - push {lr} - ldr r0, =gBattleOutcome - ldrb r2, [r0] - cmp r2, 0x3 - bne _08035C68 - ldr r0, =gText_Draw - movs r1, 0x15 - bl BattleHandleAddTextPrinter - b _08035D68 - .pool -_08035C68: - ldr r0, =gBattleTypeFlags - ldr r0, [r0] - movs r1, 0x40 - ands r0, r1 - cmp r0, 0 - beq _08035CE2 - cmp r2, 0x1 - bne _08035CAE - ldr r2, =gLinkPlayers - ldr r0, =gBattleScripting - adds r0, 0x25 - ldrb r1, [r0] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r0, [r0, 0x18] - cmp r0, 0x1 - beq _08035CFC - cmp r0, 0x1 - bgt _08035CA4 - cmp r0, 0 - beq _08035D36 - b _08035D68 - .pool -_08035CA4: - cmp r0, 0x2 - beq _08035D36 - cmp r0, 0x3 - bne _08035D68 - b _08035CFC -_08035CAE: - ldr r2, =gLinkPlayers - ldr r0, =gBattleScripting - adds r0, 0x25 - ldrb r1, [r0] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r0, [r0, 0x18] - cmp r0, 0x1 - beq _08035D36 - cmp r0, 0x1 - bgt _08035CD8 - cmp r0, 0 - beq _08035CFC - b _08035D68 - .pool -_08035CD8: - cmp r0, 0x2 - beq _08035CFC - cmp r0, 0x3 - bne _08035D68 - b _08035D36 -_08035CE2: - cmp r2, 0x1 - bne _08035D20 - ldr r2, =gLinkPlayers - ldr r0, =gBattleScripting - adds r0, 0x25 - ldrb r1, [r0] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r0, [r0, 0x18] - cmp r0, 0 - beq _08035D36 -_08035CFC: - ldr r0, =gText_Win - movs r1, 0x17 - bl BattleHandleAddTextPrinter - ldr r0, =gText_Loss - movs r1, 0x16 - bl BattleHandleAddTextPrinter - b _08035D68 - .pool -_08035D20: - ldr r2, =gLinkPlayers - ldr r0, =gBattleScripting - adds r0, 0x25 - ldrb r1, [r0] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r2 - ldrh r0, [r0, 0x18] - cmp r0, 0 - beq _08035D58 -_08035D36: - ldr r0, =gText_Win - movs r1, 0x16 - bl BattleHandleAddTextPrinter - ldr r0, =gText_Loss - movs r1, 0x17 - bl BattleHandleAddTextPrinter - b _08035D68 - .pool -_08035D58: - ldr r0, =gText_Win - movs r1, 0x17 - bl BattleHandleAddTextPrinter - ldr r0, =gText_Loss - movs r1, 0x16 - bl BattleHandleAddTextPrinter -_08035D68: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8035C4C - - thumb_func_start task00_0800F6FC -task00_0800F6FC: @ 8035D74 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - lsls r0, 24 - lsrs r7, r0, 24 - ldr r1, =gTasks - lsls r0, r7, 2 - mov r8, r0 - adds r0, r7 - lsls r0, 3 - adds r5, r0, r1 - movs r1, 0x8 - ldrsh r0, [r5, r1] - cmp r0, 0x1 - bne _08035D96 - b _08035EC4 -_08035D96: - cmp r0, 0x1 - bgt _08035DA4 - cmp r0, 0 - beq _08035DAC - b _08036138 - .pool -_08035DA4: - cmp r0, 0x2 - bne _08035DAA - b _08035F64 -_08035DAA: - b _08036138 -_08035DAC: - ldr r0, =gBattleTypeFlags - ldr r0, [r0] - movs r1, 0x40 - ands r0, r1 - cmp r0, 0 - beq _08035E44 - movs r5, 0 - movs r6, 0x3 -_08035DBC: - ldr r0, =gLinkPlayers + 8 - adds r1, r5, r0 - subs r0, 0x8 - adds r4, r5, r0 - ldrh r0, [r4, 0x18] - cmp r0, 0x1 - beq _08035DF4 - cmp r0, 0x1 - bgt _08035DDC - cmp r0, 0 - beq _08035DE6 - b _08035E3A - .pool -_08035DDC: - cmp r0, 0x2 - beq _08035E08 - cmp r0, 0x3 - beq _08035E22 - b _08035E3A -_08035DE6: - adds r0, r1, 0 - movs r1, 0x11 - bl BattleHandleAddTextPrinter - ldrb r1, [r4, 0x18] - movs r0, 0x4 - b _08035E14 -_08035DF4: - adds r0, r1, 0 - movs r1, 0x12 - bl BattleHandleAddTextPrinter - ldrb r1, [r4, 0x18] - movs r0, 0x4 - str r0, [sp] - adds r0, r7, 0 - movs r2, 0x2 - b _08035E1A -_08035E08: - adds r0, r1, 0 - movs r1, 0x13 - bl BattleHandleAddTextPrinter - ldrb r1, [r4, 0x18] - movs r0, 0x8 -_08035E14: - str r0, [sp] - adds r0, r7, 0 - movs r2, 0x1 -_08035E1A: - movs r3, 0x2 - bl sub_8035AE4 - b _08035E3A -_08035E22: - adds r0, r1, 0 - movs r1, 0x14 - bl BattleHandleAddTextPrinter - ldrb r1, [r4, 0x18] - movs r0, 0x8 - str r0, [sp] - adds r0, r7, 0 - movs r2, 0x2 - movs r3, 0x2 - bl sub_8035AE4 -_08035E3A: - adds r5, 0x1C - subs r6, 0x1 - cmp r6, 0 - bge _08035DBC - b _08035EA6 -_08035E44: - ldr r0, =gBattleScripting - adds r0, 0x25 - ldrb r5, [r0] - movs r0, 0x1 - adds r6, r5, 0 - eors r6, r0 - adds r1, r6, 0 - ldr r4, =gLinkPlayers - lsls r0, r5, 3 - subs r0, r5 - lsls r0, 2 - adds r0, r4 - ldrh r0, [r0, 0x18] - cmp r0, 0 - beq _08035E66 - adds r6, r5, 0 - adds r5, r1, 0 -_08035E66: - lsls r0, r5, 3 - subs r0, r5 - lsls r0, 2 - adds r4, 0x8 - adds r1, r0, r4 - adds r0, r1, 0 - movs r1, 0xF - bl BattleHandleAddTextPrinter - lsls r0, r6, 3 - subs r0, r6 - lsls r0, 2 - adds r1, r0, r4 - adds r0, r1, 0 - movs r1, 0x10 - bl BattleHandleAddTextPrinter - movs r4, 0x7 - str r4, [sp] - adds r0, r7, 0 - adds r1, r5, 0 - movs r2, 0x1 - movs r3, 0x2 - bl sub_8035AE4 - str r4, [sp] - adds r0, r7, 0 - adds r1, r6, 0 - movs r2, 0x2 - movs r3, 0x2 - bl sub_8035AE4 -_08035EA6: - ldr r0, =gTasks - mov r2, r8 - adds r1, r2, r7 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - b _08036138 - .pool -_08035EC4: - ldr r0, =0x00002710 - bl AllocSpritePalette - lsls r0, 24 - ldr r2, =gPlttBufferUnfaded - lsrs r0, 19 - ldr r3, =0x0000021e - adds r0, r3 - adds r2, r0, r2 - ldr r1, =gPlttBufferFaded - adds r0, r1 - ldr r1, =0x00007fff - strh r1, [r0] - strh r1, [r2] - ldr r0, =gUnknown_0831A9D0 - movs r1, 0x6F - movs r2, 0x50 - movs r3, 0 - bl CreateSprite - ldr r4, =gBattleStruct - ldr r1, [r4] - adds r1, 0x7D - strb r0, [r1] - ldr r0, =gUnknown_0831A9E8 - movs r1, 0x81 - movs r2, 0x50 - movs r3, 0 - bl CreateSprite - ldr r1, [r4] - adds r1, 0x7E - strb r0, [r1] - ldr r3, =gSprites - ldr r0, [r4] - adds r0, 0x7D - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - adds r0, 0x3E - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] - ldr r0, [r4] - adds r0, 0x7E - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - adds r0, 0x3E - ldrb r1, [r0] - orrs r1, r2 - strb r1, [r0] - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - b _08036138 - .pool -_08035F64: - movs r1, 0x12 - ldrsh r0, [r5, r1] - cmp r0, 0 - beq _08035FCC - ldr r4, =gBattle_BG1_X - ldrh r0, [r5, 0xA] - bl Sin2 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _08035F7E - adds r0, 0x1F -_08035F7E: - asrs r1, r0, 5 - movs r2, 0x14 - negs r2, r2 - adds r0, r2, 0 - subs r0, r1 - strh r0, [r4] - ldr r4, =gBattle_BG2_X - ldrh r0, [r5, 0xC] - bl Sin2 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _08035F9C - adds r0, 0x1F -_08035F9C: - asrs r1, r0, 5 - movs r3, 0x8C - negs r3, r3 - adds r0, r3, 0 - subs r0, r1 - strh r0, [r4] - ldr r0, =gBattle_BG1_Y - ldr r2, =0x0000ffdc - adds r1, r2, 0 - strh r1, [r0] - ldr r0, =gBattle_BG2_Y - strh r1, [r0] - b _08036038 - .pool -_08035FCC: - ldr r4, =gBattle_BG1_X - ldrh r0, [r5, 0xA] - bl Sin2 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _08035FDE - adds r0, 0x1F -_08035FDE: - asrs r1, r0, 5 - movs r3, 0x14 - negs r3, r3 - adds r0, r3, 0 - subs r0, r1 - strh r0, [r4] - ldr r4, =gBattle_BG1_Y - ldrh r0, [r5, 0xA] - bl Cos2 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _08035FFC - adds r0, 0x1F -_08035FFC: - asrs r0, 5 - subs r0, 0xA4 - strh r0, [r4] - ldr r4, =gBattle_BG2_X - ldrh r0, [r5, 0xC] - bl Sin2 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _08036014 - adds r0, 0x1F -_08036014: - asrs r1, r0, 5 - movs r2, 0x8C - negs r2, r2 - adds r0, r2, 0 - subs r0, r1 - strh r0, [r4] - ldr r4, =gBattle_BG2_Y - ldrh r0, [r5, 0xC] - bl Cos2 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _08036032 - adds r0, 0x1F -_08036032: - asrs r0, 5 - subs r0, 0xA4 - strh r0, [r4] -_08036038: - ldr r1, =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r1, r0, r1 - ldrh r0, [r1, 0xC] - movs r2, 0xC - ldrsh r3, [r1, r2] - mov r8, r3 - cmp r3, 0 - beq _08036070 - subs r0, 0x2 - strh r0, [r1, 0xC] - ldrh r0, [r1, 0xA] - adds r0, 0x2 - strh r0, [r1, 0xA] - b _08036138 - .pool -_08036070: - movs r3, 0x12 - ldrsh r0, [r1, r3] - cmp r0, 0 - beq _0803607C - bl sub_8035C4C -_0803607C: - movs r0, 0x78 - bl PlaySE - adds r0, r7, 0 - bl DestroyTask - ldr r4, =gSprites - ldr r5, =gBattleStruct - ldr r0, [r5] - adds r0, 0x7D - ldrb r0, [r0] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - adds r1, 0x3E - ldrb r3, [r1] - movs r2, 0x5 - negs r2, r2 - adds r0, r2, 0 - ands r0, r3 - strb r0, [r1] - ldr r0, [r5] - adds r0, 0x7E - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - adds r0, 0x3E - ldrb r1, [r0] - ands r2, r1 - strb r2, [r0] - ldr r5, [r5] - adds r6, r5, 0 - adds r6, 0x7E - ldrb r0, [r6] - lsls r2, r0, 4 - adds r2, r0 - lsls r2, 2 - adds r2, r4 - ldrh r3, [r2, 0x4] - lsls r1, r3, 22 - lsrs r1, 22 - adds r1, 0x40 - ldr r7, =0x000003ff - adds r0, r7, 0 - ands r1, r0 - ldr r0, =0xfffffc00 - ands r0, r3 - orrs r0, r1 - strh r0, [r2, 0x4] - adds r5, 0x7D - ldrb r1, [r5] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - mov r1, r8 - strh r1, [r0, 0x2E] - ldrb r1, [r6] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - movs r1, 0x1 - strh r1, [r0, 0x2E] - ldrb r1, [r5] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - ldrh r1, [r0, 0x20] - strh r1, [r0, 0x30] - ldrb r1, [r6] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - ldrh r1, [r0, 0x20] - strh r1, [r0, 0x30] - ldrb r1, [r5] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - mov r2, r8 - strh r2, [r0, 0x32] - ldrb r1, [r6] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - strh r2, [r0, 0x32] -_08036138: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end task00_0800F6FC - - thumb_func_start LoadBattleEntryBackground -LoadBattleEntryBackground: @ 8036154 - push {r4,r5,lr} - ldr r0, =gBattleTypeFlags - ldr r1, [r0] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08036208 - ldr r0, =gUnknown_08D778F0 - ldr r1, =0x06004000 - bl LZDecompressVram - ldr r0, =gUnknown_08D77B0C - ldr r1, =0x06010000 - bl LZDecompressVram - ldr r0, =gUnknown_08D77AE4 - movs r1, 0x60 - movs r2, 0x20 - bl LoadCompressedPalette - movs r0, 0x1 - movs r1, 0x3 - movs r2, 0x1 - bl SetBgAttribute - ldr r1, =0x00005c04 - movs r0, 0xA - bl SetGpuReg - ldr r4, =gUnknown_08D779D8 - movs r0, 0x1 - adds r1, r4, 0 - movs r2, 0 - movs r3, 0 - bl CopyToBgTilemapBuffer - movs r0, 0x2 - adds r1, r4, 0 - movs r2, 0 - movs r3, 0 - bl CopyToBgTilemapBuffer - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - movs r0, 0x2 - bl CopyBgTilemapBufferToVram - movs r0, 0x48 - movs r1, 0x36 - bl SetGpuReg - movs r0, 0x4A - movs r1, 0x36 - bl SetGpuReg - ldr r0, =gBattle_BG1_Y - ldr r2, =0x0000ff5c - adds r1, r2, 0 - strh r1, [r0] - ldr r0, =gBattle_BG2_Y - strh r1, [r0] - ldr r0, =gUnknown_0831AA00 - bl LoadCompressedObjectPicUsingHeap - b _080363AC - .pool -_08036208: - ldr r0, =0x023f0902 - ands r0, r1 - cmp r0, 0 - beq _0803628C - movs r0, 0x80 - lsls r0, 15 - ands r1, r0 - cmp r1, 0 - beq _08036224 - ldr r0, =gPartnerTrainerId - ldrh r1, [r0] - ldr r0, =0x00000c03 - cmp r1, r0 - bne _08036248 -_08036224: - ldr r0, =gUnknown_08D820D4 - ldr r1, =0x06004000 - bl LZDecompressVram - ldr r0, =gUnknown_08D824E4 - b _08036382 - .pool -_08036248: - movs r0, 0x1 - movs r1, 0x1 - movs r2, 0x2 - bl SetBgAttribute - movs r0, 0x2 - movs r1, 0x1 - movs r2, 0x2 - bl SetBgAttribute - ldr r1, =gUnknown_08D857A8 - movs r0, 0x1 - movs r2, 0 - movs r3, 0 - bl CopyToBgTilemapBuffer - ldr r1, =gUnknown_08D85A1C - movs r0, 0x2 - movs r2, 0 - movs r3, 0 - bl CopyToBgTilemapBuffer - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - movs r0, 0x2 - bl CopyBgTilemapBufferToVram - b _080363AC - .pool -_0803628C: - movs r0, 0x80 - lsls r0, 21 - ands r0, r1 - cmp r0, 0 - beq _080362B0 - ldr r0, =gUnknown_08D81610 - ldr r1, =0x06004000 - bl LZDecompressVram - ldr r0, =gUnknown_08D81E2C - b _08036382 - .pool -_080362B0: - movs r0, 0x80 - lsls r0, 22 - ands r0, r1 - cmp r0, 0 - beq _080362D4 - ldr r0, =gUnknown_08D7F9F8 - ldr r1, =0x06004000 - bl LZDecompressVram - ldr r0, =gUnknown_08D7FEC4 - b _08036382 - .pool -_080362D4: - movs r0, 0x80 - lsls r0, 23 - ands r0, r1 - cmp r0, 0 - beq _080362F8 - ldr r0, =gUnknown_08D82608 - ldr r1, =0x06004000 - bl LZDecompressVram - ldr r0, =gUnknown_08D82C70 - b _08036382 - .pool -_080362F8: - movs r0, 0x8 - ands r1, r0 - cmp r1, 0 - beq _08036350 - ldr r2, =gTrainers - ldr r0, =gTrainerBattleOpponent_A - ldrh r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - ldrb r0, [r0, 0x1] - cmp r0, 0x20 - bne _08036334 - ldr r0, =gUnknown_08D820D4 - ldr r1, =0x06004000 - bl LZDecompressVram - ldr r0, =gUnknown_08D824E4 - b _08036382 - .pool -_08036334: - cmp r0, 0x26 - bne _08036350 - ldr r0, =gUnknown_08D820D4 - ldr r1, =0x06004000 - bl LZDecompressVram - ldr r0, =gUnknown_08D824E4 - b _08036382 - .pool -_08036350: - bl sav1_map_get_battletype - lsls r0, 24 - cmp r0, 0 - bne _0803639C - ldr r4, =gBattleTerrainTable - ldr r5, =gBattleTerrain - ldrb r1, [r5] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r1, r4, 0 - adds r1, 0x8 - adds r0, r1 - ldr r0, [r0] - ldr r1, =0x06004000 - bl LZDecompressVram - ldrb r1, [r5] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r4, 0xC - adds r0, r4 - ldr r0, [r0] -_08036382: - ldr r1, =0x0600e000 - bl LZDecompressVram - b _080363AC - .pool -_0803639C: - ldr r0, =gUnknown_08D820D4 - ldr r1, =0x06004000 - bl LZDecompressVram - ldr r0, =gUnknown_08D824E4 - ldr r1, =0x0600e000 - bl LZDecompressVram -_080363AC: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end LoadBattleEntryBackground - - thumb_func_start LoadChosenBattleElement -LoadChosenBattleElement: @ 80363C4 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - movs r4, 0 - cmp r0, 0x6 - bls _080363D2 - b _08036756 -_080363D2: - lsls r0, 2 - ldr r1, =_080363E0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080363E0: - .4byte _080363FC - .4byte _0803640C - .4byte _08036424 - .4byte _08036434 - .4byte _0803652C - .4byte _08036638 - .4byte _08036750 -_080363FC: - ldr r0, =gUnknown_08C00000 - movs r1, 0xC0 - lsls r1, 19 - bl LZDecompressVram - b _08036758 - .pool -_0803640C: - ldr r1, =gUnknown_08C00524 - movs r0, 0 - movs r2, 0 - movs r3, 0 - bl CopyToBgTilemapBuffer - movs r0, 0 - bl CopyBgTilemapBufferToVram - b _08036758 - .pool -_08036424: - ldr r0, =gUnknown_08C004E0 - movs r1, 0 - movs r2, 0x40 - bl LoadCompressedPalette - b _08036758 - .pool -_08036434: - ldr r0, =gBattleTypeFlags - ldr r1, [r0] - ldr r0, =0x023f0902 - ands r0, r1 - cmp r0, 0 - bne _08036518 - movs r0, 0x80 - lsls r0, 21 - ands r0, r1 - cmp r0, 0 - beq _0803645C - ldr r0, =gUnknown_08D7BB14 - b _0803651A - .pool -_0803645C: - movs r0, 0x8 - ands r1, r0 - cmp r1, 0 - beq _0803648C - ldr r2, =gTrainers - ldr r0, =gTrainerBattleOpponent_A - ldrh r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - ldrb r0, [r0, 0x1] - cmp r0, 0x20 - beq _08036518 - cmp r0, 0x26 - bne _0803648C - ldr r0, =gUnknown_08D7CCD8 - b _0803651A - .pool -_0803648C: - bl sav1_map_get_battletype - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x8 - bhi _080364CC - lsls r0, 2 - ldr r1, =_080364A8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080364A8: - .4byte _080364CC - .4byte _08036518 - .4byte _080364E8 - .4byte _080364F0 - .4byte _080364F8 - .4byte _08036500 - .4byte _08036508 - .4byte _08036510 - .4byte _08036518 -_080364CC: - ldr r2, =gBattleTerrainTable - ldr r0, =gBattleTerrain - ldrb r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldr r0, [r0] - b _0803651A - .pool -_080364E8: - ldr r0, =gUnknown_08D7CCD8 - b _0803651A - .pool -_080364F0: - ldr r0, =gUnknown_08D7CCD8 - b _0803651A - .pool -_080364F8: - ldr r0, =gUnknown_08D7CCD8 - b _0803651A - .pool -_08036500: - ldr r0, =gUnknown_08D7CCD8 - b _0803651A - .pool -_08036508: - ldr r0, =gUnknown_08D7CCD8 - b _0803651A - .pool -_08036510: - ldr r0, =gUnknown_08D7CCD8 - b _0803651A - .pool -_08036518: - ldr r0, =gUnknown_08D7C440 -_0803651A: - ldr r1, =0x06008000 - bl LZDecompressVram - b _08036758 - .pool -_0803652C: - ldr r0, =gBattleTypeFlags - ldr r1, [r0] - ldr r0, =0x023f0902 - ands r0, r1 - cmp r0, 0 - beq _0803653A - b _08036624 -_0803653A: - movs r0, 0x80 - lsls r0, 5 - ands r0, r1 - cmp r0, 0 - beq _08036568 - ldr r0, =gGameVersion - ldrb r0, [r0] - cmp r0, 0x2 - bne _08036560 - ldr r0, =gUnknown_08D7C154 - b _08036626 - .pool -_08036560: - ldr r0, =gUnknown_08D7A720 - b _08036626 - .pool -_08036568: - movs r0, 0x8 - ands r1, r0 - cmp r1, 0 - beq _08036598 - ldr r2, =gTrainers - ldr r0, =gTrainerBattleOpponent_A - ldrh r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - ldrb r0, [r0, 0x1] - cmp r0, 0x20 - beq _08036624 - cmp r0, 0x26 - bne _08036598 - ldr r0, =gUnknown_08D7D2E0 - b _08036626 - .pool -_08036598: - bl sav1_map_get_battletype - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x8 - bhi _080365D8 - lsls r0, 2 - ldr r1, =_080365B4 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080365B4: - .4byte _080365D8 - .4byte _08036624 - .4byte _080365F4 - .4byte _080365FC - .4byte _08036604 - .4byte _0803660C - .4byte _08036614 - .4byte _0803661C - .4byte _08036624 -_080365D8: - ldr r2, =gBattleTerrainTable - ldr r0, =gBattleTerrain - ldrb r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r2, 0x4 - adds r0, r2 - ldr r0, [r0] - b _08036626 - .pool -_080365F4: - ldr r0, =gUnknown_08D7D2E0 - b _08036626 - .pool -_080365FC: - ldr r0, =gUnknown_08D7D2E0 - b _08036626 - .pool -_08036604: - ldr r0, =gUnknown_08D7D2E0 - b _08036626 - .pool -_0803660C: - ldr r0, =gUnknown_08D7D2E0 - b _08036626 - .pool -_08036614: - ldr r0, =gUnknown_08D7D2E0 - b _08036626 - .pool -_0803661C: - ldr r0, =gUnknown_08D7D2E0 - b _08036626 - .pool -_08036624: - ldr r0, =gUnknown_08D7CA28 -_08036626: - ldr r1, =0x0600d000 - bl LZDecompressVram - b _08036758 - .pool -_08036638: - ldr r0, =gBattleTypeFlags - ldr r1, [r0] - ldr r0, =0x023f0902 - ands r0, r1 - cmp r0, 0 - beq _08036646 - b _08036740 -_08036646: - movs r0, 0x80 - lsls r0, 5 - ands r0, r1 - cmp r0, 0 - beq _08036674 - ldr r0, =gGameVersion - ldrb r0, [r0] - cmp r0, 0x2 - bne _0803666C - ldr r0, =gUnknown_08D7DF30 - b _08036742 - .pool -_0803666C: - ldr r0, =gUnknown_08D7DEF4 - b _08036742 - .pool -_08036674: - movs r0, 0x8 - ands r1, r0 - cmp r1, 0 - beq _080366AC - ldr r2, =gTrainers - ldr r0, =gTrainerBattleOpponent_A - ldrh r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - ldrb r0, [r0, 0x1] - cmp r0, 0x20 - bne _080366A0 - ldr r0, =gUnknown_08D7DFC4 - b _08036742 - .pool -_080366A0: - cmp r0, 0x26 - bne _080366AC - ldr r0, =gUnknown_08D7E1F8 - b _08036742 - .pool -_080366AC: - bl sav1_map_get_battletype - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x8 - bhi _080366EC - lsls r0, 2 - ldr r1, =_080366C8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080366C8: - .4byte _080366EC - .4byte _08036708 - .4byte _08036710 - .4byte _08036718 - .4byte _08036720 - .4byte _08036728 - .4byte _08036730 - .4byte _08036738 - .4byte _08036740 -_080366EC: - ldr r2, =gBattleTerrainTable - ldr r0, =gBattleTerrain - ldrb r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r2, 0x10 - adds r0, r2 - ldr r0, [r0] - b _08036742 - .pool -_08036708: - ldr r0, =gUnknown_08D7DF88 - b _08036742 - .pool -_08036710: - ldr r0, =gUnknown_08D7E060 - b _08036742 - .pool -_08036718: - ldr r0, =gUnknown_08D7E000 - b _08036742 - .pool -_08036720: - ldr r0, =gUnknown_08D7E0CC - b _08036742 - .pool -_08036728: - ldr r0, =gUnknown_08D7E11C - b _08036742 - .pool -_08036730: - ldr r0, =gUnknown_08D7E164 - b _08036742 - .pool -_08036738: - ldr r0, =gUnknown_08D7E1A8 - b _08036742 - .pool -_08036740: - ldr r0, =gUnknown_08D7C9EC -_08036742: - movs r1, 0x20 - movs r2, 0x60 - bl LoadCompressedPalette - b _08036758 - .pool -_08036750: - bl ApplyPlayerChosenFrameToBattleMenu - b _08036758 -_08036756: - movs r4, 0x1 -_08036758: - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - thumb_func_end LoadChosenBattleElement - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/battle_frontier_1.s b/asm/battle_frontier_1.s index 973e87fbb..f5d4013f6 100755 --- a/asm/battle_frontier_1.s +++ b/asm/battle_frontier_1.s @@ -7383,12 +7383,12 @@ _08192932: ldr r1, [sp, 0x24] cmp r1, r0 bne _08192980 - ldr r0, =gUnknown_0860D1D0 + ldr r0, =gBattleDomePotentialPointers ldr r0, [r0, 0x40] b _0819298A .pool _08192980: - ldr r0, =gUnknown_0860D1D0 + ldr r0, =gBattleDomePotentialPointers ldr r2, [sp, 0x20] lsls r1, r2, 2 adds r1, r0 @@ -7503,7 +7503,7 @@ _08192A58: cmp r7, 0x2 ble _081929AE movs r7, 0 - ldr r2, =gUnknown_0860D214 + ldr r2, =gBattleDomeOpponentStylePointers mov r9, r2 ldr r3, =gUnknown_0860C988 mov r10, r3 @@ -8071,7 +8071,7 @@ _08192ED0: movs r7, 0x2A _08192ED2: lsls r0, r7, 2 - ldr r3, =gUnknown_0860D294 + ldr r3, =gBattleDomeOpponentStatsPointers adds r0, r3 ldr r0, [r0] str r0, [sp, 0xC] @@ -9029,7 +9029,7 @@ _081936A0: movs r0, 0xD0 strb r0, [r1, 0xD] ldr r4, =gStringVar4 - ldr r0, =gUnknown_0860D38C + ldr r0, =gBattleDomeWinStringsPointers ldr r7, [sp, 0x70] adds r0, r7, r0 ldr r1, [r0] @@ -9167,7 +9167,7 @@ _08193802: bl AddTextPrinter add r0, sp, 0xC strb r6, [r0, 0xA] - ldr r0, =gUnknown_0860D350 + ldr r0, =gBattleDomeMatchNumberPointers ldr r1, [sp, 0x58] adds r0, r1, r0 ldr r0, [r0] @@ -13791,7 +13791,7 @@ sub_8195FF8: @ 8195FF8 push {r4-r6,lr} adds r5, r0, 0 movs r4, 0 - ldr r6, =gUnknown_085500A4 + ldr r6, =gRematchTable _08196000: movs r1, 0xAE lsls r1, 1 @@ -13887,7 +13887,7 @@ task_prev_quest: @ 81960A8 cmp r0, 0 bne _081960C2 bl ScriptContext2_Enable - bl player_bitmagic + bl FreezeMapObjects bl sub_808B864 bl sub_808BCF4 _081960C2: @@ -14659,7 +14659,7 @@ sub_8196710: @ 8196710 thumb_func_start sub_819672C sub_819672C: @ 819672C push {lr} - ldr r1, =gUnknown_085500A4 + ldr r1, =gRematchTable lsls r0, 4 adds r0, r1 ldrh r2, [r0, 0xA] @@ -14677,10 +14677,10 @@ sub_8196748: @ 8196748 push {r4-r6,lr} movs r5, 0 movs r6, 0 - ldr r4, =gUnknown_085500A4 + ldr r4, =gRematchTable _08196750: ldrh r0, [r4] - bl HasTrainerAlreadyBeenFought + bl HasTrainerBeenFought lsls r0, 24 cmp r0, 0 beq _0819675E @@ -14703,10 +14703,10 @@ sub_8196774: @ 8196774 adds r7, r0, 0 movs r4, 0 movs r6, 0 - ldr r5, =gUnknown_085500A4 + ldr r5, =gRematchTable _0819677E: ldrh r0, [r5] - bl HasTrainerAlreadyBeenFought + bl HasTrainerBeenFought lsls r0, 24 cmp r0, 0 beq _0819679A @@ -14766,7 +14766,7 @@ _081967EC: adds r4, r0, 0 movs r7, 0x1 adds r0, r5, 0 - bl sub_80B1E94 + bl UpdateRematchIfDefeated b _08196832 _0819680A: bl Random @@ -15270,7 +15270,7 @@ sub_8196B98: @ 8196B98 adds r7, r0, 0 cmp r1, 0xFF beq _08196C5C - ldr r1, =gUnknown_085500A4 + ldr r1, =gRematchTable lsls r0, r2, 4 adds r2, r0, r1 ldrh r4, [r2, 0xA] @@ -15373,7 +15373,7 @@ sub_8196C70: @ 8196C70 lsls r1, 2 adds r1, r2 ldrh r0, [r1] - bl sub_80B2250 + bl GetLastBeatenRematchTrainerId lsls r0, 16 lsrs r0, 16 ldr r5, =gTrainers diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index d90fa94f0..a63267e48 100755 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -12380,7 +12380,7 @@ _081A0C8E: sub_81A0C9C: @ 81A0C9C push {lr} bl ScriptContext2_Enable - bl player_bitmagic + bl FreezeMapObjects bl sub_808B864 bl sub_808BCF4 movs r0, 0 @@ -29290,7 +29290,7 @@ sub_81A9B04: @ 81A9B04 cmp r0, 0 beq _081A9B2E movs r0, 0x1 - bl sub_80B47E0 + bl GetChosenApproachingTrainerMapObjectId ldr r1, =gSelectedMapObject strb r0, [r1] ldr r0, =gTrainerBattleOpponent_B diff --git a/asm/battle_setup.s b/asm/battle_setup.s deleted file mode 100644 index f77e7a5d0..000000000 --- a/asm/battle_setup.s +++ /dev/null @@ -1,3550 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start task01_battle_start -task01_battle_start: @ 80B05F0 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r4, r0, r1 - movs r1, 0 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _080B0614 - cmp r0, 0x1 - beq _080B062E - b _080B0652 - .pool -_080B0614: - bl c3_80A0DD8_is_running - cmp r0, 0 - bne _080B0652 - ldrb r0, [r4, 0x2] - bl sub_8145EF4 - bl sub_81BE72C - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] - b _080B0652 -_080B062E: - bl IsBattleTransitionDone - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080B0652 - bl overworld_free_bg_tilemaps - ldr r0, =CB2_InitBattle - bl SetMainCallback2 - bl prev_quest_postbuffer_cursor_backup_reset - bl overworld_poison_timer_set - adds r0, r5, 0 - bl DestroyTask -_080B0652: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end task01_battle_start - - thumb_func_start task_add_01_battle_start -task_add_01_battle_start: @ 80B065C - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 16 - lsrs r5, 16 - ldr r0, =task01_battle_start - movs r1, 0x1 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - strh r4, [r1, 0xA] - adds r0, r5, 0 - bl PlayMapChosenOrBattleBGM - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end task_add_01_battle_start - - thumb_func_start BattleSetup_StartWildBattle -BattleSetup_StartWildBattle: @ 80B0698 - push {lr} - bl GetSafariZoneFlag - cmp r0, 0 - beq _080B06A8 - bl sub_80B077C - b _080B06AC -_080B06A8: - bl sub_80B06BC -_080B06AC: - pop {r0} - bx r0 - thumb_func_end BattleSetup_StartWildBattle - - thumb_func_start BattleSetup_StartBattlePikeWildBattle -BattleSetup_StartBattlePikeWildBattle: @ 80B06B0 - push {lr} - bl sub_80B07B4 - pop {r0} - bx r0 - thumb_func_end BattleSetup_StartBattlePikeWildBattle - - thumb_func_start sub_80B06BC -sub_80B06BC: @ 80B06BC - push {r4,lr} - bl ScriptContext2_Enable - bl player_bitmagic - bl sub_808BCF4 - ldr r1, =gMain - ldr r0, =sub_80B0AF8 - str r0, [r1, 0x8] - ldr r4, =gBattleTypeFlags - movs r0, 0 - str r0, [r4] - bl InBattlePyramid - lsls r0, 24 - cmp r0, 0 - beq _080B06F2 - ldr r0, =0x0000400e - movs r1, 0 - bl VarSet - ldr r0, [r4] - movs r1, 0x80 - lsls r1, 14 - orrs r0, r1 - str r0, [r4] -_080B06F2: - bl sub_80B0EC8 - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - bl task_add_01_battle_start - movs r0, 0x7 - bl IncrementGameStat - movs r0, 0x8 - bl IncrementGameStat - bl sub_80EECC8 - bl sub_80B1218 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B06BC - - thumb_func_start BattleSetup_StartRoamerBattle -BattleSetup_StartRoamerBattle: @ 80B072C - push {lr} - bl ScriptContext2_Enable - bl player_bitmagic - bl sub_808BCF4 - ldr r1, =gMain - ldr r0, =sub_80B0AF8 - str r0, [r1, 0x8] - ldr r1, =gBattleTypeFlags - movs r0, 0x80 - lsls r0, 3 - str r0, [r1] - bl sub_80B0EC8 - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - bl task_add_01_battle_start - movs r0, 0x7 - bl IncrementGameStat - movs r0, 0x8 - bl IncrementGameStat - bl sub_80EECC8 - bl sub_80B1218 - pop {r0} - bx r0 - .pool - thumb_func_end BattleSetup_StartRoamerBattle - - thumb_func_start sub_80B077C -sub_80B077C: @ 80B077C - push {lr} - bl ScriptContext2_Enable - bl player_bitmagic - bl sub_808BCF4 - ldr r1, =gMain - ldr r0, =sub_80FC190 - str r0, [r1, 0x8] - ldr r1, =gBattleTypeFlags - movs r0, 0x80 - str r0, [r1] - bl sub_80B0EC8 - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - bl task_add_01_battle_start - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B077C - - thumb_func_start sub_80B07B4 -sub_80B07B4: @ 80B07B4 - push {lr} - bl ScriptContext2_Enable - bl player_bitmagic - bl sub_808BCF4 - ldr r1, =gMain - ldr r0, =sub_80B0AF8 - str r0, [r1, 0x8] - ldr r1, =gBattleTypeFlags - movs r0, 0x80 - lsls r0, 13 - str r0, [r1] - bl sub_80B0EC8 - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - bl task_add_01_battle_start - movs r0, 0x7 - bl IncrementGameStat - movs r0, 0x8 - bl IncrementGameStat - bl sub_80EECC8 - bl sub_80B1218 - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B07B4 - - thumb_func_start task_add_01_battle_start_with_music_and_stats -task_add_01_battle_start_with_music_and_stats: @ 80B0804 - push {lr} - bl reads_trainer_data_byte1_byte0x18 - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - bl task_add_01_battle_start - movs r0, 0x7 - bl IncrementGameStat - movs r0, 0x9 - bl IncrementGameStat - bl sub_80B1234 - pop {r0} - bx r0 - thumb_func_end task_add_01_battle_start_with_music_and_stats - - thumb_func_start sub_80B0828 -sub_80B0828: @ 80B0828 - push {lr} - bl InBattlePyramid - lsls r0, 24 - cmp r0, 0 - beq _080B0846 - movs r0, 0xA - bl sub_80B100C - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - bl task_add_01_battle_start - b _080B0856 -_080B0846: - movs r0, 0xB - bl sub_80B100C - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - bl task_add_01_battle_start -_080B0856: - movs r0, 0x7 - bl IncrementGameStat - movs r0, 0x9 - bl IncrementGameStat - bl sub_80B1234 - pop {r0} - bx r0 - thumb_func_end sub_80B0828 - - thumb_func_start sub_80B086C -sub_80B086C: @ 80B086C - push {lr} - ldr r0, =gEnemyParty - movs r1, 0xC4 - lsls r1, 1 - movs r2, 0x5 - bl CreateMaleMon - bl ScriptContext2_Enable - ldr r1, =gMain - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music - str r0, [r1, 0x8] - ldr r1, =gBattleTypeFlags - movs r0, 0x80 - lsls r0, 2 - str r0, [r1] - movs r0, 0x8 - movs r1, 0 - bl task_add_01_battle_start - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B086C - - thumb_func_start BattleSetup_StartScriptedWildBattle -BattleSetup_StartScriptedWildBattle: @ 80B08A8 - push {lr} - bl ScriptContext2_Enable - ldr r1, =gMain - ldr r0, =sub_80B0B6C - str r0, [r1, 0x8] - ldr r1, =gBattleTypeFlags - movs r0, 0 - str r0, [r1] - bl sub_80B0EC8 - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - bl task_add_01_battle_start - movs r0, 0x7 - bl IncrementGameStat - movs r0, 0x8 - bl IncrementGameStat - bl sub_80EECC8 - bl sub_80B1218 - pop {r0} - bx r0 - .pool - thumb_func_end BattleSetup_StartScriptedWildBattle - - thumb_func_start sub_80B08EC -sub_80B08EC: @ 80B08EC - push {lr} - bl ScriptContext2_Enable - ldr r1, =gMain - ldr r0, =sub_80B0B6C - str r0, [r1, 0x8] - ldr r1, =gBattleTypeFlags - movs r0, 0x80 - lsls r0, 6 - str r0, [r1] - bl sub_80B0EC8 - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - bl task_add_01_battle_start - movs r0, 0x7 - bl IncrementGameStat - movs r0, 0x8 - bl IncrementGameStat - bl sub_80EECC8 - bl sub_80B1218 - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B08EC - - thumb_func_start sub_80B0934 -sub_80B0934: @ 80B0934 - push {r4,lr} - bl ScriptContext2_Enable - ldr r1, =gMain - ldr r0, =sub_80B0B6C - str r0, [r1, 0x8] - ldr r4, =gBattleTypeFlags - movs r0, 0x80 - lsls r0, 6 - str r0, [r4] - ldr r0, =gEnemyParty - movs r1, 0xB - movs r2, 0 - bl GetMonData - adds r1, r0, 0 - movs r0, 0xCA - lsls r0, 1 - cmp r1, r0 - beq _080B09B8 - cmp r1, r0 - bhi _080B0988 - cmp r1, 0x97 - beq _080B09F4 - cmp r1, 0x97 - bcc _080B099A - cmp r1, 0xFA - bhi _080B099A - cmp r1, 0xF9 - bcc _080B099A - ldr r1, =0x00000229 - b _080B09E6 - .pool -_080B0988: - movs r0, 0xCB - lsls r0, 1 - cmp r1, r0 - beq _080B09CE - cmp r1, r0 - bcc _080B099A - adds r0, 0x4 - cmp r1, r0 - beq _080B09E4 -_080B099A: - ldr r2, =gBattleTypeFlags - ldr r0, [r2] - movs r1, 0x80 - lsls r1, 21 - orrs r0, r1 - str r0, [r2] - movs r1, 0xF0 - lsls r1, 1 - movs r0, 0x17 - bl task_add_01_battle_start - b _080B09FE - .pool -_080B09B8: - ldr r0, [r4] - movs r1, 0x80 - lsls r1, 22 - orrs r0, r1 - str r0, [r4] - movs r1, 0xF0 - lsls r1, 1 - movs r0, 0x16 - bl task_add_01_battle_start - b _080B09FE -_080B09CE: - ldr r0, [r4] - movs r1, 0x80 - lsls r1, 23 - orrs r0, r1 - str r0, [r4] - movs r1, 0xEB - lsls r1, 1 - movs r0, 0x18 - bl task_add_01_battle_start - b _080B09FE -_080B09E4: - ldr r1, =0x00000227 -_080B09E6: - movs r0, 0 - bl task_add_01_battle_start - b _080B09FE - .pool -_080B09F4: - movs r1, 0xEC - lsls r1, 1 - movs r0, 0xA - bl task_add_01_battle_start -_080B09FE: - movs r0, 0x7 - bl IncrementGameStat - movs r0, 0x8 - bl IncrementGameStat - bl sub_80EECC8 - bl sub_80B1218 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80B0934 - - thumb_func_start sub_80B0A18 -sub_80B0A18: @ 80B0A18 - push {lr} - bl ScriptContext2_Enable - ldr r1, =gMain - ldr r0, =sub_80B0B6C - str r0, [r1, 0x8] - ldr r1, =gBattleTypeFlags - movs r0, 0xC0 - lsls r0, 6 - str r0, [r1] - ldr r0, =gGameVersion - ldrb r0, [r0] - cmp r0, 0x2 - bne _080B0A50 - movs r1, 0xF0 - lsls r1, 1 - movs r0, 0xB - bl task_add_01_battle_start - b _080B0A5A - .pool -_080B0A50: - movs r1, 0xF0 - lsls r1, 1 - movs r0, 0x6 - bl task_add_01_battle_start -_080B0A5A: - movs r0, 0x7 - bl IncrementGameStat - movs r0, 0x8 - bl IncrementGameStat - bl sub_80EECC8 - bl sub_80B1218 - pop {r0} - bx r0 - thumb_func_end sub_80B0A18 - - thumb_func_start sub_80B0A74 -sub_80B0A74: @ 80B0A74 - push {lr} - bl ScriptContext2_Enable - ldr r1, =gMain - ldr r0, =sub_80B0B6C - str r0, [r1, 0x8] - ldr r1, =gBattleTypeFlags - movs r0, 0xC0 - lsls r0, 7 - str r0, [r1] - ldr r0, =gEnemyParty - movs r1, 0xB - bl GetMonData - lsls r0, 16 - lsrs r1, r0, 16 - adds r2, r1, 0 - movs r0, 0xC9 - lsls r0, 1 - cmp r1, r0 - beq _080B0ACC - cmp r1, r0 - bgt _080B0ABC - subs r0, 0x1 - cmp r1, r0 - beq _080B0AC8 - b _080B0AD4 - .pool -_080B0ABC: - ldr r0, =0x00000193 - cmp r2, r0 - beq _080B0AD0 - b _080B0AD4 - .pool -_080B0AC8: - movs r0, 0x15 - b _080B0AD6 -_080B0ACC: - movs r0, 0x13 - b _080B0AD6 -_080B0AD0: - movs r0, 0x14 - b _080B0AD6 -_080B0AD4: - movs r0, 0xA -_080B0AD6: - ldr r1, =0x000001df - bl task_add_01_battle_start - movs r0, 0x7 - bl IncrementGameStat - movs r0, 0x8 - bl IncrementGameStat - bl sub_80EECC8 - bl sub_80B1218 - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B0A74 - - thumb_func_start sub_80B0AF8 -sub_80B0AF8: @ 80B0AF8 - push {lr} - sub sp, 0x4 - mov r1, sp - movs r0, 0 - strh r0, [r1] - movs r1, 0xA0 - lsls r1, 19 - ldr r2, =0x01000100 - mov r0, sp - bl CpuSet - movs r0, 0 - movs r1, 0x80 - bl ResetOamRange - ldr r0, =gBattleOutcome - ldrb r0, [r0] - bl battle_exit_is_player_defeat - cmp r0, 0x1 - bne _080B0B4C - bl InBattlePyramid - lsls r0, 24 - cmp r0, 0 - bne _080B0B4C - bl InBattlePike - lsls r0, 24 - cmp r0, 0 - bne _080B0B4C - ldr r0, =c2_whiteout - bl SetMainCallback2 - b _080B0B58 - .pool -_080B0B4C: - ldr r0, =c2_exit_to_overworld_2_switch - bl SetMainCallback2 - ldr r1, =gFieldCallback - ldr r0, =sub_80AF6F0 - str r0, [r1] -_080B0B58: - add sp, 0x4 - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B0AF8 - - thumb_func_start sub_80B0B6C -sub_80B0B6C: @ 80B0B6C - push {lr} - sub sp, 0x4 - mov r1, sp - movs r0, 0 - strh r0, [r1] - movs r1, 0xA0 - lsls r1, 19 - ldr r2, =0x01000100 - mov r0, sp - bl CpuSet - movs r0, 0 - movs r1, 0x80 - bl ResetOamRange - ldr r0, =gBattleOutcome - ldrb r0, [r0] - bl battle_exit_is_player_defeat - cmp r0, 0x1 - bne _080B0BC0 - bl InBattlePyramid - lsls r0, 24 - cmp r0, 0 - beq _080B0BB4 - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music - bl SetMainCallback2 - b _080B0BC6 - .pool -_080B0BB4: - ldr r0, =c2_whiteout - bl SetMainCallback2 - b _080B0BC6 - .pool -_080B0BC0: - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music - bl SetMainCallback2 -_080B0BC6: - add sp, 0x4 - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B0B6C - - thumb_func_start BattleSetup_GetTerrainId -BattleSetup_GetTerrainId: @ 80B0BD0 - push {r4,r5,lr} - sub sp, 0x4 - mov r4, sp - adds r4, 0x2 - mov r0, sp - adds r1, r4, 0 - bl PlayerGetDestCoords - mov r0, sp - movs r1, 0 - ldrsh r0, [r0, r1] - movs r2, 0 - ldrsh r1, [r4, r2] - bl MapGridGetMetatileBehaviorAt - lsls r0, 16 - lsrs r5, r0, 16 - lsls r0, r5, 24 - lsrs r4, r0, 24 - adds r0, r4, 0 - bl MetatileBehavior_IsTallGrass - lsls r0, 24 - cmp r0, 0 - beq _080B0C06 - movs r0, 0 - b _080B0D1A -_080B0C06: - adds r0, r4, 0 - bl MetatileBehavior_IsLongGrass - lsls r0, 24 - cmp r0, 0 - beq _080B0C16 - movs r0, 0x1 - b _080B0D1A -_080B0C16: - adds r0, r4, 0 - bl MetatileBehavior_IsSandOrDeepSand - lsls r0, 24 - cmp r0, 0 - bne _080B0D18 - ldr r0, =gMapHeader - ldrb r0, [r0, 0x17] - subs r0, 0x1 - cmp r0, 0x8 - bhi _080B0C9C - lsls r0, 2 - ldr r1, =_080B0C40 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080B0C40: - .4byte _080B0C9C - .4byte _080B0C9C - .4byte _080B0C9C - .4byte _080B0C64 - .4byte _080B0C88 - .4byte _080B0C8C - .4byte _080B0C9C - .4byte _080B0C74 - .4byte _080B0C74 -_080B0C64: - lsls r0, r5, 24 - lsrs r4, r0, 24 - adds r0, r4, 0 - bl MetatileBehavior_IsMB_0B - lsls r0, 24 - cmp r0, 0 - beq _080B0C78 -_080B0C74: - movs r0, 0x8 - b _080B0D1A -_080B0C78: - adds r0, r4, 0 - bl MetatileBehavior_IsSurfableWaterOrUnderwater - lsls r0, 24 - cmp r0, 0 - bne _080B0CE0 - movs r0, 0x7 - b _080B0D1A -_080B0C88: - movs r0, 0x3 - b _080B0D1A -_080B0C8C: - lsls r0, r5, 24 - lsrs r0, 24 - bl MetatileBehavior_IsSurfableWaterOrUnderwater - lsls r0, 24 - cmp r0, 0 - bne _080B0CF2 - b _080B0D10 -_080B0C9C: - lsls r0, r5, 24 - lsrs r4, r0, 24 - adds r0, r4, 0 - bl MetatileBehavior_IsDeepOrOceanWater - lsls r0, 24 - cmp r0, 0 - bne _080B0CF2 - adds r0, r4, 0 - bl MetatileBehavior_IsSurfableWaterOrUnderwater - lsls r0, 24 - cmp r0, 0 - bne _080B0CE0 - adds r0, r4, 0 - bl MetatileBehavior_IsMountain - lsls r0, 24 - cmp r0, 0 - beq _080B0CC8 - movs r0, 0x6 - b _080B0D1A -_080B0CC8: - movs r0, 0x8 - bl TestPlayerAvatarFlags - lsls r0, 24 - cmp r0, 0 - beq _080B0CF6 - adds r0, r4, 0 - bl MetatileBehavior_GetBridgeSth - lsls r0, 24 - cmp r0, 0 - beq _080B0CE4 -_080B0CE0: - movs r0, 0x5 - b _080B0D1A -_080B0CE4: - adds r0, r4, 0 - bl MetatileBehavior_IsBridge - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080B0CF6 -_080B0CF2: - movs r0, 0x4 - b _080B0D1A -_080B0CF6: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldrh r1, [r0, 0x4] - movs r0, 0xE0 - lsls r0, 5 - cmp r1, r0 - beq _080B0D18 - bl sav1_get_weather_probably - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x8 - beq _080B0D18 -_080B0D10: - movs r0, 0x9 - b _080B0D1A - .pool -_080B0D18: - movs r0, 0x2 -_080B0D1A: - add sp, 0x4 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end BattleSetup_GetTerrainId - - thumb_func_start sub_80B0D24 -sub_80B0D24: @ 80B0D24 - push {r4,lr} - sub sp, 0x4 - mov r4, sp - adds r4, 0x2 - mov r0, sp - adds r1, r4, 0 - bl PlayerGetDestCoords - mov r0, sp - movs r1, 0 - ldrsh r0, [r0, r1] - movs r2, 0 - ldrsh r1, [r4, r2] - bl MapGridGetMetatileBehaviorAt - lsls r0, 16 - lsrs r4, r0, 16 - bl sav1_get_flash_used_on_map - lsls r0, 24 - cmp r0, 0 - beq _080B0D54 - movs r0, 0x2 - b _080B0D7E -_080B0D54: - lsls r0, r4, 24 - lsrs r0, 24 - bl MetatileBehavior_IsSurfableWaterOrUnderwater - lsls r0, 24 - cmp r0, 0 - bne _080B0D7C - ldr r0, =gMapHeader - ldrb r0, [r0, 0x17] - cmp r0, 0x4 - beq _080B0D78 - cmp r0, 0x5 - beq _080B0D7C - movs r0, 0 - b _080B0D7E - .pool -_080B0D78: - movs r0, 0x1 - b _080B0D7E -_080B0D7C: - movs r0, 0x3 -_080B0D7E: - add sp, 0x4 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80B0D24 - - thumb_func_start sub_80B0D88 -sub_80B0D88: @ 80B0D88 - push {r4-r7,lr} - lsls r0, 24 - lsrs r5, r0, 24 - movs r7, 0 - movs r6, 0 -_080B0D92: - movs r0, 0x64 - adds r1, r6, 0 - muls r1, r0 - ldr r0, =gPlayerParty - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0x41 - bl GetMonData - adds r1, r0, 0 - movs r0, 0xCE - lsls r0, 1 - cmp r1, r0 - beq _080B0DD6 - cmp r1, 0 - beq _080B0DD6 - adds r0, r4, 0 - movs r1, 0x39 - bl GetMonData - cmp r0, 0 - beq _080B0DD6 - adds r0, r4, 0 - movs r1, 0x38 - bl GetMonData - adds r0, r7, r0 - lsls r0, 24 - lsrs r7, r0, 24 - subs r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0 - beq _080B0DDC -_080B0DD6: - adds r6, 0x1 - cmp r6, 0x5 - ble _080B0D92 -_080B0DDC: - adds r0, r7, 0 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B0D88 - - thumb_func_start reads_trainer_data_byte0 -reads_trainer_data_byte0: @ 80B0DE8 - push {r4,r5,lr} - lsls r0, 16 - lsrs r0, 16 - lsls r1, 24 - lsrs r4, r1, 24 - ldr r5, =gTrainers - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r2, r1, r5 - adds r0, r2, 0 - adds r0, 0x20 - ldrb r0, [r0] - cmp r0, r4 - bcs _080B0E08 - adds r4, r0, 0 -_080B0E08: - movs r3, 0 - ldrb r0, [r2] - cmp r0, 0x1 - beq _080B0E50 - cmp r0, 0x1 - bgt _080B0E20 - cmp r0, 0 - beq _080B0E2A - b _080B0EC0 - .pool -_080B0E20: - cmp r0, 0x2 - beq _080B0E76 - cmp r0, 0x3 - beq _080B0E9C - b _080B0EC0 -_080B0E2A: - adds r0, r5, 0 - adds r0, 0x24 - adds r0, r1, r0 - ldr r1, [r0] - movs r2, 0 - cmp r3, r4 - bcs _080B0EC0 -_080B0E38: - lsls r0, r2, 3 - adds r0, r1 - ldrb r0, [r0, 0x2] - adds r0, r3, r0 - lsls r0, 24 - lsrs r3, r0, 24 - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, r4 - bcc _080B0E38 - b _080B0EC0 -_080B0E50: - adds r0, r5, 0 - adds r0, 0x24 - adds r0, r1, r0 - ldr r1, [r0] - movs r2, 0 - cmp r3, r4 - bcs _080B0EC0 -_080B0E5E: - lsls r0, r2, 4 - adds r0, r1 - ldrb r0, [r0, 0x2] - adds r0, r3, r0 - lsls r0, 24 - lsrs r3, r0, 24 - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, r4 - bcc _080B0E5E - b _080B0EC0 -_080B0E76: - adds r0, r5, 0 - adds r0, 0x24 - adds r0, r1, r0 - ldr r1, [r0] - movs r2, 0 - cmp r3, r4 - bcs _080B0EC0 -_080B0E84: - lsls r0, r2, 3 - adds r0, r1 - ldrb r0, [r0, 0x2] - adds r0, r3, r0 - lsls r0, 24 - lsrs r3, r0, 24 - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, r4 - bcc _080B0E84 - b _080B0EC0 -_080B0E9C: - adds r0, r5, 0 - adds r0, 0x24 - adds r0, r1, r0 - ldr r1, [r0] - movs r2, 0 - cmp r3, r4 - bcs _080B0EC0 -_080B0EAA: - lsls r0, r2, 4 - adds r0, r1 - ldrb r0, [r0, 0x2] - adds r0, r3, r0 - lsls r0, 24 - lsrs r3, r0, 24 - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, r4 - bcc _080B0EAA -_080B0EC0: - adds r0, r3, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end reads_trainer_data_byte0 - - thumb_func_start sub_80B0EC8 -sub_80B0EC8: @ 80B0EC8 - push {r4-r6,lr} - bl sub_80B0D24 - lsls r0, 24 - lsrs r5, r0, 24 - adds r6, r5, 0 - ldr r0, =gEnemyParty - movs r1, 0x38 - bl GetMonData - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0x1 - bl sub_80B0D88 - lsls r0, 24 - lsrs r0, 24 - cmp r4, r0 - bcs _080B0F10 - bl InBattlePyramid - lsls r0, 24 - cmp r0, 0 - beq _080B0F04 - movs r0, 0 - b _080B0F2E - .pool -_080B0F04: - ldr r0, =gUnknown_0854FE88 - lsls r1, r5, 1 - b _080B0F20 - .pool -_080B0F10: - bl InBattlePyramid - lsls r0, 24 - cmp r0, 0 - bne _080B0F2C - ldr r0, =gUnknown_0854FE88 - lsls r1, r6, 1 - adds r0, 0x1 -_080B0F20: - adds r1, r0 - ldrb r0, [r1] - b _080B0F2E - .pool -_080B0F2C: - movs r0, 0xA -_080B0F2E: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80B0EC8 - - thumb_func_start reads_trainer_data_byte1_byte0x18 -reads_trainer_data_byte1_byte0x18: @ 80B0F34 - push {r4-r6,lr} - ldr r4, =gTrainerBattleOpponent_A - ldrh r1, [r4] - movs r0, 0x80 - lsls r0, 3 - cmp r1, r0 - beq _080B0F98 - ldr r1, =gTrainers - ldrh r2, [r4] - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r0, r1 - ldrb r1, [r0, 0x1] - cmp r1, 0x1F - bne _080B0F94 - adds r1, r2, 0 - ldr r0, =0x00000105 - cmp r1, r0 - bne _080B0F6C - movs r0, 0xC - b _080B1000 - .pool -_080B0F6C: - movs r0, 0x83 - lsls r0, 1 - cmp r1, r0 - bne _080B0F78 - movs r0, 0xD - b _080B1000 -_080B0F78: - ldr r0, =0x00000107 - cmp r1, r0 - bne _080B0F88 - movs r0, 0xE - b _080B1000 - .pool -_080B0F88: - movs r0, 0x84 - lsls r0, 1 - cmp r1, r0 - bne _080B0F98 - movs r0, 0xF - b _080B1000 -_080B0F94: - cmp r1, 0x26 - bne _080B0F9C -_080B0F98: - movs r0, 0x10 - b _080B1000 -_080B0F9C: - cmp r1, 0x9 - beq _080B0FA8 - cmp r1, 0x35 - beq _080B0FA8 - cmp r1, 0x31 - bne _080B0FAC -_080B0FA8: - movs r0, 0x12 - b _080B1000 -_080B0FAC: - cmp r1, 0x3 - beq _080B0FB8 - cmp r1, 0xD - beq _080B0FB8 - cmp r1, 0xB - bne _080B0FBC -_080B0FB8: - movs r0, 0x11 - b _080B1000 -_080B0FBC: - ldrb r0, [r0, 0x18] - movs r5, 0x1 - cmp r0, 0x1 - bne _080B0FC6 - movs r5, 0x2 -_080B0FC6: - bl sub_80B0D24 - lsls r0, 24 - lsrs r6, r0, 24 - ldrh r0, [r4] - adds r1, r5, 0 - bl reads_trainer_data_byte0 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r5, 0 - bl sub_80B0D88 - lsls r0, 24 - lsrs r0, 24 - cmp r4, r0 - bcc _080B0FF8 - ldr r0, =gUnknown_0854FE90 - lsls r1, r6, 1 - adds r0, 0x1 - b _080B0FFC - .pool -_080B0FF8: - ldr r0, =gUnknown_0854FE90 - lsls r1, r6, 1 -_080B0FFC: - adds r1, r0 - ldrb r0, [r1] -_080B1000: - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end reads_trainer_data_byte1_byte0x18 - - thumb_func_start sub_80B100C -sub_80B100C: @ 80B100C - push {r4,r5,lr} - adds r5, r0, 0 - ldr r0, =gEnemyParty - movs r1, 0x38 - bl GetMonData - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0x1 - bl sub_80B0D88 - lsls r0, 24 - lsrs r0, 24 - cmp r4, r0 - bcs _080B1090 - cmp r5, 0xA - beq _080B1048 - cmp r5, 0xA - bgt _080B1040 - cmp r5, 0x3 - beq _080B105C - b _080B106C - .pool -_080B1040: - cmp r5, 0xD - bgt _080B106C - movs r0, 0x4 - b _080B1120 -_080B1048: - ldr r4, =gUnknown_0854FEA4 - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x3 - b _080B1114 - .pool -_080B105C: - ldr r4, =gUnknown_0854FEA7 - bl Random - ands r5, r0 - lsls r0, r5, 16 - b _080B111A - .pool -_080B106C: - ldr r0, =0x000040ce - bl VarGet - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x3 - beq _080B10EC - ldr r4, =gUnknown_0854FE98 - bl Random - lsls r0, 16 - lsrs r0, 16 - b _080B1112 - .pool -_080B1090: - cmp r5, 0xA - beq _080B10A6 - cmp r5, 0xA - bgt _080B109E - cmp r5, 0x3 - beq _080B10B8 - b _080B10C8 -_080B109E: - cmp r5, 0xD - bgt _080B10C8 - movs r0, 0x3 - b _080B1120 -_080B10A6: - ldr r4, =gUnknown_0854FEA4 - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x3 - b _080B1114 - .pool -_080B10B8: - ldr r4, =gUnknown_0854FEA7 - bl Random - ands r5, r0 - lsls r0, r5, 16 - b _080B111A - .pool -_080B10C8: - ldr r0, =0x000040ce - bl VarGet - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x3 - beq _080B10EC - ldr r4, =gUnknown_0854FE98 - bl Random - lsls r0, 16 - lsrs r0, 16 - b _080B1112 - .pool -_080B10EC: - ldr r0, =gSaveBlock2Ptr - ldr r1, [r0] - ldr r2, =0x00000cb2 - adds r0, r1, r2 - ldrh r0, [r0] - lsls r2, r0, 2 - ldr r3, =0x00000cb4 - adds r1, r3 - adds r2, r1, r2 - lsls r0, 1 - adds r0, 0x1 - lsls r0, 1 - adds r1, r0 - ldrh r0, [r1] - ldrh r2, [r2] - adds r0, r2 - lsls r0, 16 - lsrs r0, 16 - ldr r4, =gUnknown_0854FE98 -_080B1112: - movs r1, 0xC -_080B1114: - bl __umodsi3 - lsls r0, 16 -_080B111A: - lsrs r0, 16 - adds r0, r4 - ldrb r0, [r0] -_080B1120: - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B100C - - thumb_func_start sub_80B1138 -sub_80B1138: @ 80B1138 - push {lr} - ldr r0, =CB2_ChooseStarter - bl SetMainCallback2 - ldr r1, =gMain - ldr r0, =sub_80B1158 - str r0, [r1, 0x8] - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B1138 - - thumb_func_start sub_80B1158 -sub_80B1158: @ 80B1158 - push {lr} - sub sp, 0x8 - ldr r0, =0x00004023 - bl GetVarPointer - ldr r2, =gSpecialVar_Result - ldrh r1, [r2] - strh r1, [r0] - ldrh r0, [r2] - bl GetStarterPokemon - lsls r0, 16 - lsrs r0, 16 - movs r1, 0 - str r1, [sp] - str r1, [sp, 0x4] - movs r1, 0x5 - movs r2, 0 - movs r3, 0 - bl ScriptGiveMon - bl ResetTasks - bl PlayBattleBGM - ldr r0, =sub_80B11A8 - bl SetMainCallback2 - movs r0, 0 - bl sub_8145F10 - add sp, 0x8 - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B1158 - - thumb_func_start sub_80B11A8 -sub_80B11A8: @ 80B11A8 - push {lr} - bl UpdatePaletteFade - bl RunTasks - bl IsBattleTransitionDone - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080B11F0 - ldr r1, =gBattleTypeFlags - movs r0, 0x10 - str r0, [r1] - ldr r1, =gMain - ldr r0, =sub_80B1204 - str r0, [r1, 0x8] - bl FreeAllWindowBuffers - ldr r0, =CB2_InitBattle - bl SetMainCallback2 - bl prev_quest_postbuffer_cursor_backup_reset - bl overworld_poison_timer_set - movs r0, 0x7 - bl IncrementGameStat - movs r0, 0x8 - bl IncrementGameStat - bl sub_80EECC8 - bl sub_80B1218 -_080B11F0: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B11A8 - - thumb_func_start sub_80B1204 -sub_80B1204: @ 80B1204 - push {lr} - bl sav1_reset_battle_music_maybe - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music - bl SetMainCallback2 - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B1204 - - thumb_func_start sub_80B1218 -sub_80B1218: @ 80B1218 - push {lr} - movs r0, 0x8 - bl GetGameStat - movs r1, 0x3C - bl __umodsi3 - cmp r0, 0 - bne _080B122E - bl sub_81DA57C -_080B122E: - pop {r0} - bx r0 - thumb_func_end sub_80B1218 - - thumb_func_start sub_80B1234 -sub_80B1234: @ 80B1234 - push {lr} - movs r0, 0x9 - bl GetGameStat - movs r1, 0x14 - bl __umodsi3 - cmp r0, 0 - bne _080B124A - bl sub_81DA57C -_080B124A: - pop {r0} - bx r0 - thumb_func_end sub_80B1234 - - thumb_func_start TrainerBattleLoadArg32 -@ u32 TrainerBattleLoadArg32(u8 *arg) -TrainerBattleLoadArg32: @ 80B1250 - adds r2, r0, 0 - ldrb r0, [r2] - ldrb r1, [r2, 0x1] - lsls r1, 8 - orrs r0, r1 - ldrb r1, [r2, 0x2] - lsls r1, 16 - orrs r0, r1 - ldrb r1, [r2, 0x3] - lsls r1, 24 - orrs r0, r1 - bx lr - thumb_func_end TrainerBattleLoadArg32 - - thumb_func_start TrainerBattleLoadArg16 -@ u16 TrainerBattleLoadArg16(u8 *arg) -TrainerBattleLoadArg16: @ 80B1268 - adds r1, r0, 0 - ldrb r0, [r1] - ldrb r1, [r1, 0x1] - lsls r1, 8 - orrs r0, r1 - bx lr - thumb_func_end TrainerBattleLoadArg16 - - thumb_func_start TrainerBattleLoadArg8 -@ u8 TrainerBattleLoadArg8(u8 *arg) -TrainerBattleLoadArg8: @ 80B1274 - ldrb r0, [r0] - bx lr - thumb_func_end TrainerBattleLoadArg8 - - thumb_func_start trainerflag_opponent -trainerflag_opponent: @ 80B1278 - ldr r1, =gTrainerBattleOpponent_A - movs r2, 0xA0 - lsls r2, 3 - adds r0, r2, 0 - ldrh r1, [r1] - adds r0, r1 - lsls r0, 16 - lsrs r0, 16 - bx lr - .pool - thumb_func_end trainerflag_opponent - - thumb_func_start sub_80B1290 -sub_80B1290: @ 80B1290 - ldr r1, =gTrainerBattleOpponent_B - movs r2, 0xA0 - lsls r2, 3 - adds r0, r2, 0 - ldrh r1, [r1] - adds r0, r1 - lsls r0, 16 - lsrs r0, 16 - bx lr - .pool - thumb_func_end sub_80B1290 - - thumb_func_start battle_exit_is_player_defeat -battle_exit_is_player_defeat: @ 80B12A8 - push {lr} - subs r0, 0x1 - cmp r0, 0x6 - bhi _080B12E0 - lsls r0, 2 - ldr r1, =_080B12C0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080B12C0: - .4byte _080B12E0 - .4byte _080B12DC - .4byte _080B12DC - .4byte _080B12E0 - .4byte _080B12E0 - .4byte _080B12E0 - .4byte _080B12E0 -_080B12DC: - movs r0, 0x1 - b _080B12E2 -_080B12E0: - movs r0, 0 -_080B12E2: - pop {r1} - bx r1 - thumb_func_end battle_exit_is_player_defeat - - thumb_func_start ResetTrainerOpponentIds -ResetTrainerOpponentIds: @ 80B12E8 - ldr r0, =gTrainerBattleOpponent_A - movs r1, 0 - strh r1, [r0] - ldr r0, =gTrainerBattleOpponent_B - strh r1, [r0] - bx lr - .pool - thumb_func_end ResetTrainerOpponentIds - - thumb_func_start InitTrainerBattleVariables -@ void InitTrainerBattleVariables() -InitTrainerBattleVariables: @ 80B12FC - push {lr} - ldr r0, =gUnknown_02038BC8 - movs r1, 0 - strh r1, [r0] - ldr r0, =gUnknown_02038BFC - ldrb r1, [r0] - cmp r1, 0 - bne _080B132C - ldr r0, =gUnknown_02038BD4 - str r1, [r0] - ldr r0, =gUnknown_02038BDC - str r1, [r0] - ldr r0, =gUnknown_02038BF0 - b _080B1338 - .pool -_080B132C: - ldr r0, =gUnknown_02038BD8 - movs r1, 0 - str r1, [r0] - ldr r0, =gUnknown_02038BE0 - str r1, [r0] - ldr r0, =gUnknown_02038BF4 -_080B1338: - str r1, [r0] - ldr r1, =gUnknown_02038BD0 - movs r0, 0 - strh r0, [r1] - ldr r0, =gUnknown_02038BE4 - movs r1, 0 - str r1, [r0] - ldr r0, =gUnknown_02038BE8 - str r1, [r0] - ldr r0, =gUnknown_02038BEC - str r1, [r0] - pop {r0} - bx r0 - .pool - thumb_func_end InitTrainerBattleVariables - - thumb_func_start TrainerBattleLoadArgs -@ void TrainerBattleLoadArgs(struct TrainerBattleArgSpec *argSpecs, u8 *args) -TrainerBattleLoadArgs: @ 80B1370 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 -_080B1376: - ldrb r0, [r4, 0x4] - cmp r0, 0x6 - bhi _080B13E8 - lsls r0, 2 - ldr r1, =_080B138C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080B138C: - .4byte _080B13A8 - .4byte _080B13B6 - .4byte _080B13C4 - .4byte _080B13D2 - .4byte _080B13DA - .4byte _080B13E2 - .4byte _080B13EC -_080B13A8: - adds r0, r5, 0 - bl TrainerBattleLoadArg8 - ldr r1, [r4] - strb r0, [r1] - adds r5, 0x1 - b _080B13E8 -_080B13B6: - adds r0, r5, 0 - bl TrainerBattleLoadArg16 - ldr r1, [r4] - strh r0, [r1] - adds r5, 0x2 - b _080B13E8 -_080B13C4: - adds r0, r5, 0 - bl TrainerBattleLoadArg32 - ldr r1, [r4] - str r0, [r1] - adds r5, 0x4 - b _080B13E8 -_080B13D2: - ldr r1, [r4] - movs r0, 0 - strb r0, [r1] - b _080B13E8 -_080B13DA: - ldr r1, [r4] - movs r0, 0 - strh r0, [r1] - b _080B13E8 -_080B13E2: - ldr r1, [r4] - movs r0, 0 - str r0, [r1] -_080B13E8: - adds r4, 0x8 - b _080B1376 -_080B13EC: - ldr r0, [r4] - str r5, [r0] - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end TrainerBattleLoadArgs - - thumb_func_start battle_80801F0 -battle_80801F0: @ 80B13F8 - push {lr} - ldr r0, =gUnknown_02038BD0 - ldrh r1, [r0] - cmp r1, 0 - beq _080B141A - ldr r0, =gSpecialVar_LastTalked - strh r1, [r0] - lsls r0, r1, 24 - lsrs r0, 24 - ldr r1, =gSaveBlock1Ptr - ldr r2, [r1] - ldrb r1, [r2, 0x5] - ldrb r2, [r2, 0x4] - bl GetFieldObjectIdByLocalIdAndMap - ldr r1, =gSelectedMapObject - strb r0, [r1] -_080B141A: - pop {r0} - bx r0 - .pool - thumb_func_end battle_80801F0 - - thumb_func_start BattleSetup_ConfigureTrainerBattle -@ u8 *BattleSetup_ConfigureTrainerBattle(u8 *args) -BattleSetup_ConfigureTrainerBattle: @ 80B1430 - push {r4,r5,lr} - adds r5, r0, 0 - bl InitTrainerBattleVariables - ldr r4, =gUnknown_02038BC8 - adds r0, r5, 0 - bl TrainerBattleLoadArg8 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4] - ldrh r0, [r4] - subs r0, 0x1 - cmp r0, 0xB - bls _080B1450 - b _080B15F4 -_080B1450: - lsls r0, 2 - ldr r1, =_080B1464 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080B1464: - .4byte _080B14CC - .4byte _080B14B0 - .4byte _080B1494 - .4byte _080B14A8 - .4byte _080B1514 - .4byte _080B14D4 - .4byte _080B14EC - .4byte _080B14D4 - .4byte _080B153C - .4byte _080B1590 - .4byte _080B1598 - .4byte _080B15A8 -_080B1494: - ldr r0, =gUnknown_0854FF84 - adds r1, r5, 0 - bl TrainerBattleLoadArgs - ldr r0, =EventScript_2713C2 - b _080B161E - .pool -_080B14A8: - ldr r0, =gUnknown_0854FF3C - b _080B14D6 - .pool -_080B14B0: - ldr r0, =gUnknown_02038BFC - ldrb r0, [r0] - cmp r0, 0 - bne _080B14C4 - ldr r0, =gUnknown_0854FEF4 - b _080B15FE - .pool -_080B14C4: - ldr r0, =gUnknown_0855005C - b _080B1616 - .pool -_080B14CC: - ldr r0, =gUnknown_0854FEF4 - b _080B15FE - .pool -_080B14D4: - ldr r0, =gUnknown_0854FFCC -_080B14D6: - adds r1, r5, 0 - bl TrainerBattleLoadArgs - bl battle_80801F0 - ldr r0, =EventScript_27138A - b _080B161E - .pool -_080B14EC: - ldr r0, =gUnknown_0854FF3C - adds r1, r5, 0 - bl TrainerBattleLoadArgs - bl battle_80801F0 - ldr r4, =gTrainerBattleOpponent_A - ldrh r0, [r4] - bl sub_80B2234 - strh r0, [r4] - ldr r0, =EventScript_2713F8 - b _080B161E - .pool -_080B1514: - ldr r0, =gUnknown_0854FEAC - adds r1, r5, 0 - bl TrainerBattleLoadArgs - bl battle_80801F0 - ldr r4, =gTrainerBattleOpponent_A - ldrh r0, [r4] - bl sub_80B2234 - strh r0, [r4] - ldr r0, =EventScript_2713D1 - b _080B161E - .pool -_080B153C: - ldr r0, =gUnknown_02038BFC - ldrb r0, [r0] - cmp r0, 0 - bne _080B156C - ldr r0, =gUnknown_0854FEAC - adds r1, r5, 0 - bl TrainerBattleLoadArgs - bl battle_80801F0 - ldr r0, =gSpecialVar_LastTalked - ldrb r0, [r0] - bl sub_81A9AA8 - ldr r1, =gTrainerBattleOpponent_A - b _080B157E - .pool -_080B156C: - ldr r0, =gUnknown_08550014 - adds r1, r5, 0 - bl TrainerBattleLoadArgs - ldr r0, =gSpecialVar_LastTalked - ldrb r0, [r0] - bl sub_81A9AA8 -_080B157C: - ldr r1, =gTrainerBattleOpponent_B -_080B157E: - strh r0, [r1] - b _080B161C - .pool -_080B1590: - ldr r0, =gUnknown_0854FEAC - b _080B159A - .pool -_080B1598: - ldr r0, =gUnknown_08550014 -_080B159A: - adds r1, r5, 0 - bl TrainerBattleLoadArgs - movs r0, 0 - b _080B161E - .pool -_080B15A8: - ldr r0, =gUnknown_02038BFC - ldrb r0, [r0] - cmp r0, 0 - bne _080B15D8 - ldr r0, =gUnknown_0854FEAC - adds r1, r5, 0 - bl TrainerBattleLoadArgs - bl battle_80801F0 - ldr r0, =gSpecialVar_LastTalked - ldrb r0, [r0] - bl battle_init - ldr r1, =gTrainerBattleOpponent_A - b _080B157E - .pool -_080B15D8: - ldr r0, =gUnknown_08550014 - adds r1, r5, 0 - bl TrainerBattleLoadArgs - ldr r0, =gSpecialVar_LastTalked - ldrb r0, [r0] - bl battle_init - b _080B157C - .pool -_080B15F4: - ldr r0, =gUnknown_02038BFC - ldrb r0, [r0] - cmp r0, 0 - bne _080B1614 - ldr r0, =gUnknown_0854FEAC -_080B15FE: - adds r1, r5, 0 - bl TrainerBattleLoadArgs - bl battle_80801F0 - b _080B161C - .pool -_080B1614: - ldr r0, =gUnknown_08550014 -_080B1616: - adds r1, r5, 0 - bl TrainerBattleLoadArgs -_080B161C: - ldr r0, =EventScript_271362 -_080B161E: - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end BattleSetup_ConfigureTrainerBattle - - thumb_func_start SingleTrainerWantsBattle -@ void SingleTrainerWantsBattle(u8 trainerFieldObjectId, u8 *trainerScript) -SingleTrainerWantsBattle: @ 80B162C - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gSelectedMapObject - strb r0, [r2] - ldr r4, =gSpecialVar_LastTalked - ldr r3, =gMapObjects - lsls r2, r0, 3 - adds r2, r0 - lsls r2, 2 - adds r2, r3 - ldrb r0, [r2, 0x8] - strh r0, [r4] - adds r1, 0x1 - adds r0, r1, 0 - bl BattleSetup_ConfigureTrainerBattle - ldr r0, =EventScript_271354 - bl ScriptContext1_SetupScript - bl ScriptContext2_Enable - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end SingleTrainerWantsBattle - - thumb_func_start TwoTrainersWantBattle -@ void TwoTrainersWantBattle(u8 trainerFieldObjectId, u8 *trainerScript) -TwoTrainersWantBattle: @ 80B1670 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gSelectedMapObject - strb r0, [r2] - ldr r4, =gSpecialVar_LastTalked - ldr r3, =gMapObjects - lsls r2, r0, 3 - adds r2, r0 - lsls r2, 2 - adds r2, r3 - ldrb r0, [r2, 0x8] - strh r0, [r4] - adds r1, 0x1 - adds r0, r1, 0 - bl BattleSetup_ConfigureTrainerBattle - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end TwoTrainersWantBattle - - thumb_func_start TwoTrainersWantBattleExecuteScript -@ void TwoTrainersWantBattleExecuteScript() -TwoTrainersWantBattleExecuteScript: @ 80B16A4 - push {lr} - ldr r0, =EventScript_271354 - bl ScriptContext1_SetupScript - bl ScriptContext2_Enable - pop {r0} - bx r0 - .pool - thumb_func_end TwoTrainersWantBattleExecuteScript - - thumb_func_start GetTrainerFlagFromScriptPointer -@ u8 GetTrainerFlagFromScriptPointer(u8 *scriptPointer) -GetTrainerFlagFromScriptPointer: @ 80B16B8 - push {lr} - adds r0, 0x2 - bl TrainerBattleLoadArg16 - lsls r0, 16 - movs r1, 0xA0 - lsls r1, 19 - adds r0, r1 - lsrs r0, 16 - bl FlagGet - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - thumb_func_end GetTrainerFlagFromScriptPointer - - thumb_func_start sub_80B16D8 -sub_80B16D8: @ 80B16D8 - push {r4,lr} - ldr r0, =gSelectedMapObject - ldrb r0, [r0] - lsls r4, r0, 3 - adds r4, r0 - lsls r4, 2 - ldr r0, =gMapObjects - adds r4, r0 - ldrb r0, [r4, 0x18] - lsls r0, 28 - lsrs r0, 28 - bl npc_running_behaviour_by_direction - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl npc_set_running_behaviour_etc - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B16D8 - - thumb_func_start sub_80B170C -sub_80B170C: @ 80B170C - ldr r0, =gUnknown_02038BC8 - ldrb r0, [r0] - bx lr - .pool - thumb_func_end sub_80B170C - - thumb_func_start check_trainer_flag -@ pokescrcmd -check_trainer_flag: @ 80B1718 - push {lr} - bl InBattlePyramid - lsls r0, 24 - cmp r0, 0 - beq _080B1734 - ldr r0, =gSelectedMapObject - ldrb r0, [r0] - bl GetBattlePyramidTrainerFlag - b _080B1752 - .pool -_080B1734: - bl InTrainerHill - cmp r0, 0 - bne _080B174A - bl trainerflag_opponent - lsls r0, 16 - lsrs r0, 16 - bl FlagGet - b _080B1752 -_080B174A: - ldr r0, =gSelectedMapObject - ldrb r0, [r0] - bl GetTrainerHillTrainerFlag -_080B1752: - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .pool - thumb_func_end check_trainer_flag - - thumb_func_start rom_npc_set_flag_for_script_id -rom_npc_set_flag_for_script_id: @ 80B1760 - push {lr} - ldr r0, =gTrainerBattleOpponent_B - ldrh r0, [r0] - cmp r0, 0 - beq _080B1776 - bl sub_80B1290 - lsls r0, 16 - lsrs r0, 16 - bl FlagSet -_080B1776: - bl trainerflag_opponent - lsls r0, 16 - lsrs r0, 16 - bl FlagSet - pop {r0} - bx r0 - .pool - thumb_func_end rom_npc_set_flag_for_script_id - - thumb_func_start sub_80B178C -sub_80B178C: @ 80B178C - push {lr} - bl trainerflag_opponent - lsls r0, 16 - lsrs r0, 16 - bl FlagSet - pop {r0} - bx r0 - thumb_func_end sub_80B178C - - thumb_func_start HasTrainerAlreadyBeenFought -HasTrainerAlreadyBeenFought: @ 80B17A0 - push {lr} - lsls r0, 16 - movs r1, 0xA0 - lsls r1, 19 - adds r0, r1 - lsrs r0, 16 - bl FlagGet - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - thumb_func_end HasTrainerAlreadyBeenFought - - thumb_func_start trainer_flag_set -trainer_flag_set: @ 80B17B8 - push {lr} - lsls r0, 16 - movs r1, 0xA0 - lsls r1, 19 - adds r0, r1 - lsrs r0, 16 - bl FlagSet - pop {r0} - bx r0 - thumb_func_end trainer_flag_set - - thumb_func_start trainer_flag_clear -trainer_flag_clear: @ 80B17CC - push {lr} - lsls r0, 16 - movs r1, 0xA0 - lsls r1, 19 - adds r0, r1 - lsrs r0, 16 - bl FlagClear - pop {r0} - bx r0 - thumb_func_end trainer_flag_clear - - thumb_func_start BattleSetup_StartTrainerBattle -BattleSetup_StartTrainerBattle: @ 80B17E0 - push {r4,lr} - ldr r0, =gUnknown_030060A8 - ldrb r0, [r0] - cmp r0, 0x2 - bne _080B17FC - ldr r1, =gBattleTypeFlags - ldr r0, =0x00008009 - b _080B1800 - .pool -_080B17FC: - ldr r1, =gBattleTypeFlags - movs r0, 0x8 -_080B1800: - str r0, [r1] - bl InBattlePyramid - lsls r0, 24 - cmp r0, 0 - beq _080B1884 - ldr r0, =0x0000400e - movs r1, 0 - bl VarSet - ldr r2, =gBattleTypeFlags - ldr r0, [r2] - movs r1, 0x80 - lsls r1, 14 - orrs r0, r1 - str r0, [r2] - ldr r0, =gUnknown_030060A8 - ldrb r0, [r0] - cmp r0, 0x2 - bne _080B1864 - movs r0, 0x1 - bl sub_816306C - ldr r4, =gEnemyParty + 100 - adds r0, r4, 0 - bl ZeroMonData - adds r0, r4, 0 - adds r0, 0x64 - bl ZeroMonData - movs r1, 0x96 - lsls r1, 1 - adds r0, r4, r1 - bl ZeroMonData - movs r1, 0xC8 - lsls r1, 1 - adds r0, r4, r1 - bl ZeroMonData - b _080B187A - .pool -_080B1864: - movs r0, 0x1 - bl sub_8163048 - ldr r4, =gEnemyParty + 100 - adds r0, r4, 0 - bl ZeroMonData - adds r4, 0x64 - adds r0, r4, 0 - bl ZeroMonData -_080B187A: - bl sub_81A9B04 - b _080B18B8 - .pool -_080B1884: - bl sub_81D5C18 - lsls r0, 24 - cmp r0, 0 - beq _080B18B8 - ldr r2, =gBattleTypeFlags - ldr r0, [r2] - movs r1, 0x80 - lsls r1, 19 - orrs r0, r1 - str r0, [r2] - ldr r0, =gUnknown_030060A8 - ldrb r0, [r0] - cmp r0, 0x2 - bne _080B18B0 - bl sub_81D639C - b _080B18B4 - .pool -_080B18B0: - bl sub_81D6384 -_080B18B4: - bl sub_81D61E8 -_080B18B8: - ldr r1, =gUnknown_02038BF9 - ldr r2, =gUnknown_030060A8 - ldrb r0, [r2] - strb r0, [r1] - movs r1, 0 - strb r1, [r2] - ldr r0, =gUnknown_02038BF8 - strb r1, [r0] - ldr r1, =gUnknown_03006080 - movs r0, 0 - strh r0, [r1] - ldr r1, =gMain - ldr r0, =sub_80B1918 - str r0, [r1, 0x8] - bl InBattlePyramid - lsls r0, 24 - cmp r0, 0 - bne _080B18E8 - bl sub_81D5C18 - lsls r0, 24 - cmp r0, 0 - beq _080B1908 -_080B18E8: - bl sub_80B0828 - b _080B190C - .pool -_080B1908: - bl task_add_01_battle_start_with_music_and_stats -_080B190C: - bl ScriptContext1_Stop - pop {r4} - pop {r0} - bx r0 - thumb_func_end BattleSetup_StartTrainerBattle - - thumb_func_start sub_80B1918 -sub_80B1918: @ 80B1918 - push {lr} - ldr r0, =gTrainerBattleOpponent_A - ldrh r1, [r0] - movs r0, 0x80 - lsls r0, 3 - cmp r1, r0 - beq _080B1946 - ldr r0, =gBattleOutcome - ldrb r0, [r0] - bl battle_exit_is_player_defeat - cmp r0, 0x1 - bne _080B1968 - bl InBattlePyramid - lsls r0, 24 - cmp r0, 0 - bne _080B1946 - bl sub_81D5C18 - lsls r0, 24 - cmp r0, 0 - beq _080B195C -_080B1946: - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music - bl SetMainCallback2 - b _080B198A - .pool -_080B195C: - ldr r0, =c2_whiteout - bl SetMainCallback2 - b _080B198A - .pool -_080B1968: - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music - bl SetMainCallback2 - bl InBattlePyramid - lsls r0, 24 - cmp r0, 0 - bne _080B198A - bl sub_81D5C18 - lsls r0, 24 - cmp r0, 0 - bne _080B198A - bl sub_80B20BC - bl rom_npc_set_flag_for_script_id -_080B198A: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B1918 - - thumb_func_start sub_80B1994 -sub_80B1994: @ 80B1994 - push {lr} - ldr r0, =gTrainerBattleOpponent_A - ldrh r1, [r0] - movs r0, 0x80 - lsls r0, 3 - cmp r1, r0 - bne _080B19B4 - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music - bl SetMainCallback2 - b _080B19E2 - .pool -_080B19B4: - ldr r0, =gBattleOutcome - ldrb r0, [r0] - bl battle_exit_is_player_defeat - cmp r0, 0x1 - bne _080B19D0 - ldr r0, =c2_whiteout - bl SetMainCallback2 - b _080B19E2 - .pool -_080B19D0: - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music - bl SetMainCallback2 - bl sub_80B20BC - bl rom_npc_set_flag_for_script_id - bl sub_80B22BC -_080B19E2: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B1994 - - thumb_func_start sub_80B19EC -sub_80B19EC: @ 80B19EC - push {lr} - ldr r1, =gBattleTypeFlags - movs r0, 0x8 - str r0, [r1] - ldr r1, =gMain - ldr r0, =sub_80B1994 - str r0, [r1, 0x8] - bl task_add_01_battle_start_with_music_and_stats - bl ScriptContext1_Stop - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B19EC - - thumb_func_start sub_80B1A14 -sub_80B1A14: @ 80B1A14 - push {lr} - bl InBattlePyramid - lsls r0, 24 - cmp r0, 0 - beq _080B1A7C - ldr r0, =gUnknown_030060A8 - ldrb r0, [r0] - cmp r0, 0x1 - bhi _080B1A44 - ldr r0, =gSpecialVar_LastTalked - ldrb r0, [r0] - bl sub_81A9AA8 - lsls r0, 16 - lsrs r0, 16 - bl sub_81A9EDC - b _080B1AD8 - .pool -_080B1A44: - ldr r3, =gMapObjects - ldr r2, =gUnknown_03006090 - ldr r0, =gUnknown_02038BFC - ldrb r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r1, [r0] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - ldrb r0, [r0, 0x8] - bl sub_81A9AA8 - lsls r0, 16 - lsrs r0, 16 - bl sub_81A9EDC - b _080B1AD8 - .pool -_080B1A7C: - bl sub_81D5C18 - lsls r0, 24 - cmp r0, 0 - beq _080B1AEC - ldr r0, =gUnknown_030060A8 - ldrb r0, [r0] - cmp r0, 0x1 - bhi _080B1AAC - ldr r0, =gSpecialVar_LastTalked - ldrb r0, [r0] - bl battle_init - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x2 - bl sub_81D572C - b _080B1AD8 - .pool -_080B1AAC: - ldr r3, =gMapObjects - ldr r2, =gUnknown_03006090 - ldr r0, =gUnknown_02038BFC - ldrb r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r1, [r0] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - ldrb r0, [r0, 0x8] - bl battle_init - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x2 - bl sub_81D572C -_080B1AD8: - bl sub_80982B8 - b _080B1AF4 - .pool -_080B1AEC: - bl sub_80B1C7C - bl ShowFieldMessage -_080B1AF4: - pop {r0} - bx r0 - thumb_func_end sub_80B1A14 - - thumb_func_start BattleSetup_GetScriptAddrAfterBattle -BattleSetup_GetScriptAddrAfterBattle: @ 80B1AF8 - push {lr} - ldr r0, =gUnknown_02038BEC - ldr r0, [r0] - cmp r0, 0 - bne _080B1B04 - ldr r0, =EventScript_2C8436 -_080B1B04: - pop {r1} - bx r1 - .pool - thumb_func_end BattleSetup_GetScriptAddrAfterBattle - - thumb_func_start BattleSetup_GetTrainerPostBattleScript -BattleSetup_GetTrainerPostBattleScript: @ 80B1B10 - push {lr} - ldr r1, =gUnknown_02038BF8 - ldrb r2, [r1] - cmp r2, 0 - beq _080B1B3C - movs r0, 0 - strb r0, [r1] - ldr r0, =gUnknown_02038BF4 - ldr r2, [r0] - cmp r2, 0 - beq _080B1B54 - ldr r1, =gUnknown_03006080 - movs r0, 0x1 - strh r0, [r1] - adds r0, r2, 0 - b _080B1B56 - .pool -_080B1B3C: - ldr r0, =gUnknown_02038BF0 - ldr r1, [r0] - cmp r1, 0 - beq _080B1B54 - ldr r0, =gUnknown_03006080 - strh r2, [r0] - adds r0, r1, 0 - b _080B1B56 - .pool -_080B1B54: - ldr r0, =LavaridgeTown_Gym_1F_EventScript_2742E6 -_080B1B56: - pop {r1} - bx r1 - .pool - thumb_func_end BattleSetup_GetTrainerPostBattleScript - - thumb_func_start special_trainer_unable_to_battle -special_trainer_unable_to_battle: @ 80B1B60 - push {lr} - bl sub_80B1D18 - bl ShowFieldMessage - pop {r0} - bx r0 - thumb_func_end special_trainer_unable_to_battle - - thumb_func_start SetUpTrainerEncounterMusic -@ void SetUpTrainerEncounterMusic() -SetUpTrainerEncounterMusic: @ 80B1B70 - push {lr} - ldr r0, =gUnknown_02038BFC - ldrb r0, [r0] - cmp r0, 0 - bne _080B1B88 - ldr r0, =gTrainerBattleOpponent_A - b _080B1B8A - .pool -_080B1B88: - ldr r0, =gTrainerBattleOpponent_B -_080B1B8A: - ldrh r1, [r0] - ldr r0, =gUnknown_02038BC8 - ldrh r0, [r0] - cmp r0, 0x1 - beq _080B1C62 - cmp r0, 0x8 - beq _080B1C62 - adds r0, r1, 0 - bl GetTrainerEncounterMusicId - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xD - bhi _080B1C5C - lsls r0, 2 - ldr r1, =_080B1BBC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_080B1BBC: - .4byte _080B1BF4 - .4byte _080B1BFA - .4byte _080B1C04 - .4byte _080B1C5C - .4byte _080B1C0C - .4byte _080B1C12 - .4byte _080B1C1C - .4byte _080B1C24 - .4byte _080B1C2C - .4byte _080B1C34 - .4byte _080B1C3C - .4byte _080B1C42 - .4byte _080B1C4C - .4byte _080B1C54 -_080B1BF4: - movs r0, 0xBE - lsls r0, 1 - b _080B1C5E -_080B1BFA: - ldr r0, =0x00000197 - b _080B1C5E - .pool -_080B1C04: - ldr r0, =0x0000017b - b _080B1C5E - .pool -_080B1C0C: - movs r0, 0xD0 - lsls r0, 1 - b _080B1C5E -_080B1C12: - ldr r0, =0x000001a1 - b _080B1C5E - .pool -_080B1C1C: - ldr r0, =0x000001a3 - b _080B1C5E - .pool -_080B1C24: - ldr r0, =0x000001b9 - b _080B1C5E - .pool -_080B1C2C: - ldr r0, =0x00000181 - b _080B1C5E - .pool -_080B1C34: - ldr r0, =0x000001c1 - b _080B1C5E - .pool -_080B1C3C: - movs r0, 0xE1 - lsls r0, 1 - b _080B1C5E -_080B1C42: - ldr r0, =0x000001c3 - b _080B1C5E - .pool -_080B1C4C: - ldr r0, =0x000001c5 - b _080B1C5E - .pool -_080B1C54: - ldr r0, =0x0000018d - b _080B1C5E - .pool -_080B1C5C: - ldr r0, =0x000001a7 -_080B1C5E: - bl PlayNewMapMusic -_080B1C62: - pop {r0} - bx r0 - .pool - thumb_func_end SetUpTrainerEncounterMusic - - thumb_func_start ReturnEmptyStringIfNull -@ u8 *ReturnEmptyStringIfNull(u8 *str) -ReturnEmptyStringIfNull: @ 80B1C6C - push {lr} - cmp r0, 0 - bne _080B1C74 - ldr r0, =gText_EmptyString2 -_080B1C74: - pop {r1} - bx r1 - .pool - thumb_func_end ReturnEmptyStringIfNull - - thumb_func_start sub_80B1C7C -sub_80B1C7C: @ 80B1C7C - push {lr} - ldr r0, =gUnknown_02038BFC - ldrb r0, [r0] - cmp r0, 0 - beq _080B1C94 - ldr r0, =gUnknown_02038BD8 - b _080B1C96 - .pool -_080B1C94: - ldr r0, =gUnknown_02038BD4 -_080B1C96: - ldr r0, [r0] - bl ReturnEmptyStringIfNull - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B1C7C - - thumb_func_start GetTrainer1LoseText -GetTrainer1LoseText: @ 80B1CA4 - push {r4,lr} - ldr r0, =gTrainerBattleOpponent_A - ldrh r1, [r0] - movs r0, 0x80 - lsls r0, 3 - cmp r1, r0 - bne _080B1CBC - bl sub_80EA250 - b _080B1CC0 - .pool -_080B1CBC: - ldr r0, =gUnknown_02038BDC - ldr r0, [r0] -_080B1CC0: - ldr r4, =gStringVar4 - bl ReturnEmptyStringIfNull - adds r1, r0, 0 - adds r0, r4, 0 - bl StringExpandPlaceholders - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end GetTrainer1LoseText - - thumb_func_start GetTrainer2LoseText -GetTrainer2LoseText: @ 80B1CE0 - push {r4,lr} - ldr r4, =gStringVar4 - ldr r0, =gUnknown_02038BE0 - ldr r0, [r0] - bl ReturnEmptyStringIfNull - adds r1, r0, 0 - adds r0, r4, 0 - bl StringExpandPlaceholders - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end GetTrainer2LoseText - - thumb_func_start sub_80B1D04 -sub_80B1D04: @ 80B1D04 - push {lr} - ldr r0, =gUnknown_02038BE4 - ldr r0, [r0] - bl ReturnEmptyStringIfNull - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B1D04 - - thumb_func_start sub_80B1D18 -sub_80B1D18: @ 80B1D18 - push {lr} - ldr r0, =gUnknown_02038BE8 - ldr r0, [r0] - bl ReturnEmptyStringIfNull - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B1D18 - - thumb_func_start sub_80B1D2C -sub_80B1D2C: @ 80B1D2C - push {lr} - lsls r1, 16 - lsrs r1, 16 - movs r3, 0 - adds r2, r0, 0 -_080B1D36: - ldrh r0, [r2] - cmp r0, r1 - bne _080B1D40 - adds r0, r3, 0 - b _080B1D4C -_080B1D40: - adds r2, 0x10 - adds r3, 0x1 - cmp r3, 0x4D - ble _080B1D36 - movs r0, 0x1 - negs r0, r0 -_080B1D4C: - pop {r1} - bx r1 - thumb_func_end sub_80B1D2C - - thumb_func_start sub_80B1D50 -sub_80B1D50: @ 80B1D50 - push {r4,r5,lr} - lsls r1, 16 - lsrs r5, r1, 16 - movs r4, 0 - adds r2, r0, 0 -_080B1D5A: - movs r1, 0 - ldrh r0, [r2] - cmp r0, 0 - beq _080B1D80 - movs r3, 0 -_080B1D64: - adds r0, r2, r3 - ldrh r0, [r0] - cmp r0, r5 - bne _080B1D70 - adds r0, r4, 0 - b _080B1D8C -_080B1D70: - adds r3, 0x2 - adds r1, 0x1 - cmp r1, 0x4 - bgt _080B1D80 - adds r0, r2, r3 - ldrh r0, [r0] - cmp r0, 0 - bne _080B1D64 -_080B1D80: - adds r2, 0x10 - adds r4, 0x1 - cmp r4, 0x4D - ble _080B1D5A - movs r0, 0x1 - negs r0, r0 -_080B1D8C: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80B1D50 - - thumb_func_start sub_80B1D94 -sub_80B1D94: @ 80B1D94 - push {lr} - cmp r0, 0x48 - ble _080B1D9E - movs r0, 0x1 - b _080B1DB8 -_080B1D9E: - cmp r0, 0x40 - bne _080B1DB6 - movs r0, 0x7E - bl FlagGet - movs r1, 0 - lsls r0, 24 - cmp r0, 0 - bne _080B1DB2 - movs r1, 0x1 -_080B1DB2: - adds r0, r1, 0 - b _080B1DB8 -_080B1DB6: - movs r0, 0 -_080B1DB8: - pop {r1} - bx r1 - thumb_func_end sub_80B1D94 - - thumb_func_start sub_80B1DBC -sub_80B1DBC: @ 80B1DBC - push {r4-r6,lr} - adds r6, r1, 0 - movs r5, 0x1 - lsls r1, r6, 4 - adds r1, r0 - adds r4, r1, 0x2 - b _080B1DCE -_080B1DCA: - adds r4, 0x2 - adds r5, 0x1 -_080B1DCE: - cmp r5, 0x4 - bgt _080B1DE2 - ldrh r0, [r4] - cmp r0, 0 - beq _080B1DE2 - bl HasTrainerAlreadyBeenFought - lsls r0, 24 - cmp r0, 0 - bne _080B1DCA -_080B1DE2: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x000009ca - adds r0, r1 - adds r0, r6 - strb r5, [r0] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B1DBC - - thumb_func_start sub_80B1DFC -sub_80B1DFC: @ 80B1DFC - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r6, r0, 0 - lsls r1, 16 - lsrs r1, 16 - mov r9, r1 - lsls r2, 16 - lsrs r2, 16 - mov r8, r2 - movs r7, 0 - movs r5, 0 - adds r4, r6, 0 - adds r4, 0xA -_080B1E1A: - ldrh r0, [r4] - cmp r0, r9 - bne _080B1E74 - ldrh r0, [r4, 0x2] - cmp r0, r8 - bne _080B1E74 - adds r0, r5, 0 - bl sub_80B1D94 - cmp r0, 0 - bne _080B1E74 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x000009ca - adds r0, r1 - adds r0, r5 - ldrb r0, [r0] - cmp r0, 0 - bne _080B1E72 - movs r1, 0xAE - lsls r1, 1 - adds r0, r5, r1 - lsls r0, 16 - lsrs r0, 16 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _080B1E74 - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x64 - bl __umodsi3 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1E - bhi _080B1E74 - adds r0, r6, 0 - adds r1, r5, 0 - bl sub_80B1DBC -_080B1E72: - movs r7, 0x1 -_080B1E74: - adds r4, 0x10 - adds r5, 0x1 - cmp r5, 0x40 - ble _080B1E1A - adds r0, r7, 0 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B1DFC - - thumb_func_start sub_80B1E94 -sub_80B1E94: @ 80B1E94 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r5, =gUnknown_085500A4 - lsls r0, r4, 4 - adds r0, r5 - ldrh r0, [r0] - bl HasTrainerAlreadyBeenFought - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080B1EB4 - adds r0, r5, 0 - adds r1, r4, 0 - bl sub_80B1DBC -_080B1EB4: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B1E94 - - thumb_func_start sub_80B1EC0 -sub_80B1EC0: @ 80B1EC0 - push {r4-r6,lr} - lsls r1, 16 - lsrs r4, r1, 16 - lsls r2, 16 - lsrs r2, 16 - movs r1, 0 - adds r3, r0, 0 - adds r3, 0xA - ldr r5, =gSaveBlock1Ptr -_080B1ED2: - ldrh r0, [r3] - cmp r0, r4 - bne _080B1EF8 - ldrh r0, [r3, 0x2] - cmp r0, r2 - bne _080B1EF8 - ldr r0, [r5] - ldr r6, =0x000009ca - adds r0, r6 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _080B1EF8 - movs r0, 0x1 - b _080B1F02 - .pool -_080B1EF8: - adds r3, 0x10 - adds r1, 0x1 - cmp r1, 0x4D - ble _080B1ED2 - movs r0, 0 -_080B1F02: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80B1EC0 - - thumb_func_start sub_80B1F08 -sub_80B1F08: @ 80B1F08 - push {r4,lr} - lsls r1, 16 - lsrs r4, r1, 16 - lsls r2, 16 - lsrs r2, 16 - movs r1, 0 - adds r3, r0, 0 - adds r3, 0xA -_080B1F18: - ldrh r0, [r3] - cmp r0, r4 - bne _080B1F28 - ldrh r0, [r3, 0x2] - cmp r0, r2 - bne _080B1F28 - movs r0, 0x1 - b _080B1F32 -_080B1F28: - adds r3, 0x10 - adds r1, 0x1 - cmp r1, 0x4D - ble _080B1F18 - movs r0, 0 -_080B1F32: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80B1F08 - - thumb_func_start sub_80B1F38 -sub_80B1F38: @ 80B1F38 - push {lr} - lsls r1, 16 - lsrs r1, 16 - bl sub_80B1D2C - adds r1, r0, 0 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _080B1F6C - cmp r1, 0x63 - bgt _080B1F6C - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x000009ca - adds r0, r2 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _080B1F6C - movs r0, 0x1 - b _080B1F6E - .pool -_080B1F6C: - movs r0, 0 -_080B1F6E: - pop {r1} - bx r1 - thumb_func_end sub_80B1F38 - - thumb_func_start sub_80B1F74 -sub_80B1F74: @ 80B1F74 - push {lr} - lsls r1, 16 - lsrs r1, 16 - bl sub_80B1D50 - adds r1, r0, 0 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _080B1FA8 - cmp r1, 0x63 - bgt _080B1FA8 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x000009ca - adds r0, r2 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _080B1FA8 - movs r0, 0x1 - b _080B1FAA - .pool -_080B1FA8: - movs r0, 0 -_080B1FAA: - pop {r1} - bx r1 - thumb_func_end sub_80B1F74 - - thumb_func_start sub_80B1FB0 -sub_80B1FB0: @ 80B1FB0 - push {r4-r7,lr} - adds r4, r0, 0 - lsls r1, 16 - lsrs r1, 16 - bl sub_80B1D2C - adds r1, r0, 0 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - bne _080B1FD8 - movs r0, 0 - b _080B1FFE -_080B1FCA: - subs r0, r6, 0x1 - lsls r0, 1 - adds r0, r7, r0 - ldrh r0, [r0] - b _080B1FFE -_080B1FD4: - ldrh r0, [r5] - b _080B1FFE -_080B1FD8: - lsls r0, r1, 4 - adds r7, r4, r0 - movs r6, 0x1 - adds r5, r7, 0x2 - adds r4, r5, 0 -_080B1FE2: - ldrh r0, [r4] - cmp r0, 0 - beq _080B1FCA - bl HasTrainerAlreadyBeenFought - lsls r0, 24 - cmp r0, 0 - beq _080B1FD4 - adds r4, 0x2 - adds r5, 0x2 - adds r6, 0x1 - cmp r6, 0x4 - ble _080B1FE2 - ldrh r0, [r7, 0x8] -_080B1FFE: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80B1FB0 - - thumb_func_start sub_80B2004 -sub_80B2004: @ 80B2004 - push {r4-r6,lr} - adds r4, r0, 0 - lsls r1, 16 - lsrs r1, 16 - bl sub_80B1D2C - adds r1, r0, 0 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - bne _080B2032 - movs r0, 0 - b _080B2054 -_080B201E: - subs r0, r5, 0x1 - lsls r0, 1 - adds r0, r6, r0 - ldrh r0, [r0] - b _080B2054 -_080B2028: - subs r0, r5, 0x1 - lsls r0, 1 - adds r0, r6, r0 - ldrh r0, [r0] - b _080B2054 -_080B2032: - lsls r0, r1, 4 - adds r6, r4, r0 - movs r5, 0x1 - adds r4, r6, 0x2 -_080B203A: - ldrh r0, [r4] - cmp r0, 0 - beq _080B201E - bl HasTrainerAlreadyBeenFought - lsls r0, 24 - cmp r0, 0 - beq _080B2028 - adds r4, 0x2 - adds r5, 0x1 - cmp r5, 0x4 - ble _080B203A - ldrh r0, [r6, 0x8] -_080B2054: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80B2004 - - thumb_func_start sub_80B205C -sub_80B205C: @ 80B205C - push {lr} - lsls r1, 16 - lsrs r1, 16 - bl sub_80B1D50 - adds r1, r0, 0 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _080B207E - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x000009ca - adds r0, r2 - adds r0, r1 - movs r1, 0 - strb r1, [r0] -_080B207E: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B205C - - thumb_func_start sub_80B208C -sub_80B208C: @ 80B208C - push {r4,lr} - adds r3, r0, 0 - movs r1, 0 - movs r4, 0xAE - lsls r4, 1 - ldr r2, =gUnknown_085500A4 -_080B2098: - ldrh r0, [r2] - cmp r0, r3 - bne _080B20A8 - adds r0, r1, r4 - b _080B20B2 - .pool -_080B20A8: - adds r2, 0x10 - adds r1, 0x1 - cmp r1, 0x4D - ble _080B2098 - ldr r0, =0x0000ffff -_080B20B2: - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B208C - - thumb_func_start sub_80B20BC -sub_80B20BC: @ 80B20BC - push {lr} - ldr r0, =0x0000012f - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _080B20E2 - ldr r0, =gTrainerBattleOpponent_A - ldrh r0, [r0] - bl sub_80B208C - adds r1, r0, 0 - ldr r0, =0x0000ffff - cmp r1, r0 - beq _080B20E2 - lsls r0, r1, 16 - lsrs r0, 16 - bl FlagSet -_080B20E2: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B20BC - - thumb_func_start sub_80B20F4 -sub_80B20F4: @ 80B20F4 - push {r4,lr} - adds r4, r0, 0 - lsls r1, 16 - lsrs r1, 16 - bl sub_80B1D2C - adds r1, r0, 0 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _080B211E - lsls r0, r1, 4 - adds r0, r4 - ldrh r0, [r0, 0x2] - bl HasTrainerAlreadyBeenFought - lsls r0, 24 - cmp r0, 0 - beq _080B211E - movs r0, 0x1 - b _080B2120 -_080B211E: - movs r0, 0 -_080B2120: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80B20F4 - - thumb_func_start sub_80B2128 -sub_80B2128: @ 80B2128 - push {r4-r6,lr} - movs r6, 0 - movs r5, 0 - ldr r4, =gUnknown_08550584 -_080B2130: - ldrh r0, [r4] - bl FlagGet - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080B214C - adds r6, 0x1 - cmp r6, 0x4 - ble _080B214C - movs r0, 0x1 - b _080B2156 - .pool -_080B214C: - adds r4, 0x2 - adds r5, 0x1 - cmp r5, 0x7 - bls _080B2130 - movs r0, 0 -_080B2156: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_80B2128 - - thumb_func_start sub_80B215C -sub_80B215C: @ 80B215C - push {lr} - bl sub_80B2128 - cmp r0, 0 - beq _080B2184 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x000009c8 - adds r1, r0, r2 - ldrh r0, [r1] - cmp r0, 0xFE - bls _080B2180 - movs r0, 0xFF - b _080B2182 - .pool -_080B2180: - adds r0, 0x1 -_080B2182: - strh r0, [r1] -_080B2184: - pop {r0} - bx r0 - thumb_func_end sub_80B215C - - thumb_func_start sub_80B2188 -sub_80B2188: @ 80B2188 - push {lr} - bl sub_80B2128 - cmp r0, 0 - beq _080B21AC - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x000009c8 - adds r0, r1 - ldrh r0, [r0] - cmp r0, 0xFE - bls _080B21AC - movs r0, 0x1 - b _080B21AE - .pool -_080B21AC: - movs r0, 0 -_080B21AE: - pop {r1} - bx r1 - thumb_func_end sub_80B2188 - - thumb_func_start sub_80B21B4 -sub_80B21B4: @ 80B21B4 - push {r4,r5,lr} - lsls r0, 16 - lsrs r5, r0, 16 - lsls r1, 16 - lsrs r4, r1, 16 - bl sub_80B2188 - cmp r0, 0 - beq _080B21E0 - ldr r0, =gUnknown_085500A4 - adds r1, r5, 0 - adds r2, r4, 0 - bl sub_80B1DFC - cmp r0, 0x1 - bne _080B21E0 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x000009c8 - adds r0, r1 - movs r1, 0 - strh r1, [r0] -_080B21E0: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B21B4 - - thumb_func_start sub_80B21F4 -sub_80B21F4: @ 80B21F4 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - lsls r3, 16 - lsrs r3, 16 - lsls r2, 16 - lsrs r2, 16 - ldr r0, =gUnknown_085500A4 - adds r1, r3, 0 - bl sub_80B1EC0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B21F4 - - thumb_func_start sub_80B2214 -sub_80B2214: @ 80B2214 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - lsls r3, 16 - lsrs r3, 16 - lsls r2, 16 - lsrs r2, 16 - ldr r0, =gUnknown_085500A4 - adds r1, r3, 0 - bl sub_80B1F08 - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B2214 - - thumb_func_start sub_80B2234 -sub_80B2234: @ 80B2234 - push {lr} - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - ldr r0, =gUnknown_085500A4 - bl sub_80B1FB0 - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B2234 - - thumb_func_start sub_80B2250 -sub_80B2250: @ 80B2250 - push {lr} - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - ldr r0, =gUnknown_085500A4 - bl sub_80B2004 - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B2250 - - thumb_func_start sub_80B226C -sub_80B226C: @ 80B226C - push {r4,r5,lr} - ldr r5, =gUnknown_085500A4 - ldr r4, =gTrainerBattleOpponent_A - ldrh r1, [r4] - adds r0, r5, 0 - bl sub_80B1F38 - lsls r0, 24 - cmp r0, 0 - bne _080B2298 - ldrh r1, [r4] - adds r0, r5, 0 - bl sub_80B20F4 - lsls r0, 24 - lsrs r0, 24 - b _080B229A - .pool -_080B2298: - movs r0, 0x1 -_080B229A: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80B226C - - thumb_func_start sub_80B22A0 -sub_80B22A0: @ 80B22A0 - push {lr} - ldr r0, =gUnknown_085500A4 - ldr r1, =gTrainerBattleOpponent_A - ldrh r1, [r1] - bl sub_80B1F74 - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B22A0 - - thumb_func_start sub_80B22BC -sub_80B22BC: @ 80B22BC - push {lr} - ldr r0, =gUnknown_085500A4 - ldr r1, =gTrainerBattleOpponent_A - ldrh r1, [r1] - bl sub_80B205C - bl rom_npc_set_flag_for_script_id - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B22BC - - thumb_func_start CheckIfMultipleTrainersWantBattle -CheckIfMultipleTrainersWantBattle: @ 80B22D8 - push {lr} - ldr r1, =gUnknown_02038BF9 - ldrb r0, [r1] - cmp r0, 0x1 - bls _080B2300 - movs r0, 0 - strb r0, [r1] - ldr r1, =gUnknown_02038BF8 - movs r0, 0x1 - strb r0, [r1] - ldr r1, =gSpecialVar_Result - movs r0, 0x1 - b _080B230A - .pool -_080B2300: - ldr r1, =gUnknown_02038BF8 - movs r0, 0 - strb r0, [r1] - ldr r1, =gSpecialVar_Result - movs r0, 0 -_080B230A: - strh r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end CheckIfMultipleTrainersWantBattle - - thumb_func_start sub_80B2318 -sub_80B2318: @ 80B2318 - push {r4-r7,lr} - lsls r0, 16 - ldr r7, =gUnknown_085500A4 - lsrs r4, r0, 12 - adds r6, r4, r7 - ldrh r0, [r6] - bl HasTrainerAlreadyBeenFought - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _080B2338 - movs r0, 0 - b _080B2364 - .pool -_080B2338: - movs r5, 0x1 - adds r0, r4, 0x2 - adds r0, r7 - ldrh r0, [r0] - cmp r0, 0 - beq _080B2360 - adds r4, r6, 0x2 -_080B2346: - ldrh r0, [r4] - bl HasTrainerAlreadyBeenFought - lsls r0, 24 - cmp r0, 0 - beq _080B2360 - adds r4, 0x2 - adds r5, 0x1 - cmp r5, 0x4 - bgt _080B2360 - ldrh r0, [r4] - cmp r0, 0 - bne _080B2346 -_080B2360: - lsls r0, r5, 16 - lsrs r0, 16 -_080B2364: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80B2318 - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/battle_tower.s b/asm/battle_tower.s index 42dcb431a..96769dcbf 100755 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -3534,7 +3534,7 @@ _08163E10: bl sub_80B100C lsls r0, 24 lsrs r0, 24 - bl sub_8145EF4 + bl BattleTransition_StartOnField b _08163E68 .pool _08163E2C: @@ -3544,7 +3544,7 @@ _08163E2C: ldr r5, =0x00000c03 adds r0, r5, 0 bl sub_8165404 - ldr r4, =gUnknown_02038BFC + ldr r4, =gApproachingTrainerId movs r0, 0 strb r0, [r4] ldr r0, =MossdeepCity_SpaceCenter_2F_EventScript_224157 + 1 @@ -3561,7 +3561,7 @@ _08163E2C: movs r0, 0 bl PlayMapChosenOrBattleBGM movs r0, 0x12 - bl sub_8145EF4 + bl BattleTransition_StartOnField _08163E68: add sp, 0x4 pop {r4-r6} diff --git a/asm/battle_transition.s b/asm/battle_transition.s index 6ffa17320..b7f2746ec 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -57,8 +57,8 @@ TestBattleTransition: @ 8145EDC .pool thumb_func_end TestBattleTransition - thumb_func_start sub_8145EF4 -sub_8145EF4: @ 8145EF4 + thumb_func_start BattleTransition_StartOnField +BattleTransition_StartOnField: @ 8145EF4 push {lr} lsls r0, 24 lsrs r0, 24 @@ -69,17 +69,17 @@ sub_8145EF4: @ 8145EF4 pop {r0} bx r0 .pool - thumb_func_end sub_8145EF4 + thumb_func_end BattleTransition_StartOnField - thumb_func_start sub_8145F10 -sub_8145F10: @ 8145F10 + thumb_func_start BattleTransition_Start +BattleTransition_Start: @ 8145F10 push {lr} lsls r0, 24 lsrs r0, 24 bl LaunchBattleTransitionTask pop {r0} bx r0 - thumb_func_end sub_8145F10 + thumb_func_end BattleTransition_Start thumb_func_start IsBattleTransitionDone IsBattleTransitionDone: @ 8145F20 diff --git a/asm/berry_tag_screen.s b/asm/berry_tag_screen.s index 422f5f3d6..75e50f88d 100644 --- a/asm/berry_tag_screen.s +++ b/asm/berry_tag_screen.s @@ -115,7 +115,7 @@ _08177CD8: .4byte _08177DC2 _08177D18: bl SetVBlankHBlankCallbacksToNull - bl sub_8121DA0 + bl ResetVramOamAndBgCntRegs bl clear_scheduled_bg_copies_to_vram b _08177DDC _08177D26: @@ -246,7 +246,7 @@ sub_8177E14: @ 8177E14 adds r1, r0 movs r0, 0x3 bl SetBgTilemapBuffer - bl sub_8121E10 + bl ResetAllBgsCoordinates movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x3 diff --git a/asm/bike.s b/asm/bike.s index b5d40a312..89791b987 100644 --- a/asm/bike.s +++ b/asm/bike.s @@ -2004,7 +2004,7 @@ GetOnOffBike: @ 811A080 beq _0811A0B0 movs r0, 0x1 bl SetPlayerAvatarTransitionFlags - bl sav1_reset_battle_music_maybe + bl Overworld_ClearSavedMusic bl sub_8085784 b _0811A0C4 .pool diff --git a/asm/clock.s b/asm/clock.s deleted file mode 100644 index 5d771a8b6..000000000 --- a/asm/clock.s +++ /dev/null @@ -1,175 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_809E778 -sub_809E778: @ 809E778 - push {lr} - ldr r0, =0x00000895 - bl FlagSet - bl RtcCalcLocalTime - ldr r0, =gSaveBlock2Ptr - ldr r2, [r0] - adds r2, 0xA0 - ldr r3, =gLocalTime - ldr r0, [r3] - ldr r1, [r3, 0x4] - str r0, [r2] - str r1, [r2, 0x4] - ldr r0, =0x00004040 - ldrh r1, [r3] - bl VarSet - pop {r0} - bx r0 - .pool - thumb_func_end sub_809E778 - - thumb_func_start DoTimeBasedEvents -DoTimeBasedEvents: @ 809E7B0 - push {r4,lr} - ldr r0, =0x00000895 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _0809E7DA - bl sub_813B9C0 - lsls r0, 24 - cmp r0, 0 - bne _0809E7DA - bl RtcCalcLocalTime - ldr r4, =gLocalTime - adds r0, r4, 0 - bl sub_809E7E8 - adds r0, r4, 0 - bl sub_809E858 -_0809E7DA: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end DoTimeBasedEvents - - thumb_func_start sub_809E7E8 -sub_809E7E8: @ 809E7E8 - push {r4-r6,lr} - adds r5, r0, 0 - ldr r0, =0x00004040 - bl GetVarPointer - adds r6, r0, 0 - ldrh r0, [r6] - movs r2, 0 - ldrsh r1, [r5, r2] - cmp r0, r1 - beq _0809E84E - cmp r0, r1 - bgt _0809E84E - ldrh r4, [r5] - subs r4, r0 - lsls r4, 16 - lsrs r4, 16 - bl ClearUpperFlags - adds r0, r4, 0 - bl sub_8122580 - adds r0, r4, 0 - bl sub_80ED888 - adds r0, r4, 0 - bl sub_80AEFBC - adds r0, r4, 0 - bl UpdatePartyPokerusTime - adds r0, r4, 0 - bl sub_8137904 - adds r0, r4, 0 - bl sub_8137A20 - adds r0, r4, 0 - bl sub_8139EF4 - adds r0, r4, 0 - bl sub_813A7F4 - adds r0, r4, 0 - bl sub_813945C - adds r0, r4, 0 - bl SetRandomLotteryNumber - ldrh r0, [r5] - strh r0, [r6] -_0809E84E: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_809E7E8 - - thumb_func_start sub_809E858 -sub_809E858: @ 809E858 - push {r4-r6,lr} - sub sp, 0x8 - adds r5, r0, 0 - mov r4, sp - ldr r6, =gSaveBlock2Ptr - ldr r1, [r6] - adds r1, 0xA0 - mov r0, sp - adds r2, r5, 0 - bl CalcTimeDifference - mov r0, sp - movs r2, 0 - ldrsh r1, [r0, r2] - lsls r0, r1, 1 - adds r0, r1 - lsls r1, r0, 4 - subs r1, r0 - lsls r1, 5 - movs r2, 0x2 - ldrsb r2, [r4, r2] - lsls r0, r2, 4 - subs r0, r2 - lsls r0, 2 - adds r1, r0 - movs r0, 0x3 - ldrsb r0, [r4, r0] - adds r0, r1, r0 - cmp r0, 0 - beq _0809E8A8 - cmp r0, 0 - blt _0809E8A8 - bl BerryTreeTimeUpdate - ldr r2, [r6] - adds r2, 0xA0 - ldr r0, [r5] - ldr r1, [r5, 0x4] - str r0, [r2] - str r1, [r2, 0x4] -_0809E8A8: - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_809E858 - - thumb_func_start sub_809E8B4 -sub_809E8B4: @ 809E8B4 - push {lr} - bl sub_809E778 - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music - bl SetMainCallback2 - pop {r0} - bx r0 - .pool - thumb_func_end sub_809E8B4 - - thumb_func_start Special_StartWallClock -Special_StartWallClock: @ 809E8C8 - push {lr} - ldr r0, =Cb2_StartWallClock - bl SetMainCallback2 - ldr r1, =gMain - ldr r0, =sub_809E8B4 - str r0, [r1, 0x8] - pop {r0} - bx r0 - .pool - thumb_func_end Special_StartWallClock - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/contest_painting.s b/asm/contest_painting.s index 98f001442..4e58b4cc3 100644 --- a/asm/contest_painting.s +++ b/asm/contest_painting.s @@ -386,7 +386,7 @@ sub_813010C: @ 813010C ldr r1, =gText_Space adds r0, r4, 0 bl StringAppend - ldr r1, =gUnknown_085B07D4 + ldr r1, =gContestRankTextPointers ldr r0, [r6] ldrb r0, [r0, 0x1E] lsls r0, 2 @@ -415,7 +415,7 @@ _08130190: adds r1, 0xB bl StringCopy ldr r0, =gStringVar4 - ldr r2, =gUnknown_085B07F4 + ldr r2, =gContestPaintingDescriptionPointers lsls r1, r5, 2 adds r1, r2 ldr r1, [r1] diff --git a/asm/dewford_trend.s b/asm/dewford_trend.s index 89f89c4e0..7d9d67902 100644 --- a/asm/dewford_trend.s +++ b/asm/dewford_trend.s @@ -79,8 +79,8 @@ _08122522: .pool thumb_func_end InitDewfordTrend - thumb_func_start sub_8122580 -sub_8122580: @ 8122580 + thumb_func_start UpdateDewfordTrendPerDay +UpdateDewfordTrendPerDay: @ 8122580 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -253,7 +253,7 @@ _081226BE: pop {r0} bx r0 .pool - thumb_func_end sub_8122580 + thumb_func_end UpdateDewfordTrendPerDay thumb_func_start sub_81226D8 sub_81226D8: @ 81226D8 diff --git a/asm/easy_chat.s b/asm/easy_chat.s index 602e7b3e7..3a359c9fa 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -1635,7 +1635,7 @@ _0811AF86: thumb_func_start sub_811AF8C sub_811AF8C: @ 811AF8C push {lr} - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -1684,7 +1684,7 @@ _0811AFE6: thumb_func_start sub_811AFEC sub_811AFEC: @ 811AFEC push {r4,lr} - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -1727,7 +1727,7 @@ _0811B03A: thumb_func_start sub_811B040 sub_811B040: @ 811B040 push {lr} - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -1832,7 +1832,7 @@ sub_811B0E8: @ 811B0E8 thumb_func_start sub_811B0F8 sub_811B0F8: @ 811B0F8 push {r4,lr} - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 29164ed7b..9252b79d2 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -721,7 +721,7 @@ TryGetInvisibleMapObjectScript: @ 809C458 ldr r2, [r0, 0x8] cmp r2, 0 bne _0809C490 - ldr r0, =EventScript_2C8436 + ldr r0, =EventScript_TestSignpostMsg b _0809C532 .pool _0809C490: @@ -1365,7 +1365,7 @@ per_step_scripts: @ 809C9F4 bne _0809CA04 b _0809CB24 _0809CA04: - bl sub_80B215C + bl IncrementRematchStepCounter bl AdjustFriendship_step bl sub_81D4998 ldr r0, =gPlayerAvatar @@ -1531,8 +1531,8 @@ _0809CB72: .pool thumb_func_end AdjustFriendship_step - thumb_func_start overworld_poison_timer_set -overworld_poison_timer_set: @ 809CB80 + thumb_func_start ResetPoisonStepCounter +ResetPoisonStepCounter: @ 809CB80 push {lr} ldr r0, =0x0000402b movs r1, 0 @@ -1540,7 +1540,7 @@ overworld_poison_timer_set: @ 809CB80 pop {r0} bx r0 .pool - thumb_func_end overworld_poison_timer_set + thumb_func_end ResetPoisonStepCounter thumb_func_start overworld_poison_step overworld_poison_step: @ 809CB94 diff --git a/asm/field_effect.s b/asm/field_effect.s index bfa563af1..170aa6a63 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -1961,7 +1961,7 @@ mapldr_080842E8: @ 80B69FC movs r1, 0 bl CreateTask bl ScriptContext2_Enable - bl player_bitmagic + bl FreezeMapObjects ldr r1, =gFieldCallback movs r0, 0 str r0, [r1] @@ -2057,7 +2057,7 @@ mapldr_08084390: @ 80B6AA4 bl FieldObjectTurn _080B6AE6: bl ScriptContext2_Enable - bl player_bitmagic + bl FreezeMapObjects ldr r1, =gFieldCallback movs r0, 0 str r0, [r1] @@ -2116,7 +2116,7 @@ sub_80B6B68: @ 80B6B68 bl sub_8085784 bl pal_fill_for_maplights bl ScriptContext2_Enable - bl player_bitmagic + bl FreezeMapObjects ldr r0, =sub_80B6B94 movs r1, 0 bl CreateTask @@ -2534,7 +2534,7 @@ _080B6E9A: sub_80B6EC0: @ 80B6EC0 push {r4,lr} adds r4, r0, 0 - bl player_bitmagic + bl FreezeMapObjects bl CameraObjectReset2 ldrb r0, [r4, 0xA] bl sub_80E1558 @@ -3476,7 +3476,7 @@ sub_80B764C: @ 80B764C push {r4,r5,lr} adds r4, r0, 0 adds r5, r1, 0 - bl player_bitmagic + bl FreezeMapObjects bl CameraObjectReset2 movs r0, 0 bl SetCameraPanningCallback @@ -3807,7 +3807,7 @@ sub_80B78EC: @ 80B78EC adds r5, r0, 0 adds r4, r1, 0 bl CameraObjectReset2 - bl player_bitmagic + bl FreezeMapObjects ldr r1, =gPlayerAvatar movs r0, 0x1 strb r0, [r1, 0x6] @@ -4055,7 +4055,7 @@ sub_80B7AE8: @ 80B7AE8 push {r4,r5,lr} adds r5, r0, 0 adds r4, r1, 0 - bl player_bitmagic + bl FreezeMapObjects bl CameraObjectReset2 ldr r1, =gPlayerAvatar movs r0, 0x1 @@ -4287,7 +4287,7 @@ _080B7CC4: sub_80B7CC8: @ 80B7CC8 push {lr} bl ScriptContext2_Enable - bl player_bitmagic + bl FreezeMapObjects ldr r0, =sub_80B7CE4 movs r1, 0x50 bl CreateTask @@ -4461,7 +4461,7 @@ mapldr_080859D4: @ 80B7E48 bl sub_8085784 bl pal_fill_for_maplights bl ScriptContext2_Enable - bl player_bitmagic + bl FreezeMapObjects ldr r1, =gFieldCallback movs r0, 0 str r0, [r1] @@ -4672,7 +4672,7 @@ sub_80B800C: @ 80B800C push {r4,lr} adds r4, r0, 0 bl ScriptContext2_Enable - bl player_bitmagic + bl FreezeMapObjects bl CameraObjectReset2 bl player_get_direction_lower_nybble lsls r0, 24 @@ -4906,7 +4906,7 @@ mapldr_08085D88: @ 80B8200 bl sub_8085784 bl pal_fill_for_maplights bl ScriptContext2_Enable - bl player_bitmagic + bl FreezeMapObjects ldr r1, =gFieldCallback movs r0, 0 str r0, [r1] @@ -6295,7 +6295,7 @@ sub_80B8D44: @ 80B8D44 ldr r0, =gFieldEffectArguments ldr r0, [r0] strh r0, [r1, 0x26] - bl sav1_reset_battle_music_maybe + bl Overworld_ClearSavedMusic ldr r0, =0x0000016d bl Overworld_ChangeMusicTo movs r0, 0 @@ -6334,7 +6334,7 @@ sub_80B8DB4: @ 80B8DB4 push {r6} adds r4, r0, 0 bl ScriptContext2_Enable - bl player_bitmagic + bl FreezeMapObjects ldr r5, =gPlayerAvatar movs r0, 0x1 strb r0, [r5, 0x6] diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index ae405f127..62681e7fb 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -3896,7 +3896,7 @@ sub_808C750: @ 808C750 lsls r4, 24 lsrs r4, 24 bl ScriptContext2_Enable - bl sav1_reset_battle_music_maybe + bl Overworld_ClearSavedMusic bl Overworld_ChangeMusicToDefault ldr r2, =gPlayerAvatar ldrb r1, [r2] diff --git a/asm/field_screen.s b/asm/field_screen.s index 497346f8a..408f131c7 100644 --- a/asm/field_screen.s +++ b/asm/field_screen.s @@ -7527,15 +7527,15 @@ SetSav1Weather: @ 80AED7C .pool thumb_func_end SetSav1Weather - thumb_func_start sav1_get_weather_probably -sav1_get_weather_probably: @ 80AEDAC + thumb_func_start GetSav1Weather +GetSav1Weather: @ 80AEDAC ldr r0, =gSaveBlock1Ptr ldr r0, [r0] adds r0, 0x2E ldrb r0, [r0] bx lr .pool - thumb_func_end sav1_get_weather_probably + thumb_func_end GetSav1Weather thumb_func_start sub_80AEDBC sub_80AEDBC: @ 80AEDBC @@ -7565,7 +7565,7 @@ sub_80AEDBC: @ 80AEDBC sub_80AEDF0: @ 80AEDF0 push {lr} bl SetSav1Weather - bl sav1_get_weather_probably + bl GetSav1Weather lsls r0, 24 lsrs r0, 24 bl weather_set @@ -7577,7 +7577,7 @@ sub_80AEDF0: @ 80AEDF0 sub_80AEE08: @ 80AEE08 push {lr} bl SetSav1Weather - bl sav1_get_weather_probably + bl GetSav1Weather lsls r0, 24 lsrs r0, 24 bl sub_80AB104 @@ -7588,7 +7588,7 @@ sub_80AEE08: @ 80AEE08 thumb_func_start DoCurrentWeather DoCurrentWeather: @ 80AEE20 push {r4,r5,lr} - bl sav1_get_weather_probably + bl GetSav1Weather lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF @@ -7632,7 +7632,7 @@ _080AEE6E: thumb_func_start sub_80AEE84 sub_80AEE84: @ 80AEE84 push {r4,r5,lr} - bl sav1_get_weather_probably + bl GetSav1Weather lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF @@ -7777,8 +7777,8 @@ _080AEFB6: bx r1 thumb_func_end sub_80AEEE8 - thumb_func_start sub_80AEFBC -sub_80AEFBC: @ 80AEFBC + thumb_func_start UpdateWeatherPerDay +UpdateWeatherPerDay: @ 80AEFBC lsls r0, 16 ldr r1, =gSaveBlock1Ptr ldr r2, [r1] @@ -7794,7 +7794,7 @@ sub_80AEFBC: @ 80AEFBC strb r1, [r2] bx lr .pool - thumb_func_end sub_80AEFBC + thumb_func_end UpdateWeatherPerDay thumb_func_start sub_80AEFDC sub_80AEFDC: @ 80AEFDC @@ -8382,7 +8382,7 @@ _080AF46C: _080AF480: movs r0, 0 bl sub_80AF0F4 - bl player_bitmagic + bl FreezeMapObjects adds r0, r6, 0 adds r1, r7, 0 bl PlayerGetDestCoords @@ -8508,7 +8508,7 @@ _080AF580: _080AF58A: movs r0, 0 bl sub_80AF0F4 - bl player_bitmagic + bl FreezeMapObjects adds r0, r6, 0 adds r1, r7, 0 bl PlayerGetDestCoords @@ -8583,7 +8583,7 @@ task_map_chg_seq_0807E2CC: @ 80AF610 b _080AF65A .pool _080AF634: - bl player_bitmagic + bl FreezeMapObjects bl ScriptContext2_Enable ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -9062,7 +9062,7 @@ _080AFA34: beq _080AFA6C b _080AFA7C _080AFA3A: - bl player_bitmagic + bl FreezeMapObjects bl ScriptContext2_Enable b _080AFA64 _080AFA44: @@ -9133,7 +9133,7 @@ _080AFAC0: .4byte _080AFBB8 .4byte _080AFBD4 _080AFAD4: - bl player_bitmagic + bl FreezeMapObjects adds r0, r4, 0 adds r1, r6, 0 bl PlayerGetDestCoords @@ -9290,7 +9290,7 @@ _080AFC1C: beq _080AFC46 b _080AFC56 _080AFC22: - bl player_bitmagic + bl FreezeMapObjects bl ScriptContext2_Enable b _080AFC3E _080AFC2C: @@ -9877,7 +9877,7 @@ sub_80B009C: @ 80B009C lsls r0, 24 lsrs r0, 24 adds r4, r0, 0 - bl sav1_get_flash_used_on_map + bl Overworld_GetFlashLevel lsls r0, 24 lsrs r0, 24 movs r5, 0 @@ -9982,7 +9982,7 @@ task0A_mpl_807E31C: @ 80B0160 b _080B01B6 .pool _080B0184: - bl player_bitmagic + bl FreezeMapObjects bl ScriptContext2_Enable bl sub_808D194 ldrh r0, [r4, 0x8] @@ -10033,7 +10033,7 @@ _080B01E4: beq _080B022A b _080B023A _080B01EE: - bl player_bitmagic + bl FreezeMapObjects bl ScriptContext2_Enable movs r0, 0x2D bl PlaySE diff --git a/asm/fldeff_80F9BCC.s b/asm/fldeff_80F9BCC.s index 369bef809..a1e4f4ff6 100644 --- a/asm/fldeff_80F9BCC.s +++ b/asm/fldeff_80F9BCC.s @@ -2275,8 +2275,8 @@ overworld_poison_effect: @ 80FAEA8 .pool thumb_func_end overworld_poison_effect - thumb_func_start c3_80A0DD8_is_running -c3_80A0DD8_is_running: @ 80FAEC0 + thumb_func_start FieldPoisonEffectIsRunning +FieldPoisonEffectIsRunning: @ 80FAEC0 push {lr} ldr r0, =task50_overworld_poison_effect bl FuncIsActiveTask @@ -2285,7 +2285,7 @@ c3_80A0DD8_is_running: @ 80FAEC0 pop {r1} bx r1 .pool - thumb_func_end c3_80A0DD8_is_running + thumb_func_end FieldPoisonEffectIsRunning thumb_func_start sub_80FAED4 sub_80FAED4: @ 80FAED4 diff --git a/asm/international_string_util.s b/asm/international_string_util.s index 08e435249..469d88787 100755 --- a/asm/international_string_util.s +++ b/asm/international_string_util.s @@ -113,8 +113,8 @@ _081DB4D4: bx r1 thumb_func_end sub_81DB494 - thumb_func_start sub_81DB4DC -sub_81DB4DC: @ 81DB4DC + thumb_func_start PadNameString +PadNameString: @ 81DB4DC push {r4,r5,lr} adds r4, r0, 0 lsls r1, 24 @@ -156,7 +156,7 @@ _081DB51E: pop {r4,r5} pop {r0} bx r0 - thumb_func_end sub_81DB4DC + thumb_func_end PadNameString thumb_func_start sub_81DB52C sub_81DB52C: @ 81DB52C diff --git a/asm/item_menu.s b/asm/item_menu.s index 61bd5c6e9..49f587939 100755 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -463,7 +463,7 @@ _081AAF54: adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate ldrb r2, [r4, 0x5] lsls r2, 1 adds r1, r4, 0 @@ -568,7 +568,7 @@ _081AB046: thumb_func_start bag_menu_init_bgs bag_menu_init_bgs: @ 81AB050 push {r4,lr} - bl sub_8121DA0 + bl ResetVramOamAndBgCntRegs ldr r4, =gUnknown_0203CE54 ldr r0, [r4] adds r0, 0x4 @@ -586,7 +586,7 @@ bag_menu_init_bgs: @ 81AB050 adds r1, 0x4 movs r0, 0x2 bl SetBgTilemapBuffer - bl sub_8121E10 + bl ResetAllBgsCoordinates movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram movs r1, 0x82 @@ -719,7 +719,7 @@ _081AB1B2: b _081AB1E4 .pool _081AB1CC: - bl sub_8122328 + bl LoadListMenuArrowsGfx ldr r0, [r4] ldr r1, =0x00000834 adds r0, r1 @@ -902,7 +902,7 @@ _081AB30C: cmp r6, r0 bcc _081AB30C _081AB34A: - ldr r2, =gUnknown_03006310 + ldr r2, =gMultiuseListMenuTemplate adds r1, r2, 0 ldr r0, =gUnknown_08613F9C ldm r0!, {r3-r5} @@ -1924,7 +1924,7 @@ bag_menu_inits_lists_menu: @ 81ABBBC bl sub_81ABA88 ldrb r0, [r7, 0x5] bl load_bag_item_list_buffers - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate mov r2, r8 ldrh r1, [r2] ldrh r2, [r4] @@ -2133,7 +2133,7 @@ _081ABDCC: ldrb r0, [r6] adds r1, r7, 0 mov r2, r8 - bl get_coro_args_x18_x1A + bl sub_81AE860 ldrh r2, [r7] mov r3, r8 ldrh r0, [r3] @@ -2157,12 +2157,12 @@ _081ABDCC: .pool _081ABE10: ldrb r0, [r6] - bl ListMenuHandleInput + bl ListMenuHandleInputGetItemId adds r4, r0, 0 ldrb r0, [r6] adds r1, r7, 0 mov r2, r8 - bl get_coro_args_x18_x1A + bl sub_81AE860 movs r0, 0x2 negs r0, r0 cmp r4, r0 @@ -2603,7 +2603,7 @@ _081AC1DC: subs r5, r4, 0x5 ldrb r0, [r5, 0x5] bl load_bag_item_list_buffers - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate ldrb r2, [r5, 0x5] lsls r2, 1 adds r1, r4, 0 @@ -2847,12 +2847,12 @@ sub_81AC3C0: @ 81AC3C0 adds r1, r2, r1 adds r3, 0x8 adds r2, r3 - bl get_coro_args_x18_x1A + bl sub_81AE860 b _081AC472 .pool _081AC418: ldrb r0, [r4] - bl ListMenuHandleInput + bl ListMenuHandleInputGetItemId adds r7, r0, 0 ldrb r0, [r4] ldr r5, =gUnknown_0203CE58 @@ -2864,7 +2864,7 @@ _081AC418: adds r4, r5, 0 adds r4, 0x8 adds r2, r4 - bl get_coro_args_x18_x1A + bl sub_81AE860 movs r0, 0 bl sub_80D4FC8 ldrb r0, [r5, 0x5] @@ -2989,7 +2989,7 @@ _081AC4F8: _081AC538: ldrb r0, [r5, 0x5] bl load_bag_item_list_buffers - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate mov r2, r8 ldrh r1, [r2] ldrh r2, [r7] @@ -3070,7 +3070,7 @@ sub_81AC590: @ 81AC590 _081AC5F2: ldrb r0, [r4, 0x5] bl load_bag_item_list_buffers - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate ldrh r1, [r6] ldrh r2, [r5] bl ListMenuInit @@ -3360,7 +3360,7 @@ _081AC8D4: bl memcpy ldr r0, =gSpecialVar_ItemId ldrh r0, [r0] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -4326,7 +4326,7 @@ Task_ActuallyToss: @ 81AD150 bl sub_81ABA88 ldrb r0, [r4, 0x5] bl load_bag_item_list_buffers - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate mov r2, r8 ldrh r1, [r2] ldrh r2, [r7] @@ -4388,7 +4388,7 @@ _081AD23A: ldr r0, =gUnknown_0203CE58 ldrb r0, [r0, 0x5] bl load_bag_item_list_buffers - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate ldrh r1, [r6] ldrh r2, [r5] bl ListMenuInit @@ -4664,7 +4664,7 @@ item_menu_type_b: @ 81AD4B4 lsrs r4, r0, 24 ldr r5, =gSpecialVar_ItemId ldrh r0, [r5] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -4748,7 +4748,7 @@ _081AD550: cmp r6, 0x1 bne _081AD5C4 bl ScriptContext2_Enable - bl player_bitmagic + bl FreezeMapObjects bl sub_808B864 bl sub_808BCF4 ldr r2, =gSpecialVar_ItemId @@ -5155,7 +5155,7 @@ sub_81AD8C8: @ 81AD8C8 bl sub_81ABA88 ldrb r0, [r7, 0x5] bl load_bag_item_list_buffers - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate mov r2, r9 ldrh r1, [r2] ldrh r2, [r5] diff --git a/asm/item_use.s b/asm/item_use.s index 172080b16..ebf5ac979 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -266,7 +266,7 @@ sub_80FD254: @ 80FD254 ldr r1, =bag_menu_mail_related mov r0, sp movs r2, 0 - bl sub_8121478 + bl ReadMail add sp, 0x24 pop {r0} bx r0 @@ -1497,7 +1497,7 @@ sub_80FDBEC: @ 80FDBEC push {lr} ldr r1, =bag_menu_mail_related movs r0, 0 - bl sub_81357FC + bl OpenPokeblockCase pop {r0} bx r0 .pool @@ -1517,7 +1517,7 @@ sub_80FDC00: @ 80FDC00 bl overworld_free_bg_tilemaps ldr r1, =c2_exit_to_overworld_2_switch movs r0, 0 - bl sub_81357FC + bl OpenPokeblockCase adds r0, r4, 0 bl DestroyTask _080FDC24: diff --git a/asm/learn_move.s b/asm/learn_move.s index 159b16f7e..f42514e68 100755 --- a/asm/learn_move.s +++ b/asm/learn_move.s @@ -94,7 +94,7 @@ sub_81606A0: @ 81606A0 ldr r0, =gUnknown_085CEBB8 bl LoadSpritePalette bl sub_81610B8 - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate ldrh r1, [r4] ldrh r2, [r4, 0x2] bl ListMenuInit @@ -151,7 +151,7 @@ sub_8160740: @ 8160740 ldr r0, =gUnknown_085CEBB8 bl LoadSpritePalette bl sub_81610B8 - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate ldrh r1, [r4] ldrh r2, [r4, 0x2] bl ListMenuInit @@ -175,14 +175,14 @@ sub_8160740: @ 8160740 thumb_func_start sub_81607EC sub_81607EC: @ 81607EC push {lr} - bl sub_8121DA0 + bl ResetVramOamAndBgCntRegs movs r0, 0 bl ResetBgsAndClearDma3BusyFlags ldr r1, =gUnknown_085CEC28 movs r0, 0 movs r2, 0x2 bl InitBgsFromTemplates - bl sub_8121E10 + bl ResetAllBgsCoordinates movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -353,7 +353,7 @@ _08160994: b _08160E88 .pool _081609A8: - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -433,7 +433,7 @@ _08160A50: b _08160E88 .pool _08160A64: - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -493,7 +493,7 @@ _08160ADC: b _08160E88 .pool _08160AEC: - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -551,7 +551,7 @@ _08160B6C: b _08160E88 .pool _08160B80: - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -980,7 +980,7 @@ sub_8160F50: @ 8160F50 lsls r4, 1 adds r0, r4 ldrb r0, [r0] - bl ListMenuHandleInput + bl ListMenuHandleInputGetItemId adds r5, r0, 0 ldr r0, [r6] adds r0, r4 @@ -988,7 +988,7 @@ sub_8160F50: @ 8160F50 ldr r4, =gUnknown_0203BC38 adds r2, r4, 0x2 adds r1, r4, 0 - bl get_coro_args_x18_x1A + bl sub_81AE860 movs r0, 0x2 negs r0, r0 cmp r5, r0 diff --git a/asm/link.s b/asm/link.s index 2e6f3f8d3..a6e580d5c 100644 --- a/asm/link.s +++ b/asm/link.s @@ -18243,7 +18243,7 @@ _08012938: ldrb r0, [r6, 0xF] movs r1, 0 bl sub_81973FC - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate adds r2, r0, 0 ldr r1, =gUnknown_082F015C ldm r1!, {r3,r5,r7} @@ -19724,7 +19724,7 @@ _0801360C: ldrb r0, [r6, 0xB] movs r1, 0 bl sub_81973FC - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate adds r2, r0, 0 ldr r1, =gUnknown_082F0204 ldm r1!, {r3,r5,r7} @@ -19769,7 +19769,7 @@ _080136EA: b _08013A72 _080136F2: ldrb r0, [r6, 0xE] - bl ListMenuHandleInput + bl ListMenuHandleInputGetItemId adds r4, r0, 0 ldr r0, =gMain ldrh r1, [r0, 0x2E] @@ -21038,7 +21038,7 @@ sub_8014210: @ 8014210 adds r6, r0, 0 lsls r6, 16 lsrs r6, 16 - bl sp000_heal_pokemon + bl HealPlayerParty bl copy_player_party_to_sav1 bl copy_bags_and_unk_data_from_save_blocks ldr r5, =gLinkPlayers @@ -21406,7 +21406,7 @@ _080145F4: ldr r0, =gBlockSendBuffer movs r1, 0x1 bl sub_80143E4 - bl sp000_heal_pokemon + bl HealPlayerParty bl copy_player_party_to_sav1 bl copy_bags_and_unk_data_from_save_blocks movs r0, 0x1 @@ -21419,7 +21419,7 @@ _080145F4: .pool _08014620: bl overworld_free_bg_tilemaps - bl sp000_heal_pokemon + bl HealPlayerParty bl copy_player_party_to_sav1 bl copy_bags_and_unk_data_from_save_blocks ldr r0, =gBlockSendBuffer @@ -21435,7 +21435,7 @@ _08014620: .pool _0801464C: bl overworld_free_bg_tilemaps - bl sp000_heal_pokemon + bl HealPlayerParty bl copy_player_party_to_sav1 bl copy_bags_and_unk_data_from_save_blocks ldr r0, =gBlockSendBuffer @@ -21969,7 +21969,7 @@ _08014AEC: strb r0, [r5, 0xF] ldrb r0, [r5, 0xF] bl sub_8018784 - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate adds r2, r0, 0 ldr r1, =gUnknown_082F015C ldm r1!, {r3,r4,r6} @@ -22501,7 +22501,7 @@ _08014FE8: strb r0, [r7, 0xD] ldrb r0, [r7, 0xB] bl sub_8018784 - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate adds r2, r0, 0 ldr r1, =gUnknown_082F0204 ldm r1!, {r3-r5} @@ -22549,7 +22549,7 @@ _080150CE: b _080152A0 _080150D6: ldrb r0, [r7, 0xE] - bl ListMenuHandleInput + bl ListMenuHandleInputGetItemId adds r2, r0, 0 ldr r0, =gMain ldrh r1, [r0, 0x2E] @@ -22874,7 +22874,7 @@ _08015398: strb r0, [r5, 0xB] ldrb r0, [r5, 0xB] bl sub_8018784 - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate adds r2, r0, 0 ldr r1, =gUnknown_082F0204 ldm r1!, {r3,r4,r6} @@ -22920,7 +22920,7 @@ _08015446: cmp r0, 0 beq _08015452 ldrb r0, [r5, 0xE] - bl ListMenuHandleInput + bl ListMenuHandleInputGetItemId _08015452: ldrb r0, [r5, 0x14] cmp r0, 0x78 @@ -26142,7 +26142,7 @@ _080170E0: negs r0, r0 b _08017110 _080170F2: - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 movs r2, 0x80 @@ -26270,7 +26270,7 @@ _080171DC: ldrb r0, [r5] movs r1, 0 bl sub_81973FC - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate adds r2, r0, 0 ldr r1, [sp, 0x24] ldm r1!, {r3,r4,r6} @@ -26295,7 +26295,7 @@ _080171DC: _08017228: mov r3, r9 ldrb r0, [r3] - bl ListMenuHandleInput + bl ListMenuHandleInputGetItemId mov r8, r0 ldr r0, =gMain ldrh r1, [r0, 0x2E] @@ -26383,7 +26383,7 @@ _080172C8: ldrb r0, [r6] movs r1, 0 bl sub_81973FC - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate adds r2, r0, 0 ldr r1, [sp, 0x24] ldm r1!, {r3,r4,r7} @@ -26411,7 +26411,7 @@ _08017314: _0801731C: mov r3, r10 ldrb r0, [r3] - bl ListMenuHandleInput + bl ListMenuHandleInputGetItemId adds r1, r0, 0 ldr r0, =gMain ldrh r2, [r0, 0x2E] @@ -29500,7 +29500,7 @@ _08018BD6: b _08018C3E .pool _08018BE4: - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r6, r0, 24 movs r1, 0x80 @@ -52112,7 +52112,7 @@ _0802426A: bl sub_8197930 b _080242D0 _08024270: - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r4, r0, 24 movs r0, 0x2 @@ -71033,7 +71033,7 @@ _0802DA84: thumb_func_start sub_802DA8C sub_802DA8C: @ 802DA8C push {lr} - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r0, 24 pop {r1} diff --git a/asm/list_menu.s b/asm/list_menu.s index 5e6da159e..7fa0a8dd2 100755 --- a/asm/list_menu.s +++ b/asm/list_menu.s @@ -64,7 +64,7 @@ _081AE4B0: ldr r1, [sp, 0x4] bl sub_8098858 _081AE4C0: - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate adds r2, r0, 0 ldr r1, [sp] ldm r1!, {r3-r5} @@ -87,7 +87,7 @@ _081AE4C0: .pool _081AE4F4: ldrb r0, [r5, 0x6] - bl ListMenuHandleInput + bl ListMenuHandleInputGetItemId str r0, [r5] ldr r1, =gMain ldrh r0, [r1, 0x2E] @@ -227,9 +227,9 @@ _081AE5F0: bx r1 thumb_func_end Unused_ListMenuInit2 - thumb_func_start ListMenuHandleInput -@ int ListMenuHandleInput(u8 taskId) -ListMenuHandleInput: @ 81AE604 + thumb_func_start ListMenuHandleInputGetItemId +@ int ListMenuHandleInputGetItemId(u8 taskId) +ListMenuHandleInputGetItemId: @ 81AE604 push {lr} lsls r0, 24 lsrs r0, 24 @@ -337,7 +337,7 @@ _081AE6BE: _081AE6C2: pop {r1} bx r1 - thumb_func_end ListMenuHandleInput + thumb_func_end ListMenuHandleInputGetItemId thumb_func_start sub_81AE6C8 sub_81AE6C8: @ 81AE6C8 @@ -557,8 +557,8 @@ _081AE856: .pool thumb_func_end sub_81AE838 - thumb_func_start get_coro_args_x18_x1A -get_coro_args_x18_x1A: @ 81AE860 + thumb_func_start sub_81AE860 +sub_81AE860: @ 81AE860 push {lr} adds r3, r1, 0 lsls r0, 24 @@ -581,7 +581,7 @@ _081AE882: pop {r0} bx r0 .pool - thumb_func_end get_coro_args_x18_x1A + thumb_func_end sub_81AE860 thumb_func_start ListMenuGetYCoordForPrintingArrowCursor @ u8 ListMenuGetYCoordForPrintingArrowCursor(u8 taskId) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 69cdb38e5..d7b4bca37 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -226,6 +226,18 @@ .2byte \var2 .endm + @ Generic compare macro which attempts to deduce argument types based on their values + @ Any values between 0x4000 to 0x4FFF and 0x8000 to 0x8FFF are considered event variable identifiers + .macro compare arg1, arg2 + .if ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && ((\arg2 >> 12) == 4 || (\arg2 >> 12) == 8) + compare_var_to_var \arg1, \arg2 + .elseif ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && (\arg2 >= 0 && \arg2 <= 0xFFFF) + compare_var_to_value \arg1, \arg2 + .else + .error "Invalid arguments for 'compare'" + .endif + .endm + @ Calls the native C function stored at `func`. .macro callnative func .byte 0x23 @@ -518,57 +530,58 @@ .endm @ Applies the movement data at movements to the specified (index) Object. Also closes any standard message boxes that are still open. - .macro applymovement index, movements - .byte 0x4f - .2byte \index - .4byte \movements - .endm - - @ Applies the movement data at movements to the specified (index) Object on the specified (map_group, map_num) map. Really only useful if the object has followed from one map to another (e.g. Wally during the catching event). - .macro applymovementat variable, movements, map - .byte 0x50 - .2byte \variable - .4byte \movements - map \map + @ If no map is specified, then the current map is used. + .macro applymovement index, movements, map + .ifb \map + .byte 0x4f + .2byte \index + .4byte \movements + .else + @ Really only useful if the object has followed from one map to another (e.g. Wally during the catching event). + .byte 0x50 + .2byte \index + .4byte \movements + map \map + .endif .endm @ Blocks script execution until the movements being applied to the specified (index) Object finish. If the specified Object is 0x0000, then the command will block script execution until all Objects affected by applymovement finish their movements. If the specified Object is not currently being manipulated with applymovement, then this command does nothing. - .macro waitmovement index - .byte 0x51 - .2byte \index - .endm - - @ Blocks script execution until the movements being applied to the specified (index) Object on the specified (map) map finish. - .macro waitmovementat index, map - .byte 0x52 - .2byte \index - map \map - .endm - - @ Attempts to hide the specified (index) Object on the current map, by setting its visibility flag if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing. - .macro removeobject index - .byte 0x53 - .2byte \index + @ If no map is specified, then the current map is used. + .macro waitmovement index, map + .ifb \map + .byte 0x51 + .2byte \index + .else + .byte 0x52 + .2byte \index + map \map + .endif .endm @ Attempts to hide the specified (index) Object on the specified (map_group, map_num) map, by setting its visibility flag if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing. - .macro removeobjectat index, map - .byte 0x54 - .2byte \index - map \map - .endm - - @ Unsets the specified (index) Object's visibility flag on the current map if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing. - .macro addobject index - .byte 0x55 - .2byte \index + @ If no map is specified, then the current map is used. + .macro removeobject index, map + .ifb \map + .byte 0x53 + .2byte \index + .else + .byte 0x54 + .2byte \index + map \map + .endif .endm @ Unsets the specified (index) Object's visibility flag on the specified (map_group, map_num) map if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing. - .macro addobjectat index, map - .byte 0x56 - .2byte \index - map \map + @ If no map is specified, then the current map is used. + .macro addobject index, map + .ifb \map + .byte 0x55 + .2byte \index + .else + .byte 0x56 + .2byte \index + map \map + .endif .endm @ Sets the specified (index) Object's position on the current map. @@ -663,11 +676,13 @@ .byte 0x5d .endm - .macro ontrainerbattleend + @ Goes to address after the trainerbattle command (called by the battle functions, see battle_setup.c) + .macro gotopostbattlescript .byte 0x5e .endm - .macro ontrainerbattleendgoto + @ Goes to address specified in the trainerbattle command (called by the battle functions, see battle_setup.c) + .macro gotobeatenscript .byte 0x5f .endm @@ -848,11 +863,11 @@ .2byte \species .endm - .macro setmonmove byte1, byte2, word + .macro setmonmove index, slot, move .byte 0x7b - .byte \byte1 - .byte \byte2 - .2byte \word + .byte \index + .byte \slot + .2byte \move .endm @ Checks if at least one Pokemon in the player's party knows the specified (index) attack. If so, variable 0x800D (LASTRESULT) is set to the (zero-indexed) slot number of the first Pokemon that knows the move. If not, LASTRESULT is set to 0x0006. Variable 0x8004 is also set to this Pokemon's species. @@ -956,7 +971,7 @@ .endm @ This allows you to choose a Pokemon to use in a contest. In FireRed, this command sets the byte at 0x03000EA8 to 0x01. - .macro choosecontestpkmn + .macro choosecontestmon .byte 0x8b .endm @@ -1022,10 +1037,10 @@ .byte \y .endm - @ Gets the price reduction for the index (word) given. In FireRed, this command is a nop. - .macro getpricereduction word + @ Gets the price reduction for the index given. In FireRed, this command is a nop. + .macro getpricereduction index .byte 0x96 - .2byte \word + .2byte \index .endm @ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white. @@ -1076,9 +1091,9 @@ .endm @ Sets which healing place the player will return to if all of the Pokemon in their party faint. - .macro setrespawn flightspot + .macro setrespawn heallocation .byte 0x9f - .2byte \flightspot + .2byte \heallocation .endm @ Checks the player's gender. If male, then 0x0000 is stored in variable 0x800D (LASTRESULT). If female, then 0x0001 is stored in LASTRESULT. @@ -1185,7 +1200,7 @@ .endm @ Sets the door tile at (x, y) to be closed without an animation. - .macro setdoorclosed2 x, y + .macro setdoorclosed x, y .byte 0xb0 .2byte \x .2byte \y @@ -1215,9 +1230,9 @@ .2byte \count .endm - .macro takecoins word + .macro takecoins count .byte 0xb5 - .2byte \word + .2byte \count .endm @ Prepares to start a wild battle against a species at Level level holding item. Running this command will not affect normal wild battles. You start the prepared battle with dowildbattle. @@ -1233,10 +1248,9 @@ .byte 0xb7 .endm - .macro setvaddress long, word + .macro setvaddress pointer .byte 0xb8 - .4byte \long - .2byte \word + .4byte \pointer .endm .macro vgoto pointer diff --git a/asm/mail_data.s b/asm/mail_data.s deleted file mode 100755 index 70fc856d1..000000000 --- a/asm/mail_data.s +++ /dev/null @@ -1,589 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start ClearMailData -ClearMailData: @ 80D436C - push {r4,r5,lr} - movs r4, 0 - ldr r5, =gSaveBlock1Ptr -_080D4372: - lsls r1, r4, 3 - adds r1, r4 - lsls r1, 2 - ldr r0, =0x00002be0 - adds r1, r0 - ldr r0, [r5] - adds r0, r1 - bl ClearMailStruct - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xF - bls _080D4372 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end ClearMailData - - thumb_func_start ClearMailStruct -ClearMailStruct: @ 80D439C - push {r4-r6,lr} - adds r3, r0, 0 - ldr r0, =0x0000ffff - adds r4, r0, 0 - adds r1, r3, 0 - movs r2, 0x8 -_080D43A8: - ldrh r0, [r1] - orrs r0, r4 - strh r0, [r1] - adds r1, 0x2 - subs r2, 0x1 - cmp r2, 0 - bge _080D43A8 - movs r2, 0 - adds r6, r3, 0 - adds r6, 0x1A - adds r4, r3, 0 - adds r4, 0x12 - movs r5, 0xFF -_080D43C2: - adds r1, r4, r2 - ldrb r0, [r1] - orrs r0, r5 - strb r0, [r1] - adds r2, 0x1 - cmp r2, 0x7 - ble _080D43C2 - adds r1, r6, 0 - movs r2, 0 - adds r0, r1, 0x3 -_080D43D6: - strb r2, [r0] - subs r0, 0x1 - cmp r0, r1 - bge _080D43D6 - movs r1, 0 - movs r0, 0x1 - strh r0, [r3, 0x1E] - strh r1, [r3, 0x20] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end ClearMailStruct - - thumb_func_start MonHasMail -MonHasMail: @ 80D43F0 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0xC - bl GetMonData - lsls r0, 16 - lsrs r0, 16 - bl itemid_is_mail - lsls r0, 24 - cmp r0, 0 - beq _080D4418 - adds r0, r4, 0 - movs r1, 0x40 - bl GetMonData - cmp r0, 0xFF - beq _080D4418 - movs r0, 0x1 - b _080D441A -_080D4418: - movs r0, 0 -_080D441A: - pop {r4} - pop {r1} - bx r1 - thumb_func_end MonHasMail - - thumb_func_start sub_80D4420 -sub_80D4420: @ 80D4420 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - mov r8, r0 - lsls r1, 16 - lsrs r0, r1, 16 - str r0, [sp, 0x8] - mov r0, sp - movs r2, 0 - ldrb r3, [r0, 0x8] - strb r3, [r0] - lsrs r1, 24 - strb r1, [r0, 0x1] - add r3, sp, 0x4 - strb r2, [r3] - ldr r4, =gSaveBlock1Ptr - mov r10, r4 - mov r9, r3 - adds r4, r3, 0 -_080D444C: - mov r1, r10 - ldr r0, [r1] - ldrb r2, [r4] - lsls r1, r2, 3 - adds r1, r2 - lsls r1, 2 - adds r0, r1 - movs r1, 0xB0 - lsls r1, 6 - adds r0, r1 - ldrh r0, [r0] - cmp r0, 0 - beq _080D4468 - b _080D45A8 -_080D4468: - movs r4, 0 - ldr r2, =gSaveBlock2Ptr - mov r12, r2 - ldr r7, =gSaveBlock1Ptr - add r5, sp, 0x4 - ldr r3, =0x0000ffff - adds r6, r3, 0 -_080D4476: - ldr r2, [r7] - lsls r3, r4, 1 - ldrb r1, [r5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - adds r3, r0 - ldr r0, =0x00002be0 - adds r2, r0 - adds r2, r3 - ldrh r0, [r2] - orrs r0, r6 - strh r0, [r2] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x8 - bls _080D4476 - movs r4, 0 - ldr r5, =gSaveBlock1Ptr - add r3, sp, 0x4 -_080D44A0: - ldr r2, [r5] - ldrb r1, [r3] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - adds r0, r4, r0 - ldr r1, =0x00002bf2 - adds r2, r1 - adds r2, r0 - mov r1, r12 - ldr r0, [r1] - adds r0, r4 - ldrb r0, [r0] - strb r0, [r2] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x6 - bls _080D44A0 - mov r3, r10 - ldr r2, [r3] - mov r0, r9 - ldrb r1, [r0] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - adds r0, r4, r0 - ldr r1, =0x00002bf2 - adds r2, r1 - adds r2, r0 - movs r0, 0xFF - strb r0, [r2] - mov r2, r9 - ldrb r1, [r2] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, [r3] - adds r0, r1 - ldr r3, =0x00002bf2 - adds r0, r3 - movs r1, 0 - bl sub_81DB4DC - movs r4, 0 - ldr r6, =gSaveBlock1Ptr - add r3, sp, 0x4 - ldr r5, =gSaveBlock2Ptr -_080D4500: - ldr r2, [r6] - ldrb r1, [r3] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - adds r0, r4, r0 - ldr r1, =0x00002bfa - adds r2, r1 - adds r2, r0 - ldr r0, [r5] - adds r0, 0xA - adds r0, r4 - ldrb r0, [r0] - strb r0, [r2] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x3 - bls _080D4500 - mov r0, r8 - movs r1, 0xB - bl GetBoxMonData - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - mov r0, r8 - movs r1, 0 - bl GetBoxMonData - adds r1, r0, 0 - adds r0, r4, 0 - bl sub_80D45C8 - mov r2, r10 - ldr r3, [r2] - mov r4, r9 - ldrb r2, [r4] - lsls r1, r2, 3 - adds r1, r2 - lsls r1, 2 - adds r1, r3, r1 - ldr r2, =0x00002bfe - adds r1, r2 - strh r0, [r1] - ldrb r1, [r4] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - adds r3, r0 - movs r4, 0xB0 - lsls r4, 6 - adds r3, r4 - mov r0, sp - ldrh r0, [r0, 0x8] - strh r0, [r3] - mov r0, r8 - movs r1, 0x40 - mov r2, r9 - bl SetMonData - mov r0, r8 - movs r1, 0xC - mov r2, sp - bl SetMonData - mov r1, r9 - ldrb r0, [r1] - b _080D45B6 - .pool -_080D45A8: - adds r0, r2, 0x1 - strb r0, [r3] - ldrb r0, [r4] - cmp r0, 0x5 - bhi _080D45B4 - b _080D444C -_080D45B4: - movs r0, 0xFF -_080D45B6: - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80D4420 - - thumb_func_start sub_80D45C8 -sub_80D45C8: @ 80D45C8 - push {lr} - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0xC9 - bne _080D45E0 - adds r0, r1, 0 - bl mon_icon_personality_to_unown_id - lsls r0, 16 - ldr r1, =0x75300000 - adds r0, r1 - lsrs r0, 16 -_080D45E0: - pop {r1} - bx r1 - .pool - thumb_func_end sub_80D45C8 - - thumb_func_start sub_80D45E8 -sub_80D45E8: @ 80D45E8 - push {lr} - lsls r0, 16 - lsrs r3, r0, 16 - ldr r0, =0xffff8ad0 - adds r2, r3, r0 - lsls r0, r2, 16 - lsrs r0, 16 - cmp r0, 0x1B - bhi _080D4604 - movs r0, 0xC9 - strh r2, [r1] - b _080D4606 - .pool -_080D4604: - adds r0, r3, 0 -_080D4606: - pop {r1} - bx r1 - thumb_func_end sub_80D45E8 - - thumb_func_start GiveMailToMon2 -GiveMailToMon2: @ 80D460C - push {r4-r7,lr} - sub sp, 0x8 - adds r6, r0, 0 - adds r7, r1, 0 - ldrh r5, [r7, 0x20] - adds r1, r5, 0 - bl sub_80D4420 - add r4, sp, 0x4 - strb r0, [r4] - ldrb r2, [r4] - cmp r2, 0xFF - beq _080D4670 - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - lsls r0, r2, 3 - adds r0, r2 - lsls r0, 2 - adds r1, r0 - ldr r0, =0x00002be0 - adds r1, r0 - adds r0, r7, 0 - ldm r0!, {r2,r3,r7} - stm r1!, {r2,r3,r7} - ldm r0!, {r2,r3,r7} - stm r1!, {r2,r3,r7} - ldm r0!, {r2,r3,r7} - stm r1!, {r2,r3,r7} - adds r0, r6, 0 - movs r1, 0x40 - adds r2, r4, 0 - bl SetMonData - mov r0, sp - strb r5, [r0] - mov r1, sp - lsrs r0, r5, 8 - strb r0, [r1, 0x1] - adds r0, r6, 0 - movs r1, 0xC - mov r2, sp - bl SetMonData - ldrb r0, [r4] - b _080D4672 - .pool -_080D4670: - movs r0, 0xFF -_080D4672: - add sp, 0x8 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end GiveMailToMon2 - - thumb_func_start sub_80D467C -sub_80D467C: @ 80D467C - movs r0, 0 - bx lr - thumb_func_end sub_80D467C - - thumb_func_start TakeMailFromMon -TakeMailFromMon: @ 80D4680 - push {r4,lr} - sub sp, 0x8 - adds r4, r0, 0 - bl MonHasMail - lsls r0, 24 - cmp r0, 0 - beq _080D46D2 - adds r0, r4, 0 - movs r1, 0x40 - bl GetMonData - add r2, sp, 0x4 - strb r0, [r2] - ldr r0, =gSaveBlock1Ptr - ldr r3, [r0] - ldrb r1, [r2] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - adds r3, r0 - movs r0, 0xB0 - lsls r0, 6 - adds r3, r0 - movs r1, 0 - movs r0, 0 - strh r0, [r3] - movs r0, 0xFF - strb r0, [r2] - mov r0, sp - strb r1, [r0] - strb r1, [r0, 0x1] - adds r0, r4, 0 - movs r1, 0x40 - bl SetMonData - adds r0, r4, 0 - movs r1, 0xC - mov r2, sp - bl SetMonData -_080D46D2: - add sp, 0x8 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end TakeMailFromMon - - thumb_func_start sub_80D46E0 -sub_80D46E0: @ 80D46E0 - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gSaveBlock1Ptr - ldr r2, [r1] - lsls r1, r0, 3 - adds r1, r0 - lsls r1, 2 - adds r2, r1 - movs r0, 0xB0 - lsls r0, 6 - adds r2, r0 - movs r0, 0 - strh r0, [r2] - bx lr - .pool - thumb_func_end sub_80D46E0 - - thumb_func_start sub_80D4700 -sub_80D4700: @ 80D4700 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0xC - adds r5, r0, 0 - mov r0, sp - movs r1, 0 - strb r1, [r0] - strb r1, [r0, 0x1] - add r1, sp, 0x4 - movs r0, 0xFF - strb r0, [r1] - movs r7, 0x6 - mov r9, r1 - ldr r0, =gSaveBlock1Ptr - mov r8, r0 - ldr r3, =0x00002be0 -_080D4724: - mov r1, r8 - ldr r0, [r1] - lsls r1, r7, 3 - adds r1, r7 - lsls r1, 2 - adds r4, r0, r1 - movs r2, 0xB0 - lsls r2, 6 - adds r0, r4, r2 - ldrh r6, [r0] - cmp r6, 0 - bne _080D47A0 - adds r4, r3 - adds r0, r5, 0 - movs r1, 0x40 - str r3, [sp, 0x8] - bl GetMonData - mov r1, r8 - ldr r2, [r1] - lsls r1, r0, 3 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldr r3, [sp, 0x8] - adds r1, r3 - ldm r1!, {r0,r2,r3} - stm r4!, {r0,r2,r3} - ldm r1!, {r0,r2,r3} - stm r4!, {r0,r2,r3} - ldm r1!, {r0,r2,r3} - stm r4!, {r0,r2,r3} - adds r0, r5, 0 - movs r1, 0x40 - bl GetMonData - mov r1, r8 - ldr r2, [r1] - lsls r1, r0, 3 - adds r1, r0 - lsls r1, 2 - adds r2, r1 - movs r3, 0xB0 - lsls r3, 6 - adds r2, r3 - strh r6, [r2] - adds r0, r5, 0 - movs r1, 0x40 - mov r2, r9 - bl SetMonData - adds r0, r5, 0 - movs r1, 0xC - mov r2, sp - bl SetMonData - adds r0, r7, 0 - b _080D47AC - .pool -_080D47A0: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0xF - bls _080D4724 - movs r0, 0xFF -_080D47AC: - add sp, 0xC - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80D4700 - - thumb_func_start itemid_is_mail -itemid_is_mail: @ 80D47BC - push {lr} - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x84 - bgt _080D47CE - cmp r0, 0x79 - blt _080D47CE - movs r0, 0x1 - b _080D47D0 -_080D47CE: - movs r0, 0 -_080D47D0: - pop {r1} - bx r1 - thumb_func_end itemid_is_mail - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/main_menu.s b/asm/main_menu.s index 7b7ce49f7..52afc783e 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -3025,7 +3025,7 @@ task_new_game_prof_birch_speech_part2_4: @ 8031188 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 diff --git a/asm/map_obj_8097404.s b/asm/map_obj_8097404.s index 96ffc2254..4a6ae9945 100644 --- a/asm/map_obj_8097404.s +++ b/asm/map_obj_8097404.s @@ -82,9 +82,9 @@ _0809748E: bx r1 thumb_func_end sub_8097404 - thumb_func_start player_bitmagic -@ void player_bitmagic() -player_bitmagic: @ 8097494 + thumb_func_start FreezeMapObjects +@ void FreezeMapObjects() +FreezeMapObjects: @ 8097494 push {r4,r5,lr} movs r4, 0 ldr r5, =gMapObjects @@ -113,7 +113,7 @@ _080974B8: pop {r0} bx r0 .pool - thumb_func_end player_bitmagic + thumb_func_end FreezeMapObjects thumb_func_start sub_80974D0 sub_80974D0: @ 80974D0 diff --git a/asm/map_obj_lock.s b/asm/map_obj_lock.s index 2270051c2..3cf009175 100644 --- a/asm/map_obj_lock.s +++ b/asm/map_obj_lock.s @@ -62,7 +62,7 @@ _080983E2: thumb_func_start ScriptFreezeMapObjects ScriptFreezeMapObjects: @ 80983E8 push {lr} - bl player_bitmagic + bl FreezeMapObjects ldr r0, =sub_80983A4 movs r1, 0x50 bl CreateTask @@ -345,15 +345,15 @@ sub_8098630: @ 8098630 mov r6, r8 push {r6,r7} movs r0, 0 - bl sub_80B47E0 + bl GetChosenApproachingTrainerMapObjectId lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_030060A8 + ldr r0, =gNoOfApproachingTrainers ldrb r0, [r0] cmp r0, 0x2 bne _080986E0 movs r0, 0x1 - bl sub_80B47E0 + bl GetChosenApproachingTrainerMapObjectId lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 diff --git a/asm/menu.s b/asm/menu.s index e1102893a..64644504e 100755 --- a/asm/menu.s +++ b/asm/menu.s @@ -2266,8 +2266,8 @@ sub_8198C34: @ 8198C34 bx r0 thumb_func_end sub_8198C34 - thumb_func_start sub_8198C58 -sub_8198C58: @ 8198C58 + thumb_func_start ProcessMenuInputNoWrap_ +ProcessMenuInputNoWrap_: @ 8198C58 push {r4,lr} bl ProcessMenuInputNoWrapAround lsls r0, 24 @@ -2282,7 +2282,7 @@ _08198C6E: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8198C58 + thumb_func_end ProcessMenuInputNoWrap_ thumb_func_start sub_8198C78 sub_8198C78: @ 8198C78 diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s index 423f653d9..26e800944 100644 --- a/asm/menu_helpers.s +++ b/asm/menu_helpers.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_8121DA0 -sub_8121DA0: @ 8121DA0 + thumb_func_start ResetVramOamAndBgCntRegs +ResetVramOamAndBgCntRegs: @ 8121DA0 push {r4,lr} sub sp, 0xC movs r0, 0 @@ -50,10 +50,10 @@ sub_8121DA0: @ 8121DA0 pop {r0} bx r0 .pool - thumb_func_end sub_8121DA0 + thumb_func_end ResetVramOamAndBgCntRegs - thumb_func_start sub_8121E10 -sub_8121E10: @ 8121E10 + thumb_func_start ResetAllBgsCoordinates +ResetAllBgsCoordinates: @ 8121E10 push {lr} movs r0, 0 movs r1, 0 @@ -89,7 +89,7 @@ sub_8121E10: @ 8121E10 bl ChangeBgY pop {r0} bx r0 - thumb_func_end sub_8121E10 + thumb_func_end ResetAllBgsCoordinates thumb_func_start SetVBlankHBlankCallbacksToNull @ void SetVBlankHBlankCallbacksToNull() @@ -177,8 +177,8 @@ _08121EC0: .pool thumb_func_end DisplayMessageAndContinueTask - thumb_func_start sub_8121F20 -sub_8121F20: @ 8121F20 + thumb_func_start RunTextPrintersRetIsActive +RunTextPrintersRetIsActive: @ 8121F20 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -191,7 +191,7 @@ sub_8121F20: @ 8121F20 pop {r4} pop {r1} bx r1 - thumb_func_end sub_8121F20 + thumb_func_end RunTextPrintersRetIsActive thumb_func_start Task_ContinueTaskAfterMessagePrints @ void Task_ContinueTaskAfterMessagePrints(u8 taskId) @@ -201,7 +201,7 @@ Task_ContinueTaskAfterMessagePrints: @ 8121F3C lsrs r4, r0, 24 ldr r0, =gUnknown_0203A140 ldrb r0, [r0] - bl sub_8121F20 + bl RunTextPrintersRetIsActive lsls r0, 16 cmp r0, 0 bne _08121F5A @@ -277,7 +277,7 @@ Task_CallYesOrNoCallback: @ 8121FDC push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -512,7 +512,7 @@ itemid_80BF6D8_mail_related: @ 812217C bne _081221A4 _08122192: adds r0, r4, 0 - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -752,8 +752,8 @@ _08122322: bx r0 thumb_func_end sub_8122298 - thumb_func_start sub_8122328 -sub_8122328: @ 8122328 + thumb_func_start LoadListMenuArrowsGfx +LoadListMenuArrowsGfx: @ 8122328 push {lr} ldr r0, =gUnknown_0859F514 bl LoadCompressedObjectPic @@ -762,7 +762,7 @@ sub_8122328: @ 8122328 pop {r0} bx r0 .pool - thumb_func_end sub_8122328 + thumb_func_end LoadListMenuArrowsGfx thumb_func_start sub_8122344 sub_8122344: @ 8122344 diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s index fbcc5f036..a7cee8846 100644 --- a/asm/mystery_event_script.s +++ b/asm/mystery_event_script.s @@ -43,7 +43,7 @@ _081537FE: sub_8153804: @ 8153804 push {lr} ldr r0, =gStringVar4 - ldr r1, =gUnknown_08674C86 + ldr r1, =gText_MysteryGiftCantBeUsed bl StringExpandPlaceholders movs r0, 0x3 bl SetMysteryEventScriptStatus @@ -461,7 +461,7 @@ sub_8153AE8: @ 8153AE8 cmp r0, 0 bne _08153B54 ldr r0, =gStringVar4 - ldr r1, =gUnknown_08674AE4 + ldr r1, =gText_MysteryGiftBerry b _08153B74 .pool _08153B54: @@ -471,12 +471,12 @@ _08153B54: cmp r0, 0 beq _08153B70 ldr r0, =gStringVar4 - ldr r1, =gUnknown_08674B16 + ldr r1, =gText_MysteryGiftBerryTransform b _08153B74 .pool _08153B70: ldr r0, =gStringVar4 - ldr r1, =gUnknown_08674B42 + ldr r1, =gText_MysteryGiftBerryObtained _08153B74: bl StringExpandPlaceholders movs r0, 0x2 @@ -515,7 +515,7 @@ sub_8153BB0: @ 8153BB0 str r2, [r4, 0x8] bl GiveGiftRibbonToParty ldr r0, =gStringVar4 - ldr r1, =gUnknown_08674B6A + ldr r1, =gText_MysteryGiftSpecialRibbon bl StringExpandPlaceholders movs r0, 0x2 str r0, [r4, 0x6C] @@ -584,7 +584,7 @@ sub_8153C4C: @ 8153C4C adds r4, r0, 0 bl EnableNationalPokedex ldr r0, =gStringVar4 - ldr r1, =gUnknown_08674B9E + ldr r1, =gText_MysteryGiftNationalDex bl StringExpandPlaceholders movs r0, 0x2 str r0, [r4, 0x6C] @@ -605,7 +605,7 @@ sub_8153C70: @ 8153C70 str r1, [r4, 0x8] bl sub_811EFC0 ldr r0, =gStringVar4 - ldr r1, =gUnknown_08674BD4 + ldr r1, =gText_MysteryGiftRareWord bl StringExpandPlaceholders movs r0, 0x2 str r0, [r4, 0x6C] @@ -685,7 +685,7 @@ _08153D22: cmp r0, 0x6 bne _08153D4C ldr r0, =gStringVar4 - ldr r1, =gUnknown_08674C02 + ldr r1, =gText_MysteryGiftFullParty bl StringExpandPlaceholders movs r0, 0x3 b _08153DB6 @@ -721,7 +721,7 @@ _08153D86: bl GetMonData lsls r0, 16 lsrs r0, 16 - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _08153DA4 @@ -732,7 +732,7 @@ _08153DA4: bl CompactPartySlots bl CalculatePlayerPartyCount ldr r0, =gStringVar4 - ldr r1, =gUnknown_08674BF0 + ldr r1, =gText_MysteryGiftSentOver bl StringExpandPlaceholders movs r0, 0x2 _08153DB6: @@ -765,7 +765,7 @@ sub_8153DD4: @ 8153DD4 bl memcpy bl sub_81652B4 ldr r0, =gStringVar4 - ldr r1, =gUnknown_08674C31 + ldr r1, =gText_MysteryGiftNewTrainer bl StringExpandPlaceholders movs r0, 0x2 str r0, [r4, 0x6C] diff --git a/asm/overworld.s b/asm/overworld.s index ea03b8a8d..f86097ce9 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -21,7 +21,7 @@ sub_8084620: @ 8084620 lsrs r1, 1 adds r0, r4, 0 bl SetMoney - bl sp000_heal_pokemon + bl HealPlayerParty bl sub_8084720 bl copy_saved_warp3_bank_and_enter_x_to_warp1 bl warp_in @@ -1381,12 +1381,12 @@ _080850C8: bl prev_quest_postbuffer_cursor_backup_reset adds r0, r6, 0 adds r1, r5, 0 - bl sub_80B21B4 + bl TryUpdateRandomTrainerRematches bl DoTimeBasedEvents bl sub_80AEDBC bl sub_8085B2C bl update_sav1_flash_used_on_map - bl sav1_reset_battle_music_maybe + bl Overworld_ClearSavedMusic bl mapheader_run_script_with_tag_x3 bl not_trainer_hill_battle_pyramid ldr r0, [r4] @@ -1478,7 +1478,7 @@ _080851A2: asrs r1, 24 lsls r1, 16 lsrs r1, 16 - bl sub_80B21B4 + bl TryUpdateRandomTrainerRematches cmp r7, 0x1 beq _080851EE bl DoTimeBasedEvents @@ -1491,7 +1491,7 @@ _080851EE: bl FlagClear _08085200: bl update_sav1_flash_used_on_map - bl sav1_reset_battle_music_maybe + bl Overworld_ClearSavedMusic bl mapheader_run_script_with_tag_x3 bl UpdateLocationHistoryForRoamer bl RoamerMoveToOtherLocationSet @@ -1880,15 +1880,15 @@ _080854FE: .pool thumb_func_end Overworld_SetFlashLevel - thumb_func_start sav1_get_flash_used_on_map -sav1_get_flash_used_on_map: @ 8085514 + thumb_func_start Overworld_GetFlashLevel +Overworld_GetFlashLevel: @ 8085514 ldr r0, =gSaveBlock1Ptr ldr r0, [r0] adds r0, 0x30 ldrb r0, [r0] bx lr .pool - thumb_func_end sav1_get_flash_used_on_map + thumb_func_end Overworld_GetFlashLevel thumb_func_start sub_8085524 sub_8085524: @ 8085524 @@ -2133,7 +2133,7 @@ sav1_map_get_music: @ 80856D4 lsls r0, 5 cmp r1, r0 bne _080856FC - bl sav1_get_weather_probably + bl GetSav1Weather lsls r0, 24 lsrs r0, 24 cmp r0, 0x8 @@ -2272,15 +2272,15 @@ Overworld_SetSavedMusic: @ 80857F4 .pool thumb_func_end Overworld_SetSavedMusic - thumb_func_start sav1_reset_battle_music_maybe -sav1_reset_battle_music_maybe: @ 8085800 + thumb_func_start Overworld_ClearSavedMusic +Overworld_ClearSavedMusic: @ 8085800 ldr r0, =gSaveBlock1Ptr ldr r1, [r0] movs r0, 0 strh r0, [r1, 0x2C] bx lr .pool - thumb_func_end sav1_reset_battle_music_maybe + thumb_func_end Overworld_ClearSavedMusic thumb_func_start sub_8085810 sub_8085810: @ 8085810 @@ -2856,8 +2856,8 @@ sav1_map_get_name: @ 8085C58 .pool thumb_func_end sav1_map_get_name - thumb_func_start sav1_map_get_battletype -sav1_map_get_battletype: @ 8085C80 + thumb_func_start GetCurrentMapBattleScene +GetCurrentMapBattleScene: @ 8085C80 push {lr} ldr r0, =gSaveBlock1Ptr ldr r1, [r0] @@ -2875,7 +2875,7 @@ sav1_map_get_battletype: @ 8085C80 pop {r1} bx r1 .pool - thumb_func_end sav1_map_get_battletype + thumb_func_end GetCurrentMapBattleScene thumb_func_start overworld_bg_setup @ void overworld_bg_setup() @@ -3192,8 +3192,8 @@ CB2_NewGame: @ 8085EF8 .pool thumb_func_end CB2_NewGame - thumb_func_start c2_whiteout -c2_whiteout: @ 8085F58 + thumb_func_start CB2_WhiteOut +CB2_WhiteOut: @ 8085F58 push {lr} sub sp, 0x4 ldr r1, =gMain @@ -3232,7 +3232,7 @@ _08085FB0: pop {r0} bx r0 .pool - thumb_func_end c2_whiteout + thumb_func_end CB2_WhiteOut thumb_func_start c2_load_new_map c2_load_new_map: @ 8085FCC @@ -3661,7 +3661,7 @@ sub_80863B0: @ 80863B0 b _080863F0 .pool _080863D4: - bl sav1_get_flash_used_on_map + bl Overworld_GetFlashLevel lsls r0, 24 lsrs r0, 24 cmp r0, 0 diff --git a/asm/party_menu.s b/asm/party_menu.s index 4ae689d4d..4a70ab1da 100755 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -98,7 +98,7 @@ _081B0234: .4byte _081B0474 _081B0290: bl SetVBlankHBlankCallbacksToNull - bl sub_8121DA0 + bl ResetVramOamAndBgCntRegs bl clear_scheduled_bg_copies_to_vram ldr r1, =gMain movs r0, 0x87 @@ -429,7 +429,7 @@ sub_81B0550: @ 81B0550 ldr r1, [r5] movs r0, 0x1 bl SetBgTilemapBuffer - bl sub_8121E10 + bl ResetAllBgsCoordinates movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram movs r1, 0x82 @@ -2554,7 +2554,7 @@ sub_81B1708: @ 81B1708 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -3161,7 +3161,7 @@ sub_81B1B8C: @ 81B1B8C lsrs r4, r0, 24 adds r5, r4, 0 movs r0, 0x6 - bl sub_8121F20 + bl RunTextPrintersRetIsActive lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 @@ -3402,14 +3402,14 @@ sub_81B1DB8: @ 81B1DB8 lsrs r4, r5, 16 adds r7, r4, 0 adds r0, r4, 0 - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _081B1DE2 adds r0, r6, 0 adds r1, r4, 0 - bl sub_80D4420 + bl GiveMailToMon lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF @@ -4010,7 +4010,7 @@ sub_81B227C: @ 81B227C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -6216,7 +6216,7 @@ _081B34D2: bl GetMonData lsls r0, 16 lsrs r0, 16 - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _081B3508 @@ -7791,7 +7791,7 @@ _081B425A: .pool _081B4278: ldrh r0, [r6] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _081B42A4 @@ -7952,7 +7952,7 @@ sub_81B43DC: @ 81B43DC push {r4-r6,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -7999,7 +7999,7 @@ _081B4402: .pool _081B4458: ldrh r0, [r5] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _081B4498 @@ -8485,7 +8485,7 @@ sub_81B48DC: @ 81B48DC muls r1, r0 ldr r0, =gPlayerParty adds r4, r1, r0 - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -8681,7 +8681,7 @@ sub_81B4A98: @ 81B4A98 adds r0, r1 ldr r1, =sub_81B4AE0 movs r2, 0x1 - bl sub_8121478 + bl ReadMail pop {r0} bx r0 .pool @@ -8777,7 +8777,7 @@ sub_81B4BA0: @ 81B4BA0 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -8801,7 +8801,7 @@ _081B4BC6: muls r0, r1 ldr r1, =gPlayerParty adds r0, r1 - bl sub_80D4700 + bl TakeMailFromMon2 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF @@ -8883,7 +8883,7 @@ sub_81B4C94: @ 81B4C94 push {r7} lsls r0, 24 lsrs r5, r0, 24 - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -9691,7 +9691,7 @@ sub_81B5430: @ 81B5430 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -9985,7 +9985,7 @@ sub_81B56D8: @ 81B56D8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -10735,7 +10735,7 @@ sub_81B5CB0: @ 81B5CB0 b _081B5D24 .pool _081B5CD8: - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _081B5CFC @@ -10821,7 +10821,7 @@ _081B5D68: adds r0, r7, r5 ldrb r4, [r0] adds r0, r1, 0 - bl itemid_is_mail + bl ItemIsMail adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -10853,7 +10853,7 @@ _081B5DAC: adds r0, r5, r7 ldrb r4, [r0, 0x6] adds r0, r1, 0 - bl itemid_is_mail + bl ItemIsMail adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -12970,7 +12970,7 @@ sub_81B7028: @ 81B7028 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -13272,7 +13272,7 @@ sub_81B72C8: @ 81B72C8 muls r1, r0 ldr r0, =gPlayerParty adds r4, r1, r0 - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r5, r0, 24 cmp r5, 0 @@ -14728,7 +14728,7 @@ sub_81B7FAC: @ 81B7FAC .pool _081B7FF8: ldrh r0, [r5] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _081B800C @@ -14770,7 +14770,7 @@ sub_81B8044: @ 81B8044 lsrs r4, r0, 24 ldr r5, =gUnknown_0203CEC8 ldrh r0, [r5, 0xC] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _081B807C @@ -15054,7 +15054,7 @@ sub_81B82D4: @ 81B82D4 push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -15093,7 +15093,7 @@ _081B82FA: .pool _081B8338: adds r0, r4, 0 - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _081B835C diff --git a/asm/player_pc.s b/asm/player_pc.s index 2287d4123..5f32a00c2 100644 --- a/asm/player_pc.s +++ b/asm/player_pc.s @@ -733,7 +733,7 @@ sub_816B430: @ 816B430 bl sub_816B4C0 bl sub_816BC14 bl gpu_pal_allocator_reset__manage_upper_four - bl sub_8122328 + bl LoadListMenuArrowsGfx ldr r0, =gUnknown_0203BCC4 ldr r0, [r0] movs r1, 0xCD @@ -1013,7 +1013,7 @@ sub_816B674: @ 816B674 cmp r0, 0 bne _0816B71E ldrb r0, [r4, 0xA] - bl ListMenuHandleInput + bl ListMenuHandleInputGetItemId adds r6, r0, 0 ldrb r0, [r4, 0xA] ldr r7, =gUnknown_0203BCBA @@ -1021,7 +1021,7 @@ sub_816B674: @ 816B674 mov r8, r1 adds r1, r7, 0 mov r2, r8 - bl get_coro_args_x18_x1A + bl sub_81AE860 movs r0, 0x2 negs r0, r0 cmp r6, r0 @@ -1263,7 +1263,7 @@ sub_816B8A4: @ 816B8A4 adds r0, r1 ldr r1, =sub_816B900 movs r2, 0x1 - bl sub_8121478 + bl ReadMail adds r0, r4, 0 bl DestroyTask _0816B8E6: @@ -1378,7 +1378,7 @@ sub_816B9D8: @ 816B9D8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r0, 24 movs r1, 0x1 @@ -1820,7 +1820,7 @@ _0816BD58: movs r1, 0x2 negs r1, r1 str r1, [r0] - ldr r4, =gUnknown_03006310 + ldr r4, =gMultiuseListMenuTemplate adds r1, r4, 0 ldr r0, =gUnknown_085DFF44 ldm r0!, {r2,r3,r6} @@ -2327,7 +2327,7 @@ _0816C186: bl sub_816C110 bl sub_816C140 bl sub_816BD04 - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate ldr r2, =gUnknown_0203BCB8 ldrh r1, [r2, 0x2] ldrh r2, [r2] @@ -2476,7 +2476,7 @@ sub_816C30C: @ 816C30C ldr r1, =gUnknown_0203BCBA subs r4, r1, 0x2 adds r2, r4, 0 - bl get_coro_args_x18_x1A + bl sub_81AE860 ldrh r1, [r4, 0x2] ldrh r0, [r4] adds r1, r0 @@ -2492,12 +2492,12 @@ sub_816C30C: @ 816C30C .pool _0816C35C: ldrb r0, [r4, 0xA] - bl ListMenuHandleInput + bl ListMenuHandleInputGetItemId adds r6, r0, 0 ldrb r0, [r4, 0xA] ldr r1, =gUnknown_0203BCBA subs r2, r1, 0x2 - bl get_coro_args_x18_x1A + bl sub_81AE860 movs r0, 0x2 negs r0, r0 cmp r6, r0 @@ -2691,18 +2691,18 @@ sub_816C4FC: @ 816C4FC ldrb r0, [r4, 0xA] ldr r1, =gUnknown_0203BCBA subs r2, r1, 0x2 - bl get_coro_args_x18_x1A + bl sub_81AE860 b _0816C57E .pool _0816C530: ldrb r0, [r4, 0xA] - bl ListMenuHandleInput + bl ListMenuHandleInputGetItemId adds r6, r0, 0 ldrb r0, [r4, 0xA] ldr r1, =gUnknown_0203BCBA subs r4, r1, 0x2 adds r2, r4, 0 - bl get_coro_args_x18_x1A + bl sub_81AE860 ldr r0, =gUnknown_0203BCC4 ldr r0, [r0] movs r1, 0xCD @@ -2825,7 +2825,7 @@ _0816C622: adds r0, r2 movs r1, 0xFF strb r1, [r0] - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate ldr r2, =gUnknown_0203BCB8 ldrh r1, [r2, 0x2] ldrh r2, [r2] @@ -3363,7 +3363,7 @@ sub_816CB04: @ 816CB04 bl sub_816C110 bl sub_816C140 bl sub_816BD04 - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate ldrh r1, [r4, 0x2] ldrh r2, [r4] bl ListMenuInit diff --git a/asm/pokeblock_feed.s b/asm/pokeblock_feed.s deleted file mode 100644 index aef726c16..000000000 --- a/asm/pokeblock_feed.s +++ /dev/null @@ -1,1873 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_8179B68 -sub_8179B68: @ 8179B68 - push {lr} - bl RunTasks - bl AnimateSprites - bl BuildOamBuffer - bl do_scheduled_bg_tilemap_copies_to_vram - bl UpdatePaletteFade - pop {r0} - bx r0 - thumb_func_end sub_8179B68 - - thumb_func_start sub_8179B84 -sub_8179B84: @ 8179B84 - push {lr} - bl LoadOam - bl ProcessSpriteCopyRequests - bl TransferPlttBuffer - pop {r0} - bx r0 - thumb_func_end sub_8179B84 - - thumb_func_start sub_8179B98 -sub_8179B98: @ 8179B98 - push {r4,lr} - sub sp, 0x4 - ldr r0, =gMain - movs r1, 0x87 - lsls r1, 3 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0xD - bls _08179BAC - b _08179D4C -_08179BAC: - lsls r0, 2 - ldr r1, =_08179BC0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08179BC0: - .4byte _08179BF8 - .4byte _08179C20 - .4byte _08179C34 - .4byte _08179C48 - .4byte _08179C4E - .4byte _08179C60 - .4byte _08179C66 - .4byte _08179C78 - .4byte _08179C98 - .4byte _08179CB0 - .4byte _08179CDC - .4byte _08179CF8 - .4byte _08179CFE - .4byte _08179D18 -_08179BF8: - ldr r4, =gUnknown_0203BD18 - ldr r0, =0x00001084 - bl AllocZeroed - str r0, [r4] - bl SetVBlankHBlankCallbacksToNull - bl clear_scheduled_bg_copies_to_vram - ldr r1, =gMain - movs r2, 0x87 - lsls r2, 3 - adds r1, r2 - b _08179D3A - .pool -_08179C20: - bl ResetPaletteFade - ldr r2, =gPaletteFade - ldrb r0, [r2, 0x8] - movs r1, 0x80 - orrs r0, r1 - b _08179D30 - .pool -_08179C34: - bl ResetSpriteData - ldr r1, =gMain - movs r2, 0x87 - lsls r2, 3 - adds r1, r2 - b _08179D3A - .pool -_08179C48: - bl FreeAllSpritePalettes - b _08179D32 -_08179C4E: - bl AllocateMonSpritesGfx - ldr r1, =gMain - movs r2, 0x87 - lsls r2, 3 - adds r1, r2 - b _08179D3A - .pool -_08179C60: - bl sub_8179D9C - b _08179D32 -_08179C66: - bl sub_8179FAC - ldr r1, =gMain - movs r2, 0x87 - lsls r2, 3 - adds r1, r2 - b _08179D3A - .pool -_08179C78: - ldr r0, =gUnknown_0203BC9C - ldrb r1, [r0] - movs r0, 0x64 - muls r0, r1 - ldr r1, =gPlayerParty - adds r0, r1 - bl sub_8179DF4 - lsls r0, 24 - cmp r0, 0 - beq _08179D64 - b _08179D32 - .pool -_08179C98: - bl sub_817A4A4 - ldr r1, =gUnknown_0203BD18 - ldr r1, [r1] - ldr r2, =0x0000105e - adds r1, r2 - strb r0, [r1] - b _08179D32 - .pool -_08179CB0: - ldr r0, =gUnknown_0203BC9C - ldrb r1, [r0] - movs r0, 0x64 - muls r0, r1 - ldr r1, =gPlayerParty - adds r0, r1 - bl sub_817A358 - ldr r1, =gUnknown_0203BD18 - ldr r1, [r1] - ldr r2, =0x0000105d - adds r1, r2 - strb r0, [r1] - b _08179D32 - .pool -_08179CDC: - movs r0, 0 - movs r1, 0x1 - movs r2, 0x1 - movs r3, 0xE - bl SetWindowBorderStyle - ldr r1, =gMain - movs r2, 0x87 - lsls r2, 3 - adds r1, r2 - b _08179D3A - .pool -_08179CF8: - bl sub_817A168 - b _08179D32 -_08179CFE: - movs r0, 0x1 - negs r0, r0 - movs r1, 0x10 - movs r2, 0 - bl BlendPalettes - ldr r1, =gMain - movs r2, 0x87 - lsls r2, 3 - adds r1, r2 - b _08179D3A - .pool -_08179D18: - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - ldr r2, =gPaletteFade - ldrb r1, [r2, 0x8] - movs r0, 0x7F - ands r0, r1 -_08179D30: - strb r0, [r2, 0x8] -_08179D32: - ldr r1, =gMain - movs r0, 0x87 - lsls r0, 3 - adds r1, r0 -_08179D3A: - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - b _08179D64 - .pool -_08179D4C: - ldr r0, =sub_8179B84 - bl SetVBlankCallback - ldr r0, =sub_8179B68 - bl SetMainCallback2 - movs r0, 0x1 - b _08179D66 - .pool -_08179D64: - movs r0, 0 -_08179D66: - add sp, 0x4 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8179B98 - - thumb_func_start sub_8179D70 -sub_8179D70: @ 8179D70 - push {lr} -_08179D72: - bl sub_81221EC - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08179D96 - bl sub_8179B98 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08179D96 - bl sub_81221AC - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08179D72 -_08179D96: - pop {r0} - bx r0 - thumb_func_end sub_8179D70 - - thumb_func_start sub_8179D9C -sub_8179D9C: @ 8179D9C - push {lr} - bl sub_8121DA0 - movs r0, 0 - bl ResetBgsAndClearDma3BusyFlags - ldr r1, =gUnknown_085F0550 - movs r0, 0 - movs r2, 0x2 - bl InitBgsFromTemplates - ldr r0, =gUnknown_0203BD18 - ldr r1, [r0] - adds r1, 0x48 - movs r0, 0x1 - bl SetBgTilemapBuffer - bl sub_8121E10 - movs r0, 0x1 - bl schedule_bg_copy_tilemap_to_vram - movs r1, 0x82 - lsls r1, 5 - movs r0, 0 - bl SetGpuReg - movs r0, 0 - bl ShowBg - movs r0, 0x1 - bl ShowBg - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - pop {r0} - bx r0 - .pool - thumb_func_end sub_8179D9C - - thumb_func_start sub_8179DF4 -sub_8179DF4: @ 8179DF4 - push {r4-r6,lr} - sub sp, 0x4 - adds r6, r0, 0 - ldr r0, =gUnknown_0203BD18 - ldr r0, [r0] - ldr r1, =0x0000107e - adds r0, r1 - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0x8 - bls _08179E0C - b _08179FA0 -_08179E0C: - lsls r0, 2 - ldr r1, =_08179E24 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08179E24: - .4byte _08179E48 - .4byte _08179E84 - .4byte _08179EC4 - .4byte _08179ED8 - .4byte _08179EEC - .4byte _08179F00 - .4byte _08179F20 - .4byte _08179F44 - .4byte _08179F78 -_08179E48: - adds r0, r6, 0 - movs r1, 0x41 - bl GetMonData - lsls r0, 16 - lsrs r5, r0, 16 - adds r0, r6, 0 - movs r1, 0 - bl GetMonData - adds r4, r0, 0 - lsls r0, r5, 3 - ldr r1, =gMonFrontPicTable - adds r0, r1 - ldr r1, =gMonSpritesGfxPtr - ldr r1, [r1] - ldr r1, [r1, 0x8] - adds r2, r5, 0 - adds r3, r4, 0 - bl HandleLoadSpecialPokePic_2 - ldr r0, =gUnknown_0203BD18 - ldr r1, [r0] - b _08179F5E - .pool -_08179E84: - adds r0, r6, 0 - movs r1, 0x41 - bl GetMonData - lsls r0, 16 - lsrs r5, r0, 16 - adds r0, r6, 0 - movs r1, 0 - bl GetMonData - adds r4, r0, 0 - adds r0, r6, 0 - movs r1, 0x1 - bl GetMonData - adds r1, r0, 0 - adds r0, r5, 0 - adds r2, r4, 0 - bl GetMonSpritePalStructFromOtIdPersonality - adds r4, r0, 0 - bl LoadCompressedObjectPalette - ldrh r0, [r4, 0x4] - movs r1, 0x1 - bl sub_806A068 - ldr r0, =gUnknown_0203BD18 - ldr r1, [r0] - b _08179F5E - .pool -_08179EC4: - ldr r0, =gUnknown_085B26F4 - bl LoadCompressedObjectPic - ldr r0, =gUnknown_0203BD18 - ldr r1, [r0] - b _08179F5E - .pool -_08179ED8: - ldr r0, =gUnknown_085B26FC - bl LoadCompressedObjectPalette - ldr r0, =gUnknown_0203BD18 - ldr r1, [r0] - b _08179F5E - .pool -_08179EEC: - ldr r0, =gUnknown_085F06A0 - bl LoadCompressedObjectPic - ldr r0, =gUnknown_0203BD18 - ldr r1, [r0] - b _08179F5E - .pool -_08179F00: - ldr r0, =gSpecialVar_ItemId - ldrb r0, [r0] - bl sub_8179FEC - ldr r0, =gUnknown_0203BD1C - bl LoadCompressedObjectPalette - ldr r0, =gUnknown_0203BD18 - ldr r1, [r0] - b _08179F5E - .pool -_08179F20: - bl reset_temp_tile_data_buffers - ldr r1, =gUnknown_08D7C440 - movs r0, 0 - str r0, [sp] - movs r0, 0x1 - movs r2, 0 - movs r3, 0 - bl decompress_and_copy_tile_data_to_vram - ldr r0, =gUnknown_0203BD18 - ldr r1, [r0] - b _08179F5E - .pool -_08179F44: - bl free_temp_tile_data_buffers_if_possible - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08179FA0 - ldr r0, =gUnknown_08D9BA44 - ldr r4, =gUnknown_0203BD18 - ldr r1, [r4] - adds r1, 0x48 - bl LZDecompressWram - ldr r1, [r4] -_08179F5E: - ldr r0, =0x0000107e - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _08179FA0 - .pool -_08179F78: - ldr r0, =gUnknown_08D7C9EC - movs r1, 0x20 - movs r2, 0x60 - bl LoadCompressedPalette - ldr r0, =gUnknown_0203BD18 - ldr r0, [r0] - ldr r1, =0x0000107e - adds r0, r1 - movs r1, 0 - strh r1, [r0] - movs r0, 0x1 - b _08179FA2 - .pool -_08179FA0: - movs r0, 0 -_08179FA2: - add sp, 0x4 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8179DF4 - - thumb_func_start sub_8179FAC -sub_8179FAC: @ 8179FAC - push {lr} - ldr r0, =gUnknown_085F0558 - bl InitWindows - bl DeactivateAllTextPrinters - movs r0, 0 - movs r1, 0x1 - movs r2, 0xE0 - bl sub_809882C - ldr r0, =gUnknown_0860F074 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - movs r0, 0 - movs r1, 0 - bl FillWindowPixelBuffer - movs r0, 0 - bl PutWindowTilemap - movs r0, 0 - bl schedule_bg_copy_tilemap_to_vram - pop {r0} - bx r0 - .pool - thumb_func_end sub_8179FAC - - thumb_func_start sub_8179FEC -sub_8179FEC: @ 8179FEC - push {lr} - lsls r0, 24 - ldr r1, =gSaveBlock1Ptr - lsrs r0, 21 - ldr r2, =0x00000848 - adds r0, r2 - ldr r1, [r1] - adds r1, r0 - adds r0, r1, 0 - movs r1, 0 - bl sub_8136F9C - lsls r0, 24 - ldr r2, =gUnknown_0203BD1C - ldr r1, =gUnknown_085F0568 - lsrs r0, 22 - subs r0, 0x4 - adds r0, r1 - ldr r0, [r0] - str r0, [r2] - ldr r0, =0x000039e2 - strh r0, [r2, 0x4] - pop {r0} - bx r0 - .pool - thumb_func_end sub_8179FEC - - thumb_func_start sub_817A030 -sub_817A030: @ 817A030 - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _0817A044 - b _0817A154 -_0817A044: - ldr r0, =gTasks - lsls r2, r4, 2 - adds r1, r2, r4 - lsls r1, 3 - adds r1, r0 - movs r0, 0x8 - ldrsh r3, [r1, r0] - ldr r0, =0x0000010d - adds r5, r2, 0 - cmp r3, r0 - beq _0817A0C8 - cmp r3, r0 - bgt _0817A074 - cmp r3, 0 - beq _0817A088 - cmp r3, 0xFF - beq _0817A0AC - b _0817A104 - .pool -_0817A074: - ldr r0, =0x00000119 - cmp r3, r0 - beq _0817A0E0 - adds r0, 0x10 - cmp r3, r0 - beq _0817A0F8 - b _0817A104 - .pool -_0817A088: - ldr r0, =gUnknown_0203BD18 - ldr r1, [r0] - ldr r2, =0x00001050 - adds r1, r2 - strb r3, [r1] - ldr r0, [r0] - ldr r1, =0x00001058 - adds r0, r1 - strh r3, [r0] - bl sub_817A5CC - b _0817A104 - .pool -_0817A0AC: - ldr r0, =gUnknown_0203BD18 - ldr r0, [r0] - ldr r2, =0x0000105e - adds r0, r2 - ldrb r0, [r0] - ldrb r1, [r1, 0xA] - bl sub_817A4F8 - b _0817A104 - .pool -_0817A0C8: - bl sub_817A56C - ldr r1, =gUnknown_0203BD18 - ldr r1, [r1] - ldr r2, =0x0000105f - adds r1, r2 - strb r0, [r1] - b _0817A104 - .pool -_0817A0E0: - ldr r0, =gUnknown_0203BD18 - ldr r0, [r0] - ldr r1, =0x0000105d - adds r0, r1 - ldrb r0, [r0] - bl sub_817A434 - b _0817A104 - .pool -_0817A0F8: - ldr r0, =sub_817A1C4 - str r0, [r1] - b _0817A154 - .pool -_0817A104: - ldr r0, =gUnknown_0203BD18 - ldr r0, [r0] - ldr r2, =0x00001058 - adds r1, r0, r2 - subs r2, 0x2 - adds r0, r2 - ldrh r1, [r1] - ldrh r0, [r0] - cmp r1, r0 - bcs _0817A128 - bl sub_817A634 - b _0817A138 - .pool -_0817A128: - cmp r1, r0 - bne _0817A138 - ldr r0, =gTasks - adds r1, r5, r4 - lsls r1, 3 - adds r1, r0 - movs r0, 0xFE - strh r0, [r1, 0x8] -_0817A138: - ldr r0, =gUnknown_0203BD18 - ldr r1, [r0] - ldr r0, =0x00001058 - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - ldr r0, =gTasks - adds r1, r5, r4 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] -_0817A154: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_817A030 - - thumb_func_start sub_817A168 -sub_817A168: @ 817A168 - push {lr} - ldr r0, =sub_817A030 - movs r1, 0 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r0, 0 - strh r0, [r1, 0x8] - movs r0, 0x1 - strh r0, [r1, 0xA] - pop {r0} - bx r0 - .pool - thumb_func_end sub_817A168 - - thumb_func_start sub_817A194 -sub_817A194: @ 817A194 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - movs r0, 0 - bl sub_8121F20 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - beq _0817A1B6 - ldr r0, =gTasks - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - adds r1, r0 - ldr r0, =sub_817A320 - str r0, [r1] -_0817A1B6: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_817A194 - - thumb_func_start sub_817A1C4 -sub_817A1C4: @ 817A1C4 - push {r4-r7,lr} - sub sp, 0x10 - lsls r0, 24 - lsrs r7, r0, 24 - ldr r0, =gUnknown_0203BC9C - ldrb r1, [r0] - movs r0, 0x64 - adds r5, r1, 0 - muls r5, r0 - ldr r0, =gPlayerParty - adds r5, r0 - ldr r1, =gSaveBlock1Ptr - ldr r0, =gSpecialVar_ItemId - ldrh r0, [r0] - lsls r0, 3 - ldr r2, =0x00000848 - adds r0, r2 - ldr r4, [r1] - adds r4, r0 - adds r0, r5, 0 - bl GetNature - lsls r0, 24 - lsrs r0, 24 - adds r1, r4, 0 - bl PokeblockGetGain - ldr r6, =gUnknown_0203BC9E - strh r0, [r6] - ldr r1, =gStringVar1 - adds r0, r5, 0 - bl GetMonNickname - ldr r1, =gStringVar2 - adds r0, r4, 0 - bl sub_8137044 - movs r1, 0 - ldrsh r0, [r6, r1] - cmp r0, 0 - bne _0817A248 - ldr r0, =gStringVar4 - ldr r1, =gText_Var1AteTheVar2 - bl StringExpandPlaceholders - b _0817A268 - .pool -_0817A248: - cmp r0, 0 - ble _0817A260 - ldr r0, =gStringVar4 - ldr r1, =gText_Var1HappilyAteVar2 - bl StringExpandPlaceholders - b _0817A268 - .pool -_0817A260: - ldr r0, =gStringVar4 - ldr r1, =gText_Var1DisdainfullyAteVar2 - bl StringExpandPlaceholders -_0817A268: - ldr r2, =gTextFlags - ldrb r0, [r2] - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2] - bl GetPlayerTextSpeed - adds r3, r0, 0 - lsls r3, 24 - lsrs r3, 24 - ldr r2, =gStringVar4 - movs r0, 0 - str r0, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] - movs r0, 0x1 - str r0, [sp, 0x8] - movs r0, 0x3 - str r0, [sp, 0xC] - movs r0, 0 - movs r1, 0x1 - bl AddTextPrinterParametrized - ldr r1, =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r0, r1 - ldr r1, =sub_817A194 - str r1, [r0] - add sp, 0x10 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_817A1C4 - - thumb_func_start sub_817A2C0 -sub_817A2C0: @ 817A2C0 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _0817A304 - bl ResetSpriteData - bl FreeAllSpritePalettes - ldr r0, =gMPlay_BGM - ldr r1, =0x0000ffff - movs r2, 0x80 - lsls r2, 1 - bl m4aMPlayVolumeControl - ldr r0, =gMain - ldr r0, [r0, 0x8] - bl SetMainCallback2 - adds r0, r4, 0 - bl DestroyTask - bl FreeAllWindowBuffers - ldr r0, =gUnknown_0203BD18 - ldr r0, [r0] - bl Free - bl FreeMonSpritesGfx -_0817A304: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_817A2C0 - - thumb_func_start sub_817A320 -sub_817A320: @ 817A320 - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, =sub_817A2C0 - str r1, [r0] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_817A320 - - thumb_func_start sub_817A358 -sub_817A358: @ 817A358 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r5, r0, 0 - movs r1, 0x41 - bl GetMonData - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - ldr r0, =gUnknown_0202499C - movs r1, 0x30 - movs r2, 0x50 - movs r3, 0x2 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldr r0, =gUnknown_0203BD18 - mov r9, r0 - ldr r0, [r0] - ldr r2, =0x00001054 - adds r1, r0, r2 - strh r4, [r1] - ldr r1, =0x0000105b - adds r0, r1 - mov r2, r8 - strb r2, [r0] - adds r0, r5, 0 - bl GetNature - mov r2, r9 - ldr r1, [r2] - ldr r2, =0x0000105a - adds r1, r2 - strb r0, [r1] - ldr r7, =gSprites - mov r1, r8 - lsls r0, r1, 4 - add r0, r8 - lsls r5, r0, 2 - adds r6, r5, r7 - strh r4, [r6, 0x32] - adds r0, r7, 0 - adds r0, 0x1C - adds r0, r5, r0 - ldr r1, =SpriteCallbackDummy - str r1, [r0] - mov r2, r9 - ldr r0, [r2] - ldr r1, =0x00001053 - adds r0, r1 - movs r1, 0x1 - strb r1, [r0] - adds r0, r4, 0 - bl IsPokeSpriteNotFlipped - lsls r0, 24 - cmp r0, 0 - bne _0817A402 - adds r0, r7, 0 - adds r0, 0x10 - adds r0, r5, r0 - ldr r1, =gUnknown_085F05B0 - str r1, [r0] - ldrb r3, [r6, 0x1] - movs r0, 0x3 - orrs r3, r0 - strb r3, [r6, 0x1] - lsrs r1, r3, 6 - ldrb r2, [r6, 0x3] - lsrs r2, 6 - lsls r3, 30 - lsrs r3, 30 - adds r0, r6, 0 - bl CalcCenterToCornerVec - mov r2, r9 - ldr r0, [r2] - ldr r1, =0x00001053 - adds r0, r1 - movs r1, 0 - strb r1, [r0] -_0817A402: - mov r0, r8 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_817A358 - - thumb_func_start sub_817A434 -sub_817A434: @ 817A434 - lsls r0, 24 - lsrs r0, 24 - ldr r3, =gSprites - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r2, r1, r3 - movs r0, 0x30 - strh r0, [r2, 0x20] - movs r0, 0x50 - strh r0, [r2, 0x22] - ldr r0, =0x0000fff8 - strh r0, [r2, 0x2E] - movs r0, 0x1 - strh r0, [r2, 0x30] - adds r3, 0x1C - adds r1, r3 - ldr r0, =sub_817A468 - str r0, [r1] - bx lr - .pool - thumb_func_end sub_817A434 - - thumb_func_start sub_817A468 -sub_817A468: @ 817A468 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x20] - adds r0, 0x4 - strh r0, [r4, 0x20] - ldrh r0, [r4, 0x2E] - ldrh r2, [r4, 0x22] - adds r1, r0, r2 - strh r1, [r4, 0x22] - ldrh r1, [r4, 0x30] - adds r0, r1 - strh r0, [r4, 0x2E] - lsls r0, 16 - cmp r0, 0 - bne _0817A48E - ldrh r0, [r4, 0x32] - movs r1, 0 - bl PlayCry1 -_0817A48E: - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0x9 - bne _0817A49A - ldr r0, =SpriteCallbackDummy - str r0, [r4, 0x1C] -_0817A49A: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_817A468 - - thumb_func_start sub_817A4A4 -sub_817A4A4: @ 817A4A4 - push {r4,r5,lr} - movs r0, 0xBC - movs r1, 0x64 - movs r2, 0x2 - bl sub_8136444 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r5, =gSprites - lsls r3, r4, 4 - adds r3, r4 - lsls r3, 2 - adds r0, r3, r5 - ldrb r2, [r0, 0x1] - movs r1, 0x4 - negs r1, r1 - ands r1, r2 - movs r2, 0x1 - orrs r1, r2 - strb r1, [r0, 0x1] - adds r1, r5, 0 - adds r1, 0x10 - adds r1, r3, r1 - ldr r2, =gUnknown_085F0664 - str r2, [r1] - adds r5, 0x1C - adds r3, r5 - ldr r1, =SpriteCallbackDummy - str r1, [r3] - bl InitSpriteAffineAnim - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_817A4A4 - - thumb_func_start sub_817A4F8 -sub_817A4F8: @ 817A4F8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r5, r1, 0 - lsls r0, 24 - lsrs r7, r0, 24 - lsls r5, 24 - lsrs r5, 24 - ldr r0, =gSprites - mov r8, r0 - lsls r0, r7, 4 - adds r0, r7 - lsls r6, r0, 2 - mov r0, r8 - adds r4, r6, r0 - ldrb r0, [r4, 0x3] - lsls r0, 26 - lsrs r0, 27 - bl FreeOamMatrix - ldrb r0, [r4, 0x1] - movs r1, 0x3 - orrs r0, r1 - strb r0, [r4, 0x1] - cmp r5, 0 - bne _0817A540 - mov r0, r8 - adds r0, 0x10 - adds r0, r6, r0 - ldr r1, =gUnknown_085F0668 - b _0817A548 - .pool -_0817A540: - mov r0, r8 - adds r0, 0x10 - adds r0, r6, r0 - ldr r1, =gUnknown_085F066C -_0817A548: - str r1, [r0] - lsls r0, r7, 4 - adds r0, r7 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - bl InitSpriteAffineAnim - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_817A4F8 - - thumb_func_start sub_817A56C -sub_817A56C: @ 817A56C - push {lr} - ldr r0, =gUnknown_085F06A8 - movs r1, 0xAE - movs r2, 0x54 - movs r3, 0x1 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gSprites - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldr r2, =0x0000fff4 - strh r2, [r1, 0x2E] - movs r2, 0x1 - strh r2, [r1, 0x30] - pop {r1} - bx r1 - .pool - thumb_func_end sub_817A56C - - thumb_func_start sub_817A5A0 -sub_817A5A0: @ 817A5A0 - push {lr} - adds r2, r0, 0 - ldrh r0, [r2, 0x20] - subs r0, 0x4 - strh r0, [r2, 0x20] - ldrh r0, [r2, 0x2E] - ldrh r3, [r2, 0x22] - adds r1, r0, r3 - strh r1, [r2, 0x22] - ldrh r1, [r2, 0x30] - adds r0, r1 - strh r0, [r2, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xA - bne _0817A5C6 - adds r0, r2, 0 - bl DestroySprite -_0817A5C6: - pop {r0} - bx r0 - thumb_func_end sub_817A5A0 - - thumb_func_start sub_817A5CC -sub_817A5CC: @ 817A5CC - push {r4-r7,lr} - ldr r0, =gUnknown_0203BD18 - ldr r1, [r0] - ldr r0, =0x00001056 - adds r3, r1, r0 - movs r0, 0x1 - strh r0, [r3] - ldr r2, =gUnknown_085EFEBC - ldr r7, =0x0000105a - adds r1, r7 - ldrb r0, [r1] - lsls r0, 1 - adds r0, r2 - ldrb r2, [r0] - movs r4, 0 - ldr r5, =gUnknown_085EFF00 - adds r6, r5, 0 - subs r6, 0xA -_0817A5F0: - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 2 - adds r0, r1, r6 - ldrh r0, [r0] - ldrh r7, [r3] - adds r0, r7 - strh r0, [r3] - adds r1, r5 - movs r7, 0 - ldrsh r0, [r1, r7] - cmp r0, 0x1 - beq _0817A61A - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r4, 0x7 - bls _0817A5F0 -_0817A61A: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_817A5CC - - thumb_func_start sub_817A634 -sub_817A634: @ 817A634 - push {r4,lr} - ldr r0, =gUnknown_0203BD18 - ldr r4, [r0] - ldr r1, =0x00001050 - adds r0, r4, r1 - ldrb r0, [r0] - cmp r0, 0x5A - bls _0817A646 - b _0817A90E -_0817A646: - lsls r0, 2 - ldr r1, =_0817A65C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0817A65C: - .4byte _0817A7C8 - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A818 - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A858 - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A8A2 - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A8FC - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E - .4byte _0817A90E -_0817A7C8: - ldr r1, =gUnknown_085EFEBC - ldr r2, =0x0000105a - adds r0, r4, r2 - ldrb r0, [r0] - lsls r0, 1 - adds r0, r1 - ldrb r1, [r0] - ldr r3, =0x00001051 - adds r0, r4, r3 - strb r1, [r0] - ldr r1, =0x0000105b - adds r0, r4, r1 - ldrb r0, [r0] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r0, =gSprites - adds r1, r0 - adds r0, r4, 0 - stm r0!, {r1} - movs r2, 0x44 - bl memcpy - ldr r2, =0x00001050 - adds r1, r4, r2 - movs r0, 0xA - strb r0, [r1] - b _0817A90E - .pool -_0817A818: - bl sub_817A91C - ldr r1, =gUnknown_085EFEBC - ldr r3, =0x0000105a - adds r0, r4, r3 - ldrb r0, [r0] - lsls r0, 1 - adds r1, 0x1 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _0817A850 - ldr r2, [r4] - ldrb r0, [r2, 0x1] - movs r1, 0x3 - orrs r0, r1 - strb r0, [r2, 0x1] - ldr r2, [r4] - ldrb r1, [r2, 0x3] - movs r0, 0x3F - negs r0, r0 - ands r0, r1 - strb r0, [r2, 0x3] - ldr r0, [r4] - ldr r1, =gUnknown_085F04FC - str r1, [r0, 0x10] - bl InitSpriteAffineAnim -_0817A850: - ldr r0, =0x00001050 - adds r1, r4, r0 - movs r0, 0x32 - strb r0, [r1] -_0817A858: - ldr r1, =gUnknown_085EFEBC - ldr r2, =0x0000105a - adds r0, r4, r2 - ldrb r0, [r0] - lsls r0, 1 - adds r1, 0x1 - adds r2, r0, r1 - ldrb r1, [r2] - cmp r1, 0 - beq _0817A8C8 - ldr r3, =0x00001053 - adds r0, r4, r3 - ldrb r0, [r0] - cmp r0, 0 - bne _0817A898 - ldr r0, [r4] - adds r1, 0xA - lsls r1, 24 - lsrs r1, 24 - bl StartSpriteAffineAnim - b _0817A8C8 - .pool -_0817A898: - ldr r0, [r4] - ldrb r1, [r2] - bl StartSpriteAffineAnim - b _0817A8C8 -_0817A8A2: - bl sub_817A9E4 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0817A90E - ldr r1, =0x00001072 - adds r0, r4, r1 - movs r2, 0 - ldrsh r0, [r0, r2] - cmp r0, 0 - bne _0817A8E0 - ldr r3, =0x00001051 - adds r1, r4, r3 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - bl sub_817A91C -_0817A8C8: - ldr r0, =0x00001050 - adds r1, r4, r0 - movs r0, 0x3C - strb r0, [r1] - b _0817A90E - .pool -_0817A8E0: - ldr r0, [r4] - ldrb r0, [r0, 0x3] - lsls r0, 26 - lsrs r0, 27 - bl FreeOamMatrix - ldr r2, =0x00001050 - adds r1, r4, r2 - movs r0, 0x46 - strb r0, [r1] - b _0817A90E - .pool -_0817A8FC: - bl sub_817AA3C - ldr r3, =0x00001051 - adds r0, r4, r3 - movs r1, 0 - strb r1, [r0] - ldr r2, =0x00001050 - adds r0, r4, r2 - strb r1, [r0] -_0817A90E: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_817A634 - - thumb_func_start sub_817A91C -sub_817A91C: @ 817A91C - push {r4-r7,lr} - ldr r0, =gUnknown_0203BD18 - ldr r5, [r0] - movs r4, 0 - movs r0, 0x83 - lsls r0, 5 - adds r7, r5, r0 - ldr r1, =gUnknown_085EFEEE - mov r12, r1 - ldr r2, =0x00001051 - adds r6, r5, r2 -_0817A932: - lsls r2, r4, 1 - adds r3, r7, r2 - ldrb r1, [r6] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 2 - adds r2, r0 - add r2, r12 - ldrh r0, [r2] - strh r0, [r3] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x9 - bls _0817A932 - ldr r0, =0x00001068 - adds r6, r5, r0 - movs r1, 0 - ldrsh r0, [r6, r1] - cmp r0, 0 - beq _0817A9DC - movs r2, 0x83 - lsls r2, 5 - adds r4, r5, r2 - movs r1, 0 - ldrsh r0, [r4, r1] - adds r2, 0x4 - adds r1, r5, r2 - movs r2, 0 - ldrsh r1, [r1, r2] - bl Sin - ldr r2, =0x00001074 - adds r1, r5, r2 - strh r0, [r1] - movs r1, 0 - ldrsh r0, [r4, r1] - subs r2, 0xE - adds r1, r5, r2 - movs r2, 0 - ldrsh r1, [r1, r2] - bl Cos - ldr r2, =0x00001076 - adds r1, r5, r2 - strh r0, [r1] - ldrh r0, [r6] - ldr r1, =0x00001078 - adds r4, r5, r1 - strh r0, [r4] - ldr r0, [r5] - ldrh r1, [r0, 0x24] - adds r2, 0x4 - adds r0, r5, r2 - strh r1, [r0] - ldr r0, [r5] - ldrh r1, [r0, 0x26] - adds r2, 0x2 - adds r0, r5, r2 - strh r1, [r0] - bl sub_817AB68 - ldrh r0, [r4] - strh r0, [r6] - bl sub_817AA54 - ldrh r0, [r4] - strh r0, [r6] - movs r0, 0 - b _0817A9DE - .pool -_0817A9DC: - movs r0, 0x1 -_0817A9DE: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_817A91C - - thumb_func_start sub_817A9E4 -sub_817A9E4: @ 817A9E4 - push {r4,r5,lr} - ldr r0, =gUnknown_0203BD18 - ldr r2, [r0] - ldr r1, =0x00001078 - adds r0, r2, r1 - ldr r5, =0x00001068 - adds r4, r2, r5 - ldrh r1, [r0] - ldrh r0, [r4] - subs r1, r0 - lsls r1, 16 - ldr r3, [r2] - lsrs r1, 15 - movs r5, 0x85 - lsls r5, 4 - adds r0, r2, r5 - adds r0, r1 - ldrh r0, [r0] - strh r0, [r3, 0x24] - ldr r3, [r2] - movs r0, 0xC5 - lsls r0, 4 - adds r2, r0 - adds r2, r1 - ldrh r0, [r2] - strh r0, [r3, 0x26] - ldrh r0, [r4] - subs r0, 0x1 - strh r0, [r4] - lsls r0, 16 - cmp r0, 0 - beq _0817AA34 - movs r0, 0 - b _0817AA36 - .pool -_0817AA34: - movs r0, 0x1 -_0817AA36: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_817A9E4 - - thumb_func_start sub_817AA3C -sub_817AA3C: @ 817AA3C - push {lr} - ldr r0, =gUnknown_0203BD18 - ldr r0, [r0] - ldr r0, [r0] - bl FreeSpriteOamMatrix - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_817AA3C - - thumb_func_start sub_817AA54 -sub_817AA54: @ 817AA54 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x14 - ldr r0, =gUnknown_0203BD18 - ldr r7, [r0] - ldr r1, =0x00001070 - adds r0, r7, r1 - ldrh r0, [r0] - mov r9, r0 - ldr r2, =0x00001078 - adds r0, r7, r2 - ldrh r0, [r0] - mov r3, r9 - subs r0, r3 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - ldr r4, =0x0000107a - adds r1, r7, r4 - subs r2, 0xC - adds r0, r7, r2 - ldrh r0, [r0] - ldrh r1, [r1] - adds r0, r1 - lsls r0, 16 - lsrs r0, 16 - str r0, [sp] - ldr r3, =0x0000107c - adds r1, r7, r3 - subs r4, 0xC - adds r0, r7, r4 - ldrh r0, [r0] - ldrh r1, [r1] - adds r0, r1 - lsls r0, 16 - lsrs r0, 16 - str r0, [sp, 0x4] - movs r5, 0 - mov r0, r8 - subs r0, 0x1 - cmp r5, r0 - bge _0817AB20 - ldr r1, [sp] - lsls r0, r1, 16 - asrs r0, 16 - str r0, [sp, 0x8] - ldr r2, [sp, 0x4] - lsls r0, r2, 16 - asrs r0, 16 - mov r10, r0 -_0817AABE: - mov r3, r9 - adds r0, r3, r5 - lsls r0, 1 - movs r4, 0x85 - lsls r4, 4 - adds r2, r7, r4 - adds r2, r0 - ldrh r6, [r2] - ldr r3, [sp, 0x8] - subs r1, r6, r3 - movs r4, 0xC5 - lsls r4, 4 - adds r3, r7, r4 - adds r3, r0 - ldrh r4, [r3] - mov r0, r10 - subs r4, r0 - lsls r4, 16 - lsrs r4, 16 - lsls r1, 16 - asrs r1, 16 - adds r5, 0x1 - adds r0, r1, 0 - muls r0, r5 - mov r1, r8 - str r2, [sp, 0xC] - str r3, [sp, 0x10] - bl __divsi3 - subs r6, r0 - ldr r2, [sp, 0xC] - strh r6, [r2] - lsls r4, 16 - asrs r4, 16 - adds r0, r4, 0 - muls r0, r5 - mov r1, r8 - bl __divsi3 - ldr r3, [sp, 0x10] - ldrh r1, [r3] - subs r1, r0 - strh r1, [r3] - lsls r5, 16 - lsrs r5, 16 - mov r0, r8 - subs r0, 0x1 - cmp r5, r0 - blt _0817AABE -_0817AB20: - mov r0, r9 - add r0, r8 - subs r0, 0x1 - lsls r0, 1 - movs r2, 0x85 - lsls r2, 4 - adds r1, r7, r2 - adds r1, r0 - mov r3, sp - ldrh r3, [r3] - strh r3, [r1] - movs r4, 0xC5 - lsls r4, 4 - adds r1, r7, r4 - adds r1, r0 - mov r0, sp - ldrh r0, [r0, 0x4] - strh r0, [r1] - add sp, 0x14 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_817AA54 - - thumb_func_start sub_817AB68 -sub_817AB68: @ 817AB68 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - ldr r0, =gUnknown_0203BD18 - ldr r6, [r0] - movs r0, 0 - str r0, [sp] - ldr r1, =0x0000107a - adds r0, r6, r1 - ldr r2, =0x00001074 - adds r1, r6, r2 - ldrh r2, [r0] - ldrh r0, [r1] - subs r2, r0 - ldr r3, =0x0000107c - adds r0, r6, r3 - ldr r1, =0x00001076 - adds r3, r6, r1 - ldrh r1, [r0] - ldrh r0, [r3] - subs r1, r0 - ldr r3, =0x00001068 - adds r3, r6 - mov r9, r3 - movs r0, 0x83 - lsls r0, 5 - adds r0, r6 - mov r8, r0 - lsls r2, 16 - asrs r2, 16 - str r2, [sp, 0x4] - lsls r1, 16 - asrs r1, 16 - mov r10, r1 -_0817ABB2: - ldr r1, =0x0000106a - adds r0, r6, r1 - movs r2, 0 - ldrsh r0, [r0, r2] - cmp r0, 0 - bge _0817ABC0 - negs r0, r0 -_0817ABC0: - lsls r0, 16 - ldr r3, =0x00001066 - adds r7, r6, r3 - lsrs r0, 16 - ldrh r1, [r7] - adds r0, r1 - lsls r4, r0, 16 - strh r0, [r7] - ldr r2, =0x00001064 - adds r0, r6, r2 - ldrh r2, [r0] - movs r3, 0 - ldrsh r0, [r0, r3] - cmp r0, 0 - bge _0817ABE2 - movs r0, 0x1 - str r0, [sp] -_0817ABE2: - ldr r1, =0x00001078 - adds r0, r6, r1 - ldrh r0, [r0] - mov r3, r9 - ldrh r1, [r3] - subs r0, r1 - lsls r0, 16 - lsrs r5, r0, 16 - cmp r1, 0 - beq _0817ACB8 - ldr r0, [sp] - cmp r0, 0 - bne _0817AC54 - mov r1, r8 - movs r3, 0 - ldrsh r0, [r1, r3] - lsrs r4, 24 - adds r1, r2, r4 - lsls r1, 16 - asrs r1, 16 - bl Sin - lsls r5, 1 - movs r2, 0x85 - lsls r2, 4 - adds r1, r6, r2 - adds r1, r5 - ldr r3, [sp, 0x4] - adds r0, r3, r0 - strh r0, [r1] - mov r1, r8 - movs r2, 0 - ldrsh r0, [r1, r2] - ldrh r1, [r7] - adds r1, r4 - b _0817AC80 - .pool -_0817AC54: - mov r1, r8 - movs r3, 0 - ldrsh r0, [r1, r3] - lsrs r4, 24 - subs r1, r2, r4 - lsls r1, 16 - asrs r1, 16 - bl Sin - lsls r5, 1 - movs r2, 0x85 - lsls r2, 4 - adds r1, r6, r2 - adds r1, r5 - ldr r3, [sp, 0x4] - adds r0, r3, r0 - strh r0, [r1] - mov r1, r8 - movs r2, 0 - ldrsh r0, [r1, r2] - ldrh r1, [r7] - subs r1, r4 -_0817AC80: - lsls r1, 16 - asrs r1, 16 - bl Cos - movs r3, 0xC5 - lsls r3, 4 - adds r1, r6, r3 - adds r1, r5 - add r0, r10 - strh r0, [r1] - ldr r1, =0x00001062 - adds r0, r6, r1 - ldrh r0, [r0] - mov r2, r8 - ldrh r2, [r2] - adds r0, r2 - movs r1, 0xFF - ands r0, r1 - mov r3, r8 - strh r0, [r3] - mov r1, r9 - ldrh r0, [r1] - subs r0, 0x1 - strh r0, [r1] - b _0817ABB2 - .pool -_0817ACB8: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_817AB68 - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/pokemon_icon.s b/asm/pokemon_icon.s index 6009bd3f3..79838f6f9 100755 --- a/asm/pokemon_icon.s +++ b/asm/pokemon_icon.s @@ -156,7 +156,7 @@ mon_icon_convert_unown_species_id: @ 80D2E08 cmp r2, 0xC9 bne _080D2E32 adds r0, r1, 0 - bl mon_icon_personality_to_unown_id + bl GetUnownLetterByPersonality lsls r0, 16 lsrs r0, 16 cmp r0, 0 @@ -186,8 +186,8 @@ _080D2E40: bx r1 thumb_func_end mon_icon_convert_unown_species_id - thumb_func_start mon_icon_personality_to_unown_id -mon_icon_personality_to_unown_id: @ 80D2E48 + thumb_func_start GetUnownLetterByPersonality +GetUnownLetterByPersonality: @ 80D2E48 push {lr} adds r2, r0, 0 cmp r2, 0 @@ -219,7 +219,7 @@ _080D2E7E: _080D2E80: pop {r1} bx r1 - thumb_func_end mon_icon_personality_to_unown_id + thumb_func_end GetUnownLetterByPersonality thumb_func_start sub_80D2E84 sub_80D2E84: @ 80D2E84 @@ -229,7 +229,7 @@ sub_80D2E84: @ 80D2E84 lsrs r4, r0, 16 adds r0, r4, 0 mov r1, sp - bl sub_80D45E8 + bl MailSpeciesToSpecies lsls r0, 16 lsrs r0, 16 cmp r0, 0xC9 diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index c30cd7c28..1b93496a7 100755 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -2201,7 +2201,7 @@ _080C83CC: ldr r1, =0x00000ce6 adds r0, r1 ldrh r0, [r0] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _080C83F4 @@ -2304,7 +2304,7 @@ _080C84C8: ldr r1, =0x00000ce6 adds r0, r1 ldrh r0, [r0] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _080C84F8 @@ -2874,7 +2874,7 @@ _080C8A0C: ldr r2, =0x00000ce6 adds r0, r2 ldrh r0, [r0] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 bne _080C8A8C @@ -2913,7 +2913,7 @@ _080C8A7C: ldr r2, =0x00000ce6 adds r0, r1, r2 ldrh r0, [r0] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _080C8A98 @@ -3409,7 +3409,7 @@ _080C8F0C: adds r0, 0x1 strb r0, [r1] _080C8F22: - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -3661,7 +3661,7 @@ _080C914E: ldr r1, =0x00000ce6 adds r0, r1 ldrh r0, [r0] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 bne _080C9168 @@ -3943,7 +3943,7 @@ _080C93E4: ldr r1, =0x00000ce6 adds r0, r1 ldrh r0, [r0] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 bne _080C9404 @@ -4133,7 +4133,7 @@ _080C9584: b _080C9664 .pool _080C95A4: - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -4927,7 +4927,7 @@ _080C9C78: b _080C9CAA .pool _080C9C8C: - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -5058,7 +5058,7 @@ _080C9DAC: b _080C9DE0 .pool _080C9DC0: - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -16168,7 +16168,7 @@ sub_80CFB44: @ 80CFB44 .pool _080CFB8C: ldrh r0, [r1] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 bne _080CFBA4 @@ -16197,7 +16197,7 @@ _080CFBAC: .pool _080CFBCC: ldrh r0, [r1] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index f0628ebee..5ae458d6d 100755 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -2351,7 +2351,7 @@ _081C51D6: thumb_func_start sub_81C51DC sub_81C51DC: @ 81C51DC push {lr} - bl sub_8121DA0 + bl ResetVramOamAndBgCntRegs movs r0, 0 bl ResetBgsAndClearDma3BusyFlags ldr r1, =gUnknown_0861F2B4 @@ -2363,7 +2363,7 @@ sub_81C51DC: @ 81C51DC adds r1, 0x4 movs r0, 0x2 bl SetBgTilemapBuffer - bl sub_8121E10 + bl ResetAllBgsCoordinates movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram movs r1, 0x82 @@ -2460,7 +2460,7 @@ _081C52DC: b _081C5308 .pool _081C52F0: - bl sub_8122328 + bl LoadListMenuArrowsGfx ldr r0, [r4] ldr r1, =0x00000984 adds r0, r1 @@ -2559,7 +2559,7 @@ _081C5382: movs r0, 0x2 negs r0, r0 str r0, [r1] - ldr r2, =gUnknown_03006310 + ldr r2, =gMultiuseListMenuTemplate adds r1, r2, 0 ldr r0, =gUnknown_0861F2C0 ldm r0!, {r4,r6,r7} @@ -2918,7 +2918,7 @@ sub_81C56F8: @ 81C56F8 lsls r4, 3 ldr r0, =gTasks + 0x8 adds r4, r0 - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate ldr r2, =gUnknown_0203CF30 ldrh r1, [r2, 0x8] ldrh r2, [r2, 0x6] @@ -3545,7 +3545,7 @@ _081C5C12: adds r1, r4, 0 adds r1, 0x8 adds r2, r4, 0x6 - bl get_coro_args_x18_x1A + bl sub_81AE860 ldrh r1, [r4, 0x8] ldrh r0, [r4, 0x6] adds r1, r0 @@ -3565,14 +3565,14 @@ _081C5C12: .pool _081C5C5C: ldrb r0, [r7] - bl ListMenuHandleInput + bl ListMenuHandleInputGetItemId adds r6, r0, 0 ldrb r0, [r7] ldr r1, =gUnknown_0203CF38 mov r8, r1 mov r2, r8 subs r2, 0x2 - bl get_coro_args_x18_x1A + bl sub_81AE860 movs r0, 0x2 negs r0, r0 cmp r6, r0 @@ -4207,7 +4207,7 @@ sub_81C61E0: @ 81C61E0 cmp r0, 0x3 beq _081C620C ldrh r0, [r4] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -4646,7 +4646,7 @@ sub_81C65CC: @ 81C65CC bl sub_81C5924 bl sub_81C59BC bl sub_81C5314 - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate ldrh r1, [r6] ldrh r2, [r7] bl ListMenuInit @@ -4673,7 +4673,7 @@ sub_81C6648: @ 81C6648 bl sub_81C61A8 ldr r5, =gSpecialVar_ItemId ldrh r0, [r5] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -4953,18 +4953,18 @@ sub_81C68B0: @ 81C68B0 ldrb r0, [r4] ldr r1, =gUnknown_0203CF38 subs r2, r1, 0x2 - bl get_coro_args_x18_x1A + bl sub_81AE860 b _081C6940 .pool _081C68F8: ldrb r0, [r4] - bl ListMenuHandleInput + bl ListMenuHandleInputGetItemId adds r6, r0, 0 ldrb r0, [r4] ldr r4, =gUnknown_0203CF38 subs r2, r4, 0x2 adds r1, r4, 0 - bl get_coro_args_x18_x1A + bl sub_81AE860 movs r0, 0 bl sub_81C7028 subs r4, 0x8 @@ -5066,7 +5066,7 @@ _081C69A8: strh r0, [r1, 0x6] _081C69E0: bl sub_81C5314 - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate ldrh r1, [r7] mov r3, r8 ldrh r2, [r3] @@ -5124,7 +5124,7 @@ sub_81C6A14: @ 81C6A14 strh r0, [r1, 0x6] _081C6A5E: bl sub_81C5314 - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate ldrh r1, [r5] ldrh r2, [r7] bl ListMenuInit diff --git a/asm/pokenav.s b/asm/pokenav.s index 532d7599b..de7b93c5f 100755 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -8089,7 +8089,7 @@ _081CB0C0: thumb_func_start sub_81CB0C8 sub_81CB0C8: @ 81CB0C8 push {lr} - ldr r1, =gUnknown_085500A4 + ldr r1, =gRematchTable lsls r0, 4 adds r0, r1 ldrh r2, [r0, 0xA] @@ -20738,7 +20738,7 @@ _081D15B6: thumb_func_start sub_81D15BC sub_81D15BC: @ 81D15BC - ldr r1, =gUnknown_085500A4 + ldr r1, =gRematchTable lsls r0, 4 adds r0, r1 ldrh r0, [r0] @@ -20751,7 +20751,7 @@ sub_81D15CC: @ 81D15CC push {lr} adds r3, r0, 0 movs r1, 0 - ldr r2, =gUnknown_085500A4 + ldr r2, =gRematchTable _081D15D4: ldrh r0, [r2] cmp r0, r3 @@ -21440,7 +21440,7 @@ _081D1A24: cmp r0, 0 bne _081D1A1C adds r0, r7, 0 - bl sub_80B2318 + bl CountBattledRematchTeams lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 @@ -21921,7 +21921,7 @@ sub_81D1DC0: @ 81D1DC0 ldr r7, =gUnknown_0203CF4C ldr r0, =gText_Cancel2 mov r12, r0 - ldr r4, =gUnknown_03006310 + ldr r4, =gMultiuseListMenuTemplate ldr r1, =gUnknown_0203CF48 mov r8, r1 ldr r2, =sub_81D1E7C @@ -23376,7 +23376,7 @@ sub_81D28C8: @ 81D28C8 push {r4-r7,lr} lsls r1, 16 lsrs r4, r1, 16 - ldr r3, =gUnknown_03006310 + ldr r3, =gMultiuseListMenuTemplate adds r2, r3, 0 ldr r1, =gUnknown_08625548 ldm r1!, {r5-r7} @@ -30343,8 +30343,8 @@ _081D6176: .pool thumb_func_end sub_81D6134 - thumb_func_start battle_init -battle_init: @ 81D6180 + thumb_func_start sub_81D6180 +sub_81D6180: @ 81D6180 lsls r0, 24 ldr r1, =gSaveBlock2Ptr ldr r1, [r1] @@ -30355,7 +30355,7 @@ battle_init: @ 81D6180 ldrh r0, [r1] bx lr .pool - thumb_func_end battle_init + thumb_func_end sub_81D6180 thumb_func_start GetTrainerHillTrainerFlag @ u8 GetTrainerHillTrainerFlag(u8 fieldObjectId) diff --git a/asm/rayquaza_scene.s b/asm/rayquaza_scene.s index f9936f1ca..58380a354 100755 --- a/asm/rayquaza_scene.s +++ b/asm/rayquaza_scene.s @@ -1066,7 +1066,7 @@ sub_81D6FD0: @ 81D6FD0 thumb_func_start sub_81D6FE0 sub_81D6FE0: @ 81D6FE0 push {r4,lr} - bl sub_8121DA0 + bl ResetVramOamAndBgCntRegs movs r0, 0 bl ResetBgsAndClearDma3BusyFlags ldr r1, =gUnknown_0862A888 @@ -1088,7 +1088,7 @@ sub_81D6FE0: @ 81D6FE0 adds r1, r0 movs r0, 0x2 bl SetBgTilemapBuffer - bl sub_8121E10 + bl ResetAllBgsCoordinates movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x1 @@ -2758,7 +2758,7 @@ _081D7E08: thumb_func_start sub_81D7E10 sub_81D7E10: @ 81D7E10 push {r4,lr} - bl sub_8121DA0 + bl ResetVramOamAndBgCntRegs movs r0, 0 bl ResetBgsAndClearDma3BusyFlags ldr r1, =gUnknown_0862AA54 @@ -2780,7 +2780,7 @@ sub_81D7E10: @ 81D7E10 adds r1, r0 movs r0, 0x2 bl SetBgTilemapBuffer - bl sub_8121E10 + bl ResetAllBgsCoordinates movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x1 @@ -3292,7 +3292,7 @@ _081D829A: thumb_func_start sub_81D82B0 sub_81D82B0: @ 81D82B0 push {r4,lr} - bl sub_8121DA0 + bl ResetVramOamAndBgCntRegs movs r0, 0 bl ResetBgsAndClearDma3BusyFlags ldr r1, =gUnknown_0862AACC @@ -3319,7 +3319,7 @@ sub_81D82B0: @ 81D82B0 adds r1, r0 movs r0, 0x3 bl SetBgTilemapBuffer - bl sub_8121E10 + bl ResetAllBgsCoordinates movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x1 @@ -3899,7 +3899,7 @@ _081D8818: thumb_func_start sub_81D8828 sub_81D8828: @ 81D8828 push {r4,lr} - bl sub_8121DA0 + bl ResetVramOamAndBgCntRegs movs r0, 0 bl ResetBgsAndClearDma3BusyFlags ldr r1, =gUnknown_0862AB44 @@ -3926,7 +3926,7 @@ sub_81D8828: @ 81D8828 adds r1, r0 movs r0, 0x3 bl SetBgTilemapBuffer - bl sub_8121E10 + bl ResetAllBgsCoordinates movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x1 @@ -4354,7 +4354,7 @@ _081D8C26: thumb_func_start sub_81D8C38 sub_81D8C38: @ 81D8C38 push {r4,lr} - bl sub_8121DA0 + bl ResetVramOamAndBgCntRegs movs r0, 0 bl ResetBgsAndClearDma3BusyFlags ldr r1, =gUnknown_0862AD08 @@ -4376,7 +4376,7 @@ sub_81D8C38: @ 81D8C38 adds r1, r0 movs r0, 0x2 bl SetBgTilemapBuffer - bl sub_8121E10 + bl ResetAllBgsCoordinates movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x1 diff --git a/asm/record_mixing.s b/asm/record_mixing.s index e7d7c8a38..f4271556c 100644 --- a/asm/record_mixing.s +++ b/asm/record_mixing.s @@ -3650,7 +3650,7 @@ _080E8A78: beq _080E8A90 mov r0, r8 movs r1, 0xFC - bl sub_81DB4DC + bl PadNameString _080E8A90: ldrb r1, [r7] lsrs r1, 4 diff --git a/asm/rom6.s b/asm/rom6.s index 430ed7ee9..e3145fb8a 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -447,12326 +447,5 @@ _081357EE: bx r0 .pool thumb_func_end sub_81357BC - - thumb_func_start sub_81357FC -sub_81357FC: @ 81357FC - push {r4-r6,lr} - adds r4, r0, 0 - adds r6, r1, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r5, =gUnknown_0203AB50 - ldr r0, =0x00000e88 - bl Alloc - str r0, [r5] - ldr r2, =0x00000809 - adds r0, r2 - movs r3, 0 - strb r4, [r0] - ldr r0, [r5] - movs r4, 0x80 - lsls r4, 4 - adds r1, r0, r4 - str r3, [r1] - ldr r1, =0x00000e7c - adds r0, r1 - movs r1, 0xFF - strb r1, [r0] - ldr r0, [r5] - ldr r4, =0x00000e7d - adds r0, r4 - strb r3, [r0] - ldr r0, =gUnknown_0203AB48 - str r6, [r0] - ldr r5, [r5] - adds r2, r5, r2 - ldrb r2, [r2] - cmp r2, 0x2 - beq _08135888 - cmp r2, 0x2 - bgt _08135864 - cmp r2, 0x1 - beq _0813586A - b _081358C0 - .pool -_08135864: - cmp r2, 0x3 - beq _081358A4 - b _081358C0 -_0813586A: - ldr r0, =0x00000804 - adds r1, r5, r0 - ldr r0, =gUnknown_085B269B - str r0, [r1] - ldr r4, =0x00000808 - adds r1, r5, r4 - movs r0, 0x2 - b _081358D2 - .pool -_08135888: - ldr r1, =0x00000804 - adds r0, r5, r1 - ldr r1, =gUnknown_085B269D - str r1, [r0] - ldr r4, =0x00000808 - adds r0, r5, r4 - strb r2, [r0] - b _081358D4 - .pool -_081358A4: - ldr r0, =0x00000804 - adds r1, r5, r0 - ldr r0, =gUnknown_085B269F - str r0, [r1] - ldr r4, =0x00000808 - adds r1, r5, r4 - movs r0, 0x2 - b _081358D2 - .pool -_081358C0: - ldr r0, =gUnknown_0203AB50 - ldr r1, [r0] - ldr r0, =0x00000804 - adds r2, r1, r0 - ldr r0, =gUnknown_085B2698 - str r0, [r2] - ldr r4, =0x00000808 - adds r1, r4 - movs r0, 0x3 -_081358D2: - strb r0, [r1] -_081358D4: - ldr r0, =sub_813594C - bl SetMainCallback2 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81357FC - - thumb_func_start sub_81358F4 -sub_81358F4: @ 81358F4 - push {lr} - ldr r1, =SetCB2ToReshowScreenAfterMenu2 - movs r0, 0x1 - bl sub_81357FC - pop {r0} - bx r0 - .pool - thumb_func_end sub_81358F4 - - thumb_func_start sub_8135908 -sub_8135908: @ 8135908 - push {lr} - ldr r1, =c2_exit_to_overworld_2_switch - movs r0, 0x2 - bl sub_81357FC - pop {r0} - bx r0 - .pool - thumb_func_end sub_8135908 - - thumb_func_start sub_813591C -sub_813591C: @ 813591C - push {lr} - bl RunTasks - bl AnimateSprites - bl BuildOamBuffer - bl do_scheduled_bg_tilemap_copies_to_vram - bl UpdatePaletteFade - pop {r0} - bx r0 - thumb_func_end sub_813591C - - thumb_func_start sub_8135938 -sub_8135938: @ 8135938 - push {lr} - bl LoadOam - bl ProcessSpriteCopyRequests - bl TransferPlttBuffer - pop {r0} - bx r0 - thumb_func_end sub_8135938 - - thumb_func_start sub_813594C -sub_813594C: @ 813594C - push {lr} -_0813594E: - bl sub_81221EC - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08135972 - bl sub_8135978 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08135972 - bl sub_81221AC - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0813594E -_08135972: - pop {r0} - bx r0 - thumb_func_end sub_813594C - - thumb_func_start sub_8135978 -sub_8135978: @ 8135978 - push {r4,lr} - sub sp, 0x4 - ldr r0, =gMain - movs r1, 0x87 - lsls r1, 3 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0x12 - bls _0813598C - b _08135BB8 -_0813598C: - lsls r0, 2 - ldr r1, =_081359A0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_081359A0: - .4byte _081359EC - .4byte _081359F6 - .4byte _08135A08 - .4byte _08135A0E - .4byte _08135A30 - .4byte _08135A36 - .4byte _08135A54 - .4byte _08135A70 - .4byte _08135A8C - .4byte _08135A9A - .4byte _08135AC4 - .4byte _08135ADC - .4byte _08135AFC - .4byte _08135B02 - .4byte _08135B14 - .4byte _08135B1A - .4byte _08135B64 - .4byte _08135B6A - .4byte _08135B84 -_081359EC: - bl SetVBlankHBlankCallbacksToNull - bl clear_scheduled_bg_copies_to_vram - b _08135B9E -_081359F6: - bl remove_some_task - ldr r1, =gMain - movs r0, 0x87 - lsls r0, 3 - adds r1, r0 - b _08135BA6 - .pool -_08135A08: - bl FreeAllSpritePalettes - b _08135B9E -_08135A0E: - bl ResetPaletteFade - ldr r2, =gPaletteFade - ldrb r0, [r2, 0x8] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r2, 0x8] - ldr r1, =gMain - movs r0, 0x87 - lsls r0, 3 - adds r1, r0 - b _08135BA6 - .pool -_08135A30: - bl ResetSpriteData - b _08135B9E -_08135A36: - ldr r0, =gUnknown_0203AB50 - ldr r0, [r0] - ldr r1, =0x00000809 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0x1 - bne _08135A46 - b _08135B9E -_08135A46: - bl ResetTasks - b _08135B9E - .pool -_08135A54: - bl sub_8135BDC - ldr r0, =gUnknown_0203AB50 - ldr r0, [r0] - ldr r1, =0x00000e7e - adds r0, r1 - movs r1, 0 - strh r1, [r0] - b _08135B9E - .pool -_08135A70: - bl sub_8135C38 - lsls r0, 24 - cmp r0, 0 - bne _08135A7C - b _08135BD0 -_08135A7C: - ldr r1, =gMain - movs r0, 0x87 - lsls r0, 3 - adds r1, r0 - b _08135BA6 - .pool -_08135A8C: - bl sub_813625C - bl sub_81362E0 - bl sub_8136344 - b _08135B9E -_08135A9A: - movs r0, 0x38 - movs r1, 0x40 - movs r2, 0 - bl sub_8136444 - ldr r1, =gUnknown_0203AB50 - ldr r1, [r1] - ldr r2, =0x00000e74 - adds r1, r2 - strb r0, [r1] - ldr r1, =gMain - movs r0, 0x87 - lsls r0, 3 - adds r1, r0 - b _08135BA6 - .pool -_08135AC4: - ldr r0, =gUnknown_0203AB50 - ldr r0, [r0] - ldr r1, =0x00000e75 - adds r0, r1 - movs r1, 0x7 - bl sub_8122344 - b _08135B9E - .pool -_08135ADC: - ldr r0, =gUnknown_0203AB48 - ldrh r0, [r0, 0x4] - ldr r1, =0x00001005 - bl sub_8136110 - ldr r1, =gMain - movs r0, 0x87 - lsls r0, 3 - adds r1, r0 - b _08135BA6 - .pool -_08135AFC: - bl sub_8135D24 - b _08135B9E -_08135B02: - bl sub_8135E2C - ldr r1, =gMain - movs r0, 0x87 - lsls r0, 3 - adds r1, r0 - b _08135BA6 - .pool -_08135B14: - bl sub_81363BC - b _08135B9E -_08135B1A: - ldr r0, =sub_81365C8 - movs r1, 0 - bl CreateTask - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, =gUnknown_03006310 - ldr r2, =gUnknown_0203AB48 - ldrh r1, [r2, 0x6] - ldrh r2, [r2, 0x4] - bl ListMenuInit - ldr r2, =gTasks - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - adds r1, r2 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r1, 0x8] - ldr r1, =gMain - movs r0, 0x87 - lsls r0, 3 - adds r1, r0 - b _08135BA6 - .pool -_08135B64: - bl sub_8135DAC - b _08135B9E -_08135B6A: - movs r0, 0x1 - negs r0, r0 - movs r1, 0x10 - movs r2, 0 - bl BlendPalettes - ldr r1, =gMain - movs r0, 0x87 - lsls r0, 3 - adds r1, r0 - b _08135BA6 - .pool -_08135B84: - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - ldr r2, =gPaletteFade - ldrb r1, [r2, 0x8] - movs r0, 0x7F - ands r0, r1 - strb r0, [r2, 0x8] -_08135B9E: - ldr r1, =gMain - movs r2, 0x87 - lsls r2, 3 - adds r1, r2 -_08135BA6: - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - b _08135BD0 - .pool -_08135BB8: - ldr r0, =sub_8135938 - bl SetVBlankCallback - ldr r0, =sub_813591C - bl SetMainCallback2 - movs r0, 0x1 - b _08135BD2 - .pool -_08135BD0: - movs r0, 0 -_08135BD2: - add sp, 0x4 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8135978 - - thumb_func_start sub_8135BDC -sub_8135BDC: @ 8135BDC - push {lr} - bl sub_8121DA0 - movs r0, 0 - bl ResetBgsAndClearDma3BusyFlags - ldr r1, =gUnknown_085B2620 - movs r0, 0 - movs r2, 0x3 - bl InitBgsFromTemplates - ldr r0, =gUnknown_0203AB50 - ldr r1, [r0] - movs r0, 0x2 - bl SetBgTilemapBuffer - bl sub_8121E10 - movs r0, 0x2 - bl schedule_bg_copy_tilemap_to_vram - movs r1, 0x82 - lsls r1, 5 - movs r0, 0 - bl SetGpuReg - movs r0, 0 - bl ShowBg - movs r0, 0x1 - bl ShowBg - movs r0, 0x2 - bl ShowBg - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - pop {r0} - bx r0 - .pool - thumb_func_end sub_8135BDC - - thumb_func_start sub_8135C38 -sub_8135C38: @ 8135C38 - push {r4,lr} - sub sp, 0x4 - ldr r0, =gUnknown_0203AB50 - ldr r0, [r0] - ldr r1, =0x00000e7e - adds r0, r1 - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0x5 - bhi _08135D18 - lsls r0, 2 - ldr r1, =_08135C64 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08135C64: - .4byte _08135C7C - .4byte _08135C98 - .4byte _08135CBC - .4byte _08135CCC - .4byte _08135CD8 - .4byte _08135CFC -_08135C7C: - bl reset_temp_tile_data_buffers - ldr r1, =gUnknown_08D9B2B4 - movs r0, 0 - str r0, [sp] - movs r0, 0x2 - movs r2, 0 - movs r3, 0 - bl decompress_and_copy_tile_data_to_vram - b _08135CDE - .pool -_08135C98: - bl free_temp_tile_data_buffers_if_possible - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08135D18 - ldr r0, =gUnknown_08D9B7C8 - ldr r4, =gUnknown_0203AB50 - ldr r1, [r4] - bl LZDecompressWram - ldr r1, [r4] - b _08135CE2 - .pool -_08135CBC: - ldr r0, =gUnknown_08D9B470 - movs r1, 0 - movs r2, 0xC0 - bl LoadCompressedPalette - b _08135CDE - .pool -_08135CCC: - ldr r0, =gUnknown_085B26F4 - bl LoadCompressedObjectPic - b _08135CDE - .pool -_08135CD8: - ldr r0, =gUnknown_085B26FC - bl LoadCompressedObjectPalette -_08135CDE: - ldr r0, =gUnknown_0203AB50 - ldr r1, [r0] -_08135CE2: - ldr r0, =0x00000e7e - adds r1, r0 - ldrh r0, [r1] - adds r0, 0x1 - strh r0, [r1] - b _08135D18 - .pool -_08135CFC: - bl sub_8122328 - ldr r0, =gUnknown_0203AB50 - ldr r0, [r0] - ldr r1, =0x00000e7e - adds r0, r1 - movs r1, 0 - strh r1, [r0] - movs r0, 0x1 - b _08135D1A - .pool -_08135D18: - movs r0, 0 -_08135D1A: - add sp, 0x4 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8135C38 - - thumb_func_start sub_8135D24 -sub_8135D24: @ 8135D24 - push {r4,lr} - ldr r0, =gUnknown_085B2748 - bl InitWindows - bl DeactivateAllTextPrinters - movs r0, 0 - movs r1, 0x1 - movs r2, 0xE0 - bl sub_809882C - movs r0, 0 - movs r1, 0xA - movs r2, 0xD0 - bl copy_textbox_border_tile_patterns_to_vram - ldr r0, =gUnknown_0860F074 - movs r1, 0xF0 - movs r2, 0x20 - bl LoadPalette - movs r4, 0 -_08135D50: - adds r0, r4, 0 - movs r1, 0 - bl FillWindowPixelBuffer - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xA - bls _08135D50 - movs r0, 0 - bl schedule_bg_copy_tilemap_to_vram - movs r0, 0x1 - bl schedule_bg_copy_tilemap_to_vram - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8135D24 - - thumb_func_start sub_8135D7C -sub_8135D7C: @ 8135D7C - push {r4,lr} - sub sp, 0x14 - lsls r0, 24 - lsrs r0, 24 - lsls r2, 24 - lsrs r2, 24 - movs r4, 0 - str r4, [sp] - str r4, [sp, 0x4] - ldr r3, =gUnknown_085B271C - str r3, [sp, 0x8] - str r4, [sp, 0xC] - str r1, [sp, 0x10] - movs r1, 0x1 - movs r3, 0x1 - bl AddTextPrinterParametrized2 - add sp, 0x14 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8135D7C - - thumb_func_start sub_8135DAC -sub_8135DAC: @ 8135DAC - push {r4,lr} - ldr r0, =0x00000111 - bl ItemId_GetItem - adds r4, r0, 0 - movs r0, 0x1 - adds r1, r4, 0 - movs r2, 0x48 - bl GetStringCenterAlignXOffset - adds r2, r0, 0 - movs r0, 0 - adds r1, r4, 0 - bl sub_8135D7C - ldr r1, =gText_Spicy - movs r0, 0x2 - movs r2, 0 - bl sub_8135D7C - ldr r1, =gText_Dry - movs r0, 0x3 - movs r2, 0 - bl sub_8135D7C - ldr r1, =gText_Sweet - movs r0, 0x4 - movs r2, 0 - bl sub_8135D7C - ldr r1, =gText_Bitter - movs r0, 0x5 - movs r2, 0 - bl sub_8135D7C - ldr r1, =gText_Sour - movs r0, 0x6 - movs r2, 0 - bl sub_8135D7C - movs r4, 0 -_08135DFE: - adds r0, r4, 0 - bl PutWindowTilemap - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x7 - bls _08135DFE - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8135DAC - - thumb_func_start sub_8135E2C -sub_8135E2C: @ 8135E2C - push {r4-r7,lr} - movs r6, 0 - ldr r1, =gUnknown_0203AB50 - ldr r0, [r1] - ldr r2, =0x0000080a - adds r0, r2 - ldrb r0, [r0] - subs r0, 0x1 - cmp r6, r0 - bge _08135E7C - adds r5, r1, 0 -_08135E42: - lsls r4, r6, 5 - ldr r3, =0x00000954 - adds r4, r3 - ldr r0, [r5] - adds r0, r4 - adds r1, r6, 0 - bl sub_8135F04 - ldr r1, [r5] - lsls r2, r6, 3 - ldr r7, =0x0000080c - adds r0, r1, r7 - adds r0, r2 - adds r4, r1, r4 - str r4, [r0] - movs r3, 0x81 - lsls r3, 4 - adds r0, r1, r3 - adds r0, r2 - str r6, [r0] - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - ldr r4, =0x0000080a - adds r1, r4 - ldrb r0, [r1] - subs r0, 0x1 - cmp r6, r0 - blt _08135E42 -_08135E7C: - ldr r5, =gUnknown_0203AB50 - lsls r4, r6, 5 - ldr r7, =0x00000954 - adds r4, r7 - ldr r0, [r5] - adds r0, r4 - ldr r1, =gText_StowCase - bl StringCopy - ldr r1, [r5] - lsls r2, r6, 3 - ldr r3, =0x0000080c - adds r0, r1, r3 - adds r0, r2 - adds r4, r1, r4 - str r4, [r0] - movs r0, 0x81 - lsls r0, 4 - adds r1, r0 - adds r1, r2 - movs r0, 0x2 - negs r0, r0 - str r0, [r1] - ldr r2, =gUnknown_03006310 - adds r1, r2, 0 - ldr r0, =gUnknown_085B27B0 - ldm r0!, {r4,r6,r7} - stm r1!, {r4,r6,r7} - ldm r0!, {r4,r6,r7} - stm r1!, {r4,r6,r7} - ldrb r1, [r2, 0x17] - movs r0, 0x40 - negs r0, r0 - ands r0, r1 - movs r1, 0x7 - orrs r0, r1 - strb r0, [r2, 0x17] - ldr r1, [r5] - ldr r4, =0x0000080a - adds r0, r1, r4 - ldrb r0, [r0] - strh r0, [r2, 0xC] - adds r3, r1, r3 - str r3, [r2] - ldr r6, =0x0000080b - adds r1, r6 - ldrb r0, [r1] - strh r0, [r2, 0xE] - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8135E2C - - thumb_func_start sub_8135F04 -sub_8135F04: @ 8135F04 - push {r4-r6,lr} - lsls r1, 16 - ldr r2, =gSaveBlock1Ptr - lsrs r1, 13 - ldr r3, =0x00000848 - adds r1, r3 - ldr r5, [r2] - adds r5, r1 - ldr r2, =gPokeblockNames - ldrb r1, [r5] - lsls r1, 2 - adds r1, r2 - ldr r1, [r1] - bl StringCopy - adds r4, r0, 0 - movs r0, 0xFC - strb r0, [r4] - adds r4, 0x1 - movs r0, 0x12 - strb r0, [r4] - adds r4, 0x1 - movs r0, 0x57 - strb r0, [r4] - adds r4, 0x1 - ldr r6, =gStringVar1 - adds r0, r5, 0 - bl GetHighestPokeblocksFlavorLevel - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r6, 0 - movs r2, 0 - movs r3, 0x3 - bl ConvertIntToDecimalStringN - ldr r1, =gText_LvVar1 - adds r0, r4, 0 - bl StringExpandPlaceholders - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8135F04 - - thumb_func_start sub_8135F70 -sub_8135F70: @ 8135F70 - push {r4,lr} - adds r4, r0, 0 - lsls r1, 24 - lsrs r1, 24 - cmp r1, 0x1 - beq _08135F9C - movs r0, 0x5 - bl PlaySE - ldr r2, =gSprites - ldr r0, =gUnknown_0203AB50 - ldr r0, [r0] - ldr r1, =0x00000e74 - adds r0, r1 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r2, 0x1C - adds r0, r2 - ldr r1, =sub_8136470 - str r1, [r0] -_08135F9C: - ldr r0, =gUnknown_0203AB50 - ldr r0, [r0] - ldr r1, =0x00000e7d - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _08135FB0 - adds r0, r4, 0 - bl sub_8135FCC -_08135FB0: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8135F70 - - thumb_func_start sub_8135FCC -sub_8135FCC: @ 8135FCC - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0xC - adds r4, r0, 0 - movs r0, 0x7 - movs r1, 0 - bl FillWindowPixelBuffer - movs r0, 0x2 - negs r0, r0 - cmp r4, r0 - beq _081360A0 - ldr r1, =gSaveBlock1Ptr - lsls r0, r4, 3 - ldr r2, =0x00000848 - adds r0, r2 - ldr r1, [r1] - adds r1, r0 - mov r8, r1 - add r1, sp, 0x8 - movs r0, 0x17 - strh r0, [r1] - movs r0, 0x18 - strh r0, [r1, 0x2] - movs r5, 0 - adds r6, r1, 0 -_08136002: - adds r4, r5, 0x1 - lsls r1, r4, 24 - lsrs r1, 24 - mov r0, r8 - bl sub_8136F9C - lsls r0, 16 - adds r7, r4, 0 - cmp r0, 0 - ble _0813602C - lsls r1, r5, 12 - adds r0, r1, 0 - adds r0, 0x17 - strh r0, [r6] - adds r1, 0x18 - strh r1, [r6, 0x2] - b _08136032 - .pool -_0813602C: - movs r0, 0xF - strh r0, [r6] - strh r0, [r6, 0x2] -_08136032: - adds r0, r5, 0 - movs r1, 0x3 - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 1 - adds r4, r0 - lsls r4, 1 - adds r4, 0x1 - lsls r4, 24 - lsrs r4, 24 - adds r0, r5, 0 - movs r1, 0x3 - bl __umodsi3 - adds r3, r0, 0 - lsls r3, 25 - movs r0, 0xD0 - lsls r0, 20 - adds r3, r0 - lsrs r3, 24 - movs r0, 0x1 - str r0, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] - add r1, sp, 0x8 - adds r2, r4, 0 - bl CopyToBgTilemapBufferRect - lsls r0, r7, 24 - lsrs r5, r0, 24 - cmp r5, 0x4 - bls _08136002 - ldr r4, =gStringVar1 - mov r0, r8 - bl GetPokeblocksFeel - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - movs r2, 0x1 - movs r3, 0x2 - bl ConvertIntToDecimalStringN - movs r0, 0x7 - adds r1, r4, 0 - movs r2, 0x4 - bl sub_8135D7C - b _081360F8 - .pool -_081360A0: - add r0, sp, 0x8 - movs r1, 0xF - strh r1, [r0] - strh r1, [r0, 0x2] - movs r5, 0 -_081360AA: - adds r0, r5, 0 - movs r1, 0x3 - bl __udivsi3 - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 1 - adds r4, r0 - lsls r4, 1 - adds r4, 0x1 - lsls r4, 24 - lsrs r4, 24 - adds r0, r5, 0 - movs r1, 0x3 - bl __umodsi3 - adds r3, r0, 0 - lsls r3, 25 - movs r2, 0xD0 - lsls r2, 20 - adds r3, r2 - lsrs r3, 24 - movs r0, 0x1 - str r0, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] - add r1, sp, 0x8 - adds r2, r4, 0 - bl CopyToBgTilemapBufferRect - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x4 - bls _081360AA - movs r0, 0x7 - movs r1, 0x2 - bl CopyWindowToVram -_081360F8: - movs r0, 0 - bl schedule_bg_copy_tilemap_to_vram - movs r0, 0x2 - bl schedule_bg_copy_tilemap_to_vram - add sp, 0xC - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8135FCC - - thumb_func_start sub_8136110 -sub_8136110: @ 8136110 - push {lr} - sub sp, 0x8 - adds r3, r0, 0 - lsls r3, 16 - lsls r1, 16 - lsrs r1, 16 - lsrs r3, 15 - adds r3, 0x1 - lsls r3, 24 - lsrs r3, 24 - movs r0, 0xE - str r0, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] - movs r2, 0xF - bl FillBgTilemapBufferRect_Palette0 - movs r0, 0x2 - bl schedule_bg_copy_tilemap_to_vram - add sp, 0x8 - pop {r0} - bx r0 - thumb_func_end sub_8136110 - - thumb_func_start sub_8136140 -sub_8136140: @ 8136140 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - movs r2, 0 -_0813614A: - adds r1, r2, 0x1 - lsls r0, r1, 16 - lsrs r6, r0, 16 - mov r12, r1 - cmp r6, 0x27 - bhi _08136192 - ldr r0, =gSaveBlock1Ptr - mov r9, r0 - lsls r7, r2, 3 - ldr r1, =0x00000848 - mov r8, r1 -_08136160: - mov r0, r9 - ldr r2, [r0] - adds r0, r2, r7 - add r0, r8 - ldrb r0, [r0] - cmp r0, 0 - bne _08136188 - ldr r1, =0x00000848 - adds r2, r1 - adds r3, r2, r7 - ldr r4, [r3] - ldr r5, [r3, 0x4] - lsls r0, r6, 3 - adds r2, r0 - ldr r0, [r2] - ldr r1, [r2, 0x4] - str r0, [r3] - str r1, [r3, 0x4] - str r4, [r2] - str r5, [r2, 0x4] -_08136188: - adds r0, r6, 0x1 - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x27 - bls _08136160 -_08136192: - mov r1, r12 - lsls r0, r1, 16 - lsrs r2, r0, 16 - cmp r2, 0x26 - bls _0813614A - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8136140 - - thumb_func_start sub_81361B0 -sub_81361B0: @ 81361B0 - push {r4-r7,lr} - adds r4, r0, 0 - adds r5, r1, 0 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00000848 - adds r6, r0, r1 - cmp r4, r5 - beq _08136246 - movs r0, 0x8 - bl Alloc - adds r7, r0, 0 - lsls r0, r4, 3 - adds r0, r6 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [r7] - str r1, [r7, 0x4] - cmp r5, r4 - bls _0813620C - subs r5, 0x1 - lsls r3, r4, 16 - lsls r0, r5, 16 - asrs r1, r0, 16 - cmp r3, r0 - bge _08136234 - adds r4, r1, 0 -_081361E8: - asrs r3, 16 - lsls r2, r3, 3 - adds r2, r6 - ldr r0, [r2, 0x8] - ldr r1, [r2, 0xC] - str r0, [r2] - str r1, [r2, 0x4] - adds r3, 0x1 - lsls r3, 16 - asrs r0, r3, 16 - cmp r0, r4 - blt _081361E8 - b _08136234 - .pool -_0813620C: - lsls r3, r4, 16 - lsls r0, r5, 16 - asrs r1, r0, 16 - cmp r3, r0 - ble _08136234 - adds r4, r1, 0 -_08136218: - asrs r3, 16 - lsls r2, r3, 3 - adds r2, r6 - adds r0, r2, 0 - subs r0, 0x8 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [r2] - str r1, [r2, 0x4] - subs r3, 0x1 - lsls r3, 16 - asrs r0, r3, 16 - cmp r0, r4 - bgt _08136218 -_08136234: - lsls r2, r5, 3 - adds r2, r6 - ldr r0, [r7] - ldr r1, [r7, 0x4] - str r0, [r2] - str r1, [r2, 0x4] - adds r0, r7, 0 - bl Free -_08136246: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81361B0 - - thumb_func_start sub_813624C -sub_813624C: @ 813624C - ldr r1, =gUnknown_0203AB48 - movs r0, 0 - strh r0, [r1, 0x4] - strh r0, [r1, 0x6] - bx lr - .pool - thumb_func_end sub_813624C - - thumb_func_start sub_813625C -sub_813625C: @ 813625C - push {r4,r5,lr} - bl sub_8136140 - ldr r0, =gUnknown_0203AB50 - ldr r0, [r0] - ldr r1, =0x0000080a - adds r0, r1 - movs r1, 0 - strb r1, [r0] - movs r2, 0 - ldr r5, =gSaveBlock1Ptr - ldr r4, =0x00000848 -_08136274: - ldr r0, [r5] - lsls r1, r2, 3 - adds r0, r1 - adds r0, r4 - ldrb r0, [r0] - ldr r3, =gUnknown_0203AB50 - cmp r0, 0 - beq _08136290 - ldr r1, [r3] - ldr r0, =0x0000080a - adds r1, r0 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] -_08136290: - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x27 - bls _08136274 - ldr r0, [r3] - ldr r2, =0x0000080a - adds r0, r2 - ldrb r1, [r0] - adds r1, 0x1 - strb r1, [r0] - ldr r0, [r3] - adds r2, r0, r2 - ldrb r2, [r2] - cmp r2, 0x9 - bls _081362D0 - ldr r2, =0x0000080b - adds r1, r0, r2 - movs r0, 0x9 - strb r0, [r1] - b _081362D6 - .pool -_081362D0: - ldr r1, =0x0000080b - adds r0, r1 - strb r2, [r0] -_081362D6: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813625C - - thumb_func_start sub_81362E0 -sub_81362E0: @ 81362E0 - push {r4,r5,lr} - ldr r0, =gUnknown_0203AB48 - ldrh r1, [r0, 0x6] - adds r3, r0, 0 - ldr r4, =gUnknown_0203AB50 - cmp r1, 0 - beq _08136308 - ldrh r0, [r3, 0x6] - ldr r1, [r4] - ldr r5, =0x0000080b - adds r2, r1, r5 - ldrb r2, [r2] - adds r0, r2 - subs r5, 0x1 - adds r1, r5 - ldrb r1, [r1] - cmp r0, r1 - ble _08136308 - subs r0, r1, r2 - strh r0, [r3, 0x6] -_08136308: - adds r2, r3, 0 - ldrh r1, [r2, 0x6] - ldrh r0, [r2, 0x4] - adds r1, r0 - ldr r0, [r4] - ldr r4, =0x0000080a - adds r0, r4 - ldrb r0, [r0] - cmp r1, r0 - blt _0813633C - adds r1, r0, 0 - cmp r1, 0 - bne _08136338 - strh r1, [r2, 0x4] - b _0813633C - .pool -_08136338: - subs r0, 0x1 - strh r0, [r3, 0x4] -_0813633C: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_81362E0 - - thumb_func_start sub_8136344 -sub_8136344: @ 8136344 - push {r4-r7,lr} - ldr r0, =gUnknown_0203AB48 - ldrh r1, [r0, 0x4] - adds r5, r0, 0 - cmp r1, 0x4 - bls _081363A4 - movs r4, 0 - ldrh r0, [r5, 0x4] - subs r0, 0x4 - cmp r4, r0 - bge _081363A4 - ldrh r2, [r5, 0x6] - ldr r6, =gUnknown_0203AB50 - ldr r0, [r6] - ldr r3, =0x0000080b - adds r1, r0, r3 - ldrb r1, [r1] - adds r2, r1 - ldr r7, =0x0000080a - adds r0, r7 - ldrb r0, [r0] - cmp r2, r0 - beq _081363A4 - adds r3, r5, 0 -_08136374: - ldrh r0, [r3, 0x4] - subs r0, 0x1 - strh r0, [r3, 0x4] - ldrh r0, [r3, 0x6] - adds r0, 0x1 - strh r0, [r3, 0x6] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - ldrh r0, [r3, 0x4] - subs r0, 0x4 - cmp r4, r0 - bge _081363A4 - ldrh r2, [r5, 0x6] - ldr r1, [r6] - ldr r7, =0x0000080b - adds r0, r1, r7 - ldrb r0, [r0] - adds r2, r0 - ldr r0, =0x0000080a - adds r1, r0 - ldrb r1, [r1] - cmp r2, r1 - bne _08136374 -_081363A4: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8136344 - - thumb_func_start sub_81363BC -sub_81363BC: @ 81363BC - push {r4,lr} - sub sp, 0x10 - ldr r4, =gUnknown_0203AB50 - ldr r1, [r4] - ldr r2, =0x00000e7c - adds r0, r1, r2 - ldrb r0, [r0] - cmp r0, 0xFF - bne _081363FC - ldr r2, =0x0000080a - adds r0, r1, r2 - ldrb r0, [r0] - adds r2, 0x1 - adds r1, r2 - ldrb r1, [r1] - subs r0, r1 - str r0, [sp] - ldr r0, =0x00000456 - str r0, [sp, 0x4] - str r0, [sp, 0x8] - ldr r0, =gUnknown_0203AB4E - str r0, [sp, 0xC] - movs r0, 0x2 - movs r1, 0xB0 - movs r2, 0x8 - movs r3, 0x98 - bl AddScrollIndicatorArrowPairParametrized - ldr r1, [r4] - ldr r2, =0x00000e7c - adds r1, r2 - strb r0, [r1] -_081363FC: - add sp, 0x10 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81363BC - - thumb_func_start sub_8136418 -sub_8136418: @ 8136418 - push {r4,lr} - ldr r4, =gUnknown_0203AB50 - ldr r0, [r4] - ldr r2, =0x00000e7c - adds r1, r0, r2 - ldrb r0, [r1] - cmp r0, 0xFF - beq _08136436 - bl RemoveScrollIndicatorArrowPair - ldr r0, [r4] - ldr r1, =0x00000e7c - adds r0, r1 - movs r1, 0xFF - strb r1, [r0] -_08136436: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8136418 - - thumb_func_start sub_8136444 -sub_8136444: @ 8136444 - push {r4,r5,lr} - adds r4, r0, 0 - adds r5, r1, 0 - adds r3, r2, 0 - lsls r3, 24 - lsrs r3, 24 - ldr r0, =gUnknown_085B2704 - lsls r4, 16 - asrs r4, 16 - lsls r5, 16 - asrs r5, 16 - adds r1, r4, 0 - adds r2, r5, 0 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8136444 - - thumb_func_start sub_8136470 -sub_8136470: @ 8136470 - push {r4,r5,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0x1 - ble _08136480 - movs r0, 0 - strh r0, [r4, 0x2E] -_08136480: - movs r0, 0x2E - ldrsh r5, [r4, r0] - cmp r5, 0 - beq _0813648E - cmp r5, 0x1 - beq _081364B4 - b _081364E0 -_0813648E: - ldrb r1, [r4, 0x1] - movs r0, 0x4 - negs r0, r0 - ands r0, r1 - movs r1, 0x1 - orrs r0, r1 - strb r0, [r4, 0x1] - ldr r0, =gUnknown_085B26F0 - str r0, [r4, 0x10] - adds r0, r4, 0 - bl InitSpriteAffineAnim - movs r0, 0x1 - strh r0, [r4, 0x2E] - strh r5, [r4, 0x30] - b _081364E0 - .pool -_081364B4: - ldrh r0, [r4, 0x30] - adds r0, 0x1 - movs r2, 0 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0xB - ble _081364E0 - ldrb r1, [r4, 0x1] - movs r0, 0x4 - negs r0, r0 - ands r0, r1 - strb r0, [r4, 0x1] - strh r2, [r4, 0x2E] - strh r2, [r4, 0x30] - ldrb r0, [r4, 0x3] - lsls r0, 26 - lsrs r0, 27 - bl FreeOamMatrix - ldr r0, =SpriteCallbackDummy - str r0, [r4, 0x1C] -_081364E0: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8136470 - - thumb_func_start sub_81364EC -sub_81364EC: @ 81364EC - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, =sub_8136524 - str r1, [r0] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81364EC - - thumb_func_start sub_8136524 -sub_8136524: @ 8136524 - push {r4-r6,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r2, r0, r1 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _081365BE - ldr r6, =gUnknown_0203AB50 - ldr r0, [r6] - ldr r1, =0x00000809 - adds r0, r1 - ldrb r0, [r0] - subs r0, 0x2 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bhi _0813655A - ldr r1, =gFieldCallback - ldr r0, =sub_80AF168 - str r0, [r1] -_0813655A: - ldrb r0, [r2] - ldr r4, =gUnknown_0203AB4E - subs r2, r4, 0x2 - adds r1, r4, 0 - bl sub_81AE6C8 - bl sub_8136418 - bl ResetSpriteData - bl FreeAllSpritePalettes - ldr r0, [r6] - movs r1, 0x80 - lsls r1, 4 - adds r0, r1 - ldr r0, [r0] - cmp r0, 0 - beq _081365A4 - bl SetMainCallback2 - b _081365AC - .pool -_081365A4: - subs r0, r4, 0x6 - ldr r0, [r0] - bl SetMainCallback2 -_081365AC: - bl FreeAllWindowBuffers - ldr r0, =gUnknown_0203AB50 - ldr r0, [r0] - bl Free - adds r0, r5, 0 - bl DestroyTask -_081365BE: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8136524 - - thumb_func_start sub_81365C8 -sub_81365C8: @ 81365C8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r7, r0, 24 - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - mov r8, r0 - ldr r0, =gTasks + 0x8 - mov r10, r0 - mov r6, r8 - add r6, r10 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _081365F4 - b _08136708 -_081365F4: - bl sub_81221EC - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08136602 - b _08136708 -_08136602: - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x4 - ands r0, r1 - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 - cmp r0, 0 - beq _08136688 - ldrb r0, [r6] - ldr r4, =gUnknown_0203AB4E - subs r2, r4, 0x2 - adds r1, r4, 0 - bl get_coro_args_x18_x1A - subs r4, 0x6 - ldrh r1, [r4, 0x6] - ldrh r0, [r4, 0x4] - adds r1, r0 - ldr r5, =gUnknown_0203AB50 - ldr r0, [r5] - ldr r2, =0x0000080a - adds r0, r2 - ldrb r0, [r0] - subs r0, 0x1 - cmp r1, r0 - beq _08136708 - movs r0, 0x5 - bl PlaySE - ldrh r0, [r4, 0x4] - ldr r1, =0x00002005 - bl sub_8136110 - ldrh r0, [r4, 0x4] - ldrh r4, [r4, 0x6] - adds r0, r4 - strh r0, [r6, 0x4] - ldr r0, [r5] - ldr r1, =0x00000e7d - adds r0, r1 - movs r1, 0x1 - strb r1, [r0] - mov r0, r10 - subs r0, 0x8 - add r0, r8 - ldr r1, =sub_813671C - str r1, [r0] - b _08136708 - .pool -_08136688: - ldr r5, =gUnknown_0203AB48 - ldrh r2, [r5, 0x4] - mov r8, r2 - ldrb r0, [r6] - bl ListMenuHandleInput - adds r4, r0, 0 - ldrb r0, [r6] - adds r1, r5, 0x6 - adds r2, r5, 0x4 - bl get_coro_args_x18_x1A - ldrh r0, [r5, 0x4] - cmp r8, r0 - beq _081366B6 - mov r0, r8 - movs r1, 0x5 - bl sub_8136110 - ldrh r0, [r5, 0x4] - ldr r1, =0x00001005 - bl sub_8136110 -_081366B6: - movs r0, 0x2 - negs r0, r0 - cmp r4, r0 - beq _081366D0 - adds r0, 0x1 - cmp r4, r0 - bne _081366F8 - b _08136708 - .pool -_081366D0: - movs r0, 0x5 - bl PlaySE - ldr r0, =gSpecialVar_Result - ldr r2, =0x0000ffff - adds r1, r2, 0 - strh r1, [r0] - ldr r0, =gSpecialVar_ItemId - mov r1, r9 - strh r1, [r0] - adds r0, r7, 0 - bl sub_81364EC - b _08136708 - .pool -_081366F8: - movs r0, 0x5 - bl PlaySE - ldr r0, =gSpecialVar_ItemId - strh r4, [r0] - adds r0, r7, 0 - bl sub_8136938 -_08136708: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81365C8 - - thumb_func_start sub_813671C -sub_813671C: @ 813671C - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - lsls r0, 2 - add r0, r8 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r7, r0, r1 - bl sub_81221EC - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08136742 - b _08136848 -_08136742: - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0813676C - movs r0, 0x5 - bl PlaySE - ldrb r0, [r7] - ldr r1, =gUnknown_0203AB4E - subs r2, r1, 0x2 - bl get_coro_args_x18_x1A - b _08136822 - .pool -_0813676C: - ldr r6, =gUnknown_0203AB48 - ldrh r4, [r6, 0x6] - ldrh r5, [r6, 0x4] - ldrb r0, [r7] - bl ListMenuHandleInput - mov r9, r0 - ldrb r0, [r7] - adds r1, r6, 0x6 - adds r2, r6, 0x4 - bl get_coro_args_x18_x1A - ldrh r0, [r6, 0x6] - cmp r4, r0 - bne _08136790 - ldrh r6, [r6, 0x4] - cmp r5, r6 - beq _081367CA -_08136790: - movs r4, 0 -_08136792: - ldr r0, =gUnknown_0203AB48 - ldrh r0, [r0, 0x6] - adds r0, r4, r0 - lsls r0, 16 - lsrs r5, r0, 16 - movs r1, 0x4 - ldrsh r0, [r7, r1] - cmp r5, r0 - bne _081367B8 - adds r0, r4, 0 - ldr r1, =0x00002005 - bl sub_8136110 - b _081367C0 - .pool -_081367B8: - adds r0, r4, 0 - movs r1, 0x5 - bl sub_8136110 -_081367C0: - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0x8 - bls _08136792 -_081367CA: - ldr r5, =gUnknown_0203AB50 - ldr r0, [r5] - ldr r4, =0x00000e75 - adds r0, r4 - movs r1, 0x7 - movs r2, 0 - bl sub_81223FC - ldr r0, [r5] - adds r0, r4 - ldr r1, =gUnknown_0203AB48 - ldrh r3, [r1, 0x4] - lsls r3, 4 - adds r3, 0x8 - lsls r3, 16 - lsrs r3, 16 - movs r1, 0x7 - movs r2, 0x80 - bl sub_8122448 - movs r0, 0x2 - negs r0, r0 - cmp r9, r0 - beq _08136810 - adds r0, 0x1 - cmp r9, r0 - bne _0813683A - b _08136848 - .pool -_08136810: - movs r0, 0x5 - bl PlaySE - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08136830 -_08136822: - mov r0, r8 - movs r1, 0 - bl sub_8136854 - b _08136848 - .pool -_08136830: - mov r0, r8 - movs r1, 0x1 - bl sub_8136854 - b _08136848 -_0813683A: - movs r0, 0x5 - bl PlaySE - mov r0, r8 - movs r1, 0 - bl sub_8136854 -_08136848: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_813671C - - thumb_func_start sub_8136854 -sub_8136854: @ 8136854 - push {r4-r7,lr} - adds r4, r1, 0 - lsls r0, 24 - lsrs r7, r0, 24 - lsls r4, 24 - lsrs r4, 24 - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r6, r0, r1 - ldr r2, =gUnknown_0203AB48 - ldrh r0, [r2, 0x4] - ldrh r1, [r2, 0x6] - adds r0, r1 - lsls r0, 16 - lsrs r5, r0, 16 - ldr r0, =gUnknown_0203AB50 - ldr r0, [r0] - ldr r1, =0x00000e7d - adds r0, r1 - movs r1, 0 - strb r1, [r0] - ldrb r0, [r6] - adds r1, r2, 0x6 - adds r2, 0x4 - bl sub_81AE6C8 - cmp r4, 0 - bne _081368AA - movs r0, 0x4 - ldrsh r1, [r6, r0] - cmp r1, r5 - beq _081368BA - subs r0, r5, 0x1 - cmp r1, r0 - beq _081368AA - adds r0, r1, 0 - adds r1, r5, 0 - bl sub_81361B0 - bl sub_8135E2C -_081368AA: - movs r1, 0x4 - ldrsh r0, [r6, r1] - cmp r0, r5 - bge _081368BA - ldr r1, =gUnknown_0203AB48 - ldrh r0, [r1, 0x4] - subs r0, 0x1 - strh r0, [r1, 0x4] -_081368BA: - ldr r0, =gUnknown_03006310 - ldr r2, =gUnknown_0203AB48 - ldrh r1, [r2, 0x6] - ldrh r2, [r2, 0x4] - bl ListMenuInit - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6] - movs r0, 0 - bl schedule_bg_copy_tilemap_to_vram - ldr r0, =gUnknown_0203AB50 - ldr r0, [r0] - ldr r1, =0x00000e75 - adds r0, r1 - movs r1, 0x7 - movs r2, 0x1 - bl sub_81223FC - movs r4, 0 - lsls r5, r7, 2 -_081368E6: - adds r0, r4, 0 - movs r1, 0x5 - bl sub_8136110 - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x8 - bls _081368E6 - ldr r0, =gUnknown_0203AB48 - ldrh r0, [r0, 0x4] - ldr r1, =0x00001005 - bl sub_8136110 - ldr r1, =gTasks - adds r0, r5, r7 - lsls r0, 3 - adds r0, r1 - ldr r1, =sub_81365C8 - str r1, [r0] - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8136854 - - thumb_func_start sub_8136938 -sub_8136938: @ 8136938 - push {r4-r7,lr} - lsls r0, 24 - lsrs r7, r0, 24 - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r6, r0, r1 - ldr r0, =gUnknown_0203AB50 - ldr r0, [r0] - ldr r1, =0x00000808 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0x3 - bne _08136968 - movs r0, 0x8 - b _0813696A - .pool -_08136968: - movs r0, 0x9 -_0813696A: - strh r0, [r6, 0x2] - bl sub_8136418 - ldrb r0, [r6, 0x2] - movs r1, 0 - movs r2, 0x1 - movs r3, 0xE - bl SetWindowBorderStyle - ldrb r0, [r6, 0x2] - ldr r5, =gUnknown_0203AB50 - ldr r3, [r5] - ldr r4, =0x00000808 - adds r1, r3, r4 - ldrb r1, [r1] - ldr r2, =gUnknown_085B2668 - mov r12, r2 - ldr r2, =0x00000804 - adds r3, r2 - ldr r3, [r3] - mov r2, r12 - bl sub_81995E4 - ldrb r0, [r6, 0x2] - ldr r1, [r5] - adds r1, r4 - ldrb r1, [r1] - movs r2, 0 - bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed - ldrb r0, [r6, 0x2] - bl PutWindowTilemap - movs r0, 0x1 - bl schedule_bg_copy_tilemap_to_vram - ldr r1, =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r0, r1 - ldr r1, =sub_81369E0 - str r1, [r0] - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8136938 - - thumb_func_start sub_81369E0 -sub_81369E0: @ 81369E0 - push {r4-r6,lr} - lsls r0, 24 - lsrs r5, r0, 24 - adds r6, r5, 0 - bl sub_81221EC - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08136A3C - bl ProcessMenuInputNoWrapAround - lsls r0, 24 - asrs r4, r0, 24 - movs r0, 0x2 - negs r0, r0 - cmp r4, r0 - beq _08136A3C - adds r0, 0x1 - cmp r4, r0 - bne _08136A18 - movs r0, 0x5 - bl PlaySE - adds r0, r5, 0 - bl sub_8136DE8 - b _08136A3C -_08136A18: - movs r0, 0x5 - bl PlaySE - ldr r1, =gUnknown_085B2668 - ldr r0, =gUnknown_0203AB50 - ldr r0, [r0] - ldr r2, =0x00000804 - adds r0, r2 - ldr r0, [r0] - adds r0, r4 - ldrb r0, [r0] - lsls r0, 3 - adds r1, 0x4 - adds r0, r1 - ldr r1, [r0] - adds r0, r6, 0 - bl _call_via_r1 -_08136A3C: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81369E0 - - thumb_func_start sub_8136A50 -sub_8136A50: @ 8136A50 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gUnknown_0203AB50 - ldr r1, [r1] - movs r2, 0x80 - lsls r2, 4 - adds r1, r2 - ldr r2, =sub_8136A74 - str r2, [r1] - bl sub_81364EC - pop {r0} - bx r0 - .pool - thumb_func_end sub_8136A50 - - thumb_func_start sub_8136A74 -sub_8136A74: @ 8136A74 - push {lr} - ldr r2, =gSaveBlock1Ptr - ldr r0, =gSpecialVar_ItemId - ldrh r1, [r0] - lsls r1, 3 - ldr r0, =0x00000848 - adds r1, r0 - ldr r0, [r2] - adds r0, r1 - ldr r1, =sub_8136AA0 - bl sub_8166204 - pop {r0} - bx r0 - .pool - thumb_func_end sub_8136A74 - - thumb_func_start sub_8136AA0 -sub_8136AA0: @ 8136AA0 - push {lr} - ldr r0, =gUnknown_0203AB48 - ldr r1, [r0] - movs r0, 0 - bl sub_81357FC - pop {r0} - bx r0 - .pool - thumb_func_end sub_8136AA0 - - thumb_func_start sub_8136AB4 -sub_8136AB4: @ 8136AB4 - push {r4,r5,lr} - sub sp, 0x10 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r0, r1 - ldrb r0, [r0, 0x2] - movs r1, 0 - bl sub_8198070 - ldr r0, =gStringVar1 - ldr r3, =gPokeblockNames - ldr r1, =gSaveBlock1Ptr - ldr r2, [r1] - ldr r1, =gSpecialVar_ItemId - ldrh r1, [r1] - lsls r1, 3 - adds r2, r1 - ldr r1, =0x00000848 - adds r2, r1 - ldrb r1, [r2] - lsls r1, 2 - adds r1, r3 - ldr r1, [r1] - bl StringCopy - ldr r5, =gStringVar4 - ldr r1, =gText_ThrowAwayVar1 - adds r0, r5, 0 - bl StringExpandPlaceholders - bl GetPlayerTextSpeed - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x1 - str r1, [sp] - str r0, [sp, 0x4] - str r5, [sp, 0x8] - ldr r0, =sub_8136B48 - str r0, [sp, 0xC] - adds r0, r4, 0 - movs r1, 0xA - movs r2, 0xA - movs r3, 0xD - bl DisplayMessageAndContinueTask - add sp, 0x10 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8136AB4 - - thumb_func_start sub_8136B48 -sub_8136B48: @ 8136B48 - push {lr} - sub sp, 0x10 - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gUnknown_085B27A8 - movs r2, 0x2 - str r2, [sp] - movs r2, 0x1 - str r2, [sp, 0x4] - movs r2, 0xE - str r2, [sp, 0x8] - ldr r2, =gUnknown_085B26A4 - str r2, [sp, 0xC] - movs r2, 0x1 - movs r3, 0 - bl CreateYesNoMenuWithCallbacks - add sp, 0x10 - pop {r0} - bx r0 - .pool - thumb_func_end sub_8136B48 - - thumb_func_start sub_8136B78 -sub_8136B78: @ 8136B78 - push {r4,r5,lr} - sub sp, 0x10 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r5, =gStringVar4 - ldr r1, =gText_Var1ThrownAway - adds r0, r5, 0 - bl StringExpandPlaceholders - bl GetPlayerTextSpeed - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x1 - str r1, [sp] - str r0, [sp, 0x4] - str r5, [sp, 0x8] - ldr r0, =sub_8136BC0 - str r0, [sp, 0xC] - adds r0, r4, 0 - movs r1, 0xA - movs r2, 0xA - movs r3, 0xD - bl DisplayMessageAndContinueTask - add sp, 0x10 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8136B78 - - thumb_func_start sub_8136BC0 -sub_8136BC0: @ 8136BC0 - push {r4-r7,lr} - lsls r0, 24 - lsrs r7, r0, 24 - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - beq _08136C36 - ldr r0, =gSpecialVar_ItemId - ldrb r0, [r0] - bl sub_8136F68 - movs r0, 0x5 - bl PlaySE - ldr r5, =gUnknown_0203AB4E - subs r6, r5, 0x2 - lsls r4, r7, 2 - adds r4, r7 - lsls r4, 3 - ldr r0, =gTasks + 0x8 - adds r4, r0 - ldrb r0, [r4] - adds r1, r5, 0 - adds r2, r6, 0 - bl sub_81AE6C8 - ldrh r0, [r6] - movs r1, 0x5 - bl sub_8136110 - bl sub_813625C - bl sub_81362E0 - bl sub_8135E2C - ldr r0, =gUnknown_03006310 - ldrh r1, [r5] - ldrh r2, [r6] - bl ListMenuInit - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4] - ldrh r0, [r6] - ldr r1, =0x00001005 - bl sub_8136110 - movs r0, 0 - bl schedule_bg_copy_tilemap_to_vram - movs r0, 0x1 - bl schedule_bg_copy_tilemap_to_vram - adds r0, r7, 0 - bl sub_8136C54 -_08136C36: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8136BC0 - - thumb_func_start sub_8136C54 -sub_8136C54: @ 8136C54 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0xA - movs r1, 0 - bl sub_8197DF8 - movs r0, 0x1 - bl schedule_bg_copy_tilemap_to_vram - bl sub_81363BC - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, =sub_81365C8 - str r1, [r0] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8136C54 - - thumb_func_start sub_8136C8C -sub_8136C8C: @ 8136C8C - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldr r0, =gEnemyParty - bl GetNature - lsls r0, 24 - lsrs r0, 24 - ldr r5, =gSaveBlock1Ptr - ldr r7, =gSpecialVar_ItemId - ldrh r2, [r7] - lsls r2, 3 - ldr r6, =0x00000848 - adds r2, r6 - ldr r1, [r5] - adds r1, r2 - bl PokeblockGetGain - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - ldr r0, =gBattleTextBuff1 - ldr r3, =gPokeblockNames - ldr r2, [r5] - ldrh r1, [r7] - lsls r1, 3 - adds r2, r1 - adds r2, r6 - ldrb r1, [r2] - lsls r1, 2 - adds r1, r3 - ldr r1, [r1] - bl StringCopy - ldrb r0, [r7] - bl sub_8136F68 - ldr r1, [r5] - ldrh r0, [r7] - lsls r0, 3 - adds r1, r0 - adds r1, r6 - ldrb r0, [r1] - lsls r0, 8 - strh r0, [r7] - lsls r4, 16 - asrs r4, 16 - cmp r4, 0 - bne _08136D10 - adds r0, 0x1 - b _08136D1A - .pool -_08136D10: - cmp r4, 0 - ble _08136D18 - adds r0, 0x2 - b _08136D1A -_08136D18: - adds r0, 0x3 -_08136D1A: - strh r0, [r7] - mov r0, r8 - bl sub_81364EC - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8136C8C - - thumb_func_start sub_8136D2C -sub_8136D2C: @ 8136D2C - push {r4,r5,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r5, =gSpecialVar_ItemId - ldrb r0, [r5] - bl SafariZoneActivatePokeblockFeeder - ldr r0, =gStringVar1 - ldr r3, =gPokeblockNames - ldr r1, =gSaveBlock1Ptr - ldr r2, [r1] - ldrh r1, [r5] - lsls r1, 3 - adds r2, r1 - ldr r1, =0x00000848 - adds r2, r1 - ldrb r1, [r2] - lsls r1, 2 - adds r1, r3 - ldr r1, [r1] - bl StringCopy - ldr r1, =gSpecialVar_Result - ldrh r0, [r5] - strh r0, [r1] - lsls r0, 24 - lsrs r0, 24 - bl sub_8136F68 - movs r0, 0 - strh r0, [r5] - adds r0, r4, 0 - bl sub_81364EC - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8136D2C - - thumb_func_start sub_8136D90 -sub_8136D90: @ 8136D90 - push {r4-r6,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r6, =gSpecialVar_0x8004 - ldr r0, =gSaveBlock1Ptr - ldr r5, =gSpecialVar_ItemId - ldrh r1, [r5] - lsls r1, 3 - ldr r2, =0x00000848 - adds r1, r2 - ldr r0, [r0] - adds r0, r1 - bl sub_818E704 - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6] - ldr r1, =gSpecialVar_Result - ldrh r0, [r5] - strh r0, [r1] - lsls r0, 24 - lsrs r0, 24 - bl sub_8136F68 - movs r0, 0 - strh r0, [r5] - adds r0, r4, 0 - bl sub_81364EC - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8136D90 - - thumb_func_start sub_8136DE8 -sub_8136DE8: @ 8136DE8 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - ldr r5, =gTasks + 0x8 - adds r0, r4, r5 - ldrb r0, [r0, 0x2] - movs r1, 0 - bl sub_8198070 - movs r0, 0x1 - bl schedule_bg_copy_tilemap_to_vram - bl sub_81363BC - subs r5, 0x8 - adds r4, r5 - ldr r0, =sub_81365C8 - str r0, [r4] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8136DE8 - - thumb_func_start sub_8136E20 -sub_8136E20: @ 8136E20 - push {r4,lr} - lsls r0, 24 - ldr r3, =gSaveBlock1Ptr - ldr r1, [r3] - lsrs r0, 21 - adds r1, r0 - ldr r2, =0x00000848 - adds r1, r2 - movs r2, 0 - strb r2, [r1] - ldr r1, [r3] - adds r1, r0 - ldr r4, =0x00000849 - adds r1, r4 - strb r2, [r1] - ldr r1, [r3] - adds r1, r0 - adds r4, 0x1 - adds r1, r4 - strb r2, [r1] - ldr r1, [r3] - adds r1, r0 - adds r4, 0x1 - adds r1, r4 - strb r2, [r1] - ldr r1, [r3] - adds r1, r0 - adds r4, 0x1 - adds r1, r4 - strb r2, [r1] - ldr r1, [r3] - adds r1, r0 - adds r4, 0x1 - adds r1, r4 - strb r2, [r1] - ldr r1, [r3] - adds r1, r0 - ldr r0, =0x0000084e - adds r1, r0 - strb r2, [r1] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8136E20 - - thumb_func_start ClearPokeblocks -ClearPokeblocks: @ 8136E88 - push {r4,lr} - movs r4, 0 -_08136E8C: - adds r0, r4, 0 - bl sub_8136E20 - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x27 - bls _08136E8C - pop {r4} - pop {r0} - bx r0 - thumb_func_end ClearPokeblocks - - thumb_func_start GetHighestPokeblocksFlavorLevel -GetHighestPokeblocksFlavorLevel: @ 8136EA4 - push {r4-r6,lr} - adds r6, r0, 0 - movs r1, 0x1 - bl sub_8136F9C - lsls r0, 24 - lsrs r5, r0, 24 - movs r1, 0x1 -_08136EB4: - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r6, 0 - adds r1, r4, 0 - bl sub_8136F9C - lsls r0, 24 - lsrs r0, 24 - cmp r5, r0 - bcs _08136ECC - adds r5, r0, 0 -_08136ECC: - adds r1, r4, 0 - cmp r1, 0x4 - bls _08136EB4 - adds r0, r5, 0 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end GetHighestPokeblocksFlavorLevel - - thumb_func_start GetPokeblocksFeel -GetPokeblocksFeel: @ 8136EDC - push {lr} - movs r1, 0x6 - bl sub_8136F9C - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x63 - bls _08136EEE - movs r0, 0x63 -_08136EEE: - pop {r1} - bx r1 - thumb_func_end GetPokeblocksFeel - - thumb_func_start GetFirstFreePokeblockSlot -GetFirstFreePokeblockSlot: @ 8136EF4 - push {lr} - movs r1, 0 - ldr r0, =gSaveBlock1Ptr - ldr r2, [r0] - ldr r3, =0x00000848 -_08136EFE: - lsls r0, r1, 3 - adds r0, r2, r0 - adds r0, r3 - ldrb r0, [r0] - cmp r0, 0 - bne _08136F18 - lsls r0, r1, 24 - asrs r0, 24 - b _08136F26 - .pool -_08136F18: - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x27 - bls _08136EFE - movs r0, 0x1 - negs r0, r0 -_08136F26: - pop {r1} - bx r1 - thumb_func_end GetFirstFreePokeblockSlot - - thumb_func_start AddPokeblock -AddPokeblock: @ 8136F2C - push {r4,lr} - adds r4, r0, 0 - bl GetFirstFreePokeblockSlot - lsls r0, 24 - asrs r1, r0, 24 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _08136F60 - ldr r0, =gSaveBlock1Ptr - ldr r2, [r0] - lsls r0, r1, 3 - ldr r1, =0x00000848 - adds r2, r1 - adds r2, r0 - ldr r0, [r4] - ldr r1, [r4, 0x4] - str r0, [r2] - str r1, [r2, 0x4] - movs r0, 0x1 - b _08136F62 - .pool -_08136F60: - movs r0, 0 -_08136F62: - pop {r4} - pop {r1} - bx r1 - thumb_func_end AddPokeblock - - thumb_func_start sub_8136F68 -sub_8136F68: @ 8136F68 - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - lsls r1, r2, 3 - adds r0, r1 - ldr r1, =0x00000848 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _08136F94 - adds r0, r2, 0 - bl sub_8136E20 - movs r0, 0x1 - b _08136F96 - .pool -_08136F94: - movs r0, 0 -_08136F96: - pop {r1} - bx r1 - thumb_func_end sub_8136F68 - - thumb_func_start sub_8136F9C -sub_8136F9C: @ 8136F9C - push {lr} - lsls r1, 24 - lsrs r1, 24 - adds r2, r1, 0 - cmp r1, 0 - bne _08136FAC - ldrb r0, [r0] - b _08136FDE -_08136FAC: - cmp r1, 0x1 - bne _08136FB4 - ldrb r0, [r0, 0x1] - b _08136FDE -_08136FB4: - cmp r1, 0x2 - bne _08136FBC - ldrb r0, [r0, 0x2] - b _08136FDE -_08136FBC: - cmp r1, 0x3 - bne _08136FC4 - ldrb r0, [r0, 0x3] - b _08136FDE -_08136FC4: - cmp r1, 0x4 - bne _08136FCC - ldrb r0, [r0, 0x4] - b _08136FDE -_08136FCC: - cmp r1, 0x5 - bne _08136FD4 - ldrb r0, [r0, 0x5] - b _08136FDE -_08136FD4: - cmp r2, 0x6 - beq _08136FDC - movs r0, 0 - b _08136FDE -_08136FDC: - ldrb r0, [r0, 0x6] -_08136FDE: - pop {r1} - bx r1 - thumb_func_end sub_8136F9C - - thumb_func_start PokeblockGetGain -PokeblockGetGain: @ 8136FE4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - mov r8, r1 - lsls r0, 24 - lsrs r0, 24 - movs r6, 0 - movs r4, 0 - ldr r1, =gPokeblockFlavorCompatibilityTable - mov r9, r1 - lsls r1, r0, 2 - adds r7, r1, r0 -_08136FFE: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - mov r0, r8 - adds r1, r5, 0 - bl sub_8136F9C - lsls r0, 16 - asrs r1, r0, 16 - cmp r1, 0 - ble _0813702A - adds r0, r7, r4 - add r0, r9 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - muls r1, r0 - lsls r0, r6, 16 - asrs r0, 16 - adds r0, r1 - lsls r0, 16 - lsrs r6, r0, 16 -_0813702A: - adds r4, r5, 0 - cmp r4, 0x4 - bls _08136FFE - lsls r0, r6, 16 - asrs r0, 16 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end PokeblockGetGain - - thumb_func_start sub_8137044 -sub_8137044: @ 8137044 - push {r4,lr} - adds r4, r1, 0 - movs r1, 0 - bl sub_8136F9C - lsls r0, 24 - ldr r1, =gPokeblockNames - lsrs r0, 22 - adds r0, r1 - ldr r1, [r0] - adds r0, r4, 0 - bl StringCopy - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137044 - - thumb_func_start sub_8137068 -sub_8137068: @ 8137068 - push {r4-r7,lr} - adds r6, r1, 0 - lsls r0, 24 - lsrs r5, r0, 24 - movs r4, 0 - ldr r7, =gPokeblockNames -_08137074: - lsls r1, r4, 3 - ldr r0, =gUnknown_085B2720 - adds r1, r0 - adds r0, r5, 0 - bl PokeblockGetGain - lsls r0, 16 - cmp r0, 0 - ble _081370A0 - adds r0, r4, 0x1 - lsls r0, 2 - adds r0, r7 - ldr r1, [r0] - adds r0, r6, 0 - bl StringCopy - movs r0, 0x1 - b _081370AC - .pool -_081370A0: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x4 - bls _08137074 - movs r0, 0 -_081370AC: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_8137068 - - thumb_func_start GetPokeblocksFlavor -GetPokeblocksFlavor: @ 81370B4 - push {r4-r7,lr} - adds r5, r0, 0 - movs r7, 0 - movs r6, 0 -_081370BC: - adds r1, r7, 0x1 - lsls r1, 24 - lsrs r1, 24 - adds r0, r5, 0 - bl sub_8136F9C - adds r4, r0, 0 - adds r1, r6, 0x1 - lsls r1, 24 - lsrs r1, 24 - adds r0, r5, 0 - bl sub_8136F9C - lsls r4, 16 - lsls r0, 16 - lsls r1, r6, 16 - cmp r4, r0 - bge _081370E2 - lsrs r7, r1, 16 -_081370E2: - movs r2, 0x80 - lsls r2, 9 - adds r0, r1, r2 - lsrs r6, r0, 16 - asrs r0, 16 - cmp r0, 0x4 - ble _081370BC - lsls r0, r7, 24 - lsrs r0, 24 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end GetPokeblocksFlavor - - thumb_func_start sub_81370FC -sub_81370FC: @ 81370FC - push {r4,lr} - bl ShouldDoBrailleFlyEffect - lsls r0, 24 - cmp r0, 0 - beq _08137134 - ldr r4, =gSpecialVar_Result - bl GetCursorSelectionMonId - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4] - ldr r1, =gUnknown_03005DB0 - ldr r0, =hm_add_c3_launch_phase_2 - str r0, [r1] - ldr r1, =gUnknown_0203CEEC - ldr r0, =sub_8179918 - b _08137152 - .pool -_08137134: - ldr r0, =gMapHeader - ldrb r0, [r0, 0x15] - cmp r0, 0x1 - bne _08137170 - ldr r0, =0x00000888 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - bne _08137170 - ldr r1, =gUnknown_03005DB0 - ldr r0, =hm_add_c3_launch_phase_2 - str r0, [r1] - ldr r1, =gUnknown_0203CEEC - ldr r0, =hm2_flash -_08137152: - str r0, [r1] - movs r0, 0x1 - b _08137172 - .pool -_08137170: - movs r0, 0 -_08137172: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81370FC - - thumb_func_start hm2_flash -hm2_flash: @ 8137178 - push {r4,lr} - bl oei_task_add - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl GetCursorSelectionMonId - ldr r1, =gFieldEffectArguments - lsls r0, 24 - lsrs r0, 24 - str r0, [r1] - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r2, =sub_81371B4 - lsrs r1, r2, 16 - strh r1, [r0, 0x18] - strh r2, [r0, 0x1A] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end hm2_flash - - thumb_func_start sub_81371B4 -sub_81371B4: @ 81371B4 - push {lr} - movs r0, 0xCF - bl PlaySE - ldr r0, =0x00000888 - bl FlagSet - ldr r0, =EventScript_2926F8 - bl ScriptContext1_SetupScript - pop {r0} - bx r0 - .pool - thumb_func_end sub_81371B4 - - thumb_func_start sub_81371D4 -sub_81371D4: @ 81371D4 - push {lr} - bl RunTasks - bl AnimateSprites - bl BuildOamBuffer - bl UpdatePaletteFade - pop {r0} - bx r0 - thumb_func_end sub_81371D4 - - thumb_func_start sub_81371EC -sub_81371EC: @ 81371EC - push {lr} - bl LoadOam - bl ProcessSpriteCopyRequests - bl TransferPlttBuffer - pop {r0} - bx r0 - thumb_func_end sub_81371EC - - thumb_func_start c2_change_map -c2_change_map: @ 8137200 - push {r4,lr} - sub sp, 0x8 - movs r0, 0 - bl SetVBlankCallback - movs r0, 0 - movs r1, 0 - bl SetGpuReg - movs r0, 0xC - movs r1, 0 - bl SetGpuReg - movs r0, 0xA - movs r1, 0 - bl SetGpuReg - movs r0, 0x8 - movs r1, 0 - bl SetGpuReg - movs r0, 0x18 - movs r1, 0 - bl SetGpuReg - movs r0, 0x1A - movs r1, 0 - bl SetGpuReg - movs r0, 0x14 - movs r1, 0 - bl SetGpuReg - movs r0, 0x16 - movs r1, 0 - bl SetGpuReg - movs r0, 0x10 - movs r1, 0 - bl SetGpuReg - movs r0, 0x12 - movs r1, 0 - bl SetGpuReg - mov r1, sp - movs r0, 0 - strh r0, [r1] - ldr r1, =0x040000d4 - mov r0, sp - str r0, [r1] - movs r0, 0xC0 - lsls r0, 19 - str r0, [r1, 0x4] - ldr r0, =0x8100c000 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - movs r4, 0 - str r4, [sp, 0x4] - add r0, sp, 0x4 - str r0, [r1] - movs r0, 0xE0 - lsls r0, 19 - str r0, [r1, 0x4] - ldr r0, =0x85000100 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - mov r0, sp - strh r4, [r0] - str r0, [r1] - ldr r0, =0x05000002 - str r0, [r1, 0x4] - ldr r0, =0x810001ff - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - bl ResetPaletteFade - bl ResetTasks - bl ResetSpriteData - ldr r3, =0x04000208 - ldrh r2, [r3] - strh r4, [r3] - ldr r4, =0x04000200 - ldrh r0, [r4] - movs r1, 0x1 - orrs r0, r1 - strh r0, [r4] - strh r2, [r3] - ldr r0, =sub_81371EC - bl SetVBlankCallback - ldr r0, =sub_81371D4 - bl SetMainCallback2 - bl sub_8137304 - lsls r0, 24 - cmp r0, 0 - bne _081372D2 - ldr r0, =gMain - ldr r0, [r0, 0x8] - bl SetMainCallback2 -_081372D2: - add sp, 0x8 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end c2_change_map - - thumb_func_start sub_8137304 -sub_8137304: @ 8137304 - push {r4-r7,lr} - bl get_map_light_from_warp0 - lsls r0, 24 - lsrs r6, r0, 24 - bl sav1_map_get_light_level - lsls r0, 24 - lsrs r5, r0, 24 - movs r3, 0 - ldr r4, =gUnknown_085B27C8 - ldrb r0, [r4] - cmp r0, 0 - beq _08137358 - adds r7, r4, 0 - adds r0, r4, 0x4 - mov r12, r0 -_08137326: - lsls r2, r3, 3 - adds r1, r2, r7 - ldrb r0, [r1] - cmp r0, r6 - bne _08137348 - ldrb r0, [r1, 0x1] - cmp r0, r5 - bne _08137348 - mov r1, r12 - adds r0, r2, r1 - ldr r0, [r0] - bl _call_via_r0 - movs r0, 0x1 - b _0813735A - .pool -_08137348: - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - lsls r0, r3, 3 - adds r0, r4 - ldrb r0, [r0] - cmp r0, 0 - bne _08137326 -_08137358: - movs r0, 0 -_0813735A: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_8137304 - - thumb_func_start sub_8137360 -sub_8137360: @ 8137360 - push {r4-r6,lr} - lsls r0, 24 - lsls r1, 24 - lsrs r5, r0, 24 - lsrs r4, r1, 24 - movs r3, 0 - ldr r1, =gUnknown_085B27C8 - ldrb r0, [r1] - cmp r0, 0 - beq _081373A0 - adds r6, r1, 0 -_08137376: - lsls r0, r3, 3 - adds r2, r0, r6 - ldrb r0, [r2] - cmp r0, r5 - bne _08137390 - ldrb r0, [r2, 0x1] - cmp r0, r4 - bne _08137390 - ldrb r0, [r2, 0x2] - b _081373A2 - .pool -_08137390: - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - lsls r0, r3, 3 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _08137376 -_081373A0: - movs r0, 0 -_081373A2: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8137360 - - thumb_func_start fade_type_for_given_maplight_pair -fade_type_for_given_maplight_pair: @ 81373A8 - push {r4-r6,lr} - lsls r0, 24 - lsls r1, 24 - lsrs r5, r0, 24 - lsrs r4, r1, 24 - movs r3, 0 - ldr r1, =gUnknown_085B27C8 - ldrb r0, [r1] - cmp r0, 0 - beq _081373E8 - adds r6, r1, 0 -_081373BE: - lsls r0, r3, 3 - adds r2, r0, r6 - ldrb r0, [r2] - cmp r0, r5 - bne _081373D8 - ldrb r0, [r2, 0x1] - cmp r0, r4 - bne _081373D8 - ldrb r0, [r2, 0x3] - b _081373EA - .pool -_081373D8: - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - lsls r0, r3, 3 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - bne _081373BE -_081373E8: - movs r0, 0 -_081373EA: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end fade_type_for_given_maplight_pair - - thumb_func_start sub_81373F0 -sub_81373F0: @ 81373F0 - push {lr} - ldr r0, =sub_8137404 - movs r1, 0 - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_81373F0 - - thumb_func_start sub_8137404 -sub_8137404: @ 8137404 - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldr r0, =sub_8137420 - str r0, [r1] - bx lr - .pool - thumb_func_end sub_8137404 - - thumb_func_start sub_8137420 -sub_8137420: @ 8137420 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0 - movs r1, 0 - bl SetGpuReg - ldr r0, =gUnknown_085B2A90 - ldr r1, =0x0600c000 - bl LZ77UnCompVram - ldr r0, =gUnknown_085B28B0 - ldr r1, =0x0600f800 - bl LZ77UnCompVram - ldr r0, =gUnknown_085B2850 - movs r1, 0xE0 - movs r2, 0x20 - bl LoadPalette - ldr r0, =gUnknown_085B28A0 - movs r1, 0xE0 - movs r2, 0x10 - bl LoadPalette - ldr r1, =0x00003e41 - movs r0, 0x50 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg - movs r0, 0x54 - movs r1, 0 - bl SetGpuReg - ldr r1, =0x00001f0c - movs r0, 0x8 - bl SetGpuReg - movs r1, 0x8A - lsls r1, 5 - movs r0, 0 - bl SetGpuReg - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, =sub_81374C4 - str r1, [r0] - movs r2, 0 - movs r1, 0x10 - strh r1, [r0, 0x8] - strh r2, [r0, 0xA] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137420 - - thumb_func_start sub_81374C4 -sub_81374C4: @ 81374C4 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r5, r1, r2 - ldrh r4, [r5, 0xA] - movs r0, 0x80 - lsls r0, 5 - adds r1, r4, r0 - lsls r1, 16 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - cmp r4, 0x10 - bhi _081374F8 - ldrh r0, [r5, 0xA] - adds r0, 0x1 - strh r0, [r5, 0xA] - b _08137500 - .pool -_081374F8: - movs r0, 0 - strh r0, [r5, 0xC] - ldr r0, =sub_813750C - str r0, [r5] -_08137500: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81374C4 - - thumb_func_start sub_813750C -sub_813750C: @ 813750C - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r1, =0x00001010 - movs r0, 0x52 - bl SetGpuReg - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r4, r0, r1 - ldrh r1, [r4, 0xC] - cmp r1, 0x7 - bhi _08137554 - adds r0, r1, 0x1 - strh r0, [r4, 0xC] - lsls r1, 1 - ldr r0, =gUnknown_085B28A0 - adds r0, r1, r0 - movs r2, 0x10 - subs r2, r1 - lsls r2, 16 - lsrs r2, 16 - movs r1, 0xE0 - bl LoadPalette - b _08137566 - .pool -_08137554: - ldr r0, =gUnknown_085B2850 - movs r1, 0 - movs r2, 0x20 - bl LoadPalette - ldr r0, =sub_8137574 - str r0, [r4] - movs r0, 0x8 - strh r0, [r4, 0xC] -_08137566: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813750C - - thumb_func_start sub_8137574 -sub_8137574: @ 8137574 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldrh r2, [r1, 0xC] - movs r3, 0xC - ldrsh r0, [r1, r3] - cmp r0, 0 - beq _08137598 - subs r0, r2, 0x1 - strh r0, [r1, 0xC] - b _081375A0 - .pool -_08137598: - ldr r0, =gMain - ldr r0, [r0, 0x8] - bl SetMainCallback2 -_081375A0: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137574 - - thumb_func_start sub_81375A8 -sub_81375A8: @ 81375A8 - push {lr} - ldr r0, =sub_81375BC - movs r1, 0 - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_81375A8 - - thumb_func_start sub_81375BC -sub_81375BC: @ 81375BC - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldr r0, =sub_81375D8 - str r0, [r1] - bx lr - .pool - thumb_func_end sub_81375BC - - thumb_func_start sub_81375D8 -sub_81375D8: @ 81375D8 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0 - movs r1, 0 - bl SetGpuReg - ldr r0, =gUnknown_085B2A90 - ldr r1, =0x0600c000 - bl LZ77UnCompVram - ldr r0, =gUnknown_085B28B0 - ldr r1, =0x0600f800 - bl LZ77UnCompVram - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg - movs r0, 0x54 - movs r1, 0 - bl SetGpuReg - ldr r1, =0x00001f0c - movs r0, 0x8 - bl SetGpuReg - movs r1, 0x8A - lsls r1, 5 - movs r0, 0 - bl SetGpuReg - ldr r0, =gUnknown_085B2850 - movs r1, 0xE0 - movs r2, 0x20 - bl LoadPalette - ldr r0, =gUnknown_085B2870 - movs r1, 0 - movs r2, 0x20 - bl LoadPalette - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, =sub_8137678 - str r1, [r0] - movs r2, 0 - movs r1, 0x10 - strh r1, [r0, 0x8] - strh r2, [r0, 0xA] - strh r2, [r0, 0xC] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81375D8 - - thumb_func_start sub_8137678 -sub_8137678: @ 8137678 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r4, r1, r2 - ldrh r1, [r4, 0xC] - cmp r1, 0xF - bhi _081376B4 - adds r2, r1, 0x1 - adds r0, r2, 0x1 - strh r0, [r4, 0xC] - movs r0, 0xF - subs r0, r1 - lsls r0, 1 - ldr r1, =gUnknown_085B2890 - adds r0, r1 - lsls r2, 17 - lsrs r2, 16 - movs r1, 0xE0 - bl LoadPalette - b _081376C8 - .pool -_081376B4: - ldr r1, =0x00001010 - movs r0, 0x52 - bl SetGpuReg - ldr r1, =0x00003e41 - movs r0, 0x50 - bl SetGpuReg - ldr r0, =sub_81376DC - str r0, [r4] -_081376C8: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137678 - - thumb_func_start sub_81376DC -sub_81376DC: @ 81376DC - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r5, r1, r2 - ldrh r0, [r5, 0xA] - movs r1, 0x10 - subs r1, r0 - lsls r1, 16 - lsrs r4, r1, 16 - movs r0, 0x80 - lsls r0, 21 - adds r1, r0 - lsrs r1, 16 - movs r0, 0x52 - bl SetGpuReg - cmp r4, 0 - beq _08137714 - ldrh r0, [r5, 0xA] - adds r0, 0x1 - strh r0, [r5, 0xA] - b _08137726 - .pool -_08137714: - ldr r0, =gUnknown_085B2870 - movs r1, 0 - movs r2, 0x20 - bl LoadPalette - ldr r0, =gMain - ldr r0, [r0, 0x8] - bl SetMainCallback2 -_08137726: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81376DC - - thumb_func_start sub_8137734 -sub_8137734: @ 8137734 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x1C - bl sp000_heal_pokemon - ldr r4, =0x00000864 - adds r0, r4, 0 - bl FlagGet - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x1 - bne _08137760 - ldr r0, =gHasHallOfFameRecords - strb r1, [r0] - b _0813776C - .pool -_08137760: - ldr r1, =gHasHallOfFameRecords - movs r0, 0 - strb r0, [r1] - adds r0, r4, 0 - bl FlagSet -_0813776C: - movs r0, 0x1 - bl GetGameStat - cmp r0, 0 - bne _0813778E - ldr r0, =gSaveBlock2Ptr - ldr r2, [r0] - ldrh r1, [r2, 0xE] - lsls r1, 16 - ldrb r0, [r2, 0x10] - lsls r0, 8 - orrs r1, r0 - ldrb r0, [r2, 0x11] - orrs r1, r0 - movs r0, 0x1 - bl sav12_xor_set -_0813778E: - bl sub_8076D48 - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldrb r0, [r0, 0x8] - cmp r0, 0 - bne _081377AC - movs r0, 0x1 - bl sub_8084F6C - b _081377B2 - .pool -_081377AC: - movs r0, 0x2 - bl sub_8084F6C -_081377B2: - movs r7, 0 - movs r6, 0 - add r0, sp, 0x18 - mov r8, r0 - mov r5, sp -_081377BC: - movs r0, 0x64 - adds r1, r6, 0 - muls r1, r0 - ldr r0, =gPlayerParty - adds r4, r1, r0 - movs r0, 0 - strb r6, [r5] - strb r0, [r5, 0x1] - adds r0, r4, 0 - movs r1, 0x5 - bl GetMonData - cmp r0, 0 - beq _0813780A - adds r0, r4, 0 - movs r1, 0x6 - bl GetMonData - cmp r0, 0 - bne _0813780A - adds r0, r4, 0 - movs r1, 0x43 - bl GetMonData - cmp r0, 0 - bne _0813780A - movs r0, 0x1 - mov r1, r8 - strb r0, [r1] - adds r0, r4, 0 - movs r1, 0x43 - add r2, sp, 0x18 - bl SetMonData - adds r0, r4, 0 - bl GetRibbonCount - strb r0, [r5, 0x1] - movs r7, 0x1 -_0813780A: - adds r5, 0x4 - adds r6, 0x1 - cmp r6, 0x5 - ble _081377BC - cmp r7, 0x1 - bne _0813785A - movs r0, 0x2A - bl IncrementGameStat - ldr r0, =0x0000089b - bl FlagSet - mov r3, sp - add r2, sp, 0x4 - movs r6, 0x4 -_08137828: - ldrb r1, [r3, 0x1] - ldrb r0, [r2, 0x1] - cmp r0, r1 - bls _08137838 - ldr r1, [sp] - ldr r0, [r2] - str r0, [sp] - str r1, [r2] -_08137838: - adds r2, 0x4 - subs r6, 0x1 - cmp r6, 0 - bge _08137828 - mov r0, sp - ldrb r0, [r0, 0x1] - cmp r0, 0x4 - bls _0813785A - mov r0, sp - ldrb r1, [r0] - movs r0, 0x64 - muls r0, r1 - ldr r1, =gPlayerParty - adds r0, r1 - movs r1, 0x43 - bl sub_80EE4DC -_0813785A: - ldr r0, =CB2_DoHallOfFameScreen - bl SetMainCallback2 - movs r0, 0 - add sp, 0x1C - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8137734 - - thumb_func_start sp0C8_whiteout_maybe -sp0C8_whiteout_maybe: @ 813787C - push {lr} - ldr r0, =c2_whiteout - bl SetMainCallback2 - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sp0C8_whiteout_maybe - - thumb_func_start sub_8137890 -sub_8137890: @ 8137890 - push {r4,lr} - ldr r0, =0x00004024 - bl VarGet - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - ldr r0, =0x00004025 - bl VarGet - lsls r0, 16 - lsrs r0, 16 - lsls r4, 16 - orrs r4, r0 - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8137890 - - thumb_func_start sub_81378BC -sub_81378BC: @ 81378BC - push {r4,lr} - adds r4, r0, 0 - ldr r0, =0x00004024 - lsrs r1, r4, 16 - bl VarSet - ldr r0, =0x00004025 - lsls r4, 16 - lsrs r4, 16 - adds r1, r4, 0 - bl VarSet - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81378BC - - thumb_func_start sub_81378E4 -sub_81378E4: @ 81378E4 - push {r4,lr} - bl Random - adds r4, r0, 0 - bl Random - lsls r4, 16 - lsls r0, 16 - lsrs r0, 16 - orrs r4, r0 - adds r0, r4, 0 - bl sub_81378BC - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81378E4 - - thumb_func_start sub_8137904 -sub_8137904: @ 8137904 - push {r4,lr} - lsls r0, 16 - lsrs r4, r0, 16 - bl sub_8137890 - adds r1, r0, 0 - cmp r4, 0 - beq _08137928 - ldr r3, =0x41c64e6d - ldr r2, =0x00003039 -_08137918: - adds r0, r1, 0 - muls r0, r3 - adds r1, r0, r2 - subs r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0 - bne _08137918 -_08137928: - adds r0, r1, 0 - bl sub_81378BC - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137904 - - thumb_func_start sub_813793C -sub_813793C: @ 813793C - push {r4-r6,lr} - bl sub_8137890 - lsrs r6, r0, 16 - movs r5, 0 -_08137946: - movs r0, 0x64 - adds r1, r5, 0 - muls r1, r0 - ldr r0, =gPlayerParty - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0xB - bl GetMonData - cmp r0, 0 - beq _08137978 - adds r0, r4, 0 - movs r1, 0 - bl GetMonData - ldr r1, =0x0000ffff - ands r1, r0 - cmp r1, r6 - bne _08137978 - movs r0, 0x1 - b _08137980 - .pool -_08137978: - adds r5, 0x1 - cmp r5, 0x5 - ble _08137946 - movs r0, 0 -_08137980: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_813793C - - thumb_func_start sub_8137988 -sub_8137988: @ 8137988 - push {lr} - bl get_map_light_from_warp0 - lsls r0, 24 - lsrs r0, 24 - bl is_light_level_1_2_3_5_or_6 - lsls r0, 24 - cmp r0, 0 - beq _081379CE - bl RtcCalcLocalTime - ldr r1, =gUnknown_085B2B44 - ldr r0, =gLocalTime - ldrb r0, [r0, 0x2] - lsls r0, 24 - asrs r0, 24 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0 - beq _081379C8 - ldr r0, =0x0000089a - bl FlagSet - b _081379CE - .pool -_081379C8: - ldr r0, =0x0000089a - bl FlagClear -_081379CE: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137988 - - thumb_func_start sub_81379D8 -sub_81379D8: @ 81379D8 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - bl sub_80AC3BC - lsls r0, 24 - cmp r0, 0 - beq _081379F2 - bl EnableBothScriptContexts - adds r0, r4, 0 - bl DestroyTask -_081379F2: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_81379D8 - - thumb_func_start sub_81379F8 -sub_81379F8: @ 81379F8 - push {lr} - ldr r0, =sub_81379D8 - movs r1, 0x50 - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_81379F8 - - thumb_func_start sub_8137A0C -sub_8137A0C: @ 8137A0C - push {lr} - ldr r0, =0x00004049 - bl GetVarPointer - movs r1, 0 - strh r1, [r0] - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137A0C - - thumb_func_start sub_8137A20 -sub_8137A20: @ 8137A20 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - ldr r0, =0x00004049 - bl GetVarPointer - adds r5, r0, 0 - ldrh r0, [r5] - adds r4, r0 - strh r4, [r5] - ldrh r0, [r5] - movs r1, 0x7 - bl __umodsi3 - strh r0, [r5] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137A20 - - thumb_func_start sub_8137A4C -sub_8137A4C: @ 8137A4C - push {lr} - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0 - bne _08137A70 - movs r0, 0 - bl sub_80C0844 - ldr r1, =gSpecialVar_0x8005 - strh r0, [r1] - movs r0, 0x1 - bl sub_80C0844 - b _08137A80 - .pool -_08137A70: - movs r0, 0 - bl pokedex_count - ldr r1, =gSpecialVar_0x8005 - strh r0, [r1] - movs r0, 0x1 - bl pokedex_count -_08137A80: - ldr r1, =gSpecialVar_0x8006 - strh r0, [r1] - bl IsNationalPokedexEnabled - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - .pool - thumb_func_end sub_8137A4C - - thumb_func_start sub_8137A98 -sub_8137A98: @ 8137A98 - push {lr} - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x9 - bhi _08137AA4 - b _08137BFC -_08137AA4: - cmp r0, 0x13 - bhi _08137AB0 - ldr r0, =gUnknown_082A5DAB - b _08137C06 - .pool -_08137AB0: - cmp r0, 0x1D - bhi _08137ABC - ldr r0, =gUnknown_082A5DF1 - b _08137C06 - .pool -_08137ABC: - cmp r0, 0x27 - bhi _08137AC8 - ldr r0, =gUnknown_082A5E34 - b _08137C06 - .pool -_08137AC8: - cmp r0, 0x31 - bhi _08137AD4 - ldr r0, =gUnknown_082A5E83 - b _08137C06 - .pool -_08137AD4: - cmp r0, 0x3B - bhi _08137AE0 - ldr r0, =gUnknown_082A5EB9 - b _08137C06 - .pool -_08137AE0: - cmp r0, 0x45 - bhi _08137AEC - ldr r0, =gUnknown_082A5EF4 - b _08137C06 - .pool -_08137AEC: - cmp r0, 0x4F - bhi _08137AF8 - ldr r0, =gUnknown_082A5F39 - b _08137C06 - .pool -_08137AF8: - cmp r0, 0x59 - bhi _08137B04 - ldr r0, =gUnknown_082A5F82 - b _08137C06 - .pool -_08137B04: - cmp r0, 0x63 - bhi _08137B10 - ldr r0, =gUnknown_082A5FB9 - b _08137C06 - .pool -_08137B10: - cmp r0, 0x6D - bhi _08137B1C - ldr r0, =gUnknown_082A6018 - b _08137C06 - .pool -_08137B1C: - cmp r0, 0x77 - bhi _08137B28 - ldr r0, =gUnknown_082A6061 - b _08137C06 - .pool -_08137B28: - cmp r0, 0x81 - bhi _08137B34 - ldr r0, =gUnknown_082A609C - b _08137C06 - .pool -_08137B34: - cmp r0, 0x8B - bhi _08137B40 - ldr r0, =gUnknown_082A60D5 - b _08137C06 - .pool -_08137B40: - cmp r0, 0x95 - bhi _08137B4C - ldr r0, =gUnknown_082A6124 - b _08137C06 - .pool -_08137B4C: - cmp r0, 0x9F - bhi _08137B58 - ldr r0, =gUnknown_082A616F - b _08137C06 - .pool -_08137B58: - cmp r0, 0xA9 - bhi _08137B64 - ldr r0, =gUnknown_082A61D6 - b _08137C06 - .pool -_08137B64: - cmp r0, 0xB3 - bhi _08137B70 - ldr r0, =gUnknown_082A623A - b _08137C06 - .pool -_08137B70: - cmp r0, 0xBD - bhi _08137B7C - ldr r0, =gUnknown_082A6287 - b _08137C06 - .pool -_08137B7C: - cmp r0, 0xC7 - bls _08137BEA - cmp r0, 0xC8 - bne _08137BB8 - ldr r0, =0x00000199 - bl SpeciesToNationalPokedexNum - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x1 - bl GetSetPokedexFlag - lsls r0, 24 - cmp r0, 0 - bne _08137BEA - movs r0, 0xCD - lsls r0, 1 - bl SpeciesToNationalPokedexNum - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x1 - bl GetSetPokedexFlag - lsls r0, 24 - cmp r0, 0 - bne _08137BEA - b _08137C04 - .pool -_08137BB8: - cmp r0, 0xC9 - bne _08137BF8 - ldr r0, =0x00000199 - bl SpeciesToNationalPokedexNum - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x1 - bl GetSetPokedexFlag - lsls r0, 24 - cmp r0, 0 - beq _08137C04 - movs r0, 0xCD - lsls r0, 1 - bl SpeciesToNationalPokedexNum - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x1 - bl GetSetPokedexFlag - lsls r0, 24 - cmp r0, 0 - beq _08137C04 -_08137BEA: - ldr r0, =gUnknown_082A62C9 - b _08137C06 - .pool -_08137BF8: - cmp r0, 0xCA - beq _08137C04 -_08137BFC: - ldr r0, =gUnknown_082A5D6C - b _08137C06 - .pool -_08137C04: - ldr r0, =gUnknown_082A6312 -_08137C06: - pop {r1} - bx r1 - .pool - thumb_func_end sub_8137A98 - - thumb_func_start sub_8137C10 -sub_8137C10: @ 8137C10 - push {lr} - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - bl sub_8137A98 - bl ShowFieldMessage - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137C10 - - thumb_func_start sub_8137C28 -sub_8137C28: @ 8137C28 - push {lr} - ldr r0, =CB2_DoHallOfFamePC - bl SetMainCallback2 - bl ScriptContext2_Enable - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137C28 - - thumb_func_start sub_8137C3C -sub_8137C3C: @ 8137C3C - push {lr} - ldr r0, =c2_exit_to_overworld_2_switch - bl SetMainCallback2 - ldr r1, =gFieldCallback - ldr r0, =mapldr_080CA5C0 - str r0, [r1] - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137C3C - - thumb_func_start mapldr_080CA5C0 -mapldr_080CA5C0: @ 8137C5C - push {lr} - sub sp, 0x4 - bl ScriptContext2_Enable - bl sub_8085784 - bl sp109_CreatePCMenu - bl sub_80E2514 - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - ldr r0, =sub_8137C94 - movs r1, 0xA - bl CreateTask - add sp, 0x4 - pop {r0} - bx r0 - .pool - thumb_func_end mapldr_080CA5C0 - - thumb_func_start sub_8137C94 -sub_8137C94: @ 8137C94 - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08137CAC - adds r0, r2, 0 - bl DestroyTask -_08137CAC: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137C94 - - thumb_func_start sub_8137CB4 -sub_8137CB4: @ 8137CB4 - push {lr} - ldr r0, =CB2_ShowDiploma - bl SetMainCallback2 - bl ScriptContext2_Enable - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137CB4 - - thumb_func_start Special_ViewWallClock -Special_ViewWallClock: @ 8137CC8 - push {lr} - ldr r0, =gMain - ldr r1, =c2_exit_to_overworld_2_switch - str r1, [r0, 0x8] - ldr r0, =Cb2_ViewWallClock - bl SetMainCallback2 - bl ScriptContext2_Enable - pop {r0} - bx r0 - .pool - thumb_func_end Special_ViewWallClock - - thumb_func_start wild_pokemon_reroll -wild_pokemon_reroll: @ 8137CEC - ldr r0, =gUnknown_0203AB54 - movs r1, 0 - strb r1, [r0] - ldr r0, =gUnknown_0203AB55 - strb r1, [r0] - ldr r1, =gUnknown_0203AB58 - movs r0, 0 - str r0, [r1] - bx lr - .pool - thumb_func_end wild_pokemon_reroll - - thumb_func_start sub_8137D0C -sub_8137D0C: @ 8137D0C - ldr r1, =gUnknown_0203AB54 - movs r0, 0x1 - strb r0, [r1] - ldr r1, =gUnknown_0203AB55 - movs r0, 0 - strb r0, [r1] - ldr r1, =gUnknown_0203AB58 - ldr r0, =gMain - ldr r0, [r0, 0x20] - str r0, [r1] - bx lr - .pool - thumb_func_end sub_8137D0C - - thumb_func_start sp0E3_walkrun_bitfield_interpretation -sp0E3_walkrun_bitfield_interpretation: @ 8137D34 - push {lr} - movs r0, 0x4 - bl TestPlayerAvatarFlags - lsls r0, 24 - cmp r0, 0 - beq _08137D46 - movs r0, 0x1 - b _08137D58 -_08137D46: - movs r0, 0x2 - bl TestPlayerAvatarFlags - lsls r0, 24 - cmp r0, 0 - bne _08137D56 - movs r0, 0 - b _08137D58 -_08137D56: - movs r0, 0x2 -_08137D58: - pop {r1} - bx r1 - thumb_func_end sp0E3_walkrun_bitfield_interpretation - - thumb_func_start sub_8137D5C -sub_8137D5C: @ 8137D5C - push {r4-r7,lr} - adds r7, r0, 0 - lsls r1, 24 - lsrs r6, r1, 24 - cmp r6, 0x63 - bhi _08137D88 - ldr r4, =gStringVar1 - adds r0, r4, 0 - adds r1, r6, 0 - movs r2, 0 - movs r3, 0x2 - bl ConvertIntToDecimalStringN - ldr r1, =gText_SpaceTimes - adds r0, r4, 0 - bl StringAppend - b _08137D90 - .pool -_08137D88: - ldr r0, =gStringVar1 - ldr r1, =gText_99TimesPlus - bl StringCopy -_08137D90: - ldr r0, =0x00000e0f - cmp r7, r0 - bhi _08137DF0 - ldr r4, =gStringVar2 - adds r0, r7, 0 - movs r1, 0x3C - bl __udivsi3 - adds r1, r0, 0 - adds r0, r4, 0 - movs r2, 0x1 - movs r3, 0x2 - bl ConvertIntToDecimalStringN - movs r0, 0xAD - strb r0, [r4, 0x2] - adds r5, r4, 0x3 - adds r0, r7, 0 - movs r1, 0x3C - bl __umodsi3 - movs r1, 0x64 - muls r0, r1 - movs r1, 0x3C - bl __udivsi3 - adds r1, r0, 0 - adds r0, r5, 0 - movs r2, 0x2 - movs r3, 0x2 - bl ConvertIntToDecimalStringN - ldr r1, =gText_SpaceSeconds - adds r0, r4, 0 - bl StringAppend - b _08137DF8 - .pool -_08137DF0: - ldr r0, =gStringVar2 - ldr r1, =gText_1MinutePlus - bl StringCopy -_08137DF8: - movs r4, 0 - cmp r6, 0 - bne _08137E0C - movs r4, 0x5 - b _08137E2A - .pool -_08137E0C: - cmp r6, 0x3 - bhi _08137E14 - movs r4, 0x4 - b _08137E2A -_08137E14: - cmp r6, 0x9 - bhi _08137E1C - movs r4, 0x3 - b _08137E2A -_08137E1C: - cmp r6, 0x13 - bhi _08137E24 - movs r4, 0x2 - b _08137E2A -_08137E24: - cmp r6, 0x63 - bhi _08137E2A - movs r4, 0x1 -_08137E2A: - adds r0, r7, 0 - movs r1, 0x3C - bl __udivsi3 - cmp r0, 0xA - bhi _08137E3A - adds r0, r4, 0x5 - b _08137E58 -_08137E3A: - cmp r0, 0xF - bhi _08137E42 - adds r0, r4, 0x4 - b _08137E58 -_08137E42: - cmp r0, 0x14 - bhi _08137E4A - adds r0, r4, 0x3 - b _08137E58 -_08137E4A: - cmp r0, 0x28 - bhi _08137E52 - adds r0, r4, 0x2 - b _08137E58 -_08137E52: - cmp r0, 0x3B - bhi _08137E5C - adds r0, r4, 0x1 -_08137E58: - lsls r0, 24 - lsrs r4, r0, 24 -_08137E5C: - ldr r0, =gSpecialVar_Result - strh r4, [r0] - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137D5C - - thumb_func_start sub_8137E6C -sub_8137E6C: @ 8137E6C - push {r4,r5,lr} - ldr r0, =gMain - ldr r1, =gUnknown_0203AB58 - ldr r4, [r0, 0x20] - ldr r0, [r1] - subs r4, r0 - ldr r5, =gUnknown_0203AB55 - ldrb r1, [r5] - adds r0, r4, 0 - bl sub_8137D5C - ldrb r1, [r5] - adds r0, r4, 0 - bl sub_8137E9C - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137E6C - - thumb_func_start sub_8137E9C -sub_8137E9C: @ 8137E9C - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r5, r0, 0 - lsls r1, 24 - lsrs r1, 24 - mov r8, r1 - ldr r6, =0x00004028 - adds r0, r6, 0 - bl VarGet - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - ldr r7, =0x00004029 - adds r0, r7, 0 - bl VarGet - lsls r0, 16 - adds r4, r0 - cmp r4, r5 - bhi _08137ECC - cmp r4, 0 - bne _08137EE6 -_08137ECC: - lsls r1, r5, 16 - lsrs r1, 16 - adds r0, r6, 0 - bl VarSet - lsrs r1, r5, 16 - adds r0, r7, 0 - bl VarSet - ldr r0, =0x00004027 - mov r1, r8 - bl VarSet -_08137EE6: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137E9C - - thumb_func_start sub_8137EFC -sub_8137EFC: @ 8137EFC - push {r4,lr} - ldr r0, =0x00004028 - bl VarGet - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - ldr r0, =0x00004029 - bl VarGet - lsls r0, 16 - adds r4, r0 - cmp r4, 0 - beq _08137F3C - ldr r0, =0x00004027 - bl VarGet - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl sub_8137D5C - movs r0, 0x1 - b _08137F3E - .pool -_08137F3C: - movs r0, 0 -_08137F3E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8137EFC - - thumb_func_start sub_8137F44 -sub_8137F44: @ 8137F44 - push {r4,lr} - ldr r0, =gUnknown_020322DC - ldrh r1, [r0] - ldr r0, =0x00000c1d - cmp r1, r0 - beq _08137F7C - ldr r4, =0x000040a9 - adds r0, r4, 0 - bl VarGet - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x2 - beq _08137F6E - adds r0, r4, 0 - bl VarGet - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x3 - bne _08137F7C -_08137F6E: - adds r0, r4, 0 - movs r1, 0 - bl VarSet - movs r0, 0 - bl Overworld_SetSavedMusic -_08137F7C: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137F44 - - thumb_func_start sub_8137F90 -sub_8137F90: @ 8137F90 - push {lr} - ldr r0, =0x0000088d - bl FlagSet - ldr r0, =0x0000404a - bl GetVarPointer - movs r1, 0 - strh r1, [r0] - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137F90 - - thumb_func_start sub_8137FB0 -sub_8137FB0: @ 8137FB0 - push {lr} - ldr r0, =0x0000088d - bl FlagClear - pop {r0} - bx r0 - .pool - thumb_func_end sub_8137FB0 - - thumb_func_start CountSSTidalStep -CountSSTidalStep: @ 8137FC0 - push {r4,lr} - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, =0x0000088d - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _08137FE6 - ldr r0, =0x0000404a - bl GetVarPointer - ldrh r1, [r0] - adds r1, r4, r1 - strh r1, [r0] - lsls r1, 16 - lsrs r1, 16 - cmp r1, 0xCC - bhi _08137FF4 -_08137FE6: - movs r0, 0 - b _08137FF6 - .pool -_08137FF4: - movs r0, 0x1 -_08137FF6: - pop {r4} - pop {r1} - bx r1 - thumb_func_end CountSSTidalStep - - thumb_func_start GetSSTidalLocation -GetSSTidalLocation: @ 8137FFC - push {r4-r7,lr} - mov r7, r8 - push {r7} - mov r8, r0 - adds r5, r1, 0 - adds r6, r2, 0 - adds r7, r3, 0 - ldr r0, =0x0000404a - bl GetVarPointer - adds r4, r0, 0 - ldr r0, =0x000040b4 - bl GetVarPointer - ldrh r0, [r0] - subs r0, 0x1 - cmp r0, 0x9 - bhi _081380C2 - lsls r0, 2 - ldr r1, =_08138038 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08138038: - .4byte _08138060 - .4byte _08138070 - .4byte _08138064 - .4byte _08138068 - .4byte _08138068 - .4byte _0813806C - .4byte _08138098 - .4byte _08138060 - .4byte _08138064 - .4byte _0813806C -_08138060: - movs r0, 0x1 - b _081380CE -_08138064: - movs r0, 0x4 - b _081380CE -_08138068: - movs r0, 0x2 - b _081380CE -_0813806C: - movs r0, 0x3 - b _081380CE -_08138070: - ldrh r0, [r4] - cmp r0, 0x3B - bhi _08138080 - movs r0, 0x31 - strb r0, [r5] - ldrh r0, [r4] - adds r0, 0x13 - b _081380C0 -_08138080: - cmp r0, 0x8B - bhi _0813808E - movs r0, 0x30 - strb r0, [r5] - ldrh r0, [r4] - subs r0, 0x3C - b _081380C0 -_0813808E: - movs r0, 0x2F - strb r0, [r5] - ldrh r0, [r4] - subs r0, 0x8C - b _081380C0 -_08138098: - ldrh r0, [r4] - cmp r0, 0x41 - bhi _081380A8 - movs r0, 0x2F - strb r0, [r5] - ldrh r1, [r4] - movs r0, 0x41 - b _081380BE -_081380A8: - cmp r0, 0x91 - bhi _081380B6 - movs r0, 0x30 - strb r0, [r5] - ldrh r1, [r4] - movs r0, 0x91 - b _081380BE -_081380B6: - movs r0, 0x31 - strb r0, [r5] - ldrh r1, [r4] - movs r0, 0xE0 -_081380BE: - subs r0, r1 -_081380C0: - strh r0, [r6] -_081380C2: - movs r0, 0 - mov r1, r8 - strb r0, [r1] - movs r0, 0x14 - strh r0, [r7] - movs r0, 0 -_081380CE: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end GetSSTidalLocation - - thumb_func_start is_tile_that_overrides_player_control -is_tile_that_overrides_player_control: @ 81380D8 - push {lr} - movs r0, 0x88 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _0813810A - ldr r0, =gMapHeader - ldrb r0, [r0, 0x17] - cmp r0, 0x1 - blt _0813810A - cmp r0, 0x3 - ble _081380F6 - cmp r0, 0x6 - bne _0813810A -_081380F6: - ldr r0, =0x000040f2 - bl GetVarPointer - ldrh r1, [r0] - adds r1, 0x1 - strh r1, [r0] - lsls r1, 16 - lsrs r1, 16 - cmp r1, 0xF9 - bhi _08138118 -_0813810A: - movs r0, 0 - b _0813811A - .pool -_08138118: - movs r0, 0x1 -_0813811A: - pop {r1} - bx r1 - thumb_func_end is_tile_that_overrides_player_control - - thumb_func_start sub_8138120 -sub_8138120: @ 8138120 - push {lr} - movs r0, 0x8A - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _08138152 - ldr r0, =gMapHeader - ldrb r0, [r0, 0x17] - cmp r0, 0x1 - blt _08138152 - cmp r0, 0x3 - ble _0813813E - cmp r0, 0x6 - bne _08138152 -_0813813E: - ldr r0, =0x000040f3 - bl GetVarPointer - ldrh r1, [r0] - adds r1, 0x1 - strh r1, [r0] - lsls r1, 16 - lsrs r1, 16 - cmp r1, 0x9 - bhi _08138160 -_08138152: - movs r0, 0 - b _08138162 - .pool -_08138160: - movs r0, 0x1 -_08138162: - pop {r1} - bx r1 - thumb_func_end sub_8138120 - - thumb_func_start sub_8138168 -sub_8138168: @ 8138168 - push {lr} - movs r0, 0x72 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _0813819A - ldr r0, =gMapHeader - ldrb r0, [r0, 0x17] - cmp r0, 0x1 - blt _0813819A - cmp r0, 0x3 - ble _08138186 - cmp r0, 0x6 - bne _0813819A -_08138186: - ldr r0, =0x000040f5 - bl GetVarPointer - ldrh r1, [r0] - adds r1, 0x1 - strh r1, [r0] - lsls r1, 16 - lsrs r1, 16 - cmp r1, 0x9 - bhi _081381A8 -_0813819A: - movs r0, 0 - b _081381AA - .pool -_081381A8: - movs r0, 0x1 -_081381AA: - pop {r1} - bx r1 - thumb_func_end sub_8138168 - - thumb_func_start sub_81381B0 -sub_81381B0: @ 81381B0 - push {lr} - movs r0, 0x80 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _081381E2 - ldr r0, =gMapHeader - ldrb r0, [r0, 0x17] - cmp r0, 0x1 - blt _081381E2 - cmp r0, 0x3 - ble _081381CE - cmp r0, 0x6 - bne _081381E2 -_081381CE: - ldr r0, =0x000040f4 - bl GetVarPointer - ldrh r1, [r0] - adds r1, 0x1 - strh r1, [r0] - lsls r1, 16 - lsrs r1, 16 - cmp r1, 0xF9 - bhi _081381F0 -_081381E2: - movs r0, 0 - b _081381F2 - .pool -_081381F0: - movs r0, 0x1 -_081381F2: - pop {r1} - bx r1 - thumb_func_end sub_81381B0 - - thumb_func_start sub_81381F8 -sub_81381F8: @ 81381F8 - push {lr} - movs r0, 0x75 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _0813822A - ldr r0, =gMapHeader - ldrb r0, [r0, 0x17] - cmp r0, 0x1 - blt _0813822A - cmp r0, 0x3 - ble _08138216 - cmp r0, 0x6 - bne _0813822A -_08138216: - ldr r0, =0x000040f6 - bl GetVarPointer - ldrh r1, [r0] - adds r1, 0x1 - strh r1, [r0] - lsls r1, 16 - lsrs r1, 16 - cmp r1, 0xF9 - bhi _08138238 -_0813822A: - movs r0, 0 - b _0813823A - .pool -_08138238: - movs r0, 0x1 -_0813823A: - pop {r1} - bx r1 - thumb_func_end sub_81381F8 - - thumb_func_start sub_8138240 -sub_8138240: @ 8138240 - push {r4-r7,lr} - mov r7, r8 - push {r7} - movs r6, 0 - bl GetMultiplayerId - lsls r0, 24 - lsrs r7, r0, 24 - bl GetLinkPlayerCount - lsls r0, 24 - lsrs r5, r0, 24 - movs r4, 0 - cmp r4, r5 - bcs _0813828A - ldr r0, =gTVStringVarPtrs - mov r8, r0 -_08138262: - cmp r7, r4 - beq _08138280 - lsls r0, r6, 2 - add r0, r8 - ldr r0, [r0] - lsls r1, r4, 3 - subs r1, r4 - lsls r1, 2 - ldr r2, =gLinkPlayers + 8 - adds r1, r2 - bl StringCopy - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 -_08138280: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, r5 - bcc _08138262 -_0813828A: - adds r0, r5, 0 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8138240 - - thumb_func_start SpawnLinkPartnerFieldObject -SpawnLinkPartnerFieldObject: @ 81382A0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x14 - movs r7, 0 - movs r0, 0 - mov r9, r0 - mov r8, r0 - ldr r1, =gUnknown_085B2B5C - add r0, sp, 0x8 - movs r2, 0x4 - bl memcpy - add r4, sp, 0xC - ldr r1, =gUnknown_085B2B60 - adds r0, r4, 0 - movs r2, 0x8 - bl memcpy - bl GetMultiplayerId - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - bl player_get_direction_lower_nybble - lsls r0, 24 - lsrs r0, 24 - adds r1, r0, 0 - cmp r0, 0x2 - beq _08138310 - cmp r0, 0x2 - bgt _081382F4 - cmp r0, 0x1 - beq _0813833C - b _08138350 - .pool -_081382F4: - cmp r1, 0x3 - beq _081382FE - cmp r1, 0x4 - beq _08138324 - b _08138350 -_081382FE: - movs r7, 0x2 - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - ldrh r0, [r1] - subs r0, 0x1 - b _0813832C - .pool -_08138310: - movs r7, 0x1 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldrh r1, [r0] - mov r9, r1 - ldrh r0, [r0, 0x2] - subs r0, 0x1 - b _0813834A - .pool -_08138324: - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - ldrh r0, [r1] - adds r0, 0x1 -_0813832C: - lsls r0, 16 - lsrs r0, 16 - mov r9, r0 - ldrh r1, [r1, 0x2] - mov r8, r1 - b _08138350 - .pool -_0813833C: - movs r7, 0x3 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldrh r3, [r0] - mov r9, r3 - ldrh r0, [r0, 0x2] - adds r0, 0x1 -_0813834A: - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 -_08138350: - movs r6, 0 - b _08138410 - .pool -_08138358: - cmp r10, r6 - beq _0813840A - ldr r0, =gLinkPlayers - lsls r2, r6, 3 - subs r1, r2, r6 - lsls r1, 2 - adds r1, r0 - ldrb r3, [r1] - adds r4, r0, 0 - cmp r3, 0x1 - blt _0813838C - cmp r3, 0x2 - ble _0813837C - cmp r3, 0x3 - beq _08138388 - b _0813838C - .pool -_0813837C: - ldrb r0, [r1, 0x13] - movs r5, 0xEC - cmp r0, 0 - bne _0813839C - movs r5, 0xEB - b _0813839C -_08138388: - ldrb r0, [r1, 0x13] - b _08138394 -_0813838C: - subs r0, r2, r6 - lsls r0, 2 - adds r0, r4 - ldrb r0, [r0, 0x13] -_08138394: - movs r5, 0x69 - cmp r0, 0 - bne _0813839C - movs r5, 0x64 -_0813839C: - mov r0, sp - adds r0, r7 - adds r0, 0x8 - ldrb r1, [r0] - movs r4, 0xF0 - subs r4, r6 - lsls r4, 24 - lsrs r4, 24 - lsls r2, r7, 1 - mov r0, sp - adds r0, r2 - adds r0, 0xC - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - mov r3, r9 - lsls r3, 16 - asrs r3, 16 - mov r12, r3 - add r0, r12 - adds r3, r0, 0x7 - lsls r3, 16 - asrs r3, 16 - mov r12, r3 - mov r0, sp - adds r0, 0xD - adds r0, r2 - movs r2, 0 - ldrsb r2, [r0, r2] - mov r3, r8 - lsls r0, r3, 16 - asrs r0, 16 - adds r0, r2 - adds r0, 0x7 - lsls r0, 16 - asrs r0, 16 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - adds r0, r5, 0 - adds r2, r4, 0 - mov r3, r12 - bl SpawnSpecialFieldObjectParametrized - adds r0, r5, 0 - adds r1, r4, 0 - adds r2, r6, 0 - bl sub_813842C - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0x4 - bne _0813840A - movs r7, 0 -_0813840A: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 -_08138410: - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r6, r0 - bcc _08138358 - add sp, 0x14 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end SpawnLinkPartnerFieldObject - - thumb_func_start sub_813842C -sub_813842C: @ 813842C - push {r4,r5,lr} - lsls r0, 24 - lsls r1, 24 - lsrs r3, r1, 24 - lsls r2, 24 - movs r1, 0xC0 - lsls r1, 19 - adds r2, r1 - lsrs r5, r2, 24 - lsrs r4, r0, 24 - movs r2, 0xA8 - lsls r2, 21 - adds r0, r2 - lsrs r0, 24 - cmp r0, 0x1 - bls _08138454 - cmp r4, 0x64 - beq _08138454 - cmp r4, 0x69 - bne _081384E6 -_08138454: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldrb r1, [r0, 0x5] - ldrb r2, [r0, 0x4] - adds r0, r3, 0 - bl GetFieldObjectIdByLocalIdAndMap - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x10 - beq _081384E6 - ldr r1, =gMapObjects - lsls r0, r2, 3 - adds r0, r2 - lsls r0, 2 - adds r0, r1 - ldrb r0, [r0, 0x4] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r0, =gSprites - adds r1, r0 - lsls r3, r5, 4 - ldrb r2, [r1, 0x5] - movs r0, 0xF - ands r0, r2 - orrs r0, r3 - strb r0, [r1, 0x5] - cmp r4, 0x69 - beq _081384D8 - cmp r4, 0x69 - bgt _081384A8 - cmp r4, 0x64 - beq _081384C4 - b _081384E6 - .pool -_081384A8: - cmp r4, 0xEB - beq _081384B2 - cmp r4, 0xEC - beq _081384BC - b _081384E6 -_081384B2: - ldr r0, =gFieldObjectPalette33 - b _081384C6 - .pool -_081384BC: - ldr r0, =gFieldObjectPalette34 - b _081384C6 - .pool -_081384C4: - ldr r0, =gFieldObjectPalette8 -_081384C6: - movs r2, 0x80 - lsls r2, 1 - adds r1, r3, r2 - movs r2, 0x20 - bl LoadPalette - b _081384E6 - .pool -_081384D8: - ldr r0, =gFieldObjectPalette17 - movs r2, 0x80 - lsls r2, 1 - adds r1, r3, r2 - movs r2, 0x20 - bl LoadPalette -_081384E6: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813842C - - thumb_func_start sub_81384F0 -sub_81384F0: @ 81384F0 - push {r4,r5,lr} - movs r4, 0 - ldr r5, =gUnknown_085B2B68 -_081384F6: - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r4, r0 - bne _0813851C - lsls r1, r4, 2 - adds r1, r5 - ldrb r0, [r1] - ldrb r1, [r1, 0x1] - ldr r2, =0x00000206 - bl MapGridSetMetatileIdAt - b _0813852A - .pool -_0813851C: - lsls r1, r4, 2 - adds r1, r5 - ldrb r0, [r1] - ldrb r1, [r1, 0x1] - ldr r2, =0x00000205 - bl MapGridSetMetatileIdAt -_0813852A: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x3 - bls _081384F6 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81384F0 - - thumb_func_start sub_8138540 -sub_8138540: @ 8138540 - push {r4-r6,lr} - movs r5, 0xC -_08138544: - movs r4, 0x7 - adds r6, r5, 0x1 -_08138548: - adds r0, r4, 0 - adds r1, r5, 0 - bl MapGridGetMetatileIdAt - ldr r1, =0xfffffde6 - adds r0, r1 - cmp r0, 0x37 - bls _0813855A - b _08138734 -_0813855A: - lsls r0, 2 - ldr r1, =_0813856C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0813856C: - .4byte _081386F2 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _0813864C - .4byte _08138652 - .4byte _0813868C - .4byte _08138694 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _0813865C - .4byte _08138662 - .4byte _0813869C - .4byte _081386A4 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _0813866C - .4byte _08138672 - .4byte _081386AC - .4byte _081386B4 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _0813867C - .4byte _08138684 - .4byte _081386BC - .4byte _081386C4 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _081386CC - .4byte _081386DC - .4byte _081386EC - .4byte _08138714 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _081386D4 - .4byte _081386E4 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _08138734 - .4byte _0813872A - .4byte _0813871C -_0813864C: - movs r2, 0x8C - lsls r2, 2 - b _08138720 -_08138652: - ldr r2, =0x00000231 - b _08138720 - .pool -_0813865C: - movs r2, 0x8E - lsls r2, 2 - b _08138720 -_08138662: - ldr r2, =0x00000239 - b _08138720 - .pool -_0813866C: - movs r2, 0x88 - lsls r2, 2 - b _08138720 -_08138672: - ldr r2, =0x00000221 - b _08138720 - .pool -_0813867C: - ldr r2, =0x00000e28 - b _08138720 - .pool -_08138684: - ldr r2, =0x00000e29 - b _08138720 - .pool -_0813868C: - ldr r2, =0x00000232 - b _08138720 - .pool -_08138694: - ldr r2, =0x00000233 - b _08138720 - .pool -_0813869C: - ldr r2, =0x0000023a - b _08138720 - .pool -_081386A4: - ldr r2, =0x0000023b - b _08138720 - .pool -_081386AC: - ldr r2, =0x00000222 - b _08138720 - .pool -_081386B4: - ldr r2, =0x00000223 - b _08138720 - .pool -_081386BC: - ldr r2, =0x00000e2a - b _08138720 - .pool -_081386C4: - ldr r2, =0x00000e2b - b _08138720 - .pool -_081386CC: - ldr r2, =0x00000e42 - b _08138720 - .pool -_081386D4: - ldr r2, =0x0000021a - b _08138720 - .pool -_081386DC: - ldr r2, =0x00000e43 - b _08138720 - .pool -_081386E4: - ldr r2, =0x0000021a - b _08138720 - .pool -_081386EC: - movs r2, 0xE4 - lsls r2, 4 - b _08138720 -_081386F2: - subs r1, r5, 0x1 - adds r0, r4, 0 - bl MapGridGetMetatileIdAt - movs r1, 0x90 - lsls r1, 2 - cmp r0, r1 - bne _0813870C - ldr r2, =0x00000e48 - b _08138720 - .pool -_0813870C: - ldr r2, =0x00000e49 - b _08138720 - .pool -_08138714: - ldr r2, =0x00000e41 - b _08138720 - .pool -_0813871C: - movs r2, 0xE5 - lsls r2, 4 -_08138720: - adds r0, r4, 0 - adds r1, r5, 0 - bl MapGridSetMetatileIdAt - b _08138734 -_0813872A: - ldr r2, =0x00000251 - adds r0, r4, 0 - adds r1, r5, 0 - bl MapGridSetMetatileIdAt -_08138734: - adds r4, 0x1 - cmp r4, 0xF - bgt _0813873C - b _08138548 -_0813873C: - adds r5, r6, 0 - cmp r5, 0x17 - bgt _08138744 - b _08138544 -_08138744: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8138540 - - thumb_func_start sub_8138750 -sub_8138750: @ 8138750 - push {r4-r6,lr} - ldr r4, =gUnknown_085B2B68 - movs r5, 0x3 -_08138756: - ldrb r0, [r4] - ldrb r1, [r4, 0x1] - ldr r2, =0x00000206 - bl MapGridSetMetatileIdAt - adds r4, 0x4 - subs r5, 0x1 - cmp r5, 0 - bge _08138756 - movs r5, 0xC -_0813876A: - movs r4, 0x7 - adds r6, r5, 0x1 -_0813876E: - adds r0, r4, 0 - adds r1, r5, 0 - bl MapGridGetMetatileIdAt - ldr r1, =0xfffffde0 - adds r0, r1 - cmp r0, 0x30 - bls _08138780 - b _081388CA -_08138780: - lsls r0, 2 - ldr r1, =_0813879C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0813879C: - .4byte _08138860 - .4byte _08138866 - .4byte _08138880 - .4byte _08138888 - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _08138870 - .4byte _08138876 - .4byte _08138890 - .4byte _08138898 - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388A0 - .4byte _081388A8 - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388B0 - .4byte _081388B0 - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388CA - .4byte _081388C0 -_08138860: - movs r2, 0x8C - lsls r2, 2 - b _081388B2 -_08138866: - ldr r2, =0x00000231 - b _081388B2 - .pool -_08138870: - movs r2, 0x8E - lsls r2, 2 - b _081388B2 -_08138876: - ldr r2, =0x00000239 - b _081388B2 - .pool -_08138880: - ldr r2, =0x00000232 - b _081388B2 - .pool -_08138888: - ldr r2, =0x00000233 - b _081388B2 - .pool -_08138890: - ldr r2, =0x0000023a - b _081388B2 - .pool -_08138898: - ldr r2, =0x0000023b - b _081388B2 - .pool -_081388A0: - ldr r2, =0x00000e42 - b _081388B2 - .pool -_081388A8: - ldr r2, =0x00000e43 - b _081388B2 - .pool -_081388B0: - ldr r2, =0x0000021a -_081388B2: - adds r0, r4, 0 - adds r1, r5, 0 - bl MapGridSetMetatileIdAt - b _081388CA - .pool -_081388C0: - ldr r2, =0x00000251 - adds r0, r4, 0 - adds r1, r5, 0 - bl MapGridSetMetatileIdAt -_081388CA: - adds r4, 0x1 - cmp r4, 0xF - bgt _081388D2 - b _0813876E -_081388D2: - adds r5, r6, 0 - cmp r5, 0x17 - bgt _081388DA - b _0813876A -_081388DA: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8138750 - - thumb_func_start sub_81388E4 -sub_81388E4: @ 81388E4 - push {lr} - ldr r0, =gUnknown_0203AB5C - movs r1, 0 - strb r1, [r0] - ldr r0, =gUnknown_0203AB5D - strb r1, [r0] - movs r0, 0x2C - bl PlaySE - ldr r0, =sub_8138910 - movs r1, 0x8 - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_81388E4 - - thumb_func_start sub_8138910 -sub_8138910: @ 8138910 - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - ldr r0, =gUnknown_085B2B78 - ldr r5, =gUnknown_0203AB5D - ldrb r1, [r5] - adds r0, r1, r0 - ldr r4, =gUnknown_0203AB5C - ldrb r2, [r4] - ldrb r0, [r0] - cmp r0, r2 - bne _0813896C - ldr r0, =gSpecialVar_0x8004 - ldrb r0, [r0] - ldr r2, =gUnknown_085B2B7E - lsls r1, 1 - adds r1, r2 - ldrh r1, [r1] - bl sub_8138978 - movs r0, 0 - strb r0, [r4] - ldrb r0, [r5] - adds r0, 0x1 - strb r0, [r5] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x5 - bne _08138970 - adds r0, r6, 0 - bl DestroyTask - bl EnableBothScriptContexts - b _08138970 - .pool -_0813896C: - adds r0, r2, 0x1 - strb r0, [r4] -_08138970: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8138910 - - thumb_func_start sub_8138978 -sub_8138978: @ 8138978 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x10 - lsls r0, 24 - lsrs r0, 24 - lsls r1, 16 - lsrs r2, r1, 16 - movs r7, 0 - subs r0, 0x1 - cmp r0, 0x7 - bhi _08138A40 - lsls r0, 2 - ldr r1, =_081389A0 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_081389A0: - .4byte _081389C0 - .4byte _081389D2 - .4byte _081389E4 - .4byte _081389F6 - .4byte _08138A04 - .4byte _08138A1A - .4byte _08138A26 - .4byte _08138A34 -_081389C0: - movs r7, 0x2 - mov r1, sp - movs r0, 0x1 - strh r0, [r1] - movs r0, 0x7 - strh r0, [r1, 0x2] - add r1, sp, 0x8 - movs r0, 0x68 - b _08138A14 -_081389D2: - movs r7, 0x2 - mov r1, sp - movs r0, 0x1 - strh r0, [r1] - movs r0, 0x7 - strh r0, [r1, 0x2] - add r1, sp, 0x8 - movs r0, 0x4E - b _08138A14 -_081389E4: - movs r7, 0x2 - mov r1, sp - movs r0, 0x1 - strh r0, [r1] - movs r0, 0x7 - strh r0, [r1, 0x2] - add r1, sp, 0x8 - movs r0, 0x5B - b _08138A14 -_081389F6: - movs r7, 0x1 - mov r1, sp - movs r0, 0x7 - strh r0, [r1] - add r1, sp, 0x8 - movs r0, 0x27 - b _08138A3E -_08138A04: - movs r7, 0x2 - mov r1, sp - movs r0, 0x1 - strh r0, [r1] - movs r0, 0x7 - strh r0, [r1, 0x2] - add r1, sp, 0x8 - movs r0, 0x34 -_08138A14: - strh r0, [r1] - strh r0, [r1, 0x2] - b _08138A40 -_08138A1A: - movs r7, 0x1 - mov r0, sp - strh r7, [r0] - add r1, sp, 0x8 - movs r0, 0x41 - b _08138A3E -_08138A26: - movs r7, 0x1 - mov r1, sp - movs r0, 0x7 - strh r0, [r1] - add r1, sp, 0x8 - movs r0, 0xD - b _08138A3E -_08138A34: - movs r7, 0x1 - mov r0, sp - strh r7, [r0] - add r1, sp, 0x8 - movs r0, 0x1A -_08138A3E: - strh r0, [r1] -_08138A40: - movs r6, 0 - cmp r6, r7 - bcs _08138A92 - movs r1, 0xC0 - lsls r1, 4 - adds r0, r1, 0 - adds r1, r2, 0 - orrs r1, r0 - lsls r1, 16 - mov r9, r1 - adds r1, r2, 0 - adds r1, 0x8 - orrs r1, r0 - lsls r1, 16 - mov r8, r1 -_08138A5E: - lsls r1, r6, 1 - mov r3, sp - adds r5, r3, r1 - ldrh r0, [r5] - adds r0, 0x7 - add r4, sp, 0x8 - adds r4, r1 - ldrh r1, [r4] - adds r1, 0x7 - mov r3, r9 - lsrs r2, r3, 16 - bl MapGridSetMetatileIdAt - ldrh r0, [r5] - adds r0, 0x7 - ldrh r1, [r4] - adds r1, 0x8 - mov r3, r8 - lsrs r2, r3, 16 - bl MapGridSetMetatileIdAt - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, r7 - bcc _08138A5E -_08138A92: - bl DrawWholeMapView - add sp, 0x10 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8138978 - - thumb_func_start sub_8138AA4 -sub_8138AA4: @ 8138AA4 - push {lr} - ldr r0, =gSpecialVar_0x8004 - ldrb r0, [r0] - ldr r1, =gUnknown_085B2B7E - ldrh r1, [r1, 0x8] - bl sub_8138978 - pop {r0} - bx r0 - .pool - thumb_func_end sub_8138AA4 - - thumb_func_start sub_8138AC0 -sub_8138AC0: @ 8138AC0 - push {lr} - ldr r0, =gStringVar4 - bl ShowFieldMessage - pop {r0} - bx r0 - .pool - thumb_func_end sub_8138AC0 - - thumb_func_start sub_8138AD0 -sub_8138AD0: @ 8138AD0 - ldr r1, =gSpecialVar_0x8004 - ldr r0, =gSaveBlock1Ptr - ldr r2, [r0] - ldrh r0, [r2] - strh r0, [r1] - ldr r1, =gSpecialVar_0x8005 - ldrh r0, [r2, 0x2] - strh r0, [r1] - bx lr - .pool - thumb_func_end sub_8138AD0 - - thumb_func_start sub_8138AF0 -sub_8138AF0: @ 8138AF0 - push {lr} - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldrb r1, [r0, 0xB] - lsls r1, 8 - ldrb r0, [r0, 0xA] - orrs r0, r1 - movs r1, 0xA - bl __umodsi3 - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .pool - thumb_func_end sub_8138AF0 - - thumb_func_start sub_8138B10 -sub_8138B10: @ 8138B10 - push {lr} - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldrb r0, [r0, 0x8] - cmp r0, 0 - bne _08138B34 - ldr r0, =gStringVar1 - ldr r1, =gText_BigGuy - bl StringCopy - b _08138B3C - .pool -_08138B34: - ldr r0, =gStringVar1 - ldr r1, =gText_BigGirl - bl StringCopy -_08138B3C: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8138B10 - - thumb_func_start sub_8138B48 -sub_8138B48: @ 8138B48 - push {lr} - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldrb r0, [r0, 0x8] - cmp r0, 0 - bne _08138B6C - ldr r0, =gStringVar1 - ldr r1, =gText_Daughter - bl StringCopy - b _08138B74 - .pool -_08138B6C: - ldr r0, =gStringVar1 - ldr r1, =gText_Son - bl StringCopy -_08138B74: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8138B48 - - thumb_func_start sub_8138B80 -sub_8138B80: @ 8138B80 - ldr r0, =gBattleOutcome - ldrb r0, [r0] - bx lr - .pool - thumb_func_end sub_8138B80 - - thumb_func_start sub_8138B8C -sub_8138B8C: @ 8138B8C - push {lr} - sub sp, 0x4 - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0 - beq _08138BB0 - movs r2, 0x1 - negs r2, r2 - movs r0, 0x4 - str r0, [sp] - movs r0, 0x13 - movs r1, 0 - movs r3, 0x6 - bl Overworld_SetWarpDestination - b _08138BC2 - .pool -_08138BB0: - movs r2, 0x1 - negs r2, r2 - movs r0, 0x4 - str r0, [sp] - movs r0, 0x13 - movs r1, 0x1 - movs r3, 0x6 - bl Overworld_SetWarpDestination -_08138BC2: - add sp, 0x4 - pop {r0} - bx r0 - thumb_func_end sub_8138B8C - - thumb_func_start sub_8138BC8 -sub_8138BC8: @ 8138BC8 - push {lr} - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - bl FlagSet - pop {r0} - bx r0 - .pool - thumb_func_end sub_8138BC8 - - thumb_func_start sub_8138BDC -sub_8138BDC: @ 8138BDC - push {lr} - ldr r0, =gLocalTime - movs r1, 0 - ldrsh r0, [r0, r1] - movs r1, 0x7 - bl __divsi3 - lsls r0, 16 - lsrs r0, 16 - ldr r1, =0x0000270f - cmp r0, r1 - bls _08138BF6 - adds r0, r1, 0 -_08138BF6: - pop {r1} - bx r1 - .pool - thumb_func_end sub_8138BDC - - thumb_func_start sub_8138C04 -sub_8138C04: @ 8138C04 - push {r4,lr} - bl GetLeadMonIndex - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x64 - muls r1, r0 - ldr r0, =gPlayerParty - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0x20 - bl GetMonData - cmp r0, 0xFF - bne _08138C2C - movs r0, 0x6 - b _08138C7E - .pool -_08138C2C: - adds r0, r4, 0 - movs r1, 0x20 - bl GetMonData - cmp r0, 0xC7 - bls _08138C3C - movs r0, 0x5 - b _08138C7E -_08138C3C: - adds r0, r4, 0 - movs r1, 0x20 - bl GetMonData - cmp r0, 0x95 - bls _08138C4C - movs r0, 0x4 - b _08138C7E -_08138C4C: - adds r0, r4, 0 - movs r1, 0x20 - bl GetMonData - cmp r0, 0x63 - bls _08138C5C - movs r0, 0x3 - b _08138C7E -_08138C5C: - adds r0, r4, 0 - movs r1, 0x20 - bl GetMonData - cmp r0, 0x31 - bls _08138C6C - movs r0, 0x2 - b _08138C7E -_08138C6C: - adds r0, r4, 0 - movs r1, 0x20 - bl GetMonData - cmp r0, 0 - bne _08138C7C - movs r0, 0 - b _08138C7E -_08138C7C: - movs r0, 0x1 -_08138C7E: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_8138C04 - - thumb_func_start sub_8138C84 -sub_8138C84: @ 8138C84 - push {lr} - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music - bl sub_817018C - pop {r0} - bx r0 - .pool - thumb_func_end sub_8138C84 - - thumb_func_start sub_8138C94 -sub_8138C94: @ 8138C94 - push {lr} - ldr r0, =sub_8138C84 - bl SetMainCallback2 - pop {r0} - bx r0 - .pool - thumb_func_end sub_8138C94 - - thumb_func_start sp0D9_ComputerRelated -sp0D9_ComputerRelated: @ 8138CA4 - push {r4,lr} - ldr r4, =sub_8138CE8 - adds r0, r4, 0 - bl FuncIsActiveTask - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08138CD8 - adds r0, r4, 0 - movs r1, 0x8 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r2, 0 - strh r2, [r1, 0x8] - strh r0, [r1, 0xA] - strh r2, [r1, 0xC] - strh r2, [r1, 0xE] - strh r2, [r1, 0x10] -_08138CD8: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sp0D9_ComputerRelated - - thumb_func_start sub_8138CE8 -sub_8138CE8: @ 8138CE8 - push {lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, =gTasks - adds r1, r0 - movs r2, 0x8 - ldrsh r0, [r1, r2] - cmp r0, 0 - bne _08138D06 - adds r0, r1, 0 - bl sub_8138D10 -_08138D06: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8138CE8 - - thumb_func_start sub_8138D10 -sub_8138D10: @ 8138D10 - push {r4-r6,lr} - adds r4, r0, 0 - movs r6, 0 - movs r5, 0 - movs r1, 0xE - ldrsh r0, [r4, r1] - cmp r0, 0x6 - bne _08138D7C - strh r5, [r4, 0xE] - bl player_get_direction_lower_nybble - lsls r0, 24 - lsrs r0, 24 - adds r1, r0, 0 - cmp r0, 0x3 - beq _08138D44 - cmp r0, 0x3 - bgt _08138D3A - cmp r0, 0x2 - beq _08138D40 - b _08138D4C -_08138D3A: - cmp r1, 0x4 - beq _08138D48 - b _08138D4C -_08138D40: - movs r6, 0 - b _08138D4A -_08138D44: - movs r6, 0xFF - b _08138D4A -_08138D48: - movs r6, 0x1 -_08138D4A: - movs r5, 0xFF -_08138D4C: - movs r1, 0x10 - ldrsh r0, [r4, r1] - lsls r1, r6, 24 - asrs r1, 24 - lsls r2, r5, 24 - asrs r2, 24 - bl sub_8138D88 - bl DrawWholeMapView - ldrh r0, [r4, 0x10] - movs r1, 0x1 - eors r0, r1 - strh r0, [r4, 0x10] - ldrh r0, [r4, 0xC] - adds r0, 0x1 - strh r0, [r4, 0xC] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5 - bne _08138D7C - ldrb r0, [r4, 0xA] - bl DestroyTask -_08138D7C: - ldrh r0, [r4, 0xE] - adds r0, 0x1 - strh r0, [r4, 0xE] - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8138D10 - - thumb_func_start sub_8138D88 -sub_8138D88: @ 8138D88 - push {r4,r5,lr} - lsls r1, 24 - lsrs r1, 24 - lsls r2, 24 - lsrs r4, r2, 24 - movs r3, 0 - lsls r0, 16 - cmp r0, 0 - beq _08138DC4 - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0 - bne _08138DAC - movs r3, 0x4 - b _08138DE6 - .pool -_08138DAC: - cmp r0, 0x1 - bne _08138DB8 - ldr r3, =0x0000025a - b _08138DE6 - .pool -_08138DB8: - cmp r0, 0x2 - bne _08138DE6 - ldr r3, =0x00000259 - b _08138DE6 - .pool -_08138DC4: - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0 - bne _08138DD4 - movs r3, 0x5 - b _08138DE6 - .pool -_08138DD4: - cmp r0, 0x1 - bne _08138DE0 - ldr r3, =0x0000027f - b _08138DE6 - .pool -_08138DE0: - cmp r0, 0x2 - bne _08138DE6 - ldr r3, =0x0000027e -_08138DE6: - ldr r0, =gSaveBlock1Ptr - ldr r2, [r0] - movs r5, 0 - ldrsh r0, [r2, r5] - lsls r1, 24 - asrs r1, 24 - adds r0, r1 - adds r0, 0x7 - movs r5, 0x2 - ldrsh r1, [r2, r5] - lsls r2, r4, 24 - asrs r2, 24 - adds r1, r2 - adds r1, 0x7 - movs r4, 0xC0 - lsls r4, 4 - adds r2, r4, 0 - orrs r3, r2 - adds r2, r3, 0 - bl MapGridSetMetatileIdAt - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8138D88 - - thumb_func_start sub_8138E20 -sub_8138E20: @ 8138E20 - push {lr} - bl sub_8138E2C - pop {r0} - bx r0 - thumb_func_end sub_8138E20 - - thumb_func_start sub_8138E2C -sub_8138E2C: @ 8138E2C - push {r4-r6,lr} - movs r6, 0 - movs r5, 0 - movs r4, 0 - bl player_get_direction_lower_nybble - lsls r0, 24 - lsrs r0, 24 - adds r1, r0, 0 - cmp r0, 0x3 - beq _08138E56 - cmp r0, 0x3 - bgt _08138E4C - cmp r0, 0x2 - beq _08138E52 - b _08138E5E -_08138E4C: - cmp r1, 0x4 - beq _08138E5A - b _08138E5E -_08138E52: - movs r6, 0 - b _08138E5C -_08138E56: - movs r6, 0xFF - b _08138E5C -_08138E5A: - movs r6, 0x1 -_08138E5C: - movs r5, 0xFF -_08138E5E: - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0 - bne _08138E70 - movs r4, 0x4 - b _08138E82 - .pool -_08138E70: - cmp r0, 0x1 - bne _08138E7C - ldr r4, =0x0000025a - b _08138E82 - .pool -_08138E7C: - cmp r0, 0x2 - bne _08138E82 - ldr r4, =0x00000259 -_08138E82: - ldr r0, =gSaveBlock1Ptr - ldr r2, [r0] - movs r1, 0 - ldrsh r0, [r2, r1] - lsls r1, r6, 24 - asrs r1, 24 - adds r0, r1 - adds r0, 0x7 - movs r3, 0x2 - ldrsh r1, [r2, r3] - lsls r2, r5, 24 - asrs r2, 24 - adds r1, r2 - adds r1, 0x7 - movs r3, 0xC0 - lsls r3, 4 - adds r2, r3, 0 - orrs r4, r2 - adds r2, r4, 0 - bl MapGridSetMetatileIdAt - bl DrawWholeMapView - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8138E2C - - thumb_func_start sub_8138EC0 -sub_8138EC0: @ 8138EC0 - push {r4,lr} - ldr r4, =sub_8138F04 - adds r0, r4, 0 - bl FuncIsActiveTask - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08138EF4 - adds r0, r4, 0 - movs r1, 0x8 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r2, 0 - strh r2, [r1, 0x8] - strh r0, [r1, 0xA] - strh r2, [r1, 0xC] - strh r2, [r1, 0xE] - strh r2, [r1, 0x10] -_08138EF4: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8138EC0 - - thumb_func_start sub_8138F04 -sub_8138F04: @ 8138F04 - push {lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, =gTasks - adds r1, r0 - movs r2, 0x8 - ldrsh r0, [r1, r2] - cmp r0, 0 - bne _08138F22 - adds r0, r1, 0 - bl sub_8138F2C -_08138F22: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8138F04 - - thumb_func_start sub_8138F2C -sub_8138F2C: @ 8138F2C - push {r4,lr} - adds r4, r0, 0 - movs r1, 0xE - ldrsh r0, [r4, r1] - cmp r0, 0x6 - bne _08138F9A - movs r0, 0 - strh r0, [r4, 0xE] - movs r1, 0x10 - ldrsh r0, [r4, r1] - cmp r0, 0 - beq _08138F64 - ldr r2, =0x00000e9d - movs r0, 0x12 - movs r1, 0x8 - bl MapGridSetMetatileIdAt - ldr r2, =0x00000ea5 - movs r0, 0x12 - movs r1, 0x9 - bl MapGridSetMetatileIdAt - b _08138F7A - .pool -_08138F64: - ldr r2, =0x00000e58 - movs r0, 0x12 - movs r1, 0x8 - bl MapGridSetMetatileIdAt - movs r2, 0xE6 - lsls r2, 4 - movs r0, 0x12 - movs r1, 0x9 - bl MapGridSetMetatileIdAt -_08138F7A: - bl DrawWholeMapView - ldrh r0, [r4, 0x10] - movs r1, 0x1 - eors r0, r1 - strh r0, [r4, 0x10] - ldrh r0, [r4, 0xC] - adds r0, 0x1 - strh r0, [r4, 0xC] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5 - bne _08138F9A - ldrb r0, [r4, 0xA] - bl DestroyTask -_08138F9A: - ldrh r0, [r4, 0xE] - adds r0, 0x1 - strh r0, [r4, 0xE] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8138F2C - - thumb_func_start sub_8138FAC -sub_8138FAC: @ 8138FAC - push {lr} - ldr r2, =0x00000e9d - movs r0, 0x12 - movs r1, 0x8 - bl MapGridSetMetatileIdAt - ldr r2, =0x00000ea5 - movs r0, 0x12 - movs r1, 0x9 - bl MapGridSetMetatileIdAt - bl DrawWholeMapView - pop {r0} - bx r0 - .pool - thumb_func_end sub_8138FAC - - thumb_func_start sub_8138FD4 -sub_8138FD4: @ 8138FD4 - push {lr} - ldr r1, =gSpecialVar_0x8004 - ldr r0, =0x000001f5 - strh r0, [r1] - bl FlagSet - pop {r0} - bx r0 - .pool - thumb_func_end sub_8138FD4 - - thumb_func_start sub_8138FEC -sub_8138FEC: @ 8138FEC - push {lr} - ldr r1, =gSpecialVar_0x8004 - ldr r0, =0x000001f5 - strh r0, [r1] - bl FlagClear - pop {r0} - bx r0 - .pool - thumb_func_end sub_8138FEC - - thumb_func_start sub_8139004 -sub_8139004: @ 8139004 - push {lr} - bl GetLeadMonIndex - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x64 - muls r0, r1 - ldr r1, =gPlayerParty - adds r0, r1 - movs r1, 0x16 - bl GetMonData - cmp r0, 0xC7 - bls _08139028 - movs r0, 0x1 - b _0813902A - .pool -_08139028: - movs r0, 0 -_0813902A: - pop {r1} - bx r1 - thumb_func_end sub_8139004 - - thumb_func_start sub_8139030 -sub_8139030: @ 8139030 - push {lr} - bl GetLeadMonIndex - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x64 - muls r0, r1 - ldr r1, =gPlayerParty - adds r0, r1 - movs r1, 0x17 - bl GetMonData - cmp r0, 0xC7 - bls _08139054 - movs r0, 0x1 - b _08139056 - .pool -_08139054: - movs r0, 0 -_08139056: - pop {r1} - bx r1 - thumb_func_end sub_8139030 - - thumb_func_start sub_813905C -sub_813905C: @ 813905C - push {lr} - bl GetLeadMonIndex - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x64 - muls r0, r1 - ldr r1, =gPlayerParty - adds r0, r1 - movs r1, 0x18 - bl GetMonData - cmp r0, 0xC7 - bls _08139080 - movs r0, 0x1 - b _08139082 - .pool -_08139080: - movs r0, 0 -_08139082: - pop {r1} - bx r1 - thumb_func_end sub_813905C - - thumb_func_start sub_8139088 -sub_8139088: @ 8139088 - push {lr} - bl GetLeadMonIndex - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x64 - muls r0, r1 - ldr r1, =gPlayerParty - adds r0, r1 - movs r1, 0x21 - bl GetMonData - cmp r0, 0xC7 - bls _081390AC - movs r0, 0x1 - b _081390AE - .pool -_081390AC: - movs r0, 0 -_081390AE: - pop {r1} - bx r1 - thumb_func_end sub_8139088 - - thumb_func_start sub_81390B4 -sub_81390B4: @ 81390B4 - push {lr} - bl GetLeadMonIndex - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x64 - muls r0, r1 - ldr r1, =gPlayerParty - adds r0, r1 - movs r1, 0x2F - bl GetMonData - cmp r0, 0xC7 - bls _081390D8 - movs r0, 0x1 - b _081390DA - .pool -_081390D8: - movs r0, 0 -_081390DA: - pop {r1} - bx r1 - thumb_func_end sub_81390B4 - - thumb_func_start sub_81390E0 -sub_81390E0: @ 81390E0 - push {r4-r6,lr} - movs r5, 0 - ldr r6, =gBaseStats -_081390E6: - movs r0, 0x64 - adds r1, r5, 0 - muls r1, r0 - ldr r0, =gPlayerParty - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0x5 - bl GetMonData - cmp r0, 0 - beq _0813913C - adds r0, r4, 0 - movs r1, 0x2D - bl GetMonData - cmp r0, 0 - bne _0813913C - adds r0, r4, 0 - movs r1, 0xB - bl GetMonData - lsls r0, 16 - lsrs r0, 16 - lsls r1, r0, 3 - subs r1, r0 - lsls r1, 2 - adds r1, r6 - ldrb r0, [r1, 0x6] - cmp r0, 0xC - beq _08139128 - ldrb r0, [r1, 0x7] - cmp r0, 0xC - bne _0813913C -_08139128: - ldr r1, =gSpecialVar_Result - movs r0, 0x1 - b _0813914A - .pool -_0813913C: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x5 - bls _081390E6 - ldr r1, =gSpecialVar_Result - movs r0, 0 -_0813914A: - strh r0, [r1] - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81390E0 - - thumb_func_start SpawnScriptFieldObject -SpawnScriptFieldObject: @ 8139158 - push {lr} - sub sp, 0x8 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldrh r3, [r0] - adds r3, 0x7 - lsls r3, 16 - asrs r3, 16 - ldrh r0, [r0, 0x2] - adds r0, 0x7 - lsls r0, 16 - asrs r0, 16 - str r0, [sp] - movs r0, 0x3 - str r0, [sp, 0x4] - movs r0, 0x7 - movs r1, 0x8 - movs r2, 0x7F - bl SpawnSpecialFieldObjectParametrized - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gMapObjects - lsls r1, r0, 3 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldrb r0, [r1, 0x1] - movs r2, 0x20 - orrs r0, r2 - strb r0, [r1, 0x1] - ldrb r0, [r1, 0x4] - bl CameraObjectSetFollowedObjectId - add sp, 0x8 - pop {r0} - bx r0 - .pool - thumb_func_end SpawnScriptFieldObject - - thumb_func_start RemoveScriptFieldObject -RemoveScriptFieldObject: @ 81391AC - push {lr} - bl GetPlayerAvatarObjectId - lsls r0, 24 - lsrs r0, 24 - bl CameraObjectSetFollowedObjectId - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldrb r1, [r0, 0x5] - ldrb r2, [r0, 0x4] - movs r0, 0x7F - bl RemoveFieldObjectByLocalIdAndMap - pop {r0} - bx r0 - .pool - thumb_func_end RemoveScriptFieldObject - - thumb_func_start sub_81391D0 -sub_81391D0: @ 81391D0 - push {lr} - bl GetLeadMonIndex - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x64 - muls r0, r1 - ldr r1, =gPlayerParty - adds r0, r1 - bl GetNature - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gStringVar1 - bl sub_8137068 - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81391D0 - - thumb_func_start sub_8139200 -sub_8139200: @ 8139200 - push {r4,lr} - ldr r4, =gStringVar1 - ldr r0, =0x00004026 - bl VarGet - adds r1, r0, 0 - lsls r1, 16 - lsrs r1, 16 - adds r0, r4, 0 - movs r2, 0 - bl GetMapName - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8139200 - - thumb_func_start sub_8139228 -sub_8139228: @ 8139228 - push {lr} - movs r0, 0x20 - bl GetGameStat - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - thumb_func_end sub_8139228 - - thumb_func_start sub_8139238 -sub_8139238: @ 8139238 - push {lr} - ldr r0, =gStringVar1 - bl GetEreaderTrainerName - pop {r0} - bx r0 - .pool - thumb_func_end sub_8139238 - - thumb_func_start sub_8139248 -sub_8139248: @ 8139248 - push {r4,r5,lr} - ldr r0, =gSaveBlock1Ptr - ldr r2, [r0] - ldr r1, =0x00002e68 - adds r0, r2, r1 - ldrb r1, [r0] - lsls r1, 25 - ldr r0, =0x00002e6a - adds r2, r0 - lsrs r1, 25 - ldrh r2, [r2] - adds r1, r2 - ldr r2, =gUnknown_085B2B88 - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - adds r0, r2 - ldrb r0, [r0] - adds r5, r1, r0 - movs r0, 0x2 - bl GetPriceReduction - lsls r0, 24 - cmp r0, 0 - bne _08139294 - ldr r4, =gUnknown_085B2B94 - b _08139296 - .pool -_08139294: - ldr r4, =gUnknown_085B2BA0 -_08139296: - adds r0, r5, 0 - movs r1, 0xC - bl __umodsi3 - adds r0, r4 - ldrb r0, [r0] - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8139248 - - thumb_func_start sub_81392AC -sub_81392AC: @ 81392AC - push {lr} - ldr r1, =gSpecialVar_0x8004 - ldr r0, =0x00000213 - strh r0, [r1] - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _081392CC - movs r0, 0x1 - b _081392CE - .pool -_081392CC: - movs r0, 0 -_081392CE: - pop {r1} - bx r1 - thumb_func_end sub_81392AC - - thumb_func_start sub_81392D4 -sub_81392D4: @ 81392D4 - push {lr} - ldr r1, =gSpecialVar_0x8004 - movs r0, 0x85 - lsls r0, 2 - strh r0, [r1] - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _081392F0 - movs r0, 0x1 - b _081392F2 - .pool -_081392F0: - movs r0, 0 -_081392F2: - pop {r1} - bx r1 - thumb_func_end sub_81392D4 - - thumb_func_start sub_81392F8 -sub_81392F8: @ 81392F8 - push {lr} - ldr r1, =gSpecialVar_0x8004 - ldr r0, =0x00000215 - strh r0, [r1] - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _08139318 - movs r0, 0x1 - b _0813931A - .pool -_08139318: - movs r0, 0 -_0813931A: - pop {r1} - bx r1 - thumb_func_end sub_81392F8 - - thumb_func_start sub_8139320 -sub_8139320: @ 8139320 - push {lr} - ldr r1, =gSpecialVar_0x8004 - ldr r0, =0x00000216 - strh r0, [r1] - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _08139340 - movs r0, 0x1 - b _08139342 - .pool -_08139340: - movs r0, 0 -_08139342: - pop {r1} - bx r1 - thumb_func_end sub_8139320 - - thumb_func_start sub_8139348 -sub_8139348: @ 8139348 - push {lr} - bl GetLeadMonIndex - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x64 - muls r0, r1 - ldr r1, =gPlayerParty - adds r0, r1 - movs r1, 0x47 - movs r2, 0 - bl GetMonData - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .pool - thumb_func_end sub_8139348 - - thumb_func_start sub_8139370 -sub_8139370: @ 8139370 - push {r4,lr} - sub sp, 0x4 - movs r0, 0x2A - bl IncrementGameStat - ldr r0, =0x0000089b - bl FlagSet - movs r1, 0x1 - mov r0, sp - strb r1, [r0] - bl GetLeadMonIndex - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x64 - muls r1, r0 - ldr r0, =gPlayerParty - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0x47 - mov r2, sp - bl SetMonData - adds r0, r4, 0 - bl GetRibbonCount - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x4 - bls _081393B6 - adds r0, r4, 0 - movs r1, 0x47 - bl sub_80EE4DC -_081393B6: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8139370 - - thumb_func_start sub_81393C8 -sub_81393C8: @ 81393C8 - push {lr} - bl GetLeadMonIndex - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x64 - muls r0, r1 - ldr r1, =gPlayerParty - adds r0, r1 - bl GetMonEVCount - lsls r0, 16 - ldr r1, =0x01fd0000 - cmp r0, r1 - bhi _081393F4 - movs r0, 0 - b _081393F6 - .pool -_081393F4: - movs r0, 0x1 -_081393F6: - pop {r1} - bx r1 - thumb_func_end sub_81393C8 - - thumb_func_start sub_81393FC -sub_81393FC: @ 81393FC - push {lr} - movs r0, 0xC7 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - bne _08139454 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldrh r1, [r0, 0x4] - movs r0, 0x83 - lsls r0, 3 - cmp r1, r0 - bne _08139454 - subs r0, 0x75 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _08139434 - ldr r0, =0x0000409a - movs r1, 0x4 - b _08139446 - .pool -_08139434: - movs r0, 0xE9 - lsls r0, 2 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - beq _08139454 - ldr r0, =0x0000409a - movs r1, 0x5 -_08139446: - bl VarSet - movs r0, 0x1 - b _08139456 - .pool -_08139454: - movs r0, 0 -_08139456: - pop {r1} - bx r1 - thumb_func_end sub_81393FC - - thumb_func_start sub_813945C -sub_813945C: @ 813945C - push {lr} - ldr r0, =0x000008bf - bl FlagSet - pop {r0} - bx r0 - .pool - thumb_func_end sub_813945C - - thumb_func_start sub_813946C -sub_813946C: @ 813946C - push {r4,r5,lr} - sub sp, 0x14 - ldr r5, =gPlayerParty - movs r1, 0x90 - lsls r1, 1 - movs r4, 0 - str r4, [sp] - str r4, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - adds r0, r5, 0 - movs r2, 0x7 - movs r3, 0x20 - bl CreateMon - movs r1, 0x1 - add r0, sp, 0x10 - strh r1, [r0] - adds r0, r5, 0 - movs r1, 0x2E - add r2, sp, 0x10 - bl SetMonData - add r1, sp, 0x10 - movs r0, 0x21 - strh r0, [r1] - adds r0, r5, 0 - movs r1, 0xD - add r2, sp, 0x10 - bl SetMonData - add r0, sp, 0x10 - strh r4, [r0] - adds r0, r5, 0 - movs r1, 0xE - add r2, sp, 0x10 - bl SetMonData - adds r0, r5, 0 - movs r1, 0xF - add r2, sp, 0x10 - bl SetMonData - adds r0, r5, 0 - movs r1, 0x10 - add r2, sp, 0x10 - bl SetMonData - add sp, 0x14 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813946C - - thumb_func_start sub_81394D8 -sub_81394D8: @ 81394D8 - push {r4-r6,lr} - ldr r0, =0x00004023 - bl VarGet - lsls r0, 16 - lsrs r0, 16 - bl GetStarterPokemon - lsls r0, 16 - lsrs r6, r0, 16 - bl CalculatePlayerPartyCount - lsls r0, 24 - lsrs r5, r0, 24 - movs r4, 0 - cmp r4, r5 - bcs _08139526 -_081394FA: - movs r0, 0x64 - muls r0, r4 - ldr r1, =gPlayerParty - adds r0, r1 - movs r1, 0x41 - movs r2, 0 - bl GetMonData - cmp r0, r6 - bne _0813951C - movs r0, 0x1 - b _08139528 - .pool -_0813951C: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, r5 - bcc _081394FA -_08139526: - movs r0, 0 -_08139528: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_81394D8 - - thumb_func_start sub_8139530 -sub_8139530: @ 8139530 - push {lr} - bl sub_80D2218 - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - thumb_func_end sub_8139530 - - thumb_func_start sub_8139540 -sub_8139540: @ 8139540 - push {lr} - ldr r0, =gPlayerParty - movs r1, 0x3F - bl CheckPartyPokerus - lsls r0, 24 - cmp r0, 0 - beq _08139558 - movs r0, 0x1 - b _0813955A - .pool -_08139558: - movs r0, 0 -_0813955A: - pop {r1} - bx r1 - thumb_func_end sub_8139540 - - thumb_func_start sub_8139560 -sub_8139560: @ 8139560 - push {lr} - ldr r0, =sub_81395BC - movs r1, 0x9 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldr r0, =gSpecialVar_0x8005 - ldrh r0, [r0] - movs r2, 0 - strh r0, [r1, 0x8] - strh r2, [r1, 0xA] - ldr r0, =gSpecialVar_0x8006 - ldrh r0, [r0] - strh r0, [r1, 0xC] - ldr r0, =gSpecialVar_0x8007 - ldrh r0, [r0] - strh r0, [r1, 0xE] - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - strh r0, [r1, 0x10] - movs r0, 0 - bl SetCameraPanningCallback - movs r0, 0xD6 - bl PlaySE - pop {r0} - bx r0 - .pool - thumb_func_end sub_8139560 - - thumb_func_start sub_81395BC -sub_81395BC: @ 81395BC - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r4, r0, r1 - ldrh r0, [r4, 0x2] - adds r0, 0x1 - strh r0, [r4, 0x2] - movs r1, 0x2 - ldrsh r0, [r4, r1] - movs r2, 0x6 - ldrsh r1, [r4, r2] - bl __modsi3 - cmp r0, 0 - bne _08139614 - strh r0, [r4, 0x2] - ldrh r0, [r4, 0x4] - subs r0, 0x1 - strh r0, [r4, 0x4] - ldrh r0, [r4] - negs r0, r0 - strh r0, [r4] - ldrh r0, [r4, 0x8] - negs r0, r0 - strh r0, [r4, 0x8] - movs r1, 0 - ldrsh r0, [r4, r1] - movs r2, 0x8 - ldrsh r1, [r4, r2] - bl SetCameraPanning - movs r1, 0x4 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _08139614 - adds r0, r5, 0 - bl sub_8139620 - bl InstallCameraPanAheadCallback -_08139614: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81395BC - - thumb_func_start sub_8139620 -sub_8139620: @ 8139620 - push {lr} - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - bl EnableBothScriptContexts - pop {r0} - bx r0 - thumb_func_end sub_8139620 - - thumb_func_start sub_8139634 -sub_8139634: @ 8139634 - push {lr} - movs r0, 0x95 - lsls r0, 2 - bl FlagGet - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - thumb_func_end sub_8139634 - - thumb_func_start sub_8139648 -sub_8139648: @ 8139648 - push {lr} - bl get_map_light_from_warp0 - lsls r0, 24 - lsrs r0, 24 - bl is_light_level_1_2_3_5_or_6 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08139664 - movs r0, 0x14 - bl SetSav1Weather -_08139664: - pop {r0} - bx r0 - thumb_func_end sub_8139648 - - thumb_func_start sub_8139668 -sub_8139668: @ 8139668 - push {lr} - bl get_map_light_from_warp0 - lsls r0, 24 - lsrs r0, 24 - bl is_light_level_1_2_3_5_or_6 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08139684 - movs r0, 0x15 - bl SetSav1Weather -_08139684: - pop {r0} - bx r0 - thumb_func_end sub_8139668 - - thumb_func_start GetLeadMonIndex -GetLeadMonIndex: @ 8139688 - push {r4-r6,lr} - bl CalculatePlayerPartyCount - lsls r0, 24 - lsrs r6, r0, 24 - movs r5, 0 - cmp r5, r6 - bcs _081396D6 -_08139698: - movs r0, 0x64 - adds r1, r5, 0 - muls r1, r0 - ldr r0, =gPlayerParty - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0x41 - movs r2, 0 - bl GetMonData - movs r1, 0xCE - lsls r1, 1 - cmp r0, r1 - beq _081396CC - adds r0, r4, 0 - movs r1, 0x41 - movs r2, 0 - bl GetMonData - cmp r0, 0 - beq _081396CC - adds r0, r5, 0 - b _081396D8 - .pool -_081396CC: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, r6 - bcc _08139698 -_081396D6: - movs r0, 0 -_081396D8: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end GetLeadMonIndex - - thumb_func_start sub_81396E0 -sub_81396E0: @ 81396E0 - push {lr} - ldr r0, =gSpecialVar_0x8004 - ldrh r1, [r0] - movs r0, 0x64 - muls r0, r1 - ldr r1, =gPlayerParty - adds r0, r1 - movs r1, 0x41 - movs r2, 0 - bl GetMonData - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81396E0 - - thumb_func_start nullsub_54 -nullsub_54: @ 8139708 - bx lr - thumb_func_end nullsub_54 - - thumb_func_start sub_813970C -sub_813970C: @ 813970C - push {r4,lr} - ldr r0, =0x000040c2 - bl VarGet - lsls r0, 16 - lsrs r0, 16 - adds r3, r0, 0 - ldr r2, =gLocalTime - movs r1, 0 - ldrsh r0, [r2, r1] - subs r0, r3 - cmp r0, 0x6 - ble _08139734 - movs r0, 0 - b _0813974C - .pool -_08139734: - ldrh r1, [r2] - movs r4, 0 - ldrsh r0, [r2, r4] - cmp r0, 0 - blt _0813974A - subs r1, r3 - movs r0, 0x7 - subs r0, r1 - lsls r0, 16 - lsrs r0, 16 - b _0813974C -_0813974A: - movs r0, 0x8 -_0813974C: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_813970C - - thumb_func_start sub_8139754 -sub_8139754: @ 8139754 - push {r4,lr} - ldr r0, =0x000040c2 - ldr r4, =gLocalTime - ldrh r1, [r4] - bl VarSet - ldrh r0, [r4] - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_8139754 - - thumb_func_start sub_8139770 -sub_8139770: @ 8139770 - push {r4-r6,lr} - ldr r6, =gSpecialVar_0x8004 - ldrh r0, [r6] - movs r5, 0x64 - muls r0, r5 - ldr r4, =gPlayerParty - adds r0, r4 - movs r1, 0x3 - bl GetMonData - cmp r0, 0x2 - bne _081397A6 - ldrh r0, [r6] - muls r0, r5 - adds r0, r4 - ldr r4, =gStringVar1 - movs r1, 0x7 - adds r2, r4, 0 - bl GetMonData - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - adds r1, r4, 0 - bl StringCompare - cmp r0, 0 - beq _081397BC -_081397A6: - movs r0, 0x1 - b _081397BE - .pool -_081397BC: - movs r0, 0 -_081397BE: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8139770 - - thumb_func_start sub_81397C4 -sub_81397C4: @ 81397C4 - push {r4,r5,lr} - ldr r2, =gSpecialVar_Result - ldrh r1, [r2] - ldr r0, =0x0000270f - cmp r1, r0 - bls _081397E0 - movs r0, 0 - bl TV_PrintIntToStringVar - b _08139862 - .pool -_081397E0: - ldr r0, =0x000003e7 - cmp r1, r0 - bls _081397F8 - ldr r4, =gStringVar1 - movs r0, 0xA1 - strb r0, [r4] - adds r4, 0x1 - b _0813981C - .pool -_081397F8: - cmp r1, 0x63 - bls _0813980C - ldr r4, =gStringVar1 - movs r0, 0xA1 - strb r0, [r4] - strb r0, [r4, 0x1] - adds r4, 0x2 - b _0813981C - .pool -_0813980C: - cmp r1, 0x9 - bls _0813983C - ldr r4, =gStringVar1 - movs r0, 0xA1 - strb r0, [r4] - strb r0, [r4, 0x1] - strb r0, [r4, 0x2] - adds r4, 0x3 -_0813981C: - ldrh r5, [r2] - adds r0, r5, 0 - bl sub_80EF370 - adds r3, r0, 0 - lsls r3, 24 - lsrs r3, 24 - adds r0, r4, 0 - adds r1, r5, 0 - movs r2, 0 - bl ConvertIntToDecimalStringN - b _08139862 - .pool -_0813983C: - ldr r4, =gStringVar1 - movs r0, 0xA1 - strb r0, [r4] - strb r0, [r4, 0x1] - strb r0, [r4, 0x2] - strb r0, [r4, 0x3] - adds r4, 0x4 - ldrh r5, [r2] - adds r0, r5, 0 - bl sub_80EF370 - adds r3, r0, 0 - lsls r3, 24 - lsrs r3, 24 - adds r0, r4, 0 - adds r1, r5, 0 - movs r2, 0 - bl ConvertIntToDecimalStringN -_08139862: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81397C4 - - thumb_func_start sub_813986C -sub_813986C: @ 813986C - push {lr} - ldr r0, =gSpecialVar_Result - ldrh r0, [r0] - cmp r0, 0x4 - bhi _081398B8 - lsls r0, 2 - ldr r1, =_08139888 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08139888: - .4byte _0813989C - .4byte _081398A0 - .4byte _081398A4 - .4byte _081398A8 - .4byte _081398AC -_0813989C: - movs r0, 0x3 - b _081398AE -_081398A0: - movs r0, 0x4 - b _081398AE -_081398A4: - movs r0, 0 - b _081398AE -_081398A8: - movs r0, 0x1 - b _081398AE -_081398AC: - movs r0, 0x2 -_081398AE: - bl mevent_081445C0 - lsls r0, 16 - lsrs r0, 16 - b _081398BA -_081398B8: - movs r0, 0 -_081398BA: - pop {r1} - bx r1 - thumb_func_end sub_813986C - - thumb_func_start sub_81398C0 -sub_81398C0: @ 81398C0 - push {r4,lr} - ldr r1, =gSpecialVar_0x8004 - ldr r2, =0xfffffedf - adds r0, r2, 0 - ldrh r2, [r1] - adds r0, r2 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x39 - bls _081398E0 - movs r0, 0 - b _081398FC - .pool -_081398E0: - ldr r4, =gStringVar2 - ldrh r0, [r1] - bl ItemIdToBattleMoveId - lsls r0, 16 - lsrs r0, 16 - movs r1, 0xD - muls r1, r0 - ldr r0, =gMoveNames - adds r1, r0 - adds r0, r4, 0 - bl StringCopy - movs r0, 0x1 -_081398FC: - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_81398C0 - - thumb_func_start sub_813990C -sub_813990C: @ 813990C - push {r4,r5,lr} - bl CalculatePlayerPartyCount - lsls r0, 24 - lsrs r5, r0, 24 - movs r4, 0 - cmp r4, r5 - bcs _08139942 -_0813991C: - movs r0, 0x64 - muls r0, r4 - ldr r1, =gPlayerParty - adds r0, r1 - movs r1, 0x4 - bl GetMonData - cmp r0, 0x1 - bne _08139938 - movs r0, 0x1 - b _08139944 - .pool -_08139938: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, r5 - bcc _0813991C -_08139942: - movs r0, 0 -_08139944: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_813990C - - thumb_func_start InMultiBattleRoom -InMultiBattleRoom: @ 813994C - push {lr} - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldrh r1, [r0, 0x4] - ldr r0, =0x00000f1a - cmp r1, r0 - bne _08139978 - ldr r0, =0x000040ce - bl VarGet - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x2 - bne _08139978 - movs r0, 0x1 - b _0813997A - .pool -_08139978: - movs r0, 0 -_0813997A: - pop {r1} - bx r1 - thumb_func_end InMultiBattleRoom - - thumb_func_start sub_8139980 -sub_8139980: @ 8139980 - push {lr} - movs r0, 0 - bl SetCameraPanningCallback - movs r0, 0x8 - movs r1, 0 - bl SetCameraPanning - pop {r0} - bx r0 - thumb_func_end sub_8139980 - - thumb_func_start sub_8139994 -sub_8139994: @ 8139994 - push {lr} - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldrb r0, [r0, 0x15] - subs r0, 0x10 - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x5 - bhi _081399E4 - lsls r0, 2 - ldr r1, =_081399B8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_081399B8: - .4byte _081399E4 - .4byte _081399D0 - .4byte _081399D4 - .4byte _081399D8 - .4byte _081399DC - .4byte _081399E0 -_081399D0: - movs r1, 0x5 - b _081399E6 -_081399D4: - movs r1, 0x6 - b _081399E6 -_081399D8: - movs r1, 0x7 - b _081399E6 -_081399DC: - movs r1, 0x8 - b _081399E6 -_081399E0: - movs r1, 0xF - b _081399E6 -_081399E4: - movs r1, 0x4 -_081399E6: - ldr r0, =0x00004043 - bl VarSet - pop {r0} - bx r0 - .pool - thumb_func_end sub_8139994 - - thumb_func_start sub_81399F4 -sub_81399F4: @ 81399F4 - push {r4,lr} - ldr r2, =gUnknown_0203AB60 - movs r0, 0 - strh r0, [r2] - ldr r1, =gUnknown_0203AB62 - strh r0, [r1] - ldr r0, =gSaveBlock1Ptr - ldr r3, [r0] - movs r0, 0x14 - ldrsb r0, [r3, r0] - adds r4, r1, 0 - cmp r0, 0xD - bne _08139A6E - ldrb r0, [r3, 0x15] - subs r0, 0x10 - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x4 - bhi _08139A6E - lsls r0, 2 - ldr r1, =_08139A34 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_08139A34: - .4byte _08139A66 - .4byte _08139A5E - .4byte _08139A56 - .4byte _08139A4E - .4byte _08139A48 -_08139A48: - movs r0, 0 - strh r0, [r2] - b _08139A6C -_08139A4E: - movs r0, 0 - strh r0, [r2] - movs r0, 0x1 - b _08139A6C -_08139A56: - movs r0, 0 - strh r0, [r2] - movs r0, 0x2 - b _08139A6C -_08139A5E: - movs r0, 0 - strh r0, [r2] - movs r0, 0x3 - b _08139A6C -_08139A66: - movs r0, 0 - strh r0, [r2] - movs r0, 0x4 -_08139A6C: - strh r0, [r4] -_08139A6E: - ldrh r0, [r4] - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81399F4 - - thumb_func_start sub_8139A78 -sub_8139A78: @ 8139A78 - push {r4-r6,lr} - ldr r0, =sub_8139AF4 - movs r1, 0x9 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, =gTasks + 0x8 - adds r4, r1, r0 - movs r3, 0 - strh r3, [r4, 0x2] - strh r3, [r4, 0x4] - movs r6, 0x1 - strh r6, [r4, 0x8] - ldr r0, =gSpecialVar_0x8005 - ldr r1, =gSpecialVar_0x8006 - ldrh r2, [r0] - ldrh r0, [r1] - cmp r2, r0 - bls _08139AC0 - subs r0, r2, r0 - lsls r0, 16 - lsrs r5, r0, 16 - strh r6, [r4, 0xC] - b _08139AC8 - .pool -_08139AC0: - subs r0, r2 - lsls r0, 16 - lsrs r5, r0, 16 - strh r3, [r4, 0xC] -_08139AC8: - cmp r5, 0x8 - bls _08139ACE - movs r5, 0x8 -_08139ACE: - ldr r0, =gUnknown_085B2C18 - adds r0, r5, r0 - ldrb r0, [r0] - strh r0, [r4, 0xA] - movs r0, 0 - bl SetCameraPanningCallback - ldrb r1, [r4, 0xC] - adds r0, r5, 0 - bl sub_8139C2C - movs r0, 0x59 - bl PlaySE - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8139A78 - - thumb_func_start sub_8139AF4 -sub_8139AF4: @ 8139AF4 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r4, r0, r1 - ldrh r0, [r4, 0x2] - adds r0, 0x1 - strh r0, [r4, 0x2] - movs r1, 0x2 - ldrsh r0, [r4, r1] - movs r1, 0x3 - bl __modsi3 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bne _08139B54 - strh r0, [r4, 0x2] - ldrh r0, [r4, 0x4] - adds r0, 0x1 - strh r0, [r4, 0x4] - ldrh r0, [r4, 0x8] - negs r0, r0 - strh r0, [r4, 0x8] - movs r2, 0x8 - ldrsh r1, [r4, r2] - movs r0, 0 - bl SetCameraPanning - movs r0, 0x4 - ldrsh r1, [r4, r0] - movs r2, 0xA - ldrsh r0, [r4, r2] - cmp r1, r0 - bne _08139B54 - movs r0, 0x49 - bl PlaySE - adds r0, r5, 0 - bl DestroyTask - bl EnableBothScriptContexts - bl InstallCameraPanAheadCallback -_08139B54: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8139AF4 - - thumb_func_start sub_8139B60 -sub_8139B60: @ 8139B60 - push {r4-r6,lr} - mov r6, r9 - mov r5, r8 - push {r5,r6} - sub sp, 0xC - ldr r5, =gUnknown_0203AB5E - ldr r0, =gUnknown_085B2BAC - bl AddWindow - strb r0, [r5] - ldrb r0, [r5] - movs r1, 0 - bl SetStandardWindowBorderStyle - ldr r4, =gText_ElevatorNowOn - movs r0, 0x1 - adds r1, r4, 0 - movs r2, 0x40 - bl GetStringCenterAlignXOffset - adds r3, r0, 0 - ldrb r0, [r5] - lsls r3, 24 - lsrs r3, 24 - movs r1, 0x1 - str r1, [sp] - movs r1, 0xFF - mov r9, r1 - str r1, [sp, 0x4] - movs r1, 0 - mov r8, r1 - str r1, [sp, 0x8] - movs r1, 0x1 - adds r2, r4, 0 - bl PrintTextOnWindow - ldr r6, =gUnknown_085B2BB4 - ldr r4, =gSpecialVar_0x8005 - ldrh r0, [r4] - lsls r0, 2 - adds r0, r6 - ldr r1, [r0] - movs r0, 0x1 - movs r2, 0x40 - bl GetStringCenterAlignXOffset - adds r3, r0, 0 - ldrb r0, [r5] - ldrh r1, [r4] - lsls r1, 2 - adds r1, r6 - ldr r2, [r1] - lsls r3, 24 - lsrs r3, 24 - movs r1, 0x11 - str r1, [sp] - mov r1, r9 - str r1, [sp, 0x4] - mov r1, r8 - str r1, [sp, 0x8] - movs r1, 0x1 - bl PrintTextOnWindow - ldrb r0, [r5] - bl PutWindowTilemap - ldrb r0, [r5] - movs r1, 0x3 - bl CopyWindowToVram - add sp, 0xC - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8139B60 - - thumb_func_start sub_8139C10 -sub_8139C10: @ 8139C10 - push {r4,lr} - ldr r4, =gUnknown_0203AB5E - ldrb r0, [r4] - movs r1, 0x1 - bl sub_8198070 - ldrb r0, [r4] - bl RemoveWindow - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8139C10 - - thumb_func_start sub_8139C2C -sub_8139C2C: @ 8139C2C - push {r4-r6,lr} - lsls r0, 16 - lsrs r6, r0, 16 - lsls r1, 24 - lsrs r5, r1, 24 - ldr r4, =sub_8139C80 - adds r0, r4, 0 - bl FuncIsActiveTask - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08139C6C - adds r0, r4, 0 - movs r1, 0x8 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r0, 0 - strh r0, [r1, 0x8] - strh r0, [r1, 0xA] - strh r5, [r1, 0xC] - ldr r0, =gUnknown_085B2C21 - adds r0, r6, r0 - ldrb r0, [r0] - strh r0, [r1, 0xE] -_08139C6C: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8139C2C - - thumb_func_start sub_8139C80 -sub_8139C80: @ 8139C80 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp] - lsls r0, 2 - ldr r1, [sp] - adds r0, r1 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r6, r0, r1 - movs r2, 0x2 - ldrsh r0, [r6, r2] - cmp r0, 0x6 - bne _08139D7C - ldrh r0, [r6] - adds r0, 0x1 - strh r0, [r6] - movs r1, 0x4 - ldrsh r0, [r6, r1] - cmp r0, 0 - bne _08139D10 - movs r1, 0 - ldr r2, =gUnknown_085B2BF4 - mov r10, r2 -_08139CBA: - movs r5, 0 - adds r7, r1, 0x7 - lsls r0, r1, 1 - adds r2, r1, 0x1 - mov r8, r2 - adds r0, r1 - lsls r0, 1 - mov r9, r0 -_08139CCA: - adds r4, r5, 0 - adds r4, 0x8 - movs r1, 0 - ldrsh r0, [r6, r1] - movs r1, 0x3 - bl __modsi3 - lsls r0, 16 - asrs r0, 15 - add r0, r9 - add r0, r10 - ldrh r0, [r0] - movs r1, 0xC0 - lsls r1, 4 - adds r2, r1, 0 - orrs r2, r0 - adds r0, r4, 0 - adds r1, r7, 0 - bl MapGridSetMetatileIdAt - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x2 - bls _08139CCA - mov r2, r8 - lsls r0, r2, 24 - lsrs r1, r0, 24 - cmp r1, 0x2 - bls _08139CBA - b _08139D62 - .pool -_08139D10: - movs r1, 0 - ldr r0, =gUnknown_085B2C06 - mov r10, r0 -_08139D16: - movs r5, 0 - adds r7, r1, 0x7 - lsls r0, r1, 1 - adds r2, r1, 0x1 - mov r8, r2 - adds r0, r1 - lsls r0, 1 - mov r9, r0 -_08139D26: - adds r4, r5, 0 - adds r4, 0x8 - movs r1, 0 - ldrsh r0, [r6, r1] - movs r1, 0x3 - bl __modsi3 - lsls r0, 16 - asrs r0, 15 - add r0, r9 - add r0, r10 - ldrh r0, [r0] - movs r1, 0xC0 - lsls r1, 4 - adds r2, r1, 0 - orrs r2, r0 - adds r0, r4, 0 - adds r1, r7, 0 - bl MapGridSetMetatileIdAt - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x2 - bls _08139D26 - mov r2, r8 - lsls r0, r2, 24 - lsrs r1, r0, 24 - cmp r1, 0x2 - bls _08139D16 -_08139D62: - bl DrawWholeMapView - movs r0, 0 - strh r0, [r6, 0x2] - movs r0, 0 - ldrsh r1, [r6, r0] - movs r2, 0x6 - ldrsh r0, [r6, r2] - cmp r1, r0 - bne _08139D7C - ldr r0, [sp] - bl DestroyTask -_08139D7C: - ldrh r0, [r6, 0x2] - adds r0, 0x1 - strh r0, [r6, 0x2] - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8139C80 - - thumb_func_start sub_8139D98 -sub_8139D98: @ 8139D98 - push {r4-r7,lr} - sub sp, 0x18 - ldr r6, =gSpecialVar_0x8004 - ldrh r0, [r6] - movs r5, 0x64 - muls r0, r5 - ldr r4, =gPlayerParty - adds r0, r4 - movs r1, 0x27 - bl GetMonData - str r0, [sp] - ldrh r0, [r6] - muls r0, r5 - adds r0, r4 - movs r1, 0x28 - bl GetMonData - str r0, [sp, 0x4] - ldrh r0, [r6] - muls r0, r5 - adds r0, r4 - movs r1, 0x29 - bl GetMonData - str r0, [sp, 0x8] - ldrh r0, [r6] - muls r0, r5 - adds r0, r4 - movs r1, 0x2A - bl GetMonData - str r0, [sp, 0xC] - ldrh r0, [r6] - muls r0, r5 - adds r0, r4 - movs r1, 0x2B - bl GetMonData - str r0, [sp, 0x10] - ldrh r0, [r6] - muls r0, r5 - adds r0, r4 - movs r1, 0x2C - bl GetMonData - str r0, [sp, 0x14] - ldr r1, =gSpecialVar_0x8005 - movs r0, 0 - strh r0, [r1] - movs r4, 0 - adds r2, r1, 0 -_08139E00: - lsls r0, r4, 2 - add r0, sp - ldr r1, [r0] - ldrh r0, [r2] - adds r0, r1 - strh r0, [r2] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x5 - bls _08139E00 - ldr r2, =gSpecialVar_0x8006 - movs r0, 0 - strh r0, [r2] - ldr r1, =gSpecialVar_0x8007 - ldr r0, [sp] - strh r0, [r1] - movs r4, 0x1 - adds r6, r2, 0 - adds r7, r1, 0 -_08139E28: - ldrh r0, [r6] - lsls r0, 2 - mov r2, sp - adds r1, r2, r0 - lsls r0, r4, 2 - adds r5, r2, r0 - ldr r1, [r1] - ldr r0, [r5] - cmp r1, r0 - bcs _08139E54 - strh r4, [r6] - b _08139E6C - .pool -_08139E54: - cmp r1, r0 - bne _08139E6E - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08139E6E - strh r4, [r6] - ldr r0, [r5] -_08139E6C: - strh r0, [r7] -_08139E6E: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x5 - bls _08139E28 - add sp, 0x18 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8139D98 - - thumb_func_start warp0_in_pokecenter -warp0_in_pokecenter: @ 8139E80 - push {r4,lr} - ldr r0, =gUnknown_020322DC - movs r1, 0 - ldrsb r1, [r0, r1] - lsls r1, 8 - ldrb r0, [r0, 0x1] - lsls r0, 24 - asrs r0, 24 - adds r0, r1 - lsls r0, 16 - lsrs r3, r0, 16 - ldr r2, =gUnknown_085B2C2A - ldrh r0, [r2] - ldr r1, =0x0000ffff - cmp r0, r1 - beq _08139EC6 - adds r4, r1, 0 - adds r1, r2, 0 -_08139EA4: - ldrh r0, [r2] - cmp r0, r3 - bne _08139EBC - movs r0, 0x1 - b _08139EC8 - .pool -_08139EBC: - adds r1, 0x2 - adds r2, 0x2 - ldrh r0, [r1] - cmp r0, r4 - bne _08139EA4 -_08139EC6: - movs r0, 0 -_08139EC8: - pop {r4} - pop {r1} - bx r1 - thumb_func_end warp0_in_pokecenter - - thumb_func_start sub_8139ED0 -sub_8139ED0: @ 8139ED0 - push {lr} - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldrh r1, [r0, 0x4] - ldr r0, =0x00003c1a - cmp r1, r0 - beq _08139EEC - movs r0, 0x1 - b _08139EEE - .pool -_08139EEC: - movs r0, 0 -_08139EEE: - pop {r1} - bx r1 - thumb_func_end sub_8139ED0 - - thumb_func_start sub_8139EF4 -sub_8139EF4: @ 8139EF4 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - ldr r0, =0x0000402f - bl GetVarPointer - adds r5, r0, 0 - ldrh r0, [r5] - adds r4, r0 - strh r4, [r5] - ldrh r0, [r5] - movs r1, 0xA - bl __umodsi3 - strh r0, [r5] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8139EF4 - - thumb_func_start sub_8139F20 -sub_8139F20: @ 8139F20 - push {r4-r7,lr} - movs r4, 0 - ldr r0, =0x0000402f - bl VarGet - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0x9 - bls _08139F34 - b _0813A03A -_08139F34: - lsls r0, r6, 2 - ldr r1, =_08139F48 - adds r1, r0, r1 - ldr r1, [r1] - adds r2, r0, 0 - mov pc, r1 - .pool - .align 2, 0 -_08139F48: - .4byte _08139F70 - .4byte _08139F70 - .4byte _08139F70 - .4byte _08139F70 - .4byte _08139F94 - .4byte _08139FB4 - .4byte _08139FCC - .4byte _08139FE4 - .4byte _08139FFC - .4byte _0813A014 -_08139F70: - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - movs r3, 0xCE - lsls r3, 4 - adds r1, r0, r3 - adds r3, r1, r2 - ldr r1, =0x00000ce2 - adds r0, r1 - adds r1, r0, r2 - ldrh r0, [r3] - ldrh r2, [r1] - cmp r0, r2 - bcs _0813A028 - b _0813A038 - .pool -_08139F94: - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r3, =0x00000d0c - adds r2, r0, r3 - adds r3, 0x2 -_08139F9E: - adds r1, r0, r3 - ldrh r0, [r2] - ldrh r3, [r1] - cmp r0, r3 - bcs _0813A028 - b _0813A038 - .pool -_08139FB4: - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r1, =0x00000de2 - adds r2, r0, r1 - ldr r3, =0x00000de4 - b _08139F9E - .pool -_08139FCC: - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r1, =0x00000dc8 - adds r2, r0, r1 - ldr r3, =0x00000dca - b _08139F9E - .pool -_08139FE4: - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r1, =0x00000dda - adds r2, r0, r1 - ldr r3, =0x00000ddc - b _08139F9E - .pool -_08139FFC: - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r1, =0x00000e04 - adds r2, r0, r1 - ldr r3, =0x00000e06 - b _08139F9E - .pool -_0813A014: - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r1, =0x00000e1a - adds r2, r0, r1 - ldr r3, =0x00000e1c - adds r1, r0, r3 - ldrh r0, [r2] - ldrh r3, [r1] - cmp r0, r3 - bcc _0813A038 -_0813A028: - adds r4, r0, 0 - b _0813A03A - .pool -_0813A038: - ldrh r4, [r1] -_0813A03A: - movs r2, 0 - ldr r5, =gUnknown_085B2CC8 - lsls r0, r6, 1 - adds r1, r0, r5 - ldrb r1, [r1] - adds r3, r0, 0 - ldr r7, =gUnknown_085B2C50 - cmp r1, r4 - bcs _0813A062 - adds r1, r3, 0 -_0813A04E: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x1 - bhi _0813A062 - adds r0, r2, r1 - adds r0, r5 - ldrb r0, [r0] - cmp r0, r4 - bcc _0813A04E -_0813A062: - adds r0, r3, r6 - adds r0, r2 - lsls r0, 2 - adds r0, r7 - ldr r0, [r0] - bl ShowFieldMessage - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8139F20 - - thumb_func_start sub_813A080 -sub_813A080: @ 813A080 - push {r4-r7,lr} - ldr r0, =0x000040ce - bl VarGet - lsls r0, 16 - lsrs r5, r0, 16 - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r1, =0x00000ca9 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 30 - lsrs r4, r0, 30 - cmp r5, 0x2 - bne _0813A0D8 - movs r0, 0xA9 - lsls r0, 1 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - bne _0813A0D8 - ldr r1, =gSpecialVar_0x8005 - movs r0, 0x5 - strh r0, [r1] - ldr r1, =gSpecialVar_0x8006 - movs r0, 0x4 - strh r0, [r1] - b _0813A110 - .pool -_0813A0D0: - movs r0, 0x4 - strh r0, [r6] - adds r0, r3, 0x5 - b _0813A10E -_0813A0D8: - movs r3, 0 - ldr r6, =gSpecialVar_0x8005 - ldr r7, =gSpecialVar_0x8006 - lsls r1, r4, 1 - lsls r2, r5, 2 - ldr r4, =gUnknown_085B2CDC - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - adds r1, r2 - movs r2, 0xCE - lsls r2, 4 - adds r0, r2 - adds r0, r1 - ldrh r1, [r0] -_0813A0F4: - lsls r0, r3, 1 - adds r0, r4 - ldrh r0, [r0] - cmp r0, r1 - bhi _0813A0D0 - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x8 - bls _0813A0F4 - movs r0, 0x4 - strh r0, [r6] - movs r0, 0xC -_0813A10E: - strh r0, [r7] -_0813A110: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813A080 - - thumb_func_start sub_813A128 -sub_813A128: @ 813A128 - push {r4,lr} - ldr r0, =sub_813A2DC - movs r1, 0x8 - bl CreateTask - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - ldr r1, =gTasks - adds r3, r0, r1 - ldr r1, =gSpecialVar_0x8004 - ldrh r0, [r1] - strh r0, [r3, 0x1E] - ldrh r0, [r1] - cmp r0, 0xC - bls _0813A14E - b _0813A2C6 -_0813A14E: - lsls r0, 2 - ldr r1, =_0813A168 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0813A168: - .4byte _0813A19C - .4byte _0813A1AA - .4byte _0813A1C2 - .4byte _0813A1D6 - .4byte _0813A1F0 - .4byte _0813A208 - .4byte _0813A222 - .4byte _0813A23C - .4byte _0813A25A - .4byte _0813A274 - .4byte _0813A274 - .4byte _0813A28E - .4byte _0813A2A8 -_0813A19C: - movs r1, 0 - movs r0, 0x1 - strh r0, [r3, 0x8] - strh r0, [r3, 0xA] - strh r0, [r3, 0xC] - strh r0, [r3, 0xE] - b _0813A2BC -_0813A1AA: - movs r1, 0 - movs r0, 0x5 - strh r0, [r3, 0x8] - movs r0, 0x8 - strh r0, [r3, 0xA] - movs r0, 0x1 - strh r0, [r3, 0xC] - strh r0, [r3, 0xE] - movs r0, 0x9 - strh r0, [r3, 0x10] - movs r0, 0xA - b _0813A2BE -_0813A1C2: - movs r2, 0 - movs r0, 0x6 - strh r0, [r3, 0x8] - movs r1, 0xC - strh r1, [r3, 0xA] - movs r0, 0x1 - strh r0, [r3, 0xC] - strh r0, [r3, 0xE] - movs r0, 0x7 - b _0813A250 -_0813A1D6: - movs r1, 0 - movs r0, 0x6 - strh r0, [r3, 0x8] - movs r0, 0xB - strh r0, [r3, 0xA] - movs r0, 0xE - strh r0, [r3, 0xC] - movs r0, 0x1 - strh r0, [r3, 0xE] - movs r0, 0xF - strh r0, [r3, 0x10] - movs r0, 0xC - b _0813A2BE -_0813A1F0: - movs r1, 0 - movs r0, 0x6 - strh r0, [r3, 0x8] - strh r0, [r3, 0xA] - movs r0, 0xE - strh r0, [r3, 0xC] - movs r0, 0x1 - strh r0, [r3, 0xE] - movs r0, 0xF - strh r0, [r3, 0x10] - movs r0, 0xC - b _0813A2BE -_0813A208: - movs r1, 0 - movs r0, 0x6 - strh r0, [r3, 0x8] - movs r0, 0x7 - strh r0, [r3, 0xA] - movs r0, 0xE - strh r0, [r3, 0xC] - movs r0, 0x1 - strh r0, [r3, 0xE] - movs r0, 0xF - strh r0, [r3, 0x10] - movs r0, 0xC - b _0813A2BE -_0813A222: - movs r1, 0 - movs r0, 0x6 - strh r0, [r3, 0x8] - movs r0, 0xA - strh r0, [r3, 0xA] - movs r0, 0xE - strh r0, [r3, 0xC] - movs r0, 0x1 - strh r0, [r3, 0xE] - movs r0, 0xF - strh r0, [r3, 0x10] - movs r0, 0xC - b _0813A2BE -_0813A23C: - movs r2, 0 - movs r0, 0x6 - strh r0, [r3, 0x8] - movs r1, 0xC - strh r1, [r3, 0xA] - movs r0, 0xF - strh r0, [r3, 0xC] - movs r0, 0x1 - strh r0, [r3, 0xE] - movs r0, 0xE -_0813A250: - strh r0, [r3, 0x10] - strh r1, [r3, 0x12] - strh r2, [r3, 0x14] - strh r4, [r3, 0x26] - b _0813A2D2 -_0813A25A: - movs r1, 0 - movs r0, 0x6 - strh r0, [r3, 0x8] - movs r0, 0xA - strh r0, [r3, 0xA] - movs r0, 0x11 - strh r0, [r3, 0xC] - movs r0, 0x1 - strh r0, [r3, 0xE] - movs r0, 0xB - strh r0, [r3, 0x10] - movs r0, 0xC - b _0813A2BE -_0813A274: - movs r1, 0 - movs r0, 0x6 - strh r0, [r3, 0x8] - movs r0, 0xB - strh r0, [r3, 0xA] - movs r0, 0xF - strh r0, [r3, 0xC] - movs r0, 0x1 - strh r0, [r3, 0xE] - movs r0, 0xE - strh r0, [r3, 0x10] - movs r0, 0xC - b _0813A2BE -_0813A28E: - movs r1, 0 - movs r0, 0x6 - strh r0, [r3, 0x8] - movs r0, 0x7 - strh r0, [r3, 0xA] - movs r0, 0x13 - strh r0, [r3, 0xC] - movs r0, 0x1 - strh r0, [r3, 0xE] - movs r0, 0xA - strh r0, [r3, 0x10] - movs r0, 0xC - b _0813A2BE -_0813A2A8: - movs r1, 0 - movs r0, 0x6 - strh r0, [r3, 0x8] - movs r0, 0x7 - strh r0, [r3, 0xA] - movs r0, 0x11 - strh r0, [r3, 0xC] - movs r0, 0x1 - strh r0, [r3, 0xE] - movs r0, 0xC -_0813A2BC: - strh r0, [r3, 0x10] -_0813A2BE: - strh r0, [r3, 0x12] - strh r1, [r3, 0x14] - strh r4, [r3, 0x26] - b _0813A2D2 -_0813A2C6: - ldr r1, =gSpecialVar_Result - movs r0, 0x7F - strh r0, [r1] - adds r0, r4, 0 - bl DestroyTask -_0813A2D2: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813A128 - - thumb_func_start sub_813A2DC -sub_813A2DC: @ 813A2DC - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x20 - lsls r0, 24 - lsrs r7, r0, 24 - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - ldr r1, =gTasks - adds r6, r0, r1 - bl ScriptContext2_Enable - ldr r0, =gUnknown_0203AB68 - movs r5, 0 - strh r5, [r0] - ldr r1, =gUnknown_0203AB6C - movs r0, 0x40 - strb r0, [r1] - ldrh r0, [r6, 0x1E] - movs r1, 0 - bl sub_813AA60 - ldrb r0, [r6, 0x1E] - movs r1, 0 - bl sub_813ACE8 - ldr r4, =gUnknown_0203AB64 - movs r1, 0xA - ldrsh r0, [r6, r1] - lsls r0, 3 - bl AllocZeroed - str r0, [r4] - ldr r0, =gUnknown_0203AB6A - strh r5, [r0] - bl sub_813A42C - movs r3, 0 - movs r4, 0 - movs r2, 0xA - ldrsh r0, [r6, r2] - add r1, sp, 0x18 - mov r8, r1 - cmp r3, r0 - bge _0813A36A - ldr r5, =gUnknown_085B2CF0 -_0813A33A: - lsls r1, r4, 2 - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - lsls r0, 6 - adds r1, r0 - adds r1, r5 - ldr r0, [r1] - ldr r1, =gUnknown_0203AB64 - ldr r2, [r1] - lsls r1, r4, 3 - adds r1, r2 - str r0, [r1] - str r4, [r1, 0x4] - adds r1, r3, 0 - bl display_text_and_get_width - adds r3, r0, 0 - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - movs r2, 0xA - ldrsh r0, [r6, r2] - cmp r4, r0 - blt _0813A33A -_0813A36A: - adds r0, r3, 0 - bl convert_pixel_width_to_tile_width - strh r0, [r6, 0x10] - movs r1, 0xC - ldrsh r0, [r6, r1] - movs r2, 0x10 - ldrsh r1, [r6, r2] - adds r0, r1 - cmp r0, 0x1D - ble _0813A38C - movs r0, 0x1D - subs r0, r1 - cmp r0, 0 - bge _0813A38A - movs r0, 0 -_0813A38A: - strh r0, [r6, 0xC] -_0813A38C: - ldrb r2, [r6, 0xC] - ldrb r3, [r6, 0xE] - ldrb r0, [r6, 0x10] - str r0, [sp] - ldrb r0, [r6, 0x12] - str r0, [sp, 0x4] - movs r0, 0xF - str r0, [sp, 0x8] - movs r0, 0x64 - str r0, [sp, 0xC] - add r0, sp, 0x10 - movs r1, 0 - bl sub_8198A50 - ldr r0, [sp, 0x10] - ldr r1, [sp, 0x14] - str r0, [sp, 0x18] - str r1, [sp, 0x1C] - mov r0, r8 - bl AddWindow - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x22] - movs r1, 0 - bl SetStandardWindowBorderStyle - ldr r4, =gUnknown_030061D0 - ldrh r0, [r6, 0xA] - strh r0, [r4, 0xC] - ldrh r0, [r6, 0x8] - strh r0, [r4, 0xE] - ldrh r0, [r6, 0x22] - strb r0, [r4, 0x10] - adds r0, r7, 0 - bl sub_813A694 - ldrh r1, [r6, 0x16] - ldrh r2, [r6, 0x18] - adds r0, r4, 0 - bl ListMenuInit - lsls r0, 24 - lsrs r0, 24 - strh r0, [r6, 0x24] - movs r0, 0 - bl schedule_bg_copy_tilemap_to_vram - ldr r1, =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r0, r1 - ldr r1, =sub_813A4EC - str r1, [r0] - add sp, 0x20 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813A2DC - - thumb_func_start sub_813A42C -sub_813A42C: @ 813A42C - ldr r1, =gUnknown_030061D0 - ldr r0, =gUnknown_0203AB64 - ldr r0, [r0] - str r0, [r1] - ldr r0, =sub_813A46C - str r0, [r1, 0x4] - movs r0, 0 - str r0, [r1, 0x8] - movs r2, 0 - movs r0, 0x1 - strh r0, [r1, 0xC] - strh r0, [r1, 0xE] - strb r2, [r1, 0x10] - strb r2, [r1, 0x11] - movs r0, 0x8 - strb r0, [r1, 0x12] - strb r2, [r1, 0x13] - movs r0, 0x21 - strb r0, [r1, 0x14] - movs r0, 0x31 - strb r0, [r1, 0x15] - movs r0, 0 - strb r0, [r1, 0x16] - movs r0, 0x1 - strb r0, [r1, 0x17] - bx lr - .pool - thumb_func_end sub_813A42C - - thumb_func_start sub_813A46C -sub_813A46C: @ 813A46C - push {r4,r5,lr} - sub sp, 0x4 - movs r0, 0x5 - bl PlaySE - ldr r0, =sub_813A4EC - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xFF - beq _0813A4D4 - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - ldr r0, =gTasks - adds r4, r0 - ldrh r0, [r4, 0x24] - lsls r0, 24 - lsrs r0, 24 - mov r1, sp - movs r2, 0 - bl get_coro_args_x18_x1A - ldr r1, =gUnknown_0203AB68 - mov r0, sp - ldrh r0, [r0] - strh r0, [r1] - ldrh r0, [r4, 0x24] - lsls r0, 24 - lsrs r0, 24 - mov r1, sp - bl sub_81AE838 - ldrh r0, [r4, 0x1E] - ldr r5, =gUnknown_0203AB6A - ldrh r1, [r5] - bl sub_813AC44 - ldrh r0, [r4, 0x1E] - mov r1, sp - ldrh r1, [r1] - bl sub_813AA60 - ldrb r0, [r4, 0x1E] - mov r1, sp - ldrh r1, [r1] - bl sub_813AD34 - mov r0, sp - ldrh r0, [r0] - strh r0, [r5] -_0813A4D4: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813A46C - - thumb_func_start sub_813A4EC -sub_813A4EC: @ 813A4EC - push {r4-r6,lr} - lsls r0, 24 - lsrs r5, r0, 24 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks - adds r6, r0, r1 - ldrh r0, [r6, 0x24] - lsls r0, 24 - lsrs r0, 24 - bl ListMenuHandleInput - adds r4, r0, 0 - movs r0, 0x2 - negs r0, r0 - cmp r4, r0 - beq _0813A51C - adds r0, 0x1 - cmp r4, r0 - bne _0813A530 - b _0813A566 - .pool -_0813A51C: - ldr r1, =gSpecialVar_Result - movs r0, 0x7F - strh r0, [r1] - movs r0, 0x5 - bl PlaySE - b _0813A54C - .pool -_0813A530: - ldr r0, =gSpecialVar_Result - strh r4, [r0] - movs r0, 0x5 - bl PlaySE - movs r1, 0x14 - ldrsh r0, [r6, r1] - cmp r0, 0 - beq _0813A54C - movs r1, 0xA - ldrsh r0, [r6, r1] - subs r0, 0x1 - cmp r4, r0 - bne _0813A558 -_0813A54C: - adds r0, r5, 0 - bl sub_813A570 - b _0813A566 - .pool -_0813A558: - adds r0, r5, 0 - bl sub_813A738 - ldr r0, =sub_813A600 - str r0, [r6] - bl EnableBothScriptContexts -_0813A566: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813A4EC - - thumb_func_start sub_813A570 -sub_813A570: @ 813A570 - push {r4,r5,lr} - sub sp, 0x4 - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - lsls r4, r5, 2 - adds r4, r5 - lsls r4, 3 - ldr r0, =gTasks - adds r4, r0 - ldrh r0, [r4, 0x24] - lsls r0, 24 - lsrs r0, 24 - mov r1, sp - bl sub_81AE838 - ldrh r0, [r4, 0x1E] - mov r1, sp - ldrh r1, [r1] - bl sub_813AC44 - adds r0, r5, 0 - bl sub_813A738 - ldrh r0, [r4, 0x24] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - movs r2, 0 - bl sub_81AE6C8 - ldr r0, =gUnknown_0203AB64 - ldr r0, [r0] - bl Free - ldrh r0, [r4, 0x22] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x1 - bl sub_8198070 - ldrh r0, [r4, 0x22] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - bl FillWindowPixelBuffer - ldrh r0, [r4, 0x22] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x2 - bl CopyWindowToVram - ldrh r0, [r4, 0x22] - lsls r0, 24 - lsrs r0, 24 - bl RemoveWindow - adds r0, r5, 0 - bl DestroyTask - bl EnableBothScriptContexts - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813A570 - - thumb_func_start sub_813A600 -sub_813A600: @ 813A600 - push {lr} - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r2, 0x14 - ldrsh r0, [r1, r2] - cmp r0, 0x1 - beq _0813A624 - cmp r0, 0x2 - bne _0813A624 - movs r0, 0x1 - strh r0, [r1, 0x14] - ldr r0, =sub_813A664 - str r0, [r1] -_0813A624: - pop {r0} - bx r0 - .pool - thumb_func_end sub_813A600 - - thumb_func_start sub_813A630 -sub_813A630: @ 813A630 - push {lr} - ldr r0, =sub_813A600 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0xFF - bne _0813A64C - bl EnableBothScriptContexts - b _0813A65C - .pool -_0813A64C: - ldr r0, =gTasks - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x14] - adds r0, 0x1 - strh r0, [r1, 0x14] -_0813A65C: - pop {r0} - bx r0 - .pool - thumb_func_end sub_813A630 - - thumb_func_start sub_813A664 -sub_813A664: @ 813A664 - push {r4,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl ScriptContext2_Enable - adds r0, r4, 0 - bl sub_813A694 - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, =sub_813A4EC - str r1, [r0] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813A664 - - thumb_func_start sub_813A694 -sub_813A694: @ 813A694 - push {r4,r5,lr} - sub sp, 0x10 - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, =gTasks - adds r4, r1, r0 - mov r1, sp - ldr r0, =gUnknown_085B3030 - ldm r0!, {r2,r3,r5} - stm r1!, {r2,r3,r5} - ldr r0, [r0] - str r0, [r1] - movs r0, 0x8 - ldrsh r1, [r4, r0] - movs r2, 0xA - ldrsh r0, [r4, r2] - cmp r1, r0 - beq _0813A724 - mov r2, sp - movs r3, 0x10 - ldrsh r1, [r4, r3] - lsrs r0, r1, 31 - adds r1, r0 - asrs r1, 1 - lsls r1, 3 - adds r1, 0xC - movs r5, 0xC - ldrsh r0, [r4, r5] - subs r0, 0x1 - lsls r0, 3 - adds r1, r0 - movs r3, 0 - strb r1, [r2, 0x1] - mov r1, sp - movs r0, 0x8 - strb r0, [r1, 0x2] - movs r0, 0x10 - ldrsh r1, [r4, r0] - lsrs r0, r1, 31 - adds r1, r0 - asrs r1, 1 - lsls r1, 3 - adds r1, 0xC - movs r5, 0xC - ldrsh r0, [r4, r5] - subs r0, 0x1 - lsls r0, 3 - adds r1, r0 - strb r1, [r2, 0x4] - mov r1, sp - movs r2, 0x12 - ldrsh r0, [r4, r2] - lsls r0, 3 - adds r0, 0xA - strb r0, [r1, 0x5] - mov r0, sp - strh r3, [r0, 0x6] - mov r2, sp - ldrh r0, [r4, 0xA] - ldrh r1, [r4, 0x8] - subs r0, r1 - strh r0, [r2, 0x8] - ldr r1, =gUnknown_0203AB68 - mov r0, sp - bl AddScrollIndicatorArrowPair - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4, 0x20] -_0813A724: - add sp, 0x10 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813A694 - - thumb_func_start sub_813A738 -sub_813A738: @ 813A738 - push {lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, =gTasks - adds r2, r1, r0 - movs r0, 0x8 - ldrsh r1, [r2, r0] - movs r3, 0xA - ldrsh r0, [r2, r3] - cmp r1, r0 - beq _0813A75E - ldrh r0, [r2, 0x20] - lsls r0, 24 - lsrs r0, 24 - bl RemoveScrollIndicatorArrowPair -_0813A75E: - pop {r0} - bx r0 - .pool - thumb_func_end sub_813A738 - - thumb_func_start nullsub_55 -nullsub_55: @ 813A768 - bx lr - thumb_func_end nullsub_55 - - thumb_func_start sub_813A76C -sub_813A76C: @ 813A76C - push {r4-r6,lr} - movs r4, 0 - ldr r6, =gLinkPlayers - ldr r0, =0x0000401f - adds r5, r0, 0 -_0813A776: - lsls r0, r4, 3 - subs r0, r4 - lsls r0, 2 - adds r0, r6 - ldrb r0, [r0, 0x13] - cmp r0, 0 - bne _0813A79C - subs r0, r5, r4 - lsls r0, 16 - lsrs r0, 16 - movs r1, 0 - bl VarSet - b _0813A7A8 - .pool -_0813A79C: - subs r0, r5, r4 - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x69 - bl VarSet -_0813A7A8: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x1 - bls _0813A776 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_813A76C - - thumb_func_start sub_813A7B8 -sub_813A7B8: @ 813A7B8 - push {lr} - ldr r1, =gSpecialVar_0x8004 - ldrh r0, [r1] - cmp r0, 0x5 - bls _0813A7C6 - movs r0, 0 - strh r0, [r1] -_0813A7C6: - ldrh r1, [r1] - movs r0, 0x64 - muls r0, r1 - ldr r1, =gPlayerParty - adds r0, r1 - bl GetNature - lsls r0, 24 - ldr r1, =gUnknown_085B3040 - lsrs r0, 22 - adds r0, r1 - ldr r0, [r0] - bl ShowFieldMessage - pop {r0} - bx r0 - .pool - thumb_func_end sub_813A7B8 - - thumb_func_start sub_813A7F4 -sub_813A7F4: @ 813A7F4 - push {r4,r5,lr} - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - ldr r0, =0x00004030 - bl GetVarPointer - adds r5, r0, 0 - ldrh r0, [r5] - adds r4, r0 - strh r4, [r5] - ldrh r0, [r5] - movs r1, 0xC - bl __umodsi3 - strh r0, [r5] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813A7F4 - - thumb_func_start sub_813A820 -sub_813A820: @ 813A820 - push {r4,lr} - ldr r0, =0x00004030 - bl VarGet - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - ldr r1, =gUnknown_085B30A4 - lsls r0, r4, 2 - adds r0, r1 - ldr r0, [r0] - bl ShowFieldMessage - ldr r0, =0x00004031 - adds r1, r4, 0 - bl VarSet - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813A820 - - thumb_func_start sub_813A854 -sub_813A854: @ 813A854 - push {r4,lr} - ldr r4, =gUnknown_085B30D4 - ldr r0, =0x00004031 - bl VarGet - lsls r0, 16 - lsrs r0, 14 - adds r0, r4 - ldr r0, [r0] - bl ShowFieldMessage - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813A854 - - thumb_func_start sub_813A878 -sub_813A878: @ 813A878 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldr r0, =0x000040ce - bl VarGet - lsls r0, 16 - lsrs r7, r0, 16 - ldr r0, =0x00004031 - bl VarGet - lsls r0, 16 - lsrs r6, r0, 16 - ldr r0, =0x000040cf - bl VarGet - lsls r0, 16 - lsrs r5, r0, 16 - ldr r4, =0x00004033 - adds r0, r4, 0 - bl VarGet - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - bne _0813A8F0 - ldr r1, =gUnknown_085B3104 - lsls r0, r6, 1 - adds r0, r1 - ldrh r1, [r0] - lsls r0, r5, 8 - adds r0, r7 - cmp r1, r0 - bne _0813A8F0 - mov r0, r8 - cmp r0, 0 - beq _0813A8E8 - adds r0, r4, 0 - movs r1, 0x2 - bl VarSet - b _0813A8F0 - .pool -_0813A8E8: - adds r0, r4, 0 - movs r1, 0x3 - bl VarSet -_0813A8F0: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_813A878 - - thumb_func_start sub_813A8FC -sub_813A8FC: @ 813A8FC - push {lr} - sub sp, 0x2C - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r1, =0x00000eb8 - adds r0, r1 - ldrh r1, [r0] - add r0, sp, 0xC - movs r2, 0x1 - movs r3, 0x4 - bl ConvertIntToDecimalStringN - ldr r1, =gText_BP - bl StringCopy - movs r0, 0x1 - add r1, sp, 0xC - movs r2, 0x30 - bl GetStringRightAlignXOffset - adds r3, r0, 0 - ldr r0, =gUnknown_0203AB6D - ldrb r0, [r0] - lsls r3, 24 - lsrs r3, 24 - movs r1, 0x1 - str r1, [sp] - movs r1, 0 - str r1, [sp, 0x4] - str r1, [sp, 0x8] - movs r1, 0x1 - add r2, sp, 0xC - bl PrintTextOnWindow - add sp, 0x2C - pop {r0} - bx r0 - .pool - thumb_func_end sub_813A8FC - - thumb_func_start sub_813A958 -sub_813A958: @ 813A958 - push {r4,lr} - ldr r4, =gUnknown_0203AB6D - ldr r0, =gUnknown_085B311C - bl AddWindow - strb r0, [r4] - ldrb r0, [r4] - movs r1, 0 - bl SetStandardWindowBorderStyle - bl sub_813A8FC - ldrb r0, [r4] - movs r1, 0x2 - bl CopyWindowToVram - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813A958 - - thumb_func_start sub_813A988 -sub_813A988: @ 813A988 - push {r4,lr} - ldr r4, =gUnknown_0203AB6D - ldrb r0, [r4] - movs r1, 0x1 - bl sub_8198070 - ldrb r0, [r4] - bl RemoveWindow - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813A988 - - thumb_func_start sub_813A9A4 -sub_813A9A4: @ 813A9A4 - push {lr} - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r2, =0x00000eb8 - adds r1, r0, r2 - ldr r0, =gSpecialVar_0x8004 - ldrh r2, [r1] - ldrh r0, [r0] - cmp r2, r0 - bcs _0813A9C8 - movs r0, 0 - b _0813A9CA - .pool -_0813A9C8: - subs r0, r2, r0 -_0813A9CA: - strh r0, [r1] - pop {r0} - bx r0 - thumb_func_end sub_813A9A4 - - thumb_func_start sub_813A9D0 -sub_813A9D0: @ 813A9D0 - push {lr} - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r1, =0x00000eb8 - adds r2, r0, r1 - ldrh r1, [r2] - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - adds r1, r0 - ldr r0, =0x0000270f - cmp r1, r0 - ble _0813A9FC - strh r0, [r2] - b _0813A9FE - .pool -_0813A9FC: - strh r1, [r2] -_0813A9FE: - pop {r0} - bx r0 - thumb_func_end sub_813A9D0 - - thumb_func_start sub_813AA04 -sub_813AA04: @ 813AA04 - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r1, =0x00000eb8 - adds r0, r1 - ldrh r0, [r0] - bx lr - .pool - thumb_func_end sub_813AA04 - - thumb_func_start sub_813AA18 -sub_813AA18: @ 813AA18 - push {r4,lr} - ldr r4, =gUnknown_0203AB6E - ldr r0, =gUnknown_085B3124 - bl AddWindow - strb r0, [r4] - ldrb r0, [r4] - movs r1, 0 - bl SetStandardWindowBorderStyle - ldrb r0, [r4] - movs r1, 0x2 - bl CopyWindowToVram - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813AA18 - - thumb_func_start sub_813AA44 -sub_813AA44: @ 813AA44 - push {r4,lr} - ldr r4, =gUnknown_0203AB6E - ldrb r0, [r4] - movs r1, 0x1 - bl sub_8198070 - ldrb r0, [r4] - bl RemoveWindow - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813AA44 - - thumb_func_start sub_813AA60 -sub_813AA60: @ 813AA60 - push {r4,r5,lr} - sub sp, 0x10 - lsls r0, 16 - lsls r1, 16 - lsrs r5, r1, 16 - lsrs r4, r0, 16 - ldr r1, =0xfffd0000 - adds r0, r1 - lsrs r0, 16 - cmp r0, 0x3 - bls _0813AA78 - b _0813ABC2 -_0813AA78: - movs r0, 0xD8 - str r0, [sp] - movs r0, 0x20 - str r0, [sp, 0x4] - movs r0, 0 - movs r1, 0x11 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - cmp r4, 0x4 - beq _0813AAE8 - cmp r4, 0x4 - bgt _0813AAA0 - cmp r4, 0x3 - beq _0813AAAA - b _0813ABC2 - .pool -_0813AAA0: - cmp r4, 0x5 - beq _0813AB5C - cmp r4, 0x6 - beq _0813AB94 - b _0813ABC2 -_0813AAAA: - ldr r1, =gUnknown_085B3170 - lsls r0, r5, 2 - adds r0, r1 - ldr r2, [r0] - movs r0, 0 - str r0, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] - movs r0, 0x1 - str r0, [sp, 0x8] - str r4, [sp, 0xC] - movs r0, 0 - movs r1, 0x1 - movs r3, 0 - bl AddTextPrinterParametrized - ldr r1, =gUnknown_085B312C - lsls r0, r5, 1 - adds r1, r0, r1 - ldrh r5, [r1] - ldr r0, =0x0000ffff - cmp r5, r0 - beq _0813AB18 - b _0813AB2C - .pool -_0813AAE8: - ldr r1, =gUnknown_085B319C - lsls r0, r5, 2 - adds r0, r1 - ldr r2, [r0] - movs r0, 0 - str r0, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] - movs r0, 0x1 - str r0, [sp, 0x8] - movs r0, 0x3 - str r0, [sp, 0xC] - movs r0, 0 - movs r1, 0x1 - movs r3, 0 - bl AddTextPrinterParametrized - ldr r1, =gUnknown_085B3142 - lsls r0, r5, 1 - adds r1, r0, r1 - ldrh r5, [r1] - ldr r0, =0x0000ffff - cmp r5, r0 - bne _0813AB2C -_0813AB18: - ldrh r0, [r1] - bl sub_813ABD4 - b _0813ABC2 - .pool -_0813AB2C: - ldr r4, =0x0000157c - adds r0, r4, 0 - bl FreeSpriteTilesByTag - adds r0, r4, 0 - bl FreeSpritePaletteByTag - lsls r0, r5, 24 - lsrs r0, 24 - str r4, [sp] - str r4, [sp, 0x4] - movs r1, 0x21 - movs r2, 0x58 - movs r3, 0 - bl AddDecorationIconObject - ldr r1, =gUnknown_0203AB6C - strb r0, [r1] - b _0813ABC2 - .pool -_0813AB5C: - ldr r1, =gUnknown_085B31B4 - lsls r0, r5, 2 - adds r0, r1 - ldr r2, [r0] - movs r0, 0 - str r0, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] - movs r0, 0x1 - str r0, [sp, 0x8] - movs r0, 0x3 - str r0, [sp, 0xC] - movs r0, 0 - movs r1, 0x1 - movs r3, 0 - bl AddTextPrinterParametrized - ldr r1, =gUnknown_085B314E - lsls r0, r5, 1 - adds r0, r1 - ldrh r0, [r0] - bl sub_813ABD4 - b _0813ABC2 - .pool -_0813AB94: - ldr r1, =gUnknown_085B31D0 - lsls r0, r5, 2 - adds r0, r1 - ldr r2, [r0] - movs r0, 0 - str r0, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] - movs r0, 0x1 - str r0, [sp, 0x8] - movs r0, 0x3 - str r0, [sp, 0xC] - movs r0, 0 - movs r1, 0x1 - movs r3, 0 - bl AddTextPrinterParametrized - ldr r1, =gUnknown_085B315C - lsls r0, r5, 1 - adds r0, r1 - ldrh r0, [r0] - bl sub_813ABD4 -_0813ABC2: - add sp, 0x10 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813AA60 - - thumb_func_start sub_813ABD4 -sub_813ABD4: @ 813ABD4 - push {r4,r5,lr} - adds r5, r0, 0 - lsls r5, 16 - lsrs r5, 16 - ldr r4, =0x0000157c - adds r0, r4, 0 - bl FreeSpriteTilesByTag - adds r0, r4, 0 - bl FreeSpritePaletteByTag - adds r0, r4, 0 - adds r1, r4, 0 - adds r2, r5, 0 - bl AddItemIconObject - ldr r4, =gUnknown_0203AB6C - strb r0, [r4] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x40 - beq _0813AC32 - ldr r3, =gSprites - ldrb r0, [r4] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r3 - ldrb r2, [r1, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - strb r0, [r1, 0x5] - ldrb r1, [r4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - movs r1, 0x24 - strh r1, [r0, 0x20] - ldrb r1, [r4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - movs r1, 0x5C - strh r1, [r0, 0x22] -_0813AC32: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813ABD4 - - thumb_func_start sub_813AC44 -sub_813AC44: @ 813AC44 - push {lr} - lsls r0, 16 - lsrs r1, r0, 16 - ldr r2, =gUnknown_0203AB6C - ldrb r0, [r2] - cmp r0, 0x40 - beq _0813AC70 - cmp r1, 0x6 - bgt _0813AC6A - cmp r1, 0x3 - blt _0813AC6A - adds r1, r0, 0 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - bl DestroySpriteAndFreeResources -_0813AC6A: - ldr r1, =gUnknown_0203AB6C - movs r0, 0x40 - strb r0, [r1] -_0813AC70: - pop {r0} - bx r0 - .pool - thumb_func_end sub_813AC44 - - thumb_func_start sub_813AC7C -sub_813AC7C: @ 813AC7C - push {lr} - ldr r0, =gSpecialVar_0x8005 - ldrh r0, [r0] - cmp r0, 0 - beq _0813ACB8 - ldr r0, =gStringVar1 - ldr r2, =gUnknown_085B320C - ldr r1, =gSpecialVar_0x8004 - ldrh r1, [r1] - lsls r1, 1 - adds r1, r2 - ldrh r2, [r1] - movs r1, 0xD - muls r1, r2 - ldr r2, =gMoveNames - adds r1, r2 - bl StringCopy - b _0813ACD2 - .pool -_0813ACB8: - ldr r0, =gStringVar1 - ldr r2, =gUnknown_085B31F8 - ldr r1, =gSpecialVar_0x8004 - ldrh r1, [r1] - lsls r1, 1 - adds r1, r2 - ldrh r2, [r1] - movs r1, 0xD - muls r1, r2 - ldr r2, =gMoveNames - adds r1, r2 - bl StringCopy -_0813ACD2: - pop {r0} - bx r0 - .pool - thumb_func_end sub_813AC7C - - thumb_func_start sub_813ACE8 -sub_813ACE8: @ 813ACE8 - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 24 - adds r5, r0, 0 - lsls r1, 16 - lsrs r6, r1, 16 - subs r0, 0x9 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bhi _0813AD20 - ldr r0, =gSpecialVar_0x8006 - ldrh r0, [r0] - cmp r0, 0 - bne _0813AD18 - ldr r4, =gUnknown_0203AB5E - ldr r0, =gUnknown_085B3220 - bl AddWindow - strb r0, [r4] - ldrb r0, [r4] - movs r1, 0 - bl SetStandardWindowBorderStyle -_0813AD18: - adds r0, r5, 0 - adds r1, r6, 0 - bl sub_813AD34 -_0813AD20: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813ACE8 - - thumb_func_start sub_813AD34 -sub_813AD34: @ 813AD34 - push {r4-r7,lr} - sub sp, 0xC - lsls r0, 24 - lsls r1, 16 - lsrs r5, r1, 16 - adds r7, r5, 0 - lsrs r6, r0, 24 - movs r1, 0xF7 - lsls r1, 24 - adds r0, r1 - lsrs r0, 24 - cmp r0, 0x1 - bhi _0813ADAC - ldr r4, =gUnknown_0203AB5E - ldrb r0, [r4] - movs r1, 0x60 - str r1, [sp] - movs r1, 0x30 - str r1, [sp, 0x4] - movs r1, 0x11 - movs r2, 0 - movs r3, 0 - bl FillWindowPixelRect - cmp r6, 0xA - bne _0813AD90 - ldrb r0, [r4] - ldr r2, =gUnknown_085B3254 - lsls r1, r5, 2 - adds r1, r2 - ldr r2, [r1] - movs r1, 0x1 - str r1, [sp] - movs r1, 0 - str r1, [sp, 0x4] - str r1, [sp, 0x8] - movs r1, 0x1 - movs r3, 0 - bl PrintTextOnWindow - b _0813ADAC - .pool -_0813AD90: - ldrb r0, [r4] - ldr r2, =gUnknown_085B3228 - lsls r1, r7, 2 - adds r1, r2 - ldr r2, [r1] - movs r1, 0x1 - str r1, [sp] - movs r1, 0 - str r1, [sp, 0x4] - str r1, [sp, 0x8] - movs r1, 0x1 - movs r3, 0 - bl PrintTextOnWindow -_0813ADAC: - add sp, 0xC - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813AD34 - - thumb_func_start sub_813ADB8 -sub_813ADB8: @ 813ADB8 - push {r4,lr} - ldr r4, =gUnknown_0203AB5E - ldrb r0, [r4] - movs r1, 0x1 - bl sub_8198070 - ldrb r0, [r4] - bl RemoveWindow - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813ADB8 - - thumb_func_start sub_813ADD4 -sub_813ADD4: @ 813ADD4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x18 - ldr r0, =sub_813A600 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0xFF - beq _0813AE90 - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - ldr r1, =gTasks - adds r6, r0, r1 - ldrh r0, [r6, 0x24] - lsls r0, 24 - lsrs r0, 24 - mov r4, sp - adds r4, 0x16 - add r1, sp, 0x14 - adds r2, r4, 0 - bl get_coro_args_x18_x1A - ldrh r0, [r6, 0x22] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - bl SetStandardWindowBorderStyle - movs r5, 0 - mov r9, r4 - ldr r0, =gUnknown_085B2CF0 - mov r8, r0 - movs r4, 0 -_0813AE1E: - ldrh r0, [r6, 0x22] - lsls r0, 24 - lsrs r0, 24 - add r1, sp, 0x14 - ldrh r2, [r1] - adds r2, r5 - lsls r2, 2 - ldr r1, =gSpecialVar_0x8004 - ldrh r1, [r1] - lsls r1, 6 - adds r2, r1 - add r2, r8 - ldr r2, [r2] - lsls r1, r5, 28 - lsrs r1, 24 - str r1, [sp] - movs r7, 0xFF - str r7, [sp, 0x4] - str r4, [sp, 0x8] - str r4, [sp, 0xC] - str r4, [sp, 0x10] - movs r1, 0x1 - movs r3, 0xA - bl sub_8199F74 - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x5 - bls _0813AE1E - ldrh r0, [r6, 0x22] - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gText_SelectorArrow - mov r3, r9 - ldrh r1, [r3] - lsls r1, 28 - lsrs r1, 24 - str r1, [sp] - str r7, [sp, 0x4] - movs r1, 0 - str r1, [sp, 0x8] - movs r1, 0x1 - movs r3, 0 - bl PrintTextOnWindow - ldrh r0, [r6, 0x22] - lsls r0, 24 - lsrs r0, 24 - bl PutWindowTilemap - ldrh r0, [r6, 0x22] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x3 - bl CopyWindowToVram -_0813AE90: - add sp, 0x18 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813ADD4 - - thumb_func_start sub_813AEB4 -sub_813AEB4: @ 813AEB4 - push {r4,lr} - movs r1, 0 - ldr r0, =gSpecialVar_0x8005 - strh r1, [r0] - ldr r0, =0x0000400e - bl VarGet - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - ldr r0, =0x0000400d - bl VarGet - lsls r0, 16 - lsrs r1, r0, 16 - cmp r4, 0 - beq _0813AF18 - movs r2, 0 - lsls r1, 1 - ldr r3, =gUnknown_0861500C - ldr r0, =gUnknown_085B320C - adds r0, r1, r0 - ldrh r1, [r0] -_0813AEE2: - lsls r0, r2, 1 - adds r0, r3 - ldrh r0, [r0] - cmp r0, r1 - beq _0813AF0C - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x1D - bls _0813AEE2 - b _0813AF38 - .pool -_0813AF0C: - ldr r0, =gSpecialVar_0x8005 - strh r2, [r0] - b _0813AF38 - .pool -_0813AF18: - movs r2, 0 - lsls r1, 1 - ldr r3, =gUnknown_0861500C - ldr r0, =gUnknown_085B31F8 - adds r0, r1, r0 - ldrh r1, [r0] -_0813AF24: - lsls r0, r2, 1 - adds r0, r3 - ldrh r0, [r0] - cmp r0, r1 - beq _0813AF0C - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x1D - bls _0813AF24 -_0813AF38: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813AEB4 - - thumb_func_start sub_813AF48 -sub_813AF48: @ 813AF48 - push {r4,r5,lr} - ldr r0, =sub_813A600 - bl FindTaskIdByFunc - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0xFF - beq _0813AFB6 - lsls r4, r5, 2 - adds r4, r5 - lsls r4, 3 - ldr r0, =gTasks - adds r4, r0 - ldrh r0, [r4, 0x24] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - movs r2, 0 - bl sub_81AE6C8 - ldr r0, =gUnknown_0203AB64 - ldr r0, [r0] - bl Free - ldrh r0, [r4, 0x22] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x1 - bl sub_8198070 - ldrh r0, [r4, 0x22] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0 - bl FillWindowPixelBuffer - ldrh r0, [r4, 0x22] - lsls r0, 24 - lsrs r0, 24 - bl ClearWindowTilemap - ldrh r0, [r4, 0x22] - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x2 - bl CopyWindowToVram - ldrh r0, [r4, 0x22] - lsls r0, 24 - lsrs r0, 24 - bl RemoveWindow - adds r0, r5, 0 - bl DestroyTask -_0813AFB6: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813AF48 - - thumb_func_start sub_813AFC8 -sub_813AFC8: @ 813AFC8 - push {lr} - ldr r0, =task_deoxys_sound - movs r1, 0x8 - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_813AFC8 - - thumb_func_start task_deoxys_sound -task_deoxys_sound: @ 813AFDC - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r7, r0, 24 - ldr r0, =0x000008d4 - bl FlagGet - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0813B004 - ldr r1, =gSpecialVar_Result - movs r0, 0x3 - b _0813B06A - .pool -_0813B004: - ldr r0, =0x00004035 - mov r8, r0 - bl VarGet - lsls r0, 16 - lsrs r5, r0, 16 - ldr r4, =0x00004034 - adds r0, r4, 0 - bl VarGet - lsls r0, 16 - lsrs r6, r0, 16 - adds r0, r4, 0 - movs r1, 0 - bl VarSet - cmp r5, 0 - beq _0813B05C - ldr r0, =gUnknown_085B33F6 - subs r1, r5, 0x1 - adds r1, r0 - ldrb r0, [r1] - cmp r0, r6 - bcs _0813B05C - movs r0, 0 - bl sub_813B0B4 - mov r0, r8 - movs r1, 0 - bl VarSet - ldr r1, =gSpecialVar_Result - movs r0, 0 - strh r0, [r1] - b _0813B070 - .pool -_0813B05C: - cmp r5, 0xA - bne _0813B080 - ldr r0, =0x000008d4 - bl FlagSet - ldr r1, =gSpecialVar_Result - movs r0, 0x2 -_0813B06A: - strh r0, [r1] - bl EnableBothScriptContexts -_0813B070: - adds r0, r7, 0 - bl DestroyTask - b _0813B0A2 - .pool -_0813B080: - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 - lsls r0, r5, 24 - lsrs r0, 24 - bl sub_813B0B4 - ldr r0, =0x00004035 - adds r1, r5, 0 - bl VarSet - ldr r1, =gSpecialVar_Result - movs r0, 0x1 - strh r0, [r1] - adds r0, r7, 0 - bl DestroyTask -_0813B0A2: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end task_deoxys_sound - - thumb_func_start sub_813B0B4 -sub_813B0B4: @ 813B0B4 - push {r4,r5,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 5 - ldr r1, =gUnknown_085B3280 - adds r0, r1 - movs r1, 0xD0 - lsls r1, 1 - movs r2, 0x8 - bl LoadPalette - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldrb r1, [r0, 0x5] - ldrb r2, [r0, 0x4] - movs r0, 0x1 - mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap - cmp r4, 0 - bne _0813B0F0 - movs r0, 0xC4 - bl PlaySE - b _0813B0F8 - .pool -_0813B0F0: - movs r0, 0x82 - lsls r0, 1 - bl PlaySE -_0813B0F8: - ldr r0, =sub_813B160 - movs r1, 0x8 - bl CreateTask - ldr r3, =gFieldEffectArguments - movs r0, 0x1 - str r0, [r3] - movs r0, 0x3A - str r0, [r3, 0x4] - movs r0, 0x1A - str r0, [r3, 0x8] - ldr r0, =gUnknown_085B33E0 - lsls r2, r4, 1 - adds r1, r2, r0 - ldrb r1, [r1] - str r1, [r3, 0xC] - adds r0, 0x1 - adds r0, r2, r0 - ldrb r0, [r0] - str r0, [r3, 0x10] - adds r5, r2, 0 - cmp r4, 0 - bne _0813B138 - movs r0, 0x3C - b _0813B13A - .pool -_0813B138: - movs r0, 0x5 -_0813B13A: - str r0, [r3, 0x14] - movs r0, 0x42 - bl FieldEffectStart - ldr r0, =gUnknown_085B33E0 - adds r1, r5, r0 - ldrb r1, [r1] - adds r0, 0x1 - adds r0, r5, r0 - ldrb r2, [r0] - movs r0, 0x1 - bl Overworld_SetMapObjTemplateCoords - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813B0B4 - - thumb_func_start sub_813B160 -sub_813B160: @ 813B160 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - movs r0, 0x42 - bl FieldEffectActiveListContains - lsls r0, 24 - cmp r0, 0 - bne _0813B17C - bl EnableBothScriptContexts - adds r0, r4, 0 - bl DestroyTask -_0813B17C: - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_813B160 - - thumb_func_start increment_var_x4026_on_birth_island_modulo_100 -increment_var_x4026_on_birth_island_modulo_100: @ 813B184 - push {r4,lr} - ldr r4, =0x00004034 - adds r0, r4, 0 - bl VarGet - lsls r0, 16 - lsrs r2, r0, 16 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldrh r1, [r0, 0x4] - ldr r0, =0x00003a1a - cmp r1, r0 - bne _0813B1C8 - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x63 - bls _0813B1C0 - adds r0, r4, 0 - movs r1, 0 - bl VarSet - b _0813B1C8 - .pool -_0813B1C0: - adds r0, r4, 0 - adds r1, r2, 0 - bl VarSet -_0813B1C8: - pop {r4} - pop {r0} - bx r0 - thumb_func_end increment_var_x4026_on_birth_island_modulo_100 - - thumb_func_start sub_813B1D0 -sub_813B1D0: @ 813B1D0 - push {lr} - ldr r0, =0x00004035 - bl VarGet - lsls r0, 24 - lsrs r0, 19 - ldr r1, =gUnknown_085B3280 - adds r0, r1 - movs r1, 0xD0 - lsls r1, 1 - movs r2, 0x8 - bl LoadPalette - movs r0, 0x80 - lsls r0, 19 - movs r1, 0x10 - movs r2, 0 - bl BlendPalettes - pop {r0} - bx r0 - .pool - thumb_func_end sub_813B1D0 - - thumb_func_start set_unknown_box_id -@ void set_unknown_box_id(char id) -set_unknown_box_id: @ 813B204 - ldr r1, =gUnknown_0203AB6F - strb r0, [r1] - bx lr - .pool - thumb_func_end set_unknown_box_id - - thumb_func_start get_unknown_box_id -get_unknown_box_id: @ 813B210 - ldr r0, =gUnknown_0203AB6F - ldrb r0, [r0] - bx lr - .pool - thumb_func_end get_unknown_box_id - - thumb_func_start sub_813B21C -sub_813B21C: @ 813B21C - push {r4,r5,lr} - ldr r5, =0x000008d7 - adds r0, r5, 0 - bl FlagGet - lsls r0, 24 - cmp r0, 0 - bne _0813B258 - bl StorageGetCurrentBox - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldr r0, =0x00004036 - bl VarGet - lsls r0, 16 - lsrs r0, 16 - cmp r4, r0 - beq _0813B258 - adds r0, r5, 0 - bl FlagSet - movs r0, 0x1 - b _0813B25A - .pool -_0813B258: - movs r0, 0 -_0813B25A: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_813B21C - - thumb_func_start sub_813B260 -sub_813B260: @ 813B260 - push {r4-r7,lr} - ldr r0, =0x00004036 - bl VarGet - lsls r0, 24 - lsrs r0, 24 - bl set_unknown_box_id - bl StorageGetCurrentBox - lsls r0, 24 - lsrs r4, r0, 24 -_0813B278: - movs r5, 0 - lsls r6, r4, 24 - lsls r7, r4, 16 -_0813B27E: - lsls r1, r5, 24 - lsrs r1, 24 - lsrs r0, r6, 24 - bl GetBoxedMonPtr - movs r1, 0xB - movs r2, 0 - bl GetBoxMonData - cmp r0, 0 - bne _0813B2C0 - bl get_unknown_box_id - lsls r0, 16 - lsrs r0, 16 - cmp r0, r4 - beq _0813B2A6 - ldr r0, =0x000008d7 - bl FlagClear -_0813B2A6: - ldr r0, =0x00004036 - lsrs r1, r7, 16 - bl VarSet - bl sub_813B21C - lsls r0, 24 - lsrs r0, 24 - b _0813B2DC - .pool -_0813B2C0: - adds r5, 0x1 - cmp r5, 0x1D - ble _0813B27E - adds r4, 0x1 - cmp r4, 0xE - bne _0813B2CE - movs r4, 0 -_0813B2CE: - bl StorageGetCurrentBox - lsls r0, 24 - lsrs r0, 24 - cmp r4, r0 - bne _0813B278 - movs r0, 0 -_0813B2DC: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_813B260 - - thumb_func_start sub_813B2E4 -sub_813B2E4: @ 813B2E4 - push {r4,lr} - bl Random - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, =0x00004038 - movs r1, 0 - bl VarSet - movs r0, 0xDF - lsls r0, 1 - bl FlagGet - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _0813B340 - ldr r0, =0x000001bf - bl FlagGet - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0813B330 - ldr r0, =0x00004037 - movs r1, 0x7 - ands r4, r1 - adds r1, r4, 0 - adds r1, 0x9 - bl VarSet - b _0813B36A - .pool -_0813B330: - movs r0, 0x1 - ands r4, r0 - cmp r4, 0 - bne _0813B354 - bl Random - lsls r0, 16 - lsrs r4, r0, 16 -_0813B340: - ldr r0, =0x00004037 - movs r1, 0x7 - ands r4, r1 - adds r1, r4, 0x1 - bl VarSet - b _0813B36A - .pool -_0813B354: - bl Random - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, =0x00004037 - movs r1, 0x7 - ands r4, r1 - adds r1, r4, 0 - adds r1, 0x9 - bl VarSet -_0813B36A: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813B2E4 - - thumb_func_start sub_813B374 -sub_813B374: @ 813B374 - push {r4,lr} - ldr r0, =0x00004037 - bl VarGet - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - ldr r0, =gStringVar1 - ldr r2, =gUnknown_085B3400 - subs r1, r4, 0x1 - adds r1, r2 - ldrb r1, [r1] - movs r2, 0 - bl GetMapName - cmp r4, 0x8 - bls _0813B3A8 - movs r0, 0x1 - b _0813B3AA - .pool -_0813B3A8: - movs r0, 0 -_0813B3AA: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_813B374 - - thumb_func_start sub_813B3B0 -sub_813B3B0: @ 813B3B0 - push {r4-r6,lr} - ldr r5, =0x00004038 - adds r0, r5, 0 - bl VarGet - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, =0x00004037 - bl VarGet - lsls r0, 16 - lsrs r6, r0, 16 - cmp r6, 0 - beq _0813B47C - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, =0x000003e7 - cmp r4, r0 - bls _0813B474 - adds r0, r5, 0 - movs r1, 0 - bl VarSet - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - movs r0, 0x4 - ldrsb r0, [r1, r0] - cmp r0, 0x18 - bne _0813B414 - movs r0, 0x5 - ldrsb r0, [r1, r0] - cmp r0, 0x69 - bgt _0813B414 - cmp r0, 0x65 - blt _0813B414 - ldr r0, =0x00004039 - movs r1, 0x1 - b _0813B478 - .pool -_0813B414: - ldr r0, =gSaveBlock1Ptr - ldr r2, [r0] - movs r1, 0x4 - ldrsb r1, [r2, r1] - adds r3, r0, 0 - cmp r1, 0 - bne _0813B444 - movs r0, 0x5 - ldrsb r0, [r2, r0] - cmp r0, 0x34 - beq _0813B436 - cmp r0, 0x34 - blt _0813B444 - cmp r0, 0x38 - bgt _0813B444 - cmp r0, 0x36 - blt _0813B444 -_0813B436: - ldr r0, =0x00004039 - movs r1, 0x1 - b _0813B478 - .pool -_0813B444: - ldr r3, [r3] - movs r2, 0x5 - ldrsb r2, [r3, r2] - ldr r1, =gUnknown_085B3410 - subs r0, r6, 0x1 - adds r0, r1 - ldrb r0, [r0] - cmp r2, r0 - bne _0813B468 - movs r0, 0x4 - ldrsb r0, [r3, r0] - cmp r0, 0 - bne _0813B468 - movs r0, 0x1 - b _0813B47E - .pool -_0813B468: - ldr r0, =0x00004037 - movs r1, 0 - b _0813B478 - .pool -_0813B474: - adds r0, r5, 0 - adds r1, r4, 0 -_0813B478: - bl VarSet -_0813B47C: - movs r0, 0 -_0813B47E: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_813B3B0 - - thumb_func_start sub_813B484 -sub_813B484: @ 813B484 - push {lr} - movs r0, 0x2 - bl sub_80AB104 - pop {r0} - bx r0 - thumb_func_end sub_813B484 - - thumb_func_start sub_813B490 -sub_813B490: @ 813B490 - push {r4-r7,lr} - movs r3, 0 - ldr r0, =gSaveBlock1Ptr - ldr r4, [r0] - movs r6, 0x4 - ldrsb r6, [r4, r6] - ldr r5, =gUnknown_085B3420 - adds r0, r5, 0x2 - mov r12, r0 - adds r7, r5, 0x1 -_0813B4A4: - lsls r0, r3, 1 - adds r2, r0, r3 - adds r0, r2, r5 - ldrb r0, [r0] - cmp r6, r0 - bne _0813B4CC - movs r1, 0x5 - ldrsb r1, [r4, r1] - adds r0, r2, r7 - ldrb r0, [r0] - cmp r1, r0 - bne _0813B4CC - mov r1, r12 - adds r0, r2, r1 - ldrb r0, [r0] - b _0813B4D8 - .pool -_0813B4CC: - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0xB - bls _0813B4A4 - movs r0, 0x1 -_0813B4D8: - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_813B490 - - thumb_func_start sub_813B4E0 -sub_813B4E0: @ 813B4E0 - push {lr} - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - bl sub_81D15CC - cmp r0, 0 - blt _0813B50C - movs r1, 0xAE - lsls r1, 1 - adds r0, r1 - lsls r0, 16 - lsrs r0, 16 - bl FlagGet - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0813B50C - movs r0, 0x1 - b _0813B50E - .pool -_0813B50C: - movs r0, 0 -_0813B50E: - pop {r1} - bx r1 - thumb_func_end sub_813B4E0 - - thumb_func_start sub_813B514 -sub_813B514: @ 813B514 - push {lr} - ldr r0, =0x0000403f - bl VarGet - lsls r0, 16 - cmp r0, 0 - beq _0813B52C - movs r0, 0x1 - b _0813B52E - .pool -_0813B52C: - movs r0, 0 -_0813B52E: - pop {r1} - bx r1 - thumb_func_end sub_813B514 - - thumb_func_start sub_813B534 -sub_813B534: @ 813B534 - push {lr} - ldr r2, =gUnknown_0203AB70 - ldr r1, =gBattleTypeFlags - ldr r0, [r1] - str r0, [r2] - movs r0, 0 - str r0, [r1] - ldr r0, =gReceivedRemoteLinkPlayers - ldrb r0, [r0] - cmp r0, 0 - bne _0813B552 - ldr r0, =sub_80B3AF8 - movs r1, 0x5 - bl CreateTask -_0813B552: - pop {r0} - bx r0 - .pool - thumb_func_end sub_813B534 - - thumb_func_start sub_813B568 -sub_813B568: @ 813B568 - push {lr} - ldr r0, =sub_813B57C - movs r1, 0x5 - bl CreateTask - pop {r0} - bx r0 - .pool - thumb_func_end sub_813B568 - - thumb_func_start sub_813B57C -sub_813B57C: @ 813B57C - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - movs r1, 0x8 - ldrsh r0, [r0, r1] - cmp r0, 0x9 - bls _0813B596 - b _0813B7C6 -_0813B596: - lsls r0, 2 - ldr r1, =_0813B5A8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0813B5A8: - .4byte _0813B5D0 - .4byte _0813B5E4 - .4byte _0813B614 - .4byte _0813B6B4 - .4byte _0813B6E4 - .4byte _0813B728 - .4byte _0813B764 - .4byte _0813B772 - .4byte _0813B784 - .4byte _0813B7A8 -_0813B5D0: - ldr r0, =sub_80B3AF8 - bl FuncIsActiveTask - lsls r0, 24 - cmp r0, 0 - beq _0813B5DE - b _0813B7C6 -_0813B5DE: - b _0813B790 - .pool -_0813B5E4: - bl sub_800A520 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _0813B5F2 - b _0813B7C6 -_0813B5F2: - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - bne _0813B5FE - b _0813B790 -_0813B5FE: - bl bitmask_all_link_players_but_self - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gSpecialVar_0x8004 - movs r2, 0x2 - bl SendBlock - b _0813B708 - .pool -_0813B614: - bl GetBlockReceivedStatus - movs r1, 0x2 - ands r1, r0 - cmp r1, 0 - bne _0813B622 - b _0813B7C6 -_0813B622: - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - beq _0813B62E - b _0813B790 -_0813B62E: - ldr r5, =gSpecialVar_0x8005 - ldr r0, =gBlockRecvBuffer - movs r1, 0x80 - lsls r1, 1 - adds r0, r1 - ldrh r0, [r0] - strh r0, [r5] - movs r0, 0x1 - bl ResetBlockReceivedFlag - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0x1 - bne _0813B668 - ldrh r1, [r5] - cmp r1, 0x1 - bne _0813B668 - ldr r0, =gSpecialVar_Result - strh r1, [r0] - b _0813B790 - .pool -_0813B668: - ldr r0, =gSpecialVar_0x8004 - ldrh r1, [r0] - adds r2, r0, 0 - cmp r1, 0 - bne _0813B68C - ldr r0, =gSpecialVar_0x8005 - ldrh r0, [r0] - cmp r0, 0x1 - bne _0813B68C - ldr r1, =gSpecialVar_Result - movs r0, 0x2 - b _0813B6AC - .pool -_0813B68C: - ldrh r0, [r2] - cmp r0, 0x1 - bne _0813B6A8 - ldr r0, =gSpecialVar_0x8005 - ldrh r0, [r0] - cmp r0, 0 - bne _0813B6A8 - ldr r1, =gSpecialVar_Result - movs r0, 0x3 - b _0813B6AC - .pool -_0813B6A8: - ldr r1, =gSpecialVar_Result - movs r0, 0 -_0813B6AC: - strh r0, [r1] - b _0813B790 - .pool -_0813B6B4: - bl sub_800A520 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _0813B6C2 - b _0813B7C6 -_0813B6C2: - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - bne _0813B790 - bl bitmask_all_link_players_but_self - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gSpecialVar_Result - movs r2, 0x2 - bl SendBlock - b _0813B708 - .pool -_0813B6E4: - bl GetBlockReceivedStatus - movs r1, 0x1 - ands r1, r0 - cmp r1, 0 - beq _0813B7C6 - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - beq _0813B790 - ldr r1, =gSpecialVar_Result - ldr r0, =gBlockRecvBuffer - ldrh r0, [r0] - strh r0, [r1] - movs r0, 0 - bl ResetBlockReceivedFlag -_0813B708: - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldrh r1, [r0, 0x8] - adds r1, 0x1 - strh r1, [r0, 0x8] - b _0813B7C6 - .pool -_0813B728: - bl GetMultiplayerId - lsls r0, 24 - cmp r0, 0 - bne _0813B74C - ldr r0, =gSpecialVar_Result - ldrh r0, [r0] - cmp r0, 0x2 - bne _0813B790 - ldr r0, =gText_YourPartnerHasRetired - bl ShowFieldAutoScrollMessage - b _0813B790 - .pool -_0813B74C: - ldr r0, =gSpecialVar_Result - ldrh r0, [r0] - cmp r0, 0x3 - bne _0813B790 - ldr r0, =gText_YourPartnerHasRetired - bl ShowFieldAutoScrollMessage - b _0813B790 - .pool -_0813B764: - movs r0, 0 - bl IsTextPrinterActive - lsls r0, 16 - cmp r0, 0 - bne _0813B7C6 - b _0813B790 -_0813B772: - bl sub_800A520 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0813B7C6 - bl sub_800ADF8 - b _0813B790 -_0813B784: - bl sub_800A520 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0813B7C6 -_0813B790: - ldr r0, =gTasks - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] - b _0813B7C6 - .pool -_0813B7A8: - ldr r0, =gLinkVSyncDisabled - ldrb r0, [r0] - cmp r0, 0 - bne _0813B7B4 - bl sub_800AC34 -_0813B7B4: - ldr r0, =gBattleTypeFlags - ldr r1, =gUnknown_0203AB70 - ldr r1, [r1] - str r1, [r0] - bl EnableBothScriptContexts - adds r0, r4, 0 - bl DestroyTask -_0813B7C6: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813B57C - - thumb_func_start sub_813B7D8 -sub_813B7D8: @ 813B7D8 - push {lr} - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0 - bne _0813B7F8 - ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music - movs r0, 0 - movs r1, 0x1 - bl sub_81D6720 - b _0813B802 - .pool -_0813B7F8: - ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music - movs r0, 0x1 - movs r1, 0 - bl sub_81D6720 -_0813B802: - pop {r0} - bx r0 - .pool - thumb_func_end sub_813B7D8 - - thumb_func_start sub_813B80C -sub_813B80C: @ 813B80C - push {lr} - ldr r0, =sub_813B824 - movs r1, 0x8 - bl CreateTask - movs r0, 0x9D - bl PlaySE - pop {r0} - bx r0 - .pool - thumb_func_end sub_813B80C - - thumb_func_start sub_813B824 -sub_813B824: @ 813B824 - push {r4,r5,lr} - lsls r0, 24 - lsrs r0, 24 - adds r5, r0, 0 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r4, r0, r1 - ldrh r0, [r4, 0x2] - adds r0, 0x1 - strh r0, [r4, 0x2] - movs r0, 0x2 - ldrsh r1, [r4, r0] - ldr r0, =gSpecialVar_0x8005 - ldrh r0, [r0] - cmp r1, r0 - bne _0813B858 - ldrh r0, [r4] - adds r0, 0x1 - strh r0, [r4] - movs r0, 0 - strh r0, [r4, 0x2] - movs r0, 0x9D - bl PlaySE -_0813B858: - movs r0, 0 - ldrsh r1, [r4, r0] - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - subs r0, 0x1 - cmp r1, r0 - bne _0813B86C - adds r0, r5, 0 - bl DestroyTask -_0813B86C: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813B824 - - thumb_func_start sub_813B880 -sub_813B880: @ 813B880 - push {lr} - ldr r0, =_fwalk - movs r1, 0x8 - bl CreateTask - lsls r0, 24 - lsrs r0, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - movs r2, 0 - movs r0, 0x4 - strh r0, [r1, 0x8] - strh r0, [r1, 0xA] - strh r0, [r1, 0xC] - strh r2, [r1, 0xE] - pop {r0} - bx r0 - .pool - thumb_func_end sub_813B880 - - thumb_func_start _fwalk -_fwalk: @ 813B8B0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - lsls r0, 2 - add r0, r9 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r5, r0, r1 - movs r0, 0x6 - ldrsh r1, [r5, r0] - lsls r1, 1 - adds r1, r5 - ldrh r0, [r1] - subs r0, 0x1 - strh r0, [r1] - movs r1, 0x6 - ldrsh r0, [r5, r1] - lsls r0, 1 - adds r0, r5 - movs r2, 0 - ldrsh r0, [r0, r2] - cmp r0, 0 - bne _0813B94E - movs r6, 0 -_0813B8EA: - movs r4, 0 - lsls r3, r6, 3 - mov r10, r3 - adds r7, r6, 0x1 - mov r8, r7 -_0813B8F4: - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - movs r2, 0 - ldrsh r0, [r1, r2] - adds r0, r4 - adds r0, 0x6 - movs r3, 0x2 - ldrsh r1, [r1, r3] - adds r1, r6 - adds r1, 0x4 - ldr r7, =0x00000201 - adds r2, r4, r7 - add r2, r10 - movs r7, 0x6 - ldrsh r3, [r5, r7] - lsls r3, 5 - adds r2, r3 - lsls r2, 16 - lsrs r2, 16 - bl MapGridSetMetatileIdAt - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x2 - bls _0813B8F4 - mov r1, r8 - lsls r0, r1, 24 - lsrs r6, r0, 24 - cmp r6, 0x3 - bls _0813B8EA - bl DrawWholeMapView - ldrh r0, [r5, 0x6] - adds r0, 0x1 - strh r0, [r5, 0x6] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x3 - bne _0813B94E - mov r0, r9 - bl DestroyTask - bl EnableBothScriptContexts -_0813B94E: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end _fwalk - - thumb_func_start sub_813B968 -sub_813B968: @ 813B968 - push {r4,r5,lr} - ldr r5, =gSpecialVar_Result - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - movs r1, 0x7 - bl __udivsi3 - strh r0, [r5] - ldrh r4, [r5] - adds r0, r4, 0 - movs r1, 0x14 - bl __udivsi3 - lsls r0, 16 - lsrs r0, 16 - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 2 - subs r4, r1 - strh r4, [r5] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813B968 - - thumb_func_start sub_813B9A0 -sub_813B9A0: @ 813B9A0 - push {lr} - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldrh r1, [r0, 0x1C] - movs r0, 0xB0 - lsls r0, 4 - cmp r1, r0 - bne _0813B9B6 - movs r0, 0x3 - bl Overworld_SetHealLocationWarp -_0813B9B6: - pop {r0} - bx r0 - .pool - thumb_func_end sub_813B9A0 - - thumb_func_start sub_813B9C0 -sub_813B9C0: @ 813B9C0 - push {r4,lr} - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - movs r1, 0x4 - ldrsb r1, [r0, r1] - lsls r1, 8 - ldrb r0, [r0, 0x5] - lsls r0, 24 - asrs r0, 24 - adds r0, r1 - lsls r0, 16 - lsrs r3, r0, 16 - ldr r2, =gUnknown_085B3444 - ldrh r0, [r2] - ldr r1, =0x0000ffff - cmp r0, r1 - beq _0813BA06 - adds r4, r1, 0 - adds r1, r2, 0 -_0813B9E6: - ldrh r0, [r2] - cmp r0, r3 - bne _0813B9FC - movs r0, 0x1 - b _0813BA08 - .pool -_0813B9FC: - adds r1, 0x2 - adds r2, 0x2 - ldrh r0, [r1] - cmp r0, r4 - bne _0813B9E6 -_0813BA06: - movs r0, 0 -_0813BA08: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_813B9C0 - - thumb_func_start ResetFanClub -ResetFanClub: @ 813BA10 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x0000141e - adds r1, r0, r2 - movs r2, 0 - strh r2, [r1] - movs r1, 0xA1 - lsls r1, 5 - adds r0, r1 - strh r2, [r0] - bx lr - .pool - thumb_func_end ResetFanClub - - thumb_func_start sub_813BA30 -sub_813BA30: @ 813BA30 - push {lr} - bl sub_813BF44 - lsls r0, 24 - cmp r0, 0 - beq _0813BA52 - bl sub_813BCE8 - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldrh r0, [r0, 0xE] - movs r2, 0xA1 - lsls r2, 5 - adds r1, r2 - strh r0, [r1] -_0813BA52: - pop {r0} - bx r0 - .pool - thumb_func_end sub_813BA30 - - thumb_func_start sub_813BA60 -sub_813BA60: @ 813BA60 - push {r4,lr} - ldr r4, =gSaveBlock1Ptr - ldr r0, [r4] - ldr r1, =0x0000141e - adds r0, r1 - ldrh r0, [r0] - lsrs r0, 7 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - bne _0813BAB6 - bl sub_813BF60 - bl sub_813BD84 - ldr r1, [r4] - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldrh r0, [r0, 0xE] - movs r2, 0xA1 - lsls r2, 5 - adds r1, r2 - strh r0, [r1] - ldr r0, =0x00000315 - bl FlagClear - ldr r0, =0x00000316 - bl FlagClear - ldr r0, =0x00000317 - bl FlagClear - movs r0, 0xC6 - lsls r0, 2 - bl FlagClear - ldr r0, =0x000002da - bl FlagClear - ldr r0, =0x00004095 - movs r1, 0x1 - bl VarSet -_0813BAB6: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813BA60 - - thumb_func_start sub_813BADC -sub_813BADC: @ 813BADC - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - ldr r0, =0x00004095 - bl VarGet - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x2 - bne _0813BB58 - ldr r4, =gSaveBlock1Ptr - ldr r0, [r4] - ldr r5, =0x0000141e - adds r3, r0, r5 - ldrh r2, [r3] - movs r1, 0x7F - ands r1, r2 - ldr r0, =gUnknown_085B3470 - adds r0, r6, r0 - ldrb r0, [r0] - adds r1, r0 - cmp r1, 0x13 - ble _0813BB54 - bl sub_813BCA8 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x2 - bhi _0813BB3C - bl sub_813BB74 - ldr r0, [r4] - adds r0, r5 - ldrh r2, [r0] - ldr r1, =0x0000ff80 - ands r1, r2 - strh r1, [r0] - b _0813BB58 - .pool -_0813BB3C: - ldr r2, [r4] - adds r2, r5 - ldrh r1, [r2] - ldr r0, =0x0000ff80 - ands r0, r1 - movs r1, 0x14 - orrs r0, r1 - strh r0, [r2] - b _0813BB58 - .pool -_0813BB54: - adds r0, r2, r0 - strh r0, [r3] -_0813BB58: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x0000141e - adds r0, r1 - ldrb r1, [r0] - movs r0, 0x7F - ands r0, r1 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_813BADC - - thumb_func_start sub_813BB74 -sub_813BB74: @ 813BB74 - push {r4-r7,lr} - sub sp, 0x8 - movs r3, 0 - movs r5, 0 - ldr r7, =gSaveBlock1Ptr - ldr r2, =0x0000141e - movs r6, 0x1 -_0813BB82: - ldr r0, [r7] - adds r0, r2 - ldrh r1, [r0] - ldr r0, =gUnknown_085B3474 - adds r0, r5, r0 - ldrb r4, [r0] - asrs r1, r4 - ands r1, r6 - cmp r1, 0 - bne _0813BBC8 - adds r3, r5, 0 - str r2, [sp] - str r3, [sp, 0x4] - bl Random - adds r1, r6, 0 - ands r1, r0 - ldr r2, [sp] - ldr r3, [sp, 0x4] - cmp r1, 0 - beq _0813BBC8 - ldr r0, [r7] - adds r0, r2 - adds r1, r6, 0 - lsls r1, r4 - ldrh r2, [r0] - orrs r1, r2 - strh r1, [r0] - b _0813BBEA - .pool -_0813BBC8: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x7 - bls _0813BB82 - ldr r0, =gSaveBlock1Ptr - ldr r2, [r0] - ldr r0, =0x0000141e - adds r2, r0 - ldr r1, =gUnknown_085B3474 - adds r1, r3, r1 - movs r0, 0x1 - ldrb r1, [r1] - lsls r0, r1 - ldrh r1, [r2] - orrs r0, r1 - strh r0, [r2] -_0813BBEA: - adds r0, r3, 0 - add sp, 0x8 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_813BB74 - - thumb_func_start sub_813BC00 -sub_813BC00: @ 813BC00 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - movs r0, 0 - mov r10, r0 - bl sub_813BCA8 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - bne _0813BC2E - movs r0, 0 - b _0813BC8E -_0813BC1E: - mov r1, r8 - ldr r0, [r1] - add r0, r9 - lsls r4, r6 - ldrh r1, [r0] - eors r4, r1 - strh r4, [r0] - b _0813BC8C -_0813BC2E: - movs r5, 0 - ldr r2, =gSaveBlock1Ptr - mov r8, r2 - ldr r0, =0x0000141e - mov r9, r0 - movs r4, 0x1 -_0813BC3A: - mov r1, r8 - ldr r0, [r1] - add r0, r9 - ldrh r1, [r0] - ldr r7, =gUnknown_085B347C - adds r0, r5, r7 - ldrb r6, [r0] - asrs r1, r6 - ands r1, r4 - cmp r1, 0 - beq _0813BC5E - mov r10, r5 - bl Random - adds r1, r4, 0 - ands r1, r0 - cmp r1, 0 - bne _0813BC1E -_0813BC5E: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x7 - bls _0813BC3A - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r2, =0x0000141e - adds r4, r0, r2 - ldrh r1, [r4] - mov r2, r10 - adds r0, r2, r7 - ldrb r2, [r0] - adds r0, r1, 0 - asrs r0, r2 - movs r3, 0x1 - ands r0, r3 - cmp r0, 0 - beq _0813BC8C - adds r0, r3, 0 - lsls r0, r2 - eors r1, r0 - strh r1, [r4] -_0813BC8C: - mov r0, r10 -_0813BC8E: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end sub_813BC00 - - thumb_func_start sub_813BCA8 -sub_813BCA8: @ 813BCA8 - push {r4,r5,lr} - movs r3, 0 - movs r2, 0 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x0000141e - adds r0, r1 - ldrh r4, [r0] - movs r5, 0x1 -_0813BCBA: - adds r1, r2, 0 - adds r1, 0x8 - adds r0, r4, 0 - asrs r0, r1 - ands r0, r5 - cmp r0, 0 - beq _0813BCCE - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 -_0813BCCE: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x7 - bls _0813BCBA - adds r0, r3, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_813BCA8 - - thumb_func_start sub_813BCE8 -sub_813BCE8: @ 813BCE8 - push {r4-r6,lr} - movs r5, 0 - ldr r2, =gSaveBlock2Ptr - ldr r0, [r2] - ldrh r1, [r0, 0xE] - ldr r0, =0x000003e6 - cmp r1, r0 - bhi _0813BD58 - adds r6, r2, 0 - b _0813BD32 - .pool -_0813BD04: - ldr r0, [r6] - ldrh r1, [r0, 0xE] - ldr r4, =gSaveBlock1Ptr - ldr r0, [r4] - movs r2, 0xA1 - lsls r2, 5 - adds r0, r2 - ldrh r0, [r0] - subs r1, r0 - cmp r1, 0xB - ble _0813BD58 - bl sub_813BC00 - ldr r0, [r4] - movs r1, 0xA1 - lsls r1, 5 - adds r0, r1 - ldrh r1, [r0] - adds r1, 0xC - strh r1, [r0] - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 -_0813BD32: - bl sub_813BCA8 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x4 - bhi _0813BD54 - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, [r6] - ldrh r0, [r0, 0xE] - movs r2, 0xA1 - lsls r2, 5 - adds r1, r2 - strh r0, [r1] - b _0813BD58 - .pool -_0813BD54: - cmp r5, 0x8 - bne _0813BD04 -_0813BD58: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_813BCE8 - - thumb_func_start sub_813BD60 -sub_813BD60: @ 813BD60 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x0000141e - adds r0, r1 - ldrh r0, [r0] - ldr r1, =gSpecialVar_0x8004 - ldrh r1, [r1] - asrs r0, r1 - movs r1, 0x1 - ands r0, r1 - bx lr - .pool - thumb_func_end sub_813BD60 - - thumb_func_start sub_813BD84 -sub_813BD84: @ 813BD84 - ldr r0, =gSaveBlock1Ptr - ldr r2, [r0] - ldr r0, =0x0000141e - adds r2, r0 - ldrh r1, [r2] - movs r3, 0x80 - lsls r3, 6 - adds r0, r3, 0 - orrs r0, r1 - movs r3, 0x80 - lsls r3, 1 - adds r1, r3, 0 - orrs r0, r1 - movs r3, 0x80 - lsls r3, 3 - adds r1, r3, 0 - orrs r0, r1 - strh r0, [r2] - bx lr - .pool - thumb_func_end sub_813BD84 - - thumb_func_start sub_813BDB4 -sub_813BDB4: @ 813BDB4 - push {lr} - movs r3, 0 - movs r2, 0 - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - subs r0, 0x8 - cmp r0, 0x7 - bhi _0813BE14 - lsls r0, 2 - ldr r1, =_0813BDD8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0813BDD8: - .4byte _0813BE14 - .4byte _0813BE14 - .4byte _0813BDF8 - .4byte _0813BDFE - .4byte _0813BE04 - .4byte _0813BE0A - .4byte _0813BE10 - .4byte _0813BE14 -_0813BDF8: - movs r3, 0 - movs r2, 0x3 - b _0813BE14 -_0813BDFE: - movs r3, 0 - movs r2, 0x1 - b _0813BE14 -_0813BE04: - movs r3, 0x1 - movs r2, 0 - b _0813BE14 -_0813BE0A: - movs r3, 0 - movs r2, 0x4 - b _0813BE14 -_0813BE10: - movs r3, 0x1 - movs r2, 0x5 -_0813BE14: - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x00003150 - adds r0, r1 - adds r1, r3, 0 - bl sub_813BE30 - pop {r0} - bx r0 - .pool - thumb_func_end sub_813BDB4 - - thumb_func_start sub_813BE30 -sub_813BE30: @ 813BE30 - push {r4-r6,lr} - adds r6, r0, 0 - lsls r1, 24 - lsrs r5, r1, 24 - lsls r2, 24 - lsrs r2, 24 - lsls r0, r5, 4 - adds r1, r6, r0 - ldrb r0, [r1] - cmp r0, 0xFF - bne _0813BEE8 - cmp r2, 0x5 - bhi _0813BED4 - lsls r0, r2, 2 - ldr r1, =_0813BE58 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_0813BE58: - .4byte _0813BED4 - .4byte _0813BE70 - .4byte _0813BE84 - .4byte _0813BE98 - .4byte _0813BEAC - .4byte _0813BEC0 -_0813BE70: - ldr r0, =gStringVar1 - ldr r1, =gText_Steven - bl StringCopy - b _0813BF04 - .pool -_0813BE84: - ldr r0, =gStringVar1 - ldr r1, =gText_Brawly - bl StringCopy - b _0813BF04 - .pool -_0813BE98: - ldr r0, =gStringVar1 - ldr r1, =gText_Winona - bl StringCopy - b _0813BF04 - .pool -_0813BEAC: - ldr r0, =gStringVar1 - ldr r1, =gText_Phoebe - bl StringCopy - b _0813BF04 - .pool -_0813BEC0: - ldr r0, =gStringVar1 - ldr r1, =gText_Glacia - bl StringCopy - b _0813BF04 - .pool -_0813BED4: - ldr r0, =gStringVar1 - ldr r1, =gText_Wallace - bl StringCopy - b _0813BF04 - .pool -_0813BEE8: - ldr r4, =gStringVar1 - adds r0, r4, 0 - movs r2, 0x7 - bl StringCopyN - movs r0, 0xFF - strb r0, [r4, 0x7] - adds r0, r6, 0 - adds r0, 0x50 - adds r0, r5 - ldrb r1, [r0] - adds r0, r4, 0 - bl ConvertInternationalString -_0813BF04: - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_813BE30 - - thumb_func_start sub_813BF10 -sub_813BF10: @ 813BF10 - push {lr} - ldr r0, =0x00004095 - bl VarGet - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x2 - bne _0813BF40 - bl sub_813BA30 - ldr r0, =gBattleOutcome - ldrb r0, [r0] - cmp r0, 0x1 - bne _0813BF3C - bl sub_813BB74 - b _0813BF40 - .pool -_0813BF3C: - bl sub_813BC00 -_0813BF40: - pop {r0} - bx r0 - thumb_func_end sub_813BF10 - - thumb_func_start sub_813BF44 -sub_813BF44: @ 813BF44 - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldr r1, =0x0000141e - adds r0, r1 - ldrh r0, [r0] - lsrs r0, 7 - movs r1, 0x1 - ands r0, r1 - bx lr - .pool - thumb_func_end sub_813BF44 - - thumb_func_start sub_813BF60 -sub_813BF60: @ 813BF60 - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - ldr r0, =0x0000141e - adds r1, r0 - ldrh r2, [r1] - movs r0, 0x80 - orrs r0, r2 - strh r0, [r1] - bx lr - .pool - thumb_func_end sub_813BF60 - - thumb_func_start sub_813BF7C -sub_813BF7C: @ 813BF7C - push {lr} - ldr r0, =gSpecialVar_0x8004 - ldrb r0, [r0] - bl sub_813BADC - lsls r0, 24 - lsrs r0, 24 - pop {r1} - bx r1 - .pool - thumb_func_end sub_813BF7C - + .align 2, 0 @ Don't pad with nop. diff --git a/asm/rom_8034C54.s b/asm/rom_8034C54.s new file mode 100644 index 000000000..432b8250e --- /dev/null +++ b/asm/rom_8034C54.s @@ -0,0 +1,1312 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .syntax unified + + .text + + thumb_func_start sub_8034C54 +sub_8034C54: @ 8034C54 + push {r4-r7,lr} + adds r4, r0, 0 + ldr r5, =gUnknown_02022E10 + ldr r0, [r5] + cmp r0, 0 + beq _08034C64 + bl sub_8034CC8 +_08034C64: + movs r0, 0x8 + bl Alloc + str r0, [r5] + cmp r0, 0 + bne _08034C78 + movs r0, 0 + b _08034CC0 + .pool +_08034C78: + lsls r0, r4, 3 + subs r0, r4 + lsls r0, 2 + bl Alloc + ldr r1, [r5] + str r0, [r1, 0x4] + cmp r0, 0 + bne _08034C94 + adds r0, r1, 0 + bl Free + movs r0, 0 + b _08034CC0 +_08034C94: + str r4, [r1] + movs r3, 0 + cmp r3, r4 + bcs _08034CBE + movs r7, 0 + movs r6, 0xFF + movs r2, 0 +_08034CA2: + ldr r0, [r5] + ldr r0, [r0, 0x4] + adds r0, r2, r0 + strb r7, [r0] + ldr r0, [r5] + ldr r1, [r0, 0x4] + adds r1, r2, r1 + ldrb r0, [r1, 0x1] + orrs r0, r6 + strb r0, [r1, 0x1] + adds r2, 0x1C + adds r3, 0x1 + cmp r3, r4 + bcc _08034CA2 +_08034CBE: + movs r0, 0x1 +_08034CC0: + pop {r4-r7} + pop {r1} + bx r1 + thumb_func_end sub_8034C54 + + thumb_func_start sub_8034CC8 +sub_8034CC8: @ 8034CC8 + push {r4,r5,lr} + ldr r2, =gUnknown_02022E10 + ldr r1, [r2] + cmp r1, 0 + beq _08034D08 + ldr r0, [r1, 0x4] + cmp r0, 0 + beq _08034CFC + movs r4, 0 + ldr r0, [r1] + cmp r4, r0 + bcs _08034CF2 + adds r5, r2, 0 +_08034CE2: + adds r0, r4, 0 + bl sub_80353DC + adds r4, 0x1 + ldr r0, [r5] + ldr r0, [r0] + cmp r4, r0 + bcc _08034CE2 +_08034CF2: + ldr r0, =gUnknown_02022E10 + ldr r0, [r0] + ldr r0, [r0, 0x4] + bl Free +_08034CFC: + ldr r4, =gUnknown_02022E10 + ldr r0, [r4] + bl Free + movs r0, 0 + str r0, [r4] +_08034D08: + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8034CC8 + + thumb_func_start sub_8034D14 +sub_8034D14: @ 8034D14 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + sub sp, 0x8 + mov r8, r0 + mov r10, r1 + adds r5, r2, 0 + ldr r6, =gUnknown_02022E10 + ldr r0, [r6] + cmp r0, 0 + beq _08034DD4 + ldr r1, [r0, 0x4] + mov r0, r8 + lsls r2, r0, 3 + subs r0, r2, r0 + lsls r4, r0, 2 + adds r1, r4, r1 + ldrb r0, [r1] + mov r9, r2 + cmp r0, 0 + bne _08034DD4 + ldrb r0, [r5, 0x1] + bl sub_8035518 + ldr r1, [r6] + ldr r1, [r1, 0x4] + adds r1, r4, r1 + strb r0, [r1, 0x1] + ldr r0, [r6] + ldr r0, [r0, 0x4] + adds r0, r4, r0 + ldrb r0, [r0, 0x1] + cmp r0, 0xFF + beq _08034DD4 + ldr r0, [r5, 0x8] + ldrh r0, [r0, 0x6] + bl GetSpriteTileStartByTag + ldr r2, [r6] + ldr r1, [r2, 0x4] + adds r1, r4, r1 + strh r0, [r1, 0xA] + ldr r0, [r2, 0x4] + adds r0, r4, r0 + ldrh r1, [r0, 0xA] + ldr r7, =0xffff0000 + lsrs r0, r7, 16 + cmp r1, r0 + bne _08034DE0 + ldr r2, [r5, 0x8] + ldrh r0, [r2, 0x4] + adds r1, r2, 0 + cmp r0, 0 + beq _08034D94 + adds r0, r1, 0 + bl LoadSpriteSheet + b _08034DB4 + .pool +_08034D94: + ldr r0, [r2] + ldr r1, [r2, 0x4] + str r0, [sp] + str r1, [sp, 0x4] + ldr r0, [r2] + bl sub_8034974 + lsls r0, 16 + lsrs r0, 16 + ldr r1, [sp, 0x4] + ands r1, r7 + orrs r1, r0 + str r1, [sp, 0x4] + mov r0, sp + bl LoadCompressedObjectPic +_08034DB4: + ldr r1, [r6] + ldr r1, [r1, 0x4] + adds r1, r4, r1 + strh r0, [r1, 0xA] + ldr r0, =gUnknown_02022E10 + ldr r0, [r0] + ldr r1, [r0, 0x4] + mov r2, r9 + mov r3, r8 + subs r0, r2, r3 + lsls r0, 2 + adds r0, r1 + ldrh r1, [r0, 0xA] + ldr r0, =0x0000ffff + cmp r1, r0 + bne _08034DE0 +_08034DD4: + movs r0, 0 + b _08034EE8 + .pool +_08034DE0: + ldr r0, [r5, 0xC] + ldrh r0, [r0, 0x4] + bl IndexOfSpritePaletteTag + ldr r6, =gUnknown_02022E10 + ldr r1, [r6] + ldr r1, [r1, 0x4] + mov r4, r9 + mov r3, r8 + subs r2, r4, r3 + lsls r4, r2, 2 + adds r1, r4, r1 + strb r0, [r1, 0x4] + ldr r0, [r6] + ldr r0, [r0, 0x4] + adds r0, r4, r0 + ldrb r0, [r0, 0x4] + cmp r0, 0xFF + bne _08034E14 + ldr r0, [r5, 0xC] + bl LoadSpritePalette + ldr r1, [r6] + ldr r1, [r1, 0x4] + adds r1, r4, r1 + strb r0, [r1, 0x4] +_08034E14: + ldr r0, [r6] + ldr r1, [r0, 0x4] + adds r1, r4, r1 + ldrb r0, [r5] + lsls r0, 30 + lsrs r0, 30 + strb r0, [r1, 0x2] + ldr r0, [r6] + ldr r0, [r0, 0x4] + adds r0, r4, r0 + ldrb r1, [r5, 0x1] + strb r1, [r0, 0x3] + ldr r2, [r6] + ldr r0, [r2, 0x4] + adds r0, r4, r0 + ldrh r1, [r5, 0x4] + strh r1, [r0, 0xC] + ldr r0, [r2, 0x4] + adds r0, r4, r0 + ldrh r1, [r5, 0x6] + strh r1, [r0, 0xE] + ldr r1, [r2, 0x4] + adds r1, r4, r1 + ldrb r0, [r5] + lsls r0, 28 + lsrs r0, 30 + strb r0, [r1, 0x6] + ldr r0, [r6] + ldr r1, [r0, 0x4] + adds r1, r4, r1 + ldrb r0, [r5] + lsls r0, 26 + lsrs r0, 30 + strb r0, [r1, 0x5] + ldr r0, [r6] + ldr r1, [r0, 0x4] + adds r1, r4, r1 + ldrb r0, [r5] + lsrs r0, 6 + strb r0, [r1, 0x7] + ldr r0, [r6] + ldr r0, [r0, 0x4] + adds r0, r4, r0 + ldrb r1, [r5, 0x2] + strb r1, [r0, 0x8] + ldrb r1, [r5] + lsls r0, r1, 28 + lsrs r0, 30 + lsls r1, 26 + lsrs r1, 30 + bl sub_80355F8 + ldr r1, [r6] + ldr r1, [r1, 0x4] + adds r1, r4, r1 + strb r0, [r1, 0x9] + ldr r2, [r6] + ldr r0, [r2, 0x4] + adds r0, r4, r0 + ldr r1, [r5, 0x8] + ldrh r1, [r1, 0x6] + strh r1, [r0, 0x10] + ldr r0, [r2, 0x4] + adds r0, r4, r0 + ldr r1, [r5, 0xC] + ldrh r1, [r1, 0x4] + strh r1, [r0, 0x12] + ldr r0, [r2, 0x4] + adds r0, r4, r0 + movs r1, 0x1 + strb r1, [r0] + ldr r0, [r6] + ldr r0, [r0, 0x4] + adds r0, r4, r0 + str r1, [r0, 0x14] + movs r3, 0x1 + ldrb r0, [r5, 0x1] + cmp r3, r0 + bcs _08034ECA +_08034EB2: + ldr r0, [r6] + ldr r2, [r0, 0x4] + adds r2, r4, r2 + ldr r1, [r2, 0x14] + lsls r0, r1, 2 + adds r0, r1 + lsls r0, 1 + str r0, [r2, 0x14] + adds r3, 0x1 + ldrb r2, [r5, 0x1] + cmp r3, r2 + bcc _08034EB2 +_08034ECA: + ldr r0, =gUnknown_02022E10 + ldr r0, [r0] + mov r3, r9 + mov r4, r8 + subs r1, r3, r4 + lsls r1, 2 + ldr r0, [r0, 0x4] + adds r0, r1 + bl sub_8034EFC + mov r0, r8 + mov r1, r10 + bl sub_8035044 + movs r0, 0x1 +_08034EE8: + add sp, 0x8 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r1} + bx r1 + .pool + thumb_func_end sub_8034D14 + + thumb_func_start sub_8034EFC +sub_8034EFC: @ 8034EFC + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + sub sp, 0x4 + adds r4, r0, 0 + ldrb r5, [r4, 0x1] + movs r0, 0xC + ldrsh r7, [r4, r0] + ldrb r0, [r4, 0x3] + adds r0, 0x1 + mov r8, r0 + mov r1, sp + movs r0, 0 + strh r0, [r1] + lsls r1, r5, 3 + ldr r2, =gUnknown_030022F8 + mov r9, r2 + add r1, r9 + mov r0, r8 + lsls r2, r0, 2 + movs r0, 0x80 + lsls r0, 17 + orrs r2, r0 + mov r0, sp + bl CpuSet + movs r6, 0 + ldrb r5, [r4, 0x1] + cmp r6, r8 + bcs _08034FCE + movs r1, 0x3F + mov r10, r1 + movs r2, 0xD + negs r2, r2 + mov r9, r2 +_08034F46: + lsls r0, r5, 3 + ldr r1, =gMain + adds r3, r0, r1 + ldrh r1, [r4, 0xE] + adds r0, r3, 0 + adds r0, 0x38 + strb r1, [r0] + ldr r2, =0x000001ff + adds r0, r2, 0 + adds r1, r7, 0 + ands r1, r0 + ldrh r2, [r3, 0x3A] + ldr r0, =0xfffffe00 + ands r0, r2 + orrs r0, r1 + strh r0, [r3, 0x3A] + ldrb r1, [r4, 0x6] + movs r0, 0x39 + adds r0, r3 + mov r12, r0 + lsls r1, 6 + ldrb r2, [r0] + mov r0, r10 + ands r0, r2 + orrs r0, r1 + mov r1, r12 + strb r0, [r1] + ldrb r1, [r4, 0x5] + movs r2, 0x3B + adds r2, r3 + mov r12, r2 + lsls r1, 6 + ldrb r2, [r2] + mov r0, r10 + ands r0, r2 + orrs r0, r1 + mov r1, r12 + strb r0, [r1] + ldrh r0, [r4, 0xA] + ldr r1, =0x000003ff + ands r1, r0 + ldrh r2, [r3, 0x3C] + ldr r0, =0xfffffc00 + ands r0, r2 + orrs r0, r1 + strh r0, [r3, 0x3C] + adds r3, 0x3D + movs r0, 0x3 + ldrb r1, [r4, 0x7] + ands r1, r0 + lsls r1, 2 + ldrb r2, [r3] + mov r0, r9 + ands r0, r2 + orrs r0, r1 + strb r0, [r3] + ldrb r2, [r4, 0x4] + lsls r2, 4 + movs r1, 0xF + ands r0, r1 + orrs r0, r2 + strb r0, [r3] + ldrb r0, [r4, 0x8] + adds r7, r0 + adds r6, 0x1 + adds r5, 0x1 + cmp r6, r8 + bcc _08034F46 +_08034FCE: + subs r5, 0x1 + ldr r0, =gMain + lsls r3, r5, 3 + adds r3, r0 + movs r2, 0xC + ldrsh r1, [r4, r2] + ldrb r0, [r4, 0x8] + subs r1, r0 + ldr r2, =0x000001ff + adds r0, r2, 0 + ands r1, r0 + ldrh r2, [r3, 0x3A] + ldr r0, =0xfffffe00 + ands r0, r2 + orrs r0, r1 + strh r0, [r3, 0x3A] + adds r2, r3, 0 + adds r2, 0x39 + ldrb r1, [r2] + movs r0, 0x4 + negs r0, r0 + ands r0, r1 + movs r1, 0x2 + orrs r0, r1 + strb r0, [r2] + ldrb r0, [r4, 0x9] + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 1 + ldrh r4, [r4, 0xA] + adds r1, r4 + ldr r2, =0x000003ff + adds r0, r2, 0 + ands r1, r0 + ldrh r2, [r3, 0x3C] + ldr r0, =0xfffffc00 + ands r0, r2 + orrs r0, r1 + strh r0, [r3, 0x3C] + add sp, 0x4 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8034EFC + + thumb_func_start sub_8035044 +sub_8035044: @ 8035044 + push {r4-r6,lr} + adds r3, r0, 0 + adds r4, r1, 0 + ldr r0, =gUnknown_02022E10 + ldr r1, [r0] + adds r6, r0, 0 + cmp r1, 0 + beq _080350A8 + ldr r2, [r1, 0x4] + lsls r1, r3, 3 + subs r0, r1, r3 + lsls r0, 2 + adds r2, r0, r2 + ldrb r0, [r2] + adds r5, r1, 0 + cmp r0, 0 + beq _080350A8 + str r4, [r2, 0x18] + cmp r4, 0 + bge _08035078 + movs r2, 0x1 + negs r4, r4 + b _0803507A + .pool +_08035078: + movs r2, 0 +_0803507A: + ldr r0, [r6] + ldr r1, [r0, 0x4] + subs r0, r5, r3 + lsls r0, 2 + adds r0, r1 + ldrb r3, [r0, 0x2] + cmp r3, 0x1 + beq _0803509A + cmp r3, 0x1 + ble _08035092 + cmp r3, 0x2 + beq _080350A2 +_08035092: + adds r1, r4, 0 + bl sub_80350B0 + b _080350A8 +_0803509A: + adds r1, r4, 0 + bl sub_8035164 + b _080350A8 +_080350A2: + adds r1, r4, 0 + bl sub_80352C0 +_080350A8: + pop {r4-r6} + pop {r0} + bx r0 + thumb_func_end sub_8035044 + + thumb_func_start sub_80350B0 +sub_80350B0: @ 80350B0 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + sub sp, 0x4 + mov r8, r0 + mov r9, r1 + str r2, [sp] + ldr r5, [r0, 0x14] + ldrb r7, [r0, 0x1] + ldr r0, =gMain + mov r10, r0 + cmp r5, 0 + beq _0803511A + lsls r0, r7, 3 + adds r0, 0x3C + mov r1, r10 + adds r6, r0, r1 +_080350D6: + mov r0, r9 + adds r1, r5, 0 + bl __udivsi3 + adds r4, r0, 0 + adds r0, r4, 0 + muls r0, r5 + mov r2, r9 + subs r2, r0 + mov r9, r2 + adds r0, r5, 0 + movs r1, 0xA + bl __udivsi3 + adds r5, r0, 0 + mov r1, r8 + ldrb r0, [r1, 0x9] + adds r1, r4, 0 + muls r1, r0 + mov r2, r8 + ldrh r2, [r2, 0xA] + adds r1, r2 + ldr r2, =0x000003ff + adds r0, r2, 0 + ands r1, r0 + ldrh r0, [r6] + ldr r2, =0xfffffc00 + ands r0, r2 + orrs r0, r1 + strh r0, [r6] + adds r6, 0x8 + adds r7, 0x1 + cmp r5, 0 + bne _080350D6 +_0803511A: + ldr r0, [sp] + cmp r0, 0 + beq _08035140 + lsls r0, r7, 3 + add r0, r10 + adds r0, 0x39 + ldrb r2, [r0] + movs r1, 0x4 + negs r1, r1 + ands r1, r2 + strb r1, [r0] + b _08035154 + .pool +_08035140: + lsls r2, r7, 3 + add r2, r10 + adds r2, 0x39 + ldrb r1, [r2] + movs r0, 0x4 + negs r0, r0 + ands r0, r1 + movs r1, 0x2 + orrs r0, r1 + strb r0, [r2] +_08035154: + add sp, 0x4 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + thumb_func_end sub_80350B0 + + thumb_func_start sub_8035164 +sub_8035164: @ 8035164 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + sub sp, 0x4 + adds r6, r0, 0 + mov r8, r1 + str r2, [sp] + ldr r5, [r6, 0x14] + ldr r3, =gUnknown_03000DD4 + ldrb r0, [r6, 0x1] + str r0, [r3] + ldr r2, =gUnknown_03000DD8 + movs r0, 0 + str r0, [r2] + ldr r1, =gUnknown_03000DDC + subs r0, 0x1 + str r0, [r1] + adds r7, r3, 0 + mov r10, r1 + ldr r0, =gMain + mov r9, r0 + cmp r5, 0 + beq _0803524C +_08035196: + mov r0, r8 + adds r1, r5, 0 + bl __udivsi3 + adds r4, r0, 0 + adds r0, r4, 0 + muls r0, r5 + mov r1, r8 + subs r1, r0 + mov r8, r1 + adds r0, r5, 0 + movs r1, 0xA + bl __udivsi3 + adds r5, r0, 0 + cmp r4, 0 + bne _080351C8 + mov r2, r10 + ldr r1, [r2] + movs r0, 0x1 + negs r0, r0 + cmp r1, r0 + bne _080351C8 + cmp r5, 0 + bne _08035224 +_080351C8: + ldr r2, [r7] + lsls r2, 3 + add r2, r9 + ldrb r0, [r6, 0x9] + adds r3, r4, 0 + muls r3, r0 + ldrh r4, [r6, 0xA] + adds r3, r4 + ldr r1, =0x000003ff + adds r0, r1, 0 + ands r3, r0 + ldrh r0, [r2, 0x3C] + ldr r4, =0xfffffc00 + adds r1, r4, 0 + ands r0, r1 + orrs r0, r3 + strh r0, [r2, 0x3C] + adds r2, 0x39 + ldrb r0, [r2] + movs r1, 0x4 + negs r1, r1 + ands r0, r1 + strb r0, [r2] + mov r2, r10 + ldr r1, [r2] + movs r0, 0x1 + negs r0, r0 + cmp r1, r0 + bne _0803523A + ldr r4, =gUnknown_03000DD8 + ldr r0, [r4] + str r0, [r2] + b _0803523A + .pool +_08035224: + ldr r0, [r7] + lsls r0, 3 + add r0, r9 + adds r0, 0x39 + ldrb r1, [r0] + movs r2, 0x4 + negs r2, r2 + ands r1, r2 + movs r2, 0x2 + orrs r1, r2 + strb r1, [r0] +_0803523A: + ldr r0, [r7] + adds r0, 0x1 + str r0, [r7] + ldr r4, =gUnknown_03000DD8 + ldr r0, [r4] + adds r0, 0x1 + str r0, [r4] + cmp r5, 0 + bne _08035196 +_0803524C: + ldr r0, [sp] + cmp r0, 0 + beq _08035298 + ldr r1, [r7] + lsls r1, 3 + add r1, r9 + adds r1, 0x39 + ldrb r2, [r1] + movs r0, 0x4 + negs r0, r0 + ands r0, r2 + strb r0, [r1] + ldr r3, [r7] + lsls r3, 3 + add r3, r9 + movs r1, 0xC + ldrsh r2, [r6, r1] + mov r4, r10 + ldr r0, [r4] + subs r0, 0x1 + ldrb r1, [r6, 0x8] + muls r0, r1 + adds r2, r0 + ldr r1, =0x000001ff + adds r0, r1, 0 + ands r2, r0 + ldrh r1, [r3, 0x3A] + ldr r0, =0xfffffe00 + ands r0, r1 + orrs r0, r2 + strh r0, [r3, 0x3A] + b _080352AE + .pool +_08035298: + ldr r0, [r7] + lsls r0, 3 + add r0, r9 + adds r0, 0x39 + ldrb r2, [r0] + movs r1, 0x4 + negs r1, r1 + ands r1, r2 + movs r2, 0x2 + orrs r1, r2 + strb r1, [r0] +_080352AE: + add sp, 0x4 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + thumb_func_end sub_8035164 + + thumb_func_start sub_80352C0 +sub_80352C0: @ 80352C0 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + sub sp, 0xC + mov r8, r0 + mov r10, r1 + str r2, [sp] + ldr r5, [r0, 0x14] + ldrb r3, [r0, 0x1] + movs r0, 0 + str r0, [sp, 0x4] + mov r9, r0 + cmp r5, 0 + beq _0803535A +_080352E0: + lsls r0, r3, 3 + adds r1, r0, 0 + adds r1, 0x39 + ldr r2, =gMain + adds r7, r1, r2 + adds r0, 0x3C + adds r6, r0, r2 +_080352EE: + mov r0, r10 + adds r1, r5, 0 + str r3, [sp, 0x8] + bl __udivsi3 + adds r4, r0, 0 + adds r0, r4, 0 + muls r0, r5 + mov r1, r10 + subs r1, r0 + mov r10, r1 + adds r0, r5, 0 + movs r1, 0xA + bl __udivsi3 + adds r5, r0, 0 + ldr r3, [sp, 0x8] + cmp r4, 0 + bne _0803531E + ldr r2, [sp, 0x4] + cmp r2, 0 + bne _0803531E + cmp r5, 0 + bne _080352E0 +_0803531E: + movs r0, 0x1 + str r0, [sp, 0x4] + mov r1, r8 + ldrb r0, [r1, 0x9] + adds r2, r4, 0 + muls r2, r0 + ldrh r4, [r1, 0xA] + adds r2, r4 + ldr r1, =0x000003ff + adds r0, r1, 0 + ands r2, r0 + ldrh r0, [r6] + ldr r4, =0xfffffc00 + adds r1, r4, 0 + ands r0, r1 + orrs r0, r2 + strh r0, [r6] + ldrb r0, [r7] + movs r2, 0x4 + negs r2, r2 + adds r1, r2, 0 + ands r0, r1 + strb r0, [r7] + adds r7, 0x8 + adds r6, 0x8 + adds r3, 0x1 + movs r4, 0x1 + add r9, r4 + cmp r5, 0 + bne _080352EE +_0803535A: + mov r0, r8 + ldrb r0, [r0, 0x3] + cmp r9, r0 + bge _0803538A + ldr r1, =gMain + movs r5, 0x4 + negs r5, r5 + movs r4, 0x2 + lsls r0, r3, 3 + adds r0, 0x39 + adds r2, r0, r1 +_08035370: + ldrb r1, [r2] + adds r0, r5, 0 + ands r0, r1 + orrs r0, r4 + strb r0, [r2] + adds r2, 0x8 + adds r3, 0x1 + movs r1, 0x1 + add r9, r1 + mov r0, r8 + ldrb r0, [r0, 0x3] + cmp r9, r0 + blt _08035370 +_0803538A: + ldr r1, [sp] + cmp r1, 0 + beq _080353B0 + lsls r0, r3, 3 + ldr r2, =gMain + adds r0, r2 + adds r0, 0x39 + ldrb r2, [r0] + movs r1, 0x4 + negs r1, r1 + ands r1, r2 + strb r1, [r0] + b _080353C6 + .pool +_080353B0: + lsls r2, r3, 3 + ldr r4, =gMain + adds r2, r4 + adds r2, 0x39 + ldrb r1, [r2] + movs r0, 0x4 + negs r0, r0 + ands r0, r1 + movs r1, 0x2 + orrs r0, r1 + strb r0, [r2] +_080353C6: + add sp, 0xC + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_80352C0 + + thumb_func_start sub_80353DC +sub_80353DC: @ 80353DC + push {r4-r7,lr} + adds r4, r0, 0 + ldr r0, =gUnknown_02022E10 + ldr r0, [r0] + cmp r0, 0 + beq _0803546E + ldr r2, [r0, 0x4] + lsls r1, r4, 3 + subs r0, r1, r4 + lsls r0, 2 + adds r2, r0, r2 + ldrb r0, [r2] + adds r5, r1, 0 + cmp r0, 0 + beq _0803546E + ldrb r3, [r2, 0x3] + adds r0, r3, 0x1 + ldrb r2, [r2, 0x1] + cmp r0, 0 + beq _08035426 + ldr r1, =gMain + movs r7, 0x4 + negs r7, r7 + movs r6, 0x2 + adds r3, r0, 0 + lsls r0, r2, 3 + adds r0, 0x39 + adds r2, r0, r1 +_08035414: + ldrb r1, [r2] + adds r0, r7, 0 + ands r0, r1 + orrs r0, r6 + strb r0, [r2] + subs r3, 0x1 + adds r2, 0x8 + cmp r3, 0 + bne _08035414 +_08035426: + adds r0, r4, 0 + bl sub_8035570 + cmp r0, 0 + bne _08035442 + ldr r0, =gUnknown_02022E10 + ldr r0, [r0] + ldr r1, [r0, 0x4] + subs r0, r5, r4 + lsls r0, 2 + adds r0, r1 + ldrh r0, [r0, 0x10] + bl FreeSpriteTilesByTag +_08035442: + adds r0, r4, 0 + bl sub_80355B4 + cmp r0, 0 + bne _0803545E + ldr r0, =gUnknown_02022E10 + ldr r0, [r0] + ldr r1, [r0, 0x4] + subs r0, r5, r4 + lsls r0, 2 + adds r0, r1 + ldrh r0, [r0, 0x12] + bl FreeSpritePaletteByTag +_0803545E: + ldr r0, =gUnknown_02022E10 + ldr r0, [r0] + ldr r1, [r0, 0x4] + subs r0, r5, r4 + lsls r0, 2 + adds r0, r1 + movs r1, 0 + strb r1, [r0] +_0803546E: + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_80353DC + + thumb_func_start sub_803547C +sub_803547C: @ 803547C + push {r4-r7,lr} + adds r4, r0, 0 + adds r5, r1, 0 + ldr r0, =gUnknown_02022E10 + ldr r1, [r0] + adds r7, r0, 0 + cmp r1, 0 + beq _0803550C + ldr r2, [r1, 0x4] + lsls r1, r4, 3 + subs r0, r1, r4 + lsls r0, 2 + adds r2, r0, r2 + ldrb r0, [r2] + adds r6, r1, 0 + cmp r0, 0 + beq _0803550C + ldrb r3, [r2, 0x3] + adds r1, r3, 0x1 + ldrb r0, [r2, 0x1] + cmp r5, 0 + beq _080354D8 + cmp r1, 0 + beq _0803550C + ldr r1, =gMain + movs r5, 0x4 + negs r5, r5 + movs r4, 0x2 + adds r3, 0x1 + lsls r0, 3 + adds r0, 0x39 + adds r2, r0, r1 +_080354BC: + ldrb r1, [r2] + adds r0, r5, 0 + ands r0, r1 + orrs r0, r4 + strb r0, [r2] + subs r3, 0x1 + adds r2, 0x8 + cmp r3, 0 + bne _080354BC + b _0803550C + .pool +_080354D8: + cmp r1, 0 + beq _080354FA + ldr r1, =gMain + movs r5, 0x4 + negs r5, r5 + adds r3, 0x1 + lsls r0, 3 + adds r0, 0x39 + adds r2, r0, r1 +_080354EA: + ldrb r1, [r2] + adds r0, r5, 0 + ands r0, r1 + strb r0, [r2] + subs r3, 0x1 + adds r2, 0x8 + cmp r3, 0 + bne _080354EA +_080354FA: + ldr r0, [r7] + ldr r1, [r0, 0x4] + subs r0, r6, r4 + lsls r0, 2 + adds r0, r1 + ldr r1, [r0, 0x18] + adds r0, r4, 0 + bl sub_8035044 +_0803550C: + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_803547C + + thumb_func_start sub_8035518 +sub_8035518: @ 8035518 + push {r4,r5,lr} + lsls r0, 24 + lsrs r4, r0, 24 + movs r5, 0x40 + movs r3, 0 + ldr r0, =gUnknown_02022E10 + ldr r0, [r0] + ldr r2, [r0] + cmp r3, r2 + bcs _0803555A + ldr r1, [r0, 0x4] +_0803552E: + ldrb r0, [r1] + cmp r0, 0 + bne _08035548 + ldrb r0, [r1, 0x1] + cmp r0, 0xFF + beq _08035552 + ldrb r0, [r1, 0x3] + cmp r0, r4 + bhi _08035552 + ldrb r0, [r1, 0x1] + b _0803556A + .pool +_08035548: + adds r0, r5, 0x1 + ldrb r5, [r1, 0x3] + adds r0, r5 + lsls r0, 16 + lsrs r5, r0, 16 +_08035552: + adds r1, 0x1C + adds r3, 0x1 + cmp r3, r2 + bcc _0803552E +_0803555A: + adds r0, r5, r4 + adds r0, 0x1 + cmp r0, 0x80 + bgt _08035568 + lsls r0, r5, 24 + lsrs r0, 24 + b _0803556A +_08035568: + movs r0, 0xFF +_0803556A: + pop {r4,r5} + pop {r1} + bx r1 + thumb_func_end sub_8035518 + + thumb_func_start sub_8035570 +sub_8035570: @ 8035570 + push {r4-r6,lr} + adds r3, r0, 0 + movs r2, 0 + ldr r0, =gUnknown_02022E10 + ldr r0, [r0] + ldr r4, [r0] + cmp r2, r4 + bcs _080355AC + ldr r1, [r0, 0x4] + lsls r0, r3, 3 + subs r0, r3 + lsls r0, 2 + adds r5, r0, r1 +_0803558A: + ldrb r0, [r1] + cmp r0, 0 + beq _080355A4 + cmp r2, r3 + beq _080355A4 + ldrh r0, [r1, 0x10] + ldrh r6, [r5, 0x10] + cmp r0, r6 + bne _080355A4 + movs r0, 0x1 + b _080355AE + .pool +_080355A4: + adds r1, 0x1C + adds r2, 0x1 + cmp r2, r4 + bcc _0803558A +_080355AC: + movs r0, 0 +_080355AE: + pop {r4-r6} + pop {r1} + bx r1 + thumb_func_end sub_8035570 + + thumb_func_start sub_80355B4 +sub_80355B4: @ 80355B4 + push {r4-r6,lr} + adds r3, r0, 0 + movs r2, 0 + ldr r0, =gUnknown_02022E10 + ldr r0, [r0] + ldr r4, [r0] + cmp r2, r4 + bcs _080355F0 + ldr r1, [r0, 0x4] + lsls r0, r3, 3 + subs r0, r3 + lsls r0, 2 + adds r5, r0, r1 +_080355CE: + ldrb r0, [r1] + cmp r0, 0 + beq _080355E8 + cmp r2, r3 + beq _080355E8 + ldrh r0, [r1, 0x12] + ldrh r6, [r5, 0x12] + cmp r0, r6 + bne _080355E8 + movs r0, 0x1 + b _080355F2 + .pool +_080355E8: + adds r1, 0x1C + adds r2, 0x1 + cmp r2, r4 + bcc _080355CE +_080355F0: + movs r0, 0 +_080355F2: + pop {r4-r6} + pop {r1} + bx r1 + thumb_func_end sub_80355B4 + + thumb_func_start sub_80355F8 +sub_80355F8: @ 80355F8 + ldr r2, =gUnknown_082FF1C8 + lsls r0, 2 + adds r1, r0 + adds r1, r2 + ldrb r0, [r1] + bx lr + .pool + thumb_func_end sub_80355F8 + + thumb_func_start sub_8035608 +sub_8035608: @ 8035608 + push {lr} + bl ResetSpriteData + ldr r0, =gUnknown_0831AC88 + movs r1, 0 + movs r2, 0 + movs r3, 0 + bl CreateSprite + lsls r0, 24 + lsrs r0, 24 + ldr r2, =gSprites + lsls r1, r0, 4 + adds r1, r0 + lsls r1, 2 + adds r1, r2 + adds r1, 0x3E + ldrb r0, [r1] + movs r2, 0x4 + orrs r0, r2 + strb r0, [r1] + ldr r0, =sub_8035648 + bl SetMainCallback2 + pop {r0} + bx r0 + .pool + thumb_func_end sub_8035608 + + thumb_func_start sub_8035648 +sub_8035648: @ 8035648 + push {lr} + bl AnimateSprites + bl BuildOamBuffer + pop {r0} + bx r0 + thumb_func_end sub_8035648 + + .align 2, 0 @ Don't pad with nop. diff --git a/asm/rom_81370FC.s b/asm/rom_81370FC.s new file mode 100644 index 000000000..02d8fb350 --- /dev/null +++ b/asm/rom_81370FC.s @@ -0,0 +1,9455 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .syntax unified + + .text + + thumb_func_start sub_81370FC +sub_81370FC: @ 81370FC + push {r4,lr} + bl ShouldDoBrailleFlyEffect + lsls r0, 24 + cmp r0, 0 + beq _08137134 + ldr r4, =gSpecialVar_Result + bl GetCursorSelectionMonId + lsls r0, 24 + lsrs r0, 24 + strh r0, [r4] + ldr r1, =gUnknown_03005DB0 + ldr r0, =hm_add_c3_launch_phase_2 + str r0, [r1] + ldr r1, =gUnknown_0203CEEC + ldr r0, =sub_8179918 + b _08137152 + .pool +_08137134: + ldr r0, =gMapHeader + ldrb r0, [r0, 0x15] + cmp r0, 0x1 + bne _08137170 + ldr r0, =0x00000888 + bl FlagGet + lsls r0, 24 + cmp r0, 0 + bne _08137170 + ldr r1, =gUnknown_03005DB0 + ldr r0, =hm_add_c3_launch_phase_2 + str r0, [r1] + ldr r1, =gUnknown_0203CEEC + ldr r0, =hm2_flash +_08137152: + str r0, [r1] + movs r0, 0x1 + b _08137172 + .pool +_08137170: + movs r0, 0 +_08137172: + pop {r4} + pop {r1} + bx r1 + thumb_func_end sub_81370FC + + thumb_func_start hm2_flash +hm2_flash: @ 8137178 + push {r4,lr} + bl oei_task_add + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + bl GetCursorSelectionMonId + ldr r1, =gFieldEffectArguments + lsls r0, 24 + lsrs r0, 24 + str r0, [r1] + ldr r1, =gTasks + lsls r0, r4, 2 + adds r0, r4 + lsls r0, 3 + adds r0, r1 + ldr r2, =sub_81371B4 + lsrs r1, r2, 16 + strh r1, [r0, 0x18] + strh r2, [r0, 0x1A] + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end hm2_flash + + thumb_func_start sub_81371B4 +sub_81371B4: @ 81371B4 + push {lr} + movs r0, 0xCF + bl PlaySE + ldr r0, =0x00000888 + bl FlagSet + ldr r0, =EventScript_2926F8 + bl ScriptContext1_SetupScript + pop {r0} + bx r0 + .pool + thumb_func_end sub_81371B4 + + thumb_func_start sub_81371D4 +sub_81371D4: @ 81371D4 + push {lr} + bl RunTasks + bl AnimateSprites + bl BuildOamBuffer + bl UpdatePaletteFade + pop {r0} + bx r0 + thumb_func_end sub_81371D4 + + thumb_func_start sub_81371EC +sub_81371EC: @ 81371EC + push {lr} + bl LoadOam + bl ProcessSpriteCopyRequests + bl TransferPlttBuffer + pop {r0} + bx r0 + thumb_func_end sub_81371EC + + thumb_func_start c2_change_map +c2_change_map: @ 8137200 + push {r4,lr} + sub sp, 0x8 + movs r0, 0 + bl SetVBlankCallback + movs r0, 0 + movs r1, 0 + bl SetGpuReg + movs r0, 0xC + movs r1, 0 + bl SetGpuReg + movs r0, 0xA + movs r1, 0 + bl SetGpuReg + movs r0, 0x8 + movs r1, 0 + bl SetGpuReg + movs r0, 0x18 + movs r1, 0 + bl SetGpuReg + movs r0, 0x1A + movs r1, 0 + bl SetGpuReg + movs r0, 0x14 + movs r1, 0 + bl SetGpuReg + movs r0, 0x16 + movs r1, 0 + bl SetGpuReg + movs r0, 0x10 + movs r1, 0 + bl SetGpuReg + movs r0, 0x12 + movs r1, 0 + bl SetGpuReg + mov r1, sp + movs r0, 0 + strh r0, [r1] + ldr r1, =0x040000d4 + mov r0, sp + str r0, [r1] + movs r0, 0xC0 + lsls r0, 19 + str r0, [r1, 0x4] + ldr r0, =0x8100c000 + str r0, [r1, 0x8] + ldr r0, [r1, 0x8] + movs r4, 0 + str r4, [sp, 0x4] + add r0, sp, 0x4 + str r0, [r1] + movs r0, 0xE0 + lsls r0, 19 + str r0, [r1, 0x4] + ldr r0, =0x85000100 + str r0, [r1, 0x8] + ldr r0, [r1, 0x8] + mov r0, sp + strh r4, [r0] + str r0, [r1] + ldr r0, =0x05000002 + str r0, [r1, 0x4] + ldr r0, =0x810001ff + str r0, [r1, 0x8] + ldr r0, [r1, 0x8] + bl ResetPaletteFade + bl ResetTasks + bl ResetSpriteData + ldr r3, =0x04000208 + ldrh r2, [r3] + strh r4, [r3] + ldr r4, =0x04000200 + ldrh r0, [r4] + movs r1, 0x1 + orrs r0, r1 + strh r0, [r4] + strh r2, [r3] + ldr r0, =sub_81371EC + bl SetVBlankCallback + ldr r0, =sub_81371D4 + bl SetMainCallback2 + bl sub_8137304 + lsls r0, 24 + cmp r0, 0 + bne _081372D2 + ldr r0, =gMain + ldr r0, [r0, 0x8] + bl SetMainCallback2 +_081372D2: + add sp, 0x8 + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end c2_change_map + + thumb_func_start sub_8137304 +sub_8137304: @ 8137304 + push {r4-r7,lr} + bl get_map_light_from_warp0 + lsls r0, 24 + lsrs r6, r0, 24 + bl sav1_map_get_light_level + lsls r0, 24 + lsrs r5, r0, 24 + movs r3, 0 + ldr r4, =gUnknown_085B27C8 + ldrb r0, [r4] + cmp r0, 0 + beq _08137358 + adds r7, r4, 0 + adds r0, r4, 0x4 + mov r12, r0 +_08137326: + lsls r2, r3, 3 + adds r1, r2, r7 + ldrb r0, [r1] + cmp r0, r6 + bne _08137348 + ldrb r0, [r1, 0x1] + cmp r0, r5 + bne _08137348 + mov r1, r12 + adds r0, r2, r1 + ldr r0, [r0] + bl _call_via_r0 + movs r0, 0x1 + b _0813735A + .pool +_08137348: + adds r0, r3, 0x1 + lsls r0, 24 + lsrs r3, r0, 24 + lsls r0, r3, 3 + adds r0, r4 + ldrb r0, [r0] + cmp r0, 0 + bne _08137326 +_08137358: + movs r0, 0 +_0813735A: + pop {r4-r7} + pop {r1} + bx r1 + thumb_func_end sub_8137304 + + thumb_func_start sub_8137360 +sub_8137360: @ 8137360 + push {r4-r6,lr} + lsls r0, 24 + lsls r1, 24 + lsrs r5, r0, 24 + lsrs r4, r1, 24 + movs r3, 0 + ldr r1, =gUnknown_085B27C8 + ldrb r0, [r1] + cmp r0, 0 + beq _081373A0 + adds r6, r1, 0 +_08137376: + lsls r0, r3, 3 + adds r2, r0, r6 + ldrb r0, [r2] + cmp r0, r5 + bne _08137390 + ldrb r0, [r2, 0x1] + cmp r0, r4 + bne _08137390 + ldrb r0, [r2, 0x2] + b _081373A2 + .pool +_08137390: + adds r0, r3, 0x1 + lsls r0, 24 + lsrs r3, r0, 24 + lsls r0, r3, 3 + adds r0, r1 + ldrb r0, [r0] + cmp r0, 0 + bne _08137376 +_081373A0: + movs r0, 0 +_081373A2: + pop {r4-r6} + pop {r1} + bx r1 + thumb_func_end sub_8137360 + + thumb_func_start fade_type_for_given_maplight_pair +fade_type_for_given_maplight_pair: @ 81373A8 + push {r4-r6,lr} + lsls r0, 24 + lsls r1, 24 + lsrs r5, r0, 24 + lsrs r4, r1, 24 + movs r3, 0 + ldr r1, =gUnknown_085B27C8 + ldrb r0, [r1] + cmp r0, 0 + beq _081373E8 + adds r6, r1, 0 +_081373BE: + lsls r0, r3, 3 + adds r2, r0, r6 + ldrb r0, [r2] + cmp r0, r5 + bne _081373D8 + ldrb r0, [r2, 0x1] + cmp r0, r4 + bne _081373D8 + ldrb r0, [r2, 0x3] + b _081373EA + .pool +_081373D8: + adds r0, r3, 0x1 + lsls r0, 24 + lsrs r3, r0, 24 + lsls r0, r3, 3 + adds r0, r1 + ldrb r0, [r0] + cmp r0, 0 + bne _081373BE +_081373E8: + movs r0, 0 +_081373EA: + pop {r4-r6} + pop {r1} + bx r1 + thumb_func_end fade_type_for_given_maplight_pair + + thumb_func_start sub_81373F0 +sub_81373F0: @ 81373F0 + push {lr} + ldr r0, =sub_8137404 + movs r1, 0 + bl CreateTask + pop {r0} + bx r0 + .pool + thumb_func_end sub_81373F0 + + thumb_func_start sub_8137404 +sub_8137404: @ 8137404 + lsls r0, 24 + lsrs r0, 24 + ldr r2, =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r1, r2 + ldr r0, =sub_8137420 + str r0, [r1] + bx lr + .pool + thumb_func_end sub_8137404 + + thumb_func_start sub_8137420 +sub_8137420: @ 8137420 + push {r4,lr} + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + movs r0, 0 + movs r1, 0 + bl SetGpuReg + ldr r0, =gUnknown_085B2A90 + ldr r1, =0x0600c000 + bl LZ77UnCompVram + ldr r0, =gUnknown_085B28B0 + ldr r1, =0x0600f800 + bl LZ77UnCompVram + ldr r0, =gUnknown_085B2850 + movs r1, 0xE0 + movs r2, 0x20 + bl LoadPalette + ldr r0, =gUnknown_085B28A0 + movs r1, 0xE0 + movs r2, 0x10 + bl LoadPalette + ldr r1, =0x00003e41 + movs r0, 0x50 + bl SetGpuReg + movs r0, 0x52 + movs r1, 0 + bl SetGpuReg + movs r0, 0x54 + movs r1, 0 + bl SetGpuReg + ldr r1, =0x00001f0c + movs r0, 0x8 + bl SetGpuReg + movs r1, 0x8A + lsls r1, 5 + movs r0, 0 + bl SetGpuReg + ldr r1, =gTasks + lsls r0, r4, 2 + adds r0, r4 + lsls r0, 3 + adds r0, r1 + ldr r1, =sub_81374C4 + str r1, [r0] + movs r2, 0 + movs r1, 0x10 + strh r1, [r0, 0x8] + strh r2, [r0, 0xA] + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8137420 + + thumb_func_start sub_81374C4 +sub_81374C4: @ 81374C4 + push {r4,r5,lr} + lsls r0, 24 + lsrs r0, 24 + ldr r2, =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r5, r1, r2 + ldrh r4, [r5, 0xA] + movs r0, 0x80 + lsls r0, 5 + adds r1, r4, r0 + lsls r1, 16 + lsrs r1, 16 + movs r0, 0x52 + bl SetGpuReg + cmp r4, 0x10 + bhi _081374F8 + ldrh r0, [r5, 0xA] + adds r0, 0x1 + strh r0, [r5, 0xA] + b _08137500 + .pool +_081374F8: + movs r0, 0 + strh r0, [r5, 0xC] + ldr r0, =sub_813750C + str r0, [r5] +_08137500: + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81374C4 + + thumb_func_start sub_813750C +sub_813750C: @ 813750C + push {r4,lr} + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + ldr r1, =0x00001010 + movs r0, 0x52 + bl SetGpuReg + ldr r1, =gTasks + lsls r0, r4, 2 + adds r0, r4 + lsls r0, 3 + adds r4, r0, r1 + ldrh r1, [r4, 0xC] + cmp r1, 0x7 + bhi _08137554 + adds r0, r1, 0x1 + strh r0, [r4, 0xC] + lsls r1, 1 + ldr r0, =gUnknown_085B28A0 + adds r0, r1, r0 + movs r2, 0x10 + subs r2, r1 + lsls r2, 16 + lsrs r2, 16 + movs r1, 0xE0 + bl LoadPalette + b _08137566 + .pool +_08137554: + ldr r0, =gUnknown_085B2850 + movs r1, 0 + movs r2, 0x20 + bl LoadPalette + ldr r0, =sub_8137574 + str r0, [r4] + movs r0, 0x8 + strh r0, [r4, 0xC] +_08137566: + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813750C + + thumb_func_start sub_8137574 +sub_8137574: @ 8137574 + push {lr} + lsls r0, 24 + lsrs r0, 24 + ldr r2, =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r1, r2 + ldrh r2, [r1, 0xC] + movs r3, 0xC + ldrsh r0, [r1, r3] + cmp r0, 0 + beq _08137598 + subs r0, r2, 0x1 + strh r0, [r1, 0xC] + b _081375A0 + .pool +_08137598: + ldr r0, =gMain + ldr r0, [r0, 0x8] + bl SetMainCallback2 +_081375A0: + pop {r0} + bx r0 + .pool + thumb_func_end sub_8137574 + + thumb_func_start sub_81375A8 +sub_81375A8: @ 81375A8 + push {lr} + ldr r0, =sub_81375BC + movs r1, 0 + bl CreateTask + pop {r0} + bx r0 + .pool + thumb_func_end sub_81375A8 + + thumb_func_start sub_81375BC +sub_81375BC: @ 81375BC + lsls r0, 24 + lsrs r0, 24 + ldr r2, =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r1, r2 + ldr r0, =sub_81375D8 + str r0, [r1] + bx lr + .pool + thumb_func_end sub_81375BC + + thumb_func_start sub_81375D8 +sub_81375D8: @ 81375D8 + push {r4,lr} + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + movs r0, 0 + movs r1, 0 + bl SetGpuReg + ldr r0, =gUnknown_085B2A90 + ldr r1, =0x0600c000 + bl LZ77UnCompVram + ldr r0, =gUnknown_085B28B0 + ldr r1, =0x0600f800 + bl LZ77UnCompVram + movs r0, 0x50 + movs r1, 0 + bl SetGpuReg + movs r0, 0x52 + movs r1, 0 + bl SetGpuReg + movs r0, 0x54 + movs r1, 0 + bl SetGpuReg + ldr r1, =0x00001f0c + movs r0, 0x8 + bl SetGpuReg + movs r1, 0x8A + lsls r1, 5 + movs r0, 0 + bl SetGpuReg + ldr r0, =gUnknown_085B2850 + movs r1, 0xE0 + movs r2, 0x20 + bl LoadPalette + ldr r0, =gUnknown_085B2870 + movs r1, 0 + movs r2, 0x20 + bl LoadPalette + ldr r1, =gTasks + lsls r0, r4, 2 + adds r0, r4 + lsls r0, 3 + adds r0, r1 + ldr r1, =sub_8137678 + str r1, [r0] + movs r2, 0 + movs r1, 0x10 + strh r1, [r0, 0x8] + strh r2, [r0, 0xA] + strh r2, [r0, 0xC] + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81375D8 + + thumb_func_start sub_8137678 +sub_8137678: @ 8137678 + push {r4,lr} + lsls r0, 24 + lsrs r0, 24 + ldr r2, =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r4, r1, r2 + ldrh r1, [r4, 0xC] + cmp r1, 0xF + bhi _081376B4 + adds r2, r1, 0x1 + adds r0, r2, 0x1 + strh r0, [r4, 0xC] + movs r0, 0xF + subs r0, r1 + lsls r0, 1 + ldr r1, =gUnknown_085B2890 + adds r0, r1 + lsls r2, 17 + lsrs r2, 16 + movs r1, 0xE0 + bl LoadPalette + b _081376C8 + .pool +_081376B4: + ldr r1, =0x00001010 + movs r0, 0x52 + bl SetGpuReg + ldr r1, =0x00003e41 + movs r0, 0x50 + bl SetGpuReg + ldr r0, =sub_81376DC + str r0, [r4] +_081376C8: + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8137678 + + thumb_func_start sub_81376DC +sub_81376DC: @ 81376DC + push {r4,r5,lr} + lsls r0, 24 + lsrs r0, 24 + ldr r2, =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r5, r1, r2 + ldrh r0, [r5, 0xA] + movs r1, 0x10 + subs r1, r0 + lsls r1, 16 + lsrs r4, r1, 16 + movs r0, 0x80 + lsls r0, 21 + adds r1, r0 + lsrs r1, 16 + movs r0, 0x52 + bl SetGpuReg + cmp r4, 0 + beq _08137714 + ldrh r0, [r5, 0xA] + adds r0, 0x1 + strh r0, [r5, 0xA] + b _08137726 + .pool +_08137714: + ldr r0, =gUnknown_085B2870 + movs r1, 0 + movs r2, 0x20 + bl LoadPalette + ldr r0, =gMain + ldr r0, [r0, 0x8] + bl SetMainCallback2 +_08137726: + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81376DC + + thumb_func_start sub_8137734 +sub_8137734: @ 8137734 + push {r4-r7,lr} + mov r7, r8 + push {r7} + sub sp, 0x1C + bl HealPlayerParty + ldr r4, =0x00000864 + adds r0, r4, 0 + bl FlagGet + lsls r0, 24 + lsrs r1, r0, 24 + cmp r1, 0x1 + bne _08137760 + ldr r0, =gHasHallOfFameRecords + strb r1, [r0] + b _0813776C + .pool +_08137760: + ldr r1, =gHasHallOfFameRecords + movs r0, 0 + strb r0, [r1] + adds r0, r4, 0 + bl FlagSet +_0813776C: + movs r0, 0x1 + bl GetGameStat + cmp r0, 0 + bne _0813778E + ldr r0, =gSaveBlock2Ptr + ldr r2, [r0] + ldrh r1, [r2, 0xE] + lsls r1, 16 + ldrb r0, [r2, 0x10] + lsls r0, 8 + orrs r1, r0 + ldrb r0, [r2, 0x11] + orrs r1, r0 + movs r0, 0x1 + bl sav12_xor_set +_0813778E: + bl sub_8076D48 + ldr r0, =gSaveBlock2Ptr + ldr r0, [r0] + ldrb r0, [r0, 0x8] + cmp r0, 0 + bne _081377AC + movs r0, 0x1 + bl sub_8084F6C + b _081377B2 + .pool +_081377AC: + movs r0, 0x2 + bl sub_8084F6C +_081377B2: + movs r7, 0 + movs r6, 0 + add r0, sp, 0x18 + mov r8, r0 + mov r5, sp +_081377BC: + movs r0, 0x64 + adds r1, r6, 0 + muls r1, r0 + ldr r0, =gPlayerParty + adds r4, r1, r0 + movs r0, 0 + strb r6, [r5] + strb r0, [r5, 0x1] + adds r0, r4, 0 + movs r1, 0x5 + bl GetMonData + cmp r0, 0 + beq _0813780A + adds r0, r4, 0 + movs r1, 0x6 + bl GetMonData + cmp r0, 0 + bne _0813780A + adds r0, r4, 0 + movs r1, 0x43 + bl GetMonData + cmp r0, 0 + bne _0813780A + movs r0, 0x1 + mov r1, r8 + strb r0, [r1] + adds r0, r4, 0 + movs r1, 0x43 + add r2, sp, 0x18 + bl SetMonData + adds r0, r4, 0 + bl GetRibbonCount + strb r0, [r5, 0x1] + movs r7, 0x1 +_0813780A: + adds r5, 0x4 + adds r6, 0x1 + cmp r6, 0x5 + ble _081377BC + cmp r7, 0x1 + bne _0813785A + movs r0, 0x2A + bl IncrementGameStat + ldr r0, =0x0000089b + bl FlagSet + mov r3, sp + add r2, sp, 0x4 + movs r6, 0x4 +_08137828: + ldrb r1, [r3, 0x1] + ldrb r0, [r2, 0x1] + cmp r0, r1 + bls _08137838 + ldr r1, [sp] + ldr r0, [r2] + str r0, [sp] + str r1, [r2] +_08137838: + adds r2, 0x4 + subs r6, 0x1 + cmp r6, 0 + bge _08137828 + mov r0, sp + ldrb r0, [r0, 0x1] + cmp r0, 0x4 + bls _0813785A + mov r0, sp + ldrb r1, [r0] + movs r0, 0x64 + muls r0, r1 + ldr r1, =gPlayerParty + adds r0, r1 + movs r1, 0x43 + bl sub_80EE4DC +_0813785A: + ldr r0, =CB2_DoHallOfFameScreen + bl SetMainCallback2 + movs r0, 0 + add sp, 0x1C + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r1} + bx r1 + .pool + thumb_func_end sub_8137734 + + thumb_func_start sp0C8_whiteout_maybe +sp0C8_whiteout_maybe: @ 813787C + push {lr} + ldr r0, =CB2_WhiteOut + bl SetMainCallback2 + movs r0, 0 + pop {r1} + bx r1 + .pool + thumb_func_end sp0C8_whiteout_maybe + +@ time_events.o + + thumb_func_start sub_8137890 +sub_8137890: @ 8137890 + push {r4,lr} + ldr r0, =0x00004024 + bl VarGet + adds r4, r0, 0 + lsls r4, 16 + lsrs r4, 16 + ldr r0, =0x00004025 + bl VarGet + lsls r0, 16 + lsrs r0, 16 + lsls r4, 16 + orrs r4, r0 + adds r0, r4, 0 + pop {r4} + pop {r1} + bx r1 + .pool + thumb_func_end sub_8137890 + + thumb_func_start sub_81378BC +sub_81378BC: @ 81378BC + push {r4,lr} + adds r4, r0, 0 + ldr r0, =0x00004024 + lsrs r1, r4, 16 + bl VarSet + ldr r0, =0x00004025 + lsls r4, 16 + lsrs r4, 16 + adds r1, r4, 0 + bl VarSet + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81378BC + + thumb_func_start sub_81378E4 +sub_81378E4: @ 81378E4 + push {r4,lr} + bl Random + adds r4, r0, 0 + bl Random + lsls r4, 16 + lsls r0, 16 + lsrs r0, 16 + orrs r4, r0 + adds r0, r4, 0 + bl sub_81378BC + pop {r4} + pop {r0} + bx r0 + thumb_func_end sub_81378E4 + + thumb_func_start UpdateMirageRnd +UpdateMirageRnd: @ 8137904 + push {r4,lr} + lsls r0, 16 + lsrs r4, r0, 16 + bl sub_8137890 + adds r1, r0, 0 + cmp r4, 0 + beq _08137928 + ldr r3, =0x41c64e6d + ldr r2, =0x00003039 +_08137918: + adds r0, r1, 0 + muls r0, r3 + adds r1, r0, r2 + subs r0, r4, 0x1 + lsls r0, 16 + lsrs r4, r0, 16 + cmp r4, 0 + bne _08137918 +_08137928: + adds r0, r1, 0 + bl sub_81378BC + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end UpdateMirageRnd + + thumb_func_start sub_813793C +sub_813793C: @ 813793C + push {r4-r6,lr} + bl sub_8137890 + lsrs r6, r0, 16 + movs r5, 0 +_08137946: + movs r0, 0x64 + adds r1, r5, 0 + muls r1, r0 + ldr r0, =gPlayerParty + adds r4, r1, r0 + adds r0, r4, 0 + movs r1, 0xB + bl GetMonData + cmp r0, 0 + beq _08137978 + adds r0, r4, 0 + movs r1, 0 + bl GetMonData + ldr r1, =0x0000ffff + ands r1, r0 + cmp r1, r6 + bne _08137978 + movs r0, 0x1 + b _08137980 + .pool +_08137978: + adds r5, 0x1 + cmp r5, 0x5 + ble _08137946 + movs r0, 0 +_08137980: + pop {r4-r6} + pop {r1} + bx r1 + thumb_func_end sub_813793C + + thumb_func_start sub_8137988 +sub_8137988: @ 8137988 + push {lr} + bl get_map_light_from_warp0 + lsls r0, 24 + lsrs r0, 24 + bl is_light_level_1_2_3_5_or_6 + lsls r0, 24 + cmp r0, 0 + beq _081379CE + bl RtcCalcLocalTime + ldr r1, =gUnknown_085B2B44 + ldr r0, =gLocalTime + ldrb r0, [r0, 0x2] + lsls r0, 24 + asrs r0, 24 + adds r0, r1 + ldrb r0, [r0] + cmp r0, 0 + beq _081379C8 + ldr r0, =0x0000089a + bl FlagSet + b _081379CE + .pool +_081379C8: + ldr r0, =0x0000089a + bl FlagClear +_081379CE: + pop {r0} + bx r0 + .pool + thumb_func_end sub_8137988 + + thumb_func_start sub_81379D8 +sub_81379D8: @ 81379D8 + push {r4,lr} + lsls r0, 24 + lsrs r4, r0, 24 + bl sub_80AC3BC + lsls r0, 24 + cmp r0, 0 + beq _081379F2 + bl EnableBothScriptContexts + adds r0, r4, 0 + bl DestroyTask +_081379F2: + pop {r4} + pop {r0} + bx r0 + thumb_func_end sub_81379D8 + + thumb_func_start sub_81379F8 +sub_81379F8: @ 81379F8 + push {lr} + ldr r0, =sub_81379D8 + movs r1, 0x50 + bl CreateTask + pop {r0} + bx r0 + .pool + thumb_func_end sub_81379F8 + + thumb_func_start sub_8137A0C +sub_8137A0C: @ 8137A0C + push {lr} + ldr r0, =0x00004049 + bl GetVarPointer + movs r1, 0 + strh r1, [r0] + pop {r0} + bx r0 + .pool + thumb_func_end sub_8137A0C + + thumb_func_start UpdateBirchState +UpdateBirchState: @ 8137A20 + push {r4,r5,lr} + adds r4, r0, 0 + lsls r4, 16 + lsrs r4, 16 + ldr r0, =0x00004049 + bl GetVarPointer + adds r5, r0, 0 + ldrh r0, [r5] + adds r4, r0 + strh r4, [r5] + ldrh r0, [r5] + movs r1, 0x7 + bl __umodsi3 + strh r0, [r5] + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end UpdateBirchState + +@ birch_pc.o + + thumb_func_start sub_8137A4C +sub_8137A4C: @ 8137A4C + push {lr} + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + cmp r0, 0 + bne _08137A70 + movs r0, 0 + bl sub_80C0844 + ldr r1, =gSpecialVar_0x8005 + strh r0, [r1] + movs r0, 0x1 + bl sub_80C0844 + b _08137A80 + .pool +_08137A70: + movs r0, 0 + bl pokedex_count + ldr r1, =gSpecialVar_0x8005 + strh r0, [r1] + movs r0, 0x1 + bl pokedex_count +_08137A80: + ldr r1, =gSpecialVar_0x8006 + strh r0, [r1] + bl IsNationalPokedexEnabled + lsls r0, 16 + lsrs r0, 16 + pop {r1} + bx r1 + .pool + thumb_func_end sub_8137A4C + + thumb_func_start sub_8137A98 +sub_8137A98: @ 8137A98 + push {lr} + lsls r0, 16 + lsrs r0, 16 + cmp r0, 0x9 + bhi _08137AA4 + b _08137BFC +_08137AA4: + cmp r0, 0x13 + bhi _08137AB0 + ldr r0, =gUnknown_082A5DAB + b _08137C06 + .pool +_08137AB0: + cmp r0, 0x1D + bhi _08137ABC + ldr r0, =gUnknown_082A5DF1 + b _08137C06 + .pool +_08137ABC: + cmp r0, 0x27 + bhi _08137AC8 + ldr r0, =gUnknown_082A5E34 + b _08137C06 + .pool +_08137AC8: + cmp r0, 0x31 + bhi _08137AD4 + ldr r0, =gUnknown_082A5E83 + b _08137C06 + .pool +_08137AD4: + cmp r0, 0x3B + bhi _08137AE0 + ldr r0, =gUnknown_082A5EB9 + b _08137C06 + .pool +_08137AE0: + cmp r0, 0x45 + bhi _08137AEC + ldr r0, =gUnknown_082A5EF4 + b _08137C06 + .pool +_08137AEC: + cmp r0, 0x4F + bhi _08137AF8 + ldr r0, =gUnknown_082A5F39 + b _08137C06 + .pool +_08137AF8: + cmp r0, 0x59 + bhi _08137B04 + ldr r0, =gUnknown_082A5F82 + b _08137C06 + .pool +_08137B04: + cmp r0, 0x63 + bhi _08137B10 + ldr r0, =gUnknown_082A5FB9 + b _08137C06 + .pool +_08137B10: + cmp r0, 0x6D + bhi _08137B1C + ldr r0, =gUnknown_082A6018 + b _08137C06 + .pool +_08137B1C: + cmp r0, 0x77 + bhi _08137B28 + ldr r0, =gUnknown_082A6061 + b _08137C06 + .pool +_08137B28: + cmp r0, 0x81 + bhi _08137B34 + ldr r0, =gUnknown_082A609C + b _08137C06 + .pool +_08137B34: + cmp r0, 0x8B + bhi _08137B40 + ldr r0, =gUnknown_082A60D5 + b _08137C06 + .pool +_08137B40: + cmp r0, 0x95 + bhi _08137B4C + ldr r0, =gUnknown_082A6124 + b _08137C06 + .pool +_08137B4C: + cmp r0, 0x9F + bhi _08137B58 + ldr r0, =gUnknown_082A616F + b _08137C06 + .pool +_08137B58: + cmp r0, 0xA9 + bhi _08137B64 + ldr r0, =gUnknown_082A61D6 + b _08137C06 + .pool +_08137B64: + cmp r0, 0xB3 + bhi _08137B70 + ldr r0, =gUnknown_082A623A + b _08137C06 + .pool +_08137B70: + cmp r0, 0xBD + bhi _08137B7C + ldr r0, =gUnknown_082A6287 + b _08137C06 + .pool +_08137B7C: + cmp r0, 0xC7 + bls _08137BEA + cmp r0, 0xC8 + bne _08137BB8 + ldr r0, =0x00000199 + bl SpeciesToNationalPokedexNum + lsls r0, 16 + lsrs r0, 16 + movs r1, 0x1 + bl GetSetPokedexFlag + lsls r0, 24 + cmp r0, 0 + bne _08137BEA + movs r0, 0xCD + lsls r0, 1 + bl SpeciesToNationalPokedexNum + lsls r0, 16 + lsrs r0, 16 + movs r1, 0x1 + bl GetSetPokedexFlag + lsls r0, 24 + cmp r0, 0 + bne _08137BEA + b _08137C04 + .pool +_08137BB8: + cmp r0, 0xC9 + bne _08137BF8 + ldr r0, =0x00000199 + bl SpeciesToNationalPokedexNum + lsls r0, 16 + lsrs r0, 16 + movs r1, 0x1 + bl GetSetPokedexFlag + lsls r0, 24 + cmp r0, 0 + beq _08137C04 + movs r0, 0xCD + lsls r0, 1 + bl SpeciesToNationalPokedexNum + lsls r0, 16 + lsrs r0, 16 + movs r1, 0x1 + bl GetSetPokedexFlag + lsls r0, 24 + cmp r0, 0 + beq _08137C04 +_08137BEA: + ldr r0, =gUnknown_082A62C9 + b _08137C06 + .pool +_08137BF8: + cmp r0, 0xCA + beq _08137C04 +_08137BFC: + ldr r0, =gUnknown_082A5D6C + b _08137C06 + .pool +_08137C04: + ldr r0, =gUnknown_082A6312 +_08137C06: + pop {r1} + bx r1 + .pool + thumb_func_end sub_8137A98 + + thumb_func_start sub_8137C10 +sub_8137C10: @ 8137C10 + push {lr} + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + bl sub_8137A98 + bl ShowFieldMessage + pop {r0} + bx r0 + .pool + thumb_func_end sub_8137C10 + + thumb_func_start sub_8137C28 +sub_8137C28: @ 8137C28 + push {lr} + ldr r0, =CB2_DoHallOfFamePC + bl SetMainCallback2 + bl ScriptContext2_Enable + pop {r0} + bx r0 + .pool + thumb_func_end sub_8137C28 + + thumb_func_start sub_8137C3C +sub_8137C3C: @ 8137C3C + push {lr} + ldr r0, =c2_exit_to_overworld_2_switch + bl SetMainCallback2 + ldr r1, =gFieldCallback + ldr r0, =mapldr_080CA5C0 + str r0, [r1] + pop {r0} + bx r0 + .pool + thumb_func_end sub_8137C3C + + thumb_func_start mapldr_080CA5C0 +mapldr_080CA5C0: @ 8137C5C + push {lr} + sub sp, 0x4 + bl ScriptContext2_Enable + bl sub_8085784 + bl sp109_CreatePCMenu + bl sub_80E2514 + movs r0, 0x1 + negs r0, r0 + movs r1, 0 + str r1, [sp] + movs r2, 0x10 + movs r3, 0 + bl BeginNormalPaletteFade + ldr r0, =sub_8137C94 + movs r1, 0xA + bl CreateTask + add sp, 0x4 + pop {r0} + bx r0 + .pool + thumb_func_end mapldr_080CA5C0 + + thumb_func_start sub_8137C94 +sub_8137C94: @ 8137C94 + push {lr} + lsls r0, 24 + lsrs r2, r0, 24 + ldr r0, =gPaletteFade + ldrb r1, [r0, 0x7] + movs r0, 0x80 + ands r0, r1 + cmp r0, 0 + bne _08137CAC + adds r0, r2, 0 + bl DestroyTask +_08137CAC: + pop {r0} + bx r0 + .pool + thumb_func_end sub_8137C94 + + thumb_func_start sub_8137CB4 +sub_8137CB4: @ 8137CB4 + push {lr} + ldr r0, =CB2_ShowDiploma + bl SetMainCallback2 + bl ScriptContext2_Enable + pop {r0} + bx r0 + .pool + thumb_func_end sub_8137CB4 + + thumb_func_start Special_ViewWallClock +Special_ViewWallClock: @ 8137CC8 + push {lr} + ldr r0, =gMain + ldr r1, =c2_exit_to_overworld_2_switch + str r1, [r0, 0x8] + ldr r0, =Cb2_ViewWallClock + bl SetMainCallback2 + bl ScriptContext2_Enable + pop {r0} + bx r0 + .pool + thumb_func_end Special_ViewWallClock + + thumb_func_start wild_pokemon_reroll +wild_pokemon_reroll: @ 8137CEC + ldr r0, =gUnknown_0203AB54 + movs r1, 0 + strb r1, [r0] + ldr r0, =gUnknown_0203AB55 + strb r1, [r0] + ldr r1, =gUnknown_0203AB58 + movs r0, 0 + str r0, [r1] + bx lr + .pool + thumb_func_end wild_pokemon_reroll + + thumb_func_start sub_8137D0C +sub_8137D0C: @ 8137D0C + ldr r1, =gUnknown_0203AB54 + movs r0, 0x1 + strb r0, [r1] + ldr r1, =gUnknown_0203AB55 + movs r0, 0 + strb r0, [r1] + ldr r1, =gUnknown_0203AB58 + ldr r0, =gMain + ldr r0, [r0, 0x20] + str r0, [r1] + bx lr + .pool + thumb_func_end sub_8137D0C + + thumb_func_start sp0E3_walkrun_bitfield_interpretation +sp0E3_walkrun_bitfield_interpretation: @ 8137D34 + push {lr} + movs r0, 0x4 + bl TestPlayerAvatarFlags + lsls r0, 24 + cmp r0, 0 + beq _08137D46 + movs r0, 0x1 + b _08137D58 +_08137D46: + movs r0, 0x2 + bl TestPlayerAvatarFlags + lsls r0, 24 + cmp r0, 0 + bne _08137D56 + movs r0, 0 + b _08137D58 +_08137D56: + movs r0, 0x2 +_08137D58: + pop {r1} + bx r1 + thumb_func_end sp0E3_walkrun_bitfield_interpretation + + thumb_func_start sub_8137D5C +sub_8137D5C: @ 8137D5C + push {r4-r7,lr} + adds r7, r0, 0 + lsls r1, 24 + lsrs r6, r1, 24 + cmp r6, 0x63 + bhi _08137D88 + ldr r4, =gStringVar1 + adds r0, r4, 0 + adds r1, r6, 0 + movs r2, 0 + movs r3, 0x2 + bl ConvertIntToDecimalStringN + ldr r1, =gText_SpaceTimes + adds r0, r4, 0 + bl StringAppend + b _08137D90 + .pool +_08137D88: + ldr r0, =gStringVar1 + ldr r1, =gText_99TimesPlus + bl StringCopy +_08137D90: + ldr r0, =0x00000e0f + cmp r7, r0 + bhi _08137DF0 + ldr r4, =gStringVar2 + adds r0, r7, 0 + movs r1, 0x3C + bl __udivsi3 + adds r1, r0, 0 + adds r0, r4, 0 + movs r2, 0x1 + movs r3, 0x2 + bl ConvertIntToDecimalStringN + movs r0, 0xAD + strb r0, [r4, 0x2] + adds r5, r4, 0x3 + adds r0, r7, 0 + movs r1, 0x3C + bl __umodsi3 + movs r1, 0x64 + muls r0, r1 + movs r1, 0x3C + bl __udivsi3 + adds r1, r0, 0 + adds r0, r5, 0 + movs r2, 0x2 + movs r3, 0x2 + bl ConvertIntToDecimalStringN + ldr r1, =gText_SpaceSeconds + adds r0, r4, 0 + bl StringAppend + b _08137DF8 + .pool +_08137DF0: + ldr r0, =gStringVar2 + ldr r1, =gText_1MinutePlus + bl StringCopy +_08137DF8: + movs r4, 0 + cmp r6, 0 + bne _08137E0C + movs r4, 0x5 + b _08137E2A + .pool +_08137E0C: + cmp r6, 0x3 + bhi _08137E14 + movs r4, 0x4 + b _08137E2A +_08137E14: + cmp r6, 0x9 + bhi _08137E1C + movs r4, 0x3 + b _08137E2A +_08137E1C: + cmp r6, 0x13 + bhi _08137E24 + movs r4, 0x2 + b _08137E2A +_08137E24: + cmp r6, 0x63 + bhi _08137E2A + movs r4, 0x1 +_08137E2A: + adds r0, r7, 0 + movs r1, 0x3C + bl __udivsi3 + cmp r0, 0xA + bhi _08137E3A + adds r0, r4, 0x5 + b _08137E58 +_08137E3A: + cmp r0, 0xF + bhi _08137E42 + adds r0, r4, 0x4 + b _08137E58 +_08137E42: + cmp r0, 0x14 + bhi _08137E4A + adds r0, r4, 0x3 + b _08137E58 +_08137E4A: + cmp r0, 0x28 + bhi _08137E52 + adds r0, r4, 0x2 + b _08137E58 +_08137E52: + cmp r0, 0x3B + bhi _08137E5C + adds r0, r4, 0x1 +_08137E58: + lsls r0, 24 + lsrs r4, r0, 24 +_08137E5C: + ldr r0, =gSpecialVar_Result + strh r4, [r0] + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8137D5C + + thumb_func_start sub_8137E6C +sub_8137E6C: @ 8137E6C + push {r4,r5,lr} + ldr r0, =gMain + ldr r1, =gUnknown_0203AB58 + ldr r4, [r0, 0x20] + ldr r0, [r1] + subs r4, r0 + ldr r5, =gUnknown_0203AB55 + ldrb r1, [r5] + adds r0, r4, 0 + bl sub_8137D5C + ldrb r1, [r5] + adds r0, r4, 0 + bl sub_8137E9C + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8137E6C + + thumb_func_start sub_8137E9C +sub_8137E9C: @ 8137E9C + push {r4-r7,lr} + mov r7, r8 + push {r7} + adds r5, r0, 0 + lsls r1, 24 + lsrs r1, 24 + mov r8, r1 + ldr r6, =0x00004028 + adds r0, r6, 0 + bl VarGet + adds r4, r0, 0 + lsls r4, 16 + lsrs r4, 16 + ldr r7, =0x00004029 + adds r0, r7, 0 + bl VarGet + lsls r0, 16 + adds r4, r0 + cmp r4, r5 + bhi _08137ECC + cmp r4, 0 + bne _08137EE6 +_08137ECC: + lsls r1, r5, 16 + lsrs r1, 16 + adds r0, r6, 0 + bl VarSet + lsrs r1, r5, 16 + adds r0, r7, 0 + bl VarSet + ldr r0, =0x00004027 + mov r1, r8 + bl VarSet +_08137EE6: + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8137E9C + + thumb_func_start sub_8137EFC +sub_8137EFC: @ 8137EFC + push {r4,lr} + ldr r0, =0x00004028 + bl VarGet + adds r4, r0, 0 + lsls r4, 16 + lsrs r4, 16 + ldr r0, =0x00004029 + bl VarGet + lsls r0, 16 + adds r4, r0 + cmp r4, 0 + beq _08137F3C + ldr r0, =0x00004027 + bl VarGet + adds r1, r0, 0 + lsls r1, 24 + lsrs r1, 24 + adds r0, r4, 0 + bl sub_8137D5C + movs r0, 0x1 + b _08137F3E + .pool +_08137F3C: + movs r0, 0 +_08137F3E: + pop {r4} + pop {r1} + bx r1 + thumb_func_end sub_8137EFC + + thumb_func_start sub_8137F44 +sub_8137F44: @ 8137F44 + push {r4,lr} + ldr r0, =gUnknown_020322DC + ldrh r1, [r0] + ldr r0, =0x00000c1d + cmp r1, r0 + beq _08137F7C + ldr r4, =0x000040a9 + adds r0, r4, 0 + bl VarGet + lsls r0, 16 + lsrs r0, 16 + cmp r0, 0x2 + beq _08137F6E + adds r0, r4, 0 + bl VarGet + lsls r0, 16 + lsrs r0, 16 + cmp r0, 0x3 + bne _08137F7C +_08137F6E: + adds r0, r4, 0 + movs r1, 0 + bl VarSet + movs r0, 0 + bl Overworld_SetSavedMusic +_08137F7C: + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8137F44 + + thumb_func_start sub_8137F90 +sub_8137F90: @ 8137F90 + push {lr} + ldr r0, =0x0000088d + bl FlagSet + ldr r0, =0x0000404a + bl GetVarPointer + movs r1, 0 + strh r1, [r0] + pop {r0} + bx r0 + .pool + thumb_func_end sub_8137F90 + + thumb_func_start sub_8137FB0 +sub_8137FB0: @ 8137FB0 + push {lr} + ldr r0, =0x0000088d + bl FlagClear + pop {r0} + bx r0 + .pool + thumb_func_end sub_8137FB0 + + thumb_func_start CountSSTidalStep +CountSSTidalStep: @ 8137FC0 + push {r4,lr} + lsls r0, 16 + lsrs r4, r0, 16 + ldr r0, =0x0000088d + bl FlagGet + lsls r0, 24 + cmp r0, 0 + beq _08137FE6 + ldr r0, =0x0000404a + bl GetVarPointer + ldrh r1, [r0] + adds r1, r4, r1 + strh r1, [r0] + lsls r1, 16 + lsrs r1, 16 + cmp r1, 0xCC + bhi _08137FF4 +_08137FE6: + movs r0, 0 + b _08137FF6 + .pool +_08137FF4: + movs r0, 0x1 +_08137FF6: + pop {r4} + pop {r1} + bx r1 + thumb_func_end CountSSTidalStep + + thumb_func_start GetSSTidalLocation +GetSSTidalLocation: @ 8137FFC + push {r4-r7,lr} + mov r7, r8 + push {r7} + mov r8, r0 + adds r5, r1, 0 + adds r6, r2, 0 + adds r7, r3, 0 + ldr r0, =0x0000404a + bl GetVarPointer + adds r4, r0, 0 + ldr r0, =0x000040b4 + bl GetVarPointer + ldrh r0, [r0] + subs r0, 0x1 + cmp r0, 0x9 + bhi _081380C2 + lsls r0, 2 + ldr r1, =_08138038 + adds r0, r1 + ldr r0, [r0] + mov pc, r0 + .pool + .align 2, 0 +_08138038: + .4byte _08138060 + .4byte _08138070 + .4byte _08138064 + .4byte _08138068 + .4byte _08138068 + .4byte _0813806C + .4byte _08138098 + .4byte _08138060 + .4byte _08138064 + .4byte _0813806C +_08138060: + movs r0, 0x1 + b _081380CE +_08138064: + movs r0, 0x4 + b _081380CE +_08138068: + movs r0, 0x2 + b _081380CE +_0813806C: + movs r0, 0x3 + b _081380CE +_08138070: + ldrh r0, [r4] + cmp r0, 0x3B + bhi _08138080 + movs r0, 0x31 + strb r0, [r5] + ldrh r0, [r4] + adds r0, 0x13 + b _081380C0 +_08138080: + cmp r0, 0x8B + bhi _0813808E + movs r0, 0x30 + strb r0, [r5] + ldrh r0, [r4] + subs r0, 0x3C + b _081380C0 +_0813808E: + movs r0, 0x2F + strb r0, [r5] + ldrh r0, [r4] + subs r0, 0x8C + b _081380C0 +_08138098: + ldrh r0, [r4] + cmp r0, 0x41 + bhi _081380A8 + movs r0, 0x2F + strb r0, [r5] + ldrh r1, [r4] + movs r0, 0x41 + b _081380BE +_081380A8: + cmp r0, 0x91 + bhi _081380B6 + movs r0, 0x30 + strb r0, [r5] + ldrh r1, [r4] + movs r0, 0x91 + b _081380BE +_081380B6: + movs r0, 0x31 + strb r0, [r5] + ldrh r1, [r4] + movs r0, 0xE0 +_081380BE: + subs r0, r1 +_081380C0: + strh r0, [r6] +_081380C2: + movs r0, 0 + mov r1, r8 + strb r0, [r1] + movs r0, 0x14 + strh r0, [r7] + movs r0, 0 +_081380CE: + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r1} + bx r1 + thumb_func_end GetSSTidalLocation + + thumb_func_start is_tile_that_overrides_player_control +is_tile_that_overrides_player_control: @ 81380D8 + push {lr} + movs r0, 0x88 + bl FlagGet + lsls r0, 24 + cmp r0, 0 + beq _0813810A + ldr r0, =gMapHeader + ldrb r0, [r0, 0x17] + cmp r0, 0x1 + blt _0813810A + cmp r0, 0x3 + ble _081380F6 + cmp r0, 0x6 + bne _0813810A +_081380F6: + ldr r0, =0x000040f2 + bl GetVarPointer + ldrh r1, [r0] + adds r1, 0x1 + strh r1, [r0] + lsls r1, 16 + lsrs r1, 16 + cmp r1, 0xF9 + bhi _08138118 +_0813810A: + movs r0, 0 + b _0813811A + .pool +_08138118: + movs r0, 0x1 +_0813811A: + pop {r1} + bx r1 + thumb_func_end is_tile_that_overrides_player_control + + thumb_func_start sub_8138120 +sub_8138120: @ 8138120 + push {lr} + movs r0, 0x8A + bl FlagGet + lsls r0, 24 + cmp r0, 0 + beq _08138152 + ldr r0, =gMapHeader + ldrb r0, [r0, 0x17] + cmp r0, 0x1 + blt _08138152 + cmp r0, 0x3 + ble _0813813E + cmp r0, 0x6 + bne _08138152 +_0813813E: + ldr r0, =0x000040f3 + bl GetVarPointer + ldrh r1, [r0] + adds r1, 0x1 + strh r1, [r0] + lsls r1, 16 + lsrs r1, 16 + cmp r1, 0x9 + bhi _08138160 +_08138152: + movs r0, 0 + b _08138162 + .pool +_08138160: + movs r0, 0x1 +_08138162: + pop {r1} + bx r1 + thumb_func_end sub_8138120 + + thumb_func_start sub_8138168 +sub_8138168: @ 8138168 + push {lr} + movs r0, 0x72 + bl FlagGet + lsls r0, 24 + cmp r0, 0 + beq _0813819A + ldr r0, =gMapHeader + ldrb r0, [r0, 0x17] + cmp r0, 0x1 + blt _0813819A + cmp r0, 0x3 + ble _08138186 + cmp r0, 0x6 + bne _0813819A +_08138186: + ldr r0, =0x000040f5 + bl GetVarPointer + ldrh r1, [r0] + adds r1, 0x1 + strh r1, [r0] + lsls r1, 16 + lsrs r1, 16 + cmp r1, 0x9 + bhi _081381A8 +_0813819A: + movs r0, 0 + b _081381AA + .pool +_081381A8: + movs r0, 0x1 +_081381AA: + pop {r1} + bx r1 + thumb_func_end sub_8138168 + + thumb_func_start sub_81381B0 +sub_81381B0: @ 81381B0 + push {lr} + movs r0, 0x80 + bl FlagGet + lsls r0, 24 + cmp r0, 0 + beq _081381E2 + ldr r0, =gMapHeader + ldrb r0, [r0, 0x17] + cmp r0, 0x1 + blt _081381E2 + cmp r0, 0x3 + ble _081381CE + cmp r0, 0x6 + bne _081381E2 +_081381CE: + ldr r0, =0x000040f4 + bl GetVarPointer + ldrh r1, [r0] + adds r1, 0x1 + strh r1, [r0] + lsls r1, 16 + lsrs r1, 16 + cmp r1, 0xF9 + bhi _081381F0 +_081381E2: + movs r0, 0 + b _081381F2 + .pool +_081381F0: + movs r0, 0x1 +_081381F2: + pop {r1} + bx r1 + thumb_func_end sub_81381B0 + + thumb_func_start sub_81381F8 +sub_81381F8: @ 81381F8 + push {lr} + movs r0, 0x75 + bl FlagGet + lsls r0, 24 + cmp r0, 0 + beq _0813822A + ldr r0, =gMapHeader + ldrb r0, [r0, 0x17] + cmp r0, 0x1 + blt _0813822A + cmp r0, 0x3 + ble _08138216 + cmp r0, 0x6 + bne _0813822A +_08138216: + ldr r0, =0x000040f6 + bl GetVarPointer + ldrh r1, [r0] + adds r1, 0x1 + strh r1, [r0] + lsls r1, 16 + lsrs r1, 16 + cmp r1, 0xF9 + bhi _08138238 +_0813822A: + movs r0, 0 + b _0813823A + .pool +_08138238: + movs r0, 0x1 +_0813823A: + pop {r1} + bx r1 + thumb_func_end sub_81381F8 + + thumb_func_start sub_8138240 +sub_8138240: @ 8138240 + push {r4-r7,lr} + mov r7, r8 + push {r7} + movs r6, 0 + bl GetMultiplayerId + lsls r0, 24 + lsrs r7, r0, 24 + bl GetLinkPlayerCount + lsls r0, 24 + lsrs r5, r0, 24 + movs r4, 0 + cmp r4, r5 + bcs _0813828A + ldr r0, =gTVStringVarPtrs + mov r8, r0 +_08138262: + cmp r7, r4 + beq _08138280 + lsls r0, r6, 2 + add r0, r8 + ldr r0, [r0] + lsls r1, r4, 3 + subs r1, r4 + lsls r1, 2 + ldr r2, =gLinkPlayers + 8 + adds r1, r2 + bl StringCopy + adds r0, r6, 0x1 + lsls r0, 24 + lsrs r6, r0, 24 +_08138280: + adds r0, r4, 0x1 + lsls r0, 24 + lsrs r4, r0, 24 + cmp r4, r5 + bcc _08138262 +_0813828A: + adds r0, r5, 0 + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r1} + bx r1 + .pool + thumb_func_end sub_8138240 + + thumb_func_start SpawnLinkPartnerFieldObject +SpawnLinkPartnerFieldObject: @ 81382A0 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + sub sp, 0x14 + movs r7, 0 + movs r0, 0 + mov r9, r0 + mov r8, r0 + ldr r1, =gUnknown_085B2B5C + add r0, sp, 0x8 + movs r2, 0x4 + bl memcpy + add r4, sp, 0xC + ldr r1, =gUnknown_085B2B60 + adds r0, r4, 0 + movs r2, 0x8 + bl memcpy + bl GetMultiplayerId + lsls r0, 24 + lsrs r0, 24 + mov r10, r0 + bl player_get_direction_lower_nybble + lsls r0, 24 + lsrs r0, 24 + adds r1, r0, 0 + cmp r0, 0x2 + beq _08138310 + cmp r0, 0x2 + bgt _081382F4 + cmp r0, 0x1 + beq _0813833C + b _08138350 + .pool +_081382F4: + cmp r1, 0x3 + beq _081382FE + cmp r1, 0x4 + beq _08138324 + b _08138350 +_081382FE: + movs r7, 0x2 + ldr r0, =gSaveBlock1Ptr + ldr r1, [r0] + ldrh r0, [r1] + subs r0, 0x1 + b _0813832C + .pool +_08138310: + movs r7, 0x1 + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + ldrh r1, [r0] + mov r9, r1 + ldrh r0, [r0, 0x2] + subs r0, 0x1 + b _0813834A + .pool +_08138324: + ldr r0, =gSaveBlock1Ptr + ldr r1, [r0] + ldrh r0, [r1] + adds r0, 0x1 +_0813832C: + lsls r0, 16 + lsrs r0, 16 + mov r9, r0 + ldrh r1, [r1, 0x2] + mov r8, r1 + b _08138350 + .pool +_0813833C: + movs r7, 0x3 + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + ldrh r3, [r0] + mov r9, r3 + ldrh r0, [r0, 0x2] + adds r0, 0x1 +_0813834A: + lsls r0, 16 + lsrs r0, 16 + mov r8, r0 +_08138350: + movs r6, 0 + b _08138410 + .pool +_08138358: + cmp r10, r6 + beq _0813840A + ldr r0, =gLinkPlayers + lsls r2, r6, 3 + subs r1, r2, r6 + lsls r1, 2 + adds r1, r0 + ldrb r3, [r1] + adds r4, r0, 0 + cmp r3, 0x1 + blt _0813838C + cmp r3, 0x2 + ble _0813837C + cmp r3, 0x3 + beq _08138388 + b _0813838C + .pool +_0813837C: + ldrb r0, [r1, 0x13] + movs r5, 0xEC + cmp r0, 0 + bne _0813839C + movs r5, 0xEB + b _0813839C +_08138388: + ldrb r0, [r1, 0x13] + b _08138394 +_0813838C: + subs r0, r2, r6 + lsls r0, 2 + adds r0, r4 + ldrb r0, [r0, 0x13] +_08138394: + movs r5, 0x69 + cmp r0, 0 + bne _0813839C + movs r5, 0x64 +_0813839C: + mov r0, sp + adds r0, r7 + adds r0, 0x8 + ldrb r1, [r0] + movs r4, 0xF0 + subs r4, r6 + lsls r4, 24 + lsrs r4, 24 + lsls r2, r7, 1 + mov r0, sp + adds r0, r2 + adds r0, 0xC + ldrb r0, [r0] + lsls r0, 24 + asrs r0, 24 + mov r3, r9 + lsls r3, 16 + asrs r3, 16 + mov r12, r3 + add r0, r12 + adds r3, r0, 0x7 + lsls r3, 16 + asrs r3, 16 + mov r12, r3 + mov r0, sp + adds r0, 0xD + adds r0, r2 + movs r2, 0 + ldrsb r2, [r0, r2] + mov r3, r8 + lsls r0, r3, 16 + asrs r0, 16 + adds r0, r2 + adds r0, 0x7 + lsls r0, 16 + asrs r0, 16 + str r0, [sp] + movs r0, 0 + str r0, [sp, 0x4] + adds r0, r5, 0 + adds r2, r4, 0 + mov r3, r12 + bl SpawnSpecialFieldObjectParametrized + adds r0, r5, 0 + adds r1, r4, 0 + adds r2, r6, 0 + bl sub_813842C + adds r0, r7, 0x1 + lsls r0, 24 + lsrs r7, r0, 24 + cmp r7, 0x4 + bne _0813840A + movs r7, 0 +_0813840A: + adds r0, r6, 0x1 + lsls r0, 24 + lsrs r6, r0, 24 +_08138410: + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + cmp r6, r0 + bcc _08138358 + add sp, 0x14 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end SpawnLinkPartnerFieldObject + + thumb_func_start sub_813842C +sub_813842C: @ 813842C + push {r4,r5,lr} + lsls r0, 24 + lsls r1, 24 + lsrs r3, r1, 24 + lsls r2, 24 + movs r1, 0xC0 + lsls r1, 19 + adds r2, r1 + lsrs r5, r2, 24 + lsrs r4, r0, 24 + movs r2, 0xA8 + lsls r2, 21 + adds r0, r2 + lsrs r0, 24 + cmp r0, 0x1 + bls _08138454 + cmp r4, 0x64 + beq _08138454 + cmp r4, 0x69 + bne _081384E6 +_08138454: + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + ldrb r1, [r0, 0x5] + ldrb r2, [r0, 0x4] + adds r0, r3, 0 + bl GetFieldObjectIdByLocalIdAndMap + lsls r0, 24 + lsrs r2, r0, 24 + cmp r2, 0x10 + beq _081384E6 + ldr r1, =gMapObjects + lsls r0, r2, 3 + adds r0, r2 + lsls r0, 2 + adds r0, r1 + ldrb r0, [r0, 0x4] + lsls r1, r0, 4 + adds r1, r0 + lsls r1, 2 + ldr r0, =gSprites + adds r1, r0 + lsls r3, r5, 4 + ldrb r2, [r1, 0x5] + movs r0, 0xF + ands r0, r2 + orrs r0, r3 + strb r0, [r1, 0x5] + cmp r4, 0x69 + beq _081384D8 + cmp r4, 0x69 + bgt _081384A8 + cmp r4, 0x64 + beq _081384C4 + b _081384E6 + .pool +_081384A8: + cmp r4, 0xEB + beq _081384B2 + cmp r4, 0xEC + beq _081384BC + b _081384E6 +_081384B2: + ldr r0, =gFieldObjectPalette33 + b _081384C6 + .pool +_081384BC: + ldr r0, =gFieldObjectPalette34 + b _081384C6 + .pool +_081384C4: + ldr r0, =gFieldObjectPalette8 +_081384C6: + movs r2, 0x80 + lsls r2, 1 + adds r1, r3, r2 + movs r2, 0x20 + bl LoadPalette + b _081384E6 + .pool +_081384D8: + ldr r0, =gFieldObjectPalette17 + movs r2, 0x80 + lsls r2, 1 + adds r1, r3, r2 + movs r2, 0x20 + bl LoadPalette +_081384E6: + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813842C + + thumb_func_start sub_81384F0 +sub_81384F0: @ 81384F0 + push {r4,r5,lr} + movs r4, 0 + ldr r5, =gUnknown_085B2B68 +_081384F6: + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + cmp r4, r0 + bne _0813851C + lsls r1, r4, 2 + adds r1, r5 + ldrb r0, [r1] + ldrb r1, [r1, 0x1] + ldr r2, =0x00000206 + bl MapGridSetMetatileIdAt + b _0813852A + .pool +_0813851C: + lsls r1, r4, 2 + adds r1, r5 + ldrb r0, [r1] + ldrb r1, [r1, 0x1] + ldr r2, =0x00000205 + bl MapGridSetMetatileIdAt +_0813852A: + adds r0, r4, 0x1 + lsls r0, 24 + lsrs r4, r0, 24 + cmp r4, 0x3 + bls _081384F6 + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81384F0 + + thumb_func_start sub_8138540 +sub_8138540: @ 8138540 + push {r4-r6,lr} + movs r5, 0xC +_08138544: + movs r4, 0x7 + adds r6, r5, 0x1 +_08138548: + adds r0, r4, 0 + adds r1, r5, 0 + bl MapGridGetMetatileIdAt + ldr r1, =0xfffffde6 + adds r0, r1 + cmp r0, 0x37 + bls _0813855A + b _08138734 +_0813855A: + lsls r0, 2 + ldr r1, =_0813856C + adds r0, r1 + ldr r0, [r0] + mov pc, r0 + .pool + .align 2, 0 +_0813856C: + .4byte _081386F2 + .4byte _08138734 + .4byte _08138734 + .4byte _08138734 + .4byte _08138734 + .4byte _08138734 + .4byte _0813864C + .4byte _08138652 + .4byte _0813868C + .4byte _08138694 + .4byte _08138734 + .4byte _08138734 + .4byte _08138734 + .4byte _08138734 + .4byte _0813865C + .4byte _08138662 + .4byte _0813869C + .4byte _081386A4 + .4byte _08138734 + .4byte _08138734 + .4byte _08138734 + .4byte _08138734 + .4byte _0813866C + .4byte _08138672 + .4byte _081386AC + .4byte _081386B4 + .4byte _08138734 + .4byte _08138734 + .4byte _08138734 + .4byte _08138734 + .4byte _0813867C + .4byte _08138684 + .4byte _081386BC + .4byte _081386C4 + .4byte _08138734 + .4byte _08138734 + .4byte _08138734 + .4byte _08138734 + .4byte _081386CC + .4byte _081386DC + .4byte _081386EC + .4byte _08138714 + .4byte _08138734 + .4byte _08138734 + .4byte _08138734 + .4byte _08138734 + .4byte _081386D4 + .4byte _081386E4 + .4byte _08138734 + .4byte _08138734 + .4byte _08138734 + .4byte _08138734 + .4byte _08138734 + .4byte _08138734 + .4byte _0813872A + .4byte _0813871C +_0813864C: + movs r2, 0x8C + lsls r2, 2 + b _08138720 +_08138652: + ldr r2, =0x00000231 + b _08138720 + .pool +_0813865C: + movs r2, 0x8E + lsls r2, 2 + b _08138720 +_08138662: + ldr r2, =0x00000239 + b _08138720 + .pool +_0813866C: + movs r2, 0x88 + lsls r2, 2 + b _08138720 +_08138672: + ldr r2, =0x00000221 + b _08138720 + .pool +_0813867C: + ldr r2, =0x00000e28 + b _08138720 + .pool +_08138684: + ldr r2, =0x00000e29 + b _08138720 + .pool +_0813868C: + ldr r2, =0x00000232 + b _08138720 + .pool +_08138694: + ldr r2, =0x00000233 + b _08138720 + .pool +_0813869C: + ldr r2, =0x0000023a + b _08138720 + .pool +_081386A4: + ldr r2, =0x0000023b + b _08138720 + .pool +_081386AC: + ldr r2, =0x00000222 + b _08138720 + .pool +_081386B4: + ldr r2, =0x00000223 + b _08138720 + .pool +_081386BC: + ldr r2, =0x00000e2a + b _08138720 + .pool +_081386C4: + ldr r2, =0x00000e2b + b _08138720 + .pool +_081386CC: + ldr r2, =0x00000e42 + b _08138720 + .pool +_081386D4: + ldr r2, =0x0000021a + b _08138720 + .pool +_081386DC: + ldr r2, =0x00000e43 + b _08138720 + .pool +_081386E4: + ldr r2, =0x0000021a + b _08138720 + .pool +_081386EC: + movs r2, 0xE4 + lsls r2, 4 + b _08138720 +_081386F2: + subs r1, r5, 0x1 + adds r0, r4, 0 + bl MapGridGetMetatileIdAt + movs r1, 0x90 + lsls r1, 2 + cmp r0, r1 + bne _0813870C + ldr r2, =0x00000e48 + b _08138720 + .pool +_0813870C: + ldr r2, =0x00000e49 + b _08138720 + .pool +_08138714: + ldr r2, =0x00000e41 + b _08138720 + .pool +_0813871C: + movs r2, 0xE5 + lsls r2, 4 +_08138720: + adds r0, r4, 0 + adds r1, r5, 0 + bl MapGridSetMetatileIdAt + b _08138734 +_0813872A: + ldr r2, =0x00000251 + adds r0, r4, 0 + adds r1, r5, 0 + bl MapGridSetMetatileIdAt +_08138734: + adds r4, 0x1 + cmp r4, 0xF + bgt _0813873C + b _08138548 +_0813873C: + adds r5, r6, 0 + cmp r5, 0x17 + bgt _08138744 + b _08138544 +_08138744: + pop {r4-r6} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8138540 + + thumb_func_start sub_8138750 +sub_8138750: @ 8138750 + push {r4-r6,lr} + ldr r4, =gUnknown_085B2B68 + movs r5, 0x3 +_08138756: + ldrb r0, [r4] + ldrb r1, [r4, 0x1] + ldr r2, =0x00000206 + bl MapGridSetMetatileIdAt + adds r4, 0x4 + subs r5, 0x1 + cmp r5, 0 + bge _08138756 + movs r5, 0xC +_0813876A: + movs r4, 0x7 + adds r6, r5, 0x1 +_0813876E: + adds r0, r4, 0 + adds r1, r5, 0 + bl MapGridGetMetatileIdAt + ldr r1, =0xfffffde0 + adds r0, r1 + cmp r0, 0x30 + bls _08138780 + b _081388CA +_08138780: + lsls r0, 2 + ldr r1, =_0813879C + adds r0, r1 + ldr r0, [r0] + mov pc, r0 + .pool + .align 2, 0 +_0813879C: + .4byte _08138860 + .4byte _08138866 + .4byte _08138880 + .4byte _08138888 + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _08138870 + .4byte _08138876 + .4byte _08138890 + .4byte _08138898 + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388A0 + .4byte _081388A8 + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388B0 + .4byte _081388B0 + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388CA + .4byte _081388C0 +_08138860: + movs r2, 0x8C + lsls r2, 2 + b _081388B2 +_08138866: + ldr r2, =0x00000231 + b _081388B2 + .pool +_08138870: + movs r2, 0x8E + lsls r2, 2 + b _081388B2 +_08138876: + ldr r2, =0x00000239 + b _081388B2 + .pool +_08138880: + ldr r2, =0x00000232 + b _081388B2 + .pool +_08138888: + ldr r2, =0x00000233 + b _081388B2 + .pool +_08138890: + ldr r2, =0x0000023a + b _081388B2 + .pool +_08138898: + ldr r2, =0x0000023b + b _081388B2 + .pool +_081388A0: + ldr r2, =0x00000e42 + b _081388B2 + .pool +_081388A8: + ldr r2, =0x00000e43 + b _081388B2 + .pool +_081388B0: + ldr r2, =0x0000021a +_081388B2: + adds r0, r4, 0 + adds r1, r5, 0 + bl MapGridSetMetatileIdAt + b _081388CA + .pool +_081388C0: + ldr r2, =0x00000251 + adds r0, r4, 0 + adds r1, r5, 0 + bl MapGridSetMetatileIdAt +_081388CA: + adds r4, 0x1 + cmp r4, 0xF + bgt _081388D2 + b _0813876E +_081388D2: + adds r5, r6, 0 + cmp r5, 0x17 + bgt _081388DA + b _0813876A +_081388DA: + pop {r4-r6} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8138750 + + thumb_func_start sub_81388E4 +sub_81388E4: @ 81388E4 + push {lr} + ldr r0, =gUnknown_0203AB5C + movs r1, 0 + strb r1, [r0] + ldr r0, =gUnknown_0203AB5D + strb r1, [r0] + movs r0, 0x2C + bl PlaySE + ldr r0, =sub_8138910 + movs r1, 0x8 + bl CreateTask + pop {r0} + bx r0 + .pool + thumb_func_end sub_81388E4 + + thumb_func_start sub_8138910 +sub_8138910: @ 8138910 + push {r4-r6,lr} + lsls r0, 24 + lsrs r6, r0, 24 + ldr r0, =gUnknown_085B2B78 + ldr r5, =gUnknown_0203AB5D + ldrb r1, [r5] + adds r0, r1, r0 + ldr r4, =gUnknown_0203AB5C + ldrb r2, [r4] + ldrb r0, [r0] + cmp r0, r2 + bne _0813896C + ldr r0, =gSpecialVar_0x8004 + ldrb r0, [r0] + ldr r2, =gUnknown_085B2B7E + lsls r1, 1 + adds r1, r2 + ldrh r1, [r1] + bl sub_8138978 + movs r0, 0 + strb r0, [r4] + ldrb r0, [r5] + adds r0, 0x1 + strb r0, [r5] + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x5 + bne _08138970 + adds r0, r6, 0 + bl DestroyTask + bl EnableBothScriptContexts + b _08138970 + .pool +_0813896C: + adds r0, r2, 0x1 + strb r0, [r4] +_08138970: + pop {r4-r6} + pop {r0} + bx r0 + thumb_func_end sub_8138910 + + thumb_func_start sub_8138978 +sub_8138978: @ 8138978 + push {r4-r7,lr} + mov r7, r9 + mov r6, r8 + push {r6,r7} + sub sp, 0x10 + lsls r0, 24 + lsrs r0, 24 + lsls r1, 16 + lsrs r2, r1, 16 + movs r7, 0 + subs r0, 0x1 + cmp r0, 0x7 + bhi _08138A40 + lsls r0, 2 + ldr r1, =_081389A0 + adds r0, r1 + ldr r0, [r0] + mov pc, r0 + .pool + .align 2, 0 +_081389A0: + .4byte _081389C0 + .4byte _081389D2 + .4byte _081389E4 + .4byte _081389F6 + .4byte _08138A04 + .4byte _08138A1A + .4byte _08138A26 + .4byte _08138A34 +_081389C0: + movs r7, 0x2 + mov r1, sp + movs r0, 0x1 + strh r0, [r1] + movs r0, 0x7 + strh r0, [r1, 0x2] + add r1, sp, 0x8 + movs r0, 0x68 + b _08138A14 +_081389D2: + movs r7, 0x2 + mov r1, sp + movs r0, 0x1 + strh r0, [r1] + movs r0, 0x7 + strh r0, [r1, 0x2] + add r1, sp, 0x8 + movs r0, 0x4E + b _08138A14 +_081389E4: + movs r7, 0x2 + mov r1, sp + movs r0, 0x1 + strh r0, [r1] + movs r0, 0x7 + strh r0, [r1, 0x2] + add r1, sp, 0x8 + movs r0, 0x5B + b _08138A14 +_081389F6: + movs r7, 0x1 + mov r1, sp + movs r0, 0x7 + strh r0, [r1] + add r1, sp, 0x8 + movs r0, 0x27 + b _08138A3E +_08138A04: + movs r7, 0x2 + mov r1, sp + movs r0, 0x1 + strh r0, [r1] + movs r0, 0x7 + strh r0, [r1, 0x2] + add r1, sp, 0x8 + movs r0, 0x34 +_08138A14: + strh r0, [r1] + strh r0, [r1, 0x2] + b _08138A40 +_08138A1A: + movs r7, 0x1 + mov r0, sp + strh r7, [r0] + add r1, sp, 0x8 + movs r0, 0x41 + b _08138A3E +_08138A26: + movs r7, 0x1 + mov r1, sp + movs r0, 0x7 + strh r0, [r1] + add r1, sp, 0x8 + movs r0, 0xD + b _08138A3E +_08138A34: + movs r7, 0x1 + mov r0, sp + strh r7, [r0] + add r1, sp, 0x8 + movs r0, 0x1A +_08138A3E: + strh r0, [r1] +_08138A40: + movs r6, 0 + cmp r6, r7 + bcs _08138A92 + movs r1, 0xC0 + lsls r1, 4 + adds r0, r1, 0 + adds r1, r2, 0 + orrs r1, r0 + lsls r1, 16 + mov r9, r1 + adds r1, r2, 0 + adds r1, 0x8 + orrs r1, r0 + lsls r1, 16 + mov r8, r1 +_08138A5E: + lsls r1, r6, 1 + mov r3, sp + adds r5, r3, r1 + ldrh r0, [r5] + adds r0, 0x7 + add r4, sp, 0x8 + adds r4, r1 + ldrh r1, [r4] + adds r1, 0x7 + mov r3, r9 + lsrs r2, r3, 16 + bl MapGridSetMetatileIdAt + ldrh r0, [r5] + adds r0, 0x7 + ldrh r1, [r4] + adds r1, 0x8 + mov r3, r8 + lsrs r2, r3, 16 + bl MapGridSetMetatileIdAt + adds r0, r6, 0x1 + lsls r0, 24 + lsrs r6, r0, 24 + cmp r6, r7 + bcc _08138A5E +_08138A92: + bl DrawWholeMapView + add sp, 0x10 + pop {r3,r4} + mov r8, r3 + mov r9, r4 + pop {r4-r7} + pop {r0} + bx r0 + thumb_func_end sub_8138978 + + thumb_func_start sub_8138AA4 +sub_8138AA4: @ 8138AA4 + push {lr} + ldr r0, =gSpecialVar_0x8004 + ldrb r0, [r0] + ldr r1, =gUnknown_085B2B7E + ldrh r1, [r1, 0x8] + bl sub_8138978 + pop {r0} + bx r0 + .pool + thumb_func_end sub_8138AA4 + + thumb_func_start sub_8138AC0 +sub_8138AC0: @ 8138AC0 + push {lr} + ldr r0, =gStringVar4 + bl ShowFieldMessage + pop {r0} + bx r0 + .pool + thumb_func_end sub_8138AC0 + + thumb_func_start sub_8138AD0 +sub_8138AD0: @ 8138AD0 + ldr r1, =gSpecialVar_0x8004 + ldr r0, =gSaveBlock1Ptr + ldr r2, [r0] + ldrh r0, [r2] + strh r0, [r1] + ldr r1, =gSpecialVar_0x8005 + ldrh r0, [r2, 0x2] + strh r0, [r1] + bx lr + .pool + thumb_func_end sub_8138AD0 + + thumb_func_start sub_8138AF0 +sub_8138AF0: @ 8138AF0 + push {lr} + ldr r0, =gSaveBlock2Ptr + ldr r0, [r0] + ldrb r1, [r0, 0xB] + lsls r1, 8 + ldrb r0, [r0, 0xA] + orrs r0, r1 + movs r1, 0xA + bl __umodsi3 + lsls r0, 24 + lsrs r0, 24 + pop {r1} + bx r1 + .pool + thumb_func_end sub_8138AF0 + + thumb_func_start sub_8138B10 +sub_8138B10: @ 8138B10 + push {lr} + ldr r0, =gSaveBlock2Ptr + ldr r0, [r0] + ldrb r0, [r0, 0x8] + cmp r0, 0 + bne _08138B34 + ldr r0, =gStringVar1 + ldr r1, =gText_BigGuy + bl StringCopy + b _08138B3C + .pool +_08138B34: + ldr r0, =gStringVar1 + ldr r1, =gText_BigGirl + bl StringCopy +_08138B3C: + pop {r0} + bx r0 + .pool + thumb_func_end sub_8138B10 + + thumb_func_start sub_8138B48 +sub_8138B48: @ 8138B48 + push {lr} + ldr r0, =gSaveBlock2Ptr + ldr r0, [r0] + ldrb r0, [r0, 0x8] + cmp r0, 0 + bne _08138B6C + ldr r0, =gStringVar1 + ldr r1, =gText_Daughter + bl StringCopy + b _08138B74 + .pool +_08138B6C: + ldr r0, =gStringVar1 + ldr r1, =gText_Son + bl StringCopy +_08138B74: + pop {r0} + bx r0 + .pool + thumb_func_end sub_8138B48 + + thumb_func_start sub_8138B80 +sub_8138B80: @ 8138B80 + ldr r0, =gBattleOutcome + ldrb r0, [r0] + bx lr + .pool + thumb_func_end sub_8138B80 + + thumb_func_start sub_8138B8C +sub_8138B8C: @ 8138B8C + push {lr} + sub sp, 0x4 + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + cmp r0, 0 + beq _08138BB0 + movs r2, 0x1 + negs r2, r2 + movs r0, 0x4 + str r0, [sp] + movs r0, 0x13 + movs r1, 0 + movs r3, 0x6 + bl Overworld_SetWarpDestination + b _08138BC2 + .pool +_08138BB0: + movs r2, 0x1 + negs r2, r2 + movs r0, 0x4 + str r0, [sp] + movs r0, 0x13 + movs r1, 0x1 + movs r3, 0x6 + bl Overworld_SetWarpDestination +_08138BC2: + add sp, 0x4 + pop {r0} + bx r0 + thumb_func_end sub_8138B8C + + thumb_func_start sub_8138BC8 +sub_8138BC8: @ 8138BC8 + push {lr} + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + bl FlagSet + pop {r0} + bx r0 + .pool + thumb_func_end sub_8138BC8 + + thumb_func_start sub_8138BDC +sub_8138BDC: @ 8138BDC + push {lr} + ldr r0, =gLocalTime + movs r1, 0 + ldrsh r0, [r0, r1] + movs r1, 0x7 + bl __divsi3 + lsls r0, 16 + lsrs r0, 16 + ldr r1, =0x0000270f + cmp r0, r1 + bls _08138BF6 + adds r0, r1, 0 +_08138BF6: + pop {r1} + bx r1 + .pool + thumb_func_end sub_8138BDC + + thumb_func_start sub_8138C04 +sub_8138C04: @ 8138C04 + push {r4,lr} + bl GetLeadMonIndex + lsls r0, 24 + lsrs r0, 24 + movs r1, 0x64 + muls r1, r0 + ldr r0, =gPlayerParty + adds r4, r1, r0 + adds r0, r4, 0 + movs r1, 0x20 + bl GetMonData + cmp r0, 0xFF + bne _08138C2C + movs r0, 0x6 + b _08138C7E + .pool +_08138C2C: + adds r0, r4, 0 + movs r1, 0x20 + bl GetMonData + cmp r0, 0xC7 + bls _08138C3C + movs r0, 0x5 + b _08138C7E +_08138C3C: + adds r0, r4, 0 + movs r1, 0x20 + bl GetMonData + cmp r0, 0x95 + bls _08138C4C + movs r0, 0x4 + b _08138C7E +_08138C4C: + adds r0, r4, 0 + movs r1, 0x20 + bl GetMonData + cmp r0, 0x63 + bls _08138C5C + movs r0, 0x3 + b _08138C7E +_08138C5C: + adds r0, r4, 0 + movs r1, 0x20 + bl GetMonData + cmp r0, 0x31 + bls _08138C6C + movs r0, 0x2 + b _08138C7E +_08138C6C: + adds r0, r4, 0 + movs r1, 0x20 + bl GetMonData + cmp r0, 0 + bne _08138C7C + movs r0, 0 + b _08138C7E +_08138C7C: + movs r0, 0x1 +_08138C7E: + pop {r4} + pop {r1} + bx r1 + thumb_func_end sub_8138C04 + + thumb_func_start sub_8138C84 +sub_8138C84: @ 8138C84 + push {lr} + ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + bl sub_817018C + pop {r0} + bx r0 + .pool + thumb_func_end sub_8138C84 + + thumb_func_start sub_8138C94 +sub_8138C94: @ 8138C94 + push {lr} + ldr r0, =sub_8138C84 + bl SetMainCallback2 + pop {r0} + bx r0 + .pool + thumb_func_end sub_8138C94 + + thumb_func_start sp0D9_ComputerRelated +sp0D9_ComputerRelated: @ 8138CA4 + push {r4,lr} + ldr r4, =sub_8138CE8 + adds r0, r4, 0 + bl FuncIsActiveTask + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x1 + beq _08138CD8 + adds r0, r4, 0 + movs r1, 0x8 + bl CreateTask + lsls r0, 24 + lsrs r0, 24 + ldr r2, =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r1, r2 + movs r2, 0 + strh r2, [r1, 0x8] + strh r0, [r1, 0xA] + strh r2, [r1, 0xC] + strh r2, [r1, 0xE] + strh r2, [r1, 0x10] +_08138CD8: + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sp0D9_ComputerRelated + + thumb_func_start sub_8138CE8 +sub_8138CE8: @ 8138CE8 + push {lr} + lsls r0, 24 + lsrs r0, 24 + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + ldr r0, =gTasks + adds r1, r0 + movs r2, 0x8 + ldrsh r0, [r1, r2] + cmp r0, 0 + bne _08138D06 + adds r0, r1, 0 + bl sub_8138D10 +_08138D06: + pop {r0} + bx r0 + .pool + thumb_func_end sub_8138CE8 + + thumb_func_start sub_8138D10 +sub_8138D10: @ 8138D10 + push {r4-r6,lr} + adds r4, r0, 0 + movs r6, 0 + movs r5, 0 + movs r1, 0xE + ldrsh r0, [r4, r1] + cmp r0, 0x6 + bne _08138D7C + strh r5, [r4, 0xE] + bl player_get_direction_lower_nybble + lsls r0, 24 + lsrs r0, 24 + adds r1, r0, 0 + cmp r0, 0x3 + beq _08138D44 + cmp r0, 0x3 + bgt _08138D3A + cmp r0, 0x2 + beq _08138D40 + b _08138D4C +_08138D3A: + cmp r1, 0x4 + beq _08138D48 + b _08138D4C +_08138D40: + movs r6, 0 + b _08138D4A +_08138D44: + movs r6, 0xFF + b _08138D4A +_08138D48: + movs r6, 0x1 +_08138D4A: + movs r5, 0xFF +_08138D4C: + movs r1, 0x10 + ldrsh r0, [r4, r1] + lsls r1, r6, 24 + asrs r1, 24 + lsls r2, r5, 24 + asrs r2, 24 + bl sub_8138D88 + bl DrawWholeMapView + ldrh r0, [r4, 0x10] + movs r1, 0x1 + eors r0, r1 + strh r0, [r4, 0x10] + ldrh r0, [r4, 0xC] + adds r0, 0x1 + strh r0, [r4, 0xC] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0x5 + bne _08138D7C + ldrb r0, [r4, 0xA] + bl DestroyTask +_08138D7C: + ldrh r0, [r4, 0xE] + adds r0, 0x1 + strh r0, [r4, 0xE] + pop {r4-r6} + pop {r0} + bx r0 + thumb_func_end sub_8138D10 + + thumb_func_start sub_8138D88 +sub_8138D88: @ 8138D88 + push {r4,r5,lr} + lsls r1, 24 + lsrs r1, 24 + lsls r2, 24 + lsrs r4, r2, 24 + movs r3, 0 + lsls r0, 16 + cmp r0, 0 + beq _08138DC4 + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + cmp r0, 0 + bne _08138DAC + movs r3, 0x4 + b _08138DE6 + .pool +_08138DAC: + cmp r0, 0x1 + bne _08138DB8 + ldr r3, =0x0000025a + b _08138DE6 + .pool +_08138DB8: + cmp r0, 0x2 + bne _08138DE6 + ldr r3, =0x00000259 + b _08138DE6 + .pool +_08138DC4: + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + cmp r0, 0 + bne _08138DD4 + movs r3, 0x5 + b _08138DE6 + .pool +_08138DD4: + cmp r0, 0x1 + bne _08138DE0 + ldr r3, =0x0000027f + b _08138DE6 + .pool +_08138DE0: + cmp r0, 0x2 + bne _08138DE6 + ldr r3, =0x0000027e +_08138DE6: + ldr r0, =gSaveBlock1Ptr + ldr r2, [r0] + movs r5, 0 + ldrsh r0, [r2, r5] + lsls r1, 24 + asrs r1, 24 + adds r0, r1 + adds r0, 0x7 + movs r5, 0x2 + ldrsh r1, [r2, r5] + lsls r2, r4, 24 + asrs r2, 24 + adds r1, r2 + adds r1, 0x7 + movs r4, 0xC0 + lsls r4, 4 + adds r2, r4, 0 + orrs r3, r2 + adds r2, r3, 0 + bl MapGridSetMetatileIdAt + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8138D88 + + thumb_func_start sub_8138E20 +sub_8138E20: @ 8138E20 + push {lr} + bl sub_8138E2C + pop {r0} + bx r0 + thumb_func_end sub_8138E20 + + thumb_func_start sub_8138E2C +sub_8138E2C: @ 8138E2C + push {r4-r6,lr} + movs r6, 0 + movs r5, 0 + movs r4, 0 + bl player_get_direction_lower_nybble + lsls r0, 24 + lsrs r0, 24 + adds r1, r0, 0 + cmp r0, 0x3 + beq _08138E56 + cmp r0, 0x3 + bgt _08138E4C + cmp r0, 0x2 + beq _08138E52 + b _08138E5E +_08138E4C: + cmp r1, 0x4 + beq _08138E5A + b _08138E5E +_08138E52: + movs r6, 0 + b _08138E5C +_08138E56: + movs r6, 0xFF + b _08138E5C +_08138E5A: + movs r6, 0x1 +_08138E5C: + movs r5, 0xFF +_08138E5E: + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + cmp r0, 0 + bne _08138E70 + movs r4, 0x4 + b _08138E82 + .pool +_08138E70: + cmp r0, 0x1 + bne _08138E7C + ldr r4, =0x0000025a + b _08138E82 + .pool +_08138E7C: + cmp r0, 0x2 + bne _08138E82 + ldr r4, =0x00000259 +_08138E82: + ldr r0, =gSaveBlock1Ptr + ldr r2, [r0] + movs r1, 0 + ldrsh r0, [r2, r1] + lsls r1, r6, 24 + asrs r1, 24 + adds r0, r1 + adds r0, 0x7 + movs r3, 0x2 + ldrsh r1, [r2, r3] + lsls r2, r5, 24 + asrs r2, 24 + adds r1, r2 + adds r1, 0x7 + movs r3, 0xC0 + lsls r3, 4 + adds r2, r3, 0 + orrs r4, r2 + adds r2, r4, 0 + bl MapGridSetMetatileIdAt + bl DrawWholeMapView + pop {r4-r6} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8138E2C + + thumb_func_start sub_8138EC0 +sub_8138EC0: @ 8138EC0 + push {r4,lr} + ldr r4, =sub_8138F04 + adds r0, r4, 0 + bl FuncIsActiveTask + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x1 + beq _08138EF4 + adds r0, r4, 0 + movs r1, 0x8 + bl CreateTask + lsls r0, 24 + lsrs r0, 24 + ldr r2, =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r1, r2 + movs r2, 0 + strh r2, [r1, 0x8] + strh r0, [r1, 0xA] + strh r2, [r1, 0xC] + strh r2, [r1, 0xE] + strh r2, [r1, 0x10] +_08138EF4: + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8138EC0 + + thumb_func_start sub_8138F04 +sub_8138F04: @ 8138F04 + push {lr} + lsls r0, 24 + lsrs r0, 24 + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + ldr r0, =gTasks + adds r1, r0 + movs r2, 0x8 + ldrsh r0, [r1, r2] + cmp r0, 0 + bne _08138F22 + adds r0, r1, 0 + bl sub_8138F2C +_08138F22: + pop {r0} + bx r0 + .pool + thumb_func_end sub_8138F04 + + thumb_func_start sub_8138F2C +sub_8138F2C: @ 8138F2C + push {r4,lr} + adds r4, r0, 0 + movs r1, 0xE + ldrsh r0, [r4, r1] + cmp r0, 0x6 + bne _08138F9A + movs r0, 0 + strh r0, [r4, 0xE] + movs r1, 0x10 + ldrsh r0, [r4, r1] + cmp r0, 0 + beq _08138F64 + ldr r2, =0x00000e9d + movs r0, 0x12 + movs r1, 0x8 + bl MapGridSetMetatileIdAt + ldr r2, =0x00000ea5 + movs r0, 0x12 + movs r1, 0x9 + bl MapGridSetMetatileIdAt + b _08138F7A + .pool +_08138F64: + ldr r2, =0x00000e58 + movs r0, 0x12 + movs r1, 0x8 + bl MapGridSetMetatileIdAt + movs r2, 0xE6 + lsls r2, 4 + movs r0, 0x12 + movs r1, 0x9 + bl MapGridSetMetatileIdAt +_08138F7A: + bl DrawWholeMapView + ldrh r0, [r4, 0x10] + movs r1, 0x1 + eors r0, r1 + strh r0, [r4, 0x10] + ldrh r0, [r4, 0xC] + adds r0, 0x1 + strh r0, [r4, 0xC] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0x5 + bne _08138F9A + ldrb r0, [r4, 0xA] + bl DestroyTask +_08138F9A: + ldrh r0, [r4, 0xE] + adds r0, 0x1 + strh r0, [r4, 0xE] + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8138F2C + + thumb_func_start sub_8138FAC +sub_8138FAC: @ 8138FAC + push {lr} + ldr r2, =0x00000e9d + movs r0, 0x12 + movs r1, 0x8 + bl MapGridSetMetatileIdAt + ldr r2, =0x00000ea5 + movs r0, 0x12 + movs r1, 0x9 + bl MapGridSetMetatileIdAt + bl DrawWholeMapView + pop {r0} + bx r0 + .pool + thumb_func_end sub_8138FAC + + thumb_func_start sub_8138FD4 +sub_8138FD4: @ 8138FD4 + push {lr} + ldr r1, =gSpecialVar_0x8004 + ldr r0, =0x000001f5 + strh r0, [r1] + bl FlagSet + pop {r0} + bx r0 + .pool + thumb_func_end sub_8138FD4 + + thumb_func_start sub_8138FEC +sub_8138FEC: @ 8138FEC + push {lr} + ldr r1, =gSpecialVar_0x8004 + ldr r0, =0x000001f5 + strh r0, [r1] + bl FlagClear + pop {r0} + bx r0 + .pool + thumb_func_end sub_8138FEC + + thumb_func_start sub_8139004 +sub_8139004: @ 8139004 + push {lr} + bl GetLeadMonIndex + lsls r0, 24 + lsrs r0, 24 + movs r1, 0x64 + muls r0, r1 + ldr r1, =gPlayerParty + adds r0, r1 + movs r1, 0x16 + bl GetMonData + cmp r0, 0xC7 + bls _08139028 + movs r0, 0x1 + b _0813902A + .pool +_08139028: + movs r0, 0 +_0813902A: + pop {r1} + bx r1 + thumb_func_end sub_8139004 + + thumb_func_start sub_8139030 +sub_8139030: @ 8139030 + push {lr} + bl GetLeadMonIndex + lsls r0, 24 + lsrs r0, 24 + movs r1, 0x64 + muls r0, r1 + ldr r1, =gPlayerParty + adds r0, r1 + movs r1, 0x17 + bl GetMonData + cmp r0, 0xC7 + bls _08139054 + movs r0, 0x1 + b _08139056 + .pool +_08139054: + movs r0, 0 +_08139056: + pop {r1} + bx r1 + thumb_func_end sub_8139030 + + thumb_func_start sub_813905C +sub_813905C: @ 813905C + push {lr} + bl GetLeadMonIndex + lsls r0, 24 + lsrs r0, 24 + movs r1, 0x64 + muls r0, r1 + ldr r1, =gPlayerParty + adds r0, r1 + movs r1, 0x18 + bl GetMonData + cmp r0, 0xC7 + bls _08139080 + movs r0, 0x1 + b _08139082 + .pool +_08139080: + movs r0, 0 +_08139082: + pop {r1} + bx r1 + thumb_func_end sub_813905C + + thumb_func_start sub_8139088 +sub_8139088: @ 8139088 + push {lr} + bl GetLeadMonIndex + lsls r0, 24 + lsrs r0, 24 + movs r1, 0x64 + muls r0, r1 + ldr r1, =gPlayerParty + adds r0, r1 + movs r1, 0x21 + bl GetMonData + cmp r0, 0xC7 + bls _081390AC + movs r0, 0x1 + b _081390AE + .pool +_081390AC: + movs r0, 0 +_081390AE: + pop {r1} + bx r1 + thumb_func_end sub_8139088 + + thumb_func_start sub_81390B4 +sub_81390B4: @ 81390B4 + push {lr} + bl GetLeadMonIndex + lsls r0, 24 + lsrs r0, 24 + movs r1, 0x64 + muls r0, r1 + ldr r1, =gPlayerParty + adds r0, r1 + movs r1, 0x2F + bl GetMonData + cmp r0, 0xC7 + bls _081390D8 + movs r0, 0x1 + b _081390DA + .pool +_081390D8: + movs r0, 0 +_081390DA: + pop {r1} + bx r1 + thumb_func_end sub_81390B4 + + thumb_func_start sub_81390E0 +sub_81390E0: @ 81390E0 + push {r4-r6,lr} + movs r5, 0 + ldr r6, =gBaseStats +_081390E6: + movs r0, 0x64 + adds r1, r5, 0 + muls r1, r0 + ldr r0, =gPlayerParty + adds r4, r1, r0 + adds r0, r4, 0 + movs r1, 0x5 + bl GetMonData + cmp r0, 0 + beq _0813913C + adds r0, r4, 0 + movs r1, 0x2D + bl GetMonData + cmp r0, 0 + bne _0813913C + adds r0, r4, 0 + movs r1, 0xB + bl GetMonData + lsls r0, 16 + lsrs r0, 16 + lsls r1, r0, 3 + subs r1, r0 + lsls r1, 2 + adds r1, r6 + ldrb r0, [r1, 0x6] + cmp r0, 0xC + beq _08139128 + ldrb r0, [r1, 0x7] + cmp r0, 0xC + bne _0813913C +_08139128: + ldr r1, =gSpecialVar_Result + movs r0, 0x1 + b _0813914A + .pool +_0813913C: + adds r0, r5, 0x1 + lsls r0, 24 + lsrs r5, r0, 24 + cmp r5, 0x5 + bls _081390E6 + ldr r1, =gSpecialVar_Result + movs r0, 0 +_0813914A: + strh r0, [r1] + pop {r4-r6} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81390E0 + + thumb_func_start SpawnScriptFieldObject +SpawnScriptFieldObject: @ 8139158 + push {lr} + sub sp, 0x8 + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + ldrh r3, [r0] + adds r3, 0x7 + lsls r3, 16 + asrs r3, 16 + ldrh r0, [r0, 0x2] + adds r0, 0x7 + lsls r0, 16 + asrs r0, 16 + str r0, [sp] + movs r0, 0x3 + str r0, [sp, 0x4] + movs r0, 0x7 + movs r1, 0x8 + movs r2, 0x7F + bl SpawnSpecialFieldObjectParametrized + lsls r0, 24 + lsrs r0, 24 + ldr r2, =gMapObjects + lsls r1, r0, 3 + adds r1, r0 + lsls r1, 2 + adds r1, r2 + ldrb r0, [r1, 0x1] + movs r2, 0x20 + orrs r0, r2 + strb r0, [r1, 0x1] + ldrb r0, [r1, 0x4] + bl CameraObjectSetFollowedObjectId + add sp, 0x8 + pop {r0} + bx r0 + .pool + thumb_func_end SpawnScriptFieldObject + + thumb_func_start RemoveScriptFieldObject +RemoveScriptFieldObject: @ 81391AC + push {lr} + bl GetPlayerAvatarObjectId + lsls r0, 24 + lsrs r0, 24 + bl CameraObjectSetFollowedObjectId + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + ldrb r1, [r0, 0x5] + ldrb r2, [r0, 0x4] + movs r0, 0x7F + bl RemoveFieldObjectByLocalIdAndMap + pop {r0} + bx r0 + .pool + thumb_func_end RemoveScriptFieldObject + + thumb_func_start sub_81391D0 +sub_81391D0: @ 81391D0 + push {lr} + bl GetLeadMonIndex + lsls r0, 24 + lsrs r0, 24 + movs r1, 0x64 + muls r0, r1 + ldr r1, =gPlayerParty + adds r0, r1 + bl GetNature + lsls r0, 24 + lsrs r0, 24 + ldr r1, =gStringVar1 + bl CopyMonFavoritePokeblockName + lsls r0, 24 + lsrs r0, 24 + pop {r1} + bx r1 + .pool + thumb_func_end sub_81391D0 + + thumb_func_start sub_8139200 +sub_8139200: @ 8139200 + push {r4,lr} + ldr r4, =gStringVar1 + ldr r0, =0x00004026 + bl VarGet + adds r1, r0, 0 + lsls r1, 16 + lsrs r1, 16 + adds r0, r4, 0 + movs r2, 0 + bl GetMapName + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8139200 + + thumb_func_start sub_8139228 +sub_8139228: @ 8139228 + push {lr} + movs r0, 0x20 + bl GetGameStat + lsls r0, 16 + lsrs r0, 16 + pop {r1} + bx r1 + thumb_func_end sub_8139228 + + thumb_func_start sub_8139238 +sub_8139238: @ 8139238 + push {lr} + ldr r0, =gStringVar1 + bl GetEreaderTrainerName + pop {r0} + bx r0 + .pool + thumb_func_end sub_8139238 + + thumb_func_start sub_8139248 +sub_8139248: @ 8139248 + push {r4,r5,lr} + ldr r0, =gSaveBlock1Ptr + ldr r2, [r0] + ldr r1, =0x00002e68 + adds r0, r2, r1 + ldrb r1, [r0] + lsls r1, 25 + ldr r0, =0x00002e6a + adds r2, r0 + lsrs r1, 25 + ldrh r2, [r2] + adds r1, r2 + ldr r2, =gUnknown_085B2B88 + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + adds r0, r2 + ldrb r0, [r0] + adds r5, r1, r0 + movs r0, 0x2 + bl GetPriceReduction + lsls r0, 24 + cmp r0, 0 + bne _08139294 + ldr r4, =gUnknown_085B2B94 + b _08139296 + .pool +_08139294: + ldr r4, =gUnknown_085B2BA0 +_08139296: + adds r0, r5, 0 + movs r1, 0xC + bl __umodsi3 + adds r0, r4 + ldrb r0, [r0] + pop {r4,r5} + pop {r1} + bx r1 + .pool + thumb_func_end sub_8139248 + + thumb_func_start sub_81392AC +sub_81392AC: @ 81392AC + push {lr} + ldr r1, =gSpecialVar_0x8004 + ldr r0, =0x00000213 + strh r0, [r1] + bl FlagGet + lsls r0, 24 + cmp r0, 0 + beq _081392CC + movs r0, 0x1 + b _081392CE + .pool +_081392CC: + movs r0, 0 +_081392CE: + pop {r1} + bx r1 + thumb_func_end sub_81392AC + + thumb_func_start sub_81392D4 +sub_81392D4: @ 81392D4 + push {lr} + ldr r1, =gSpecialVar_0x8004 + movs r0, 0x85 + lsls r0, 2 + strh r0, [r1] + bl FlagGet + lsls r0, 24 + cmp r0, 0 + beq _081392F0 + movs r0, 0x1 + b _081392F2 + .pool +_081392F0: + movs r0, 0 +_081392F2: + pop {r1} + bx r1 + thumb_func_end sub_81392D4 + + thumb_func_start sub_81392F8 +sub_81392F8: @ 81392F8 + push {lr} + ldr r1, =gSpecialVar_0x8004 + ldr r0, =0x00000215 + strh r0, [r1] + bl FlagGet + lsls r0, 24 + cmp r0, 0 + beq _08139318 + movs r0, 0x1 + b _0813931A + .pool +_08139318: + movs r0, 0 +_0813931A: + pop {r1} + bx r1 + thumb_func_end sub_81392F8 + + thumb_func_start sub_8139320 +sub_8139320: @ 8139320 + push {lr} + ldr r1, =gSpecialVar_0x8004 + ldr r0, =0x00000216 + strh r0, [r1] + bl FlagGet + lsls r0, 24 + cmp r0, 0 + beq _08139340 + movs r0, 0x1 + b _08139342 + .pool +_08139340: + movs r0, 0 +_08139342: + pop {r1} + bx r1 + thumb_func_end sub_8139320 + + thumb_func_start sub_8139348 +sub_8139348: @ 8139348 + push {lr} + bl GetLeadMonIndex + lsls r0, 24 + lsrs r0, 24 + movs r1, 0x64 + muls r0, r1 + ldr r1, =gPlayerParty + adds r0, r1 + movs r1, 0x47 + movs r2, 0 + bl GetMonData + lsls r0, 24 + lsrs r0, 24 + pop {r1} + bx r1 + .pool + thumb_func_end sub_8139348 + + thumb_func_start sub_8139370 +sub_8139370: @ 8139370 + push {r4,lr} + sub sp, 0x4 + movs r0, 0x2A + bl IncrementGameStat + ldr r0, =0x0000089b + bl FlagSet + movs r1, 0x1 + mov r0, sp + strb r1, [r0] + bl GetLeadMonIndex + lsls r0, 24 + lsrs r0, 24 + movs r1, 0x64 + muls r1, r0 + ldr r0, =gPlayerParty + adds r4, r1, r0 + adds r0, r4, 0 + movs r1, 0x47 + mov r2, sp + bl SetMonData + adds r0, r4, 0 + bl GetRibbonCount + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x4 + bls _081393B6 + adds r0, r4, 0 + movs r1, 0x47 + bl sub_80EE4DC +_081393B6: + add sp, 0x4 + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8139370 + + thumb_func_start sub_81393C8 +sub_81393C8: @ 81393C8 + push {lr} + bl GetLeadMonIndex + lsls r0, 24 + lsrs r0, 24 + movs r1, 0x64 + muls r0, r1 + ldr r1, =gPlayerParty + adds r0, r1 + bl GetMonEVCount + lsls r0, 16 + ldr r1, =0x01fd0000 + cmp r0, r1 + bhi _081393F4 + movs r0, 0 + b _081393F6 + .pool +_081393F4: + movs r0, 0x1 +_081393F6: + pop {r1} + bx r1 + thumb_func_end sub_81393C8 + + thumb_func_start sub_81393FC +sub_81393FC: @ 81393FC + push {lr} + movs r0, 0xC7 + bl FlagGet + lsls r0, 24 + cmp r0, 0 + bne _08139454 + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + ldrh r1, [r0, 0x4] + movs r0, 0x83 + lsls r0, 3 + cmp r1, r0 + bne _08139454 + subs r0, 0x75 + bl FlagGet + lsls r0, 24 + cmp r0, 0 + beq _08139434 + ldr r0, =0x0000409a + movs r1, 0x4 + b _08139446 + .pool +_08139434: + movs r0, 0xE9 + lsls r0, 2 + bl FlagGet + lsls r0, 24 + cmp r0, 0 + beq _08139454 + ldr r0, =0x0000409a + movs r1, 0x5 +_08139446: + bl VarSet + movs r0, 0x1 + b _08139456 + .pool +_08139454: + movs r0, 0 +_08139456: + pop {r1} + bx r1 + thumb_func_end sub_81393FC + + thumb_func_start SetShoalItemFlag +SetShoalItemFlag: @ 813945C + push {lr} + ldr r0, =0x000008bf + bl FlagSet + pop {r0} + bx r0 + .pool + thumb_func_end SetShoalItemFlag + + thumb_func_start sub_813946C +sub_813946C: @ 813946C + push {r4,r5,lr} + sub sp, 0x14 + ldr r5, =gPlayerParty + movs r1, 0x90 + lsls r1, 1 + movs r4, 0 + str r4, [sp] + str r4, [sp, 0x4] + str r4, [sp, 0x8] + str r4, [sp, 0xC] + adds r0, r5, 0 + movs r2, 0x7 + movs r3, 0x20 + bl CreateMon + movs r1, 0x1 + add r0, sp, 0x10 + strh r1, [r0] + adds r0, r5, 0 + movs r1, 0x2E + add r2, sp, 0x10 + bl SetMonData + add r1, sp, 0x10 + movs r0, 0x21 + strh r0, [r1] + adds r0, r5, 0 + movs r1, 0xD + add r2, sp, 0x10 + bl SetMonData + add r0, sp, 0x10 + strh r4, [r0] + adds r0, r5, 0 + movs r1, 0xE + add r2, sp, 0x10 + bl SetMonData + adds r0, r5, 0 + movs r1, 0xF + add r2, sp, 0x10 + bl SetMonData + adds r0, r5, 0 + movs r1, 0x10 + add r2, sp, 0x10 + bl SetMonData + add sp, 0x14 + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813946C + + thumb_func_start sub_81394D8 +sub_81394D8: @ 81394D8 + push {r4-r6,lr} + ldr r0, =0x00004023 + bl VarGet + lsls r0, 16 + lsrs r0, 16 + bl GetStarterPokemon + lsls r0, 16 + lsrs r6, r0, 16 + bl CalculatePlayerPartyCount + lsls r0, 24 + lsrs r5, r0, 24 + movs r4, 0 + cmp r4, r5 + bcs _08139526 +_081394FA: + movs r0, 0x64 + muls r0, r4 + ldr r1, =gPlayerParty + adds r0, r1 + movs r1, 0x41 + movs r2, 0 + bl GetMonData + cmp r0, r6 + bne _0813951C + movs r0, 0x1 + b _08139528 + .pool +_0813951C: + adds r0, r4, 0x1 + lsls r0, 24 + lsrs r4, r0, 24 + cmp r4, r5 + bcc _081394FA +_08139526: + movs r0, 0 +_08139528: + pop {r4-r6} + pop {r1} + bx r1 + thumb_func_end sub_81394D8 + + thumb_func_start sub_8139530 +sub_8139530: @ 8139530 + push {lr} + bl sub_80D2218 + lsls r0, 24 + lsrs r0, 24 + pop {r1} + bx r1 + thumb_func_end sub_8139530 + + thumb_func_start sub_8139540 +sub_8139540: @ 8139540 + push {lr} + ldr r0, =gPlayerParty + movs r1, 0x3F + bl CheckPartyPokerus + lsls r0, 24 + cmp r0, 0 + beq _08139558 + movs r0, 0x1 + b _0813955A + .pool +_08139558: + movs r0, 0 +_0813955A: + pop {r1} + bx r1 + thumb_func_end sub_8139540 + + thumb_func_start sub_8139560 +sub_8139560: @ 8139560 + push {lr} + ldr r0, =sub_81395BC + movs r1, 0x9 + bl CreateTask + lsls r0, 24 + lsrs r0, 24 + ldr r2, =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r1, r2 + ldr r0, =gSpecialVar_0x8005 + ldrh r0, [r0] + movs r2, 0 + strh r0, [r1, 0x8] + strh r2, [r1, 0xA] + ldr r0, =gSpecialVar_0x8006 + ldrh r0, [r0] + strh r0, [r1, 0xC] + ldr r0, =gSpecialVar_0x8007 + ldrh r0, [r0] + strh r0, [r1, 0xE] + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + strh r0, [r1, 0x10] + movs r0, 0 + bl SetCameraPanningCallback + movs r0, 0xD6 + bl PlaySE + pop {r0} + bx r0 + .pool + thumb_func_end sub_8139560 + + thumb_func_start sub_81395BC +sub_81395BC: @ 81395BC + push {r4,r5,lr} + lsls r0, 24 + lsrs r5, r0, 24 + lsls r0, r5, 2 + adds r0, r5 + lsls r0, 3 + ldr r1, =gTasks + 0x8 + adds r4, r0, r1 + ldrh r0, [r4, 0x2] + adds r0, 0x1 + strh r0, [r4, 0x2] + movs r1, 0x2 + ldrsh r0, [r4, r1] + movs r2, 0x6 + ldrsh r1, [r4, r2] + bl __modsi3 + cmp r0, 0 + bne _08139614 + strh r0, [r4, 0x2] + ldrh r0, [r4, 0x4] + subs r0, 0x1 + strh r0, [r4, 0x4] + ldrh r0, [r4] + negs r0, r0 + strh r0, [r4] + ldrh r0, [r4, 0x8] + negs r0, r0 + strh r0, [r4, 0x8] + movs r1, 0 + ldrsh r0, [r4, r1] + movs r2, 0x8 + ldrsh r1, [r4, r2] + bl SetCameraPanning + movs r1, 0x4 + ldrsh r0, [r4, r1] + cmp r0, 0 + bne _08139614 + adds r0, r5, 0 + bl sub_8139620 + bl InstallCameraPanAheadCallback +_08139614: + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81395BC + + thumb_func_start sub_8139620 +sub_8139620: @ 8139620 + push {lr} + lsls r0, 24 + lsrs r0, 24 + bl DestroyTask + bl EnableBothScriptContexts + pop {r0} + bx r0 + thumb_func_end sub_8139620 + + thumb_func_start sub_8139634 +sub_8139634: @ 8139634 + push {lr} + movs r0, 0x95 + lsls r0, 2 + bl FlagGet + lsls r0, 24 + lsrs r0, 24 + pop {r1} + bx r1 + thumb_func_end sub_8139634 + + thumb_func_start sub_8139648 +sub_8139648: @ 8139648 + push {lr} + bl get_map_light_from_warp0 + lsls r0, 24 + lsrs r0, 24 + bl is_light_level_1_2_3_5_or_6 + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x1 + beq _08139664 + movs r0, 0x14 + bl SetSav1Weather +_08139664: + pop {r0} + bx r0 + thumb_func_end sub_8139648 + + thumb_func_start sub_8139668 +sub_8139668: @ 8139668 + push {lr} + bl get_map_light_from_warp0 + lsls r0, 24 + lsrs r0, 24 + bl is_light_level_1_2_3_5_or_6 + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x1 + beq _08139684 + movs r0, 0x15 + bl SetSav1Weather +_08139684: + pop {r0} + bx r0 + thumb_func_end sub_8139668 + + thumb_func_start GetLeadMonIndex +GetLeadMonIndex: @ 8139688 + push {r4-r6,lr} + bl CalculatePlayerPartyCount + lsls r0, 24 + lsrs r6, r0, 24 + movs r5, 0 + cmp r5, r6 + bcs _081396D6 +_08139698: + movs r0, 0x64 + adds r1, r5, 0 + muls r1, r0 + ldr r0, =gPlayerParty + adds r4, r1, r0 + adds r0, r4, 0 + movs r1, 0x41 + movs r2, 0 + bl GetMonData + movs r1, 0xCE + lsls r1, 1 + cmp r0, r1 + beq _081396CC + adds r0, r4, 0 + movs r1, 0x41 + movs r2, 0 + bl GetMonData + cmp r0, 0 + beq _081396CC + adds r0, r5, 0 + b _081396D8 + .pool +_081396CC: + adds r0, r5, 0x1 + lsls r0, 24 + lsrs r5, r0, 24 + cmp r5, r6 + bcc _08139698 +_081396D6: + movs r0, 0 +_081396D8: + pop {r4-r6} + pop {r1} + bx r1 + thumb_func_end GetLeadMonIndex + + thumb_func_start sub_81396E0 +sub_81396E0: @ 81396E0 + push {lr} + ldr r0, =gSpecialVar_0x8004 + ldrh r1, [r0] + movs r0, 0x64 + muls r0, r1 + ldr r1, =gPlayerParty + adds r0, r1 + movs r1, 0x41 + movs r2, 0 + bl GetMonData + lsls r0, 16 + lsrs r0, 16 + pop {r1} + bx r1 + .pool + thumb_func_end sub_81396E0 + + thumb_func_start nullsub_54 +nullsub_54: @ 8139708 + bx lr + thumb_func_end nullsub_54 + + thumb_func_start sub_813970C +sub_813970C: @ 813970C + push {r4,lr} + ldr r0, =0x000040c2 + bl VarGet + lsls r0, 16 + lsrs r0, 16 + adds r3, r0, 0 + ldr r2, =gLocalTime + movs r1, 0 + ldrsh r0, [r2, r1] + subs r0, r3 + cmp r0, 0x6 + ble _08139734 + movs r0, 0 + b _0813974C + .pool +_08139734: + ldrh r1, [r2] + movs r4, 0 + ldrsh r0, [r2, r4] + cmp r0, 0 + blt _0813974A + subs r1, r3 + movs r0, 0x7 + subs r0, r1 + lsls r0, 16 + lsrs r0, 16 + b _0813974C +_0813974A: + movs r0, 0x8 +_0813974C: + pop {r4} + pop {r1} + bx r1 + thumb_func_end sub_813970C + + thumb_func_start sub_8139754 +sub_8139754: @ 8139754 + push {r4,lr} + ldr r0, =0x000040c2 + ldr r4, =gLocalTime + ldrh r1, [r4] + bl VarSet + ldrh r0, [r4] + pop {r4} + pop {r1} + bx r1 + .pool + thumb_func_end sub_8139754 + + thumb_func_start sub_8139770 +sub_8139770: @ 8139770 + push {r4-r6,lr} + ldr r6, =gSpecialVar_0x8004 + ldrh r0, [r6] + movs r5, 0x64 + muls r0, r5 + ldr r4, =gPlayerParty + adds r0, r4 + movs r1, 0x3 + bl GetMonData + cmp r0, 0x2 + bne _081397A6 + ldrh r0, [r6] + muls r0, r5 + adds r0, r4 + ldr r4, =gStringVar1 + movs r1, 0x7 + adds r2, r4, 0 + bl GetMonData + ldr r0, =gSaveBlock2Ptr + ldr r0, [r0] + adds r1, r4, 0 + bl StringCompare + cmp r0, 0 + beq _081397BC +_081397A6: + movs r0, 0x1 + b _081397BE + .pool +_081397BC: + movs r0, 0 +_081397BE: + pop {r4-r6} + pop {r1} + bx r1 + thumb_func_end sub_8139770 + + thumb_func_start sub_81397C4 +sub_81397C4: @ 81397C4 + push {r4,r5,lr} + ldr r2, =gSpecialVar_Result + ldrh r1, [r2] + ldr r0, =0x0000270f + cmp r1, r0 + bls _081397E0 + movs r0, 0 + bl TV_PrintIntToStringVar + b _08139862 + .pool +_081397E0: + ldr r0, =0x000003e7 + cmp r1, r0 + bls _081397F8 + ldr r4, =gStringVar1 + movs r0, 0xA1 + strb r0, [r4] + adds r4, 0x1 + b _0813981C + .pool +_081397F8: + cmp r1, 0x63 + bls _0813980C + ldr r4, =gStringVar1 + movs r0, 0xA1 + strb r0, [r4] + strb r0, [r4, 0x1] + adds r4, 0x2 + b _0813981C + .pool +_0813980C: + cmp r1, 0x9 + bls _0813983C + ldr r4, =gStringVar1 + movs r0, 0xA1 + strb r0, [r4] + strb r0, [r4, 0x1] + strb r0, [r4, 0x2] + adds r4, 0x3 +_0813981C: + ldrh r5, [r2] + adds r0, r5, 0 + bl sub_80EF370 + adds r3, r0, 0 + lsls r3, 24 + lsrs r3, 24 + adds r0, r4, 0 + adds r1, r5, 0 + movs r2, 0 + bl ConvertIntToDecimalStringN + b _08139862 + .pool +_0813983C: + ldr r4, =gStringVar1 + movs r0, 0xA1 + strb r0, [r4] + strb r0, [r4, 0x1] + strb r0, [r4, 0x2] + strb r0, [r4, 0x3] + adds r4, 0x4 + ldrh r5, [r2] + adds r0, r5, 0 + bl sub_80EF370 + adds r3, r0, 0 + lsls r3, 24 + lsrs r3, 24 + adds r0, r4, 0 + adds r1, r5, 0 + movs r2, 0 + bl ConvertIntToDecimalStringN +_08139862: + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_81397C4 + + thumb_func_start sub_813986C +sub_813986C: @ 813986C + push {lr} + ldr r0, =gSpecialVar_Result + ldrh r0, [r0] + cmp r0, 0x4 + bhi _081398B8 + lsls r0, 2 + ldr r1, =_08139888 + adds r0, r1 + ldr r0, [r0] + mov pc, r0 + .pool + .align 2, 0 +_08139888: + .4byte _0813989C + .4byte _081398A0 + .4byte _081398A4 + .4byte _081398A8 + .4byte _081398AC +_0813989C: + movs r0, 0x3 + b _081398AE +_081398A0: + movs r0, 0x4 + b _081398AE +_081398A4: + movs r0, 0 + b _081398AE +_081398A8: + movs r0, 0x1 + b _081398AE +_081398AC: + movs r0, 0x2 +_081398AE: + bl mevent_081445C0 + lsls r0, 16 + lsrs r0, 16 + b _081398BA +_081398B8: + movs r0, 0 +_081398BA: + pop {r1} + bx r1 + thumb_func_end sub_813986C + + thumb_func_start sub_81398C0 +sub_81398C0: @ 81398C0 + push {r4,lr} + ldr r1, =gSpecialVar_0x8004 + ldr r2, =0xfffffedf + adds r0, r2, 0 + ldrh r2, [r1] + adds r0, r2 + lsls r0, 16 + lsrs r0, 16 + cmp r0, 0x39 + bls _081398E0 + movs r0, 0 + b _081398FC + .pool +_081398E0: + ldr r4, =gStringVar2 + ldrh r0, [r1] + bl ItemIdToBattleMoveId + lsls r0, 16 + lsrs r0, 16 + movs r1, 0xD + muls r1, r0 + ldr r0, =gMoveNames + adds r1, r0 + adds r0, r4, 0 + bl StringCopy + movs r0, 0x1 +_081398FC: + pop {r4} + pop {r1} + bx r1 + .pool + thumb_func_end sub_81398C0 + + thumb_func_start sub_813990C +sub_813990C: @ 813990C + push {r4,r5,lr} + bl CalculatePlayerPartyCount + lsls r0, 24 + lsrs r5, r0, 24 + movs r4, 0 + cmp r4, r5 + bcs _08139942 +_0813991C: + movs r0, 0x64 + muls r0, r4 + ldr r1, =gPlayerParty + adds r0, r1 + movs r1, 0x4 + bl GetMonData + cmp r0, 0x1 + bne _08139938 + movs r0, 0x1 + b _08139944 + .pool +_08139938: + adds r0, r4, 0x1 + lsls r0, 24 + lsrs r4, r0, 24 + cmp r4, r5 + bcc _0813991C +_08139942: + movs r0, 0 +_08139944: + pop {r4,r5} + pop {r1} + bx r1 + thumb_func_end sub_813990C + + thumb_func_start InMultiBattleRoom +InMultiBattleRoom: @ 813994C + push {lr} + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + ldrh r1, [r0, 0x4] + ldr r0, =0x00000f1a + cmp r1, r0 + bne _08139978 + ldr r0, =0x000040ce + bl VarGet + lsls r0, 16 + lsrs r0, 16 + cmp r0, 0x2 + bne _08139978 + movs r0, 0x1 + b _0813997A + .pool +_08139978: + movs r0, 0 +_0813997A: + pop {r1} + bx r1 + thumb_func_end InMultiBattleRoom + + thumb_func_start sub_8139980 +sub_8139980: @ 8139980 + push {lr} + movs r0, 0 + bl SetCameraPanningCallback + movs r0, 0x8 + movs r1, 0 + bl SetCameraPanning + pop {r0} + bx r0 + thumb_func_end sub_8139980 + + thumb_func_start sub_8139994 +sub_8139994: @ 8139994 + push {lr} + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + ldrb r0, [r0, 0x15] + subs r0, 0x10 + lsls r0, 24 + asrs r0, 24 + cmp r0, 0x5 + bhi _081399E4 + lsls r0, 2 + ldr r1, =_081399B8 + adds r0, r1 + ldr r0, [r0] + mov pc, r0 + .pool + .align 2, 0 +_081399B8: + .4byte _081399E4 + .4byte _081399D0 + .4byte _081399D4 + .4byte _081399D8 + .4byte _081399DC + .4byte _081399E0 +_081399D0: + movs r1, 0x5 + b _081399E6 +_081399D4: + movs r1, 0x6 + b _081399E6 +_081399D8: + movs r1, 0x7 + b _081399E6 +_081399DC: + movs r1, 0x8 + b _081399E6 +_081399E0: + movs r1, 0xF + b _081399E6 +_081399E4: + movs r1, 0x4 +_081399E6: + ldr r0, =0x00004043 + bl VarSet + pop {r0} + bx r0 + .pool + thumb_func_end sub_8139994 + + thumb_func_start sub_81399F4 +sub_81399F4: @ 81399F4 + push {r4,lr} + ldr r2, =gUnknown_0203AB60 + movs r0, 0 + strh r0, [r2] + ldr r1, =gUnknown_0203AB62 + strh r0, [r1] + ldr r0, =gSaveBlock1Ptr + ldr r3, [r0] + movs r0, 0x14 + ldrsb r0, [r3, r0] + adds r4, r1, 0 + cmp r0, 0xD + bne _08139A6E + ldrb r0, [r3, 0x15] + subs r0, 0x10 + lsls r0, 24 + asrs r0, 24 + cmp r0, 0x4 + bhi _08139A6E + lsls r0, 2 + ldr r1, =_08139A34 + adds r0, r1 + ldr r0, [r0] + mov pc, r0 + .pool + .align 2, 0 +_08139A34: + .4byte _08139A66 + .4byte _08139A5E + .4byte _08139A56 + .4byte _08139A4E + .4byte _08139A48 +_08139A48: + movs r0, 0 + strh r0, [r2] + b _08139A6C +_08139A4E: + movs r0, 0 + strh r0, [r2] + movs r0, 0x1 + b _08139A6C +_08139A56: + movs r0, 0 + strh r0, [r2] + movs r0, 0x2 + b _08139A6C +_08139A5E: + movs r0, 0 + strh r0, [r2] + movs r0, 0x3 + b _08139A6C +_08139A66: + movs r0, 0 + strh r0, [r2] + movs r0, 0x4 +_08139A6C: + strh r0, [r4] +_08139A6E: + ldrh r0, [r4] + pop {r4} + pop {r1} + bx r1 + thumb_func_end sub_81399F4 + + thumb_func_start sub_8139A78 +sub_8139A78: @ 8139A78 + push {r4-r6,lr} + ldr r0, =sub_8139AF4 + movs r1, 0x9 + bl CreateTask + lsls r0, 24 + lsrs r0, 24 + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + ldr r0, =gTasks + 0x8 + adds r4, r1, r0 + movs r3, 0 + strh r3, [r4, 0x2] + strh r3, [r4, 0x4] + movs r6, 0x1 + strh r6, [r4, 0x8] + ldr r0, =gSpecialVar_0x8005 + ldr r1, =gSpecialVar_0x8006 + ldrh r2, [r0] + ldrh r0, [r1] + cmp r2, r0 + bls _08139AC0 + subs r0, r2, r0 + lsls r0, 16 + lsrs r5, r0, 16 + strh r6, [r4, 0xC] + b _08139AC8 + .pool +_08139AC0: + subs r0, r2 + lsls r0, 16 + lsrs r5, r0, 16 + strh r3, [r4, 0xC] +_08139AC8: + cmp r5, 0x8 + bls _08139ACE + movs r5, 0x8 +_08139ACE: + ldr r0, =gUnknown_085B2C18 + adds r0, r5, r0 + ldrb r0, [r0] + strh r0, [r4, 0xA] + movs r0, 0 + bl SetCameraPanningCallback + ldrb r1, [r4, 0xC] + adds r0, r5, 0 + bl sub_8139C2C + movs r0, 0x59 + bl PlaySE + pop {r4-r6} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8139A78 + + thumb_func_start sub_8139AF4 +sub_8139AF4: @ 8139AF4 + push {r4,r5,lr} + lsls r0, 24 + lsrs r5, r0, 24 + lsls r0, r5, 2 + adds r0, r5 + lsls r0, 3 + ldr r1, =gTasks + 0x8 + adds r4, r0, r1 + ldrh r0, [r4, 0x2] + adds r0, 0x1 + strh r0, [r4, 0x2] + movs r1, 0x2 + ldrsh r0, [r4, r1] + movs r1, 0x3 + bl __modsi3 + lsls r0, 16 + asrs r0, 16 + cmp r0, 0 + bne _08139B54 + strh r0, [r4, 0x2] + ldrh r0, [r4, 0x4] + adds r0, 0x1 + strh r0, [r4, 0x4] + ldrh r0, [r4, 0x8] + negs r0, r0 + strh r0, [r4, 0x8] + movs r2, 0x8 + ldrsh r1, [r4, r2] + movs r0, 0 + bl SetCameraPanning + movs r0, 0x4 + ldrsh r1, [r4, r0] + movs r2, 0xA + ldrsh r0, [r4, r2] + cmp r1, r0 + bne _08139B54 + movs r0, 0x49 + bl PlaySE + adds r0, r5, 0 + bl DestroyTask + bl EnableBothScriptContexts + bl InstallCameraPanAheadCallback +_08139B54: + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8139AF4 + + thumb_func_start sub_8139B60 +sub_8139B60: @ 8139B60 + push {r4-r6,lr} + mov r6, r9 + mov r5, r8 + push {r5,r6} + sub sp, 0xC + ldr r5, =gUnknown_0203AB5E + ldr r0, =gUnknown_085B2BAC + bl AddWindow + strb r0, [r5] + ldrb r0, [r5] + movs r1, 0 + bl SetStandardWindowBorderStyle + ldr r4, =gText_ElevatorNowOn + movs r0, 0x1 + adds r1, r4, 0 + movs r2, 0x40 + bl GetStringCenterAlignXOffset + adds r3, r0, 0 + ldrb r0, [r5] + lsls r3, 24 + lsrs r3, 24 + movs r1, 0x1 + str r1, [sp] + movs r1, 0xFF + mov r9, r1 + str r1, [sp, 0x4] + movs r1, 0 + mov r8, r1 + str r1, [sp, 0x8] + movs r1, 0x1 + adds r2, r4, 0 + bl PrintTextOnWindow + ldr r6, =gUnknown_085B2BB4 + ldr r4, =gSpecialVar_0x8005 + ldrh r0, [r4] + lsls r0, 2 + adds r0, r6 + ldr r1, [r0] + movs r0, 0x1 + movs r2, 0x40 + bl GetStringCenterAlignXOffset + adds r3, r0, 0 + ldrb r0, [r5] + ldrh r1, [r4] + lsls r1, 2 + adds r1, r6 + ldr r2, [r1] + lsls r3, 24 + lsrs r3, 24 + movs r1, 0x11 + str r1, [sp] + mov r1, r9 + str r1, [sp, 0x4] + mov r1, r8 + str r1, [sp, 0x8] + movs r1, 0x1 + bl PrintTextOnWindow + ldrb r0, [r5] + bl PutWindowTilemap + ldrb r0, [r5] + movs r1, 0x3 + bl CopyWindowToVram + add sp, 0xC + pop {r3,r4} + mov r8, r3 + mov r9, r4 + pop {r4-r6} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8139B60 + + thumb_func_start sub_8139C10 +sub_8139C10: @ 8139C10 + push {r4,lr} + ldr r4, =gUnknown_0203AB5E + ldrb r0, [r4] + movs r1, 0x1 + bl sub_8198070 + ldrb r0, [r4] + bl RemoveWindow + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8139C10 + + thumb_func_start sub_8139C2C +sub_8139C2C: @ 8139C2C + push {r4-r6,lr} + lsls r0, 16 + lsrs r6, r0, 16 + lsls r1, 24 + lsrs r5, r1, 24 + ldr r4, =sub_8139C80 + adds r0, r4, 0 + bl FuncIsActiveTask + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x1 + beq _08139C6C + adds r0, r4, 0 + movs r1, 0x8 + bl CreateTask + lsls r0, 24 + lsrs r0, 24 + ldr r2, =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r1, r2 + movs r0, 0 + strh r0, [r1, 0x8] + strh r0, [r1, 0xA] + strh r5, [r1, 0xC] + ldr r0, =gUnknown_085B2C21 + adds r0, r6, r0 + ldrb r0, [r0] + strh r0, [r1, 0xE] +_08139C6C: + pop {r4-r6} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8139C2C + + thumb_func_start sub_8139C80 +sub_8139C80: @ 8139C80 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + sub sp, 0x4 + lsls r0, 24 + lsrs r0, 24 + str r0, [sp] + lsls r0, 2 + ldr r1, [sp] + adds r0, r1 + lsls r0, 3 + ldr r1, =gTasks + 0x8 + adds r6, r0, r1 + movs r2, 0x2 + ldrsh r0, [r6, r2] + cmp r0, 0x6 + bne _08139D7C + ldrh r0, [r6] + adds r0, 0x1 + strh r0, [r6] + movs r1, 0x4 + ldrsh r0, [r6, r1] + cmp r0, 0 + bne _08139D10 + movs r1, 0 + ldr r2, =gUnknown_085B2BF4 + mov r10, r2 +_08139CBA: + movs r5, 0 + adds r7, r1, 0x7 + lsls r0, r1, 1 + adds r2, r1, 0x1 + mov r8, r2 + adds r0, r1 + lsls r0, 1 + mov r9, r0 +_08139CCA: + adds r4, r5, 0 + adds r4, 0x8 + movs r1, 0 + ldrsh r0, [r6, r1] + movs r1, 0x3 + bl __modsi3 + lsls r0, 16 + asrs r0, 15 + add r0, r9 + add r0, r10 + ldrh r0, [r0] + movs r1, 0xC0 + lsls r1, 4 + adds r2, r1, 0 + orrs r2, r0 + adds r0, r4, 0 + adds r1, r7, 0 + bl MapGridSetMetatileIdAt + adds r0, r5, 0x1 + lsls r0, 24 + lsrs r5, r0, 24 + cmp r5, 0x2 + bls _08139CCA + mov r2, r8 + lsls r0, r2, 24 + lsrs r1, r0, 24 + cmp r1, 0x2 + bls _08139CBA + b _08139D62 + .pool +_08139D10: + movs r1, 0 + ldr r0, =gUnknown_085B2C06 + mov r10, r0 +_08139D16: + movs r5, 0 + adds r7, r1, 0x7 + lsls r0, r1, 1 + adds r2, r1, 0x1 + mov r8, r2 + adds r0, r1 + lsls r0, 1 + mov r9, r0 +_08139D26: + adds r4, r5, 0 + adds r4, 0x8 + movs r1, 0 + ldrsh r0, [r6, r1] + movs r1, 0x3 + bl __modsi3 + lsls r0, 16 + asrs r0, 15 + add r0, r9 + add r0, r10 + ldrh r0, [r0] + movs r1, 0xC0 + lsls r1, 4 + adds r2, r1, 0 + orrs r2, r0 + adds r0, r4, 0 + adds r1, r7, 0 + bl MapGridSetMetatileIdAt + adds r0, r5, 0x1 + lsls r0, 24 + lsrs r5, r0, 24 + cmp r5, 0x2 + bls _08139D26 + mov r2, r8 + lsls r0, r2, 24 + lsrs r1, r0, 24 + cmp r1, 0x2 + bls _08139D16 +_08139D62: + bl DrawWholeMapView + movs r0, 0 + strh r0, [r6, 0x2] + movs r0, 0 + ldrsh r1, [r6, r0] + movs r2, 0x6 + ldrsh r0, [r6, r2] + cmp r1, r0 + bne _08139D7C + ldr r0, [sp] + bl DestroyTask +_08139D7C: + ldrh r0, [r6, 0x2] + adds r0, 0x1 + strh r0, [r6, 0x2] + add sp, 0x4 + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8139C80 + + thumb_func_start sub_8139D98 +sub_8139D98: @ 8139D98 + push {r4-r7,lr} + sub sp, 0x18 + ldr r6, =gSpecialVar_0x8004 + ldrh r0, [r6] + movs r5, 0x64 + muls r0, r5 + ldr r4, =gPlayerParty + adds r0, r4 + movs r1, 0x27 + bl GetMonData + str r0, [sp] + ldrh r0, [r6] + muls r0, r5 + adds r0, r4 + movs r1, 0x28 + bl GetMonData + str r0, [sp, 0x4] + ldrh r0, [r6] + muls r0, r5 + adds r0, r4 + movs r1, 0x29 + bl GetMonData + str r0, [sp, 0x8] + ldrh r0, [r6] + muls r0, r5 + adds r0, r4 + movs r1, 0x2A + bl GetMonData + str r0, [sp, 0xC] + ldrh r0, [r6] + muls r0, r5 + adds r0, r4 + movs r1, 0x2B + bl GetMonData + str r0, [sp, 0x10] + ldrh r0, [r6] + muls r0, r5 + adds r0, r4 + movs r1, 0x2C + bl GetMonData + str r0, [sp, 0x14] + ldr r1, =gSpecialVar_0x8005 + movs r0, 0 + strh r0, [r1] + movs r4, 0 + adds r2, r1, 0 +_08139E00: + lsls r0, r4, 2 + add r0, sp + ldr r1, [r0] + ldrh r0, [r2] + adds r0, r1 + strh r0, [r2] + adds r0, r4, 0x1 + lsls r0, 24 + lsrs r4, r0, 24 + cmp r4, 0x5 + bls _08139E00 + ldr r2, =gSpecialVar_0x8006 + movs r0, 0 + strh r0, [r2] + ldr r1, =gSpecialVar_0x8007 + ldr r0, [sp] + strh r0, [r1] + movs r4, 0x1 + adds r6, r2, 0 + adds r7, r1, 0 +_08139E28: + ldrh r0, [r6] + lsls r0, 2 + mov r2, sp + adds r1, r2, r0 + lsls r0, r4, 2 + adds r5, r2, r0 + ldr r1, [r1] + ldr r0, [r5] + cmp r1, r0 + bcs _08139E54 + strh r4, [r6] + b _08139E6C + .pool +_08139E54: + cmp r1, r0 + bne _08139E6E + bl Random + lsls r0, 16 + lsrs r0, 16 + movs r1, 0x1 + ands r0, r1 + cmp r0, 0 + beq _08139E6E + strh r4, [r6] + ldr r0, [r5] +_08139E6C: + strh r0, [r7] +_08139E6E: + adds r0, r4, 0x1 + lsls r0, 24 + lsrs r4, r0, 24 + cmp r4, 0x5 + bls _08139E28 + add sp, 0x18 + pop {r4-r7} + pop {r0} + bx r0 + thumb_func_end sub_8139D98 + + thumb_func_start warp0_in_pokecenter +warp0_in_pokecenter: @ 8139E80 + push {r4,lr} + ldr r0, =gUnknown_020322DC + movs r1, 0 + ldrsb r1, [r0, r1] + lsls r1, 8 + ldrb r0, [r0, 0x1] + lsls r0, 24 + asrs r0, 24 + adds r0, r1 + lsls r0, 16 + lsrs r3, r0, 16 + ldr r2, =gUnknown_085B2C2A + ldrh r0, [r2] + ldr r1, =0x0000ffff + cmp r0, r1 + beq _08139EC6 + adds r4, r1, 0 + adds r1, r2, 0 +_08139EA4: + ldrh r0, [r2] + cmp r0, r3 + bne _08139EBC + movs r0, 0x1 + b _08139EC8 + .pool +_08139EBC: + adds r1, 0x2 + adds r2, 0x2 + ldrh r0, [r1] + cmp r0, r4 + bne _08139EA4 +_08139EC6: + movs r0, 0 +_08139EC8: + pop {r4} + pop {r1} + bx r1 + thumb_func_end warp0_in_pokecenter + + thumb_func_start sub_8139ED0 +sub_8139ED0: @ 8139ED0 + push {lr} + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + ldrh r1, [r0, 0x4] + ldr r0, =0x00003c1a + cmp r1, r0 + beq _08139EEC + movs r0, 0x1 + b _08139EEE + .pool +_08139EEC: + movs r0, 0 +_08139EEE: + pop {r1} + bx r1 + thumb_func_end sub_8139ED0 + + thumb_func_start UpdateFrontierManiac +UpdateFrontierManiac: @ 8139EF4 + push {r4,r5,lr} + adds r4, r0, 0 + lsls r4, 16 + lsrs r4, 16 + ldr r0, =0x0000402f + bl GetVarPointer + adds r5, r0, 0 + ldrh r0, [r5] + adds r4, r0 + strh r4, [r5] + ldrh r0, [r5] + movs r1, 0xA + bl __umodsi3 + strh r0, [r5] + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end UpdateFrontierManiac + + thumb_func_start sub_8139F20 +sub_8139F20: @ 8139F20 + push {r4-r7,lr} + movs r4, 0 + ldr r0, =0x0000402f + bl VarGet + lsls r0, 16 + lsrs r6, r0, 16 + cmp r6, 0x9 + bls _08139F34 + b _0813A03A +_08139F34: + lsls r0, r6, 2 + ldr r1, =_08139F48 + adds r1, r0, r1 + ldr r1, [r1] + adds r2, r0, 0 + mov pc, r1 + .pool + .align 2, 0 +_08139F48: + .4byte _08139F70 + .4byte _08139F70 + .4byte _08139F70 + .4byte _08139F70 + .4byte _08139F94 + .4byte _08139FB4 + .4byte _08139FCC + .4byte _08139FE4 + .4byte _08139FFC + .4byte _0813A014 +_08139F70: + ldr r0, =gSaveBlock2Ptr + ldr r0, [r0] + movs r3, 0xCE + lsls r3, 4 + adds r1, r0, r3 + adds r3, r1, r2 + ldr r1, =0x00000ce2 + adds r0, r1 + adds r1, r0, r2 + ldrh r0, [r3] + ldrh r2, [r1] + cmp r0, r2 + bcs _0813A028 + b _0813A038 + .pool +_08139F94: + ldr r0, =gSaveBlock2Ptr + ldr r0, [r0] + ldr r3, =0x00000d0c + adds r2, r0, r3 + adds r3, 0x2 +_08139F9E: + adds r1, r0, r3 + ldrh r0, [r2] + ldrh r3, [r1] + cmp r0, r3 + bcs _0813A028 + b _0813A038 + .pool +_08139FB4: + ldr r0, =gSaveBlock2Ptr + ldr r0, [r0] + ldr r1, =0x00000de2 + adds r2, r0, r1 + ldr r3, =0x00000de4 + b _08139F9E + .pool +_08139FCC: + ldr r0, =gSaveBlock2Ptr + ldr r0, [r0] + ldr r1, =0x00000dc8 + adds r2, r0, r1 + ldr r3, =0x00000dca + b _08139F9E + .pool +_08139FE4: + ldr r0, =gSaveBlock2Ptr + ldr r0, [r0] + ldr r1, =0x00000dda + adds r2, r0, r1 + ldr r3, =0x00000ddc + b _08139F9E + .pool +_08139FFC: + ldr r0, =gSaveBlock2Ptr + ldr r0, [r0] + ldr r1, =0x00000e04 + adds r2, r0, r1 + ldr r3, =0x00000e06 + b _08139F9E + .pool +_0813A014: + ldr r0, =gSaveBlock2Ptr + ldr r0, [r0] + ldr r1, =0x00000e1a + adds r2, r0, r1 + ldr r3, =0x00000e1c + adds r1, r0, r3 + ldrh r0, [r2] + ldrh r3, [r1] + cmp r0, r3 + bcc _0813A038 +_0813A028: + adds r4, r0, 0 + b _0813A03A + .pool +_0813A038: + ldrh r4, [r1] +_0813A03A: + movs r2, 0 + ldr r5, =gUnknown_085B2CC8 + lsls r0, r6, 1 + adds r1, r0, r5 + ldrb r1, [r1] + adds r3, r0, 0 + ldr r7, =gUnknown_085B2C50 + cmp r1, r4 + bcs _0813A062 + adds r1, r3, 0 +_0813A04E: + adds r0, r2, 0x1 + lsls r0, 24 + lsrs r2, r0, 24 + cmp r2, 0x1 + bhi _0813A062 + adds r0, r2, r1 + adds r0, r5 + ldrb r0, [r0] + cmp r0, r4 + bcc _0813A04E +_0813A062: + adds r0, r3, r6 + adds r0, r2 + lsls r0, 2 + adds r0, r7 + ldr r0, [r0] + bl ShowFieldMessage + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_8139F20 + + thumb_func_start sub_813A080 +sub_813A080: @ 813A080 + push {r4-r7,lr} + ldr r0, =0x000040ce + bl VarGet + lsls r0, 16 + lsrs r5, r0, 16 + ldr r0, =gSaveBlock2Ptr + ldr r0, [r0] + ldr r1, =0x00000ca9 + adds r0, r1 + ldrb r0, [r0] + lsls r0, 30 + lsrs r4, r0, 30 + cmp r5, 0x2 + bne _0813A0D8 + movs r0, 0xA9 + lsls r0, 1 + bl FlagGet + lsls r0, 24 + cmp r0, 0 + bne _0813A0D8 + ldr r1, =gSpecialVar_0x8005 + movs r0, 0x5 + strh r0, [r1] + ldr r1, =gSpecialVar_0x8006 + movs r0, 0x4 + strh r0, [r1] + b _0813A110 + .pool +_0813A0D0: + movs r0, 0x4 + strh r0, [r6] + adds r0, r3, 0x5 + b _0813A10E +_0813A0D8: + movs r3, 0 + ldr r6, =gSpecialVar_0x8005 + ldr r7, =gSpecialVar_0x8006 + lsls r1, r4, 1 + lsls r2, r5, 2 + ldr r4, =gUnknown_085B2CDC + ldr r0, =gSaveBlock2Ptr + ldr r0, [r0] + adds r1, r2 + movs r2, 0xCE + lsls r2, 4 + adds r0, r2 + adds r0, r1 + ldrh r1, [r0] +_0813A0F4: + lsls r0, r3, 1 + adds r0, r4 + ldrh r0, [r0] + cmp r0, r1 + bhi _0813A0D0 + adds r0, r3, 0x1 + lsls r0, 24 + lsrs r3, r0, 24 + cmp r3, 0x8 + bls _0813A0F4 + movs r0, 0x4 + strh r0, [r6] + movs r0, 0xC +_0813A10E: + strh r0, [r7] +_0813A110: + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813A080 + + thumb_func_start sub_813A128 +sub_813A128: @ 813A128 + push {r4,lr} + ldr r0, =sub_813A2DC + movs r1, 0x8 + bl CreateTask + lsls r0, 24 + lsrs r4, r0, 24 + lsls r0, r4, 2 + adds r0, r4 + lsls r0, 3 + ldr r1, =gTasks + adds r3, r0, r1 + ldr r1, =gSpecialVar_0x8004 + ldrh r0, [r1] + strh r0, [r3, 0x1E] + ldrh r0, [r1] + cmp r0, 0xC + bls _0813A14E + b _0813A2C6 +_0813A14E: + lsls r0, 2 + ldr r1, =_0813A168 + adds r0, r1 + ldr r0, [r0] + mov pc, r0 + .pool + .align 2, 0 +_0813A168: + .4byte _0813A19C + .4byte _0813A1AA + .4byte _0813A1C2 + .4byte _0813A1D6 + .4byte _0813A1F0 + .4byte _0813A208 + .4byte _0813A222 + .4byte _0813A23C + .4byte _0813A25A + .4byte _0813A274 + .4byte _0813A274 + .4byte _0813A28E + .4byte _0813A2A8 +_0813A19C: + movs r1, 0 + movs r0, 0x1 + strh r0, [r3, 0x8] + strh r0, [r3, 0xA] + strh r0, [r3, 0xC] + strh r0, [r3, 0xE] + b _0813A2BC +_0813A1AA: + movs r1, 0 + movs r0, 0x5 + strh r0, [r3, 0x8] + movs r0, 0x8 + strh r0, [r3, 0xA] + movs r0, 0x1 + strh r0, [r3, 0xC] + strh r0, [r3, 0xE] + movs r0, 0x9 + strh r0, [r3, 0x10] + movs r0, 0xA + b _0813A2BE +_0813A1C2: + movs r2, 0 + movs r0, 0x6 + strh r0, [r3, 0x8] + movs r1, 0xC + strh r1, [r3, 0xA] + movs r0, 0x1 + strh r0, [r3, 0xC] + strh r0, [r3, 0xE] + movs r0, 0x7 + b _0813A250 +_0813A1D6: + movs r1, 0 + movs r0, 0x6 + strh r0, [r3, 0x8] + movs r0, 0xB + strh r0, [r3, 0xA] + movs r0, 0xE + strh r0, [r3, 0xC] + movs r0, 0x1 + strh r0, [r3, 0xE] + movs r0, 0xF + strh r0, [r3, 0x10] + movs r0, 0xC + b _0813A2BE +_0813A1F0: + movs r1, 0 + movs r0, 0x6 + strh r0, [r3, 0x8] + strh r0, [r3, 0xA] + movs r0, 0xE + strh r0, [r3, 0xC] + movs r0, 0x1 + strh r0, [r3, 0xE] + movs r0, 0xF + strh r0, [r3, 0x10] + movs r0, 0xC + b _0813A2BE +_0813A208: + movs r1, 0 + movs r0, 0x6 + strh r0, [r3, 0x8] + movs r0, 0x7 + strh r0, [r3, 0xA] + movs r0, 0xE + strh r0, [r3, 0xC] + movs r0, 0x1 + strh r0, [r3, 0xE] + movs r0, 0xF + strh r0, [r3, 0x10] + movs r0, 0xC + b _0813A2BE +_0813A222: + movs r1, 0 + movs r0, 0x6 + strh r0, [r3, 0x8] + movs r0, 0xA + strh r0, [r3, 0xA] + movs r0, 0xE + strh r0, [r3, 0xC] + movs r0, 0x1 + strh r0, [r3, 0xE] + movs r0, 0xF + strh r0, [r3, 0x10] + movs r0, 0xC + b _0813A2BE +_0813A23C: + movs r2, 0 + movs r0, 0x6 + strh r0, [r3, 0x8] + movs r1, 0xC + strh r1, [r3, 0xA] + movs r0, 0xF + strh r0, [r3, 0xC] + movs r0, 0x1 + strh r0, [r3, 0xE] + movs r0, 0xE +_0813A250: + strh r0, [r3, 0x10] + strh r1, [r3, 0x12] + strh r2, [r3, 0x14] + strh r4, [r3, 0x26] + b _0813A2D2 +_0813A25A: + movs r1, 0 + movs r0, 0x6 + strh r0, [r3, 0x8] + movs r0, 0xA + strh r0, [r3, 0xA] + movs r0, 0x11 + strh r0, [r3, 0xC] + movs r0, 0x1 + strh r0, [r3, 0xE] + movs r0, 0xB + strh r0, [r3, 0x10] + movs r0, 0xC + b _0813A2BE +_0813A274: + movs r1, 0 + movs r0, 0x6 + strh r0, [r3, 0x8] + movs r0, 0xB + strh r0, [r3, 0xA] + movs r0, 0xF + strh r0, [r3, 0xC] + movs r0, 0x1 + strh r0, [r3, 0xE] + movs r0, 0xE + strh r0, [r3, 0x10] + movs r0, 0xC + b _0813A2BE +_0813A28E: + movs r1, 0 + movs r0, 0x6 + strh r0, [r3, 0x8] + movs r0, 0x7 + strh r0, [r3, 0xA] + movs r0, 0x13 + strh r0, [r3, 0xC] + movs r0, 0x1 + strh r0, [r3, 0xE] + movs r0, 0xA + strh r0, [r3, 0x10] + movs r0, 0xC + b _0813A2BE +_0813A2A8: + movs r1, 0 + movs r0, 0x6 + strh r0, [r3, 0x8] + movs r0, 0x7 + strh r0, [r3, 0xA] + movs r0, 0x11 + strh r0, [r3, 0xC] + movs r0, 0x1 + strh r0, [r3, 0xE] + movs r0, 0xC +_0813A2BC: + strh r0, [r3, 0x10] +_0813A2BE: + strh r0, [r3, 0x12] + strh r1, [r3, 0x14] + strh r4, [r3, 0x26] + b _0813A2D2 +_0813A2C6: + ldr r1, =gSpecialVar_Result + movs r0, 0x7F + strh r0, [r1] + adds r0, r4, 0 + bl DestroyTask +_0813A2D2: + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813A128 + + thumb_func_start sub_813A2DC +sub_813A2DC: @ 813A2DC + push {r4-r7,lr} + mov r7, r8 + push {r7} + sub sp, 0x20 + lsls r0, 24 + lsrs r7, r0, 24 + lsls r0, r7, 2 + adds r0, r7 + lsls r0, 3 + ldr r1, =gTasks + adds r6, r0, r1 + bl ScriptContext2_Enable + ldr r0, =gUnknown_0203AB68 + movs r5, 0 + strh r5, [r0] + ldr r1, =gUnknown_0203AB6C + movs r0, 0x40 + strb r0, [r1] + ldrh r0, [r6, 0x1E] + movs r1, 0 + bl sub_813AA60 + ldrb r0, [r6, 0x1E] + movs r1, 0 + bl sub_813ACE8 + ldr r4, =gUnknown_0203AB64 + movs r1, 0xA + ldrsh r0, [r6, r1] + lsls r0, 3 + bl AllocZeroed + str r0, [r4] + ldr r0, =gUnknown_0203AB6A + strh r5, [r0] + bl sub_813A42C + movs r3, 0 + movs r4, 0 + movs r2, 0xA + ldrsh r0, [r6, r2] + add r1, sp, 0x18 + mov r8, r1 + cmp r3, r0 + bge _0813A36A + ldr r5, =gUnknown_085B2CF0 +_0813A33A: + lsls r1, r4, 2 + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + lsls r0, 6 + adds r1, r0 + adds r1, r5 + ldr r0, [r1] + ldr r1, =gUnknown_0203AB64 + ldr r2, [r1] + lsls r1, r4, 3 + adds r1, r2 + str r0, [r1] + str r4, [r1, 0x4] + adds r1, r3, 0 + bl display_text_and_get_width + adds r3, r0, 0 + adds r0, r4, 0x1 + lsls r0, 24 + lsrs r4, r0, 24 + movs r2, 0xA + ldrsh r0, [r6, r2] + cmp r4, r0 + blt _0813A33A +_0813A36A: + adds r0, r3, 0 + bl convert_pixel_width_to_tile_width + strh r0, [r6, 0x10] + movs r1, 0xC + ldrsh r0, [r6, r1] + movs r2, 0x10 + ldrsh r1, [r6, r2] + adds r0, r1 + cmp r0, 0x1D + ble _0813A38C + movs r0, 0x1D + subs r0, r1 + cmp r0, 0 + bge _0813A38A + movs r0, 0 +_0813A38A: + strh r0, [r6, 0xC] +_0813A38C: + ldrb r2, [r6, 0xC] + ldrb r3, [r6, 0xE] + ldrb r0, [r6, 0x10] + str r0, [sp] + ldrb r0, [r6, 0x12] + str r0, [sp, 0x4] + movs r0, 0xF + str r0, [sp, 0x8] + movs r0, 0x64 + str r0, [sp, 0xC] + add r0, sp, 0x10 + movs r1, 0 + bl sub_8198A50 + ldr r0, [sp, 0x10] + ldr r1, [sp, 0x14] + str r0, [sp, 0x18] + str r1, [sp, 0x1C] + mov r0, r8 + bl AddWindow + lsls r0, 24 + lsrs r0, 24 + strh r0, [r6, 0x22] + movs r1, 0 + bl SetStandardWindowBorderStyle + ldr r4, =gUnknown_030061D0 + ldrh r0, [r6, 0xA] + strh r0, [r4, 0xC] + ldrh r0, [r6, 0x8] + strh r0, [r4, 0xE] + ldrh r0, [r6, 0x22] + strb r0, [r4, 0x10] + adds r0, r7, 0 + bl sub_813A694 + ldrh r1, [r6, 0x16] + ldrh r2, [r6, 0x18] + adds r0, r4, 0 + bl ListMenuInit + lsls r0, 24 + lsrs r0, 24 + strh r0, [r6, 0x24] + movs r0, 0 + bl schedule_bg_copy_tilemap_to_vram + ldr r1, =gTasks + lsls r0, r7, 2 + adds r0, r7 + lsls r0, 3 + adds r0, r1 + ldr r1, =sub_813A4EC + str r1, [r0] + add sp, 0x20 + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813A2DC + + thumb_func_start sub_813A42C +sub_813A42C: @ 813A42C + ldr r1, =gUnknown_030061D0 + ldr r0, =gUnknown_0203AB64 + ldr r0, [r0] + str r0, [r1] + ldr r0, =sub_813A46C + str r0, [r1, 0x4] + movs r0, 0 + str r0, [r1, 0x8] + movs r2, 0 + movs r0, 0x1 + strh r0, [r1, 0xC] + strh r0, [r1, 0xE] + strb r2, [r1, 0x10] + strb r2, [r1, 0x11] + movs r0, 0x8 + strb r0, [r1, 0x12] + strb r2, [r1, 0x13] + movs r0, 0x21 + strb r0, [r1, 0x14] + movs r0, 0x31 + strb r0, [r1, 0x15] + movs r0, 0 + strb r0, [r1, 0x16] + movs r0, 0x1 + strb r0, [r1, 0x17] + bx lr + .pool + thumb_func_end sub_813A42C + + thumb_func_start sub_813A46C +sub_813A46C: @ 813A46C + push {r4,r5,lr} + sub sp, 0x4 + movs r0, 0x5 + bl PlaySE + ldr r0, =sub_813A4EC + bl FindTaskIdByFunc + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0xFF + beq _0813A4D4 + lsls r4, r0, 2 + adds r4, r0 + lsls r4, 3 + ldr r0, =gTasks + adds r4, r0 + ldrh r0, [r4, 0x24] + lsls r0, 24 + lsrs r0, 24 + mov r1, sp + movs r2, 0 + bl sub_81AE860 + ldr r1, =gUnknown_0203AB68 + mov r0, sp + ldrh r0, [r0] + strh r0, [r1] + ldrh r0, [r4, 0x24] + lsls r0, 24 + lsrs r0, 24 + mov r1, sp + bl sub_81AE838 + ldrh r0, [r4, 0x1E] + ldr r5, =gUnknown_0203AB6A + ldrh r1, [r5] + bl sub_813AC44 + ldrh r0, [r4, 0x1E] + mov r1, sp + ldrh r1, [r1] + bl sub_813AA60 + ldrb r0, [r4, 0x1E] + mov r1, sp + ldrh r1, [r1] + bl sub_813AD34 + mov r0, sp + ldrh r0, [r0] + strh r0, [r5] +_0813A4D4: + add sp, 0x4 + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813A46C + + thumb_func_start sub_813A4EC +sub_813A4EC: @ 813A4EC + push {r4-r6,lr} + lsls r0, 24 + lsrs r5, r0, 24 + lsls r0, r5, 2 + adds r0, r5 + lsls r0, 3 + ldr r1, =gTasks + adds r6, r0, r1 + ldrh r0, [r6, 0x24] + lsls r0, 24 + lsrs r0, 24 + bl ListMenuHandleInputGetItemId + adds r4, r0, 0 + movs r0, 0x2 + negs r0, r0 + cmp r4, r0 + beq _0813A51C + adds r0, 0x1 + cmp r4, r0 + bne _0813A530 + b _0813A566 + .pool +_0813A51C: + ldr r1, =gSpecialVar_Result + movs r0, 0x7F + strh r0, [r1] + movs r0, 0x5 + bl PlaySE + b _0813A54C + .pool +_0813A530: + ldr r0, =gSpecialVar_Result + strh r4, [r0] + movs r0, 0x5 + bl PlaySE + movs r1, 0x14 + ldrsh r0, [r6, r1] + cmp r0, 0 + beq _0813A54C + movs r1, 0xA + ldrsh r0, [r6, r1] + subs r0, 0x1 + cmp r4, r0 + bne _0813A558 +_0813A54C: + adds r0, r5, 0 + bl sub_813A570 + b _0813A566 + .pool +_0813A558: + adds r0, r5, 0 + bl sub_813A738 + ldr r0, =sub_813A600 + str r0, [r6] + bl EnableBothScriptContexts +_0813A566: + pop {r4-r6} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813A4EC + + thumb_func_start sub_813A570 +sub_813A570: @ 813A570 + push {r4,r5,lr} + sub sp, 0x4 + adds r5, r0, 0 + lsls r5, 24 + lsrs r5, 24 + lsls r4, r5, 2 + adds r4, r5 + lsls r4, 3 + ldr r0, =gTasks + adds r4, r0 + ldrh r0, [r4, 0x24] + lsls r0, 24 + lsrs r0, 24 + mov r1, sp + bl sub_81AE838 + ldrh r0, [r4, 0x1E] + mov r1, sp + ldrh r1, [r1] + bl sub_813AC44 + adds r0, r5, 0 + bl sub_813A738 + ldrh r0, [r4, 0x24] + lsls r0, 24 + lsrs r0, 24 + movs r1, 0 + movs r2, 0 + bl sub_81AE6C8 + ldr r0, =gUnknown_0203AB64 + ldr r0, [r0] + bl Free + ldrh r0, [r4, 0x22] + lsls r0, 24 + lsrs r0, 24 + movs r1, 0x1 + bl sub_8198070 + ldrh r0, [r4, 0x22] + lsls r0, 24 + lsrs r0, 24 + movs r1, 0 + bl FillWindowPixelBuffer + ldrh r0, [r4, 0x22] + lsls r0, 24 + lsrs r0, 24 + movs r1, 0x2 + bl CopyWindowToVram + ldrh r0, [r4, 0x22] + lsls r0, 24 + lsrs r0, 24 + bl RemoveWindow + adds r0, r5, 0 + bl DestroyTask + bl EnableBothScriptContexts + add sp, 0x4 + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813A570 + + thumb_func_start sub_813A600 +sub_813A600: @ 813A600 + push {lr} + lsls r0, 24 + lsrs r0, 24 + ldr r2, =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r1, r2 + movs r2, 0x14 + ldrsh r0, [r1, r2] + cmp r0, 0x1 + beq _0813A624 + cmp r0, 0x2 + bne _0813A624 + movs r0, 0x1 + strh r0, [r1, 0x14] + ldr r0, =sub_813A664 + str r0, [r1] +_0813A624: + pop {r0} + bx r0 + .pool + thumb_func_end sub_813A600 + + thumb_func_start sub_813A630 +sub_813A630: @ 813A630 + push {lr} + ldr r0, =sub_813A600 + bl FindTaskIdByFunc + lsls r0, 24 + lsrs r2, r0, 24 + cmp r2, 0xFF + bne _0813A64C + bl EnableBothScriptContexts + b _0813A65C + .pool +_0813A64C: + ldr r0, =gTasks + lsls r1, r2, 2 + adds r1, r2 + lsls r1, 3 + adds r1, r0 + ldrh r0, [r1, 0x14] + adds r0, 0x1 + strh r0, [r1, 0x14] +_0813A65C: + pop {r0} + bx r0 + .pool + thumb_func_end sub_813A630 + + thumb_func_start sub_813A664 +sub_813A664: @ 813A664 + push {r4,lr} + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + bl ScriptContext2_Enable + adds r0, r4, 0 + bl sub_813A694 + ldr r1, =gTasks + lsls r0, r4, 2 + adds r0, r4 + lsls r0, 3 + adds r0, r1 + ldr r1, =sub_813A4EC + str r1, [r0] + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813A664 + + thumb_func_start sub_813A694 +sub_813A694: @ 813A694 + push {r4,r5,lr} + sub sp, 0x10 + lsls r0, 24 + lsrs r0, 24 + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + ldr r0, =gTasks + adds r4, r1, r0 + mov r1, sp + ldr r0, =gUnknown_085B3030 + ldm r0!, {r2,r3,r5} + stm r1!, {r2,r3,r5} + ldr r0, [r0] + str r0, [r1] + movs r0, 0x8 + ldrsh r1, [r4, r0] + movs r2, 0xA + ldrsh r0, [r4, r2] + cmp r1, r0 + beq _0813A724 + mov r2, sp + movs r3, 0x10 + ldrsh r1, [r4, r3] + lsrs r0, r1, 31 + adds r1, r0 + asrs r1, 1 + lsls r1, 3 + adds r1, 0xC + movs r5, 0xC + ldrsh r0, [r4, r5] + subs r0, 0x1 + lsls r0, 3 + adds r1, r0 + movs r3, 0 + strb r1, [r2, 0x1] + mov r1, sp + movs r0, 0x8 + strb r0, [r1, 0x2] + movs r0, 0x10 + ldrsh r1, [r4, r0] + lsrs r0, r1, 31 + adds r1, r0 + asrs r1, 1 + lsls r1, 3 + adds r1, 0xC + movs r5, 0xC + ldrsh r0, [r4, r5] + subs r0, 0x1 + lsls r0, 3 + adds r1, r0 + strb r1, [r2, 0x4] + mov r1, sp + movs r2, 0x12 + ldrsh r0, [r4, r2] + lsls r0, 3 + adds r0, 0xA + strb r0, [r1, 0x5] + mov r0, sp + strh r3, [r0, 0x6] + mov r2, sp + ldrh r0, [r4, 0xA] + ldrh r1, [r4, 0x8] + subs r0, r1 + strh r0, [r2, 0x8] + ldr r1, =gUnknown_0203AB68 + mov r0, sp + bl AddScrollIndicatorArrowPair + lsls r0, 24 + lsrs r0, 24 + strh r0, [r4, 0x20] +_0813A724: + add sp, 0x10 + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813A694 + + thumb_func_start sub_813A738 +sub_813A738: @ 813A738 + push {lr} + lsls r0, 24 + lsrs r0, 24 + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + ldr r0, =gTasks + adds r2, r1, r0 + movs r0, 0x8 + ldrsh r1, [r2, r0] + movs r3, 0xA + ldrsh r0, [r2, r3] + cmp r1, r0 + beq _0813A75E + ldrh r0, [r2, 0x20] + lsls r0, 24 + lsrs r0, 24 + bl RemoveScrollIndicatorArrowPair +_0813A75E: + pop {r0} + bx r0 + .pool + thumb_func_end sub_813A738 + + thumb_func_start nullsub_55 +nullsub_55: @ 813A768 + bx lr + thumb_func_end nullsub_55 + + thumb_func_start sub_813A76C +sub_813A76C: @ 813A76C + push {r4-r6,lr} + movs r4, 0 + ldr r6, =gLinkPlayers + ldr r0, =0x0000401f + adds r5, r0, 0 +_0813A776: + lsls r0, r4, 3 + subs r0, r4 + lsls r0, 2 + adds r0, r6 + ldrb r0, [r0, 0x13] + cmp r0, 0 + bne _0813A79C + subs r0, r5, r4 + lsls r0, 16 + lsrs r0, 16 + movs r1, 0 + bl VarSet + b _0813A7A8 + .pool +_0813A79C: + subs r0, r5, r4 + lsls r0, 16 + lsrs r0, 16 + movs r1, 0x69 + bl VarSet +_0813A7A8: + adds r0, r4, 0x1 + lsls r0, 24 + lsrs r4, r0, 24 + cmp r4, 0x1 + bls _0813A776 + pop {r4-r6} + pop {r0} + bx r0 + thumb_func_end sub_813A76C + + thumb_func_start sub_813A7B8 +sub_813A7B8: @ 813A7B8 + push {lr} + ldr r1, =gSpecialVar_0x8004 + ldrh r0, [r1] + cmp r0, 0x5 + bls _0813A7C6 + movs r0, 0 + strh r0, [r1] +_0813A7C6: + ldrh r1, [r1] + movs r0, 0x64 + muls r0, r1 + ldr r1, =gPlayerParty + adds r0, r1 + bl GetNature + lsls r0, 24 + ldr r1, =gUnknown_085B3040 + lsrs r0, 22 + adds r0, r1 + ldr r0, [r0] + bl ShowFieldMessage + pop {r0} + bx r0 + .pool + thumb_func_end sub_813A7B8 + + thumb_func_start UpdateFrontierGambler +UpdateFrontierGambler: @ 813A7F4 + push {r4,r5,lr} + adds r4, r0, 0 + lsls r4, 16 + lsrs r4, 16 + ldr r0, =0x00004030 + bl GetVarPointer + adds r5, r0, 0 + ldrh r0, [r5] + adds r4, r0 + strh r4, [r5] + ldrh r0, [r5] + movs r1, 0xC + bl __umodsi3 + strh r0, [r5] + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end UpdateFrontierGambler + + thumb_func_start sub_813A820 +sub_813A820: @ 813A820 + push {r4,lr} + ldr r0, =0x00004030 + bl VarGet + adds r4, r0, 0 + lsls r4, 16 + lsrs r4, 16 + ldr r1, =gUnknown_085B30A4 + lsls r0, r4, 2 + adds r0, r1 + ldr r0, [r0] + bl ShowFieldMessage + ldr r0, =0x00004031 + adds r1, r4, 0 + bl VarSet + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813A820 + + thumb_func_start sub_813A854 +sub_813A854: @ 813A854 + push {r4,lr} + ldr r4, =gUnknown_085B30D4 + ldr r0, =0x00004031 + bl VarGet + lsls r0, 16 + lsrs r0, 14 + adds r0, r4 + ldr r0, [r0] + bl ShowFieldMessage + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813A854 + + thumb_func_start sub_813A878 +sub_813A878: @ 813A878 + push {r4-r7,lr} + mov r7, r8 + push {r7} + lsls r0, 24 + lsrs r0, 24 + mov r8, r0 + ldr r0, =0x000040ce + bl VarGet + lsls r0, 16 + lsrs r7, r0, 16 + ldr r0, =0x00004031 + bl VarGet + lsls r0, 16 + lsrs r6, r0, 16 + ldr r0, =0x000040cf + bl VarGet + lsls r0, 16 + lsrs r5, r0, 16 + ldr r4, =0x00004033 + adds r0, r4, 0 + bl VarGet + lsls r0, 16 + lsrs r0, 16 + cmp r0, 0x1 + bne _0813A8F0 + ldr r1, =gUnknown_085B3104 + lsls r0, r6, 1 + adds r0, r1 + ldrh r1, [r0] + lsls r0, r5, 8 + adds r0, r7 + cmp r1, r0 + bne _0813A8F0 + mov r0, r8 + cmp r0, 0 + beq _0813A8E8 + adds r0, r4, 0 + movs r1, 0x2 + bl VarSet + b _0813A8F0 + .pool +_0813A8E8: + adds r0, r4, 0 + movs r1, 0x3 + bl VarSet +_0813A8F0: + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + thumb_func_end sub_813A878 + + thumb_func_start sub_813A8FC +sub_813A8FC: @ 813A8FC + push {lr} + sub sp, 0x2C + ldr r0, =gSaveBlock2Ptr + ldr r0, [r0] + ldr r1, =0x00000eb8 + adds r0, r1 + ldrh r1, [r0] + add r0, sp, 0xC + movs r2, 0x1 + movs r3, 0x4 + bl ConvertIntToDecimalStringN + ldr r1, =gText_BP + bl StringCopy + movs r0, 0x1 + add r1, sp, 0xC + movs r2, 0x30 + bl GetStringRightAlignXOffset + adds r3, r0, 0 + ldr r0, =gUnknown_0203AB6D + ldrb r0, [r0] + lsls r3, 24 + lsrs r3, 24 + movs r1, 0x1 + str r1, [sp] + movs r1, 0 + str r1, [sp, 0x4] + str r1, [sp, 0x8] + movs r1, 0x1 + add r2, sp, 0xC + bl PrintTextOnWindow + add sp, 0x2C + pop {r0} + bx r0 + .pool + thumb_func_end sub_813A8FC + + thumb_func_start sub_813A958 +sub_813A958: @ 813A958 + push {r4,lr} + ldr r4, =gUnknown_0203AB6D + ldr r0, =gUnknown_085B311C + bl AddWindow + strb r0, [r4] + ldrb r0, [r4] + movs r1, 0 + bl SetStandardWindowBorderStyle + bl sub_813A8FC + ldrb r0, [r4] + movs r1, 0x2 + bl CopyWindowToVram + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813A958 + + thumb_func_start sub_813A988 +sub_813A988: @ 813A988 + push {r4,lr} + ldr r4, =gUnknown_0203AB6D + ldrb r0, [r4] + movs r1, 0x1 + bl sub_8198070 + ldrb r0, [r4] + bl RemoveWindow + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813A988 + + thumb_func_start sub_813A9A4 +sub_813A9A4: @ 813A9A4 + push {lr} + ldr r0, =gSaveBlock2Ptr + ldr r0, [r0] + ldr r2, =0x00000eb8 + adds r1, r0, r2 + ldr r0, =gSpecialVar_0x8004 + ldrh r2, [r1] + ldrh r0, [r0] + cmp r2, r0 + bcs _0813A9C8 + movs r0, 0 + b _0813A9CA + .pool +_0813A9C8: + subs r0, r2, r0 +_0813A9CA: + strh r0, [r1] + pop {r0} + bx r0 + thumb_func_end sub_813A9A4 + + thumb_func_start sub_813A9D0 +sub_813A9D0: @ 813A9D0 + push {lr} + ldr r0, =gSaveBlock2Ptr + ldr r0, [r0] + ldr r1, =0x00000eb8 + adds r2, r0, r1 + ldrh r1, [r2] + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + adds r1, r0 + ldr r0, =0x0000270f + cmp r1, r0 + ble _0813A9FC + strh r0, [r2] + b _0813A9FE + .pool +_0813A9FC: + strh r1, [r2] +_0813A9FE: + pop {r0} + bx r0 + thumb_func_end sub_813A9D0 + + thumb_func_start sub_813AA04 +sub_813AA04: @ 813AA04 + ldr r0, =gSaveBlock2Ptr + ldr r0, [r0] + ldr r1, =0x00000eb8 + adds r0, r1 + ldrh r0, [r0] + bx lr + .pool + thumb_func_end sub_813AA04 + + thumb_func_start sub_813AA18 +sub_813AA18: @ 813AA18 + push {r4,lr} + ldr r4, =gUnknown_0203AB6E + ldr r0, =gUnknown_085B3124 + bl AddWindow + strb r0, [r4] + ldrb r0, [r4] + movs r1, 0 + bl SetStandardWindowBorderStyle + ldrb r0, [r4] + movs r1, 0x2 + bl CopyWindowToVram + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813AA18 + + thumb_func_start sub_813AA44 +sub_813AA44: @ 813AA44 + push {r4,lr} + ldr r4, =gUnknown_0203AB6E + ldrb r0, [r4] + movs r1, 0x1 + bl sub_8198070 + ldrb r0, [r4] + bl RemoveWindow + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813AA44 + + thumb_func_start sub_813AA60 +sub_813AA60: @ 813AA60 + push {r4,r5,lr} + sub sp, 0x10 + lsls r0, 16 + lsls r1, 16 + lsrs r5, r1, 16 + lsrs r4, r0, 16 + ldr r1, =0xfffd0000 + adds r0, r1 + lsrs r0, 16 + cmp r0, 0x3 + bls _0813AA78 + b _0813ABC2 +_0813AA78: + movs r0, 0xD8 + str r0, [sp] + movs r0, 0x20 + str r0, [sp, 0x4] + movs r0, 0 + movs r1, 0x11 + movs r2, 0 + movs r3, 0 + bl FillWindowPixelRect + cmp r4, 0x4 + beq _0813AAE8 + cmp r4, 0x4 + bgt _0813AAA0 + cmp r4, 0x3 + beq _0813AAAA + b _0813ABC2 + .pool +_0813AAA0: + cmp r4, 0x5 + beq _0813AB5C + cmp r4, 0x6 + beq _0813AB94 + b _0813ABC2 +_0813AAAA: + ldr r1, =gUnknown_085B3170 + lsls r0, r5, 2 + adds r0, r1 + ldr r2, [r0] + movs r0, 0 + str r0, [sp] + movs r0, 0x2 + str r0, [sp, 0x4] + movs r0, 0x1 + str r0, [sp, 0x8] + str r4, [sp, 0xC] + movs r0, 0 + movs r1, 0x1 + movs r3, 0 + bl AddTextPrinterParametrized + ldr r1, =gUnknown_085B312C + lsls r0, r5, 1 + adds r1, r0, r1 + ldrh r5, [r1] + ldr r0, =0x0000ffff + cmp r5, r0 + beq _0813AB18 + b _0813AB2C + .pool +_0813AAE8: + ldr r1, =gUnknown_085B319C + lsls r0, r5, 2 + adds r0, r1 + ldr r2, [r0] + movs r0, 0 + str r0, [sp] + movs r0, 0x2 + str r0, [sp, 0x4] + movs r0, 0x1 + str r0, [sp, 0x8] + movs r0, 0x3 + str r0, [sp, 0xC] + movs r0, 0 + movs r1, 0x1 + movs r3, 0 + bl AddTextPrinterParametrized + ldr r1, =gUnknown_085B3142 + lsls r0, r5, 1 + adds r1, r0, r1 + ldrh r5, [r1] + ldr r0, =0x0000ffff + cmp r5, r0 + bne _0813AB2C +_0813AB18: + ldrh r0, [r1] + bl sub_813ABD4 + b _0813ABC2 + .pool +_0813AB2C: + ldr r4, =0x0000157c + adds r0, r4, 0 + bl FreeSpriteTilesByTag + adds r0, r4, 0 + bl FreeSpritePaletteByTag + lsls r0, r5, 24 + lsrs r0, 24 + str r4, [sp] + str r4, [sp, 0x4] + movs r1, 0x21 + movs r2, 0x58 + movs r3, 0 + bl AddDecorationIconObject + ldr r1, =gUnknown_0203AB6C + strb r0, [r1] + b _0813ABC2 + .pool +_0813AB5C: + ldr r1, =gUnknown_085B31B4 + lsls r0, r5, 2 + adds r0, r1 + ldr r2, [r0] + movs r0, 0 + str r0, [sp] + movs r0, 0x2 + str r0, [sp, 0x4] + movs r0, 0x1 + str r0, [sp, 0x8] + movs r0, 0x3 + str r0, [sp, 0xC] + movs r0, 0 + movs r1, 0x1 + movs r3, 0 + bl AddTextPrinterParametrized + ldr r1, =gUnknown_085B314E + lsls r0, r5, 1 + adds r0, r1 + ldrh r0, [r0] + bl sub_813ABD4 + b _0813ABC2 + .pool +_0813AB94: + ldr r1, =gUnknown_085B31D0 + lsls r0, r5, 2 + adds r0, r1 + ldr r2, [r0] + movs r0, 0 + str r0, [sp] + movs r0, 0x2 + str r0, [sp, 0x4] + movs r0, 0x1 + str r0, [sp, 0x8] + movs r0, 0x3 + str r0, [sp, 0xC] + movs r0, 0 + movs r1, 0x1 + movs r3, 0 + bl AddTextPrinterParametrized + ldr r1, =gUnknown_085B315C + lsls r0, r5, 1 + adds r0, r1 + ldrh r0, [r0] + bl sub_813ABD4 +_0813ABC2: + add sp, 0x10 + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813AA60 + + thumb_func_start sub_813ABD4 +sub_813ABD4: @ 813ABD4 + push {r4,r5,lr} + adds r5, r0, 0 + lsls r5, 16 + lsrs r5, 16 + ldr r4, =0x0000157c + adds r0, r4, 0 + bl FreeSpriteTilesByTag + adds r0, r4, 0 + bl FreeSpritePaletteByTag + adds r0, r4, 0 + adds r1, r4, 0 + adds r2, r5, 0 + bl AddItemIconObject + ldr r4, =gUnknown_0203AB6C + strb r0, [r4] + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x40 + beq _0813AC32 + ldr r3, =gSprites + ldrb r0, [r4] + lsls r1, r0, 4 + adds r1, r0 + lsls r1, 2 + adds r1, r3 + ldrb r2, [r1, 0x5] + movs r0, 0xD + negs r0, r0 + ands r0, r2 + strb r0, [r1, 0x5] + ldrb r1, [r4] + lsls r0, r1, 4 + adds r0, r1 + lsls r0, 2 + adds r0, r3 + movs r1, 0x24 + strh r1, [r0, 0x20] + ldrb r1, [r4] + lsls r0, r1, 4 + adds r0, r1 + lsls r0, 2 + adds r0, r3 + movs r1, 0x5C + strh r1, [r0, 0x22] +_0813AC32: + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813ABD4 + + thumb_func_start sub_813AC44 +sub_813AC44: @ 813AC44 + push {lr} + lsls r0, 16 + lsrs r1, r0, 16 + ldr r2, =gUnknown_0203AB6C + ldrb r0, [r2] + cmp r0, 0x40 + beq _0813AC70 + cmp r1, 0x6 + bgt _0813AC6A + cmp r1, 0x3 + blt _0813AC6A + adds r1, r0, 0 + lsls r0, r1, 4 + adds r0, r1 + lsls r0, 2 + ldr r1, =gSprites + adds r0, r1 + bl DestroySpriteAndFreeResources +_0813AC6A: + ldr r1, =gUnknown_0203AB6C + movs r0, 0x40 + strb r0, [r1] +_0813AC70: + pop {r0} + bx r0 + .pool + thumb_func_end sub_813AC44 + + thumb_func_start sub_813AC7C +sub_813AC7C: @ 813AC7C + push {lr} + ldr r0, =gSpecialVar_0x8005 + ldrh r0, [r0] + cmp r0, 0 + beq _0813ACB8 + ldr r0, =gStringVar1 + ldr r2, =gUnknown_085B320C + ldr r1, =gSpecialVar_0x8004 + ldrh r1, [r1] + lsls r1, 1 + adds r1, r2 + ldrh r2, [r1] + movs r1, 0xD + muls r1, r2 + ldr r2, =gMoveNames + adds r1, r2 + bl StringCopy + b _0813ACD2 + .pool +_0813ACB8: + ldr r0, =gStringVar1 + ldr r2, =gUnknown_085B31F8 + ldr r1, =gSpecialVar_0x8004 + ldrh r1, [r1] + lsls r1, 1 + adds r1, r2 + ldrh r2, [r1] + movs r1, 0xD + muls r1, r2 + ldr r2, =gMoveNames + adds r1, r2 + bl StringCopy +_0813ACD2: + pop {r0} + bx r0 + .pool + thumb_func_end sub_813AC7C + + thumb_func_start sub_813ACE8 +sub_813ACE8: @ 813ACE8 + push {r4-r6,lr} + lsls r0, 24 + lsrs r0, 24 + adds r5, r0, 0 + lsls r1, 16 + lsrs r6, r1, 16 + subs r0, 0x9 + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x1 + bhi _0813AD20 + ldr r0, =gSpecialVar_0x8006 + ldrh r0, [r0] + cmp r0, 0 + bne _0813AD18 + ldr r4, =gUnknown_0203AB5E + ldr r0, =gUnknown_085B3220 + bl AddWindow + strb r0, [r4] + ldrb r0, [r4] + movs r1, 0 + bl SetStandardWindowBorderStyle +_0813AD18: + adds r0, r5, 0 + adds r1, r6, 0 + bl sub_813AD34 +_0813AD20: + pop {r4-r6} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813ACE8 + + thumb_func_start sub_813AD34 +sub_813AD34: @ 813AD34 + push {r4-r7,lr} + sub sp, 0xC + lsls r0, 24 + lsls r1, 16 + lsrs r5, r1, 16 + adds r7, r5, 0 + lsrs r6, r0, 24 + movs r1, 0xF7 + lsls r1, 24 + adds r0, r1 + lsrs r0, 24 + cmp r0, 0x1 + bhi _0813ADAC + ldr r4, =gUnknown_0203AB5E + ldrb r0, [r4] + movs r1, 0x60 + str r1, [sp] + movs r1, 0x30 + str r1, [sp, 0x4] + movs r1, 0x11 + movs r2, 0 + movs r3, 0 + bl FillWindowPixelRect + cmp r6, 0xA + bne _0813AD90 + ldrb r0, [r4] + ldr r2, =gUnknown_085B3254 + lsls r1, r5, 2 + adds r1, r2 + ldr r2, [r1] + movs r1, 0x1 + str r1, [sp] + movs r1, 0 + str r1, [sp, 0x4] + str r1, [sp, 0x8] + movs r1, 0x1 + movs r3, 0 + bl PrintTextOnWindow + b _0813ADAC + .pool +_0813AD90: + ldrb r0, [r4] + ldr r2, =gUnknown_085B3228 + lsls r1, r7, 2 + adds r1, r2 + ldr r2, [r1] + movs r1, 0x1 + str r1, [sp] + movs r1, 0 + str r1, [sp, 0x4] + str r1, [sp, 0x8] + movs r1, 0x1 + movs r3, 0 + bl PrintTextOnWindow +_0813ADAC: + add sp, 0xC + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813AD34 + + thumb_func_start sub_813ADB8 +sub_813ADB8: @ 813ADB8 + push {r4,lr} + ldr r4, =gUnknown_0203AB5E + ldrb r0, [r4] + movs r1, 0x1 + bl sub_8198070 + ldrb r0, [r4] + bl RemoveWindow + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813ADB8 + + thumb_func_start sub_813ADD4 +sub_813ADD4: @ 813ADD4 + push {r4-r7,lr} + mov r7, r9 + mov r6, r8 + push {r6,r7} + sub sp, 0x18 + ldr r0, =sub_813A600 + bl FindTaskIdByFunc + lsls r0, 24 + lsrs r1, r0, 24 + cmp r1, 0xFF + beq _0813AE90 + lsls r0, r1, 2 + adds r0, r1 + lsls r0, 3 + ldr r1, =gTasks + adds r6, r0, r1 + ldrh r0, [r6, 0x24] + lsls r0, 24 + lsrs r0, 24 + mov r4, sp + adds r4, 0x16 + add r1, sp, 0x14 + adds r2, r4, 0 + bl sub_81AE860 + ldrh r0, [r6, 0x22] + lsls r0, 24 + lsrs r0, 24 + movs r1, 0 + bl SetStandardWindowBorderStyle + movs r5, 0 + mov r9, r4 + ldr r0, =gUnknown_085B2CF0 + mov r8, r0 + movs r4, 0 +_0813AE1E: + ldrh r0, [r6, 0x22] + lsls r0, 24 + lsrs r0, 24 + add r1, sp, 0x14 + ldrh r2, [r1] + adds r2, r5 + lsls r2, 2 + ldr r1, =gSpecialVar_0x8004 + ldrh r1, [r1] + lsls r1, 6 + adds r2, r1 + add r2, r8 + ldr r2, [r2] + lsls r1, r5, 28 + lsrs r1, 24 + str r1, [sp] + movs r7, 0xFF + str r7, [sp, 0x4] + str r4, [sp, 0x8] + str r4, [sp, 0xC] + str r4, [sp, 0x10] + movs r1, 0x1 + movs r3, 0xA + bl sub_8199F74 + adds r0, r5, 0x1 + lsls r0, 24 + lsrs r5, r0, 24 + cmp r5, 0x5 + bls _0813AE1E + ldrh r0, [r6, 0x22] + lsls r0, 24 + lsrs r0, 24 + ldr r2, =gText_SelectorArrow + mov r3, r9 + ldrh r1, [r3] + lsls r1, 28 + lsrs r1, 24 + str r1, [sp] + str r7, [sp, 0x4] + movs r1, 0 + str r1, [sp, 0x8] + movs r1, 0x1 + movs r3, 0 + bl PrintTextOnWindow + ldrh r0, [r6, 0x22] + lsls r0, 24 + lsrs r0, 24 + bl PutWindowTilemap + ldrh r0, [r6, 0x22] + lsls r0, 24 + lsrs r0, 24 + movs r1, 0x3 + bl CopyWindowToVram +_0813AE90: + add sp, 0x18 + pop {r3,r4} + mov r8, r3 + mov r9, r4 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813ADD4 + + thumb_func_start sub_813AEB4 +sub_813AEB4: @ 813AEB4 + push {r4,lr} + movs r1, 0 + ldr r0, =gSpecialVar_0x8005 + strh r1, [r0] + ldr r0, =0x0000400e + bl VarGet + adds r4, r0, 0 + lsls r4, 16 + lsrs r4, 16 + ldr r0, =0x0000400d + bl VarGet + lsls r0, 16 + lsrs r1, r0, 16 + cmp r4, 0 + beq _0813AF18 + movs r2, 0 + lsls r1, 1 + ldr r3, =gUnknown_0861500C + ldr r0, =gUnknown_085B320C + adds r0, r1, r0 + ldrh r1, [r0] +_0813AEE2: + lsls r0, r2, 1 + adds r0, r3 + ldrh r0, [r0] + cmp r0, r1 + beq _0813AF0C + adds r0, r2, 0x1 + lsls r0, 24 + lsrs r2, r0, 24 + cmp r2, 0x1D + bls _0813AEE2 + b _0813AF38 + .pool +_0813AF0C: + ldr r0, =gSpecialVar_0x8005 + strh r2, [r0] + b _0813AF38 + .pool +_0813AF18: + movs r2, 0 + lsls r1, 1 + ldr r3, =gUnknown_0861500C + ldr r0, =gUnknown_085B31F8 + adds r0, r1, r0 + ldrh r1, [r0] +_0813AF24: + lsls r0, r2, 1 + adds r0, r3 + ldrh r0, [r0] + cmp r0, r1 + beq _0813AF0C + adds r0, r2, 0x1 + lsls r0, 24 + lsrs r2, r0, 24 + cmp r2, 0x1D + bls _0813AF24 +_0813AF38: + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813AEB4 + + thumb_func_start sub_813AF48 +sub_813AF48: @ 813AF48 + push {r4,r5,lr} + ldr r0, =sub_813A600 + bl FindTaskIdByFunc + lsls r0, 24 + lsrs r5, r0, 24 + cmp r5, 0xFF + beq _0813AFB6 + lsls r4, r5, 2 + adds r4, r5 + lsls r4, 3 + ldr r0, =gTasks + adds r4, r0 + ldrh r0, [r4, 0x24] + lsls r0, 24 + lsrs r0, 24 + movs r1, 0 + movs r2, 0 + bl sub_81AE6C8 + ldr r0, =gUnknown_0203AB64 + ldr r0, [r0] + bl Free + ldrh r0, [r4, 0x22] + lsls r0, 24 + lsrs r0, 24 + movs r1, 0x1 + bl sub_8198070 + ldrh r0, [r4, 0x22] + lsls r0, 24 + lsrs r0, 24 + movs r1, 0 + bl FillWindowPixelBuffer + ldrh r0, [r4, 0x22] + lsls r0, 24 + lsrs r0, 24 + bl ClearWindowTilemap + ldrh r0, [r4, 0x22] + lsls r0, 24 + lsrs r0, 24 + movs r1, 0x2 + bl CopyWindowToVram + ldrh r0, [r4, 0x22] + lsls r0, 24 + lsrs r0, 24 + bl RemoveWindow + adds r0, r5, 0 + bl DestroyTask +_0813AFB6: + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813AF48 + + thumb_func_start sub_813AFC8 +sub_813AFC8: @ 813AFC8 + push {lr} + ldr r0, =task_deoxys_sound + movs r1, 0x8 + bl CreateTask + pop {r0} + bx r0 + .pool + thumb_func_end sub_813AFC8 + + thumb_func_start task_deoxys_sound +task_deoxys_sound: @ 813AFDC + push {r4-r7,lr} + mov r7, r8 + push {r7} + lsls r0, 24 + lsrs r7, r0, 24 + ldr r0, =0x000008d4 + bl FlagGet + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x1 + bne _0813B004 + ldr r1, =gSpecialVar_Result + movs r0, 0x3 + b _0813B06A + .pool +_0813B004: + ldr r0, =0x00004035 + mov r8, r0 + bl VarGet + lsls r0, 16 + lsrs r5, r0, 16 + ldr r4, =0x00004034 + adds r0, r4, 0 + bl VarGet + lsls r0, 16 + lsrs r6, r0, 16 + adds r0, r4, 0 + movs r1, 0 + bl VarSet + cmp r5, 0 + beq _0813B05C + ldr r0, =gUnknown_085B33F6 + subs r1, r5, 0x1 + adds r1, r0 + ldrb r0, [r1] + cmp r0, r6 + bcs _0813B05C + movs r0, 0 + bl sub_813B0B4 + mov r0, r8 + movs r1, 0 + bl VarSet + ldr r1, =gSpecialVar_Result + movs r0, 0 + strh r0, [r1] + b _0813B070 + .pool +_0813B05C: + cmp r5, 0xA + bne _0813B080 + ldr r0, =0x000008d4 + bl FlagSet + ldr r1, =gSpecialVar_Result + movs r0, 0x2 +_0813B06A: + strh r0, [r1] + bl EnableBothScriptContexts +_0813B070: + adds r0, r7, 0 + bl DestroyTask + b _0813B0A2 + .pool +_0813B080: + adds r0, r5, 0x1 + lsls r0, 16 + lsrs r5, r0, 16 + lsls r0, r5, 24 + lsrs r0, 24 + bl sub_813B0B4 + ldr r0, =0x00004035 + adds r1, r5, 0 + bl VarSet + ldr r1, =gSpecialVar_Result + movs r0, 0x1 + strh r0, [r1] + adds r0, r7, 0 + bl DestroyTask +_0813B0A2: + pop {r3} + mov r8, r3 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end task_deoxys_sound + + thumb_func_start sub_813B0B4 +sub_813B0B4: @ 813B0B4 + push {r4,r5,lr} + sub sp, 0x4 + lsls r0, 24 + lsrs r4, r0, 24 + lsls r0, r4, 5 + ldr r1, =gUnknown_085B3280 + adds r0, r1 + movs r1, 0xD0 + lsls r1, 1 + movs r2, 0x8 + bl LoadPalette + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + ldrb r1, [r0, 0x5] + ldrb r2, [r0, 0x4] + movs r0, 0x1 + mov r3, sp + bl TryGetFieldObjectIdByLocalIdAndMap + cmp r4, 0 + bne _0813B0F0 + movs r0, 0xC4 + bl PlaySE + b _0813B0F8 + .pool +_0813B0F0: + movs r0, 0x82 + lsls r0, 1 + bl PlaySE +_0813B0F8: + ldr r0, =sub_813B160 + movs r1, 0x8 + bl CreateTask + ldr r3, =gFieldEffectArguments + movs r0, 0x1 + str r0, [r3] + movs r0, 0x3A + str r0, [r3, 0x4] + movs r0, 0x1A + str r0, [r3, 0x8] + ldr r0, =gUnknown_085B33E0 + lsls r2, r4, 1 + adds r1, r2, r0 + ldrb r1, [r1] + str r1, [r3, 0xC] + adds r0, 0x1 + adds r0, r2, r0 + ldrb r0, [r0] + str r0, [r3, 0x10] + adds r5, r2, 0 + cmp r4, 0 + bne _0813B138 + movs r0, 0x3C + b _0813B13A + .pool +_0813B138: + movs r0, 0x5 +_0813B13A: + str r0, [r3, 0x14] + movs r0, 0x42 + bl FieldEffectStart + ldr r0, =gUnknown_085B33E0 + adds r1, r5, r0 + ldrb r1, [r1] + adds r0, 0x1 + adds r0, r5, r0 + ldrb r2, [r0] + movs r0, 0x1 + bl Overworld_SetMapObjTemplateCoords + add sp, 0x4 + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813B0B4 + + thumb_func_start sub_813B160 +sub_813B160: @ 813B160 + push {r4,lr} + lsls r0, 24 + lsrs r4, r0, 24 + movs r0, 0x42 + bl FieldEffectActiveListContains + lsls r0, 24 + cmp r0, 0 + bne _0813B17C + bl EnableBothScriptContexts + adds r0, r4, 0 + bl DestroyTask +_0813B17C: + pop {r4} + pop {r0} + bx r0 + thumb_func_end sub_813B160 + + thumb_func_start increment_var_x4026_on_birth_island_modulo_100 +increment_var_x4026_on_birth_island_modulo_100: @ 813B184 + push {r4,lr} + ldr r4, =0x00004034 + adds r0, r4, 0 + bl VarGet + lsls r0, 16 + lsrs r2, r0, 16 + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + ldrh r1, [r0, 0x4] + ldr r0, =0x00003a1a + cmp r1, r0 + bne _0813B1C8 + adds r0, r2, 0x1 + lsls r0, 16 + lsrs r2, r0, 16 + cmp r2, 0x63 + bls _0813B1C0 + adds r0, r4, 0 + movs r1, 0 + bl VarSet + b _0813B1C8 + .pool +_0813B1C0: + adds r0, r4, 0 + adds r1, r2, 0 + bl VarSet +_0813B1C8: + pop {r4} + pop {r0} + bx r0 + thumb_func_end increment_var_x4026_on_birth_island_modulo_100 + + thumb_func_start sub_813B1D0 +sub_813B1D0: @ 813B1D0 + push {lr} + ldr r0, =0x00004035 + bl VarGet + lsls r0, 24 + lsrs r0, 19 + ldr r1, =gUnknown_085B3280 + adds r0, r1 + movs r1, 0xD0 + lsls r1, 1 + movs r2, 0x8 + bl LoadPalette + movs r0, 0x80 + lsls r0, 19 + movs r1, 0x10 + movs r2, 0 + bl BlendPalettes + pop {r0} + bx r0 + .pool + thumb_func_end sub_813B1D0 + + thumb_func_start set_unknown_box_id +@ void set_unknown_box_id(char id) +set_unknown_box_id: @ 813B204 + ldr r1, =gUnknown_0203AB6F + strb r0, [r1] + bx lr + .pool + thumb_func_end set_unknown_box_id + + thumb_func_start get_unknown_box_id +get_unknown_box_id: @ 813B210 + ldr r0, =gUnknown_0203AB6F + ldrb r0, [r0] + bx lr + .pool + thumb_func_end get_unknown_box_id + + thumb_func_start sub_813B21C +sub_813B21C: @ 813B21C + push {r4,r5,lr} + ldr r5, =0x000008d7 + adds r0, r5, 0 + bl FlagGet + lsls r0, 24 + cmp r0, 0 + bne _0813B258 + bl StorageGetCurrentBox + adds r4, r0, 0 + lsls r4, 24 + lsrs r4, 24 + ldr r0, =0x00004036 + bl VarGet + lsls r0, 16 + lsrs r0, 16 + cmp r4, r0 + beq _0813B258 + adds r0, r5, 0 + bl FlagSet + movs r0, 0x1 + b _0813B25A + .pool +_0813B258: + movs r0, 0 +_0813B25A: + pop {r4,r5} + pop {r1} + bx r1 + thumb_func_end sub_813B21C + + thumb_func_start sub_813B260 +sub_813B260: @ 813B260 + push {r4-r7,lr} + ldr r0, =0x00004036 + bl VarGet + lsls r0, 24 + lsrs r0, 24 + bl set_unknown_box_id + bl StorageGetCurrentBox + lsls r0, 24 + lsrs r4, r0, 24 +_0813B278: + movs r5, 0 + lsls r6, r4, 24 + lsls r7, r4, 16 +_0813B27E: + lsls r1, r5, 24 + lsrs r1, 24 + lsrs r0, r6, 24 + bl GetBoxedMonPtr + movs r1, 0xB + movs r2, 0 + bl GetBoxMonData + cmp r0, 0 + bne _0813B2C0 + bl get_unknown_box_id + lsls r0, 16 + lsrs r0, 16 + cmp r0, r4 + beq _0813B2A6 + ldr r0, =0x000008d7 + bl FlagClear +_0813B2A6: + ldr r0, =0x00004036 + lsrs r1, r7, 16 + bl VarSet + bl sub_813B21C + lsls r0, 24 + lsrs r0, 24 + b _0813B2DC + .pool +_0813B2C0: + adds r5, 0x1 + cmp r5, 0x1D + ble _0813B27E + adds r4, 0x1 + cmp r4, 0xE + bne _0813B2CE + movs r4, 0 +_0813B2CE: + bl StorageGetCurrentBox + lsls r0, 24 + lsrs r0, 24 + cmp r4, r0 + bne _0813B278 + movs r0, 0 +_0813B2DC: + pop {r4-r7} + pop {r1} + bx r1 + thumb_func_end sub_813B260 + + thumb_func_start sub_813B2E4 +sub_813B2E4: @ 813B2E4 + push {r4,lr} + bl Random + lsls r0, 16 + lsrs r4, r0, 16 + ldr r0, =0x00004038 + movs r1, 0 + bl VarSet + movs r0, 0xDF + lsls r0, 1 + bl FlagGet + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x1 + beq _0813B340 + ldr r0, =0x000001bf + bl FlagGet + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x1 + bne _0813B330 + ldr r0, =0x00004037 + movs r1, 0x7 + ands r4, r1 + adds r1, r4, 0 + adds r1, 0x9 + bl VarSet + b _0813B36A + .pool +_0813B330: + movs r0, 0x1 + ands r4, r0 + cmp r4, 0 + bne _0813B354 + bl Random + lsls r0, 16 + lsrs r4, r0, 16 +_0813B340: + ldr r0, =0x00004037 + movs r1, 0x7 + ands r4, r1 + adds r1, r4, 0x1 + bl VarSet + b _0813B36A + .pool +_0813B354: + bl Random + lsls r0, 16 + lsrs r4, r0, 16 + ldr r0, =0x00004037 + movs r1, 0x7 + ands r4, r1 + adds r1, r4, 0 + adds r1, 0x9 + bl VarSet +_0813B36A: + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813B2E4 + + thumb_func_start sub_813B374 +sub_813B374: @ 813B374 + push {r4,lr} + ldr r0, =0x00004037 + bl VarGet + adds r4, r0, 0 + lsls r4, 16 + lsrs r4, 16 + ldr r0, =gStringVar1 + ldr r2, =gUnknown_085B3400 + subs r1, r4, 0x1 + adds r1, r2 + ldrb r1, [r1] + movs r2, 0 + bl GetMapName + cmp r4, 0x8 + bls _0813B3A8 + movs r0, 0x1 + b _0813B3AA + .pool +_0813B3A8: + movs r0, 0 +_0813B3AA: + pop {r4} + pop {r1} + bx r1 + thumb_func_end sub_813B374 + + thumb_func_start sub_813B3B0 +sub_813B3B0: @ 813B3B0 + push {r4-r6,lr} + ldr r5, =0x00004038 + adds r0, r5, 0 + bl VarGet + lsls r0, 16 + lsrs r4, r0, 16 + ldr r0, =0x00004037 + bl VarGet + lsls r0, 16 + lsrs r6, r0, 16 + cmp r6, 0 + beq _0813B47C + adds r0, r4, 0x1 + lsls r0, 16 + lsrs r4, r0, 16 + ldr r0, =0x000003e7 + cmp r4, r0 + bls _0813B474 + adds r0, r5, 0 + movs r1, 0 + bl VarSet + ldr r0, =gSaveBlock1Ptr + ldr r1, [r0] + movs r0, 0x4 + ldrsb r0, [r1, r0] + cmp r0, 0x18 + bne _0813B414 + movs r0, 0x5 + ldrsb r0, [r1, r0] + cmp r0, 0x69 + bgt _0813B414 + cmp r0, 0x65 + blt _0813B414 + ldr r0, =0x00004039 + movs r1, 0x1 + b _0813B478 + .pool +_0813B414: + ldr r0, =gSaveBlock1Ptr + ldr r2, [r0] + movs r1, 0x4 + ldrsb r1, [r2, r1] + adds r3, r0, 0 + cmp r1, 0 + bne _0813B444 + movs r0, 0x5 + ldrsb r0, [r2, r0] + cmp r0, 0x34 + beq _0813B436 + cmp r0, 0x34 + blt _0813B444 + cmp r0, 0x38 + bgt _0813B444 + cmp r0, 0x36 + blt _0813B444 +_0813B436: + ldr r0, =0x00004039 + movs r1, 0x1 + b _0813B478 + .pool +_0813B444: + ldr r3, [r3] + movs r2, 0x5 + ldrsb r2, [r3, r2] + ldr r1, =gUnknown_085B3410 + subs r0, r6, 0x1 + adds r0, r1 + ldrb r0, [r0] + cmp r2, r0 + bne _0813B468 + movs r0, 0x4 + ldrsb r0, [r3, r0] + cmp r0, 0 + bne _0813B468 + movs r0, 0x1 + b _0813B47E + .pool +_0813B468: + ldr r0, =0x00004037 + movs r1, 0 + b _0813B478 + .pool +_0813B474: + adds r0, r5, 0 + adds r1, r4, 0 +_0813B478: + bl VarSet +_0813B47C: + movs r0, 0 +_0813B47E: + pop {r4-r6} + pop {r1} + bx r1 + thumb_func_end sub_813B3B0 + + thumb_func_start sub_813B484 +sub_813B484: @ 813B484 + push {lr} + movs r0, 0x2 + bl sub_80AB104 + pop {r0} + bx r0 + thumb_func_end sub_813B484 + + thumb_func_start sub_813B490 +sub_813B490: @ 813B490 + push {r4-r7,lr} + movs r3, 0 + ldr r0, =gSaveBlock1Ptr + ldr r4, [r0] + movs r6, 0x4 + ldrsb r6, [r4, r6] + ldr r5, =gUnknown_085B3420 + adds r0, r5, 0x2 + mov r12, r0 + adds r7, r5, 0x1 +_0813B4A4: + lsls r0, r3, 1 + adds r2, r0, r3 + adds r0, r2, r5 + ldrb r0, [r0] + cmp r6, r0 + bne _0813B4CC + movs r1, 0x5 + ldrsb r1, [r4, r1] + adds r0, r2, r7 + ldrb r0, [r0] + cmp r1, r0 + bne _0813B4CC + mov r1, r12 + adds r0, r2, r1 + ldrb r0, [r0] + b _0813B4D8 + .pool +_0813B4CC: + adds r0, r3, 0x1 + lsls r0, 24 + lsrs r3, r0, 24 + cmp r3, 0xB + bls _0813B4A4 + movs r0, 0x1 +_0813B4D8: + pop {r4-r7} + pop {r1} + bx r1 + thumb_func_end sub_813B490 + + thumb_func_start sub_813B4E0 +sub_813B4E0: @ 813B4E0 + push {lr} + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + bl sub_81D15CC + cmp r0, 0 + blt _0813B50C + movs r1, 0xAE + lsls r1, 1 + adds r0, r1 + lsls r0, 16 + lsrs r0, 16 + bl FlagGet + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x1 + bne _0813B50C + movs r0, 0x1 + b _0813B50E + .pool +_0813B50C: + movs r0, 0 +_0813B50E: + pop {r1} + bx r1 + thumb_func_end sub_813B4E0 + + thumb_func_start sub_813B514 +sub_813B514: @ 813B514 + push {lr} + ldr r0, =0x0000403f + bl VarGet + lsls r0, 16 + cmp r0, 0 + beq _0813B52C + movs r0, 0x1 + b _0813B52E + .pool +_0813B52C: + movs r0, 0 +_0813B52E: + pop {r1} + bx r1 + thumb_func_end sub_813B514 + + thumb_func_start sub_813B534 +sub_813B534: @ 813B534 + push {lr} + ldr r2, =gUnknown_0203AB70 + ldr r1, =gBattleTypeFlags + ldr r0, [r1] + str r0, [r2] + movs r0, 0 + str r0, [r1] + ldr r0, =gReceivedRemoteLinkPlayers + ldrb r0, [r0] + cmp r0, 0 + bne _0813B552 + ldr r0, =sub_80B3AF8 + movs r1, 0x5 + bl CreateTask +_0813B552: + pop {r0} + bx r0 + .pool + thumb_func_end sub_813B534 + + thumb_func_start sub_813B568 +sub_813B568: @ 813B568 + push {lr} + ldr r0, =sub_813B57C + movs r1, 0x5 + bl CreateTask + pop {r0} + bx r0 + .pool + thumb_func_end sub_813B568 + + thumb_func_start sub_813B57C +sub_813B57C: @ 813B57C + push {r4,r5,lr} + lsls r0, 24 + lsrs r4, r0, 24 + ldr r1, =gTasks + lsls r0, r4, 2 + adds r0, r4 + lsls r0, 3 + adds r0, r1 + movs r1, 0x8 + ldrsh r0, [r0, r1] + cmp r0, 0x9 + bls _0813B596 + b _0813B7C6 +_0813B596: + lsls r0, 2 + ldr r1, =_0813B5A8 + adds r0, r1 + ldr r0, [r0] + mov pc, r0 + .pool + .align 2, 0 +_0813B5A8: + .4byte _0813B5D0 + .4byte _0813B5E4 + .4byte _0813B614 + .4byte _0813B6B4 + .4byte _0813B6E4 + .4byte _0813B728 + .4byte _0813B764 + .4byte _0813B772 + .4byte _0813B784 + .4byte _0813B7A8 +_0813B5D0: + ldr r0, =sub_80B3AF8 + bl FuncIsActiveTask + lsls r0, 24 + cmp r0, 0 + beq _0813B5DE + b _0813B7C6 +_0813B5DE: + b _0813B790 + .pool +_0813B5E4: + bl sub_800A520 + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x1 + beq _0813B5F2 + b _0813B7C6 +_0813B5F2: + bl GetMultiplayerId + lsls r0, 24 + cmp r0, 0 + bne _0813B5FE + b _0813B790 +_0813B5FE: + bl bitmask_all_link_players_but_self + lsls r0, 24 + lsrs r0, 24 + ldr r1, =gSpecialVar_0x8004 + movs r2, 0x2 + bl SendBlock + b _0813B708 + .pool +_0813B614: + bl GetBlockReceivedStatus + movs r1, 0x2 + ands r1, r0 + cmp r1, 0 + bne _0813B622 + b _0813B7C6 +_0813B622: + bl GetMultiplayerId + lsls r0, 24 + cmp r0, 0 + beq _0813B62E + b _0813B790 +_0813B62E: + ldr r5, =gSpecialVar_0x8005 + ldr r0, =gBlockRecvBuffer + movs r1, 0x80 + lsls r1, 1 + adds r0, r1 + ldrh r0, [r0] + strh r0, [r5] + movs r0, 0x1 + bl ResetBlockReceivedFlag + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + cmp r0, 0x1 + bne _0813B668 + ldrh r1, [r5] + cmp r1, 0x1 + bne _0813B668 + ldr r0, =gSpecialVar_Result + strh r1, [r0] + b _0813B790 + .pool +_0813B668: + ldr r0, =gSpecialVar_0x8004 + ldrh r1, [r0] + adds r2, r0, 0 + cmp r1, 0 + bne _0813B68C + ldr r0, =gSpecialVar_0x8005 + ldrh r0, [r0] + cmp r0, 0x1 + bne _0813B68C + ldr r1, =gSpecialVar_Result + movs r0, 0x2 + b _0813B6AC + .pool +_0813B68C: + ldrh r0, [r2] + cmp r0, 0x1 + bne _0813B6A8 + ldr r0, =gSpecialVar_0x8005 + ldrh r0, [r0] + cmp r0, 0 + bne _0813B6A8 + ldr r1, =gSpecialVar_Result + movs r0, 0x3 + b _0813B6AC + .pool +_0813B6A8: + ldr r1, =gSpecialVar_Result + movs r0, 0 +_0813B6AC: + strh r0, [r1] + b _0813B790 + .pool +_0813B6B4: + bl sub_800A520 + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x1 + beq _0813B6C2 + b _0813B7C6 +_0813B6C2: + bl GetMultiplayerId + lsls r0, 24 + cmp r0, 0 + bne _0813B790 + bl bitmask_all_link_players_but_self + lsls r0, 24 + lsrs r0, 24 + ldr r1, =gSpecialVar_Result + movs r2, 0x2 + bl SendBlock + b _0813B708 + .pool +_0813B6E4: + bl GetBlockReceivedStatus + movs r1, 0x1 + ands r1, r0 + cmp r1, 0 + beq _0813B7C6 + bl GetMultiplayerId + lsls r0, 24 + cmp r0, 0 + beq _0813B790 + ldr r1, =gSpecialVar_Result + ldr r0, =gBlockRecvBuffer + ldrh r0, [r0] + strh r0, [r1] + movs r0, 0 + bl ResetBlockReceivedFlag +_0813B708: + ldr r1, =gTasks + lsls r0, r4, 2 + adds r0, r4 + lsls r0, 3 + adds r0, r1 + ldrh r1, [r0, 0x8] + adds r1, 0x1 + strh r1, [r0, 0x8] + b _0813B7C6 + .pool +_0813B728: + bl GetMultiplayerId + lsls r0, 24 + cmp r0, 0 + bne _0813B74C + ldr r0, =gSpecialVar_Result + ldrh r0, [r0] + cmp r0, 0x2 + bne _0813B790 + ldr r0, =gText_YourPartnerHasRetired + bl ShowFieldAutoScrollMessage + b _0813B790 + .pool +_0813B74C: + ldr r0, =gSpecialVar_Result + ldrh r0, [r0] + cmp r0, 0x3 + bne _0813B790 + ldr r0, =gText_YourPartnerHasRetired + bl ShowFieldAutoScrollMessage + b _0813B790 + .pool +_0813B764: + movs r0, 0 + bl IsTextPrinterActive + lsls r0, 16 + cmp r0, 0 + bne _0813B7C6 + b _0813B790 +_0813B772: + bl sub_800A520 + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x1 + bne _0813B7C6 + bl sub_800ADF8 + b _0813B790 +_0813B784: + bl sub_800A520 + lsls r0, 24 + lsrs r0, 24 + cmp r0, 0x1 + bne _0813B7C6 +_0813B790: + ldr r0, =gTasks + lsls r1, r4, 2 + adds r1, r4 + lsls r1, 3 + adds r1, r0 + ldrh r0, [r1, 0x8] + adds r0, 0x1 + strh r0, [r1, 0x8] + b _0813B7C6 + .pool +_0813B7A8: + ldr r0, =gLinkVSyncDisabled + ldrb r0, [r0] + cmp r0, 0 + bne _0813B7B4 + bl sub_800AC34 +_0813B7B4: + ldr r0, =gBattleTypeFlags + ldr r1, =gUnknown_0203AB70 + ldr r1, [r1] + str r1, [r0] + bl EnableBothScriptContexts + adds r0, r4, 0 + bl DestroyTask +_0813B7C6: + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813B57C + + thumb_func_start sub_813B7D8 +sub_813B7D8: @ 813B7D8 + push {lr} + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + cmp r0, 0 + bne _0813B7F8 + ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music + movs r0, 0 + movs r1, 0x1 + bl sub_81D6720 + b _0813B802 + .pool +_0813B7F8: + ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music + movs r0, 0x1 + movs r1, 0 + bl sub_81D6720 +_0813B802: + pop {r0} + bx r0 + .pool + thumb_func_end sub_813B7D8 + + thumb_func_start sub_813B80C +sub_813B80C: @ 813B80C + push {lr} + ldr r0, =sub_813B824 + movs r1, 0x8 + bl CreateTask + movs r0, 0x9D + bl PlaySE + pop {r0} + bx r0 + .pool + thumb_func_end sub_813B80C + + thumb_func_start sub_813B824 +sub_813B824: @ 813B824 + push {r4,r5,lr} + lsls r0, 24 + lsrs r0, 24 + adds r5, r0, 0 + lsls r0, r5, 2 + adds r0, r5 + lsls r0, 3 + ldr r1, =gTasks + 0x8 + adds r4, r0, r1 + ldrh r0, [r4, 0x2] + adds r0, 0x1 + strh r0, [r4, 0x2] + movs r0, 0x2 + ldrsh r1, [r4, r0] + ldr r0, =gSpecialVar_0x8005 + ldrh r0, [r0] + cmp r1, r0 + bne _0813B858 + ldrh r0, [r4] + adds r0, 0x1 + strh r0, [r4] + movs r0, 0 + strh r0, [r4, 0x2] + movs r0, 0x9D + bl PlaySE +_0813B858: + movs r0, 0 + ldrsh r1, [r4, r0] + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + subs r0, 0x1 + cmp r1, r0 + bne _0813B86C + adds r0, r5, 0 + bl DestroyTask +_0813B86C: + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813B824 + + thumb_func_start sub_813B880 +sub_813B880: @ 813B880 + push {lr} + ldr r0, =_fwalk + movs r1, 0x8 + bl CreateTask + lsls r0, 24 + lsrs r0, 24 + ldr r2, =gTasks + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 3 + adds r1, r2 + movs r2, 0 + movs r0, 0x4 + strh r0, [r1, 0x8] + strh r0, [r1, 0xA] + strh r0, [r1, 0xC] + strh r2, [r1, 0xE] + pop {r0} + bx r0 + .pool + thumb_func_end sub_813B880 + + thumb_func_start _fwalk +_fwalk: @ 813B8B0 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + lsls r0, 24 + lsrs r0, 24 + mov r9, r0 + lsls r0, 2 + add r0, r9 + lsls r0, 3 + ldr r1, =gTasks + 0x8 + adds r5, r0, r1 + movs r0, 0x6 + ldrsh r1, [r5, r0] + lsls r1, 1 + adds r1, r5 + ldrh r0, [r1] + subs r0, 0x1 + strh r0, [r1] + movs r1, 0x6 + ldrsh r0, [r5, r1] + lsls r0, 1 + adds r0, r5 + movs r2, 0 + ldrsh r0, [r0, r2] + cmp r0, 0 + bne _0813B94E + movs r6, 0 +_0813B8EA: + movs r4, 0 + lsls r3, r6, 3 + mov r10, r3 + adds r7, r6, 0x1 + mov r8, r7 +_0813B8F4: + ldr r0, =gSaveBlock1Ptr + ldr r1, [r0] + movs r2, 0 + ldrsh r0, [r1, r2] + adds r0, r4 + adds r0, 0x6 + movs r3, 0x2 + ldrsh r1, [r1, r3] + adds r1, r6 + adds r1, 0x4 + ldr r7, =0x00000201 + adds r2, r4, r7 + add r2, r10 + movs r7, 0x6 + ldrsh r3, [r5, r7] + lsls r3, 5 + adds r2, r3 + lsls r2, 16 + lsrs r2, 16 + bl MapGridSetMetatileIdAt + adds r0, r4, 0x1 + lsls r0, 24 + lsrs r4, r0, 24 + cmp r4, 0x2 + bls _0813B8F4 + mov r1, r8 + lsls r0, r1, 24 + lsrs r6, r0, 24 + cmp r6, 0x3 + bls _0813B8EA + bl DrawWholeMapView + ldrh r0, [r5, 0x6] + adds r0, 0x1 + strh r0, [r5, 0x6] + lsls r0, 16 + asrs r0, 16 + cmp r0, 0x3 + bne _0813B94E + mov r0, r9 + bl DestroyTask + bl EnableBothScriptContexts +_0813B94E: + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r0} + bx r0 + .pool + thumb_func_end _fwalk + + thumb_func_start sub_813B968 +sub_813B968: @ 813B968 + push {r4,r5,lr} + ldr r5, =gSpecialVar_Result + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + movs r1, 0x7 + bl __udivsi3 + strh r0, [r5] + ldrh r4, [r5] + adds r0, r4, 0 + movs r1, 0x14 + bl __udivsi3 + lsls r0, 16 + lsrs r0, 16 + lsls r1, r0, 2 + adds r1, r0 + lsls r1, 2 + subs r4, r1 + strh r4, [r5] + pop {r4,r5} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813B968 + + thumb_func_start sub_813B9A0 +sub_813B9A0: @ 813B9A0 + push {lr} + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + ldrh r1, [r0, 0x1C] + movs r0, 0xB0 + lsls r0, 4 + cmp r1, r0 + bne _0813B9B6 + movs r0, 0x3 + bl Overworld_SetHealLocationWarp +_0813B9B6: + pop {r0} + bx r0 + .pool + thumb_func_end sub_813B9A0 + + thumb_func_start sub_813B9C0 +sub_813B9C0: @ 813B9C0 + push {r4,lr} + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + movs r1, 0x4 + ldrsb r1, [r0, r1] + lsls r1, 8 + ldrb r0, [r0, 0x5] + lsls r0, 24 + asrs r0, 24 + adds r0, r1 + lsls r0, 16 + lsrs r3, r0, 16 + ldr r2, =gUnknown_085B3444 + ldrh r0, [r2] + ldr r1, =0x0000ffff + cmp r0, r1 + beq _0813BA06 + adds r4, r1, 0 + adds r1, r2, 0 +_0813B9E6: + ldrh r0, [r2] + cmp r0, r3 + bne _0813B9FC + movs r0, 0x1 + b _0813BA08 + .pool +_0813B9FC: + adds r1, 0x2 + adds r2, 0x2 + ldrh r0, [r1] + cmp r0, r4 + bne _0813B9E6 +_0813BA06: + movs r0, 0 +_0813BA08: + pop {r4} + pop {r1} + bx r1 + thumb_func_end sub_813B9C0 + + thumb_func_start ResetFanClub +ResetFanClub: @ 813BA10 + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + ldr r2, =0x0000141e + adds r1, r0, r2 + movs r2, 0 + strh r2, [r1] + movs r1, 0xA1 + lsls r1, 5 + adds r0, r1 + strh r2, [r0] + bx lr + .pool + thumb_func_end ResetFanClub + + thumb_func_start sub_813BA30 +sub_813BA30: @ 813BA30 + push {lr} + bl sub_813BF44 + lsls r0, 24 + cmp r0, 0 + beq _0813BA52 + bl sub_813BCE8 + ldr r0, =gSaveBlock1Ptr + ldr r1, [r0] + ldr r0, =gSaveBlock2Ptr + ldr r0, [r0] + ldrh r0, [r0, 0xE] + movs r2, 0xA1 + lsls r2, 5 + adds r1, r2 + strh r0, [r1] +_0813BA52: + pop {r0} + bx r0 + .pool + thumb_func_end sub_813BA30 + + thumb_func_start sub_813BA60 +sub_813BA60: @ 813BA60 + push {r4,lr} + ldr r4, =gSaveBlock1Ptr + ldr r0, [r4] + ldr r1, =0x0000141e + adds r0, r1 + ldrh r0, [r0] + lsrs r0, 7 + movs r1, 0x1 + ands r0, r1 + cmp r0, 0 + bne _0813BAB6 + bl sub_813BF60 + bl sub_813BD84 + ldr r1, [r4] + ldr r0, =gSaveBlock2Ptr + ldr r0, [r0] + ldrh r0, [r0, 0xE] + movs r2, 0xA1 + lsls r2, 5 + adds r1, r2 + strh r0, [r1] + ldr r0, =0x00000315 + bl FlagClear + ldr r0, =0x00000316 + bl FlagClear + ldr r0, =0x00000317 + bl FlagClear + movs r0, 0xC6 + lsls r0, 2 + bl FlagClear + ldr r0, =0x000002da + bl FlagClear + ldr r0, =0x00004095 + movs r1, 0x1 + bl VarSet +_0813BAB6: + pop {r4} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813BA60 + + thumb_func_start sub_813BADC +sub_813BADC: @ 813BADC + push {r4-r6,lr} + lsls r0, 24 + lsrs r6, r0, 24 + ldr r0, =0x00004095 + bl VarGet + lsls r0, 16 + lsrs r0, 16 + cmp r0, 0x2 + bne _0813BB58 + ldr r4, =gSaveBlock1Ptr + ldr r0, [r4] + ldr r5, =0x0000141e + adds r3, r0, r5 + ldrh r2, [r3] + movs r1, 0x7F + ands r1, r2 + ldr r0, =gUnknown_085B3470 + adds r0, r6, r0 + ldrb r0, [r0] + adds r1, r0 + cmp r1, 0x13 + ble _0813BB54 + bl sub_813BCA8 + lsls r0, 16 + lsrs r0, 16 + cmp r0, 0x2 + bhi _0813BB3C + bl sub_813BB74 + ldr r0, [r4] + adds r0, r5 + ldrh r2, [r0] + ldr r1, =0x0000ff80 + ands r1, r2 + strh r1, [r0] + b _0813BB58 + .pool +_0813BB3C: + ldr r2, [r4] + adds r2, r5 + ldrh r1, [r2] + ldr r0, =0x0000ff80 + ands r0, r1 + movs r1, 0x14 + orrs r0, r1 + strh r0, [r2] + b _0813BB58 + .pool +_0813BB54: + adds r0, r2, r0 + strh r0, [r3] +_0813BB58: + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + ldr r1, =0x0000141e + adds r0, r1 + ldrb r1, [r0] + movs r0, 0x7F + ands r0, r1 + pop {r4-r6} + pop {r1} + bx r1 + .pool + thumb_func_end sub_813BADC + + thumb_func_start sub_813BB74 +sub_813BB74: @ 813BB74 + push {r4-r7,lr} + sub sp, 0x8 + movs r3, 0 + movs r5, 0 + ldr r7, =gSaveBlock1Ptr + ldr r2, =0x0000141e + movs r6, 0x1 +_0813BB82: + ldr r0, [r7] + adds r0, r2 + ldrh r1, [r0] + ldr r0, =gUnknown_085B3474 + adds r0, r5, r0 + ldrb r4, [r0] + asrs r1, r4 + ands r1, r6 + cmp r1, 0 + bne _0813BBC8 + adds r3, r5, 0 + str r2, [sp] + str r3, [sp, 0x4] + bl Random + adds r1, r6, 0 + ands r1, r0 + ldr r2, [sp] + ldr r3, [sp, 0x4] + cmp r1, 0 + beq _0813BBC8 + ldr r0, [r7] + adds r0, r2 + adds r1, r6, 0 + lsls r1, r4 + ldrh r2, [r0] + orrs r1, r2 + strh r1, [r0] + b _0813BBEA + .pool +_0813BBC8: + adds r0, r5, 0x1 + lsls r0, 24 + lsrs r5, r0, 24 + cmp r5, 0x7 + bls _0813BB82 + ldr r0, =gSaveBlock1Ptr + ldr r2, [r0] + ldr r0, =0x0000141e + adds r2, r0 + ldr r1, =gUnknown_085B3474 + adds r1, r3, r1 + movs r0, 0x1 + ldrb r1, [r1] + lsls r0, r1 + ldrh r1, [r2] + orrs r0, r1 + strh r0, [r2] +_0813BBEA: + adds r0, r3, 0 + add sp, 0x8 + pop {r4-r7} + pop {r1} + bx r1 + .pool + thumb_func_end sub_813BB74 + + thumb_func_start sub_813BC00 +sub_813BC00: @ 813BC00 + push {r4-r7,lr} + mov r7, r10 + mov r6, r9 + mov r5, r8 + push {r5-r7} + movs r0, 0 + mov r10, r0 + bl sub_813BCA8 + lsls r0, 16 + lsrs r0, 16 + cmp r0, 0x1 + bne _0813BC2E + movs r0, 0 + b _0813BC8E +_0813BC1E: + mov r1, r8 + ldr r0, [r1] + add r0, r9 + lsls r4, r6 + ldrh r1, [r0] + eors r4, r1 + strh r4, [r0] + b _0813BC8C +_0813BC2E: + movs r5, 0 + ldr r2, =gSaveBlock1Ptr + mov r8, r2 + ldr r0, =0x0000141e + mov r9, r0 + movs r4, 0x1 +_0813BC3A: + mov r1, r8 + ldr r0, [r1] + add r0, r9 + ldrh r1, [r0] + ldr r7, =gUnknown_085B347C + adds r0, r5, r7 + ldrb r6, [r0] + asrs r1, r6 + ands r1, r4 + cmp r1, 0 + beq _0813BC5E + mov r10, r5 + bl Random + adds r1, r4, 0 + ands r1, r0 + cmp r1, 0 + bne _0813BC1E +_0813BC5E: + adds r0, r5, 0x1 + lsls r0, 24 + lsrs r5, r0, 24 + cmp r5, 0x7 + bls _0813BC3A + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + ldr r2, =0x0000141e + adds r4, r0, r2 + ldrh r1, [r4] + mov r2, r10 + adds r0, r2, r7 + ldrb r2, [r0] + adds r0, r1, 0 + asrs r0, r2 + movs r3, 0x1 + ands r0, r3 + cmp r0, 0 + beq _0813BC8C + adds r0, r3, 0 + lsls r0, r2 + eors r1, r0 + strh r1, [r4] +_0813BC8C: + mov r0, r10 +_0813BC8E: + pop {r3-r5} + mov r8, r3 + mov r9, r4 + mov r10, r5 + pop {r4-r7} + pop {r1} + bx r1 + .pool + thumb_func_end sub_813BC00 + + thumb_func_start sub_813BCA8 +sub_813BCA8: @ 813BCA8 + push {r4,r5,lr} + movs r3, 0 + movs r2, 0 + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + ldr r1, =0x0000141e + adds r0, r1 + ldrh r4, [r0] + movs r5, 0x1 +_0813BCBA: + adds r1, r2, 0 + adds r1, 0x8 + adds r0, r4, 0 + asrs r0, r1 + ands r0, r5 + cmp r0, 0 + beq _0813BCCE + adds r0, r3, 0x1 + lsls r0, 24 + lsrs r3, r0, 24 +_0813BCCE: + adds r0, r2, 0x1 + lsls r0, 24 + lsrs r2, r0, 24 + cmp r2, 0x7 + bls _0813BCBA + adds r0, r3, 0 + pop {r4,r5} + pop {r1} + bx r1 + .pool + thumb_func_end sub_813BCA8 + + thumb_func_start sub_813BCE8 +sub_813BCE8: @ 813BCE8 + push {r4-r6,lr} + movs r5, 0 + ldr r2, =gSaveBlock2Ptr + ldr r0, [r2] + ldrh r1, [r0, 0xE] + ldr r0, =0x000003e6 + cmp r1, r0 + bhi _0813BD58 + adds r6, r2, 0 + b _0813BD32 + .pool +_0813BD04: + ldr r0, [r6] + ldrh r1, [r0, 0xE] + ldr r4, =gSaveBlock1Ptr + ldr r0, [r4] + movs r2, 0xA1 + lsls r2, 5 + adds r0, r2 + ldrh r0, [r0] + subs r1, r0 + cmp r1, 0xB + ble _0813BD58 + bl sub_813BC00 + ldr r0, [r4] + movs r1, 0xA1 + lsls r1, 5 + adds r0, r1 + ldrh r1, [r0] + adds r1, 0xC + strh r1, [r0] + adds r0, r5, 0x1 + lsls r0, 24 + lsrs r5, r0, 24 +_0813BD32: + bl sub_813BCA8 + lsls r0, 16 + lsrs r0, 16 + cmp r0, 0x4 + bhi _0813BD54 + ldr r0, =gSaveBlock1Ptr + ldr r1, [r0] + ldr r0, [r6] + ldrh r0, [r0, 0xE] + movs r2, 0xA1 + lsls r2, 5 + adds r1, r2 + strh r0, [r1] + b _0813BD58 + .pool +_0813BD54: + cmp r5, 0x8 + bne _0813BD04 +_0813BD58: + pop {r4-r6} + pop {r0} + bx r0 + thumb_func_end sub_813BCE8 + + thumb_func_start sub_813BD60 +sub_813BD60: @ 813BD60 + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + ldr r1, =0x0000141e + adds r0, r1 + ldrh r0, [r0] + ldr r1, =gSpecialVar_0x8004 + ldrh r1, [r1] + asrs r0, r1 + movs r1, 0x1 + ands r0, r1 + bx lr + .pool + thumb_func_end sub_813BD60 + + thumb_func_start sub_813BD84 +sub_813BD84: @ 813BD84 + ldr r0, =gSaveBlock1Ptr + ldr r2, [r0] + ldr r0, =0x0000141e + adds r2, r0 + ldrh r1, [r2] + movs r3, 0x80 + lsls r3, 6 + adds r0, r3, 0 + orrs r0, r1 + movs r3, 0x80 + lsls r3, 1 + adds r1, r3, 0 + orrs r0, r1 + movs r3, 0x80 + lsls r3, 3 + adds r1, r3, 0 + orrs r0, r1 + strh r0, [r2] + bx lr + .pool + thumb_func_end sub_813BD84 + + thumb_func_start sub_813BDB4 +sub_813BDB4: @ 813BDB4 + push {lr} + movs r3, 0 + movs r2, 0 + ldr r0, =gSpecialVar_0x8004 + ldrh r0, [r0] + subs r0, 0x8 + cmp r0, 0x7 + bhi _0813BE14 + lsls r0, 2 + ldr r1, =_0813BDD8 + adds r0, r1 + ldr r0, [r0] + mov pc, r0 + .pool + .align 2, 0 +_0813BDD8: + .4byte _0813BE14 + .4byte _0813BE14 + .4byte _0813BDF8 + .4byte _0813BDFE + .4byte _0813BE04 + .4byte _0813BE0A + .4byte _0813BE10 + .4byte _0813BE14 +_0813BDF8: + movs r3, 0 + movs r2, 0x3 + b _0813BE14 +_0813BDFE: + movs r3, 0 + movs r2, 0x1 + b _0813BE14 +_0813BE04: + movs r3, 0x1 + movs r2, 0 + b _0813BE14 +_0813BE0A: + movs r3, 0 + movs r2, 0x4 + b _0813BE14 +_0813BE10: + movs r3, 0x1 + movs r2, 0x5 +_0813BE14: + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + ldr r1, =0x00003150 + adds r0, r1 + adds r1, r3, 0 + bl sub_813BE30 + pop {r0} + bx r0 + .pool + thumb_func_end sub_813BDB4 + + thumb_func_start sub_813BE30 +sub_813BE30: @ 813BE30 + push {r4-r6,lr} + adds r6, r0, 0 + lsls r1, 24 + lsrs r5, r1, 24 + lsls r2, 24 + lsrs r2, 24 + lsls r0, r5, 4 + adds r1, r6, r0 + ldrb r0, [r1] + cmp r0, 0xFF + bne _0813BEE8 + cmp r2, 0x5 + bhi _0813BED4 + lsls r0, r2, 2 + ldr r1, =_0813BE58 + adds r0, r1 + ldr r0, [r0] + mov pc, r0 + .pool + .align 2, 0 +_0813BE58: + .4byte _0813BED4 + .4byte _0813BE70 + .4byte _0813BE84 + .4byte _0813BE98 + .4byte _0813BEAC + .4byte _0813BEC0 +_0813BE70: + ldr r0, =gStringVar1 + ldr r1, =gText_Steven + bl StringCopy + b _0813BF04 + .pool +_0813BE84: + ldr r0, =gStringVar1 + ldr r1, =gText_Brawly + bl StringCopy + b _0813BF04 + .pool +_0813BE98: + ldr r0, =gStringVar1 + ldr r1, =gText_Winona + bl StringCopy + b _0813BF04 + .pool +_0813BEAC: + ldr r0, =gStringVar1 + ldr r1, =gText_Phoebe + bl StringCopy + b _0813BF04 + .pool +_0813BEC0: + ldr r0, =gStringVar1 + ldr r1, =gText_Glacia + bl StringCopy + b _0813BF04 + .pool +_0813BED4: + ldr r0, =gStringVar1 + ldr r1, =gText_Wallace + bl StringCopy + b _0813BF04 + .pool +_0813BEE8: + ldr r4, =gStringVar1 + adds r0, r4, 0 + movs r2, 0x7 + bl StringCopyN + movs r0, 0xFF + strb r0, [r4, 0x7] + adds r0, r6, 0 + adds r0, 0x50 + adds r0, r5 + ldrb r1, [r0] + adds r0, r4, 0 + bl ConvertInternationalString +_0813BF04: + pop {r4-r6} + pop {r0} + bx r0 + .pool + thumb_func_end sub_813BE30 + + thumb_func_start sub_813BF10 +sub_813BF10: @ 813BF10 + push {lr} + ldr r0, =0x00004095 + bl VarGet + lsls r0, 16 + lsrs r0, 16 + cmp r0, 0x2 + bne _0813BF40 + bl sub_813BA30 + ldr r0, =gBattleOutcome + ldrb r0, [r0] + cmp r0, 0x1 + bne _0813BF3C + bl sub_813BB74 + b _0813BF40 + .pool +_0813BF3C: + bl sub_813BC00 +_0813BF40: + pop {r0} + bx r0 + thumb_func_end sub_813BF10 + + thumb_func_start sub_813BF44 +sub_813BF44: @ 813BF44 + ldr r0, =gSaveBlock1Ptr + ldr r0, [r0] + ldr r1, =0x0000141e + adds r0, r1 + ldrh r0, [r0] + lsrs r0, 7 + movs r1, 0x1 + ands r0, r1 + bx lr + .pool + thumb_func_end sub_813BF44 + + thumb_func_start sub_813BF60 +sub_813BF60: @ 813BF60 + ldr r0, =gSaveBlock1Ptr + ldr r1, [r0] + ldr r0, =0x0000141e + adds r1, r0 + ldrh r2, [r1] + movs r0, 0x80 + orrs r0, r2 + strh r0, [r1] + bx lr + .pool + thumb_func_end sub_813BF60 + + thumb_func_start sub_813BF7C +sub_813BF7C: @ 813BF7C + push {lr} + ldr r0, =gSpecialVar_0x8004 + ldrb r0, [r0] + bl sub_813BADC + lsls r0, 24 + lsrs r0, 24 + pop {r1} + bx r1 + .pool + thumb_func_end sub_813BF7C + + .align 2, 0 @ Don't pad with nop. diff --git a/asm/roulette.s b/asm/roulette.s index 009f30717..85d857f39 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -425,8 +425,8 @@ _08140618: bl SetVBlankCallback bl remove_some_task bl SetVBlankHBlankCallbacksToNull - bl sub_8121DA0 - bl sub_8121E10 + bl ResetVramOamAndBgCntRegs + bl ResetAllBgsCoordinates b _081407F8 _08140630: bl sub_8140388 @@ -3258,8 +3258,8 @@ sub_8141E7C: @ 8141E7C ldr r0, =gSpriteCoordOffsetY strh r4, [r0] strh r4, [r1] - bl sub_8121DA0 - bl sub_8121E10 + bl ResetVramOamAndBgCntRegs + bl ResetAllBgsCoordinates movs r0, 0x50 movs r1, 0 bl SetGpuReg diff --git a/asm/script_menu.s b/asm/script_menu.s index be7cbfbc7..233a5e14c 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -444,7 +444,7 @@ task_yes_no_maybe: @ 80E215C b _080E21C4 .pool _080E2180: - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 movs r0, 0x1 diff --git a/asm/script_pokemon_util_80F87D8.s b/asm/script_pokemon_util_80F87D8.s index 3a3cf4269..4f0fb850b 100644 --- a/asm/script_pokemon_util_80F87D8.s +++ b/asm/script_pokemon_util_80F87D8.s @@ -1174,8 +1174,8 @@ _080F917A: bx r1 thumb_func_end sub_80F9160 - thumb_func_start sp000_heal_pokemon -sp000_heal_pokemon: @ 80F9180 + thumb_func_start HealPlayerParty +HealPlayerParty: @ 80F9180 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1267,7 +1267,7 @@ _080F922C: pop {r0} bx r0 .pool - thumb_func_end sp000_heal_pokemon + thumb_func_end HealPlayerParty thumb_func_start ScriptGiveMon @ void ScriptGiveMon(s16 species_num, u8 level, int held_item) @@ -1359,8 +1359,8 @@ ScriptGiveEgg: @ 80F92C8 bx r1 thumb_func_end ScriptGiveEgg - thumb_func_start sub_80F92F8 -sub_80F92F8: @ 80F92F8 + thumb_func_start HasEnoughMonsForDoubleBattle +HasEnoughMonsForDoubleBattle: @ 80F92F8 push {lr} bl GetMonsStateToDoubles lsls r0, 24 @@ -1382,7 +1382,7 @@ _080F9318: pop {r0} bx r0 .pool - thumb_func_end sub_80F92F8 + thumb_func_end HasEnoughMonsForDoubleBattle thumb_func_start sub_80F9320 sub_80F9320: @ 80F9320 diff --git a/asm/shop.s b/asm/shop.s index 2d6791a62..ccbf458c9 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -409,7 +409,7 @@ _080DFDAC: adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, =gUnknown_03006310 + ldr r0, =gMultiuseListMenuTemplate movs r1, 0 movs r2, 0 bl ListMenuInit @@ -601,7 +601,7 @@ _080DFF78: movs r0, 0x2 negs r0, r0 str r0, [r1, 0x4] - ldr r3, =gUnknown_03006310 + ldr r3, =gMultiuseListMenuTemplate adds r1, r3, 0 ldr r0, =gUnknown_08589A48 ldm r0!, {r4-r6} @@ -627,7 +627,7 @@ _080DFFDC: _080DFFDE: ldr r0, =gUnknown_02039F70 ldr r0, [r0] - ldr r1, =gUnknown_03006310 + ldr r1, =gMultiuseListMenuTemplate ldrh r1, [r1, 0xE] ldr r2, =0x00002004 adds r0, r2 @@ -1976,7 +1976,7 @@ Task_BuyMenu: @ 80E0AC8 b _080E0C8E _080E0AEA: ldrb r0, [r4, 0xE] - bl ListMenuHandleInput + bl ListMenuHandleInputGetItemId adds r5, r0, 0 ldrb r0, [r4, 0xE] ldr r7, =gUnknown_02039F70 @@ -1985,7 +1985,7 @@ _080E0AEA: adds r1, r2, r3 subs r3, 0x2 adds r2, r3 - bl get_coro_args_x18_x1A + bl sub_81AE860 movs r0, 0x2 negs r0, r0 cmp r5, r0 diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 6390ae992..24e755648 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -1581,7 +1581,7 @@ sub_812B158: @ 812B158 thumb_func_start sub_812B1B0 sub_812B1B0: @ 812B1B0 push {lr} - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 diff --git a/asm/start_menu.s b/asm/start_menu.s index 634425f80..6182c3c27 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -356,7 +356,7 @@ sub_809FA9C: @ 809FA9C bl is_c1_link_related_active cmp r0, 0 bne _0809FAB2 - bl player_bitmagic + bl FreezeMapObjects bl sub_808B864 bl sub_808BCF4 _0809FAB2: @@ -1121,7 +1121,7 @@ sub_80A00EC: @ 80A00EC thumb_func_start sub_80A0108 sub_80A0108: @ 80A0108 push {lr} - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -1226,7 +1226,7 @@ sub_80A01D0: @ 80A01D0 thumb_func_start sub_80A01EC sub_80A01EC: @ 80A01EC push {lr} - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -1441,7 +1441,7 @@ sub_80A0388: @ 80A0388 thumb_func_start sub_80A03A4 sub_80A03A4: @ 80A03A4 push {lr} - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 diff --git a/asm/trade.s b/asm/trade.s index d36ae3c67..f576be122 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -3696,7 +3696,7 @@ _0807920E: thumb_func_start sub_8079218 sub_8079218: @ 8079218 push {lr} - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -3798,7 +3798,7 @@ _080792D8: thumb_func_start sub_80792E4 sub_80792E4: @ 80792E4 push {lr} - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -7602,7 +7602,7 @@ sub_807B170: @ 807B170 movs r0, 0x3 bl SetBgTilemapBuffer bl DeactivateAllTextPrinters - ldr r0, =gUnknown_08C00000 + ldr r0, =gBattleTextboxTiles mov r10, r0 movs r0, 0 mov r9, r0 @@ -7611,7 +7611,7 @@ sub_807B170: @ 807B170 movs r2, 0 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r0, =gUnknown_08C00524 + ldr r0, =gBattleTextboxTilemap mov r8, r0 ldr r4, =0x0201c000 adds r1, r4, 0 @@ -7621,7 +7621,7 @@ sub_807B170: @ 807B170 adds r2, r5, 0 movs r3, 0 bl CopyToBgTilemapBuffer - ldr r6, =gUnknown_08C004E0 + ldr r6, =gBattleTextboxPalette adds r0, r6, 0 movs r1, 0 movs r2, 0x20 @@ -13369,7 +13369,7 @@ sub_807E7E8: @ 807E7E8 ldrh r0, [r5, 0x28] cmp r0, 0 beq _0807E960 - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _0807E954 @@ -13442,7 +13442,7 @@ _0807E98E: bl StringCopy adds r0, r4, 0 movs r1, 0 - bl sub_81DB4DC + bl PadNameString ldr r1, [r6, 0x18] lsrs r0, r1, 24 strb r0, [r5, 0x1A] diff --git a/asm/trainer_rematch.s b/asm/trainer_rematch.s index b814934a3..1c874f28f 100755 --- a/asm/trainer_rematch.s +++ b/asm/trainer_rematch.s @@ -178,14 +178,14 @@ sub_81DA6CC: @ 81DA6CC push {r4-r6,lr} adds r5, r0, 0 movs r4, 0 - ldr r6, =gUnknown_085500A4 + ldr r6, =gRematchTable _081DA6D4: lsls r0, r4, 1 lsls r1, r5, 4 adds r0, r1 adds r0, r6 ldrh r0, [r0] - bl HasTrainerAlreadyBeenFought + bl HasTrainerBeenFought lsls r0, 24 cmp r0, 0 bne _081DA6F0 diff --git a/asm/trainer_see.s b/asm/trainer_see.s deleted file mode 100644 index ad6cc370e..000000000 --- a/asm/trainer_see.s +++ /dev/null @@ -1,1645 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start CheckForTrainersWantingBattle -@ bool8 CheckForTrainersWantingBattle() -CheckForTrainersWantingBattle: @ 80B3BE8 - push {r4-r7,lr} - ldr r0, =gUnknown_030060A8 - movs r1, 0 - strb r1, [r0] - ldr r0, =gUnknown_02038BFC - strb r1, [r0] - movs r4, 0 - ldr r6, =gMapObjects -_080B3BF8: - lsls r0, r4, 3 - adds r0, r4 - lsls r0, 2 - adds r1, r0, r6 - ldrb r0, [r1] - lsls r0, 31 - cmp r0, 0 - beq _080B3C38 - ldrb r0, [r1, 0x7] - cmp r0, 0x1 - beq _080B3C12 - cmp r0, 0x3 - bne _080B3C38 -_080B3C12: - adds r0, r4, 0 - bl CheckIfTrainerWantsBattle - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - beq _080B3C42 - cmp r0, 0 - beq _080B3C38 - ldr r0, =gUnknown_030060A8 - ldrb r1, [r0] - adds r5, r0, 0 - cmp r1, 0x1 - bhi _080B3C88 - bl GetMonsStateToDoubles_2 - lsls r0, 24 - cmp r0, 0 - bne _080B3C42 -_080B3C38: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xF - bls _080B3BF8 -_080B3C42: - ldr r0, =gUnknown_030060A8 - ldrb r4, [r0] - adds r5, r0, 0 - cmp r4, 0x1 - bne _080B3C88 - bl ResetTrainerOpponentIds - ldr r2, =gUnknown_03006090 - ldrb r0, [r5] - subs r0, 0x1 - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r0, r1, r2 - ldrb r0, [r0] - adds r2, 0x4 - adds r1, r2 - ldr r1, [r1] - bl SingleTrainerWantsBattle - ldr r0, =gUnknown_030060AC - strb r4, [r0] - movs r0, 0x1 - b _080B3CF4 - .pool -_080B3C88: - ldrb r0, [r5] - cmp r0, 0x2 - bne _080B3CEC - bl ResetTrainerOpponentIds - movs r4, 0 - ldrb r5, [r5] - cmp r4, r5 - bcs _080B3CC6 - ldr r6, =gUnknown_03006090 - adds r7, r6, 0x4 - ldr r5, =gUnknown_02038BFC -_080B3CA0: - lsls r1, r4, 1 - adds r1, r4 - lsls r1, 2 - adds r0, r1, r6 - ldrb r0, [r0] - adds r1, r7 - ldr r1, [r1] - bl TwoTrainersWantBattle - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - ldrb r0, [r5] - adds r0, 0x1 - strb r0, [r5] - ldr r0, =gUnknown_030060A8 - ldrb r0, [r0] - cmp r4, r0 - bcc _080B3CA0 -_080B3CC6: - bl TwoTrainersWantBattleExecuteScript - ldr r1, =gUnknown_02038BFC - movs r0, 0 - strb r0, [r1] - ldr r1, =gUnknown_030060AC - movs r0, 0x1 - strb r0, [r1] - movs r0, 0x1 - b _080B3CF4 - .pool -_080B3CEC: - ldr r1, =gUnknown_030060AC - movs r0, 0 - strb r0, [r1] - movs r0, 0 -_080B3CF4: - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end CheckForTrainersWantingBattle - - thumb_func_start CheckIfTrainerWantsBattle -@ u8 CheckIfTrainerWantsBattle(u8 trainerFieldObjectId) -CheckIfTrainerWantsBattle: @ 80B3D00 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 24 - lsrs r5, r0, 24 - movs r0, 0x1 - mov r9, r0 - bl InTrainerHill - cmp r0, 0x1 - bne _080B3D1E - bl sub_81D62AC - b _080B3D24 -_080B3D1E: - adds r0, r5, 0 - bl GetFieldObjectScriptPointerByFieldObjectId -_080B3D24: - adds r7, r0, 0 - bl InBattlePyramid - lsls r0, 24 - cmp r0, 0 - beq _080B3D3E - adds r0, r5, 0 - bl GetBattlePyramidTrainerFlag -_080B3D36: - lsls r0, 24 -_080B3D38: - cmp r0, 0 - beq _080B3D56 - b _080B3DE0 -_080B3D3E: - bl InTrainerHill - cmp r0, 0x1 - bne _080B3D4E - adds r0, r5, 0 - bl GetTrainerHillTrainerFlag - b _080B3D36 -_080B3D4E: - adds r0, r7, 0 - bl GetTrainerFlagFromScriptPointer - b _080B3D38 -_080B3D56: - lsls r4, r5, 3 - adds r0, r4, r5 - lsls r0, 2 - ldr r1, =gMapObjects - adds r0, r1 - bl CheckIfTrainerCanApproachPlayer - lsls r0, 24 - lsrs r6, r0, 24 - mov r8, r4 - cmp r6, 0 - beq _080B3DE0 - ldrb r0, [r7, 0x1] - cmp r0, 0x4 - beq _080B3D7C - cmp r0, 0x7 - beq _080B3D7C - cmp r0, 0x6 - bne _080B3D8A -_080B3D7C: - bl GetMonsStateToDoubles_2 - lsls r0, 24 - cmp r0, 0 - bne _080B3DE0 - movs r1, 0x2 - mov r9, r1 -_080B3D8A: - ldr r2, =gUnknown_03006090 - ldr r4, =gUnknown_030060A8 - ldrb r1, [r4] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - strb r5, [r0] - ldrb r1, [r4] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r1, r2, 0x4 - adds r0, r1 - str r7, [r0] - ldrb r1, [r4] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - strb r6, [r0, 0x1] - mov r1, r8 - adds r0, r1, r5 - lsls r0, 2 - ldr r1, =gMapObjects - adds r0, r1 - subs r1, r6, 0x1 - lsls r1, 24 - lsrs r1, 24 - bl TrainerApproachPlayer - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] - mov r0, r9 - b _080B3DE2 - .pool -_080B3DE0: - movs r0, 0 -_080B3DE2: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end CheckIfTrainerWantsBattle - - thumb_func_start CheckIfTrainerCanApproachPlayer -@ u8 CheckIfTrainerCanApproachPlayer(struct npc_state *trainerFieldObject) -CheckIfTrainerCanApproachPlayer: @ 80B3DF0 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - adds r7, r0, 0 - mov r4, sp - adds r4, 0x2 - mov r0, sp - adds r1, r4, 0 - bl PlayerGetDestCoords - ldrb r0, [r7, 0x7] - mov r8, r4 - cmp r0, 0x1 - bne _080B3E50 - ldr r1, =gIsTrainerInRange - ldrb r0, [r7, 0x18] - lsls r0, 28 - lsrs r0, 26 - subs r0, 0x4 - adds r0, r1 - ldrb r1, [r7, 0x1D] - mov r2, sp - movs r3, 0 - ldrsh r2, [r2, r3] - movs r5, 0 - ldrsh r3, [r4, r5] - ldr r4, [r0] - adds r0, r7, 0 - bl _call_via_r4 - lsls r0, 24 - lsrs r6, r0, 24 - ldrb r2, [r7, 0x18] - lsls r2, 28 - lsrs r2, 28 - adds r0, r7, 0 - adds r1, r6, 0 - bl CheckPathBetweenTrainerAndPlayer - lsls r0, 24 - lsrs r0, 24 - b _080B3E90 - .pool -_080B3E4C: - adds r0, r6, 0 - b _080B3E90 -_080B3E50: - movs r5, 0 -_080B3E52: - ldr r0, =gIsTrainerInRange - lsls r4, r5, 2 - adds r4, r0 - ldrb r1, [r7, 0x1D] - mov r0, sp - movs r6, 0 - ldrsh r2, [r0, r6] - mov r0, r8 - movs r6, 0 - ldrsh r3, [r0, r6] - ldr r4, [r4] - adds r0, r7, 0 - bl _call_via_r4 - lsls r0, 24 - lsrs r6, r0, 24 - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r7, 0 - adds r1, r6, 0 - adds r2, r4, 0 - bl CheckPathBetweenTrainerAndPlayer - lsls r0, 24 - cmp r0, 0 - bne _080B3E4C - adds r5, r4, 0 - cmp r5, 0x3 - bls _080B3E52 - movs r0, 0 -_080B3E90: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end CheckIfTrainerCanApproachPlayer - - thumb_func_start IsTrainerInRangeSouth -@ u8 IsTrainerInRangeSouth(struct npc_state *trainerFieldObject, u16 sightRange, u16 playerX, u16 playerY) -IsTrainerInRangeSouth: @ 80B3EA0 - push {r4-r6,lr} - adds r4, r0, 0 - lsls r1, 16 - lsrs r6, r1, 16 - lsls r3, 16 - lsrs r5, r3, 16 - movs r1, 0x10 - ldrsh r0, [r4, r1] - lsls r2, 16 - asrs r2, 16 - cmp r0, r2 - bne _080B3EDA - lsls r0, r5, 16 - asrs r2, r0, 16 - ldrh r3, [r4, 0x12] - movs r1, 0x12 - ldrsh r0, [r4, r1] - cmp r2, r0 - ble _080B3EDA - adds r1, r0, 0 - lsls r0, r6, 16 - asrs r0, 16 - adds r1, r0 - cmp r2, r1 - bgt _080B3EDA - subs r0, r5, r3 - lsls r0, 24 - lsrs r0, 24 - b _080B3EDC -_080B3EDA: - movs r0, 0 -_080B3EDC: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end IsTrainerInRangeSouth - - thumb_func_start IsTrainerInRangeNorth -@ u8 IsTrainerInRangeNorth(struct npc_state *trainerFieldObject, u16 sightRange, u16 playerX, u16 playerY) -IsTrainerInRangeNorth: @ 80B3EE4 - push {r4-r6,lr} - adds r4, r0, 0 - lsls r1, 16 - lsrs r6, r1, 16 - lsls r3, 16 - lsrs r5, r3, 16 - movs r1, 0x10 - ldrsh r0, [r4, r1] - lsls r2, 16 - asrs r2, 16 - cmp r0, r2 - bne _080B3F1E - lsls r0, r5, 16 - asrs r2, r0, 16 - ldrh r3, [r4, 0x12] - movs r1, 0x12 - ldrsh r0, [r4, r1] - cmp r2, r0 - bge _080B3F1E - adds r1, r0, 0 - lsls r0, r6, 16 - asrs r0, 16 - subs r1, r0 - cmp r2, r1 - blt _080B3F1E - subs r0, r3, r5 - lsls r0, 24 - lsrs r0, 24 - b _080B3F20 -_080B3F1E: - movs r0, 0 -_080B3F20: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end IsTrainerInRangeNorth - - thumb_func_start IsTrainerInRangeWest -@ u8 IsTrainerInRangeWest(struct npc_state *trainerFieldObject, u16 sightRange, u16 playerX, u16 playerY) -IsTrainerInRangeWest: @ 80B3F28 - push {r4-r6,lr} - adds r4, r0, 0 - lsls r1, 16 - lsrs r6, r1, 16 - lsls r2, 16 - lsrs r5, r2, 16 - movs r1, 0x12 - ldrsh r0, [r4, r1] - lsls r3, 16 - asrs r3, 16 - cmp r0, r3 - bne _080B3F62 - lsls r0, r5, 16 - asrs r3, r0, 16 - ldrh r2, [r4, 0x10] - movs r1, 0x10 - ldrsh r0, [r4, r1] - cmp r3, r0 - bge _080B3F62 - adds r1, r0, 0 - lsls r0, r6, 16 - asrs r0, 16 - subs r1, r0 - cmp r3, r1 - blt _080B3F62 - subs r0, r2, r5 - lsls r0, 24 - lsrs r0, 24 - b _080B3F64 -_080B3F62: - movs r0, 0 -_080B3F64: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end IsTrainerInRangeWest - - thumb_func_start IsTrainerInRangeEast -@ u8 IsTrainerInRangeEast(struct npc_state *trainerFieldObject, u16 sightRange, u16 playerX, u16 playerY) -IsTrainerInRangeEast: @ 80B3F6C - push {r4-r6,lr} - adds r4, r0, 0 - lsls r1, 16 - lsrs r6, r1, 16 - lsls r2, 16 - lsrs r5, r2, 16 - movs r1, 0x12 - ldrsh r0, [r4, r1] - lsls r3, 16 - asrs r3, 16 - cmp r0, r3 - bne _080B3FA6 - lsls r0, r5, 16 - asrs r3, r0, 16 - ldrh r2, [r4, 0x10] - movs r1, 0x10 - ldrsh r0, [r4, r1] - cmp r3, r0 - ble _080B3FA6 - adds r1, r0, 0 - lsls r0, r6, 16 - asrs r0, 16 - adds r1, r0 - cmp r3, r1 - bgt _080B3FA6 - subs r0, r5, r2 - lsls r0, 24 - lsrs r0, 24 - b _080B3FA8 -_080B3FA6: - movs r0, 0 -_080B3FA8: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end IsTrainerInRangeEast - - thumb_func_start CheckPathBetweenTrainerAndPlayer -@ u8 CheckPathBetweenTrainerAndPlayer(struct npc_state *fieldObject, u8 a2, u8 direction) -CheckPathBetweenTrainerAndPlayer: @ 80B3FB0 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x4 - adds r6, r0, 0 - lsls r1, 24 - lsrs r1, 24 - mov r9, r1 - lsls r2, 24 - lsrs r7, r2, 24 - cmp r1, 0 - beq _080B4056 - ldrh r1, [r6, 0x10] - mov r0, sp - strh r1, [r0] - ldrh r0, [r6, 0x12] - mov r4, sp - adds r4, 0x2 - strh r0, [r4] - adds r0, r7, 0 - mov r1, sp - adds r2, r4, 0 - bl MoveCoords - movs r5, 0 - mov r8, r4 - mov r4, r9 - subs r4, 0x1 - cmp r5, r4 - bge _080B4028 -_080B3FEE: - mov r0, sp - movs r2, 0 - ldrsh r1, [r0, r2] - mov r3, r8 - movs r0, 0 - ldrsh r2, [r3, r0] - adds r0, r6, 0 - adds r3, r7, 0 - bl sub_8092C8C - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0 - beq _080B4014 - movs r0, 0x2 - negs r0, r0 - ands r1, r0 - cmp r1, 0 - bne _080B4056 -_080B4014: - adds r0, r5, 0x1 - lsls r0, 24 - lsrs r5, r0, 24 - adds r0, r7, 0 - mov r1, sp - mov r2, r8 - bl MoveCoords - cmp r5, r4 - blt _080B3FEE -_080B4028: - ldrb r4, [r6, 0x19] - lsls r5, r4, 28 - lsrs r5, 28 - lsrs r4, 4 - movs r0, 0 - strb r0, [r6, 0x19] - mov r0, sp - movs r2, 0 - ldrsh r1, [r0, r2] - mov r3, r8 - movs r0, 0 - ldrsh r2, [r3, r0] - adds r0, r6, 0 - adds r3, r7, 0 - bl npc_block_way - lsls r0, 24 - lsrs r1, r0, 24 - lsls r4, 4 - orrs r5, r4 - strb r5, [r6, 0x19] - cmp r1, 0x4 - beq _080B405A -_080B4056: - movs r0, 0 - b _080B405C -_080B405A: - mov r0, r9 -_080B405C: - add sp, 0x4 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end CheckPathBetweenTrainerAndPlayer - - thumb_func_start TrainerApproachPlayer -@ void TrainerApproachPlayer(struct npc_state *trainerFieldObject, u8 distance) -TrainerApproachPlayer: @ 80B406C - push {r4,r5,lr} - lsls r5, r1, 24 - lsrs r5, 24 - ldr r0, =c3_8081EDC - movs r1, 0x50 - bl CreateTask - ldr r4, =gUnknown_03006090 - ldr r3, =gUnknown_030060A8 - ldrb r2, [r3] - lsls r1, r2, 1 - adds r1, r2 - lsls r1, 2 - adds r1, r4 - strb r0, [r1, 0x8] - ldrb r1, [r3] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - ldrb r0, [r0, 0x8] - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - ldr r0, =gTasks - adds r1, r0 - strh r5, [r1, 0xE] - ldrb r2, [r3] - lsls r0, r2, 1 - adds r0, r2 - lsls r0, 2 - adds r0, r4 - ldrb r0, [r0] - strh r0, [r1, 0x16] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end TrainerApproachPlayer - - thumb_func_start sub_80B40C8 -sub_80B40C8: @ 80B40C8 - push {r4,r5,lr} - adds r2, r0, 0 - ldr r0, =gUnknown_02038BFC - ldrb r0, [r0] - cmp r0, 0 - bne _080B40E4 - ldr r0, =gUnknown_03006090 - ldrb r5, [r0, 0x8] - b _080B40E8 - .pool -_080B40E4: - ldr r0, =gUnknown_03006090 - ldrb r5, [r0, 0x14] -_080B40E8: - ldr r4, =c3_8081EDC - adds r0, r5, 0 - adds r1, r4, 0 - bl SetTaskFuncWithFollowupFunc - ldr r1, =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - movs r1, 0x1 - strh r1, [r0, 0x8] - adds r0, r5, 0 - bl _call_via_r4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B40C8 - - thumb_func_start c3_8081EDC -c3_8081EDC: @ 80B4118 - push {r4-r7,lr} - lsls r0, 24 - lsrs r6, r0, 24 - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - ldr r1, =gTasks - adds r4, r0, r1 - movs r0, 0x16 - ldrsh r1, [r4, r0] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, =gMapObjects - adds r5, r0, r1 - ldrb r0, [r5] - lsls r0, 31 - cmp r0, 0 - bne _080B4150 - adds r0, r6, 0 - bl SwitchTaskToFollowupFunc - b _080B416C - .pool -_080B4150: - ldr r7, =gTrainerSeeFuncList -_080B4152: - movs r1, 0x8 - ldrsh r0, [r4, r1] - lsls r0, 2 - adds r0, r7 - ldr r3, [r0] - adds r0, r6, 0 - adds r1, r4, 0 - adds r2, r5, 0 - bl _call_via_r3 - lsls r0, 24 - cmp r0, 0 - bne _080B4152 -_080B416C: - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end c3_8081EDC - - thumb_func_start sub_80B4178 -sub_80B4178: @ 80B4178 - movs r0, 0 - bx lr - thumb_func_end sub_80B4178 - - thumb_func_start sub_80B417C -sub_80B417C: @ 80B417C - push {r4,r5,lr} - adds r5, r1, 0 - adds r4, r2, 0 - ldr r1, =gFieldEffectArguments - adds r2, r1, 0x4 - adds r3, r1, 0 - adds r3, 0x8 - adds r0, r4, 0 - bl FieldObjectGetLocalIdAndMap - movs r0, 0 - bl FieldEffectStart - ldrb r0, [r4, 0x18] - lsls r0, 28 - lsrs r0, 28 - bl GetFaceDirectionAnimId - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl FieldObjectSetSpecialAnim - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] - movs r0, 0x1 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B417C - - thumb_func_start sub_80B41C0 -sub_80B41C0: @ 80B41C0 - push {r4,r5,lr} - adds r4, r1, 0 - adds r5, r2, 0 - movs r0, 0 - bl FieldEffectActiveListContains - lsls r0, 24 - cmp r0, 0 - beq _080B41D6 - movs r0, 0 - b _080B41F8 -_080B41D6: - ldrh r0, [r4, 0x8] - adds r0, 0x1 - strh r0, [r4, 0x8] - ldrb r0, [r5, 0x6] - subs r0, 0x39 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bhi _080B41EC - movs r0, 0x6 - strh r0, [r4, 0x8] -_080B41EC: - ldrb r0, [r5, 0x6] - cmp r0, 0x3F - bne _080B41F6 - movs r0, 0x8 - strh r0, [r4, 0x8] -_080B41F6: - movs r0, 0x1 -_080B41F8: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80B41C0 - - thumb_func_start sub_80B4200 -sub_80B4200: @ 80B4200 - push {r4,r5,lr} - adds r5, r1, 0 - adds r4, r2, 0 - adds r0, r4, 0 - bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive - lsls r0, 24 - cmp r0, 0 - beq _080B421E - adds r0, r4, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished - lsls r0, 24 - cmp r0, 0 - beq _080B4252 -_080B421E: - movs r1, 0xE - ldrsh r0, [r5, r1] - cmp r0, 0 - beq _080B4244 - ldrb r0, [r4, 0x18] - lsls r0, 28 - lsrs r0, 28 - bl GetGoSpeed0AnimId - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl FieldObjectSetSpecialAnim - ldrh r0, [r5, 0xE] - subs r0, 0x1 - strh r0, [r5, 0xE] - b _080B4252 -_080B4244: - adds r0, r4, 0 - movs r1, 0x3E - bl FieldObjectSetSpecialAnim - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] -_080B4252: - movs r0, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80B4200 - - thumb_func_start sub_80B425C -sub_80B425C: @ 80B425C - push {r4-r6,lr} - adds r6, r1, 0 - adds r5, r2, 0 - adds r0, r5, 0 - bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive - lsls r0, 24 - cmp r0, 0 - beq _080B427A - adds r0, r5, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished - lsls r0, 24 - cmp r0, 0 - beq _080B4308 -_080B427A: - ldrb r0, [r5, 0x18] - lsls r0, 28 - lsrs r0, 28 - bl npc_running_behaviour_by_direction - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r5, 0 - bl npc_set_running_behaviour_etc - ldrb r0, [r5, 0x18] - lsls r0, 28 - lsrs r0, 28 - bl npc_running_behaviour_by_direction - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r5, 0 - bl sub_808F23C - adds r0, r5, 0 - bl sub_808F208 - ldr r0, =gPlayerAvatar - ldrb r1, [r0, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, =gMapObjects - adds r4, r0, r1 - adds r0, r4, 0 - bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive - lsls r0, 24 - cmp r0, 0 - beq _080B42D2 - adds r0, r4, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished - lsls r0, 24 - cmp r0, 0 - beq _080B4308 -_080B42D2: - bl sub_808BCE8 - ldr r0, =gPlayerAvatar - ldrb r0, [r0, 0x5] - lsls r4, r0, 3 - adds r4, r0 - lsls r4, 2 - ldr r0, =gMapObjects - adds r4, r0 - ldrb r0, [r5, 0x18] - lsls r0, 28 - lsrs r0, 28 - bl GetOppositeDirection - lsls r0, 24 - lsrs r0, 24 - bl GetFaceDirectionAnimId - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl FieldObjectSetSpecialAnim - ldrh r0, [r6, 0x8] - adds r0, 0x1 - strh r0, [r6, 0x8] -_080B4308: - movs r0, 0 - pop {r4-r6} - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B425C - - thumb_func_start sub_80B4318 -sub_80B4318: @ 80B4318 - push {r4,r5,lr} - lsls r0, 24 - lsrs r5, r0, 24 - ldr r0, =gPlayerAvatar - ldrb r1, [r0, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, =gMapObjects - adds r4, r0, r1 - adds r0, r4, 0 - bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive - lsls r0, 24 - cmp r0, 0 - beq _080B4344 - adds r0, r4, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished - lsls r0, 24 - cmp r0, 0 - beq _080B434A -_080B4344: - adds r0, r5, 0 - bl SwitchTaskToFollowupFunc -_080B434A: - movs r0, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B4318 - - thumb_func_start sub_80B435C -sub_80B435C: @ 80B435C - push {r4,r5,lr} - adds r5, r1, 0 - adds r4, r2, 0 - adds r0, r4, 0 - bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive - lsls r0, 24 - cmp r0, 0 - beq _080B437A - adds r0, r4, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished - lsls r0, 24 - cmp r0, 0 - beq _080B4388 -_080B437A: - adds r0, r4, 0 - movs r1, 0x59 - bl FieldObjectSetSpecialAnim - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] -_080B4388: - movs r0, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80B435C - - thumb_func_start sub_80B4390 -sub_80B4390: @ 80B4390 - push {r4,lr} - adds r4, r1, 0 - adds r0, r2, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished - lsls r0, 24 - cmp r0, 0 - beq _080B43A4 - movs r0, 0x3 - strh r0, [r4, 0x8] -_080B43A4: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80B4390 - - thumb_func_start sub_80B43AC -sub_80B43AC: @ 80B43AC - push {r4,r5,lr} - adds r5, r1, 0 - adds r4, r2, 0 - adds r0, r4, 0 - bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive - lsls r0, 24 - cmp r0, 0 - beq _080B43CA - adds r0, r4, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished - lsls r0, 24 - cmp r0, 0 - beq _080B43D8 -_080B43CA: - adds r0, r4, 0 - movs r1, 0x3E - bl FieldObjectSetSpecialAnim - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] -_080B43D8: - movs r0, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_80B43AC - - thumb_func_start sub_80B43E0 -sub_80B43E0: @ 80B43E0 - push {r4,r5,lr} - adds r5, r1, 0 - adds r4, r2, 0 - adds r0, r4, 0 - bl FieldObjectCheckIfSpecialAnimFinishedOrInactive - lsls r0, 24 - cmp r0, 0 - beq _080B4426 - ldr r2, =gFieldEffectArguments - movs r1, 0x10 - ldrsh r0, [r4, r1] - str r0, [r2] - movs r1, 0x12 - ldrsh r0, [r4, r1] - str r0, [r2, 0x4] - ldr r3, =gSprites - ldrb r1, [r4, 0x4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - adds r0, 0x43 - ldrb r0, [r0] - subs r0, 0x1 - str r0, [r2, 0x8] - movs r0, 0x2 - str r0, [r2, 0xC] - movs r0, 0x31 - bl FieldEffectStart - strh r0, [r5, 0x10] - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] -_080B4426: - movs r0, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B43E0 - - thumb_func_start sub_80B4438 -sub_80B4438: @ 80B4438 - push {r4,r5,lr} - adds r5, r1, 0 - adds r4, r2, 0 - ldr r2, =gSprites - movs r1, 0x10 - ldrsh r0, [r5, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - adds r1, 0x2B - ldrb r0, [r1] - cmp r0, 0x2 - bne _080B44A0 - ldrb r1, [r4, 0x3] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - strb r0, [r4, 0x3] - ldrb r0, [r4] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r4] - ldrb r1, [r4, 0x4] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r2, [r0, 0x5] - movs r1, 0xD - negs r1, r1 - ands r1, r2 - movs r2, 0x8 - orrs r1, r2 - strb r1, [r0, 0x5] - adds r0, r4, 0 - bl FieldObjectClearAnimIfSpecialAnimFinished - ldrb r0, [r4, 0x18] - lsls r0, 28 - lsrs r0, 28 - bl sub_80934BC - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl FieldObjectSetSpecialAnim - ldrh r0, [r5, 0x8] - adds r0, 0x1 - strh r0, [r5, 0x8] -_080B44A0: - movs r0, 0 - pop {r4,r5} - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B4438 - - thumb_func_start sub_80B44AC -sub_80B44AC: @ 80B44AC - push {r4,lr} - adds r4, r1, 0 - movs r0, 0x31 - bl FieldEffectActiveListContains - lsls r0, 24 - cmp r0, 0 - bne _080B44C0 - movs r0, 0x3 - strh r0, [r4, 0x8] -_080B44C0: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_80B44AC - - thumb_func_start sub_80B44C8 -sub_80B44C8: @ 80B44C8 - push {r4,r5,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r0, 24 - adds r5, r0, 0 - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - ldr r1, =gTasks - adds r4, r0, r1 - adds r0, r4, 0 - adds r0, 0xA - mov r1, sp - bl LoadWordFromTwoHalfwords - movs r1, 0x16 - ldrsh r0, [r4, r1] - cmp r0, 0 - bne _080B44FA - ldr r0, [sp] - bl FieldObjectClearAnim - ldrh r0, [r4, 0x16] - adds r0, 0x1 - strh r0, [r4, 0x16] -_080B44FA: - ldr r1, =gTrainerSeeFuncList2 - movs r2, 0x8 - ldrsh r0, [r4, r2] - lsls r0, 2 - adds r0, r1 - ldr r2, [sp] - ldr r3, [r0] - adds r0, r5, 0 - adds r1, r4, 0 - bl _call_via_r3 - movs r1, 0x8 - ldrsh r0, [r4, r1] - cmp r0, 0x3 - bne _080B4564 - movs r0, 0x31 - bl FieldEffectActiveListContains - lsls r0, 24 - cmp r0, 0 - bne _080B4564 - ldr r4, [sp] - ldrb r0, [r4, 0x18] - lsls r0, 28 - lsrs r0, 28 - bl npc_running_behaviour_by_direction - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl npc_set_running_behaviour_etc - ldr r4, [sp] - ldrb r0, [r4, 0x18] - lsls r0, 28 - lsrs r0, 28 - bl npc_running_behaviour_by_direction - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl sub_808F23C - adds r0, r5, 0 - bl DestroyTask - b _080B456E - .pool -_080B4564: - ldr r2, [sp] - ldrb r1, [r2] - movs r0, 0x7F - ands r0, r1 - strb r0, [r2] -_080B456E: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_80B44C8 - - thumb_func_start sub_80B4578 -sub_80B4578: @ 80B4578 - push {r4,lr} - adds r4, r0, 0 - ldr r0, =sub_80B44C8 - movs r1, 0 - bl CreateTask - adds r1, r0, 0 - lsls r1, 24 - lsrs r1, 24 - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - ldr r1, =gTasks + 0x8 - adds r0, r1 - adds r0, 0x2 - adds r1, r4, 0 - bl StoreWordInTwoHalfwords - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B4578 - - thumb_func_start sub_80B45AC -sub_80B45AC: @ 80B45AC - push {lr} - ldr r0, =sub_80B45BC - bl sub_80B40C8 - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B45AC - - thumb_func_start sub_80B45BC -sub_80B45BC: @ 80B45BC - push {lr} - lsls r0, 24 - lsrs r0, 24 - bl DestroyTask - bl EnableBothScriptContexts - pop {r0} - bx r0 - thumb_func_end sub_80B45BC - - thumb_func_start sub_80B45D0 -sub_80B45D0: @ 80B45D0 - push {lr} - ldr r0, =gUnknown_030060A8 - ldrb r0, [r0] - cmp r0, 0x2 - bne _080B4610 - ldr r1, =gUnknown_02038BFC - ldrb r0, [r1] - cmp r0, 0 - bne _080B460C - adds r0, 0x1 - strb r0, [r1] - ldr r1, =gSpecialVar_Result - movs r0, 0x1 - strh r0, [r1] - bl UnfreezeMapObjects - ldr r0, =gUnknown_03006090 - ldrb r0, [r0, 0xC] - bl sub_80974D0 - b _080B4616 - .pool -_080B460C: - movs r0, 0 - strb r0, [r1] -_080B4610: - ldr r1, =gSpecialVar_Result - movs r0, 0 - strh r0, [r1] -_080B4616: - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B45D0 - - thumb_func_start oei_exclamation_mark -oei_exclamation_mark: @ 80B4620 - push {lr} - ldr r0, =gSpriteTemplate_85507B4 - movs r1, 0 - movs r2, 0 - movs r3, 0x53 - bl CreateSpriteAtEnd - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _080B4648 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - movs r1, 0 - movs r2, 0 - bl sub_80B46D8 -_080B4648: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end oei_exclamation_mark - - thumb_func_start sub_80B4658 -sub_80B4658: @ 80B4658 - push {lr} - ldr r0, =gSpriteTemplate_85507B4 - movs r1, 0 - movs r2, 0 - movs r3, 0x52 - bl CreateSpriteAtEnd - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - beq _080B4680 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, =gSprites - adds r0, r1 - movs r1, 0x21 - movs r2, 0x1 - bl sub_80B46D8 -_080B4680: - movs r0, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B4658 - - thumb_func_start sub_80B4690 -sub_80B4690: @ 80B4690 - push {r4,lr} - ldr r0, =gSpriteTemplate_85507CC - movs r1, 0 - movs r2, 0 - movs r3, 0x52 - bl CreateSpriteAtEnd - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x40 - beq _080B46C6 - lsls r4, r0, 4 - adds r4, r0 - lsls r4, 2 - ldr r0, =gSprites - adds r4, r0 - adds r0, r4, 0 - movs r1, 0x2E - movs r2, 0 - bl sub_80B46D8 - ldrb r1, [r4, 0x5] - movs r0, 0xF - ands r0, r1 - movs r1, 0x20 - orrs r0, r1 - strb r0, [r4, 0x5] -_080B46C6: - movs r0, 0 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B4690 - - thumb_func_start sub_80B46D8 -@ void sub_80B46D8(struct obj *object, s16 a2, u8 a3) -sub_80B46D8: @ 80B46D8 - push {r4,lr} - lsls r2, 24 - lsrs r2, 24 - ldrb r4, [r0, 0x5] - movs r3, 0xD - negs r3, r3 - ands r3, r4 - movs r4, 0x4 - orrs r3, r4 - strb r3, [r0, 0x5] - movs r3, 0x3E - adds r3, r0 - mov r12, r3 - ldrb r3, [r3] - movs r4, 0x2 - orrs r3, r4 - mov r4, r12 - strb r3, [r4] - ldr r4, =gFieldEffectArguments - ldr r3, [r4] - strh r3, [r0, 0x2E] - ldr r3, [r4, 0x4] - strh r3, [r0, 0x30] - ldr r3, [r4, 0x8] - strh r3, [r0, 0x32] - ldr r3, =0x0000fffb - strh r3, [r0, 0x34] - strh r1, [r0, 0x3C] - adds r1, r2, 0 - bl StartSpriteAnim - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B46D8 - - thumb_func_start objc_exclamation_mark_probably -objc_exclamation_mark_probably: @ 80B4724 - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - ldrh r0, [r4, 0x2E] - lsls r0, 24 - lsrs r0, 24 - ldrh r1, [r4, 0x30] - lsls r1, 24 - lsrs r1, 24 - ldrh r2, [r4, 0x32] - lsls r2, 24 - lsrs r2, 24 - mov r3, sp - bl TryGetFieldObjectIdByLocalIdAndMap - lsls r0, 24 - cmp r0, 0 - bne _080B4756 - adds r0, r4, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _080B4764 -_080B4756: - ldrh r1, [r4, 0x3C] - lsls r1, 24 - lsrs r1, 24 - adds r0, r4, 0 - bl FieldEffectStop - b _080B47B2 -_080B4764: - ldr r2, =gMapObjects - mov r0, sp - ldrb r1, [r0] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0, 0x4] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - ldr r0, =gSprites - adds r1, r0 - ldrh r3, [r4, 0x34] - ldrh r0, [r4, 0x36] - adds r2, r3, r0 - strh r2, [r4, 0x36] - ldrh r0, [r1, 0x20] - strh r0, [r4, 0x20] - ldrh r0, [r1, 0x22] - subs r0, 0x10 - strh r0, [r4, 0x22] - ldrh r0, [r1, 0x24] - strh r0, [r4, 0x24] - ldrh r0, [r1, 0x26] - adds r0, r2 - strh r0, [r4, 0x26] - lsls r2, 16 - asrs r2, 16 - cmp r2, 0 - beq _080B47B0 - adds r0, r3, 0x1 - strh r0, [r4, 0x34] - b _080B47B2 - .pool -_080B47B0: - strh r2, [r4, 0x34] -_080B47B2: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - thumb_func_end objc_exclamation_mark_probably - - thumb_func_start sub_80B47BC -sub_80B47BC: @ 80B47BC - push {lr} - ldr r0, =gUnknown_02038BFC - ldrb r0, [r0] - cmp r0, 0 - beq _080B47D4 - ldr r0, =gUnknown_03006090 - ldrb r0, [r0, 0xC] - b _080B47D8 - .pool -_080B47D4: - ldr r0, =gUnknown_03006090 - ldrb r0, [r0] -_080B47D8: - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B47BC - - thumb_func_start sub_80B47E0 -sub_80B47E0: @ 80B47E0 - push {lr} - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bls _080B47EE - movs r0, 0 - b _080B4800 -_080B47EE: - cmp r0, 0 - beq _080B47FC - ldr r0, =gUnknown_03006090 - ldrb r0, [r0, 0xC] - b _080B4800 - .pool -_080B47FC: - ldr r0, =gUnknown_03006090 - ldrb r0, [r0] -_080B4800: - pop {r1} - bx r1 - .pool - thumb_func_end sub_80B47E0 - - thumb_func_start sub_80B4808 -sub_80B4808: @ 80B4808 - push {lr} - ldr r0, =gUnknown_030060AC - ldrb r0, [r0] - cmp r0, 0x1 - bne _080B4870 - ldr r2, =gUnknown_03006090 - ldr r0, =gUnknown_03006080 - ldrh r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r1, [r0] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, =gMapObjects - adds r0, r1 - ldrb r0, [r0, 0x18] - lsls r0, 28 - lsrs r0, 28 - bl GetOppositeDirection - lsls r0, 24 - lsrs r0, 24 - bl GetFaceDirectionAnimId - ldr r3, =gUnknown_03006084 - strb r0, [r3] - movs r0, 0xFE - strb r0, [r3, 0x1] - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldrb r1, [r0, 0x5] - ldrb r2, [r0, 0x4] - movs r0, 0xFF - bl ScriptMovement_StartObjectMovementScript - b _080B489E - .pool -_080B4870: - ldr r0, =gPlayerAvatar - ldrb r1, [r0, 0x5] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - ldr r1, =gMapObjects - adds r0, r1 - ldrb r0, [r0, 0x18] - lsls r0, 28 - lsrs r0, 28 - bl GetFaceDirectionAnimId - ldr r3, =gUnknown_03006084 - strb r0, [r3] - movs r0, 0xFE - strb r0, [r3, 0x1] - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - ldrb r1, [r0, 0x5] - ldrb r2, [r0, 0x4] - movs r0, 0xFF - bl ScriptMovement_StartObjectMovementScript -_080B489E: - movs r0, 0xFF - bl sub_809BE48 - pop {r0} - bx r0 - .pool - thumb_func_end sub_80B4808 - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/use_pokeblock.s b/asm/use_pokeblock.s index 3c580654c..b01f1eff4 100755 --- a/asm/use_pokeblock.s +++ b/asm/use_pokeblock.s @@ -5,350 +5,10 @@ .text - thumb_func_start sub_8166204 -sub_8166204: @ 8166204 - push {r4-r6,lr} - adds r5, r0, 0 - adds r6, r1, 0 - ldr r4, =gUnknown_0203BCAC - ldr r0, =0x0000806c - bl AllocZeroed - str r0, [r4] - ldr r1, =gUnknown_0203BC90 - ldr r2, =0x00007fd0 - adds r0, r2 - str r0, [r1] - str r5, [r0, 0x8] - str r6, [r0, 0x4] - ldr r0, =sub_8166380 - bl launch_c3_walk_stairs_and_run_once - ldr r0, =sub_816631C - bl SetMainCallback2 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8166204 - - thumb_func_start sub_816624C -sub_816624C: @ 816624C - push {r4,r5,lr} - ldr r4, =gUnknown_0203BCAC - ldr r0, =0x0000806c - bl AllocZeroed - str r0, [r4] - ldr r5, =gUnknown_0203BC90 - ldr r1, =0x00007fd0 - adds r0, r1 - str r0, [r5] - ldr r1, =gUnknown_0203BC98 - ldr r1, [r1] - str r1, [r0, 0x8] - ldr r1, =gUnknown_0203BC94 - ldr r1, [r1] - str r1, [r0, 0x4] - ldr r4, =gUnknown_0203BC9C - ldrb r0, [r4] - bl sub_81672E4 - strb r0, [r4] - ldr r5, [r5] - movs r1, 0 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x3 - bls _08166284 - movs r1, 0x1 -_08166284: - adds r0, r5, 0 - adds r0, 0x56 - strb r1, [r0] - ldr r0, =sub_8166380 - bl launch_c3_walk_stairs_and_run_once - ldr r0, =sub_81662C0 - bl SetMainCallback2 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_816624C - thumb_func_start sub_81662C0 -sub_81662C0: @ 81662C0 - push {r4,lr} - ldr r4, =gUnknown_0203BC90 - ldr r0, [r4] - ldr r0, [r0] - bl _call_via_r0 - bl AnimateSprites - bl BuildOamBuffer - bl UpdatePaletteFade - ldr r4, [r4] - ldr r1, [r4] - ldr r0, =map_warp_consider_1_to_outside_or_stair_or_dive - cmp r1, r0 - bne _081662F0 - adds r0, r4, 0 - adds r0, 0x50 - movs r1, 0 - strb r1, [r0] - ldr r0, =sub_8166304 - bl SetMainCallback2 -_081662F0: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81662C0 - - thumb_func_start sub_8166304 -sub_8166304: @ 8166304 - push {lr} - bl sub_81668F8 - bl AnimateSprites - bl BuildOamBuffer - bl UpdatePaletteFade - pop {r0} - bx r0 - thumb_func_end sub_8166304 - - thumb_func_start sub_816631C -sub_816631C: @ 816631C - push {lr} - ldr r0, =gUnknown_0203BC90 - ldr r0, [r0] - ldr r0, [r0] - bl _call_via_r0 - bl AnimateSprites - bl BuildOamBuffer - bl RunTextPrinters - bl UpdatePaletteFade - pop {r0} - bx r0 - .pool - thumb_func_end sub_816631C - - thumb_func_start sub_8166340 -sub_8166340: @ 8166340 - push {lr} - bl LoadOam - bl ProcessSpriteCopyRequests - bl TransferPlttBuffer - ldr r0, =gUnknown_0203BCAC - ldr r0, [r0] - ldr r1, =0x00007c58 - adds r0, r1 - bl sub_81D2108 - bl sub_80BA0A8 - pop {r0} - bx r0 - .pool - thumb_func_end sub_8166340 - - thumb_func_start launch_c3_walk_stairs_and_run_once -launch_c3_walk_stairs_and_run_once: @ 816636C - ldr r1, =gUnknown_0203BC90 - ldr r1, [r1] - str r0, [r1] - adds r1, 0x50 - movs r0, 0 - strb r0, [r1] - bx lr - .pool - thumb_func_end launch_c3_walk_stairs_and_run_once - - thumb_func_start sub_8166380 -sub_8166380: @ 8166380 - push {r4,r5,lr} - sub sp, 0x4 - ldr r1, =gUnknown_0203BC90 - ldr r0, [r1] - adds r0, 0x50 - ldrb r0, [r0] - adds r2, r1, 0 - cmp r0, 0xF - bls _08166394 - b _08166556 -_08166394: - lsls r0, 2 - ldr r1, =_081663A8 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .pool - .align 2, 0 -_081663A8: - .4byte _081663E8 - .4byte _0816640C - .4byte _08166416 - .4byte _08166434 - .4byte _08166464 - .4byte _08166468 - .4byte _08166474 - .4byte _08166484 - .4byte _08166490 - .4byte _0816649C - .4byte _081664B8 - .4byte _081664BC - .4byte _081664E4 - .4byte _08166510 - .4byte _08166528 - .4byte _08166550 -_081663E8: - ldr r2, =gUnknown_0203BCAC - ldr r0, [r2] - ldr r1, =0x00007b10 - adds r0, r1 - movs r1, 0xFF - strb r1, [r0] - ldr r0, [r2] - ldr r2, =0x00007c58 - adds r0, r2 - bl sub_81D1ED4 - b _0816653C - .pool -_0816640C: - bl ResetSpriteData - bl FreeAllSpritePalettes - b _0816653C -_08166416: - movs r0, 0 - bl SetVBlankCallback - movs r0, 0 - str r0, [sp] - movs r1, 0xC0 - lsls r1, 19 - ldr r2, =0x05006000 - mov r0, sp - bl CpuSet - b _0816653C - .pool -_08166434: - movs r0, 0 - bl ResetBgsAndClearDma3BusyFlags - ldr r1, =gUnknown_085DFCCC - movs r0, 0 - movs r2, 0x4 - bl InitBgsFromTemplates - ldr r0, =gUnknown_085DFCDC - bl InitWindows - bl DeactivateAllTextPrinters - movs r0, 0 - movs r1, 0x97 - movs r2, 0xE0 - bl sub_809882C - b _0816653C - .pool -_08166464: - ldr r1, [r2] - b _08166540 -_08166468: - bl sub_8168328 - lsls r0, 24 - cmp r0, 0 - bne _08166556 - b _0816653C -_08166474: - ldr r1, =gKeyRepeatStartDelay - movs r0, 0x14 - strh r0, [r1] - bl sub_8167420 - b _0816653C - .pool -_08166484: - bl sub_8167930 - lsls r0, 24 - cmp r0, 0 - bne _08166556 - b _0816653C -_08166490: - movs r0, 0 - bl sub_8167608 - bl sub_8167760 - b _0816653C -_0816649C: - ldr r0, =gUnknown_0203BCAC - ldr r0, [r0] - ldr r1, =0x00007b0e - adds r0, r1 - bl sub_81D312C - lsls r0, 24 - cmp r0, 0 - bne _08166556 - b _0816653C - .pool -_081664B8: - ldr r1, [r2] - b _08166540 -_081664BC: - ldr r5, =gUnknown_0203BCAC - ldr r1, [r5] - ldr r4, =0x00007c58 - adds r0, r1, r4 - ldr r2, =0x00007c6c - adds r1, r2 - bl sub_81D2754 - ldr r0, [r5] - adds r0, r4 - bl sub_81D20AC - b _0816653C - .pool -_081664E4: - ldr r4, =gUnknown_0203BCAC - ldr r0, [r4] - ldr r1, =0x00007c58 - adds r0, r1 - bl sub_81D20BC - lsls r0, 24 - cmp r0, 0 - bne _08166556 - ldr r2, [r4] - ldr r1, =0x00007c58 - adds r0, r2, r1 - adds r1, 0x14 - adds r2, r1 - adds r1, r2, 0 - bl sub_81D1F84 - b _0816653C - .pool -_08166510: - ldr r0, =gUnknown_0203BCAC - ldr r0, [r0] - ldr r2, =0x00007c58 - adds r0, r2 - bl sub_81D2230 - b _0816653C - .pool -_08166528: - movs r0, 0 - bl PutWindowTilemap - movs r0, 0x1 - bl PutWindowTilemap - movs r0, 0 - movs r1, 0x1 - bl sub_8167BA0 -_0816653C: - ldr r0, =gUnknown_0203BC90 - ldr r1, [r0] -_08166540: - adds r1, 0x50 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - b _08166556 - .pool -_08166550: - ldr r0, =map_warp_consider_1_to_outside_or_stair_or_dive - bl launch_c3_walk_stairs_and_run_once -_08166556: - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8166380 - thumb_func_start map_warp_consider_1_to_outside_or_stair_or_dive -map_warp_consider_1_to_outside_or_stair_or_dive: @ 8166564 + thumb_func_start sub_8166564 +sub_8166564: @ 8166564 push {r4,lr} sub sp, 0x4 ldr r4, =gUnknown_0203BC90 @@ -424,14 +84,14 @@ _081665C0: bl sub_81D3480 _0816660A: ldr r0, =sub_8166634 - bl launch_c3_walk_stairs_and_run_once + bl sub_816636C _08166610: add sp, 0x4 pop {r4} pop {r0} bx r0 .pool - thumb_func_end map_warp_consider_1_to_outside_or_stair_or_dive + thumb_func_end sub_8166564 thumb_func_start sub_8166634 sub_8166634: @ 8166634 @@ -567,7 +227,7 @@ _0816675C: .pool _08166788: ldr r0, =sub_8166BEC - bl launch_c3_walk_stairs_and_run_once + bl sub_816636C b _0816680E .pool _08166794: @@ -611,7 +271,7 @@ _081667CC: .pool _081667E8: ldr r0, =sub_816681C - bl launch_c3_walk_stairs_and_run_once + bl sub_816636C b _0816680E .pool _081667F4: @@ -656,7 +316,7 @@ _08166838: adds r0, r1 ldrb r0, [r0] bl sub_81672A4 - ldr r1, =gUnknown_0203BC9C + ldr r1, =gPokeblockMonId strb r0, [r1] ldr r1, =gUnknown_0203BC94 ldr r2, [r5] @@ -708,9 +368,9 @@ _08166888: str r5, [r4] bl FreeAllWindowBuffers ldr r1, =gMain - ldr r0, =sub_816624C + ldr r0, =CB2_ReturnAndChooseMonToGivePokeblock str r0, [r1, 0x8] - bl sub_8179D70 + bl CB2_PreparePokeblockFeedScene _081668D4: add sp, 0x4 pop {r4,r5} @@ -752,7 +412,7 @@ _0816693C: ldr r0, [r0] ldr r1, =0x00008041 adds r0, r1 - ldr r1, =gUnknown_0203BC9C + ldr r1, =gPokeblockMonId ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 @@ -837,7 +497,7 @@ _081669F4: adds r0, r1 bl sub_81D3464 ldr r0, =sub_8166A34 - bl launch_c3_walk_stairs_and_run_once + bl sub_816636C ldr r0, =sub_816631C bl SetMainCallback2 _08166A18: @@ -1018,9 +678,9 @@ _08166BB6: bne _08166BDA ldr r0, =gSpecialVar_ItemId ldrb r0, [r0] - bl sub_8136F68 + bl TryClearPokeblock ldr r0, =sub_8166BEC - bl launch_c3_walk_stairs_and_run_once + bl sub_816636C _08166BDA: pop {r4-r6} pop {r0} @@ -1225,7 +885,7 @@ sub_8166D44: @ 8166D44 movs r0, 0x2 movs r1, 0x3 bl CopyWindowToVram - ldr r0, =gUnknown_085DFCFC + ldr r0, =sUsePokeblockYesNoWinTemplate movs r1, 0x97 movs r2, 0xE movs r3, 0 @@ -1240,7 +900,7 @@ sub_8166D44: @ 8166D44 thumb_func_start sub_8166DE4 sub_8166DE4: @ 8166DE4 push {r4,lr} - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 lsrs r4, r0, 24 asrs r1, r0, 24 @@ -1497,7 +1157,7 @@ sub_8166FD4: @ 8166FD4 movs r0, 0 _08166FEC: lsls r0, 16 - ldr r1, =gUnknown_085DFD04 + ldr r1, =sContestStatNames lsls r0, r3, 2 adds r0, r1 ldr r1, [r0] @@ -1719,7 +1379,7 @@ sub_8167184: @ 8167184 adds r0, r3, 0 adds r0, 0x6E strh r1, [r0] - ldr r0, =gUnknown_0203BC9E + ldr r0, =gPokeblockGain movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 diff --git a/asm/wallclock.s b/asm/wallclock.s deleted file mode 100644 index 5c818212c..000000000 --- a/asm/wallclock.s +++ /dev/null @@ -1,1515 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_81347B4 -sub_81347B4: @ 81347B4 - push {lr} - bl LoadOam - bl ProcessSpriteCopyRequests - bl TransferPlttBuffer - pop {r0} - bx r0 - thumb_func_end sub_81347B4 - - thumb_func_start LoadWallClockGraphics -LoadWallClockGraphics: @ 81347C8 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - movs r0, 0 - bl SetVBlankCallback - movs r0, 0 - movs r1, 0 - bl SetGpuReg - movs r0, 0xE - movs r1, 0 - bl SetGpuReg - movs r0, 0xC - movs r1, 0 - bl SetGpuReg - movs r0, 0xA - movs r1, 0 - bl SetGpuReg - movs r0, 0x8 - movs r1, 0 - bl SetGpuReg - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r3, 0xC0 - lsls r3, 19 - movs r4, 0xC0 - lsls r4, 9 - add r0, sp, 0x4 - mov r8, r0 - mov r2, sp - movs r6, 0 - ldr r1, =0x040000d4 - movs r5, 0x80 - lsls r5, 5 - ldr r7, =0x81000800 - movs r0, 0x81 - lsls r0, 24 - mov r12, r0 -_0813486C: - strh r6, [r2] - mov r0, sp - str r0, [r1] - str r3, [r1, 0x4] - str r7, [r1, 0x8] - ldr r0, [r1, 0x8] - adds r3, r5 - subs r4, r5 - cmp r4, r5 - bhi _0813486C - strh r6, [r2] - mov r2, sp - str r2, [r1] - str r3, [r1, 0x4] - lsrs r0, r4, 1 - mov r2, r12 - orrs r0, r2 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - movs r0, 0xE0 - lsls r0, 19 - movs r3, 0x80 - lsls r3, 3 - movs r4, 0 - str r4, [sp, 0x4] - ldr r2, =0x040000d4 - mov r1, r8 - str r1, [r2] - str r0, [r2, 0x4] - lsrs r0, r3, 2 - movs r1, 0x85 - lsls r1, 24 - orrs r0, r1 - str r0, [r2, 0x8] - ldr r0, [r2, 0x8] - movs r1, 0xA0 - lsls r1, 19 - mov r0, sp - strh r4, [r0] - str r0, [r2] - str r1, [r2, 0x4] - lsrs r3, 1 - movs r0, 0x81 - lsls r0, 24 - orrs r3, r0 - str r3, [r2, 0x8] - ldr r0, [r2, 0x8] - ldr r0, =gUnknown_08DCC05C - movs r1, 0xC0 - lsls r1, 19 - bl LZ77UnCompVram - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - cmp r0, 0 - bne _081348FC - ldr r0, =gUnknown_08DCC01C - movs r1, 0 - movs r2, 0x20 - bl LoadPalette - b _08134906 - .pool -_081348FC: - ldr r0, =gUnknown_08DCC03C - movs r1, 0 - movs r2, 0x20 - bl LoadPalette -_08134906: - bl GetOverworldTextboxPalettePtr - movs r1, 0xE0 - movs r2, 0x20 - bl LoadPalette - ldr r0, =gUnknown_085B21D4 - movs r1, 0xC0 - movs r2, 0x8 - bl LoadPalette - movs r0, 0 - bl ResetBgsAndClearDma3BusyFlags - ldr r1, =gUnknown_085B21FC - movs r0, 0 - movs r2, 0x3 - bl InitBgsFromTemplates - ldr r0, =gUnknown_085B21DC - bl InitWindows - bl DeactivateAllTextPrinters - movs r1, 0x94 - lsls r1, 2 - movs r0, 0 - movs r2, 0xD0 - bl sub_809882C - bl clear_scheduled_bg_copies_to_vram - bl remove_some_task - bl ResetTasks - bl ResetSpriteData - bl ResetPaletteFade - bl FreeAllSpritePalettes - ldr r0, =gUnknown_085B2208 - bl LoadCompressedObjectPic - ldr r0, =gUnknown_085B2218 - bl LoadSpritePalettes - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end LoadWallClockGraphics - - thumb_func_start sub_813498C -sub_813498C: @ 813498C - push {lr} - sub sp, 0x4 - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - movs r0, 0x1 - bl EnableInterrupts - ldr r0, =sub_81347B4 - bl SetVBlankCallback - ldr r0, =sub_8134C9C - bl SetMainCallback2 - movs r0, 0x50 - movs r1, 0 - bl SetGpuReg - movs r0, 0x52 - movs r1, 0 - bl SetGpuReg - movs r0, 0x54 - movs r1, 0 - bl SetGpuReg - movs r1, 0x82 - lsls r1, 5 - movs r0, 0 - bl SetGpuReg - movs r0, 0 - bl ShowBg - movs r0, 0x2 - bl ShowBg - movs r0, 0x3 - bl ShowBg - add sp, 0x4 - pop {r0} - bx r0 - .pool - thumb_func_end sub_813498C - - thumb_func_start Cb2_StartWallClock -Cb2_StartWallClock: @ 81349F4 - push {r4-r6,lr} - mov r6, r10 - mov r5, r9 - mov r4, r8 - push {r4-r6} - sub sp, 0xC - bl LoadWallClockGraphics - ldr r0, =gUnknown_08DCC648 - ldr r1, =0x06003800 - bl LZ77UnCompVram - ldr r0, =sub_8134CB8 - movs r1, 0 - bl CreateTask - adds r6, r0, 0 - lsls r6, 24 - lsrs r6, 24 - ldr r1, =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r0, r1 - movs r1, 0 - mov r8, r1 - movs r1, 0xA - strh r1, [r0, 0xC] - mov r2, r8 - strh r2, [r0, 0xE] - strh r2, [r0, 0x10] - strh r2, [r0, 0x12] - strh r2, [r0, 0x14] - strh r2, [r0, 0x8] - movs r1, 0x96 - lsls r1, 1 - strh r1, [r0, 0xA] - ldr r0, =gUnknown_085B2250 - movs r1, 0x78 - movs r2, 0x50 - movs r3, 0x1 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gSprites - mov r9, r1 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - add r1, r9 - strh r6, [r1, 0x2E] - ldrb r2, [r1, 0x1] - movs r5, 0x4 - negs r5, r5 - adds r0, r5, 0 - ands r0, r2 - movs r2, 0x1 - mov r10, r2 - mov r2, r10 - orrs r0, r2 - strb r0, [r1, 0x1] - ldrb r2, [r1, 0x3] - movs r4, 0x3F - negs r4, r4 - adds r0, r4, 0 - ands r0, r2 - strb r0, [r1, 0x3] - ldr r0, =gUnknown_085B2268 - movs r1, 0x78 - movs r2, 0x50 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - add r1, r9 - strh r6, [r1, 0x2E] - ldrb r0, [r1, 0x1] - ands r5, r0 - mov r0, r10 - orrs r5, r0 - strb r5, [r1, 0x1] - ldrb r0, [r1, 0x3] - ands r4, r0 - movs r0, 0x2 - orrs r4, r0 - strb r4, [r1, 0x3] - ldr r0, =gUnknown_085B22A0 - movs r1, 0x78 - movs r2, 0x50 - movs r3, 0x2 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - add r1, r9 - strh r6, [r1, 0x2E] - movs r0, 0x2D - strh r0, [r1, 0x30] - ldr r0, =gUnknown_085B22B8 - movs r1, 0x78 - movs r2, 0x50 - movs r3, 0x2 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - add r1, r9 - strh r6, [r1, 0x2E] - movs r0, 0x5A - strh r0, [r1, 0x30] - bl sub_813498C - ldr r2, =gText_Confirm3 - movs r0, 0x1 - str r0, [sp] - mov r1, r8 - str r1, [sp, 0x4] - str r1, [sp, 0x8] - movs r1, 0x1 - movs r3, 0 - bl PrintTextOnWindow - movs r0, 0x1 - bl PutWindowTilemap - movs r0, 0x2 - bl schedule_bg_copy_tilemap_to_vram - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r6} - pop {r0} - bx r0 - .pool - thumb_func_end Cb2_StartWallClock - - thumb_func_start Cb2_ViewWallClock -Cb2_ViewWallClock: @ 8134B44 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x10 - bl LoadWallClockGraphics - ldr r0, =gUnknown_08DCC908 - ldr r1, =0x06003800 - bl LZ77UnCompVram - ldr r0, =sub_8134F10 - movs r1, 0 - bl CreateTask - lsls r0, 24 - lsrs r7, r0, 24 - adds r0, r7, 0 - bl sub_8135130 - ldr r1, =gTasks - lsls r0, r7, 2 - adds r0, r7 - lsls r0, 3 - adds r0, r1 - movs r1, 0x12 - ldrsh r0, [r0, r1] - cmp r0, 0 - bne _08134B9C - movs r2, 0x2D - mov r10, r2 - movs r0, 0x5A - str r0, [sp, 0xC] - b _08134BA4 - .pool -_08134B9C: - movs r1, 0x5A - mov r10, r1 - movs r2, 0x87 - str r2, [sp, 0xC] -_08134BA4: - ldr r0, =gUnknown_085B2250 - movs r1, 0x78 - movs r2, 0x50 - movs r3, 0x1 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - ldr r6, =gSprites - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r6 - movs r0, 0 - mov r9, r0 - strh r7, [r1, 0x2E] - ldrb r2, [r1, 0x1] - movs r5, 0x4 - negs r5, r5 - adds r0, r5, 0 - ands r0, r2 - movs r2, 0x1 - mov r8, r2 - mov r2, r8 - orrs r0, r2 - strb r0, [r1, 0x1] - ldrb r2, [r1, 0x3] - movs r4, 0x3F - negs r4, r4 - adds r0, r4, 0 - ands r0, r2 - strb r0, [r1, 0x3] - ldr r0, =gUnknown_085B2268 - movs r1, 0x78 - movs r2, 0x50 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r6 - strh r7, [r1, 0x2E] - ldrb r0, [r1, 0x1] - ands r5, r0 - mov r0, r8 - orrs r5, r0 - strb r5, [r1, 0x1] - ldrb r0, [r1, 0x3] - ands r4, r0 - movs r0, 0x2 - orrs r4, r0 - strb r4, [r1, 0x3] - ldr r0, =gUnknown_085B22A0 - movs r1, 0x78 - movs r2, 0x50 - movs r3, 0x2 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r6 - strh r7, [r1, 0x2E] - mov r2, r10 - strh r2, [r1, 0x30] - ldr r0, =gUnknown_085B22B8 - movs r1, 0x78 - movs r2, 0x50 - movs r3, 0x2 - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r6 - strh r7, [r1, 0x2E] - mov r0, sp - ldrh r0, [r0, 0xC] - strh r0, [r1, 0x30] - bl sub_813498C - ldr r2, =gText_Cancel4 - movs r0, 0x1 - str r0, [sp] - mov r1, r9 - str r1, [sp, 0x4] - str r1, [sp, 0x8] - movs r1, 0x1 - movs r3, 0 - bl PrintTextOnWindow - movs r0, 0x1 - bl PutWindowTilemap - movs r0, 0x2 - bl schedule_bg_copy_tilemap_to_vram - add sp, 0x10 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end Cb2_ViewWallClock - - thumb_func_start sub_8134C9C -sub_8134C9C: @ 8134C9C - push {lr} - bl RunTasks - bl AnimateSprites - bl BuildOamBuffer - bl do_scheduled_bg_tilemap_copies_to_vram - bl UpdatePaletteFade - pop {r0} - bx r0 - thumb_func_end sub_8134C9C - - thumb_func_start sub_8134CB8 -sub_8134CB8: @ 8134CB8 - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08134CD8 - ldr r0, =gTasks - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 3 - adds r1, r0 - ldr r0, =sub_8134CE8 - str r0, [r1] -_08134CD8: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8134CB8 - - thumb_func_start sub_8134CE8 -sub_8134CE8: @ 8134CE8 - push {r4-r6,lr} - lsls r0, 24 - lsrs r6, r0, 24 - ldr r1, =gTasks - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - adds r5, r0, r1 - movs r1, 0x8 - ldrsh r0, [r5, r1] - movs r1, 0x6 - bl __modsi3 - lsls r0, 16 - cmp r0, 0 - beq _08134D1C - ldrh r0, [r5, 0x8] - ldrb r1, [r5, 0x10] - ldrb r2, [r5, 0x14] - bl sub_8134FFC - strh r0, [r5, 0x8] - b _08134DBE - .pool -_08134D1C: - movs r2, 0xE - ldrsh r1, [r5, r2] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 1 - strh r0, [r5, 0x8] - movs r3, 0xC - ldrsh r0, [r5, r3] - movs r1, 0xC - bl __modsi3 - lsls r0, 16 - asrs r0, 16 - lsls r4, r0, 4 - subs r4, r0 - lsls r4, 1 - movs r1, 0xE - ldrsh r0, [r5, r1] - movs r1, 0xA - bl __divsi3 - lsls r0, 16 - asrs r0, 16 - lsls r1, r0, 2 - adds r1, r0 - adds r4, r1 - strh r4, [r5, 0xA] - ldr r2, =gMain - ldrh r0, [r2, 0x2E] - movs r3, 0x1 - adds r1, r3, 0 - ands r1, r0 - cmp r1, 0 - beq _08134D70 - ldr r0, =sub_8134DC4 - str r0, [r5] - b _08134DBE - .pool -_08134D70: - strh r1, [r5, 0x10] - ldrh r1, [r2, 0x2C] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _08134D7E - strh r3, [r5, 0x10] -_08134D7E: - ldrh r1, [r2, 0x2C] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _08134D8C - movs r0, 0x2 - strh r0, [r5, 0x10] -_08134D8C: - ldrh r1, [r5, 0x10] - movs r2, 0x10 - ldrsh r0, [r5, r2] - cmp r0, 0 - beq _08134DBC - ldrh r2, [r5, 0x14] - movs r3, 0x14 - ldrsh r0, [r5, r3] - cmp r0, 0xFE - bgt _08134DA4 - adds r0, r2, 0x1 - strh r0, [r5, 0x14] -_08134DA4: - ldrh r0, [r5, 0x8] - lsls r1, 24 - lsrs r1, 24 - ldrb r2, [r5, 0x14] - bl sub_8134FFC - strh r0, [r5, 0x8] - ldrb r1, [r5, 0x10] - adds r0, r6, 0 - bl sub_813504C - b _08134DBE -_08134DBC: - strh r0, [r5, 0x14] -_08134DBE: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8134CE8 - - thumb_func_start sub_8134DC4 -sub_8134DC4: @ 8134DC4 - push {r4,r5,lr} - sub sp, 0xC - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r5, 0x94 - lsls r5, 2 - movs r0, 0 - movs r1, 0 - adds r2, r5, 0 - movs r3, 0xD - bl SetWindowBorderStyle - ldr r2, =gText_IsThisTheCorrectTime - movs r0, 0x1 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - str r0, [sp, 0x8] - movs r1, 0x1 - movs r3, 0 - bl PrintTextOnWindow - movs r0, 0 - bl PutWindowTilemap - movs r0, 0 - bl schedule_bg_copy_tilemap_to_vram - ldr r0, =gUnknown_085B21F4 - adds r1, r5, 0 - movs r2, 0xD - movs r3, 0x1 - bl CreateYesNoMenu - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, =c3_80BF560 - str r1, [r0] - add sp, 0xC - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8134DC4 - - thumb_func_start c3_80BF560 -c3_80BF560: @ 8134E30 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - bl sub_8198C58 - lsls r0, 24 - asrs r1, r0, 24 - cmp r1, 0 - beq _08134E56 - cmp r1, 0 - bgt _08134E50 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _08134E74 - b _08134E96 -_08134E50: - cmp r1, 0x1 - beq _08134E74 - b _08134E96 -_08134E56: - movs r0, 0x5 - bl PlaySE - ldr r0, =gTasks - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - adds r1, r0 - ldr r0, =sub_8134EA4 - b _08134E94 - .pool -_08134E74: - movs r0, 0x5 - bl PlaySE - movs r0, 0 - movs r1, 0 - bl sub_8198070 - movs r0, 0 - bl ClearWindowTilemap - ldr r0, =gTasks - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - adds r1, r0 - ldr r0, =sub_8134CE8 -_08134E94: - str r0, [r1] -_08134E96: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end c3_80BF560 - - thumb_func_start sub_8134EA4 -sub_8134EA4: @ 8134EA4 - push {r4,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gTasks - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - adds r4, r1 - movs r1, 0xC - ldrsh r0, [r4, r1] - movs r2, 0xE - ldrsh r1, [r4, r2] - bl RtcInitLocalTimeOffset - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldr r0, =c2_080111BC - str r0, [r4] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8134EA4 - - thumb_func_start c2_080111BC -c2_080111BC: @ 8134EE8 - push {lr} - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08134F02 - bl FreeAllWindowBuffers - ldr r0, =gMain - ldr r0, [r0, 0x8] - bl SetMainCallback2 -_08134F02: - pop {r0} - bx r0 - .pool - thumb_func_end c2_080111BC - - thumb_func_start sub_8134F10 -sub_8134F10: @ 8134F10 - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08134F30 - ldr r0, =gTasks - lsls r1, r2, 2 - adds r1, r2 - lsls r1, 3 - adds r1, r0 - ldr r0, =sub_8134F40 - str r0, [r1] -_08134F30: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8134F10 - - thumb_func_start sub_8134F40 -sub_8134F40: @ 8134F40 - push {r4,lr} - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r4, 0 - bl sub_8135130 - ldr r0, =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x3 - ands r0, r1 - cmp r0, 0 - beq _08134F66 - ldr r0, =gTasks - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - adds r1, r0 - ldr r0, =sub_8134F78 - str r0, [r1] -_08134F66: - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8134F40 - - thumb_func_start sub_8134F78 -sub_8134F78: @ 8134F78 - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r0, r1 - ldr r1, =sub_8134FB0 - str r1, [r0] - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8134F78 - - thumb_func_start sub_8134FB0 -sub_8134FB0: @ 8134FB0 - push {lr} - ldr r0, =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08134FC6 - ldr r0, =gMain - ldr r0, [r0, 0x8] - bl SetMainCallback2 -_08134FC6: - pop {r0} - bx r0 - .pool - thumb_func_end sub_8134FB0 - - thumb_func_start sub_8134FD4 -sub_8134FD4: @ 8134FD4 - push {lr} - lsls r0, 16 - lsrs r0, 16 - adds r1, r0, 0 - cmp r0, 0x3C - bls _08134FE4 - movs r0, 0x6 - b _08134FF6 -_08134FE4: - cmp r0, 0x1E - bls _08134FEC - movs r0, 0x3 - b _08134FF6 -_08134FEC: - cmp r1, 0xA - bhi _08134FF4 - movs r0, 0x1 - b _08134FF6 -_08134FF4: - movs r0, 0x2 -_08134FF6: - pop {r1} - bx r1 - thumb_func_end sub_8134FD4 - - thumb_func_start sub_8134FFC -sub_8134FFC: @ 8134FFC - push {r4,r5,lr} - lsls r0, 16 - lsrs r4, r0, 16 - lsls r1, 24 - lsrs r5, r1, 24 - lsls r2, 24 - lsrs r2, 24 - adds r0, r2, 0 - bl sub_8134FD4 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r5, 0x1 - beq _0813501E - cmp r5, 0x2 - beq _08135030 - b _08135044 -_0813501E: - cmp r4, 0 - beq _08135026 - subs r0, r4, r1 - b _0813503C -_08135026: - movs r2, 0xB4 - lsls r2, 1 - adds r0, r2, 0 - subs r0, r1 - b _0813503C -_08135030: - movs r0, 0xB4 - lsls r0, 1 - subs r0, r1 - cmp r4, r0 - bge _08135042 - adds r0, r4, r1 -_0813503C: - lsls r0, 16 - lsrs r4, r0, 16 - b _08135044 -_08135042: - movs r4, 0 -_08135044: - adds r0, r4, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8134FFC - - thumb_func_start sub_813504C -sub_813504C: @ 813504C - push {r4-r6,lr} - lsls r0, 24 - lsrs r3, r0, 24 - lsls r1, 24 - lsrs r4, r1, 24 - cmp r4, 0x1 - beq _08135060 - cmp r4, 0x2 - beq _081350A0 - b _081350DE -_08135060: - ldr r0, =gTasks - lsls r1, r3, 2 - adds r1, r3 - lsls r1, 3 - adds r1, r0 - ldrh r2, [r1, 0xE] - movs r5, 0xE - ldrsh r0, [r1, r5] - cmp r0, 0 - ble _08135080 - subs r0, r2, 0x1 - strh r0, [r1, 0xE] - b _081350DE - .pool -_08135080: - movs r0, 0x3B - strh r0, [r1, 0xE] - ldrh r2, [r1, 0xC] - movs r6, 0xC - ldrsh r0, [r1, r6] - cmp r0, 0 - ble _08135092 - subs r0, r2, 0x1 - b _08135094 -_08135092: - movs r0, 0x17 -_08135094: - strh r0, [r1, 0xC] - adds r0, r3, 0 - adds r1, r4, 0 - bl sub_81350E8 - b _081350DE -_081350A0: - ldr r0, =gTasks - lsls r1, r3, 2 - adds r1, r3 - lsls r1, 3 - adds r1, r0 - ldrh r2, [r1, 0xE] - movs r5, 0xE - ldrsh r0, [r1, r5] - cmp r0, 0x3A - bgt _081350C0 - adds r0, r2, 0x1 - strh r0, [r1, 0xE] - b _081350DE - .pool -_081350C0: - movs r5, 0 - strh r5, [r1, 0xE] - ldrh r2, [r1, 0xC] - movs r6, 0xC - ldrsh r0, [r1, r6] - cmp r0, 0x16 - bgt _081350D4 - adds r0, r2, 0x1 - strh r0, [r1, 0xC] - b _081350D6 -_081350D4: - strh r5, [r1, 0xC] -_081350D6: - adds r0, r3, 0 - adds r1, r4, 0 - bl sub_81350E8 -_081350DE: - movs r0, 0 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_813504C - - thumb_func_start sub_81350E8 -sub_81350E8: @ 81350E8 - push {lr} - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r3, r1, 24 - ldr r2, =gTasks - lsls r1, r0, 2 - adds r1, r0 - lsls r1, 3 - adds r1, r2 - ldrb r0, [r1, 0xC] - cmp r3, 0x1 - beq _0813510C - cmp r3, 0x2 - beq _0813511E - b _0813512A - .pool -_0813510C: - cmp r0, 0xB - beq _08135116 - cmp r0, 0x17 - beq _0813511A - b _0813512A -_08135116: - movs r0, 0 - b _08135128 -_0813511A: - strh r3, [r1, 0x12] - b _0813512A -_0813511E: - cmp r0, 0 - beq _08135128 - cmp r0, 0xC - bne _0813512A - movs r0, 0x1 -_08135128: - strh r0, [r1, 0x12] -_0813512A: - pop {r0} - bx r0 - thumb_func_end sub_81350E8 - - thumb_func_start sub_8135130 -sub_8135130: @ 8135130 - push {r4-r6,lr} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl RtcCalcLocalTime - ldr r1, =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r6, r0, r1 - ldr r5, =gLocalTime - movs r0, 0x2 - ldrsb r0, [r5, r0] - strh r0, [r6, 0xC] - movs r0, 0x3 - ldrsb r0, [r5, r0] - strh r0, [r6, 0xE] - movs r0, 0xE - ldrsh r1, [r6, r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 1 - strh r0, [r6, 0x8] - movs r1, 0xC - ldrsh r0, [r6, r1] - movs r1, 0xC - bl __modsi3 - lsls r0, 16 - asrs r0, 16 - lsls r4, r0, 4 - subs r4, r0 - lsls r4, 1 - movs r1, 0xE - ldrsh r0, [r6, r1] - movs r1, 0xA - bl __divsi3 - lsls r0, 16 - asrs r0, 16 - lsls r1, r0, 2 - adds r1, r0 - adds r4, r1 - strh r4, [r6, 0xA] - movs r0, 0x2 - ldrsb r0, [r5, r0] - cmp r0, 0xB - bgt _081351A0 - movs r0, 0 - b _081351A2 - .pool -_081351A0: - movs r0, 0x1 -_081351A2: - strh r0, [r6, 0x12] - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_8135130 - - thumb_func_start sub_81351AC -sub_81351AC: @ 81351AC - push {r4-r7,lr} - sub sp, 0x4 - adds r6, r0, 0 - ldr r2, =gTasks - movs r0, 0x2E - ldrsh r1, [r6, r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - ldrh r4, [r0, 0x8] - adds r7, r4, 0 - adds r0, r4, 0 - bl Sin2 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _081351D4 - adds r0, 0xF -_081351D4: - lsls r0, 12 - lsrs r5, r0, 16 - adds r0, r4, 0 - bl Cos2 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _081351E8 - adds r0, 0xF -_081351E8: - lsls r1, r0, 12 - lsrs r1, 16 - lsls r3, r5, 16 - lsrs r2, r3, 16 - negs r3, r3 - lsrs r3, 16 - str r1, [sp] - movs r0, 0 - bl SetOamMatrix - ldr r1, =gUnknown_085B22D0 - lsls r2, r7, 1 - adds r0, r2, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 16 - lsrs r3, r0, 16 - adds r1, 0x1 - adds r2, r1 - movs r0, 0 - ldrsb r0, [r2, r0] - lsls r0, 16 - lsrs r2, r0, 16 - cmp r3, 0x80 - bls _08135224 - movs r1, 0xFF - lsls r1, 8 - adds r0, r1, 0 - orrs r3, r0 -_08135224: - cmp r2, 0x80 - bls _08135230 - movs r1, 0xFF - lsls r1, 8 - adds r0, r1, 0 - orrs r2, r0 -_08135230: - strh r3, [r6, 0x24] - strh r2, [r6, 0x26] - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81351AC - - thumb_func_start sub_8135244 -sub_8135244: @ 8135244 - push {r4-r7,lr} - sub sp, 0x4 - adds r6, r0, 0 - ldr r2, =gTasks - movs r0, 0x2E - ldrsh r1, [r6, r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - ldrh r4, [r0, 0xA] - adds r7, r4, 0 - adds r0, r4, 0 - bl Sin2 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _0813526C - adds r0, 0xF -_0813526C: - lsls r0, 12 - lsrs r5, r0, 16 - adds r0, r4, 0 - bl Cos2 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0 - bge _08135280 - adds r0, 0xF -_08135280: - lsls r1, r0, 12 - lsrs r1, 16 - lsls r3, r5, 16 - lsrs r2, r3, 16 - negs r3, r3 - lsrs r3, 16 - str r1, [sp] - movs r0, 0x1 - bl SetOamMatrix - ldr r1, =gUnknown_085B22D0 - lsls r2, r7, 1 - adds r0, r2, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - lsls r0, 16 - lsrs r3, r0, 16 - adds r1, 0x1 - adds r2, r1 - movs r0, 0 - ldrsb r0, [r2, r0] - lsls r0, 16 - lsrs r2, r0, 16 - cmp r3, 0x80 - bls _081352BC - movs r1, 0xFF - lsls r1, 8 - adds r0, r1, 0 - orrs r3, r0 -_081352BC: - cmp r2, 0x80 - bls _081352C8 - movs r1, 0xFF - lsls r1, 8 - adds r0, r1, 0 - orrs r2, r0 -_081352C8: - strh r3, [r6, 0x24] - strh r2, [r6, 0x26] - add sp, 0x4 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8135244 - - thumb_func_start sub_81352DC -sub_81352DC: @ 81352DC - push {r4,lr} - adds r4, r0, 0 - ldr r2, =gTasks - movs r0, 0x2E - ldrsh r1, [r4, r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - movs r1, 0x12 - ldrsh r0, [r0, r1] - cmp r0, 0 - beq _0813531C - ldrh r1, [r4, 0x30] - adds r0, r1, 0 - subs r0, 0x3C - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1D - bhi _08135308 - adds r0, r1, 0x5 - strh r0, [r4, 0x30] -_08135308: - ldrh r1, [r4, 0x30] - movs r2, 0x30 - ldrsh r0, [r4, r2] - cmp r0, 0x3B - bgt _0813533C - adds r0, r1, 0x1 - b _0813533A - .pool -_0813531C: - ldrh r1, [r4, 0x30] - adds r0, r1, 0 - subs r0, 0x2E - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1D - bhi _0813532E - subs r0, r1, 0x5 - strh r0, [r4, 0x30] -_0813532E: - ldrh r1, [r4, 0x30] - movs r2, 0x30 - ldrsh r0, [r4, r2] - cmp r0, 0x4B - ble _0813533C - subs r0, r1, 0x1 -_0813533A: - strh r0, [r4, 0x30] -_0813533C: - ldrh r0, [r4, 0x30] - bl Cos2 - lsls r0, 16 - asrs r0, 16 - lsls r1, r0, 4 - subs r1, r0 - lsls r0, r1, 1 - cmp r0, 0 - bge _08135354 - ldr r1, =0x00000fff - adds r0, r1 -_08135354: - asrs r0, 12 - strh r0, [r4, 0x24] - ldrh r0, [r4, 0x30] - bl Sin2 - lsls r0, 16 - asrs r0, 16 - lsls r1, r0, 4 - subs r1, r0 - lsls r0, r1, 1 - cmp r0, 0 - bge _08135370 - ldr r2, =0x00000fff - adds r0, r2 -_08135370: - asrs r0, 12 - strh r0, [r4, 0x26] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81352DC - - thumb_func_start sub_8135380 -sub_8135380: @ 8135380 - push {r4,lr} - adds r4, r0, 0 - ldr r2, =gTasks - movs r0, 0x2E - ldrsh r1, [r4, r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - adds r0, r2 - movs r1, 0x12 - ldrsh r0, [r0, r1] - cmp r0, 0 - beq _081353C0 - ldrh r1, [r4, 0x30] - adds r0, r1, 0 - subs r0, 0x69 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1D - bhi _081353AC - adds r0, r1, 0x5 - strh r0, [r4, 0x30] -_081353AC: - ldrh r1, [r4, 0x30] - movs r2, 0x30 - ldrsh r0, [r4, r2] - cmp r0, 0x68 - bgt _081353E0 - adds r0, r1, 0x1 - b _081353DE - .pool -_081353C0: - ldrh r1, [r4, 0x30] - adds r0, r1, 0 - subs r0, 0x5B - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1D - bhi _081353D2 - subs r0, r1, 0x5 - strh r0, [r4, 0x30] -_081353D2: - ldrh r1, [r4, 0x30] - movs r2, 0x30 - ldrsh r0, [r4, r2] - cmp r0, 0x78 - ble _081353E0 - subs r0, r1, 0x1 -_081353DE: - strh r0, [r4, 0x30] -_081353E0: - ldrh r0, [r4, 0x30] - bl Cos2 - lsls r0, 16 - asrs r0, 16 - lsls r1, r0, 4 - subs r1, r0 - lsls r0, r1, 1 - cmp r0, 0 - bge _081353F8 - ldr r1, =0x00000fff - adds r0, r1 -_081353F8: - asrs r0, 12 - strh r0, [r4, 0x24] - ldrh r0, [r4, 0x30] - bl Sin2 - lsls r0, 16 - asrs r0, 16 - lsls r1, r0, 4 - subs r1, r0 - lsls r0, r1, 1 - cmp r0, 0 - bge _08135414 - ldr r2, =0x00000fff - adds r0, r2 -_08135414: - asrs r0, 12 - strh r0, [r4, 0x26] - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_8135380 - - .align 2, 0 @ Don't pad with nop. diff --git a/common_syms/trainer_see.txt b/common_syms/trainer_see.txt new file mode 100644 index 000000000..2d0514325 --- /dev/null +++ b/common_syms/trainer_see.txt @@ -0,0 +1,5 @@ +gUnknown_03006080 +gUnknown_03006084 +gApproachingTrainers +gNoOfApproachingTrainers +gUnknown_030060AC diff --git a/constants/battle_constants.inc b/constants/battle_constants.inc index 34f16a8c9..7309d68cd 100644 --- a/constants/battle_constants.inc +++ b/constants/battle_constants.inc @@ -19,7 +19,7 @@ .set BATTLE_TYPE_PALACE, 0x20000 .set BATTLE_TYPE_ARENA, 0x40000 .set BATTLE_TYPE_FACTORY, 0x80000 - .set BATTLE_TYPE_x100000, 0x100000 + .set BATTLE_TYPE_PIKE, 0x100000 .set BATTLE_TYPE_PYRAMID, 0x200000 .set BATTLE_TYPE_INGAME_PARTNER, 0x400000 .set BATTLE_TYPE_x800000, 0x800000 @@ -28,7 +28,7 @@ .set BATTLE_TYPE_x4000000, 0x4000000 .set BATTLE_TYPE_SECRET_BASE, 0x8000000 .set BATTLE_TYPE_GROUDON, 0x10000000 - .set BATTLE_TYPE_KYORGE, 0x20000000 + .set BATTLE_TYPE_KYOGRE, 0x20000000 .set BATTLE_TYPE_RAYQUAZA, 0x40000000 .set BATTLE_TYPE_x80000000, 0x80000000 diff --git a/data/battle_frontier_1.s b/data/battle_frontier_1.s index 5d82c25f2..a6cad8f50 100644 --- a/data/battle_frontier_1.s +++ b/data/battle_frontier_1.s @@ -11,7 +11,27 @@ gUnknown_0860C988:: @ 860C988 .incbin "baserom.gba", 0x60c988, 0x269 gUnknown_0860CBF1:: @ 860CBF1 - .incbin "baserom.gba", 0x60cbf1, 0x283 + .byte 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x00, 0x02, 0x09, 0x10, 0x00, 0x02, 0x09, 0x10, 0x00, 0x02, 0x09, 0x10 + .byte 0x00, 0x02, 0x09, 0x10, 0x00, 0x02, 0x09, 0x10, 0x01, 0x03, 0x0a, 0x11, 0x01, 0x03, 0x0a, 0x11, 0x01, 0x03, 0x0a, 0x11, 0x01, 0x03, 0x0a, 0x11, 0x01, 0x03, 0x0a, 0x11, 0x02, 0x04, 0x0b, 0x11 + .byte 0x02, 0x04, 0x0b, 0x11, 0x02, 0x04, 0x0b, 0x11, 0x02, 0x04, 0x0b, 0x11, 0x02, 0x04, 0x0b, 0x11, 0x03, 0x05, 0x0c, 0x12, 0x03, 0x05, 0x0c, 0x12, 0x03, 0x05, 0x0c, 0x12, 0x03, 0x05, 0x0c, 0x12 + .byte 0x03, 0x05, 0x0c, 0x12, 0x04, 0x06, 0x0d, 0x12, 0x04, 0x06, 0x0d, 0x12, 0x04, 0x06, 0x0d, 0x12, 0x04, 0x06, 0x0d, 0x12, 0x04, 0x06, 0x0d, 0x12, 0x05, 0x07, 0x0e, 0x13, 0x05, 0x07, 0x0e, 0x13 + .byte 0x05, 0x07, 0x0e, 0x13, 0x05, 0x07, 0x0e, 0x13, 0x05, 0x07, 0x0e, 0x13, 0x06, 0x00, 0x0f, 0x13, 0x06, 0x00, 0x0f, 0x13, 0x06, 0x00, 0x0f, 0x13, 0x06, 0x00, 0x0f, 0x13, 0x06, 0x00, 0x0f, 0x13 + .byte 0x1f, 0x09, 0x14, 0x1f, 0x1f, 0x09, 0x14, 0x1f, 0x1f, 0x09, 0x14, 0x1f, 0x1f, 0x09, 0x14, 0x1f, 0x1f, 0x09, 0x14, 0x1f, 0x08, 0x0a, 0x14, 0x01, 0x08, 0x0a, 0x14, 0x01, 0x08, 0x0a, 0x14, 0x01 + .byte 0x08, 0x0a, 0x14, 0x01, 0x08, 0x0a, 0x14, 0x01, 0x09, 0x0b, 0x15, 0x02, 0x09, 0x0b, 0x15, 0x02, 0x09, 0x0b, 0x15, 0x02, 0x09, 0x0b, 0x15, 0x02, 0x09, 0x0b, 0x15, 0x02, 0x0a, 0x0c, 0x15, 0x03 + .byte 0x0a, 0x0c, 0x15, 0x03, 0x0a, 0x0c, 0x15, 0x03, 0x0a, 0x0c, 0x15, 0x03, 0x0a, 0x0c, 0x15, 0x03, 0x0b, 0x0d, 0x16, 0x04, 0x0b, 0x0d, 0x16, 0x04, 0x0b, 0x0d, 0x16, 0x04, 0x0b, 0x0d, 0x16, 0x04 + .byte 0x0b, 0x0d, 0x16, 0x04, 0x0c, 0x0e, 0x16, 0x05, 0x0c, 0x0e, 0x16, 0x05, 0x0c, 0x0e, 0x16, 0x05, 0x0c, 0x0e, 0x16, 0x05, 0x0c, 0x0e, 0x16, 0x05, 0x0d, 0x0f, 0x17, 0x06, 0x0d, 0x0f, 0x17, 0x06 + .byte 0x0d, 0x0f, 0x17, 0x06, 0x0d, 0x0f, 0x17, 0x06, 0x0d, 0x0f, 0x17, 0x06, 0x0e, 0x1f, 0x17, 0x07, 0x0e, 0x1f, 0x17, 0x07, 0x0e, 0x1f, 0x17, 0x07, 0x0e, 0x1f, 0x17, 0x07, 0x0e, 0x1f, 0x17, 0x07 + .byte 0x13, 0x11, 0x00, 0x14, 0x13, 0x11, 0x00, 0x18, 0x13, 0x11, 0x00, 0x18, 0x13, 0x11, 0x00, 0x18, 0x13, 0x11, 0x00, 0x18, 0x10, 0x12, 0x02, 0x15, 0x10, 0x12, 0x02, 0x18, 0x10, 0x12, 0x02, 0x18 + .byte 0x10, 0x12, 0x02, 0x18, 0x10, 0x12, 0x02, 0x18, 0x11, 0x13, 0x04, 0x16, 0x11, 0x13, 0x04, 0x19, 0x11, 0x13, 0x04, 0x19, 0x11, 0x13, 0x04, 0x19, 0x11, 0x13, 0x04, 0x19, 0x12, 0x10, 0x06, 0x17 + .byte 0x12, 0x10, 0x06, 0x19, 0x12, 0x10, 0x06, 0x19, 0x12, 0x10, 0x06, 0x19, 0x12, 0x10, 0x06, 0x19, 0x17, 0x15, 0x10, 0x08, 0x17, 0x15, 0x1a, 0x08, 0x17, 0x15, 0x1a, 0x08, 0x17, 0x15, 0x1a, 0x08 + .byte 0x17, 0x15, 0x1a, 0x08, 0x14, 0x16, 0x11, 0x0a, 0x14, 0x16, 0x1a, 0x0a, 0x14, 0x16, 0x1a, 0x0a, 0x14, 0x16, 0x1a, 0x0a, 0x14, 0x16, 0x1a, 0x0a, 0x15, 0x17, 0x12, 0x0c, 0x15, 0x17, 0x1b, 0x0c + .byte 0x15, 0x17, 0x1b, 0x0c, 0x15, 0x17, 0x1b, 0x0c, 0x15, 0x17, 0x1b, 0x0c, 0x16, 0x14, 0x13, 0x0e, 0x16, 0x14, 0x1b, 0x0e, 0x16, 0x14, 0x1b, 0x0e, 0x16, 0x14, 0x1b, 0x0e, 0x16, 0x14, 0x1b, 0x0e + .byte 0xff, 0xff, 0xff, 0xff, 0x19, 0x19, 0x10, 0x1a, 0x19, 0x19, 0x10, 0x1c, 0x19, 0x19, 0x10, 0x1c, 0x19, 0x19, 0x10, 0x1c, 0xff, 0xff, 0xff, 0xff, 0x18, 0x18, 0x12, 0x1b, 0x18, 0x18, 0x12, 0x1c + .byte 0x18, 0x18, 0x12, 0x1c, 0x18, 0x18, 0x12, 0x1c, 0xff, 0xff, 0xff, 0xff, 0x1b, 0x1b, 0x18, 0x14, 0x1b, 0x1b, 0x1d, 0x14, 0x1b, 0x1b, 0x1d, 0x14, 0x1b, 0x1b, 0x1d, 0x14, 0xff, 0xff, 0xff, 0xff + .byte 0x1a, 0x1a, 0x19, 0x16, 0x1a, 0x1a, 0x1d, 0x16, 0x1a, 0x1a, 0x1d, 0x16, 0x1a, 0x1a, 0x1d, 0x16, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x18, 0x1d, 0xff, 0xff, 0x18, 0x1e + .byte 0xff, 0xff, 0x18, 0x1e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1c, 0x1a, 0xff, 0xff, 0x1e, 0x1a, 0xff, 0xff, 0x1e, 0x1a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff + .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1c, 0x1d, 0xff, 0xff, 0x1c, 0x1d, 0x0f, 0x08, 0x08, 0x00, 0x0f, 0x08, 0x08, 0x00, 0x0f, 0x08, 0x08, 0x00, 0x0f, 0x08, 0x08, 0x00, 0x0f, 0x08, 0x08, 0x00 + .byte 0x00, 0x00, 0x00 gUnknown_0860CE74:: @ 860CE74 .incbin "baserom.gba", 0x60ce74, 0x10 @@ -20,10 +40,30 @@ gUnknown_0860CE84:: @ 860CE84 .incbin "baserom.gba", 0x60ce84, 0x10 gUnknown_0860CE94:: @ 860CE94 - .incbin "baserom.gba", 0x60ce94, 0x20 + window_template 0x00, 0x00, 0x03, 0x08, 0x10, 0x0f, 0x0010 + window_template 0x00, 0x16, 0x03, 0x08, 0x10, 0x0f, 0x0090 + window_template 0x00, 0x08, 0x01, 0x0e, 0x02, 0x0f, 0x0110 + window_template_terminator gUnknown_0860CEB4:: @ 860CEB4 - .incbin "baserom.gba", 0x60ceb4, 0x90 + window_template 0x00, 0x02, 0x02, 0x1a, 0x02, 0x0f, 0x0001 + window_template 0x00, 0x10, 0x05, 0x08, 0x02, 0x0f, 0x0035 + window_template 0x00, 0x13, 0x07, 0x09, 0x03, 0x0f, 0x0045 + window_template 0x00, 0x10, 0x0a, 0x08, 0x02, 0x0f, 0x0060 + window_template 0x00, 0x02, 0x0c, 0x1a, 0x07, 0x0f, 0x0070 + window_template 0x00, 0x05, 0x02, 0x17, 0x02, 0x0f, 0x0126 + window_template 0x00, 0x02, 0x05, 0x08, 0x02, 0x0f, 0x0154 + window_template 0x00, 0x14, 0x05, 0x08, 0x02, 0x0f, 0x0164 + window_template 0x00, 0x02, 0x10, 0x1a, 0x02, 0x0f, 0x0174 + window_template 0x01, 0x02, 0x02, 0x1a, 0x02, 0x0f, 0x0001 + window_template 0x01, 0x10, 0x05, 0x08, 0x02, 0x0f, 0x0035 + window_template 0x01, 0x13, 0x07, 0x09, 0x03, 0x0f, 0x0045 + window_template 0x01, 0x10, 0x0a, 0x08, 0x02, 0x0f, 0x0060 + window_template 0x01, 0x02, 0x0c, 0x1a, 0x07, 0x0f, 0x0070 + window_template 0x01, 0x05, 0x02, 0x17, 0x02, 0x0f, 0x0126 + window_template 0x01, 0x02, 0x05, 0x08, 0x02, 0x0f, 0x0154 + window_template 0x01, 0x14, 0x05, 0x08, 0x02, 0x0f, 0x0164 + window_template 0x01, 0x02, 0x10, 0x1a, 0x02, 0x0f, 0x0174 gUnknown_0860CF44:: @ 860CF44 .incbin "baserom.gba", 0x60cf44, 0xc @@ -47,124 +87,1254 @@ gUnknown_0860D068:: @ 860D068 .incbin "baserom.gba", 0x60d068, 0x18 gUnknown_0860D080:: @ 860D080 - .incbin "baserom.gba", 0x60d080, 0x10 + .byte 0x00, 0x08, 0x0c, 0x04, 0x07, 0x0f, 0x0b, 0x03, 0x02, 0x0a, 0x0e, 0x06, 0x05, 0x0d, 0x09, 0x01 gUnknown_0860D090:: @ 860D090 - .incbin "baserom.gba", 0x60d090, 0x5c + .4byte sub_818E9CC + .4byte sub_818EA84 + .4byte sub_818ED28 + .4byte sub_818F9B0 + .4byte sub_818F9E0 + .4byte sub_818FA20 + .4byte sub_81903B8 + .4byte sub_81938A4 + .4byte sub_81938E0 + .4byte sub_8190298 + .4byte sub_81902E4 + .4byte sub_8193D40 + .4byte sub_8193D7C + .4byte sub_81902F8 + .4byte sub_819033C + .4byte sub_8194D48 + .4byte sub_8194D68 + .4byte sub_8194E44 + .4byte sub_8194EB4 + .4byte sub_8194EC0 + .4byte sub_8194EF8 + .4byte sub_8194F58 + .4byte sub_818F02C gUnknown_0860D0EC:: @ 860D0EC - .incbin "baserom.gba", 0x60d0ec, 0x10 + .4byte 0x00000004, 0x00000008, 0x00100000, 0x00200000 gUnknown_0860D0FC:: @ 860D0FC - .incbin "baserom.gba", 0x60d0fc, 0x10 + .4byte 0xfffffffb, 0xfffffff7, 0xffefffff, 0xffdfffff gUnknown_0860D10C:: @ 860D10C - .incbin "baserom.gba", 0x60d10c, 0x40 + .byte 0x08, 0x00, 0x04, 0x08, 0x09, 0x0c, 0x08, 0x00, 0x0a, 0x08, 0x0c, 0x00, 0x0b, 0x04, 0x00, 0x08, 0x0c, 0x00, 0x04, 0x08, 0x0d, 0x0c, 0x08, 0x00, 0x0e, 0x08, 0x0c, 0x00, 0x0f, 0x04, 0x00, 0x08 + .byte 0x00, 0x00, 0x04, 0x08, 0x01, 0x0c, 0x08, 0x00, 0x02, 0x08, 0x0c, 0x00, 0x03, 0x04, 0x00, 0x08, 0x04, 0x00, 0x04, 0x08, 0x05, 0x0c, 0x08, 0x00, 0x06, 0x08, 0x0c, 0x00, 0x07, 0x04, 0x00, 0x08 gUnknown_0860D14C:: @ 860D14C - .incbin "baserom.gba", 0x60d14c, 0x10 + .byte 0x00, 0x08, 0x04, 0x0c, 0x07, 0x0f, 0x03, 0x0b, 0x02, 0x0a, 0x06, 0x0e, 0x05, 0x0d, 0x01, 0x09 gUnknown_0860D15C:: @ 860D15C - .incbin "baserom.gba", 0x60d15c, 0x40 + .byte 0x00, 0x08, 0x0c, 0x0e, 0x00, 0x08, 0x0c, 0x0e, 0x01, 0x08, 0x0c, 0x0e, 0x01, 0x08, 0x0c, 0x0e, 0x02, 0x09, 0x0c, 0x0e, 0x02, 0x09, 0x0c, 0x0e, 0x03, 0x09, 0x0c, 0x0e, 0x03, 0x09, 0x0c, 0x0e + .byte 0x04, 0x0a, 0x0d, 0x0e, 0x04, 0x0a, 0x0d, 0x0e, 0x05, 0x0a, 0x0d, 0x0e, 0x05, 0x0a, 0x0d, 0x0e, 0x06, 0x0b, 0x0d, 0x0e, 0x06, 0x0b, 0x0d, 0x0e, 0x07, 0x0b, 0x0d, 0x0e, 0x07, 0x0b, 0x0d, 0x0e gUnknown_0860D19C:: @ 860D19C - .incbin "baserom.gba", 0x60d19c, 0x4 + .byte 0x17, 0x1b, 0x1d, 0x1e gUnknown_0860D1A0:: @ 860D1A0 - .incbin "baserom.gba", 0x60d1a0, 0x20 + .byte 0x10, 0x18, 0x1c, 0x1e, 0x11, 0x18, 0x1c, 0x1e, 0x12, 0x19, 0x1c, 0x1e, 0x13, 0x19, 0x1c, 0x1e, 0x14, 0x1a, 0x1d, 0x1e, 0x15, 0x1a, 0x1d, 0x1e, 0x16, 0x1b, 0x1d, 0x1e, 0x17, 0x1b, 0x1d, 0x1e gUnknown_0860D1C0:: @ 860D1C0 - .incbin "baserom.gba", 0x60d1c0, 0x10 - -gUnknown_0860D1D0:: @ 860D1D0 - .incbin "baserom.gba", 0x60d1d0, 0x44 - -gUnknown_0860D214:: @ 860D214 - .incbin "baserom.gba", 0x60d214, 0x80 - -gUnknown_0860D294:: @ 860D294 - .incbin "baserom.gba", 0x60d294, 0xac + .byte 0x00, 0x0f, 0x08, 0x07, 0x03, 0x0c, 0x0b, 0x04, 0x01, 0x0e, 0x09, 0x06, 0x02, 0x0d, 0x0a, 0x05 + +gBattleDomePotentialPointers:: @ 860D1D0 + .4byte gBattleDomeOpponentPotential1 + .4byte gBattleDomeOpponentPotential2 + .4byte gBattleDomeOpponentPotential3 + .4byte gBattleDomeOpponentPotential4 + .4byte gBattleDomeOpponentPotential5 + .4byte gBattleDomeOpponentPotential6 + .4byte gBattleDomeOpponentPotential7 + .4byte gBattleDomeOpponentPotential8 + .4byte gBattleDomeOpponentPotential9 + .4byte gBattleDomeOpponentPotential10 + .4byte gBattleDomeOpponentPotential11 + .4byte gBattleDomeOpponentPotential12 + .4byte gBattleDomeOpponentPotential13 + .4byte gBattleDomeOpponentPotential14 + .4byte gBattleDomeOpponentPotential15 + .4byte gBattleDomeOpponentPotential16 + .4byte gBattleDomeOpponentPotential17 + +gBattleDomeOpponentStylePointers:: @ 860D214 + .4byte gBattleDomeOpponentStyle1 + .4byte gBattleDomeOpponentStyle2 + .4byte gBattleDomeOpponentStyle3 + .4byte gBattleDomeOpponentStyle4 + .4byte gBattleDomeOpponentStyle5 + .4byte gBattleDomeOpponentStyle6 + .4byte gBattleDomeOpponentStyle7 + .4byte gBattleDomeOpponentStyle8 + .4byte gBattleDomeOpponentStyle9 + .4byte gBattleDomeOpponentStyle10 + .4byte gBattleDomeOpponentStyle11 + .4byte gBattleDomeOpponentStyle12 + .4byte gBattleDomeOpponentStyle13 + .4byte gBattleDomeOpponentStyle14 + .4byte gBattleDomeOpponentStyle15 + .4byte gBattleDomeOpponentStyle16 + .4byte gBattleDomeOpponentStyle17 + .4byte gBattleDomeOpponentStyle18 + .4byte gBattleDomeOpponentStyle19 + .4byte gBattleDomeOpponentStyle20 + .4byte gBattleDomeOpponentStyle21 + .4byte gBattleDomeOpponentStyle22 + .4byte gBattleDomeOpponentStyle23 + .4byte gBattleDomeOpponentStyle24 + .4byte gBattleDomeOpponentStyle25 + .4byte gBattleDomeOpponentStyle26 + .4byte gBattleDomeOpponentStyle27 + .4byte gBattleDomeOpponentStyle28 + .4byte gBattleDomeOpponentStyleUnused1 + .4byte gBattleDomeOpponentStyleUnused2 + .4byte gBattleDomeOpponentStyleUnused3 + .4byte gBattleDomeOpponentStyleUnused4 + +gBattleDomeOpponentStatsPointers:: @ 860D294 + .4byte gBattleDomeOpponentStats1 + .4byte gBattleDomeOpponentStats2 + .4byte gBattleDomeOpponentStats3 + .4byte gBattleDomeOpponentStats4 + .4byte gBattleDomeOpponentStats5 + .4byte gBattleDomeOpponentStats6 + .4byte gBattleDomeOpponentStats7 + .4byte gBattleDomeOpponentStats8 + .4byte gBattleDomeOpponentStats9 + .4byte gBattleDomeOpponentStats10 + .4byte gBattleDomeOpponentStats11 + .4byte gBattleDomeOpponentStats12 + .4byte gBattleDomeOpponentStats13 + .4byte gBattleDomeOpponentStats14 + .4byte gBattleDomeOpponentStats15 + .4byte gBattleDomeOpponentStats16 + .4byte gBattleDomeOpponentStats17 + .4byte gBattleDomeOpponentStats18 + .4byte gBattleDomeOpponentStats19 + .4byte gBattleDomeOpponentStats20 + .4byte gBattleDomeOpponentStats21 + .4byte gBattleDomeOpponentStats22 + .4byte gBattleDomeOpponentStats23 + .4byte gBattleDomeOpponentStats24 + .4byte gBattleDomeOpponentStats25 + .4byte gBattleDomeOpponentStats26 + .4byte gBattleDomeOpponentStats27 + .4byte gBattleDomeOpponentStats28 + .4byte gBattleDomeOpponentStats29 + .4byte gBattleDomeOpponentStats30 + .4byte gBattleDomeOpponentStats31 + .4byte gBattleDomeOpponentStats32 + .4byte gBattleDomeOpponentStats33 + .4byte gBattleDomeOpponentStats34 + .4byte gBattleDomeOpponentStats35 + .4byte gBattleDomeOpponentStats36 + .4byte gBattleDomeOpponentStats37 + .4byte gBattleDomeOpponentStats38 + .4byte gBattleDomeOpponentStats39 + .4byte gBattleDomeOpponentStats40 + .4byte gBattleDomeOpponentStats41 + .4byte gBattleDomeOpponentStats42 + .4byte gBattleDomeOpponentStats43 gUnknown_0860D340:: @ 860D340 - .incbin "baserom.gba", 0x60d340, 0x3 + .byte 0x68, 0x88, 0x68 gUnknown_0860D343:: @ 860D343 - .incbin "baserom.gba", 0x60d343, 0x3 + .byte 0x26, 0x3e, 0x4e gUnknown_0860D346:: @ 860D346 - .incbin "baserom.gba", 0x60d346, 0x3 + .byte 0x00, 0x04, 0x00 gUnknown_0860D349:: @ 860D349 - .incbin "baserom.gba", 0x60d349, 0x7 - -gUnknown_0860D350:: @ 860D350 - .incbin "baserom.gba", 0x60d350, 0x3c - -gUnknown_0860D38C:: @ 860D38C - .incbin "baserom.gba", 0x60d38c, 0x1c + .byte 0x00, 0x05, 0x09, 0x0c, 0x0e, 0x00, 0x00 + +gBattleDomeMatchNumberPointers:: @ 860D350 + .4byte gBattleDomeMatchNumber1 + .4byte gBattleDomeMatchNumber2 + .4byte gBattleDomeMatchNumber3 + .4byte gBattleDomeMatchNumber4 + .4byte gBattleDomeMatchNumber5 + .4byte gBattleDomeMatchNumber6 + .4byte gBattleDomeMatchNumber7 + .4byte gBattleDomeMatchNumber8 + .4byte gBattleDomeMatchNumber9 + .4byte gBattleDomeMatchNumber10 + .4byte gBattleDomeMatchNumber11 + .4byte gBattleDomeMatchNumber12 + .4byte gBattleDomeMatchNumber13 + .4byte gBattleDomeMatchNumber14 + .4byte gBattleDomeMatchNumber15 + +gBattleDomeWinStringsPointers:: @ 860D38C + .4byte gBattleDomeWinStrings1 + .4byte gBattleDomeWinStrings2 + .4byte gBattleDomeWinStrings3 + .4byte gBattleDomeWinStrings4 + .4byte gBattleDomeWinStrings5 + .4byte gBattleDomeWinStrings6 + .4byte gBattleDomeWinStrings7 gUnknown_0860D3A8:: @ 860D3A8 - .incbin "baserom.gba", 0x60d3a8, 0x3 + .byte 0x60, 0x60, 0x60 gUnknown_0860D3AB:: @ 860D3AB - .incbin "baserom.gba", 0x60d3ab, 0x3 + .byte 0x38, 0x50, 0x68 gUnknown_0860D3AE:: @ 860D3AE - .incbin "baserom.gba", 0x60d3ae, 0x3 + .byte 0x90, 0x90, 0x90 gUnknown_0860D3B1:: @ 860D3B1 - .incbin "baserom.gba", 0x60d3b1, 0x3 + .byte 0x38, 0x50, 0x68 gUnknown_0860D3B4:: @ 860D3B4 - .incbin "baserom.gba", 0x60d3b4, 0x10 + .byte 0x00, 0x08, 0x0c, 0x04, 0x07, 0x0f, 0x0b, 0x03, 0x02, 0x0a, 0x0e, 0x06, 0x05, 0x0d, 0x09, 0x01 gUnknown_0860D3C4:: @ 860D3C4 - .incbin "baserom.gba", 0x60d3c4, 0x2 + .byte 0x00, 0x02 gUnknown_0860D3C6:: @ 860D3C6 - .incbin "baserom.gba", 0x60d3c6, 0x2b + .byte 0x00, 0x02, 0x02, 0x00, 0x04, 0x02, 0x00, 0x06, 0x02, 0x00, 0x08, 0x02, 0x00, 0x0a, 0x02, 0x00, 0x0c, 0x02, 0x00, 0x0e, 0x02, 0x00, 0x00, 0x04, 0x01, 0x04, 0x04, 0x01, 0x08, 0x04, 0x01, 0x0c + .byte 0x04, 0x01, 0x00, 0x08, 0x02, 0x08, 0x08, 0x02, 0x00, 0x10, 0x03 gUnknown_0860D3F1:: @ 860D3F1 - .incbin "baserom.gba", 0x60d3f1, 0x1 + .byte 0x00 gUnknown_0860D3F2:: @ 860D3F2 - .incbin "baserom.gba", 0x60d3f2, 0x1f + .byte 0x00, 0x01, 0x70, 0x01, 0x00, 0x00, 0x70, 0x00, 0x30, 0x01, 0x40, 0x01, 0x30, 0x00, 0x40, 0x00, 0x10, 0x01, 0x60, 0x01, 0x10, 0x00, 0x60, 0x00, 0x20, 0x01, 0x50, 0x01, 0x20, 0x00, 0x50 gUnknown_0860D411:: @ 860D411 - .incbin "baserom.gba", 0x60d411, 0x8ff + .incbin "baserom.gba", 0x60d411, 0x3f //struct - byte 1 and 2 loaded seperately, 2 added to move 1 addr across + +gUnknown_0860d450:: @ 860D450 + .4byte 0x60210409 + .4byte 0x6023040a + .4byte 0x6047050a + .4byte 0x6043050b + +gUnknown_0860d460:: @ 860D460 + .4byte 0x60210409 + .4byte 0x6023040a + .4byte 0x6047050a + .4byte 0x6023050b + .4byte 0x6027060b + .4byte 0x6047070b + .4byte 0x6043070c + +gUnknown_0860d47c:: @ 860D47C + .4byte 0x60210409 + .4byte 0x6023040a + .4byte 0x6047050a + .4byte 0x6023050b + .4byte 0x6027060b + .4byte 0x6047070b + .4byte 0x6023070c + .4byte 0x6027080c + .4byte 0x6027090c + .4byte 0x60270a0c + .4byte 0x603b0b0c + +gUnknown_0860d4a8:: @ 860D4A8 + .4byte 0x60210409 + .4byte 0x6023040a + .4byte 0x6047050a + .4byte 0x6023050b + .4byte 0x6027060b + .4byte 0x6047070b + .4byte 0x6023070c + .4byte 0x6027080c + .4byte 0x6027090c + .4byte 0x60270a0c + .4byte 0x603b0b0c + .4byte 0x602c0b0d + .4byte 0x602d0b0e + +gUnknown_0860d4dc:: @ 860D4DC + .4byte 0x60210609 + .4byte 0x6021060a + .4byte 0x6027050a + .4byte 0x6043050b + +gUnknown_0860d4ec:: @ 860D4EC + .4byte 0x60210609 + .4byte 0x6021060a + .4byte 0x6027050a + .4byte 0x6023050b + .4byte 0x6027060b + .4byte 0x6047070b + .4byte 0x6043070c + +gUnknown_0860d508:: @ 860D508 + .4byte 0x60210609 + .4byte 0x6021060a + .4byte 0x6027050a + .4byte 0x6023050b + .4byte 0x6027060b + .4byte 0x6047070b + .4byte 0x6023070c + .4byte 0x6027080c + .4byte 0x6027090c + .4byte 0x60270a0c + .4byte 0x603b0b0c + +gUnknown_0860d534:: @ 860D534 + .4byte 0x60210609 + .4byte 0x6021060a + .4byte 0x6027050a + .4byte 0x6023050b + .4byte 0x6027060b + .4byte 0x6047070b + .4byte 0x6023070c + .4byte 0x6027080c + .4byte 0x6027090c + .4byte 0x60270a0c + .4byte 0x603b0b0c + .4byte 0x602c0b0d + .4byte 0x602d0b0e + +gUnknown_0860d568:: @ 860D568 + .4byte 0x60210809 + .4byte 0x6023080a + .4byte 0x6047090a + .4byte 0x6021090b + +gUnknown_0860d578:: @ 860D578 + .4byte 0x60210809 + .4byte 0x6023080a + .4byte 0x6047090a + .4byte 0x6021090b + .4byte 0x6027080b + .4byte 0x6027070b + .4byte 0x6043070c + +gUnknown_0860d594:: @ 860D594 + .4byte 0x60210809 + .4byte 0x6023080a + .4byte 0x6047090a + .4byte 0x6021090b + .4byte 0x6027080b + .4byte 0x6027070b + .4byte 0x6023070c + .4byte 0x6027080c + .4byte 0x6027090c + .4byte 0x60270a0c + .4byte 0x603b0b0c + +gUnknown_0860d5c0:: @ 860D5C0 + .4byte 0x60210809 + .4byte 0x6023080a + .4byte 0x6047090a + .4byte 0x6021090b + .4byte 0x6027080b + .4byte 0x6027070b + .4byte 0x6023070c + .4byte 0x6027080c + .4byte 0x6027090c + .4byte 0x60270a0c + .4byte 0x603b0b0c + .4byte 0x602c0b0d + .4byte 0x602d0b0e + +gUnknown_0860d5f4:: @ 860D5F4 + .4byte 0x60210a09 + .4byte 0x60210a0a + .4byte 0x6027090a + .4byte 0x6021090b + +gUnknown_0860d604:: @ 860D604 + .4byte 0x60210a09 + .4byte 0x60210a0a + .4byte 0x6027090a + .4byte 0x6021090b + .4byte 0x6027080b + .4byte 0x6027070b + .4byte 0x6043070c + +gUnknown_0860d620:: @ 860D620 + .4byte 0x60210a09 + .4byte 0x60210a0a + .4byte 0x6027090a + .4byte 0x6021090b + .4byte 0x6027080b + .4byte 0x6027070b + .4byte 0x6023070c + .4byte 0x6027080c + .4byte 0x6027090c + .4byte 0x60270a0c + .4byte 0x603b0b0c + +gUnknown_0860d64c:: @ 860D64C + .4byte 0x60210a09 + .4byte 0x60210a0a + .4byte 0x6027090a + .4byte 0x6021090b + .4byte 0x6027080b + .4byte 0x6027070b + .4byte 0x6023070c + .4byte 0x6027080c + .4byte 0x6027090c + .4byte 0x60270a0c + .4byte 0x603b0b0c + .4byte 0x602c0b0d + .4byte 0x602d0b0e + +gUnknown_0860d680:: @ 860D680 + .4byte 0x60210c09 + .4byte 0x60230c0a + .4byte 0x60470d0a + .4byte 0x60430d0b + +gUnknown_0860d690:: @ 860D690 + .4byte 0x60210c09 + .4byte 0x60230c0a + .4byte 0x60470d0a + .4byte 0x60230d0b + .4byte 0x60270e0b + .4byte 0x60470f0b + .4byte 0x60210f0c + +gUnknown_0860d6ac:: @ 860D6AC + .4byte 0x60210c09 + .4byte 0x60230c0a + .4byte 0x60470d0a + .4byte 0x60230d0b + .4byte 0x60270e0b + .4byte 0x60470f0b + .4byte 0x60210f0c + .4byte 0x60330e0c + .4byte 0x60320d0c + .4byte 0x60310c0c + .4byte 0x60300b0c + +gUnknown_0860d6d8:: @ 860D6D8 + .4byte 0x60210c09 + .4byte 0x60230c0a + .4byte 0x60470d0a + .4byte 0x60230d0b + .4byte 0x60270e0b + .4byte 0x60470f0b + .4byte 0x60210f0c + .4byte 0x60330e0c + .4byte 0x60320d0c + .4byte 0x60310c0c + .4byte 0x60300b0c + .4byte 0x602c0b0d + .4byte 0x602d0b0e + +gUnknown_0860d70c:: @ 860D70C + .4byte 0x60210e09 + .4byte 0x60210e0a + .4byte 0x60270d0a + .4byte 0x60430d0b + +gUnknown_0860d71c:: @ 860D71C + .4byte 0x60210e09 + .4byte 0x60210e0a + .4byte 0x60270d0a + .4byte 0x60230d0b + .4byte 0x60270e0b + .4byte 0x60470f0b + .4byte 0x60210f0c + +gUnknown_0860d738:: @ 860D738 + .4byte 0x60210e09 + .4byte 0x60210e0a + .4byte 0x60270d0a + .4byte 0x60230d0b + .4byte 0x60270e0b + .4byte 0x60470f0b + .4byte 0x60210f0c + .4byte 0x60330e0c + .4byte 0x60320d0c + .4byte 0x60310c0c + .4byte 0x60300b0c + +gUnknown_0860d764:: @ 860D764 + .4byte 0x60210e09 + .4byte 0x60210e0a + .4byte 0x60270d0a + .4byte 0x60230d0b + .4byte 0x60270e0b + .4byte 0x60470f0b + .4byte 0x60210f0c + .4byte 0x60330e0c + .4byte 0x60320d0c + .4byte 0x60310c0c + .4byte 0x60300b0c + .4byte 0x602c0b0d + .4byte 0x602d0b0e + +gUnknown_0860d798:: @ 860D798 + .4byte 0x60211009 + .4byte 0x6023100a + .4byte 0x6047110a + .4byte 0x6021110b + +gUnknown_0860d7a8:: @ 860D7A8 + .4byte 0x60211009 + .4byte 0x6023100a + .4byte 0x6047110a + .4byte 0x6021110b + .4byte 0x6027100b + .4byte 0x60270f0b + .4byte 0x60210f0c + +gUnknown_0860d7c4:: @ 860D7C4 + .4byte 0x60211009 + .4byte 0x6023100a + .4byte 0x6047110a + .4byte 0x6021110b + .4byte 0x6027100b + .4byte 0x60270f0b + .4byte 0x60210f0c + .4byte 0x60330e0c + .4byte 0x60320d0c + .4byte 0x60310c0c + .4byte 0x60300b0c + +gUnknown_0860d7f0:: @ 860D7F0 + .4byte 0x60211009 + .4byte 0x6023100a + .4byte 0x6047110a + .4byte 0x6021110b + .4byte 0x6027100b + .4byte 0x60270f0b + .4byte 0x60210f0c + .4byte 0x60330e0c + .4byte 0x60320d0c + .4byte 0x60310c0c + .4byte 0x60300b0c + .4byte 0x602c0b0d + .4byte 0x602d0b0e + +gUnknown_0860d824:: @ 860D824 + .4byte 0x602b1209 + .4byte 0x602b120a + .4byte 0x6027110a + .4byte 0x6021110b + +gUnknown_0860d834:: @ 860D834 + .4byte 0x602b1209 + .4byte 0x602b120a + .4byte 0x6027110a + .4byte 0x6021110b + .4byte 0x6027100b + .4byte 0x60270f0b + .4byte 0x60210f0c + +gUnknown_0860d850:: @ 860D850 + .4byte 0x602b1209 + .4byte 0x602b120a + .4byte 0x6027110a + .4byte 0x6021110b + .4byte 0x6027100b + .4byte 0x60270f0b + .4byte 0x60210f0c + .4byte 0x60330e0c + .4byte 0x60320d0c + .4byte 0x60310c0c + .4byte 0x60300b0c + +gUnknown_0860d87c:: @ 860D87C + .4byte 0x602b1209 + .4byte 0x602b120a + .4byte 0x6027110a + .4byte 0x6021110b + .4byte 0x6027100b + .4byte 0x60270f0b + .4byte 0x60210f0c + .4byte 0x60330e0c + .4byte 0x60320d0c + .4byte 0x60310c0c + .4byte 0x60300b0c + .4byte 0x602c0b0d + .4byte 0x602d0b0e + +gUnknown_0860d8b0:: @ 860D8B0 + .4byte 0x60210414 + .4byte 0x60250413 + .4byte 0x60490513 + .4byte 0x60450512 + +gUnknown_0860d8c0:: @ 860D8C0 + .4byte 0x60210414 + .4byte 0x60250413 + .4byte 0x60490513 + .4byte 0x60250512 + .4byte 0x60290612 + .4byte 0x60490712 + .4byte 0x60450711 + +gUnknown_0860d8dc:: @ 860D8DC + .4byte 0x60210414 + .4byte 0x60250413 + .4byte 0x60490513 + .4byte 0x60250512 + .4byte 0x60290612 + .4byte 0x60490712 + .4byte 0x60250711 + .4byte 0x60290811 + .4byte 0x60290911 + .4byte 0x60290a11 + .4byte 0x603c0b11 + +gUnknown_0860d908:: @ 860D908 + .4byte 0x60210414 + .4byte 0x60250413 + .4byte 0x60490513 + .4byte 0x60250512 + .4byte 0x60290612 + .4byte 0x60490712 + .4byte 0x60250711 + .4byte 0x60290811 + .4byte 0x60290911 + .4byte 0x60290a11 + .4byte 0x603c0b11 + .4byte 0x602f0b10 + .4byte 0x602e0b0f + +gUnknown_0860d93c:: @ 860D93C + .4byte 0x60210614 + .4byte 0x60210613 + .4byte 0x60290513 + .4byte 0x60450512 + +gUnknown_0860d94c:: @ 860D94C + .4byte 0x60210614 + .4byte 0x60210613 + .4byte 0x60290513 + .4byte 0x60250512 + .4byte 0x60290612 + .4byte 0x60490712 + .4byte 0x60450711 + +gUnknown_0860d968:: @ 860D968 + .4byte 0x60210614 + .4byte 0x60210613 + .4byte 0x60290513 + .4byte 0x60250512 + .4byte 0x60290612 + .4byte 0x60490712 + .4byte 0x60250711 + .4byte 0x60290811 + .4byte 0x60290911 + .4byte 0x60290a11 + .4byte 0x603c0b11 + +gUnknown_0860d994:: @ 860D994 + .4byte 0x60210614 + .4byte 0x60210613 + .4byte 0x60290513 + .4byte 0x60250512 + .4byte 0x60290612 + .4byte 0x60490712 + .4byte 0x60250711 + .4byte 0x60290811 + .4byte 0x60290911 + .4byte 0x60290a11 + .4byte 0x603c0b11 + .4byte 0x602f0b10 + .4byte 0x602e0b0f + +gUnknown_0860d9c8:: @ 860D9C8 + .4byte 0x60210814 + .4byte 0x60250813 + .4byte 0x60490913 + .4byte 0x60210912 + +gUnknown_0860d9d8:: @ 860D9D8 + .4byte 0x60210814 + .4byte 0x60250813 + .4byte 0x60490913 + .4byte 0x60210912 + .4byte 0x60290812 + .4byte 0x60290712 + .4byte 0x60450711 + +gUnknown_0860d9f4:: @ 860D9F4 + .4byte 0x60210814 + .4byte 0x60250813 + .4byte 0x60490913 + .4byte 0x60210912 + .4byte 0x60290812 + .4byte 0x60290712 + .4byte 0x60250711 + .4byte 0x60290811 + .4byte 0x60290911 + .4byte 0x60290a11 + .4byte 0x603c0b11 + +gUnknown_0860da20:: @ 860DA20 + .4byte 0x60210814 + .4byte 0x60250813 + .4byte 0x60490913 + .4byte 0x60210912 + .4byte 0x60290812 + .4byte 0x60290712 + .4byte 0x60250711 + .4byte 0x60290811 + .4byte 0x60290911 + .4byte 0x60290a11 + .4byte 0x603c0b11 + .4byte 0x602f0b10 + .4byte 0x602e0b0f + +gUnknown_0860da54:: @ 860DA54 + .4byte 0x60210a14 + .4byte 0x60210a13 + .4byte 0x60290913 + .4byte 0x60210912 + +gUnknown_0860da64:: @ 860DA64 + .4byte 0x60210a14 + .4byte 0x60210a13 + .4byte 0x60290913 + .4byte 0x60210912 + .4byte 0x60290812 + .4byte 0x60290712 + .4byte 0x60450711 + +gUnknown_0860da80:: @ 860DA80 + .4byte 0x60210a14 + .4byte 0x60210a13 + .4byte 0x60290913 + .4byte 0x60210912 + .4byte 0x60290812 + .4byte 0x60290712 + .4byte 0x60250711 + .4byte 0x60290811 + .4byte 0x60290911 + .4byte 0x60290a11 + .4byte 0x603c0b11 + +gUnknown_0860daac:: @ 860DAAC + .4byte 0x60210a14 + .4byte 0x60210a13 + .4byte 0x60290913 + .4byte 0x60210912 + .4byte 0x60290812 + .4byte 0x60290712 + .4byte 0x60250711 + .4byte 0x60290811 + .4byte 0x60290911 + .4byte 0x60290a11 + .4byte 0x603c0b11 + .4byte 0x602f0b10 + .4byte 0x602e0b0f + +gUnknown_0860dae0:: @ 860DAE0 + .4byte 0x60210c14 + .4byte 0x60250c13 + .4byte 0x60490d13 + .4byte 0x60450d12 + +gUnknown_0860daf0:: @ 860DAF0 + .4byte 0x60210c14 + .4byte 0x60250c13 + .4byte 0x60490d13 + .4byte 0x60250d12 + .4byte 0x60290e12 + .4byte 0x60490f12 + .4byte 0x60210f11 + +gUnknown_0860db0c:: @ 860DB0C + .4byte 0x60210c14 + .4byte 0x60250c13 + .4byte 0x60490d13 + .4byte 0x60250d12 + .4byte 0x60290e12 + .4byte 0x60490f12 + .4byte 0x60210f11 + .4byte 0x60380e11 + .4byte 0x60370d11 + .4byte 0x60360c11 + .4byte 0x60350b11 + +gUnknown_0860db38:: @ 860DB38 + .4byte 0x60210c14 + .4byte 0x60250c13 + .4byte 0x60490d13 + .4byte 0x60250d12 + .4byte 0x60290e12 + .4byte 0x60490f12 + .4byte 0x60210f11 + .4byte 0x60380e11 + .4byte 0x60370d11 + .4byte 0x60360c11 + .4byte 0x60350b11 + .4byte 0x602f0b10 + .4byte 0x602e0b0f + +gUnknown_0860db6c:: @ 860DB6C + .4byte 0x60210e14 + .4byte 0x60210e13 + .4byte 0x60290d13 + .4byte 0x60450d12 + +gUnknown_0860db7c:: @ 860DB7C + .4byte 0x60210e14 + .4byte 0x60210e13 + .4byte 0x60290d13 + .4byte 0x60250d12 + .4byte 0x60290e12 + .4byte 0x60490f12 + .4byte 0x60210f11 + +gUnknown_0860db98:: @ 860DB98 + .4byte 0x60210e14 + .4byte 0x60210e13 + .4byte 0x60290d13 + .4byte 0x60250d12 + .4byte 0x60290e12 + .4byte 0x60490f12 + .4byte 0x60210f11 + .4byte 0x60380e11 + .4byte 0x60370d11 + .4byte 0x60360c11 + .4byte 0x60350b11 + +gUnknown_0860dbc4:: @ 860DBC4 + .4byte 0x60210e14 + .4byte 0x60210e13 + .4byte 0x60290d13 + .4byte 0x60250d12 + .4byte 0x60290e12 + .4byte 0x60490f12 + .4byte 0x60210f11 + .4byte 0x60380e11 + .4byte 0x60370d11 + .4byte 0x60360c11 + .4byte 0x60350b11 + .4byte 0x602f0b10 + .4byte 0x602e0b0f + +gUnknown_0860dbf8:: @ 860DBF8 + .4byte 0x60211014 + .4byte 0x60251013 + .4byte 0x60491113 + .4byte 0x60211112 + +gUnknown_0860dc08:: @ 860DC08 + .4byte 0x60211014 + .4byte 0x60251013 + .4byte 0x60491113 + .4byte 0x60211112 + .4byte 0x60291012 + .4byte 0x60290f12 + .4byte 0x60210f11 + +gUnknown_0860dc24:: @ 860DC24 + .4byte 0x60211014 + .4byte 0x60251013 + .4byte 0x60491113 + .4byte 0x60211112 + .4byte 0x60291012 + .4byte 0x60290f12 + .4byte 0x60210f11 + .4byte 0x60380e11 + .4byte 0x60370d11 + .4byte 0x60360c11 + .4byte 0x60350b11 + +gUnknown_0860dc50:: @ 860DC50 + .4byte 0x60211014 + .4byte 0x60251013 + .4byte 0x60491113 + .4byte 0x60211112 + .4byte 0x60291012 + .4byte 0x60290f12 + .4byte 0x60210f11 + .4byte 0x60380e11 + .4byte 0x60370d11 + .4byte 0x60360c11 + .4byte 0x60350b11 + .4byte 0x602f0b10 + .4byte 0x602e0b0f + +gUnknown_0860dc84:: @ 860DC84 + .4byte 0x602b1214 + .4byte 0x602b1213 + .4byte 0x60291113 + .4byte 0x60211112 + +gUnknown_0860dc94:: @ 860DC94 + .4byte 0x602b1214 + .4byte 0x602b1213 + .4byte 0x60291113 + .4byte 0x60211112 + .4byte 0x60291012 + .4byte 0x60290f12 + .4byte 0x60210f11 + +gUnknown_0860dcb0:: @ 860DCB0 + .4byte 0x602b1214 + .4byte 0x602b1213 + .4byte 0x60291113 + .4byte 0x60211112 + .4byte 0x60291012 + .4byte 0x60290f12 + .4byte 0x60210f11 + .4byte 0x60380e11 + .4byte 0x60370d11 + .4byte 0x60360c11 + .4byte 0x60350b11 + +gUnknown_0860dcdc:: @ 860DCDC + .4byte 0x602b1214 + .4byte 0x602b1213 + .4byte 0x60291113 + .4byte 0x60211112 + .4byte 0x60291012 + .4byte 0x60290f12 + .4byte 0x60210f11 + .4byte 0x60380e11 + .4byte 0x60370d11 + .4byte 0x60360c11 + .4byte 0x60350b11 + .4byte 0x602f0b10 + .4byte 0x602e0b0f gUnknown_0860DD10:: @ 860DD10 - .incbin "baserom.gba", 0x60dd10, 0x100 + .4byte gUnknown_0860d450 + .4byte gUnknown_0860d460 + .4byte gUnknown_0860d47c + .4byte gUnknown_0860d4a8 + .4byte gUnknown_0860dc84 + .4byte gUnknown_0860dc94 + .4byte gUnknown_0860dcb0 + .4byte gUnknown_0860dcdc + .4byte gUnknown_0860d8b0 + .4byte gUnknown_0860d8c0 + .4byte gUnknown_0860d8dc + .4byte gUnknown_0860d908 + .4byte gUnknown_0860d824 + .4byte gUnknown_0860d834 + .4byte gUnknown_0860d850 + .4byte gUnknown_0860d87c + .4byte gUnknown_0860d5f4 + .4byte gUnknown_0860d604 + .4byte gUnknown_0860d620 + .4byte gUnknown_0860d64c + .4byte gUnknown_0860dae0 + .4byte gUnknown_0860daf0 + .4byte gUnknown_0860db0c + .4byte gUnknown_0860db38 + .4byte gUnknown_0860da54 + .4byte gUnknown_0860da64 + .4byte gUnknown_0860da80 + .4byte gUnknown_0860daac + .4byte gUnknown_0860d680 + .4byte gUnknown_0860d690 + .4byte gUnknown_0860d6ac + .4byte gUnknown_0860d6d8 + .4byte gUnknown_0860d4dc + .4byte gUnknown_0860d4ec + .4byte gUnknown_0860d508 + .4byte gUnknown_0860d534 + .4byte gUnknown_0860dbf8 + .4byte gUnknown_0860dc08 + .4byte gUnknown_0860dc24 + .4byte gUnknown_0860dc50 + .4byte gUnknown_0860d93c + .4byte gUnknown_0860d94c + .4byte gUnknown_0860d968 + .4byte gUnknown_0860d994 + .4byte gUnknown_0860d798 + .4byte gUnknown_0860d7a8 + .4byte gUnknown_0860d7c4 + .4byte gUnknown_0860d7f0 + .4byte gUnknown_0860d568 + .4byte gUnknown_0860d578 + .4byte gUnknown_0860d594 + .4byte gUnknown_0860d5c0 + .4byte gUnknown_0860db6c + .4byte gUnknown_0860db7c + .4byte gUnknown_0860db98 + .4byte gUnknown_0860dbc4 + .4byte gUnknown_0860d9c8 + .4byte gUnknown_0860d9d8 + .4byte gUnknown_0860d9f4 + .4byte gUnknown_0860da20 + .4byte gUnknown_0860d70c + .4byte gUnknown_0860d71c + .4byte gUnknown_0860d738 + .4byte gUnknown_0860d764 gUnknown_0860DE10:: @ 860DE10 - .incbin "baserom.gba", 0x60de10, 0x40 + .byte 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d + .byte 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d gUnknown_0860DE50:: @ 860DE50 - .incbin "baserom.gba", 0x60de50, 0x28 - + .4byte sub_8195980 + .4byte sub_8195A38 + .4byte sub_8195AE4 + .4byte sub_8195BB0 + .4byte sub_8195C20 + .4byte sub_8195C50 + .4byte sub_8195C7C + .4byte sub_8195CE4 + .4byte sub_8195D28 + .4byte sub_8195DB8 + gUnknown_0860DE78:: @ 860DE78 - .incbin "baserom.gba", 0x60de78, 0xc + .2byte 0x003f, 0x0040, 0x0041, 0x0043, 0x0042, 0x0046 gUnknown_0860DE84:: @ 860DE84 - .incbin "baserom.gba", 0x60de84, 0x14 + .2byte 0x00b3, 0x00b4, 0x00b7, 0x00c8, 0x00b9, 0x00bb, 0x00c4, 0x00c6, 0x00ba, 0x0000 gUnknown_0860DE98:: @ 860DE98 - .incbin "baserom.gba", 0x60de98, 0x10 + .4byte 0x00000010, 0x00000020, 0x00400000, 0x00800000 gUnknown_0860DEA8:: @ 860DEA8 - .incbin "baserom.gba", 0x60dea8, 0x10 - -gUnknown_0860DEB8:: @ 860DEB8 - .incbin "baserom.gba", 0x60deb8, 0xb68 + .4byte 0xffffffef, 0xffffffdf, 0xffbfffff, 0xff7fffff + +gUnknown_0860DEB8:: @ 860DEB8 //struct + .incbin "baserom.gba", 0x60deb8, 0x500 + +gUnknown_0860E3B8:: @ 860E3B8 + .4byte BattleFrontier_PokeNav_2A971C, 0x00ff0200 + .4byte BattleFrontier_PokeNav_2A9798, 0x00ff0200 + .4byte BattleFrontier_PokeNav_2A9813, 0x00ff0200 + .4byte BattleFrontier_PokeNav_2A98A8, 0x00ff0200 + .4byte BattleFrontier_PokeNav_2A9977, 0x00ff0200 + .4byte BattleFrontier_PokeNav_2A99FD, 0x00ff0200 + .4byte BattleFrontier_PokeNav_2A9A78, 0x00ff0200 + .4byte BattleFrontier_PokeNav_2A9AE8, 0x00ff0200 + .4byte BattleFrontier_PokeNav_2A9BA7, 0x00ff0200 + .4byte BattleFrontier_PokeNav_2A9C36, 0x00ff0200 + .4byte BattleFrontier_PokeNav_2A9CC8, 0x00ff0200 + .4byte BattleFrontier_PokeNav_2A9D44, 0x00ff0200 + .4byte BattleFrontier_PokeNav_2A9DD7, 0x00ff0200 + .4byte BattleFrontier_PokeNav_2A9E70, 0x00ff0200 + .4byte BattleFrontier_PokeNav_2A9EFD, 0x00ff0200 + +gUnknown_0860E430:: @ 860E430 + .4byte BattleFrontier_PokeNav_2A9FAB, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AA028, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AA099, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AA100, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AA188, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AA214, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AA2A1, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AA31B, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AA3A8, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AA442, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AA4C5, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AA520, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AA5AD, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AA64D, 0x00ffff00 + +gUnknown_0860E4A0:: @ 860E4A0 + .4byte BattleFrontier_PokeNav_2AA6AF, 0x00ff0300 + .4byte BattleFrontier_PokeNav_2AA730, 0x00ff0300 + .4byte BattleFrontier_PokeNav_2AA77A, 0x00ff0300 + .4byte BattleFrontier_PokeNav_2AA81C, 0x00ff0300 + .4byte BattleFrontier_PokeNav_2AA88C, 0x00ff0300 + .4byte BattleFrontier_PokeNav_2AA934, 0x00ff0300 + .4byte BattleFrontier_PokeNav_2AA9D3, 0x00ff0300 + .4byte BattleFrontier_PokeNav_2AAA40, 0x00ff0300 + .4byte BattleFrontier_PokeNav_2AAAE4, 0x00ff0300 + .4byte BattleFrontier_PokeNav_2AAB8C, 0x00ff0300 + .4byte BattleFrontier_PokeNav_2AAC25, 0x00ff0300 + .4byte BattleFrontier_PokeNav_2AAC9D, 0x00ff0300 + .4byte BattleFrontier_PokeNav_2AAD41, 0x00ff0300 + .4byte BattleFrontier_PokeNav_2AAE00, 0x00ff0300 + +gUnknown_0860E510:: @ 860E510 + .4byte BattleFrontier_PokeNav_2AAE7F, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2AAEF1, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2AAF69, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2AB010, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2AB076, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2AB11A, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2AB1B4, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2AB23D, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2AB2E9, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2AB382, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2AB410, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2AB4B0, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2AB538, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2AB5E4, 0x00ff0100 + +gUnknown_0860E580:: @ 860E580 + .4byte BattleFrontier_PokeNav_2AB670, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2AB6CD, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2AB73C, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2AB808, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2AB8B7, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2AB95D, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2ABA03, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2ABA9F, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2ABB62, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2ABC26, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2ABCE9, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2ABDA2, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2ABE5E, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2ABF36, 0x00ff0100 + +gUnknown_0860E5F0:: @ 860E5F0 + .4byte BattleFrontier_PokeNav_2AC009, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2AC0BD, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AC18C, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AC228, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AC30C, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AC3B6, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AC446, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AC5C7, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AC682, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AC755, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AC82C, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AC914, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2ACA59, 0x00ff0200 + .4byte BattleFrontier_PokeNav_2ACB02, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2ACC3F, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2ACD2F, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2ACE1E, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2ACF32, 0x00ff0300 + .4byte BattleFrontier_PokeNav_2ACFBE, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AD0AC, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AD194, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AD1DF, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AD2A8, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AD34F, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AD44E, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AD53A, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AD642, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AD801, 0x00ff0300 + .4byte BattleFrontier_PokeNav_2AD92E, 0x00ff0300 + .4byte BattleFrontier_PokeNav_2ADA8F, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2ADB9B, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2ADC92, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2ADE08, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2ADF07, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AE0D9, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AE1FD, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AE327, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AE3DA, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AE489, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AE5CD, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AE698, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AE704, 0x00ff0300 + .4byte BattleFrontier_PokeNav_2AE78F, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AE859, 0x00ff0300 + .4byte BattleFrontier_PokeNav_2AE8E6, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AE998, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AEA8F, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AEB77, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AEBFA, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AECC1, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AED52, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2AEE35, 0x00ff0300 + .4byte BattleFrontier_PokeNav_2AEEF4, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AEFDA, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AF0E7, 0x00ff0100 + .4byte BattleFrontier_PokeNav_2AF1B8, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AF2C4, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AF371, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AF480, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AF671, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AF7D8, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AF8F7, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AFA39, 0x00ffff00 + .4byte BattleFrontier_PokeNav_2AFB26, 0x00ffff00 + +gUnknown_0860E7F0:: @860E7F0 + .4byte BattleFrontier_PokeNav_2AFC07, 0x00050400 + .4byte BattleFrontier_PokeNav_2AFC78, 0x00050400 + .4byte BattleFrontier_PokeNav_2AFCFF, 0x00050400 + .4byte BattleFrontier_PokeNav_2AFDA7, 0x00050400 + .4byte BattleFrontier_PokeNav_2AFE3D, 0x00050400 + .4byte BattleFrontier_PokeNav_2AFECA, 0x00050400 + .4byte BattleFrontier_PokeNav_2AFF64, 0x00050400 + .4byte BattleFrontier_PokeNav_2AFFF0, 0x00050400 + .4byte BattleFrontier_PokeNav_2B00B5, 0x00050400 + .4byte BattleFrontier_PokeNav_2B0129, 0x00050400 + .4byte BattleFrontier_PokeNav_2B01A5, 0x00050400 + .4byte BattleFrontier_PokeNav_2B0232, 0x00050400 + .4byte BattleFrontier_PokeNav_2B02D9, 0x00050400 + .4byte BattleFrontier_PokeNav_2B0366, 0x00050400 + +gUnknown_0860E860:: @860E860 + .4byte BattleFrontier_PokeNav_2B03E6, 0x00050400 + .4byte BattleFrontier_PokeNav_2B0457, 0x00050400 + .4byte BattleFrontier_PokeNav_2B04DE, 0x00050400 + .4byte BattleFrontier_PokeNav_2B0586, 0x00050400 + .4byte BattleFrontier_PokeNav_2B061C, 0x00050400 + .4byte BattleFrontier_PokeNav_2B06A3, 0x00050400 + .4byte BattleFrontier_PokeNav_2B073B, 0x00050400 + .4byte BattleFrontier_PokeNav_2B07C7, 0x00050400 + .4byte BattleFrontier_PokeNav_2B0894, 0x00050400 + .4byte BattleFrontier_PokeNav_2B0908, 0x00050400 + .4byte BattleFrontier_PokeNav_2B0984, 0x00050400 + .4byte BattleFrontier_PokeNav_2B0A11, 0x00050400 + .4byte BattleFrontier_PokeNav_2B0AB8, 0x00050400 + .4byte BattleFrontier_PokeNav_2B0B45, 0x00050400 + +gUnknown_0860E8D0:: @860E8D0 + .4byte BattleFrontier_PokeNav_2B0BC5, 0x00050400 + .4byte BattleFrontier_PokeNav_2B0C4A, 0x00050400 + .4byte BattleFrontier_PokeNav_2B0CC7, 0x00050400 + .4byte BattleFrontier_PokeNav_2B0D4A, 0x00050400 + .4byte BattleFrontier_PokeNav_2B0DC8, 0x00050400 + .4byte BattleFrontier_PokeNav_2B0E35, 0x00050400 + .4byte BattleFrontier_PokeNav_2B0ED1, 0x00050400 + .4byte BattleFrontier_PokeNav_2B0F72, 0x00050400 + .4byte BattleFrontier_PokeNav_2B102A, 0x00050400 + .4byte BattleFrontier_PokeNav_2B10A7, 0x00050400 + .4byte BattleFrontier_PokeNav_2B1121, 0x00050400 + .4byte BattleFrontier_PokeNav_2B11D3, 0x00050400 + .4byte BattleFrontier_PokeNav_2B124D, 0x00050400 + .4byte BattleFrontier_PokeNav_2B12D0, 0x00050400 + +gUnknown_0860E940:: @860E940 + .4byte BattleFrontier_PokeNav_2B1347, 0x00050400 + .4byte BattleFrontier_PokeNav_2B13B1, 0x00050400 + .4byte BattleFrontier_PokeNav_2B142B, 0x00050400 + .4byte BattleFrontier_PokeNav_2B14B4, 0x00050400 + .4byte BattleFrontier_PokeNav_2B1525, 0x00050400 + .4byte BattleFrontier_PokeNav_2B158E, 0x00050400 + .4byte BattleFrontier_PokeNav_2B1622, 0x00050400 + .4byte BattleFrontier_PokeNav_2B169D, 0x00050400 + .4byte BattleFrontier_PokeNav_2B1775, 0x00050400 + .4byte BattleFrontier_PokeNav_2B17F8, 0x00050400 + .4byte BattleFrontier_PokeNav_2B1877, 0x00050400 + .4byte BattleFrontier_PokeNav_2B1946, 0x00050400 + .4byte BattleFrontier_PokeNav_2B19C7, 0x00050400 + .4byte BattleFrontier_PokeNav_2B1A4C, 0x00050400 + +gUnknown_0860E9B0:: @860E9B0 + .4byte BattleFrontier_PokeNav_2B1ACA, 0x00050400 + .4byte BattleFrontier_PokeNav_2B1B50, 0x00050400 + .4byte BattleFrontier_PokeNav_2B1BE4, 0x00050400 + .4byte BattleFrontier_PokeNav_2B1C6A, 0x00050400 + .4byte BattleFrontier_PokeNav_2B1CCF, 0x00050400 + .4byte BattleFrontier_PokeNav_2B1D38, 0x00050400 + .4byte BattleFrontier_PokeNav_2B1DCD, 0x00050400 + .4byte BattleFrontier_PokeNav_2B1E4B, 0x00050400 + .4byte BattleFrontier_PokeNav_2B1F24, 0x00050400 + .4byte BattleFrontier_PokeNav_2B1FA8, 0x00050400 + .4byte BattleFrontier_PokeNav_2B2022, 0x00050400 + .4byte BattleFrontier_PokeNav_2B20F3, 0x00050400 + .4byte BattleFrontier_PokeNav_2B2175, 0x00050400 + .4byte BattleFrontier_PokeNav_2B21FC, 0x00050400 gUnknown_0860EA20:: @ 860EA20 - .incbin "baserom.gba", 0x60ea20, 0xc + .4byte gUnknown_0860E3B8 + .4byte gUnknown_0860E430 + .4byte gUnknown_0860E4A0 gUnknown_0860EA2C:: @ 860EA2C - .incbin "baserom.gba", 0x60ea2c, 0x8 + .4byte gUnknown_0860E510 + .4byte gUnknown_0860E580 gUnknown_0860EA34:: @ 860EA34 - .incbin "baserom.gba", 0x60ea34, 0x18 + .4byte gUnknown_0860E5F0 + .4byte gUnknown_0860E7F0 + .4byte gUnknown_0860E860 + .4byte gUnknown_0860E8D0 + .4byte gUnknown_0860E940 + .4byte gUnknown_0860E9B0 gUnknown_0860EA4C:: @ 860EA4C .incbin "baserom.gba", 0x60ea4c, 0x20 @@ -182,25 +1352,69 @@ gUnknown_0860EF70:: @ 860EF70 .incbin "baserom.gba", 0x60ef70, 0x8 gUnknown_0860EF78:: @ 860EF78 - .incbin "baserom.gba", 0x60ef78, 0x20 + .4byte sub_819612C + .4byte sub_81961F0 + .4byte sub_8196274 + .4byte sub_81962B0 + .4byte sub_81962D8 + .4byte sub_8196330 + .4byte sub_8196390 + .4byte sub_81963F0 gUnknown_0860EF98:: @ 860EF98 .incbin "baserom.gba", 0x60ef98, 0x8 gUnknown_0860EFA0:: @ 860EFA0 - .incbin "baserom.gba", 0x60efa0, 0xc + .4byte gStringVar1 + .4byte gStringVar2 + .4byte gStringVar3 gUnknown_0860EFAC:: @ 860EFAC - .incbin "baserom.gba", 0x60efac, 0x18 + .4byte sub_8196A44 + .4byte sub_8196A9C + .4byte sub_8196B98 + .4byte sub_8196C70 + .4byte sub_8196CF4 + .4byte sub_8196D14 gUnknown_0860EFC4:: @ 860EFC4 - .incbin "baserom.gba", 0x60efc4, 0x30 + .2byte 0x0282, 0x0000, 0xfa72, 0x085e, 0x01e1, 0x0000, 0xfa77, 0x085e, 0x02a9, 0x0000, 0xfa7b, 0x085e, 0x02af, 0x0000, 0xfa80, 0x085e + .2byte 0x0033, 0x0000, 0xfa84, 0x085e, 0x011f, 0x0000, 0xfa8a, 0x085e gUnknown_0860EFF4:: @ 860EFF4 - .incbin "baserom.gba", 0x60eff4, 0x1c + .4byte gText_BattleTower2 + .4byte gText_BattleDome + .4byte gText_BattlePalace + .4byte gText_BattleArena + .4byte gText_BattlePike + .4byte gText_BattleFactory + .4byte gText_BattlePyramid gUnknown_0860F010:: @ 860F010 - .incbin "baserom.gba", 0x60f010, 0x10 + .4byte gUnknown_08680867 + .4byte gUnknown_086A0869 + .4byte gUnknown_086C086B + .4byte gUnknown_086E086D gUnknown_0860F020:: @ 860F020 - .incbin "baserom.gba", 0x60f020, 0x54 + .4byte gUnknown_082A5D6C + .4byte gUnknown_082A5DAB + .4byte gUnknown_082A5DF1 + .4byte gUnknown_082A5E34 + .4byte gUnknown_082A5E83 + .4byte gUnknown_082A5EB9 + .4byte gUnknown_082A5EF4 + .4byte gUnknown_082A5F39 + .4byte gUnknown_082A5F82 + .4byte gUnknown_082A5FB9 + .4byte gUnknown_082A6018 + .4byte gUnknown_082A6061 + .4byte gUnknown_082A609C + .4byte gUnknown_082A60D5 + .4byte gUnknown_082A6124 + .4byte gUnknown_082A616F + .4byte gUnknown_082A61D6 + .4byte gUnknown_082A623A + .4byte gUnknown_082A6287 + .4byte gUnknown_082A62C9 + .4byte gUnknown_082A6312 diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index ef6df1584..4efa72858 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2870,7 +2870,7 @@ BattleScript_FaintedMonTryChooseAnother:: jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonChooseAnother jumpifbattletype BATTLE_TYPE_LINK, BattleScript_FaintedMonChooseAnother jumpifbattletype BATTLE_TYPE_x2000000, BattleScript_FaintedMonChooseAnother - jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000 | BATTLE_TYPE_PYRAMID, BattleScript_FaintedMonChooseAnother + jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID, BattleScript_FaintedMonChooseAnother jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonChooseAnother jumpifword COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonChooseAnother jumpifbyte EQUAL, sBATTLE_STYLE, 0x1, BattleScript_FaintedMonChooseAnother @@ -2965,7 +2965,7 @@ BattleScript_PayDayMoneyAndPickUpItems:: BattleScript_LocalBattleLost:: jumpifbattletype BATTLE_TYPE_DOME, BattleScript_CheckDomeDrew - jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000 | BATTLE_TYPE_PYRAMID, BattleScript_LocalBattleLostPrintTrainersWinText + jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID, BattleScript_LocalBattleLostPrintTrainersWinText jumpifbattletype BATTLE_TYPE_x4000000, BattleScript_LocalBattleLostPrintTrainersWinText jumpifbattletype BATTLE_TYPE_EREADER_TRAINER, BattleScript_LocalBattleLostEnd jumpifhalfword EQUAL, gTrainerBattleOpponent_A, 0x400, BattleScript_LocalBattleLostEnd diff --git a/data/battle_setup.s b/data/battle_setup.s deleted file mode 100644 index d5043aae9..000000000 --- a/data/battle_setup.s +++ /dev/null @@ -1,190 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_0854FE88:: @ 854FE88 - .byte 0x08, 0x09, 0x05, 0x0a, 0x00, 0x0a, 0x07, 0x06 - -gUnknown_0854FE90:: @ 854FE90 - .byte 0x04, 0x0b, 0x02, 0x03, 0x00, 0x0a, 0x01, 0x06 - -gUnknown_0854FE98:: @ 854FE98 - .byte 0x1d, 0x1e, 0x1f, 0x20, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29 - -gUnknown_0854FEA4:: @ 854FEA4 - .byte 0x1f, 0x20, 0x21 - -gUnknown_0854FEA7:: @ 854FEA7 - .byte 0x1d, 0x1f, 0x20, 0x21, 0x00 - - .align 2 -gUnknown_0854FEAC:: @ 854FEAC - .4byte gUnknown_02038BC8, 0x00000000 - .4byte gTrainerBattleOpponent_A, 0x00000001 - .4byte gUnknown_02038BD0, 0x00000001 - .4byte gUnknown_02038BD4, 0x00000002 - .4byte gUnknown_02038BDC, 0x00000002 - .4byte gUnknown_02038BE4, 0x00000005 - .4byte gUnknown_02038BE8, 0x00000005 - .4byte gUnknown_02038BF0, 0x00000005 - .4byte gUnknown_02038BEC, 0x00000006 - - .align 2 -gUnknown_0854FEF4:: @ 854FEF4 - .4byte gUnknown_02038BC8, 0x00000000 - .4byte gTrainerBattleOpponent_A, 0x00000001 - .4byte gUnknown_02038BD0, 0x00000001 - .4byte gUnknown_02038BD4, 0x00000002 - .4byte gUnknown_02038BDC, 0x00000002 - .4byte gUnknown_02038BE4, 0x00000005 - .4byte gUnknown_02038BE8, 0x00000005 - .4byte gUnknown_02038BF0, 0x00000002 - .4byte gUnknown_02038BEC, 0x00000006 - - .align 2 -gUnknown_0854FF3C:: @ 854FF3C - .4byte gUnknown_02038BC8, 0x00000000 - .4byte gTrainerBattleOpponent_A, 0x00000001 - .4byte gUnknown_02038BD0, 0x00000001 - .4byte gUnknown_02038BD4, 0x00000002 - .4byte gUnknown_02038BDC, 0x00000002 - .4byte gUnknown_02038BE4, 0x00000005 - .4byte gUnknown_02038BE8, 0x00000002 - .4byte gUnknown_02038BF0, 0x00000005 - .4byte gUnknown_02038BEC, 0x00000006 - - .align 2 -gUnknown_0854FF84:: @ 854FF84 - .4byte gUnknown_02038BC8, 0x00000000 - .4byte gTrainerBattleOpponent_A, 0x00000001 - .4byte gUnknown_02038BD0, 0x00000001 - .4byte gUnknown_02038BD4, 0x00000005 - .4byte gUnknown_02038BDC, 0x00000002 - .4byte gUnknown_02038BE4, 0x00000005 - .4byte gUnknown_02038BE8, 0x00000005 - .4byte gUnknown_02038BF0, 0x00000005 - .4byte gUnknown_02038BEC, 0x00000006 - - .align 2 -gUnknown_0854FFCC:: @ 854FFCC - .4byte gUnknown_02038BC8, 0x00000000 - .4byte gTrainerBattleOpponent_A, 0x00000001 - .4byte gUnknown_02038BD0, 0x00000001 - .4byte gUnknown_02038BD4, 0x00000002 - .4byte gUnknown_02038BDC, 0x00000002 - .4byte gUnknown_02038BE4, 0x00000005 - .4byte gUnknown_02038BE8, 0x00000002 - .4byte gUnknown_02038BF0, 0x00000002 - .4byte gUnknown_02038BEC, 0x00000006 - - .align 2 -gUnknown_08550014:: @ 8550014 - .4byte gUnknown_02038BC8, 0x00000000 - .4byte gTrainerBattleOpponent_B, 0x00000001 - .4byte gUnknown_02038BD0, 0x00000001 - .4byte gUnknown_02038BD8, 0x00000002 - .4byte gUnknown_02038BE0, 0x00000002 - .4byte gUnknown_02038BE4, 0x00000005 - .4byte gUnknown_02038BE8, 0x00000005 - .4byte gUnknown_02038BF4, 0x00000005 - .4byte gUnknown_02038BEC, 0x00000006 - - .align 2 -gUnknown_0855005C:: @ 855005C - .4byte gUnknown_02038BC8, 0x00000000 - .4byte gTrainerBattleOpponent_B, 0x00000001 - .4byte gUnknown_02038BD0, 0x00000001 - .4byte gUnknown_02038BD8, 0x00000002 - .4byte gUnknown_02038BE0, 0x00000002 - .4byte gUnknown_02038BE4, 0x00000005 - .4byte gUnknown_02038BE8, 0x00000005 - .4byte gUnknown_02038BF4, 0x00000002 - .4byte gUnknown_02038BEC, 0x00000006 - - .align 2 -gUnknown_085500A4:: @ 85500A4 - .2byte 0x0025, 0x0028, 0x0029, 0x002a, 0x002b, 0x0000, 0x0021, 0x0000 - .2byte 0x02e1, 0x032c, 0x032d, 0x032e, 0x032f, 0x0000, 0x0014, 0x0000 - .2byte 0x002c, 0x002f, 0x0030, 0x0031, 0x0032, 0x0000, 0x001a, 0x0000 - .2byte 0x0039, 0x003c, 0x003d, 0x003e, 0x003f, 0x0000, 0x0018, 0x0000 - .2byte 0x0040, 0x0043, 0x0044, 0x0045, 0x0046, 0x0000, 0x0018, 0x0000 - .2byte 0x02af, 0x02b0, 0x02b1, 0x02b2, 0x02b3, 0x0000, 0x0027, 0x0000 - .2byte 0x02ff, 0x033c, 0x033d, 0x033e, 0x033f, 0x0000, 0x0024, 0x0000 - .2byte 0x005e, 0x0065, 0x0066, 0x0067, 0x0068, 0x0000, 0x001a, 0x0000 - .2byte 0x004e, 0x0054, 0x0055, 0x0056, 0x0057, 0x0000, 0x001a, 0x0000 - .2byte 0x006c, 0x006e, 0x006f, 0x0070, 0x0071, 0x0018, 0x0014, 0x0000 - .2byte 0x0072, 0x0078, 0x0079, 0x007a, 0x007b, 0x0000, 0x0013, 0x0000 - .2byte 0x0090, 0x034c, 0x034d, 0x034e, 0x034f, 0x0018, 0x0038, 0x0000 - .2byte 0x007f, 0x0084, 0x0085, 0x0086, 0x0087, 0x0000, 0x0024, 0x0000 - .2byte 0x0088, 0x008b, 0x008c, 0x008d, 0x008e, 0x0000, 0x0013, 0x0000 - .2byte 0x008f, 0x0093, 0x0094, 0x0095, 0x0096, 0x0000, 0x001d, 0x0000 - .2byte 0x009b, 0x00af, 0x00b0, 0x00b1, 0x00b2, 0x0000, 0x0016, 0x0000 - .2byte 0x00b7, 0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x0000, 0x001e, 0x0000 - .2byte 0x02a0, 0x0338, 0x0339, 0x033a, 0x033b, 0x0000, 0x002a, 0x0000 - .2byte 0x00c3, 0x0340, 0x0341, 0x0342, 0x0343, 0x0000, 0x0026, 0x0000 - .2byte 0x00c4, 0x00c5, 0x00c6, 0x00c7, 0x00c8, 0x0000, 0x0021, 0x0000 - .2byte 0x00ce, 0x00cf, 0x00d0, 0x00d1, 0x00d2, 0x0000, 0x001d, 0x0000 - .2byte 0x00d8, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x0018, 0x000d, 0x0000 - .2byte 0x02a9, 0x02aa, 0x02ab, 0x02ac, 0x02ad, 0x0018, 0x0001, 0x0000 - .2byte 0x00e2, 0x00e4, 0x00e5, 0x00e6, 0x00e7, 0x0000, 0x0023, 0x0000 - .2byte 0x00ee, 0x00ef, 0x00f0, 0x00f1, 0x00f2, 0x0000, 0x0026, 0x0000 - .2byte 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x0000, 0x0026, 0x0000 - .2byte 0x00fe, 0x0101, 0x0102, 0x0103, 0x0104, 0x0000, 0x0024, 0x0000 - .2byte 0x0118, 0x011a, 0x011b, 0x011c, 0x011d, 0x0000, 0x001f, 0x0000 - .2byte 0x0111, 0x0114, 0x0115, 0x0116, 0x0117, 0x0000, 0x001f, 0x0000 - .2byte 0x011f, 0x0120, 0x0121, 0x0122, 0x0123, 0x0000, 0x0020, 0x0000 - .2byte 0x012e, 0x012f, 0x0130, 0x0131, 0x0132, 0x0000, 0x0019, 0x0000 - .2byte 0x0125, 0x0127, 0x0128, 0x0129, 0x012a, 0x0000, 0x0012, 0x0000 - .2byte 0x0133, 0x0134, 0x0135, 0x0136, 0x0137, 0x0000, 0x001e, 0x0000 - .2byte 0x0139, 0x013a, 0x013b, 0x013c, 0x013d, 0x0018, 0x000c, 0x0000 - .2byte 0x013e, 0x0148, 0x0149, 0x014a, 0x014b, 0x0000, 0x0011, 0x0000 - .2byte 0x0153, 0x015a, 0x015b, 0x015c, 0x015d, 0x0000, 0x0015, 0x0000 - .2byte 0x0178, 0x017b, 0x017c, 0x017d, 0x017e, 0x0000, 0x002b, 0x0000 - .2byte 0x0171, 0x0172, 0x0173, 0x0174, 0x0175, 0x0000, 0x0020, 0x0000 - .2byte 0x0166, 0x0168, 0x0169, 0x016a, 0x016b, 0x0000, 0x0019, 0x0000 - .2byte 0x016c, 0x016d, 0x016e, 0x016f, 0x0170, 0x0000, 0x0020, 0x0000 - .2byte 0x0182, 0x0184, 0x0185, 0x0186, 0x0187, 0x0000, 0x002b, 0x0000 - .2byte 0x0161, 0x0162, 0x0163, 0x0164, 0x0165, 0x0000, 0x0019, 0x0000 - .2byte 0x0179, 0x0334, 0x0335, 0x0336, 0x0337, 0x0000, 0x0029, 0x0000 - .2byte 0x0188, 0x0189, 0x018a, 0x018b, 0x018c, 0x0018, 0x0001, 0x0000 - .2byte 0x0196, 0x0199, 0x019a, 0x019b, 0x019c, 0x0000, 0x0023, 0x0000 - .2byte 0x01a3, 0x01a5, 0x01a6, 0x01a7, 0x01a8, 0x0000, 0x001c, 0x0000 - .2byte 0x01ab, 0x01ae, 0x01af, 0x01b0, 0x01b1, 0x0000, 0x001e, 0x0000 - .2byte 0x01b2, 0x01b5, 0x01b6, 0x01b7, 0x01b8, 0x0000, 0x001c, 0x0000 - .2byte 0x01c1, 0x01d1, 0x01d2, 0x01d3, 0x01d4, 0x0000, 0x0027, 0x0000 - .2byte 0x01da, 0x01dd, 0x01de, 0x01df, 0x01e0, 0x0018, 0x000d, 0x0000 - .2byte 0x01e1, 0x01e2, 0x01e7, 0x01e8, 0x01e9, 0x0000, 0x0012, 0x0000 - .2byte 0x01ec, 0x01f1, 0x01f2, 0x01f3, 0x01f4, 0x0000, 0x0028, 0x0000 - .2byte 0x02e4, 0x0330, 0x0331, 0x0332, 0x0333, 0x0000, 0x0017, 0x0000 - .2byte 0x0200, 0x0203, 0x0204, 0x0205, 0x0206, 0x0000, 0x0019, 0x0000 - .2byte 0x0221, 0x0224, 0x0225, 0x0226, 0x0227, 0x0000, 0x0020, 0x0000 - .2byte 0x021a, 0x021d, 0x021e, 0x021f, 0x0220, 0x0000, 0x0020, 0x0000 - .2byte 0x0009, 0x0348, 0x0349, 0x034a, 0x034b, 0x0018, 0x0011, 0x0000 - .2byte 0x022f, 0x0232, 0x0233, 0x0234, 0x0235, 0x0000, 0x0022, 0x0000 - .2byte 0x0228, 0x022b, 0x022c, 0x022d, 0x022e, 0x0000, 0x0022, 0x0000 - .2byte 0x025c, 0x025f, 0x0260, 0x0261, 0x0262, 0x0000, 0x0013, 0x0000 - .2byte 0x026d, 0x026e, 0x026f, 0x0270, 0x0271, 0x0018, 0x000b, 0x0000 - .2byte 0x0273, 0x027c, 0x027d, 0x027e, 0x027f, 0x0000, 0x001b, 0x0000 - .2byte 0x0001, 0x0344, 0x0345, 0x0346, 0x0347, 0x0018, 0x000c, 0x0000 - .2byte 0x0282, 0x0283, 0x0284, 0x0285, 0x0286, 0x0018, 0x003e, 0x0000 - .2byte 0x0291, 0x0292, 0x0293, 0x0294, 0x0294, 0x0018, 0x002b, 0x0000 - .2byte 0x0109, 0x0302, 0x0303, 0x0304, 0x0305, 0x0000, 0x0003, 0x0000 - .2byte 0x010a, 0x0306, 0x0307, 0x0308, 0x0309, 0x0000, 0x000b, 0x0000 - .2byte 0x010b, 0x030a, 0x030b, 0x030c, 0x030d, 0x0000, 0x0002, 0x0000 - .2byte 0x010c, 0x030e, 0x030f, 0x0310, 0x0311, 0x0000, 0x000c, 0x0000 - .2byte 0x010d, 0x0312, 0x0313, 0x0314, 0x0315, 0x0000, 0x0000, 0x0000 - .2byte 0x010e, 0x0316, 0x0317, 0x0318, 0x0319, 0x0000, 0x0004, 0x0000 - .2byte 0x010f, 0x031a, 0x031b, 0x031c, 0x031d, 0x0000, 0x0006, 0x0000 - .2byte 0x0110, 0x031e, 0x031f, 0x0320, 0x0321, 0x0000, 0x0007, 0x0000 - .2byte 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0000, 0x0008, 0x0000 - .2byte 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0000, 0x0008, 0x0000 - .2byte 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0000, 0x0008, 0x0000 - .2byte 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0000, 0x0008, 0x0000 - .2byte 0x014f, 0x014f, 0x014f, 0x014f, 0x014f, 0x0000, 0x0008, 0x0000 - - .align 2 -gUnknown_08550584:: @ 8550584 - .2byte 0x0867, 0x0868, 0x0869, 0x086a, 0x086b, 0x086c, 0x086d, 0x086e - diff --git a/data/contest.s b/data/contest.s index 09754327b..66a055b7d 100644 --- a/data/contest.s +++ b/data/contest.s @@ -5,10 +5,10 @@ .align 2, 0 gUnknown_08587A6C:: @ 8587A6C - .incbin "baserom.gba", 0x587a6c, 0x4 + .byte 0x24, 0x4c, 0x74, 0x9c gUnknown_08587A70:: @ 8587A70 - .incbin "baserom.gba", 0x587a70, 0x4 + .byte 0x24, 0x4c, 0x74, 0x9c gUnknown_08587A74:: @ 8587A74 .incbin "baserom.gba", 0x587a74, 0x5c @@ -59,19 +59,132 @@ gUnknown_08587C30:: @ 8587C30 .include "data/text/contest_text_pointers.inc" @ 8587D5C - .incbin "baserom.gba", 0x587d5c, 0x34 + .4byte gText_0827D5C1 + .4byte gText_0827D5DC + .4byte gText_0827D600 + .4byte gText_0827D612 + .4byte gText_0827D612 + .4byte gText_0827D62D + .4byte gText_0827D654 + .4byte gText_0827D67E + .4byte gText_0827D69C + .4byte gText_0827D6BA + .4byte gText_0827D6E5 + .4byte gText_0827D706 + .4byte gText_0827D71D gUnknown_08587D90:: @ 8587D90 - .incbin "baserom.gba", 0x587d90, 0x80 + .4byte gText_0827D743 + .4byte gText_0827D764 + .4byte gText_0827D785 + .4byte gText_0827D7A5 + .4byte gText_0827D7C8 + .4byte gText_0827D7E8 + .4byte gText_0827D831 + .4byte gText_0827D855 + .4byte gText_0827D830 + .4byte gText_0827D872 + .4byte gText_0827D88F + .4byte gText_0827D8B5 + .4byte gText_0827D8E4 + .4byte gText_0827D8FE + .4byte gText_0827D926 + .4byte gText_0827D947 + .4byte gText_0827D961 + .4byte gText_0827D986 + .4byte gText_0827D9B1 + .4byte gText_0827D9D9 + .4byte gText_0827DA03 + .4byte gText_0827DA31 + .4byte gText_0827DA5B + .4byte gText_0827DA85 + .4byte gText_0827DAB2 + .4byte gText_0827DADA + .4byte gText_0827DB03 + .4byte gText_0827D830 + .4byte gText_0827D830 + .4byte gText_0827D830 + .4byte gText_0827DB1F + .4byte gText_0827DB4E gUnknown_08587E10:: @ 8587E10 - .incbin "baserom.gba", 0x587e10, 0xf8 + .4byte gText_827DB75 + .4byte gText_827DBB0 + .4byte gText_827DBE0 + .4byte gText_827DC0F + .4byte gText_827DC45 + .4byte gText_827DC7C + .4byte gText_827DCB4 + .4byte gText_827DCE7 + .4byte gText_827DD12 + .4byte gText_827DD3D + .4byte gText_827DD6F + .4byte gText_827DD8E + .4byte gText_827DDC7 + .4byte gText_827DDF2 + .4byte gText_827DE14 + .4byte gText_827DE44 + .4byte gText_827DE73 + .4byte gText_827DEA5 + .4byte gText_827DED9 + .4byte gText_827DF02 + .4byte gText_827DF3A + .4byte gText_827DF63 + .4byte gText_827DF8C + .4byte gText_827DFB8 + .4byte gText_827DFE2 + .4byte gText_827E00C + .4byte gText_827E02F + .4byte gText_827E05F + .4byte gText_827E08B + .4byte gText_827E0B5 + .4byte gText_827E0DD + .4byte gText_827E107 + .4byte gText_827E143 + .4byte gText_827E17F + .4byte gText_827E1BB + .4byte gText_827E1F3 + .4byte gText_827E220 + .4byte gText_827E254 + .4byte gText_827E289 + .4byte gText_827E2C5 + .4byte gText_0827E2FE + .4byte gText_0827E32E + .4byte gText_0827E35B + .4byte gText_0827E38D + .4byte gText_0827E3C1 + .4byte gText_0827E3EB + .4byte gText_0827E416 + .4byte gText_0827E448 + .4byte gText_0827E473 + .4byte gText_0827E4A6 + .4byte gText_0827E4D5 + .4byte gText_0827E504 + .4byte gText_0827E531 + .4byte gText_0827E55A + .4byte gText_0827E5B2 + .4byte gText_0827E5D0 + .4byte gText_0827E606 + .4byte gText_0827E638 + .4byte gText_0827E658 + .4byte gText_0827E68B + .4byte gText_0827E6C4 + .4byte gText_0827E7BA gUnknown_08587F08:: @ 8587F08 - .incbin "baserom.gba", 0x587f08, 0x14 + .4byte gText_0827E85F + .4byte gText_0827E868 + .4byte gText_0827E86F + .4byte gText_0827E878 + .4byte gText_0827E882 gUnknown_08587F1C:: @ 8587F1C - .incbin "baserom.gba", 0x587f1c, 0x18 + .4byte gText_0827E894 + .4byte gText_0827E89E + .4byte gText_0827E8AA + .4byte gText_0827E8B4 + .4byte gText_0827E8BF + .4byte gText_0827E8CA gUnknown_08587F34:: @ 8587F34 .incbin "baserom.gba", 0x587f34, 0x10 @@ -86,7 +199,7 @@ gUnknown_085880A4:: @ 85880A4 .incbin "baserom.gba", 0x5880a4, 0x1740 gUnknown_085897E4:: @ 85897E4 - .incbin "baserom.gba", 0x5897e4, 0xc0 + .incbin "baserom.gba", 0x005897e4, 0xc0 gUnknown_085898A4:: @ 85898A4 .incbin "baserom.gba", 0x5898a4, 0x60 @@ -102,3 +215,4 @@ gUnknown_0858998C:: @ 858998C gUnknown_085899EC:: @ 85899EC .incbin "baserom.gba", 0x5899ec, 0x1c + diff --git a/data/contest_painting.s b/data/contest_painting.s index 728649dec..fca82a2b5 100644 --- a/data/contest_painting.s +++ b/data/contest_painting.s @@ -45,8 +45,12 @@ gUnknown_085AFDA4:: @ 85AFDA4 gUnknown_085B02B0:: @ 85B02B0 .incbin "baserom.gba", 0x5b02b0, 0x524 -gUnknown_085B07D4:: @ 85B07D4 - .incbin "baserom.gba", 0x5b07d4, 0x14 +gContestRankTextPointers:: @ 85B07D4 + .4byte gContestRankNormal + .4byte gContestRankSuper + .4byte gContestRankHyper + .4byte gContestRankMaster + .4byte gContestLink gUnknown_085B07E8:: @ 85B07E8 .incbin "baserom.gba", 0x5b07e8, 0x4 @@ -54,11 +58,25 @@ gUnknown_085B07E8:: @ 85B07E8 gUnknown_085B07EC:: @ 85B07EC .incbin "baserom.gba", 0x5b07ec, 0x8 -gUnknown_085B07F4:: @ 85B07F4 - .incbin "baserom.gba", 0x5b07f4, 0x3c +gContestPaintingDescriptionPointers:: @ 85B07F4 + .4byte gContestPaintingCool1 + .4byte gContestPaintingCool2 + .4byte gContestPaintingCool3 + .4byte gContestPaintingBeauty1 + .4byte gContestPaintingBeauty2 + .4byte gContestPaintingBeauty3 + .4byte gContestPaintingCute1 + .4byte gContestPaintingCute2 + .4byte gContestPaintingCute3 + .4byte gContestPaintingSmart1 + .4byte gContestPaintingSmart2 + .4byte gContestPaintingSmart3 + .4byte gContestPaintingTough1 + .4byte gContestPaintingTough2 + .4byte gContestPaintingTough3 gUnknown_085B0830:: @ 85B0830 - .incbin "baserom.gba", 0x5b0830, 0x8 + .4byte 0xc0003000, 0x00000000 gUnknown_085B0838:: @ 85B0838 .incbin "baserom.gba", 0x5b0838, 0x4 diff --git a/data/cute_sketch.s b/data/cute_sketch.s index 8a8ee1481..d14b51a51 100644 --- a/data/cute_sketch.s +++ b/data/cute_sketch.s @@ -5,4 +5,304 @@ .align 2, 0 gUnknown_085A1F94:: @ 85A1F94 - .incbin "baserom.gba", 0x5a1f94, 0x2580 + .byte 0x00, 0x1d, 0x1c, 0x0e, 0x1e, 0x1b, 0x00, 0x01, 0x32, 0x2e, 0x1e, 0x37, 0x0a, 0x22, 0x1f, 0x05, 0x26, 0x2e, 0x12, 0x17, 0x1e, 0x1a, 0x03, 0x11, 0x05, 0x11, 0x18, 0x05, 0x27, 0x2f, 0x1a, 0x3f + .byte 0x12, 0x22, 0x3f, 0x16, 0x2b, 0x2f, 0x2e, 0x11, 0x02, 0x2d, 0x23, 0x0d, 0x28, 0x17, 0x0c, 0x19, 0x2f, 0x0e, 0x13, 0x30, 0x18, 0x20, 0x2d, 0x28, 0x22, 0x01, 0x03, 0x19, 0x0e, 0x2a, 0x2b, 0x22 + .byte 0x15, 0x25, 0x22, 0x0a, 0x26, 0x39, 0x06, 0x23, 0x16, 0x07, 0x2f, 0x22, 0x3a, 0x1b, 0x3b, 0x36, 0x35, 0x0a, 0x2b, 0x24, 0x36, 0x09, 0x12, 0x1c, 0x2f, 0x23, 0x2e, 0x38, 0x2c, 0x05, 0x2a, 0x20 + .byte 0x07, 0x14, 0x32, 0x31, 0x08, 0x17, 0x1a, 0x24, 0x2d, 0x22, 0x0a, 0x16, 0x1b, 0x26, 0x2b, 0x29, 0x16, 0x11, 0x35, 0x08, 0x14, 0x1e, 0x08, 0x14, 0x05, 0x31, 0x14, 0x38, 0x31, 0x17, 0x34, 0x33 + .byte 0x12, 0x11, 0x09, 0x1f, 0x28, 0x3d, 0x32, 0x35, 0x03, 0x1e, 0x3c, 0x2b, 0x2e, 0x10, 0x01, 0x17, 0x03, 0x3e, 0x22, 0x17, 0x18, 0x34, 0x08, 0x29, 0x19, 0x03, 0x24, 0x28, 0x3d, 0x33, 0x2f, 0x31 + .byte 0x24, 0x19, 0x1b, 0x18, 0x26, 0x07, 0x0d, 0x25, 0x2d, 0x3f, 0x12, 0x2f, 0x15, 0x25, 0x29, 0x0f, 0x12, 0x07, 0x2c, 0x12, 0x2c, 0x0b, 0x26, 0x12, 0x1a, 0x16, 0x00, 0x0b, 0x2f, 0x16, 0x35, 0x24 + .byte 0x1f, 0x1c, 0x22, 0x29, 0x33, 0x27, 0x3b, 0x30, 0x17, 0x11, 0x06, 0x35, 0x3e, 0x31, 0x2f, 0x11, 0x3a, 0x25, 0x2a, 0x02, 0x19, 0x33, 0x18, 0x35, 0x2a, 0x20, 0x21, 0x2e, 0x32, 0x1b, 0x3b, 0x1f + .byte 0x23, 0x39, 0x29, 0x2a, 0x2e, 0x31, 0x29, 0x2a, 0x0e, 0x2d, 0x2d, 0x00, 0x1f, 0x38, 0x28, 0x1b, 0x14, 0x3b, 0x2b, 0x2e, 0x04, 0x26, 0x36, 0x30, 0x11, 0x3b, 0x21, 0x2d, 0x2b, 0x3f, 0x1b, 0x20 + .byte 0x13, 0x31, 0x33, 0x0c, 0x30, 0x22, 0x2b, 0x2b, 0x16, 0x02, 0x1e, 0x1c, 0x12, 0x1c, 0x0f, 0x3c, 0x36, 0x38, 0x10, 0x2d, 0x18, 0x2f, 0x2d, 0x35, 0x3b, 0x11, 0x37, 0x31, 0x13, 0x13, 0x3d, 0x2f + .byte 0x1e, 0x2c, 0x33, 0x2e, 0x37, 0x12, 0x3c, 0x1f, 0x33, 0x32, 0x2a, 0x27, 0x0d, 0x3b, 0x1c, 0x35, 0x2a, 0x27, 0x09, 0x3d, 0x27, 0x12, 0x0b, 0x18, 0x0c, 0x15, 0x1d, 0x20, 0x01, 0x1c, 0x08, 0x3b + .byte 0x1c, 0x12, 0x37, 0x33, 0x15, 0x03, 0x2c, 0x2a, 0x3b, 0x31, 0x0f, 0x04, 0x35, 0x08, 0x17, 0x33, 0x38, 0x3d, 0x2a, 0x2f, 0x35, 0x16, 0x10, 0x35, 0x16, 0x23, 0x13, 0x2c, 0x2f, 0x06, 0x20, 0x27 + .byte 0x3a, 0x24, 0x00, 0x1c, 0x2a, 0x03, 0x39, 0x1d, 0x28, 0x07, 0x1a, 0x20, 0x0a, 0x37, 0x07, 0x35, 0x2d, 0x15, 0x2f, 0x2c, 0x10, 0x2c, 0x23, 0x3f, 0x29, 0x14, 0x2a, 0x21, 0x36, 0x34, 0x1a, 0x2c + .byte 0x1c, 0x3d, 0x33, 0x38, 0x2b, 0x22, 0x35, 0x28, 0x1f, 0x3d, 0x0f, 0x1c, 0x1e, 0x3e, 0x1b, 0x0c, 0x3e, 0x1f, 0x2b, 0x31, 0x2c, 0x32, 0x39, 0x11, 0x05, 0x09, 0x11, 0x04, 0x38, 0x2a, 0x32, 0x00 + .byte 0x16, 0x13, 0x0b, 0x31, 0x34, 0x2a, 0x13, 0x2c, 0x22, 0x21, 0x39, 0x2f, 0x15, 0x37, 0x28, 0x1e, 0x07, 0x3b, 0x2d, 0x11, 0x03, 0x28, 0x2d, 0x30, 0x1e, 0x31, 0x11, 0x11, 0x23, 0x01, 0x1e, 0x3d + .byte 0x31, 0x34, 0x1c, 0x02, 0x34, 0x21, 0x0e, 0x25, 0x3d, 0x07, 0x17, 0x33, 0x15, 0x10, 0x29, 0x32, 0x32, 0x18, 0x1f, 0x30, 0x2d, 0x3b, 0x30, 0x27, 0x3e, 0x16, 0x31, 0x15, 0x12, 0x30, 0x25, 0x17 + .byte 0x33, 0x06, 0x34, 0x00, 0x29, 0x18, 0x3c, 0x03, 0x12, 0x2c, 0x0c, 0x11, 0x09, 0x30, 0x30, 0x10, 0x0e, 0x11, 0x27, 0x16, 0x1b, 0x0c, 0x3b, 0x2e, 0x2b, 0x33, 0x1e, 0x13, 0x2d, 0x2d, 0x11, 0x24 + .byte 0x29, 0x34, 0x3e, 0x2b, 0x24, 0x1e, 0x21, 0x27, 0x1a, 0x2d, 0x04, 0x39, 0x16, 0x3e, 0x33, 0x26, 0x1b, 0x2e, 0x25, 0x0c, 0x06, 0x19, 0x25, 0x19, 0x18, 0x1d, 0x33, 0x33, 0x1d, 0x28, 0x2d, 0x1c + .byte 0x10, 0x2a, 0x1f, 0x35, 0x1e, 0x34, 0x02, 0x10, 0x2b, 0x3a, 0x14, 0x0d, 0x0b, 0x15, 0x0c, 0x2c, 0x10, 0x37, 0x3a, 0x19, 0x06, 0x13, 0x17, 0x24, 0x10, 0x25, 0x24, 0x04, 0x1e, 0x00, 0x35, 0x34 + .byte 0x3a, 0x00, 0x37, 0x3c, 0x07, 0x1a, 0x2b, 0x28, 0x36, 0x34, 0x39, 0x2f, 0x28, 0x09, 0x1f, 0x38, 0x31, 0x30, 0x16, 0x25, 0x31, 0x18, 0x28, 0x31, 0x18, 0x0c, 0x22, 0x06, 0x39, 0x2d, 0x3d, 0x20 + .byte 0x24, 0x2e, 0x27, 0x21, 0x3e, 0x18, 0x18, 0x15, 0x3c, 0x24, 0x06, 0x1b, 0x26, 0x15, 0x0e, 0x22, 0x0a, 0x0d, 0x1f, 0x18, 0x16, 0x34, 0x10, 0x28, 0x21, 0x20, 0x11, 0x11, 0x36, 0x32, 0x15, 0x3b + .byte 0x2e, 0x24, 0x1f, 0x2d, 0x12, 0x36, 0x2e, 0x20, 0x0b, 0x17, 0x33, 0x26, 0x03, 0x1f, 0x08, 0x19, 0x31, 0x2a, 0x18, 0x25, 0x35, 0x2d, 0x2d, 0x30, 0x38, 0x18, 0x1c, 0x25, 0x14, 0x1c, 0x22, 0x28 + .byte 0x08, 0x23, 0x21, 0x26, 0x1e, 0x30, 0x19, 0x0f, 0x15, 0x10, 0x2f, 0x22, 0x12, 0x02, 0x25, 0x3c, 0x01, 0x1d, 0x0e, 0x14, 0x18, 0x0d, 0x18, 0x17, 0x22, 0x0b, 0x31, 0x13, 0x34, 0x21, 0x0f, 0x2d + .byte 0x36, 0x39, 0x1f, 0x25, 0x18, 0x10, 0x1f, 0x2d, 0x20, 0x20, 0x19, 0x0b, 0x31, 0x33, 0x13, 0x14, 0x2e, 0x11, 0x21, 0x2d, 0x0a, 0x37, 0x07, 0x15, 0x1b, 0x32, 0x04, 0x32, 0x06, 0x18, 0x1b, 0x13 + .byte 0x24, 0x12, 0x36, 0x22, 0x16, 0x1d, 0x29, 0x1c, 0x35, 0x17, 0x21, 0x36, 0x17, 0x2b, 0x35, 0x32, 0x19, 0x2a, 0x0f, 0x2e, 0x10, 0x00, 0x34, 0x02, 0x0e, 0x28, 0x31, 0x32, 0x32, 0x3b, 0x05, 0x20 + .byte 0x36, 0x26, 0x12, 0x34, 0x06, 0x34, 0x1e, 0x31, 0x32, 0x35, 0x05, 0x34, 0x1e, 0x13, 0x15, 0x15, 0x14, 0x2c, 0x29, 0x1c, 0x18, 0x24, 0x24, 0x12, 0x22, 0x29, 0x18, 0x34, 0x36, 0x30, 0x1e, 0x01 + .byte 0x23, 0x0c, 0x3c, 0x24, 0x0a, 0x3d, 0x16, 0x27, 0x1e, 0x23, 0x15, 0x02, 0x12, 0x11, 0x19, 0x2a, 0x1d, 0x31, 0x15, 0x03, 0x3b, 0x2a, 0x21, 0x19, 0x2c, 0x0a, 0x23, 0x11, 0x25, 0x11, 0x1a, 0x1a + .byte 0x0a, 0x34, 0x3b, 0x0b, 0x33, 0x21, 0x0b, 0x37, 0x01, 0x31, 0x28, 0x35, 0x1d, 0x27, 0x2c, 0x30, 0x31, 0x2e, 0x39, 0x2d, 0x30, 0x05, 0x2c, 0x12, 0x2a, 0x2b, 0x39, 0x22, 0x20, 0x15, 0x34, 0x1c + .byte 0x1c, 0x01, 0x15, 0x20, 0x16, 0x22, 0x13, 0x04, 0x18, 0x1e, 0x13, 0x10, 0x25, 0x33, 0x15, 0x39, 0x03, 0x31, 0x3f, 0x36, 0x18, 0x14, 0x23, 0x10, 0x2f, 0x1e, 0x1f, 0x1f, 0x17, 0x2c, 0x02, 0x16 + .byte 0x31, 0x20, 0x18, 0x30, 0x2e, 0x18, 0x37, 0x3b, 0x0e, 0x30, 0x10, 0x39, 0x24, 0x26, 0x39, 0x1e, 0x30, 0x26, 0x2e, 0x12, 0x01, 0x14, 0x37, 0x2a, 0x2e, 0x21, 0x06, 0x1d, 0x2a, 0x16, 0x32, 0x09 + .byte 0x38, 0x1c, 0x07, 0x22, 0x17, 0x3b, 0x2d, 0x15, 0x07, 0x1e, 0x2e, 0x1b, 0x2e, 0x1d, 0x04, 0x09, 0x30, 0x30, 0x2d, 0x37, 0x2d, 0x34, 0x24, 0x18, 0x24, 0x25, 0x0e, 0x2d, 0x26, 0x23, 0x0a, 0x16 + .byte 0x12, 0x2d, 0x11, 0x21, 0x28, 0x2e, 0x0f, 0x01, 0x21, 0x01, 0x31, 0x12, 0x3f, 0x1b, 0x1e, 0x21, 0x25, 0x2b, 0x26, 0x18, 0x13, 0x15, 0x2d, 0x34, 0x23, 0x21, 0x36, 0x0e, 0x2e, 0x1c, 0x14, 0x22 + .byte 0x1c, 0x2c, 0x0b, 0x28, 0x1a, 0x18, 0x21, 0x21, 0x07, 0x1a, 0x24, 0x26, 0x29, 0x2b, 0x0a, 0x34, 0x3e, 0x27, 0x33, 0x12, 0x34, 0x1b, 0x1f, 0x01, 0x2a, 0x2e, 0x06, 0x23, 0x2f, 0x1f, 0x14, 0x18 + .byte 0x06, 0x26, 0x31, 0x1f, 0x2b, 0x22, 0x26, 0x2e, 0x1e, 0x15, 0x16, 0x20, 0x22, 0x28, 0x15, 0x37, 0x12, 0x25, 0x04, 0x2c, 0x1f, 0x04, 0x2e, 0x0c, 0x13, 0x18, 0x07, 0x0b, 0x36, 0x1d, 0x1c, 0x2a + .byte 0x30, 0x22, 0x1c, 0x2e, 0x12, 0x2f, 0x2b, 0x21, 0x1e, 0x16, 0x38, 0x30, 0x04, 0x02, 0x16, 0x05, 0x14, 0x20, 0x38, 0x3c, 0x33, 0x21, 0x1b, 0x2f, 0x14, 0x2a, 0x27, 0x38, 0x14, 0x1b, 0x2b, 0x1f + .byte 0x2b, 0x29, 0x2b, 0x25, 0x27, 0x36, 0x21, 0x11, 0x22, 0x1b, 0x29, 0x03, 0x1b, 0x18, 0x24, 0x28, 0x21, 0x2d, 0x36, 0x3c, 0x2c, 0x24, 0x33, 0x17, 0x1f, 0x2a, 0x3a, 0x21, 0x0a, 0x23, 0x37, 0x00 + .byte 0x0b, 0x21, 0x11, 0x38, 0x19, 0x0f, 0x0e, 0x1c, 0x1f, 0x0f, 0x37, 0x3c, 0x10, 0x37, 0x38, 0x31, 0x35, 0x07, 0x15, 0x28, 0x1e, 0x2e, 0x19, 0x26, 0x10, 0x33, 0x3d, 0x35, 0x2f, 0x3a, 0x04, 0x34 + .byte 0x0d, 0x18, 0x1a, 0x01, 0x2d, 0x15, 0x3d, 0x1a, 0x17, 0x17, 0x3f, 0x32, 0x0b, 0x21, 0x11, 0x1e, 0x26, 0x2b, 0x0d, 0x19, 0x24, 0x2e, 0x04, 0x1b, 0x1b, 0x33, 0x20, 0x15, 0x21, 0x1d, 0x1f, 0x04 + .byte 0x21, 0x0f, 0x12, 0x1f, 0x2d, 0x2a, 0x32, 0x03, 0x37, 0x1f, 0x35, 0x07, 0x27, 0x24, 0x1f, 0x31, 0x2f, 0x30, 0x15, 0x06, 0x00, 0x24, 0x0b, 0x22, 0x1a, 0x0c, 0x3b, 0x29, 0x14, 0x1a, 0x17, 0x37 + .byte 0x20, 0x25, 0x3f, 0x26, 0x37, 0x3a, 0x3e, 0x10, 0x22, 0x04, 0x11, 0x28, 0x12, 0x1c, 0x03, 0x2e, 0x2e, 0x0e, 0x38, 0x28, 0x01, 0x29, 0x22, 0x1e, 0x33, 0x19, 0x06, 0x21, 0x27, 0x33, 0x19, 0x1a + .byte 0x02, 0x05, 0x17, 0x11, 0x11, 0x2c, 0x1f, 0x26, 0x1e, 0x39, 0x1f, 0x28, 0x2e, 0x2f, 0x12, 0x22, 0x34, 0x13, 0x3b, 0x26, 0x2f, 0x34, 0x00, 0x14, 0x10, 0x31, 0x11, 0x1d, 0x2d, 0x2a, 0x08, 0x08 + .byte 0x37, 0x15, 0x18, 0x34, 0x04, 0x2b, 0x24, 0x2f, 0x1e, 0x27, 0x22, 0x2a, 0x24, 0x07, 0x14, 0x25, 0x01, 0x27, 0x19, 0x29, 0x0a, 0x29, 0x3d, 0x1c, 0x2f, 0x0d, 0x1f, 0x1c, 0x24, 0x3d, 0x32, 0x36 + .byte 0x1d, 0x24, 0x14, 0x21, 0x16, 0x1a, 0x0d, 0x29, 0x3f, 0x2b, 0x2a, 0x1a, 0x3e, 0x35, 0x11, 0x28, 0x18, 0x32, 0x05, 0x15, 0x21, 0x2e, 0x34, 0x2d, 0x14, 0x2a, 0x3c, 0x08, 0x37, 0x3f, 0x34, 0x1e + .byte 0x27, 0x24, 0x1c, 0x16, 0x16, 0x33, 0x29, 0x3b, 0x19, 0x36, 0x2f, 0x1c, 0x03, 0x25, 0x2c, 0x0b, 0x16, 0x36, 0x1c, 0x1d, 0x1b, 0x2c, 0x27, 0x1b, 0x0b, 0x1f, 0x2b, 0x08, 0x10, 0x27, 0x3f, 0x25 + .byte 0x2f, 0x33, 0x13, 0x1f, 0x04, 0x31, 0x37, 0x0e, 0x2f, 0x12, 0x08, 0x23, 0x20, 0x3a, 0x1a, 0x1e, 0x2f, 0x0b, 0x1f, 0x1e, 0x20, 0x19, 0x23, 0x3b, 0x14, 0x25, 0x00, 0x27, 0x14, 0x04, 0x25, 0x36 + .byte 0x1a, 0x2b, 0x27, 0x21, 0x15, 0x28, 0x13, 0x2c, 0x0e, 0x3c, 0x35, 0x0c, 0x2d, 0x2b, 0x37, 0x16, 0x15, 0x29, 0x15, 0x1d, 0x17, 0x34, 0x36, 0x09, 0x0a, 0x31, 0x37, 0x22, 0x28, 0x17, 0x2b, 0x35 + .byte 0x14, 0x2b, 0x12, 0x08, 0x13, 0x1f, 0x31, 0x13, 0x28, 0x06, 0x07, 0x35, 0x23, 0x3a, 0x29, 0x0f, 0x24, 0x2e, 0x07, 0x35, 0x26, 0x0e, 0x12, 0x15, 0x23, 0x33, 0x2c, 0x0e, 0x21, 0x26, 0x1c, 0x12 + .byte 0x25, 0x23, 0x1d, 0x2f, 0x04, 0x35, 0x33, 0x16, 0x01, 0x24, 0x3d, 0x2c, 0x2e, 0x35, 0x0a, 0x25, 0x11, 0x13, 0x25, 0x1b, 0x1b, 0x15, 0x15, 0x39, 0x10, 0x0b, 0x35, 0x24, 0x3a, 0x27, 0x30, 0x2e + .byte 0x2f, 0x15, 0x10, 0x1f, 0x35, 0x1b, 0x28, 0x35, 0x26, 0x30, 0x37, 0x34, 0x37, 0x2b, 0x0f, 0x30, 0x29, 0x2e, 0x3f, 0x2b, 0x38, 0x34, 0x2b, 0x2b, 0x2f, 0x25, 0x0d, 0x28, 0x2a, 0x33, 0x18, 0x10 + .byte 0x21, 0x12, 0x11, 0x1f, 0x22, 0x34, 0x11, 0x25, 0x23, 0x21, 0x3f, 0x11, 0x26, 0x27, 0x25, 0x28, 0x36, 0x12, 0x15, 0x26, 0x32, 0x11, 0x18, 0x24, 0x32, 0x25, 0x37, 0x27, 0x3a, 0x33, 0x35, 0x07 + .byte 0x1c, 0x1a, 0x0e, 0x2a, 0x1e, 0x2f, 0x1f, 0x00, 0x2e, 0x21, 0x1b, 0x3c, 0x14, 0x2f, 0x3a, 0x2f, 0x3e, 0x38, 0x15, 0x1a, 0x13, 0x2f, 0x29, 0x0d, 0x2f, 0x37, 0x17, 0x18, 0x30, 0x1c, 0x35, 0x15 + .byte 0x34, 0x14, 0x28, 0x11, 0x2c, 0x2c, 0x25, 0x2a, 0x20, 0x3f, 0x28, 0x0c, 0x34, 0x1b, 0x30, 0x2e, 0x25, 0x37, 0x1c, 0x24, 0x1f, 0x25, 0x26, 0x0c, 0x19, 0x34, 0x18, 0x10, 0x35, 0x0a, 0x13, 0x11 + .byte 0x25, 0x13, 0x20, 0x13, 0x19, 0x11, 0x20, 0x28, 0x1d, 0x3e, 0x30, 0x1b, 0x23, 0x24, 0x21, 0x0d, 0x23, 0x23, 0x1d, 0x28, 0x2e, 0x2d, 0x12, 0x1f, 0x0e, 0x2e, 0x2b, 0x0b, 0x31, 0x32, 0x24, 0x3c + .byte 0x2c, 0x13, 0x3c, 0x12, 0x28, 0x16, 0x2a, 0x05, 0x0c, 0x32, 0x39, 0x0b, 0x32, 0x21, 0x04, 0x14, 0x10, 0x31, 0x32, 0x12, 0x1f, 0x23, 0x39, 0x2e, 0x2e, 0x22, 0x3d, 0x27, 0x0c, 0x1e, 0x18, 0x25 + .byte 0x00, 0x17, 0x06, 0x31, 0x14, 0x13, 0x21, 0x1a, 0x14, 0x20, 0x35, 0x0a, 0x3b, 0x25, 0x33, 0x08, 0x28, 0x3d, 0x02, 0x33, 0x23, 0x00, 0x13, 0x22, 0x21, 0x28, 0x30, 0x14, 0x2e, 0x14, 0x32, 0x36 + .byte 0x39, 0x23, 0x1e, 0x1c, 0x11, 0x30, 0x37, 0x16, 0x30, 0x15, 0x31, 0x1f, 0x34, 0x28, 0x2c, 0x35, 0x05, 0x29, 0x37, 0x33, 0x2a, 0x1c, 0x17, 0x2e, 0x10, 0x06, 0x16, 0x32, 0x1f, 0x2f, 0x00, 0x29 + .byte 0x1e, 0x04, 0x01, 0x16, 0x3b, 0x23, 0x1e, 0x1b, 0x34, 0x2a, 0x30, 0x11, 0x2b, 0x03, 0x00, 0x1f, 0x1d, 0x37, 0x1a, 0x3a, 0x18, 0x25, 0x1c, 0x16, 0x2c, 0x04, 0x3f, 0x33, 0x26, 0x23, 0x2d, 0x15 + .byte 0x2c, 0x27, 0x02, 0x35, 0x27, 0x07, 0x35, 0x33, 0x1a, 0x0c, 0x10, 0x28, 0x26, 0x2c, 0x2f, 0x36, 0x16, 0x37, 0x0b, 0x27, 0x1b, 0x3d, 0x18, 0x27, 0x1f, 0x20, 0x2b, 0x2a, 0x33, 0x0b, 0x0f, 0x20 + .byte 0x35, 0x3c, 0x2f, 0x33, 0x21, 0x15, 0x2d, 0x26, 0x34, 0x1f, 0x1a, 0x21, 0x2f, 0x2c, 0x2a, 0x1a, 0x32, 0x1a, 0x3b, 0x3f, 0x21, 0x13, 0x3f, 0x13, 0x0f, 0x24, 0x22, 0x14, 0x1b, 0x10, 0x21, 0x06 + .byte 0x28, 0x25, 0x34, 0x10, 0x2e, 0x0e, 0x14, 0x3c, 0x3e, 0x25, 0x16, 0x06, 0x30, 0x0b, 0x04, 0x1f, 0x3e, 0x02, 0x24, 0x0c, 0x17, 0x25, 0x2b, 0x3c, 0x2d, 0x15, 0x36, 0x33, 0x18, 0x23, 0x2a, 0x1d + .byte 0x10, 0x2a, 0x35, 0x17, 0x28, 0x00, 0x37, 0x24, 0x0a, 0x3b, 0x15, 0x1d, 0x0b, 0x1f, 0x3c, 0x31, 0x25, 0x1d, 0x0f, 0x1d, 0x20, 0x13, 0x34, 0x11, 0x2b, 0x2e, 0x23, 0x0c, 0x2e, 0x24, 0x02, 0x14 + .byte 0x31, 0x16, 0x19, 0x0e, 0x23, 0x35, 0x1a, 0x10, 0x16, 0x14, 0x04, 0x19, 0x2d, 0x27, 0x37, 0x33, 0x02, 0x31, 0x02, 0x04, 0x16, 0x0d, 0x22, 0x25, 0x25, 0x00, 0x16, 0x2a, 0x3f, 0x26, 0x20, 0x0c + .byte 0x12, 0x2f, 0x2e, 0x35, 0x1b, 0x0d, 0x22, 0x1e, 0x01, 0x34, 0x05, 0x22, 0x21, 0x34, 0x2a, 0x32, 0x0b, 0x09, 0x1d, 0x3f, 0x32, 0x2f, 0x3d, 0x18, 0x2d, 0x0b, 0x38, 0x36, 0x39, 0x17, 0x28, 0x34 + .byte 0x04, 0x24, 0x36, 0x0e, 0x2a, 0x38, 0x01, 0x14, 0x3c, 0x24, 0x22, 0x21, 0x03, 0x18, 0x32, 0x2f, 0x12, 0x29, 0x24, 0x31, 0x0a, 0x3b, 0x12, 0x1a, 0x1c, 0x20, 0x30, 0x31, 0x1b, 0x1a, 0x21, 0x10 + .byte 0x05, 0x29, 0x10, 0x26, 0x2d, 0x13, 0x16, 0x0c, 0x1d, 0x2b, 0x06, 0x1b, 0x06, 0x12, 0x14, 0x38, 0x0f, 0x35, 0x23, 0x3a, 0x2c, 0x00, 0x19, 0x33, 0x29, 0x14, 0x2d, 0x2a, 0x21, 0x29, 0x14, 0x31 + .byte 0x14, 0x1a, 0x06, 0x1e, 0x18, 0x1b, 0x28, 0x3b, 0x16, 0x29, 0x15, 0x1e, 0x12, 0x34, 0x0a, 0x14, 0x1b, 0x05, 0x27, 0x0b, 0x01, 0x26, 0x2a, 0x22, 0x35, 0x21, 0x20, 0x18, 0x20, 0x37, 0x17, 0x14 + .byte 0x1f, 0x11, 0x1d, 0x11, 0x25, 0x24, 0x2b, 0x2f, 0x07, 0x3f, 0x1f, 0x2c, 0x25, 0x25, 0x2a, 0x29, 0x18, 0x11, 0x24, 0x28, 0x31, 0x2c, 0x2a, 0x39, 0x0b, 0x26, 0x28, 0x10, 0x26, 0x22, 0x06, 0x16 + .byte 0x09, 0x2c, 0x13, 0x34, 0x19, 0x15, 0x3a, 0x12, 0x21, 0x1d, 0x38, 0x23, 0x12, 0x25, 0x24, 0x21, 0x30, 0x12, 0x37, 0x1a, 0x12, 0x24, 0x3b, 0x25, 0x32, 0x15, 0x23, 0x0d, 0x1a, 0x10, 0x16, 0x2e + .byte 0x26, 0x1d, 0x14, 0x16, 0x3e, 0x2e, 0x1f, 0x0a, 0x16, 0x10, 0x1d, 0x30, 0x2b, 0x04, 0x3a, 0x19, 0x08, 0x2d, 0x2e, 0x28, 0x1e, 0x33, 0x0a, 0x12, 0x2e, 0x0d, 0x03, 0x2f, 0x26, 0x3a, 0x1e, 0x35 + .byte 0x3b, 0x2a, 0x03, 0x1a, 0x18, 0x3f, 0x0b, 0x27, 0x04, 0x05, 0x34, 0x36, 0x0b, 0x27, 0x3b, 0x17, 0x11, 0x0d, 0x27, 0x26, 0x2c, 0x1f, 0x20, 0x26, 0x10, 0x20, 0x25, 0x23, 0x2d, 0x37, 0x09, 0x13 + .byte 0x14, 0x17, 0x2d, 0x2e, 0x3d, 0x23, 0x1d, 0x1a, 0x1f, 0x21, 0x33, 0x2e, 0x28, 0x17, 0x13, 0x26, 0x3c, 0x36, 0x14, 0x1a, 0x33, 0x32, 0x20, 0x2b, 0x19, 0x3e, 0x20, 0x0c, 0x02, 0x2d, 0x3c, 0x3c + .byte 0x2a, 0x30, 0x30, 0x28, 0x25, 0x3f, 0x1e, 0x03, 0x17, 0x1e, 0x35, 0x11, 0x1c, 0x1b, 0x14, 0x2a, 0x28, 0x3a, 0x23, 0x0e, 0x1f, 0x12, 0x36, 0x21, 0x20, 0x07, 0x3b, 0x10, 0x23, 0x19, 0x34, 0x0d + .byte 0x2e, 0x18, 0x3f, 0x20, 0x25, 0x3e, 0x3b, 0x15, 0x0b, 0x2e, 0x12, 0x37, 0x0b, 0x23, 0x3d, 0x32, 0x1f, 0x16, 0x03, 0x27, 0x14, 0x0c, 0x21, 0x18, 0x03, 0x30, 0x3e, 0x21, 0x13, 0x0f, 0x00, 0x32 + .byte 0x3f, 0x23, 0x16, 0x0e, 0x31, 0x1d, 0x18, 0x1c, 0x1d, 0x30, 0x0e, 0x1e, 0x21, 0x20, 0x23, 0x3f, 0x0c, 0x1e, 0x14, 0x33, 0x22, 0x22, 0x21, 0x15, 0x36, 0x05, 0x1e, 0x1d, 0x31, 0x14, 0x20, 0x11 + .byte 0x37, 0x0d, 0x33, 0x19, 0x25, 0x05, 0x36, 0x1e, 0x31, 0x20, 0x35, 0x3a, 0x2f, 0x32, 0x2f, 0x30, 0x14, 0x23, 0x2d, 0x35, 0x1e, 0x29, 0x05, 0x05, 0x1b, 0x09, 0x1f, 0x26, 0x2f, 0x0b, 0x15, 0x15 + .byte 0x11, 0x13, 0x29, 0x1b, 0x18, 0x1c, 0x13, 0x35, 0x34, 0x31, 0x23, 0x27, 0x3f, 0x2f, 0x09, 0x30, 0x19, 0x23, 0x12, 0x34, 0x02, 0x2a, 0x21, 0x09, 0x3c, 0x1d, 0x0c, 0x02, 0x10, 0x22, 0x05, 0x17 + .byte 0x22, 0x08, 0x1b, 0x0a, 0x0f, 0x15, 0x02, 0x11, 0x13, 0x01, 0x21, 0x22, 0x16, 0x39, 0x33, 0x24, 0x38, 0x34, 0x0f, 0x1e, 0x2b, 0x2b, 0x15, 0x15, 0x20, 0x22, 0x2e, 0x3a, 0x3f, 0x31, 0x1a, 0x27 + .byte 0x2b, 0x29, 0x34, 0x14, 0x16, 0x39, 0x2f, 0x13, 0x3e, 0x16, 0x36, 0x21, 0x30, 0x00, 0x24, 0x2b, 0x24, 0x21, 0x30, 0x15, 0x31, 0x13, 0x10, 0x37, 0x24, 0x08, 0x07, 0x23, 0x21, 0x09, 0x25, 0x05 + .byte 0x3c, 0x32, 0x19, 0x03, 0x25, 0x0f, 0x29, 0x2b, 0x16, 0x07, 0x13, 0x3e, 0x3d, 0x25, 0x36, 0x0b, 0x28, 0x2e, 0x2b, 0x16, 0x0c, 0x31, 0x11, 0x30, 0x13, 0x2d, 0x26, 0x3e, 0x37, 0x29, 0x2f, 0x2e + .byte 0x15, 0x3d, 0x17, 0x1c, 0x2e, 0x21, 0x33, 0x2f, 0x10, 0x0d, 0x05, 0x1d, 0x1c, 0x1a, 0x12, 0x0e, 0x18, 0x37, 0x1b, 0x11, 0x14, 0x06, 0x14, 0x21, 0x31, 0x0e, 0x27, 0x1a, 0x03, 0x10, 0x00, 0x34 + .byte 0x31, 0x3f, 0x0b, 0x1d, 0x0f, 0x12, 0x1f, 0x1a, 0x15, 0x10, 0x0f, 0x00, 0x24, 0x3e, 0x0a, 0x2a, 0x30, 0x2b, 0x24, 0x26, 0x31, 0x10, 0x2d, 0x2f, 0x2f, 0x3f, 0x0c, 0x13, 0x12, 0x0b, 0x16, 0x15 + .byte 0x07, 0x1f, 0x28, 0x10, 0x32, 0x0f, 0x17, 0x15, 0x0b, 0x27, 0x33, 0x34, 0x1d, 0x10, 0x1c, 0x3a, 0x12, 0x2c, 0x27, 0x37, 0x0a, 0x1a, 0x32, 0x05, 0x1f, 0x21, 0x24, 0x0d, 0x1f, 0x1c, 0x17, 0x24 + .byte 0x2f, 0x3b, 0x32, 0x3b, 0x25, 0x10, 0x03, 0x2f, 0x21, 0x0c, 0x10, 0x23, 0x0e, 0x3a, 0x2c, 0x33, 0x03, 0x2c, 0x12, 0x06, 0x1c, 0x2a, 0x37, 0x30, 0x3f, 0x01, 0x1e, 0x35, 0x16, 0x37, 0x2c, 0x32 + .byte 0x35, 0x05, 0x11, 0x22, 0x29, 0x09, 0x20, 0x2b, 0x0d, 0x1f, 0x18, 0x0d, 0x20, 0x23, 0x39, 0x16, 0x0f, 0x3a, 0x18, 0x21, 0x35, 0x2b, 0x36, 0x26, 0x2b, 0x23, 0x05, 0x2f, 0x1b, 0x08, 0x17, 0x3e + .byte 0x09, 0x16, 0x2d, 0x3a, 0x37, 0x15, 0x35, 0x35, 0x29, 0x0a, 0x12, 0x02, 0x39, 0x1f, 0x14, 0x34, 0x33, 0x17, 0x1d, 0x18, 0x16, 0x1d, 0x1a, 0x01, 0x39, 0x22, 0x1e, 0x27, 0x36, 0x32, 0x14, 0x26 + .byte 0x0a, 0x39, 0x36, 0x1f, 0x0d, 0x1e, 0x0b, 0x0a, 0x19, 0x35, 0x1d, 0x34, 0x03, 0x12, 0x16, 0x0c, 0x13, 0x2e, 0x0c, 0x34, 0x1e, 0x10, 0x14, 0x1e, 0x23, 0x32, 0x27, 0x02, 0x10, 0x29, 0x35, 0x18 + .byte 0x33, 0x33, 0x1d, 0x1a, 0x3c, 0x15, 0x23, 0x3e, 0x3f, 0x22, 0x2a, 0x02, 0x2c, 0x28, 0x0a, 0x2f, 0x1a, 0x06, 0x35, 0x3c, 0x17, 0x2b, 0x03, 0x12, 0x17, 0x2f, 0x0a, 0x26, 0x12, 0x38, 0x11, 0x36 + .byte 0x1b, 0x23, 0x01, 0x39, 0x35, 0x19, 0x19, 0x17, 0x09, 0x28, 0x22, 0x1e, 0x27, 0x2c, 0x35, 0x33, 0x2c, 0x27, 0x25, 0x31, 0x06, 0x31, 0x2d, 0x1a, 0x39, 0x28, 0x2d, 0x04, 0x1e, 0x24, 0x3e, 0x1c + .byte 0x3c, 0x30, 0x1b, 0x3f, 0x3e, 0x37, 0x22, 0x36, 0x11, 0x00, 0x01, 0x1c, 0x12, 0x1a, 0x10, 0x12, 0x1e, 0x2c, 0x1f, 0x12, 0x2a, 0x2f, 0x06, 0x19, 0x35, 0x1a, 0x18, 0x3b, 0x09, 0x36, 0x34, 0x1d + .byte 0x13, 0x02, 0x07, 0x10, 0x20, 0x2f, 0x1d, 0x0b, 0x03, 0x33, 0x1c, 0x16, 0x31, 0x05, 0x13, 0x1b, 0x29, 0x06, 0x13, 0x30, 0x2d, 0x36, 0x2a, 0x2d, 0x2c, 0x19, 0x34, 0x1c, 0x0f, 0x15, 0x12, 0x36 + .byte 0x15, 0x2c, 0x3a, 0x06, 0x1c, 0x12, 0x1d, 0x26, 0x03, 0x38, 0x1d, 0x01, 0x01, 0x2d, 0x17, 0x2e, 0x10, 0x14, 0x17, 0x1c, 0x34, 0x0f, 0x28, 0x09, 0x37, 0x1b, 0x28, 0x1d, 0x26, 0x29, 0x2d, 0x36 + .byte 0x1e, 0x17, 0x28, 0x15, 0x0f, 0x1c, 0x20, 0x2d, 0x10, 0x27, 0x16, 0x2e, 0x14, 0x09, 0x12, 0x3b, 0x3d, 0x21, 0x25, 0x1a, 0x2c, 0x00, 0x22, 0x36, 0x0d, 0x30, 0x10, 0x17, 0x19, 0x1b, 0x00, 0x3b + .byte 0x21, 0x2a, 0x28, 0x34, 0x2d, 0x0f, 0x16, 0x0a, 0x30, 0x28, 0x06, 0x00, 0x25, 0x31, 0x2e, 0x2a, 0x14, 0x33, 0x28, 0x36, 0x10, 0x2e, 0x05, 0x2e, 0x19, 0x19, 0x1a, 0x15, 0x2c, 0x14, 0x17, 0x37 + .byte 0x0f, 0x13, 0x32, 0x17, 0x1b, 0x39, 0x18, 0x32, 0x2e, 0x32, 0x1e, 0x24, 0x1d, 0x31, 0x12, 0x1d, 0x2b, 0x14, 0x0c, 0x27, 0x36, 0x2e, 0x32, 0x06, 0x0a, 0x1a, 0x28, 0x28, 0x20, 0x3a, 0x3a, 0x17 + .byte 0x08, 0x27, 0x36, 0x18, 0x1a, 0x10, 0x1e, 0x26, 0x1b, 0x1f, 0x33, 0x1f, 0x21, 0x17, 0x2f, 0x01, 0x08, 0x20, 0x35, 0x03, 0x19, 0x3b, 0x02, 0x20, 0x02, 0x2d, 0x23, 0x0e, 0x17, 0x32, 0x31, 0x29 + .byte 0x11, 0x22, 0x17, 0x22, 0x3a, 0x2c, 0x23, 0x34, 0x20, 0x18, 0x00, 0x3a, 0x22, 0x25, 0x33, 0x21, 0x33, 0x04, 0x27, 0x04, 0x18, 0x32, 0x2c, 0x0c, 0x2f, 0x28, 0x14, 0x2c, 0x3f, 0x30, 0x2b, 0x30 + .byte 0x21, 0x1d, 0x01, 0x25, 0x32, 0x05, 0x23, 0x34, 0x24, 0x10, 0x30, 0x3d, 0x14, 0x1b, 0x3f, 0x38, 0x2f, 0x22, 0x1b, 0x32, 0x25, 0x07, 0x37, 0x0a, 0x0c, 0x1d, 0x03, 0x1e, 0x1a, 0x0f, 0x3c, 0x12 + .byte 0x11, 0x18, 0x1d, 0x00, 0x35, 0x2f, 0x32, 0x18, 0x14, 0x23, 0x30, 0x1b, 0x11, 0x3d, 0x12, 0x1a, 0x16, 0x35, 0x28, 0x05, 0x24, 0x17, 0x3d, 0x37, 0x2e, 0x09, 0x2e, 0x18, 0x1d, 0x17, 0x20, 0x1f + .byte 0x18, 0x23, 0x2c, 0x2f, 0x20, 0x3f, 0x16, 0x3f, 0x29, 0x2e, 0x23, 0x3b, 0x29, 0x18, 0x39, 0x13, 0x1e, 0x32, 0x35, 0x14, 0x1d, 0x2a, 0x35, 0x01, 0x1d, 0x3e, 0x3b, 0x1e, 0x22, 0x1e, 0x16, 0x18 + .byte 0x22, 0x12, 0x3e, 0x29, 0x33, 0x2f, 0x14, 0x19, 0x3b, 0x07, 0x15, 0x06, 0x3d, 0x29, 0x35, 0x37, 0x23, 0x34, 0x1d, 0x2d, 0x18, 0x12, 0x1b, 0x0b, 0x13, 0x24, 0x13, 0x38, 0x1c, 0x1f, 0x0b, 0x1b + .byte 0x13, 0x21, 0x1c, 0x06, 0x39, 0x32, 0x37, 0x3d, 0x26, 0x29, 0x26, 0x15, 0x3c, 0x33, 0x27, 0x00, 0x01, 0x2e, 0x15, 0x18, 0x31, 0x0d, 0x2c, 0x13, 0x27, 0x3b, 0x20, 0x2d, 0x01, 0x26, 0x23, 0x15 + .byte 0x30, 0x24, 0x00, 0x17, 0x37, 0x3f, 0x33, 0x25, 0x24, 0x31, 0x06, 0x3b, 0x37, 0x03, 0x18, 0x1a, 0x2c, 0x34, 0x14, 0x1d, 0x36, 0x18, 0x3a, 0x04, 0x23, 0x12, 0x26, 0x15, 0x2b, 0x19, 0x1a, 0x29 + .byte 0x2c, 0x36, 0x01, 0x19, 0x1d, 0x2f, 0x06, 0x2b, 0x0c, 0x12, 0x26, 0x36, 0x32, 0x1d, 0x0d, 0x12, 0x28, 0x03, 0x28, 0x13, 0x29, 0x06, 0x17, 0x03, 0x38, 0x21, 0x30, 0x2c, 0x10, 0x22, 0x00, 0x28 + .byte 0x24, 0x3b, 0x1c, 0x20, 0x3e, 0x13, 0x02, 0x0c, 0x19, 0x29, 0x2c, 0x1a, 0x39, 0x30, 0x22, 0x2a, 0x1f, 0x22, 0x14, 0x34, 0x2c, 0x14, 0x25, 0x1b, 0x06, 0x3b, 0x15, 0x06, 0x1c, 0x13, 0x15, 0x03 + .byte 0x18, 0x1e, 0x2a, 0x1b, 0x17, 0x25, 0x2f, 0x1c, 0x29, 0x2e, 0x02, 0x32, 0x1e, 0x1d, 0x28, 0x35, 0x36, 0x03, 0x34, 0x16, 0x3d, 0x2a, 0x12, 0x0d, 0x13, 0x1d, 0x2d, 0x21, 0x32, 0x17, 0x2e, 0x1a + .byte 0x15, 0x26, 0x22, 0x2f, 0x15, 0x3c, 0x0e, 0x20, 0x2f, 0x27, 0x13, 0x04, 0x09, 0x32, 0x1e, 0x01, 0x34, 0x06, 0x16, 0x1e, 0x2e, 0x1b, 0x1c, 0x28, 0x13, 0x2a, 0x30, 0x34, 0x12, 0x12, 0x32, 0x18 + .byte 0x1d, 0x1d, 0x35, 0x07, 0x1c, 0x16, 0x2d, 0x3d, 0x35, 0x1c, 0x1b, 0x24, 0x21, 0x2d, 0x1e, 0x10, 0x09, 0x14, 0x3d, 0x11, 0x12, 0x25, 0x02, 0x26, 0x23, 0x02, 0x19, 0x19, 0x05, 0x14, 0x0b, 0x21 + .byte 0x1a, 0x09, 0x02, 0x2c, 0x18, 0x28, 0x2d, 0x1e, 0x10, 0x12, 0x2e, 0x18, 0x2e, 0x1f, 0x02, 0x2c, 0x14, 0x17, 0x24, 0x39, 0x08, 0x32, 0x16, 0x14, 0x22, 0x16, 0x28, 0x21, 0x11, 0x10, 0x2c, 0x23 + .byte 0x36, 0x2b, 0x39, 0x21, 0x26, 0x0e, 0x06, 0x2d, 0x3c, 0x3e, 0x26, 0x2a, 0x1b, 0x1f, 0x00, 0x3c, 0x33, 0x35, 0x3f, 0x14, 0x00, 0x0b, 0x10, 0x34, 0x3c, 0x17, 0x2d, 0x07, 0x1f, 0x24, 0x39, 0x27 + .byte 0x16, 0x00, 0x1d, 0x33, 0x2b, 0x1e, 0x0f, 0x08, 0x31, 0x3a, 0x09, 0x13, 0x0c, 0x21, 0x1c, 0x2a, 0x17, 0x34, 0x29, 0x27, 0x10, 0x37, 0x1b, 0x18, 0x15, 0x08, 0x2f, 0x1f, 0x16, 0x12, 0x1f, 0x28 + .byte 0x34, 0x1c, 0x20, 0x22, 0x12, 0x01, 0x12, 0x21, 0x31, 0x10, 0x22, 0x26, 0x1e, 0x01, 0x3d, 0x11, 0x1e, 0x27, 0x25, 0x3d, 0x30, 0x24, 0x1d, 0x11, 0x22, 0x36, 0x30, 0x16, 0x1f, 0x3e, 0x2a, 0x3c + .byte 0x27, 0x1b, 0x1f, 0x29, 0x10, 0x1e, 0x05, 0x2a, 0x0a, 0x10, 0x14, 0x1f, 0x00, 0x2e, 0x0b, 0x3b, 0x18, 0x0a, 0x39, 0x30, 0x37, 0x0b, 0x1f, 0x1d, 0x0a, 0x29, 0x3e, 0x1c, 0x33, 0x13, 0x2e, 0x28 + .byte 0x27, 0x1b, 0x1e, 0x1d, 0x02, 0x1c, 0x01, 0x25, 0x14, 0x3a, 0x10, 0x1c, 0x12, 0x05, 0x2a, 0x30, 0x20, 0x26, 0x2f, 0x2e, 0x2e, 0x03, 0x07, 0x24, 0x36, 0x04, 0x2b, 0x11, 0x25, 0x2d, 0x28, 0x0e + .byte 0x2e, 0x0f, 0x1d, 0x15, 0x1c, 0x28, 0x30, 0x1f, 0x23, 0x26, 0x36, 0x12, 0x37, 0x3a, 0x31, 0x10, 0x2c, 0x2c, 0x2f, 0x1a, 0x0d, 0x15, 0x3f, 0x3c, 0x32, 0x35, 0x1c, 0x16, 0x33, 0x16, 0x28, 0x1d + .byte 0x3f, 0x21, 0x2c, 0x3e, 0x2b, 0x24, 0x23, 0x2f, 0x32, 0x15, 0x2a, 0x1b, 0x10, 0x35, 0x18, 0x37, 0x10, 0x3b, 0x1e, 0x11, 0x2b, 0x16, 0x24, 0x1d, 0x16, 0x26, 0x3c, 0x2d, 0x11, 0x15, 0x28, 0x28 + .byte 0x27, 0x27, 0x27, 0x3b, 0x3a, 0x16, 0x1a, 0x0c, 0x1a, 0x15, 0x08, 0x25, 0x0b, 0x10, 0x22, 0x1a, 0x3e, 0x17, 0x28, 0x1f, 0x1e, 0x01, 0x1e, 0x1e, 0x1c, 0x2f, 0x10, 0x25, 0x0b, 0x34, 0x3e, 0x0c + .byte 0x1a, 0x1b, 0x10, 0x2a, 0x0f, 0x14, 0x17, 0x0f, 0x3f, 0x17, 0x03, 0x15, 0x1f, 0x02, 0x36, 0x17, 0x15, 0x1d, 0x18, 0x08, 0x36, 0x10, 0x14, 0x0d, 0x2b, 0x0a, 0x05, 0x1d, 0x26, 0x12, 0x1e, 0x3e + .byte 0x18, 0x19, 0x36, 0x18, 0x37, 0x17, 0x39, 0x2e, 0x0d, 0x04, 0x19, 0x16, 0x22, 0x15, 0x3e, 0x26, 0x1f, 0x00, 0x06, 0x17, 0x33, 0x22, 0x1d, 0x2b, 0x39, 0x2b, 0x3e, 0x31, 0x1c, 0x22, 0x3f, 0x13 + .byte 0x30, 0x1c, 0x31, 0x07, 0x2b, 0x14, 0x32, 0x35, 0x1e, 0x02, 0x07, 0x20, 0x0f, 0x3b, 0x11, 0x20, 0x07, 0x12, 0x2a, 0x30, 0x1d, 0x28, 0x38, 0x36, 0x20, 0x01, 0x17, 0x15, 0x20, 0x21, 0x3a, 0x1b + .byte 0x1e, 0x38, 0x12, 0x24, 0x03, 0x3e, 0x1f, 0x29, 0x1d, 0x13, 0x20, 0x27, 0x19, 0x12, 0x25, 0x20, 0x32, 0x33, 0x2b, 0x3f, 0x05, 0x31, 0x35, 0x3c, 0x2d, 0x2d, 0x02, 0x2e, 0x10, 0x2a, 0x16, 0x17 + .byte 0x08, 0x31, 0x17, 0x2e, 0x2b, 0x30, 0x1e, 0x15, 0x31, 0x15, 0x26, 0x08, 0x10, 0x33, 0x15, 0x01, 0x27, 0x12, 0x07, 0x2f, 0x29, 0x27, 0x34, 0x3f, 0x08, 0x31, 0x1c, 0x20, 0x1a, 0x33, 0x0c, 0x13 + .byte 0x18, 0x31, 0x24, 0x37, 0x2d, 0x2e, 0x21, 0x18, 0x24, 0x3a, 0x27, 0x31, 0x35, 0x3e, 0x30, 0x3a, 0x14, 0x33, 0x0f, 0x1a, 0x2d, 0x30, 0x2e, 0x11, 0x1a, 0x31, 0x1d, 0x17, 0x3c, 0x18, 0x33, 0x31 + .byte 0x23, 0x1d, 0x39, 0x2d, 0x10, 0x1d, 0x2f, 0x24, 0x15, 0x1c, 0x25, 0x01, 0x2b, 0x22, 0x16, 0x2e, 0x1b, 0x25, 0x35, 0x37, 0x10, 0x26, 0x39, 0x01, 0x36, 0x17, 0x2b, 0x14, 0x09, 0x16, 0x17, 0x20 + .byte 0x28, 0x23, 0x26, 0x3a, 0x26, 0x27, 0x2a, 0x24, 0x36, 0x02, 0x2c, 0x29, 0x30, 0x35, 0x36, 0x01, 0x1f, 0x28, 0x3b, 0x1d, 0x23, 0x1e, 0x2d, 0x11, 0x1e, 0x2c, 0x2f, 0x32, 0x19, 0x3f, 0x26, 0x31 + .byte 0x38, 0x1e, 0x17, 0x05, 0x18, 0x2e, 0x00, 0x2e, 0x12, 0x34, 0x3f, 0x34, 0x16, 0x10, 0x29, 0x20, 0x3d, 0x36, 0x2f, 0x16, 0x25, 0x12, 0x17, 0x10, 0x21, 0x37, 0x35, 0x25, 0x37, 0x2d, 0x01, 0x08 + .byte 0x27, 0x03, 0x1f, 0x29, 0x0d, 0x2a, 0x16, 0x3a, 0x3f, 0x33, 0x2b, 0x19, 0x1d, 0x2a, 0x1f, 0x29, 0x28, 0x2c, 0x10, 0x28, 0x30, 0x10, 0x39, 0x14, 0x1b, 0x00, 0x18, 0x21, 0x28, 0x0c, 0x37, 0x11 + .byte 0x10, 0x11, 0x3c, 0x33, 0x32, 0x33, 0x36, 0x1a, 0x36, 0x00, 0x1c, 0x31, 0x1b, 0x1d, 0x38, 0x1d, 0x10, 0x3c, 0x39, 0x27, 0x3a, 0x3f, 0x14, 0x19, 0x12, 0x14, 0x0d, 0x1f, 0x18, 0x00, 0x25, 0x18 + .byte 0x28, 0x1c, 0x32, 0x27, 0x03, 0x1a, 0x26, 0x2d, 0x2a, 0x29, 0x28, 0x27, 0x0a, 0x2a, 0x18, 0x0a, 0x1a, 0x30, 0x20, 0x1a, 0x2e, 0x06, 0x0b, 0x1d, 0x0f, 0x0c, 0x1c, 0x35, 0x28, 0x1c, 0x3d, 0x16 + .byte 0x23, 0x21, 0x1c, 0x31, 0x14, 0x1c, 0x2e, 0x22, 0x32, 0x35, 0x09, 0x29, 0x30, 0x20, 0x1a, 0x10, 0x31, 0x3f, 0x2c, 0x0a, 0x3d, 0x37, 0x0b, 0x2e, 0x2d, 0x1f, 0x22, 0x31, 0x06, 0x07, 0x29, 0x22 + .byte 0x17, 0x2d, 0x30, 0x11, 0x18, 0x0c, 0x19, 0x15, 0x07, 0x0a, 0x34, 0x18, 0x29, 0x27, 0x33, 0x0c, 0x30, 0x03, 0x1a, 0x37, 0x06, 0x01, 0x2d, 0x0f, 0x3b, 0x2b, 0x11, 0x1f, 0x37, 0x2b, 0x21, 0x36 + .byte 0x3f, 0x23, 0x17, 0x17, 0x07, 0x2b, 0x2b, 0x0e, 0x30, 0x11, 0x39, 0x1d, 0x29, 0x03, 0x33, 0x30, 0x03, 0x2f, 0x3c, 0x20, 0x26, 0x03, 0x22, 0x14, 0x3a, 0x28, 0x35, 0x01, 0x28, 0x2b, 0x3e, 0x15 + .byte 0x18, 0x30, 0x07, 0x17, 0x3b, 0x2c, 0x30, 0x15, 0x07, 0x2c, 0x17, 0x27, 0x1d, 0x3f, 0x1e, 0x33, 0x0d, 0x17, 0x10, 0x15, 0x0e, 0x30, 0x09, 0x05, 0x30, 0x2d, 0x20, 0x15, 0x3c, 0x3d, 0x30, 0x0c + .byte 0x17, 0x1c, 0x1a, 0x0d, 0x25, 0x2b, 0x2b, 0x2a, 0x02, 0x16, 0x2d, 0x17, 0x31, 0x17, 0x00, 0x08, 0x13, 0x37, 0x35, 0x21, 0x1e, 0x1c, 0x1f, 0x2b, 0x32, 0x1c, 0x10, 0x2a, 0x16, 0x3a, 0x33, 0x31 + .byte 0x17, 0x2b, 0x2a, 0x0c, 0x3d, 0x11, 0x28, 0x0a, 0x30, 0x23, 0x0a, 0x26, 0x0a, 0x14, 0x24, 0x0b, 0x0f, 0x30, 0x1b, 0x1e, 0x29, 0x02, 0x35, 0x28, 0x3b, 0x02, 0x14, 0x00, 0x0f, 0x35, 0x1c, 0x3c + .byte 0x2e, 0x28, 0x38, 0x19, 0x1b, 0x11, 0x12, 0x09, 0x16, 0x10, 0x2e, 0x0d, 0x20, 0x3d, 0x04, 0x32, 0x16, 0x2c, 0x25, 0x02, 0x3d, 0x18, 0x0b, 0x13, 0x1c, 0x22, 0x2a, 0x1c, 0x20, 0x27, 0x22, 0x05 + .byte 0x26, 0x22, 0x12, 0x1d, 0x2c, 0x08, 0x05, 0x2e, 0x3f, 0x1c, 0x17, 0x24, 0x0d, 0x33, 0x36, 0x08, 0x24, 0x10, 0x22, 0x29, 0x1c, 0x0a, 0x11, 0x25, 0x0f, 0x10, 0x24, 0x38, 0x2f, 0x25, 0x32, 0x1e + .byte 0x06, 0x2a, 0x29, 0x3e, 0x3a, 0x28, 0x34, 0x17, 0x33, 0x18, 0x33, 0x17, 0x07, 0x14, 0x1f, 0x11, 0x17, 0x20, 0x13, 0x0e, 0x14, 0x3b, 0x1c, 0x12, 0x2a, 0x13, 0x37, 0x2a, 0x35, 0x32, 0x30, 0x02 + .byte 0x25, 0x00, 0x07, 0x1f, 0x0c, 0x04, 0x2c, 0x37, 0x37, 0x30, 0x25, 0x12, 0x25, 0x12, 0x22, 0x21, 0x22, 0x35, 0x33, 0x07, 0x20, 0x2d, 0x27, 0x0e, 0x30, 0x34, 0x19, 0x1a, 0x0a, 0x3c, 0x25, 0x07 + .byte 0x1d, 0x2b, 0x31, 0x3a, 0x12, 0x1a, 0x3d, 0x37, 0x16, 0x15, 0x16, 0x39, 0x13, 0x15, 0x2d, 0x03, 0x2e, 0x06, 0x39, 0x2c, 0x16, 0x00, 0x13, 0x35, 0x2a, 0x35, 0x24, 0x01, 0x18, 0x24, 0x37, 0x28 + .byte 0x25, 0x1b, 0x34, 0x25, 0x19, 0x17, 0x27, 0x2f, 0x1b, 0x27, 0x0d, 0x10, 0x36, 0x3c, 0x30, 0x3c, 0x33, 0x23, 0x3e, 0x27, 0x1e, 0x25, 0x2d, 0x29, 0x1f, 0x12, 0x21, 0x37, 0x32, 0x1f, 0x11, 0x21 + .byte 0x35, 0x30, 0x0c, 0x19, 0x25, 0x3d, 0x26, 0x17, 0x02, 0x1d, 0x14, 0x2e, 0x11, 0x38, 0x13, 0x30, 0x0a, 0x2b, 0x20, 0x1e, 0x10, 0x15, 0x37, 0x30, 0x2e, 0x1e, 0x04, 0x2c, 0x14, 0x34, 0x19, 0x08 + .byte 0x14, 0x18, 0x0e, 0x1c, 0x30, 0x1a, 0x2e, 0x1b, 0x1f, 0x39, 0x31, 0x0c, 0x1c, 0x28, 0x3e, 0x33, 0x23, 0x0f, 0x13, 0x16, 0x25, 0x39, 0x2f, 0x14, 0x1b, 0x1a, 0x28, 0x3e, 0x21, 0x2d, 0x19, 0x11 + .byte 0x0c, 0x34, 0x32, 0x39, 0x31, 0x19, 0x1a, 0x08, 0x34, 0x09, 0x2f, 0x11, 0x30, 0x04, 0x1c, 0x02, 0x3b, 0x1b, 0x33, 0x21, 0x33, 0x38, 0x02, 0x1a, 0x31, 0x38, 0x32, 0x1f, 0x1d, 0x16, 0x17, 0x10 + .byte 0x1b, 0x32, 0x20, 0x17, 0x00, 0x33, 0x12, 0x21, 0x0f, 0x27, 0x14, 0x19, 0x27, 0x24, 0x2c, 0x37, 0x25, 0x05, 0x2f, 0x3d, 0x25, 0x11, 0x12, 0x30, 0x1a, 0x16, 0x03, 0x1a, 0x14, 0x09, 0x13, 0x02 + .byte 0x23, 0x22, 0x01, 0x3c, 0x10, 0x3f, 0x2d, 0x23, 0x31, 0x3f, 0x23, 0x17, 0x00, 0x33, 0x3f, 0x0f, 0x2f, 0x26, 0x07, 0x15, 0x21, 0x2b, 0x2a, 0x38, 0x39, 0x1e, 0x09, 0x25, 0x2b, 0x3b, 0x30, 0x25 + .byte 0x12, 0x2d, 0x13, 0x32, 0x19, 0x28, 0x24, 0x1c, 0x2d, 0x35, 0x32, 0x26, 0x0d, 0x23, 0x1e, 0x1d, 0x07, 0x21, 0x0b, 0x34, 0x17, 0x2d, 0x32, 0x32, 0x3a, 0x3c, 0x35, 0x1a, 0x10, 0x33, 0x1a, 0x07 + .byte 0x22, 0x3b, 0x1b, 0x2a, 0x33, 0x1f, 0x26, 0x0e, 0x35, 0x1a, 0x3b, 0x0a, 0x1c, 0x11, 0x07, 0x11, 0x0d, 0x3c, 0x2d, 0x1e, 0x37, 0x29, 0x11, 0x05, 0x12, 0x15, 0x2f, 0x1c, 0x24, 0x31, 0x16, 0x2b + .byte 0x21, 0x1b, 0x23, 0x10, 0x31, 0x02, 0x14, 0x29, 0x26, 0x20, 0x16, 0x10, 0x17, 0x10, 0x0b, 0x0f, 0x33, 0x01, 0x2e, 0x14, 0x21, 0x0e, 0x37, 0x1a, 0x1d, 0x2f, 0x1e, 0x30, 0x24, 0x04, 0x14, 0x2d + .byte 0x11, 0x00, 0x30, 0x08, 0x2a, 0x1d, 0x1d, 0x22, 0x21, 0x24, 0x2c, 0x37, 0x24, 0x11, 0x12, 0x04, 0x2e, 0x28, 0x1d, 0x18, 0x23, 0x3c, 0x16, 0x16, 0x10, 0x17, 0x31, 0x20, 0x21, 0x12, 0x33, 0x3e + .byte 0x34, 0x06, 0x13, 0x13, 0x17, 0x38, 0x2b, 0x14, 0x0d, 0x15, 0x24, 0x3b, 0x2b, 0x34, 0x3b, 0x1e, 0x18, 0x07, 0x34, 0x37, 0x1d, 0x1f, 0x0b, 0x29, 0x20, 0x12, 0x1e, 0x1d, 0x1a, 0x24, 0x24, 0x3d + .byte 0x28, 0x24, 0x0b, 0x12, 0x33, 0x1b, 0x3a, 0x22, 0x14, 0x13, 0x2a, 0x31, 0x38, 0x15, 0x37, 0x2b, 0x2e, 0x19, 0x1e, 0x2c, 0x3f, 0x1b, 0x2a, 0x33, 0x1f, 0x33, 0x3f, 0x15, 0x29, 0x01, 0x1e, 0x18 + .byte 0x1f, 0x22, 0x19, 0x33, 0x3c, 0x34, 0x1e, 0x12, 0x22, 0x0d, 0x37, 0x2c, 0x0f, 0x08, 0x31, 0x2e, 0x09, 0x36, 0x01, 0x05, 0x1e, 0x1c, 0x04, 0x1e, 0x0c, 0x01, 0x1c, 0x29, 0x28, 0x2f, 0x39, 0x2d + .byte 0x14, 0x09, 0x22, 0x36, 0x04, 0x37, 0x37, 0x2d, 0x2f, 0x35, 0x24, 0x23, 0x1b, 0x08, 0x20, 0x32, 0x20, 0x1f, 0x34, 0x02, 0x31, 0x19, 0x18, 0x13, 0x36, 0x06, 0x2b, 0x1e, 0x0e, 0x1b, 0x10, 0x2f + .byte 0x0e, 0x1c, 0x11, 0x38, 0x13, 0x01, 0x37, 0x19, 0x14, 0x11, 0x26, 0x31, 0x3d, 0x33, 0x1d, 0x1b, 0x34, 0x25, 0x31, 0x2f, 0x11, 0x0a, 0x2f, 0x39, 0x17, 0x1b, 0x05, 0x0e, 0x13, 0x29, 0x25, 0x22 + .byte 0x15, 0x0d, 0x20, 0x2b, 0x27, 0x21, 0x3e, 0x24, 0x27, 0x2a, 0x2b, 0x16, 0x24, 0x3d, 0x15, 0x15, 0x30, 0x31, 0x0f, 0x33, 0x24, 0x06, 0x16, 0x13, 0x06, 0x31, 0x10, 0x2e, 0x3f, 0x10, 0x05, 0x0d + .byte 0x2f, 0x3c, 0x1f, 0x19, 0x12, 0x13, 0x24, 0x0f, 0x33, 0x36, 0x15, 0x3b, 0x33, 0x03, 0x0f, 0x2a, 0x3b, 0x3c, 0x2c, 0x36, 0x09, 0x29, 0x11, 0x3b, 0x27, 0x28, 0x2b, 0x31, 0x1a, 0x0e, 0x2f, 0x39 + .byte 0x2c, 0x31, 0x0e, 0x3c, 0x35, 0x2c, 0x24, 0x33, 0x3d, 0x11, 0x2b, 0x07, 0x3c, 0x37, 0x14, 0x18, 0x13, 0x1d, 0x3f, 0x2e, 0x30, 0x12, 0x25, 0x26, 0x1d, 0x11, 0x07, 0x11, 0x1e, 0x34, 0x01, 0x11 + .byte 0x0b, 0x39, 0x21, 0x29, 0x02, 0x29, 0x15, 0x10, 0x1a, 0x30, 0x1f, 0x35, 0x3c, 0x2b, 0x2a, 0x30, 0x3b, 0x36, 0x20, 0x1a, 0x23, 0x32, 0x24, 0x2b, 0x15, 0x20, 0x1c, 0x25, 0x3d, 0x36, 0x2d, 0x14 + .byte 0x31, 0x18, 0x23, 0x17, 0x18, 0x05, 0x13, 0x34, 0x30, 0x37, 0x0e, 0x39, 0x23, 0x1d, 0x1f, 0x17, 0x01, 0x15, 0x2f, 0x0b, 0x3e, 0x1b, 0x0d, 0x19, 0x2e, 0x31, 0x38, 0x1c, 0x15, 0x34, 0x15, 0x13 + .byte 0x19, 0x29, 0x19, 0x14, 0x27, 0x15, 0x18, 0x23, 0x29, 0x0c, 0x27, 0x2d, 0x0e, 0x17, 0x34, 0x18, 0x10, 0x3b, 0x1e, 0x29, 0x34, 0x2c, 0x22, 0x31, 0x08, 0x13, 0x1d, 0x18, 0x1a, 0x1c, 0x0b, 0x2a + .byte 0x19, 0x1e, 0x1a, 0x23, 0x27, 0x17, 0x3b, 0x0e, 0x37, 0x19, 0x2b, 0x16, 0x2f, 0x08, 0x21, 0x37, 0x02, 0x20, 0x0b, 0x32, 0x30, 0x16, 0x05, 0x30, 0x13, 0x05, 0x1a, 0x07, 0x39, 0x19, 0x0c, 0x3b + .byte 0x2a, 0x15, 0x05, 0x30, 0x30, 0x05, 0x19, 0x13, 0x00, 0x12, 0x27, 0x16, 0x2a, 0x0f, 0x28, 0x27, 0x0c, 0x23, 0x2f, 0x39, 0x28, 0x2a, 0x24, 0x25, 0x1f, 0x18, 0x29, 0x14, 0x16, 0x05, 0x1a, 0x35 + .byte 0x2f, 0x26, 0x0a, 0x3a, 0x29, 0x34, 0x2c, 0x36, 0x2e, 0x3a, 0x15, 0x1a, 0x0a, 0x2d, 0x16, 0x14, 0x2e, 0x35, 0x28, 0x2a, 0x35, 0x0f, 0x11, 0x11, 0x32, 0x19, 0x20, 0x1a, 0x28, 0x17, 0x1a, 0x28 + .byte 0x16, 0x33, 0x25, 0x13, 0x2c, 0x29, 0x09, 0x16, 0x33, 0x1d, 0x27, 0x26, 0x15, 0x0c, 0x2f, 0x22, 0x1c, 0x19, 0x29, 0x33, 0x10, 0x2d, 0x11, 0x1b, 0x16, 0x19, 0x2e, 0x0d, 0x0c, 0x28, 0x37, 0x3a + .byte 0x34, 0x2a, 0x1d, 0x37, 0x30, 0x0a, 0x36, 0x24, 0x39, 0x1b, 0x39, 0x0a, 0x32, 0x11, 0x03, 0x2d, 0x32, 0x1d, 0x30, 0x38, 0x1e, 0x27, 0x2e, 0x17, 0x18, 0x16, 0x17, 0x2a, 0x36, 0x3b, 0x31, 0x17 + .byte 0x04, 0x19, 0x3a, 0x25, 0x2d, 0x00, 0x36, 0x27, 0x25, 0x12, 0x33, 0x06, 0x0a, 0x14, 0x11, 0x05, 0x2f, 0x03, 0x35, 0x2f, 0x0b, 0x34, 0x29, 0x00, 0x31, 0x13, 0x27, 0x0f, 0x1c, 0x1d, 0x06, 0x2d + .byte 0x1c, 0x30, 0x27, 0x2f, 0x2a, 0x27, 0x16, 0x20, 0x31, 0x33, 0x2b, 0x2b, 0x05, 0x30, 0x36, 0x29, 0x23, 0x35, 0x10, 0x16, 0x2f, 0x2d, 0x20, 0x29, 0x37, 0x13, 0x24, 0x2d, 0x0e, 0x25, 0x08, 0x0a + .byte 0x18, 0x0f, 0x03, 0x1b, 0x31, 0x0c, 0x37, 0x1e, 0x34, 0x31, 0x1b, 0x0e, 0x25, 0x1a, 0x07, 0x34, 0x0d, 0x3c, 0x33, 0x00, 0x3a, 0x36, 0x04, 0x27, 0x12, 0x23, 0x18, 0x24, 0x0d, 0x0b, 0x18, 0x31 + .byte 0x32, 0x37, 0x00, 0x0d, 0x21, 0x32, 0x10, 0x12, 0x26, 0x0d, 0x19, 0x29, 0x24, 0x2b, 0x3d, 0x21, 0x1f, 0x1e, 0x1b, 0x28, 0x0d, 0x12, 0x28, 0x35, 0x1e, 0x23, 0x0a, 0x2e, 0x22, 0x27, 0x27, 0x35 + .byte 0x01, 0x0e, 0x20, 0x31, 0x39, 0x29, 0x3b, 0x24, 0x36, 0x14, 0x10, 0x33, 0x18, 0x2c, 0x26, 0x04, 0x2d, 0x15, 0x1a, 0x11, 0x37, 0x0f, 0x0b, 0x14, 0x0e, 0x2c, 0x2c, 0x21, 0x17, 0x2c, 0x16, 0x21 + .byte 0x35, 0x3e, 0x10, 0x10, 0x0a, 0x05, 0x1e, 0x3b, 0x09, 0x13, 0x26, 0x18, 0x1e, 0x23, 0x0c, 0x1a, 0x33, 0x37, 0x1f, 0x09, 0x12, 0x35, 0x3d, 0x0d, 0x15, 0x36, 0x06, 0x24, 0x33, 0x30, 0x29, 0x3b + .byte 0x0f, 0x28, 0x34, 0x2a, 0x2c, 0x02, 0x12, 0x35, 0x09, 0x22, 0x31, 0x3b, 0x31, 0x1c, 0x33, 0x22, 0x27, 0x3d, 0x34, 0x15, 0x14, 0x22, 0x28, 0x28, 0x10, 0x1e, 0x21, 0x31, 0x10, 0x2d, 0x16, 0x21 + .byte 0x1e, 0x05, 0x33, 0x0f, 0x30, 0x31, 0x0e, 0x1a, 0x35, 0x38, 0x2e, 0x28, 0x26, 0x37, 0x1e, 0x2b, 0x13, 0x33, 0x1f, 0x1e, 0x37, 0x0a, 0x28, 0x24, 0x32, 0x1c, 0x1a, 0x1f, 0x3f, 0x19, 0x39, 0x39 + .byte 0x29, 0x2c, 0x1b, 0x14, 0x15, 0x2a, 0x17, 0x32, 0x0f, 0x21, 0x30, 0x21, 0x18, 0x23, 0x2a, 0x27, 0x3d, 0x07, 0x10, 0x0b, 0x3f, 0x2f, 0x31, 0x02, 0x2e, 0x08, 0x39, 0x2f, 0x3f, 0x20, 0x18, 0x2d + .byte 0x34, 0x11, 0x2e, 0x34, 0x10, 0x26, 0x12, 0x23, 0x25, 0x0a, 0x37, 0x34, 0x09, 0x25, 0x0a, 0x3e, 0x16, 0x1a, 0x17, 0x11, 0x38, 0x1c, 0x20, 0x11, 0x21, 0x26, 0x05, 0x0f, 0x18, 0x26, 0x2b, 0x32 + .byte 0x0a, 0x0c, 0x16, 0x03, 0x29, 0x1d, 0x29, 0x3b, 0x23, 0x16, 0x1b, 0x29, 0x07, 0x09, 0x17, 0x17, 0x2c, 0x1c, 0x35, 0x33, 0x30, 0x17, 0x12, 0x1e, 0x3d, 0x1a, 0x2b, 0x21, 0x1d, 0x10, 0x0a, 0x08 + .byte 0x17, 0x14, 0x3c, 0x36, 0x28, 0x36, 0x36, 0x3b, 0x20, 0x1b, 0x13, 0x22, 0x1d, 0x13, 0x3a, 0x15, 0x02, 0x23, 0x2c, 0x3e, 0x19, 0x14, 0x39, 0x3c, 0x1a, 0x10, 0x08, 0x1e, 0x0a, 0x13, 0x29, 0x3f + .byte 0x38, 0x2c, 0x07, 0x23, 0x1f, 0x19, 0x2a, 0x24, 0x14, 0x3c, 0x1f, 0x0d, 0x04, 0x37, 0x1a, 0x2f, 0x28, 0x2a, 0x1d, 0x1e, 0x11, 0x37, 0x29, 0x28, 0x27, 0x12, 0x0d, 0x00, 0x26, 0x0a, 0x3c, 0x26 + .byte 0x1f, 0x1c, 0x33, 0x04, 0x3a, 0x2c, 0x24, 0x3d, 0x2b, 0x26, 0x31, 0x2f, 0x13, 0x1c, 0x21, 0x3e, 0x12, 0x23, 0x36, 0x0a, 0x1a, 0x2d, 0x1e, 0x19, 0x05, 0x1f, 0x1b, 0x1e, 0x0a, 0x1f, 0x20, 0x08 + .byte 0x24, 0x2c, 0x0c, 0x33, 0x1d, 0x1f, 0x11, 0x0e, 0x12, 0x10, 0x27, 0x12, 0x19, 0x2a, 0x13, 0x31, 0x1c, 0x04, 0x30, 0x1a, 0x38, 0x1f, 0x2c, 0x35, 0x25, 0x07, 0x0b, 0x33, 0x2d, 0x02, 0x1a, 0x2a + .byte 0x35, 0x35, 0x16, 0x2f, 0x14, 0x11, 0x31, 0x33, 0x2c, 0x31, 0x1e, 0x3c, 0x3a, 0x27, 0x3c, 0x2b, 0x12, 0x27, 0x1d, 0x12, 0x36, 0x2c, 0x2b, 0x25, 0x3b, 0x35, 0x12, 0x3d, 0x27, 0x13, 0x23, 0x19 + .byte 0x33, 0x2c, 0x26, 0x09, 0x3c, 0x12, 0x15, 0x1a, 0x23, 0x21, 0x07, 0x1a, 0x22, 0x25, 0x20, 0x19, 0x1b, 0x2c, 0x3a, 0x19, 0x35, 0x05, 0x26, 0x1d, 0x23, 0x22, 0x25, 0x0e, 0x1e, 0x11, 0x13, 0x30 + .byte 0x12, 0x2c, 0x22, 0x25, 0x0a, 0x1d, 0x18, 0x23, 0x3e, 0x1d, 0x02, 0x28, 0x25, 0x21, 0x0e, 0x20, 0x21, 0x22, 0x37, 0x18, 0x33, 0x27, 0x23, 0x23, 0x31, 0x24, 0x1a, 0x1a, 0x3e, 0x25, 0x24, 0x24 + .byte 0x01, 0x18, 0x34, 0x10, 0x22, 0x07, 0x00, 0x37, 0x06, 0x20, 0x20, 0x3a, 0x02, 0x2b, 0x07, 0x2c, 0x2c, 0x09, 0x2f, 0x2a, 0x01, 0x32, 0x2c, 0x00, 0x35, 0x13, 0x2b, 0x3c, 0x1f, 0x36, 0x37, 0x1e + .byte 0x20, 0x35, 0x1d, 0x0c, 0x07, 0x33, 0x16, 0x08, 0x12, 0x3f, 0x36, 0x11, 0x0b, 0x1f, 0x2d, 0x21, 0x20, 0x33, 0x17, 0x1a, 0x2e, 0x16, 0x01, 0x2f, 0x2f, 0x1c, 0x34, 0x29, 0x31, 0x2e, 0x3b, 0x38 + .byte 0x31, 0x0d, 0x16, 0x12, 0x07, 0x29, 0x24, 0x33, 0x3c, 0x34, 0x3e, 0x1e, 0x18, 0x30, 0x02, 0x34, 0x2a, 0x34, 0x1b, 0x2e, 0x23, 0x18, 0x34, 0x00, 0x1f, 0x20, 0x0e, 0x28, 0x15, 0x33, 0x37, 0x27 + .byte 0x35, 0x23, 0x37, 0x3e, 0x11, 0x32, 0x2e, 0x36, 0x3a, 0x02, 0x2b, 0x00, 0x36, 0x1d, 0x13, 0x29, 0x16, 0x08, 0x2b, 0x37, 0x08, 0x02, 0x27, 0x32, 0x2d, 0x34, 0x30, 0x36, 0x29, 0x2e, 0x10, 0x12 + .byte 0x3c, 0x2e, 0x2a, 0x04, 0x33, 0x30, 0x3f, 0x01, 0x22, 0x37, 0x14, 0x1d, 0x27, 0x00, 0x2f, 0x0c, 0x39, 0x26, 0x27, 0x04, 0x21, 0x19, 0x08, 0x1d, 0x01, 0x04, 0x1e, 0x27, 0x1b, 0x2b, 0x31, 0x17 + .byte 0x1f, 0x07, 0x01, 0x2d, 0x2e, 0x3b, 0x1f, 0x34, 0x24, 0x31, 0x32, 0x2b, 0x24, 0x0e, 0x07, 0x1e, 0x0f, 0x33, 0x10, 0x16, 0x21, 0x32, 0x39, 0x02, 0x1a, 0x33, 0x3d, 0x22, 0x0c, 0x25, 0x1a, 0x29 + .byte 0x29, 0x28, 0x3a, 0x32, 0x26, 0x0b, 0x13, 0x22, 0x1f, 0x0f, 0x1c, 0x04, 0x2c, 0x20, 0x39, 0x1a, 0x1b, 0x1a, 0x2a, 0x1f, 0x24, 0x13, 0x1a, 0x31, 0x3b, 0x33, 0x39, 0x23, 0x28, 0x31, 0x07, 0x31 + .byte 0x1f, 0x10, 0x20, 0x29, 0x17, 0x32, 0x26, 0x3b, 0x2d, 0x02, 0x3c, 0x1c, 0x0e, 0x00, 0x20, 0x14, 0x3e, 0x37, 0x01, 0x0f, 0x2d, 0x06, 0x12, 0x27, 0x30, 0x13, 0x19, 0x00, 0x33, 0x2a, 0x0c, 0x07 + .byte 0x27, 0x11, 0x3a, 0x1c, 0x15, 0x0a, 0x13, 0x1f, 0x0d, 0x2a, 0x37, 0x07, 0x2a, 0x34, 0x35, 0x34, 0x28, 0x16, 0x27, 0x06, 0x02, 0x36, 0x09, 0x23, 0x30, 0x14, 0x02, 0x28, 0x39, 0x32, 0x34, 0x24 + .byte 0x35, 0x12, 0x12, 0x22, 0x26, 0x09, 0x07, 0x33, 0x0f, 0x3e, 0x1e, 0x00, 0x3c, 0x33, 0x10, 0x37, 0x14, 0x3a, 0x03, 0x25, 0x2d, 0x1e, 0x24, 0x36, 0x36, 0x26, 0x1f, 0x3c, 0x1a, 0x37, 0x33, 0x25 + .byte 0x23, 0x13, 0x1f, 0x33, 0x0d, 0x13, 0x25, 0x30, 0x1e, 0x17, 0x03, 0x18, 0x18, 0x18, 0x14, 0x30, 0x07, 0x22, 0x3e, 0x33, 0x21, 0x14, 0x37, 0x16, 0x16, 0x00, 0x12, 0x2c, 0x12, 0x2f, 0x25, 0x3f + .byte 0x1e, 0x24, 0x19, 0x16, 0x16, 0x0f, 0x35, 0x2d, 0x10, 0x11, 0x24, 0x2a, 0x28, 0x19, 0x25, 0x2e, 0x0c, 0x16, 0x1f, 0x38, 0x21, 0x36, 0x3d, 0x1a, 0x2f, 0x3b, 0x32, 0x12, 0x36, 0x13, 0x29, 0x0e + .byte 0x30, 0x31, 0x19, 0x07, 0x2f, 0x25, 0x23, 0x28, 0x20, 0x08, 0x29, 0x2a, 0x00, 0x30, 0x30, 0x38, 0x23, 0x1e, 0x0f, 0x1f, 0x3b, 0x1b, 0x30, 0x3a, 0x37, 0x2f, 0x39, 0x37, 0x35, 0x39, 0x2d, 0x2f + .byte 0x1f, 0x2e, 0x1e, 0x1a, 0x2b, 0x1e, 0x14, 0x17, 0x20, 0x2f, 0x03, 0x11, 0x1d, 0x00, 0x30, 0x17, 0x2b, 0x1d, 0x35, 0x28, 0x25, 0x3b, 0x0f, 0x11, 0x09, 0x04, 0x2e, 0x23, 0x11, 0x1e, 0x13, 0x37 + .byte 0x1e, 0x37, 0x37, 0x1e, 0x07, 0x01, 0x32, 0x14, 0x06, 0x32, 0x11, 0x0c, 0x2e, 0x36, 0x2e, 0x24, 0x15, 0x2a, 0x1c, 0x22, 0x15, 0x34, 0x2c, 0x1e, 0x35, 0x22, 0x27, 0x33, 0x19, 0x3f, 0x2d, 0x21 + .byte 0x33, 0x15, 0x26, 0x1a, 0x11, 0x16, 0x3e, 0x12, 0x2b, 0x24, 0x15, 0x3c, 0x0f, 0x2d, 0x31, 0x15, 0x36, 0x3f, 0x24, 0x1d, 0x25, 0x01, 0x37, 0x33, 0x16, 0x1a, 0x1f, 0x0e, 0x10, 0x2f, 0x0b, 0x12 + .byte 0x2a, 0x1a, 0x25, 0x17, 0x0a, 0x35, 0x09, 0x28, 0x35, 0x02, 0x13, 0x36, 0x34, 0x2f, 0x17, 0x03, 0x04, 0x31, 0x3e, 0x26, 0x11, 0x35, 0x33, 0x31, 0x22, 0x17, 0x23, 0x1d, 0x05, 0x2b, 0x2e, 0x27 + .byte 0x20, 0x03, 0x2b, 0x1d, 0x01, 0x19, 0x1e, 0x0e, 0x05, 0x18, 0x16, 0x25, 0x17, 0x02, 0x28, 0x18, 0x19, 0x0b, 0x24, 0x3e, 0x35, 0x16, 0x2e, 0x29, 0x25, 0x3e, 0x38, 0x1e, 0x3a, 0x2f, 0x12, 0x14 + .byte 0x17, 0x2d, 0x11, 0x12, 0x30, 0x15, 0x31, 0x18, 0x08, 0x0b, 0x29, 0x2d, 0x00, 0x33, 0x2c, 0x06, 0x1a, 0x14, 0x1c, 0x2e, 0x04, 0x08, 0x12, 0x1b, 0x2b, 0x2d, 0x2a, 0x37, 0x33, 0x10, 0x27, 0x2c + .byte 0x1d, 0x0e, 0x34, 0x20, 0x02, 0x12, 0x1e, 0x1a, 0x2e, 0x07, 0x0b, 0x10, 0x36, 0x1e, 0x33, 0x2b, 0x28, 0x1b, 0x31, 0x25, 0x1f, 0x38, 0x3a, 0x2f, 0x39, 0x30, 0x2f, 0x12, 0x09, 0x14, 0x0e, 0x08 + .byte 0x19, 0x00, 0x0d, 0x2c, 0x1b, 0x0e, 0x34, 0x11, 0x25, 0x15, 0x0c, 0x2d, 0x26, 0x36, 0x2c, 0x16, 0x31, 0x31, 0x2c, 0x03, 0x1a, 0x16, 0x1c, 0x32, 0x14, 0x0a, 0x3e, 0x36, 0x33, 0x1b, 0x27, 0x1f + .byte 0x32, 0x18, 0x33, 0x26, 0x33, 0x1a, 0x13, 0x1a, 0x0f, 0x34, 0x1c, 0x35, 0x2c, 0x2f, 0x38, 0x03, 0x18, 0x15, 0x0f, 0x27, 0x31, 0x29, 0x20, 0x28, 0x0e, 0x28, 0x31, 0x2c, 0x2e, 0x15, 0x19, 0x1b + .byte 0x10, 0x03, 0x2f, 0x2e, 0x2a, 0x32, 0x2a, 0x27, 0x1b, 0x36, 0x04, 0x1e, 0x3b, 0x04, 0x21, 0x07, 0x2f, 0x19, 0x27, 0x1d, 0x1d, 0x3c, 0x3d, 0x2e, 0x25, 0x08, 0x32, 0x3b, 0x34, 0x2a, 0x0c, 0x10 + .byte 0x13, 0x25, 0x35, 0x1a, 0x2f, 0x19, 0x28, 0x17, 0x00, 0x2b, 0x0a, 0x1c, 0x17, 0x0a, 0x11, 0x1b, 0x35, 0x13, 0x37, 0x29, 0x1c, 0x28, 0x0c, 0x31, 0x35, 0x3c, 0x10, 0x1a, 0x1b, 0x3a, 0x2d, 0x3a + .byte 0x1c, 0x18, 0x22, 0x10, 0x2d, 0x1c, 0x3c, 0x12, 0x17, 0x18, 0x2a, 0x0b, 0x2b, 0x2f, 0x2d, 0x04, 0x2e, 0x3c, 0x13, 0x23, 0x01, 0x1c, 0x2e, 0x14, 0x16, 0x22, 0x0c, 0x24, 0x13, 0x35, 0x37, 0x34 + .byte 0x1b, 0x30, 0x1e, 0x3a, 0x1c, 0x20, 0x06, 0x06, 0x36, 0x09, 0x15, 0x1a, 0x1b, 0x1a, 0x27, 0x0f, 0x33, 0x35, 0x37, 0x06, 0x23, 0x3a, 0x12, 0x1d, 0x00, 0x16, 0x29, 0x0e, 0x1d, 0x35, 0x3f, 0x38 + .byte 0x16, 0x2a, 0x3c, 0x34, 0x13, 0x32, 0x10, 0x17, 0x2c, 0x37, 0x29, 0x2a, 0x1e, 0x35, 0x2f, 0x2d, 0x3c, 0x2a, 0x11, 0x28, 0x13, 0x21, 0x19, 0x1e, 0x34, 0x0c, 0x06, 0x2d, 0x09, 0x04, 0x1c, 0x1d + .byte 0x2f, 0x26, 0x39, 0x07, 0x16, 0x14, 0x04, 0x2d, 0x3a, 0x2f, 0x2e, 0x29, 0x15, 0x35, 0x24, 0x02, 0x36, 0x3f, 0x02, 0x1a, 0x0f, 0x18, 0x24, 0x16, 0x1d, 0x19, 0x14, 0x16, 0x10, 0x29, 0x1b, 0x13 + .byte 0x15, 0x0e, 0x19, 0x3a, 0x2e, 0x2b, 0x08, 0x30, 0x15, 0x35, 0x16, 0x30, 0x2e, 0x18, 0x35, 0x3b, 0x0b, 0x1c, 0x3a, 0x18, 0x13, 0x29, 0x13, 0x1e, 0x20, 0x13, 0x27, 0x04, 0x1d, 0x34, 0x00, 0x38 + .byte 0x19, 0x08, 0x39, 0x32, 0x20, 0x10, 0x26, 0x08, 0x02, 0x28, 0x3f, 0x0f, 0x16, 0x30, 0x1f, 0x19, 0x20, 0x2d, 0x10, 0x38, 0x17, 0x1c, 0x18, 0x31, 0x27, 0x33, 0x38, 0x30, 0x16, 0x33, 0x23, 0x00 + .byte 0x01, 0x36, 0x0d, 0x02, 0x23, 0x39, 0x04, 0x1f, 0x0e, 0x30, 0x24, 0x06, 0x01, 0x2c, 0x34, 0x33, 0x35, 0x16, 0x34, 0x2e, 0x32, 0x16, 0x24, 0x26, 0x39, 0x34, 0x1f, 0x3c, 0x1d, 0x28, 0x1d, 0x37 + .byte 0x17, 0x15, 0x2b, 0x27, 0x39, 0x30, 0x0b, 0x1b, 0x18, 0x35, 0x20, 0x2d, 0x0b, 0x35, 0x1c, 0x03, 0x0e, 0x21, 0x06, 0x0c, 0x20, 0x02, 0x18, 0x34, 0x1e, 0x36, 0x2d, 0x16, 0x0c, 0x19, 0x25, 0x09 + .byte 0x2c, 0x37, 0x05, 0x2e, 0x2e, 0x2b, 0x2c, 0x24, 0x1a, 0x14, 0x27, 0x04, 0x10, 0x32, 0x38, 0x33, 0x37, 0x15, 0x35, 0x11, 0x3f, 0x1d, 0x23, 0x23, 0x1f, 0x29, 0x3f, 0x1d, 0x1a, 0x3c, 0x2b, 0x1b + .byte 0x2c, 0x2c, 0x38, 0x3b, 0x36, 0x04, 0x13, 0x33, 0x2c, 0x14, 0x12, 0x1a, 0x09, 0x1b, 0x36, 0x11, 0x24, 0x3a, 0x3f, 0x11, 0x01, 0x0e, 0x2b, 0x3b, 0x03, 0x2a, 0x08, 0x0d, 0x2b, 0x2b, 0x13, 0x27 + .byte 0x3a, 0x3c, 0x1c, 0x3a, 0x15, 0x2a, 0x24, 0x00, 0x17, 0x3e, 0x0a, 0x15, 0x0c, 0x29, 0x2d, 0x1f, 0x15, 0x30, 0x35, 0x18, 0x19, 0x3d, 0x37, 0x37, 0x12, 0x38, 0x1b, 0x3b, 0x02, 0x20, 0x08, 0x21 + .byte 0x19, 0x2e, 0x36, 0x1d, 0x15, 0x3d, 0x24, 0x22, 0x0c, 0x27, 0x36, 0x3f, 0x33, 0x33, 0x12, 0x11, 0x1a, 0x19, 0x1f, 0x2b, 0x24, 0x12, 0x11, 0x2a, 0x18, 0x25, 0x32, 0x2a, 0x2c, 0x1a, 0x12, 0x26 + .byte 0x06, 0x10, 0x11, 0x29, 0x33, 0x2c, 0x09, 0x14, 0x2b, 0x12, 0x2b, 0x1d, 0x03, 0x24, 0x00, 0x12, 0x15, 0x22, 0x3d, 0x26, 0x15, 0x37, 0x1a, 0x0f, 0x12, 0x37, 0x24, 0x01, 0x18, 0x2a, 0x17, 0x13 + .byte 0x14, 0x3b, 0x29, 0x2a, 0x19, 0x32, 0x2d, 0x17, 0x17, 0x0b, 0x2c, 0x33, 0x07, 0x2d, 0x34, 0x07, 0x38, 0x1d, 0x1f, 0x36, 0x22, 0x11, 0x0a, 0x17, 0x14, 0x11, 0x13, 0x2a, 0x17, 0x25, 0x01, 0x3a + .byte 0x1c, 0x26, 0x27, 0x30, 0x2d, 0x3b, 0x35, 0x3a, 0x30, 0x34, 0x06, 0x3a, 0x1c, 0x2d, 0x05, 0x13, 0x21, 0x32, 0x12, 0x3e, 0x1e, 0x2c, 0x3a, 0x3f, 0x2d, 0x20, 0x2a, 0x34, 0x26, 0x03, 0x1a, 0x19 + .byte 0x27, 0x2e, 0x31, 0x04, 0x26, 0x2a, 0x3f, 0x30, 0x25, 0x23, 0x2a, 0x08, 0x08, 0x35, 0x2c, 0x30, 0x1e, 0x08, 0x05, 0x18, 0x06, 0x09, 0x2d, 0x19, 0x00, 0x27, 0x0d, 0x10, 0x19, 0x1c, 0x00, 0x13 + .byte 0x3d, 0x0b, 0x24, 0x2e, 0x1f, 0x16, 0x3d, 0x18, 0x34, 0x12, 0x1e, 0x15, 0x15, 0x39, 0x25, 0x33, 0x0f, 0x17, 0x1a, 0x1c, 0x1b, 0x37, 0x29, 0x1b, 0x3b, 0x38, 0x12, 0x1d, 0x22, 0x34, 0x26, 0x0a + .byte 0x31, 0x16, 0x2d, 0x13, 0x0d, 0x20, 0x27, 0x24, 0x1d, 0x16, 0x2e, 0x2b, 0x18, 0x16, 0x2a, 0x1b, 0x24, 0x17, 0x36, 0x02, 0x05, 0x2b, 0x37, 0x1a, 0x17, 0x11, 0x3d, 0x2c, 0x1e, 0x2f, 0x22, 0x2c + .byte 0x29, 0x1a, 0x2f, 0x04, 0x25, 0x36, 0x0c, 0x35, 0x30, 0x3e, 0x12, 0x11, 0x30, 0x37, 0x12, 0x21, 0x2e, 0x21, 0x30, 0x17, 0x2c, 0x3d, 0x24, 0x11, 0x23, 0x14, 0x1a, 0x32, 0x17, 0x39, 0x27, 0x18 + .byte 0x0f, 0x24, 0x19, 0x00, 0x3d, 0x37, 0x2c, 0x3c, 0x1c, 0x0b, 0x39, 0x23, 0x0e, 0x04, 0x1f, 0x1c, 0x31, 0x14, 0x00, 0x04, 0x15, 0x26, 0x2a, 0x2a, 0x20, 0x25, 0x2a, 0x0b, 0x3c, 0x33, 0x11, 0x0b + .byte 0x2e, 0x37, 0x22, 0x2e, 0x0e, 0x22, 0x26, 0x18, 0x2d, 0x27, 0x06, 0x0c, 0x1c, 0x26, 0x18, 0x2f, 0x3a, 0x01, 0x2a, 0x2f, 0x31, 0x34, 0x1f, 0x34, 0x1a, 0x31, 0x05, 0x10, 0x2e, 0x17, 0x34, 0x18 + .byte 0x22, 0x23, 0x23, 0x21, 0x32, 0x07, 0x08, 0x22, 0x26, 0x1c, 0x22, 0x31, 0x12, 0x2f, 0x08, 0x1f, 0x10, 0x27, 0x15, 0x2a, 0x1f, 0x0b, 0x26, 0x2f, 0x14, 0x35, 0x24, 0x1f, 0x26, 0x3b, 0x23, 0x33 + .byte 0x20, 0x3e, 0x2d, 0x17, 0x0c, 0x15, 0x13, 0x39, 0x1a, 0x30, 0x14, 0x25, 0x09, 0x07, 0x17, 0x38, 0x38, 0x1f, 0x29, 0x24, 0x27, 0x17, 0x27, 0x28, 0x1b, 0x12, 0x2a, 0x2b, 0x3d, 0x2d, 0x19, 0x34 + .byte 0x1c, 0x01, 0x1d, 0x10, 0x08, 0x39, 0x11, 0x0e, 0x36, 0x1b, 0x26, 0x13, 0x10, 0x16, 0x28, 0x1e, 0x3c, 0x28, 0x17, 0x3e, 0x39, 0x34, 0x0a, 0x03, 0x2e, 0x37, 0x1a, 0x13, 0x2b, 0x33, 0x26, 0x13 + .byte 0x2c, 0x21, 0x25, 0x14, 0x10, 0x16, 0x0b, 0x35, 0x1d, 0x35, 0x33, 0x21, 0x08, 0x33, 0x28, 0x21, 0x1a, 0x12, 0x0c, 0x1b, 0x36, 0x2a, 0x19, 0x2c, 0x2b, 0x23, 0x01, 0x0f, 0x26, 0x17, 0x0c, 0x18 + .byte 0x09, 0x0f, 0x11, 0x2b, 0x24, 0x1c, 0x09, 0x09, 0x15, 0x36, 0x08, 0x13, 0x20, 0x39, 0x21, 0x00, 0x3a, 0x1f, 0x2b, 0x36, 0x31, 0x02, 0x37, 0x13, 0x04, 0x34, 0x35, 0x37, 0x3d, 0x1a, 0x17, 0x3d + .byte 0x13, 0x2b, 0x36, 0x2f, 0x13, 0x1e, 0x13, 0x3e, 0x11, 0x33, 0x27, 0x3a, 0x2d, 0x1e, 0x31, 0x1a, 0x03, 0x03, 0x2d, 0x25, 0x37, 0x1f, 0x11, 0x01, 0x22, 0x1c, 0x12, 0x17, 0x30, 0x3a, 0x30, 0x17 + .byte 0x1d, 0x29, 0x0e, 0x13, 0x27, 0x1a, 0x2e, 0x24, 0x2d, 0x00, 0x1c, 0x17, 0x28, 0x1d, 0x09, 0x1f, 0x2e, 0x1a, 0x2d, 0x26, 0x0a, 0x13, 0x32, 0x3e, 0x00, 0x27, 0x0b, 0x3b, 0x30, 0x08, 0x3a, 0x2d + .byte 0x22, 0x12, 0x1e, 0x34, 0x1d, 0x2b, 0x26, 0x22, 0x35, 0x17, 0x2c, 0x17, 0x29, 0x13, 0x2d, 0x2d, 0x10, 0x10, 0x20, 0x31, 0x23, 0x1e, 0x33, 0x18, 0x33, 0x06, 0x2d, 0x26, 0x14, 0x27, 0x22, 0x1d + .byte 0x2a, 0x2d, 0x06, 0x18, 0x07, 0x09, 0x2e, 0x21, 0x15, 0x2e, 0x21, 0x38, 0x23, 0x35, 0x0b, 0x34, 0x24, 0x0b, 0x22, 0x1e, 0x01, 0x17, 0x0b, 0x24, 0x11, 0x17, 0x07, 0x20, 0x14, 0x25, 0x32, 0x1a + .byte 0x0e, 0x2f, 0x35, 0x17, 0x1f, 0x0c, 0x08, 0x21, 0x30, 0x35, 0x1f, 0x0c, 0x0b, 0x20, 0x04, 0x10, 0x11, 0x35, 0x11, 0x1e, 0x33, 0x3d, 0x16, 0x1e, 0x2b, 0x1d, 0x1a, 0x19, 0x10, 0x04, 0x06, 0x22 + .byte 0x03, 0x3d, 0x24, 0x2a, 0x0e, 0x35, 0x03, 0x3e, 0x17, 0x0b, 0x18, 0x36, 0x3d, 0x0d, 0x26, 0x35, 0x12, 0x20, 0x1f, 0x0d, 0x16, 0x23, 0x32, 0x1a, 0x00, 0x3d, 0x26, 0x30, 0x19, 0x36, 0x12, 0x0e + .byte 0x23, 0x01, 0x23, 0x28, 0x3b, 0x31, 0x11, 0x2d, 0x1c, 0x36, 0x2a, 0x05, 0x16, 0x14, 0x0e, 0x30, 0x3a, 0x37, 0x19, 0x1f, 0x30, 0x25, 0x10, 0x26, 0x2f, 0x22, 0x11, 0x1f, 0x2e, 0x2b, 0x1e, 0x16 + .byte 0x16, 0x21, 0x32, 0x18, 0x35, 0x23, 0x32, 0x1a, 0x3d, 0x0d, 0x19, 0x39, 0x09, 0x23, 0x30, 0x2e, 0x24, 0x1e, 0x0f, 0x24, 0x09, 0x21, 0x31, 0x05, 0x03, 0x11, 0x05, 0x22, 0x2a, 0x03, 0x07, 0x37 + .byte 0x04, 0x08, 0x13, 0x05, 0x10, 0x34, 0x37, 0x14, 0x29, 0x0a, 0x24, 0x32, 0x34, 0x1e, 0x1b, 0x12, 0x17, 0x2e, 0x01, 0x02, 0x13, 0x0a, 0x0c, 0x11, 0x02, 0x14, 0x13, 0x0d, 0x25, 0x23, 0x00, 0x07 + .byte 0x1a, 0x1c, 0x28, 0x35, 0x08, 0x0e, 0x2c, 0x1b, 0x3c, 0x15, 0x1c, 0x19, 0x1d, 0x32, 0x13, 0x1a, 0x1c, 0x00, 0x37, 0x22, 0x1b, 0x35, 0x39, 0x3e, 0x14, 0x32, 0x06, 0x31, 0x17, 0x05, 0x2b, 0x01 + .byte 0x0f, 0x20, 0x1e, 0x0f, 0x34, 0x18, 0x03, 0x1f, 0x2b, 0x00, 0x14, 0x15, 0x3a, 0x30, 0x25, 0x30, 0x21, 0x0b, 0x00, 0x37, 0x24, 0x37, 0x1d, 0x29, 0x21, 0x16, 0x24, 0x0f, 0x2c, 0x3e, 0x15, 0x36 + .byte 0x3c, 0x2d, 0x23, 0x3d, 0x3c, 0x17, 0x1a, 0x1c, 0x13, 0x0a, 0x29, 0x22, 0x25, 0x3f, 0x26, 0x3b, 0x39, 0x2f, 0x1d, 0x08, 0x16, 0x0b, 0x19, 0x14, 0x12, 0x01, 0x2c, 0x35, 0x11, 0x2a, 0x02, 0x00 + .byte 0x13, 0x39, 0x2a, 0x35, 0x07, 0x1a, 0x11, 0x24, 0x0e, 0x1e, 0x0e, 0x2c, 0x15, 0x08, 0x31, 0x1b, 0x21, 0x1d, 0x26, 0x1d, 0x1c, 0x2a, 0x1d, 0x24, 0x13, 0x01, 0x00, 0x18, 0x28, 0x2a, 0x37, 0x15 + .byte 0x0f, 0x13, 0x10, 0x32, 0x36, 0x22, 0x13, 0x31, 0x13, 0x05, 0x1e, 0x17, 0x35, 0x35, 0x3b, 0x0e, 0x24, 0x35, 0x3a, 0x1d, 0x1b, 0x36, 0x1b, 0x03, 0x1d, 0x24, 0x0f, 0x16, 0x30, 0x2d, 0x09, 0x25 + .byte 0x05, 0x21, 0x13, 0x0a, 0x27, 0x36, 0x04, 0x0d, 0x1c, 0x06, 0x3e, 0x21, 0x2a, 0x27, 0x33, 0x28, 0x0e, 0x15, 0x0b, 0x17, 0x1d, 0x1d, 0x32, 0x2d, 0x08, 0x3d, 0x29, 0x21, 0x32, 0x17, 0x33, 0x31 + .byte 0x22, 0x0e, 0x03, 0x21, 0x0d, 0x0b, 0x16, 0x3e, 0x2a, 0x2e, 0x19, 0x36, 0x2a, 0x0d, 0x00, 0x14, 0x22, 0x07, 0x36, 0x0a, 0x09, 0x15, 0x14, 0x10, 0x22, 0x07, 0x16, 0x2c, 0x36, 0x13, 0x15, 0x09 + .byte 0x2f, 0x1b, 0x20, 0x3b, 0x2e, 0x3a, 0x3a, 0x16, 0x0d, 0x15, 0x2a, 0x39, 0x13, 0x2b, 0x0b, 0x01, 0x2a, 0x13, 0x17, 0x1e, 0x08, 0x17, 0x1e, 0x0c, 0x0f, 0x34, 0x1f, 0x31, 0x12, 0x07, 0x3a, 0x1d + .byte 0x35, 0x1e, 0x12, 0x24, 0x2c, 0x15, 0x0e, 0x21, 0x19, 0x34, 0x3b, 0x33, 0x19, 0x0f, 0x28, 0x10, 0x2f, 0x2e, 0x23, 0x27, 0x31, 0x39, 0x2e, 0x18, 0x3c, 0x3f, 0x24, 0x07, 0x23, 0x30, 0x28, 0x13 + .byte 0x35, 0x13, 0x0a, 0x10, 0x35, 0x19, 0x33, 0x23, 0x28, 0x29, 0x13, 0x2f, 0x1a, 0x3a, 0x19, 0x14, 0x37, 0x36, 0x26, 0x20, 0x3b, 0x15, 0x37, 0x39, 0x10, 0x3c, 0x21, 0x34, 0x1c, 0x38, 0x30, 0x15 + .byte 0x07, 0x26, 0x27, 0x21, 0x19, 0x18, 0x11, 0x23, 0x30, 0x28, 0x37, 0x32, 0x2d, 0x1f, 0x2c, 0x3f, 0x30, 0x1d, 0x2f, 0x26, 0x01, 0x11, 0x1c, 0x3b, 0x0f, 0x12, 0x2a, 0x17, 0x27, 0x05, 0x00, 0x1b + .byte 0x25, 0x1c, 0x32, 0x04, 0x22, 0x2d, 0x10, 0x0f, 0x25, 0x0d, 0x39, 0x30, 0x0b, 0x2e, 0x27, 0x2d, 0x34, 0x15, 0x3e, 0x30, 0x36, 0x16, 0x26, 0x2a, 0x05, 0x3f, 0x2b, 0x20, 0x3b, 0x2e, 0x3b, 0x1c + .byte 0x2f, 0x01, 0x18, 0x16, 0x16, 0x3d, 0x10, 0x0a, 0x1f, 0x18, 0x17, 0x0f, 0x22, 0x06, 0x13, 0x11, 0x38, 0x21, 0x17, 0x17, 0x0a, 0x37, 0x1c, 0x19, 0x30, 0x16, 0x38, 0x31, 0x30, 0x10, 0x36, 0x31 + .byte 0x2f, 0x26, 0x3c, 0x1b, 0x23, 0x33, 0x2f, 0x19, 0x16, 0x35, 0x25, 0x3a, 0x18, 0x1f, 0x37, 0x01, 0x1e, 0x0d, 0x18, 0x12, 0x1f, 0x1c, 0x1b, 0x07, 0x34, 0x2d, 0x0b, 0x3f, 0x33, 0x1e, 0x34, 0x1d + .byte 0x2c, 0x13, 0x2c, 0x20, 0x20, 0x13, 0x20, 0x0f, 0x31, 0x08, 0x0f, 0x24, 0x18, 0x3d, 0x1c, 0x36, 0x34, 0x27, 0x33, 0x2a, 0x25, 0x2d, 0x30, 0x26, 0x3d, 0x37, 0x26, 0x25, 0x11, 0x11, 0x03, 0x05 + .byte 0x18, 0x10, 0x04, 0x29, 0x07, 0x2e, 0x36, 0x2a, 0x29, 0x15, 0x3a, 0x0e, 0x33, 0x2a, 0x06, 0x29, 0x3d, 0x01, 0x29, 0x27, 0x0e, 0x16, 0x1d, 0x28, 0x1b, 0x10, 0x33, 0x2b, 0x0c, 0x14, 0x1d, 0x15 + .byte 0x3f, 0x25, 0x37, 0x23, 0x1e, 0x04, 0x2c, 0x1c, 0x15, 0x34, 0x2a, 0x09, 0x2f, 0x15, 0x02, 0x3f, 0x14, 0x19, 0x2c, 0x33, 0x39, 0x32, 0x20, 0x2a, 0x18, 0x32, 0x17, 0x23, 0x21, 0x0b, 0x2d, 0x25 + .byte 0x24, 0x3a, 0x2d, 0x31, 0x3f, 0x34, 0x18, 0x19, 0x24, 0x1e, 0x15, 0x1a, 0x17, 0x33, 0x2b, 0x23, 0x09, 0x26, 0x1b, 0x0d, 0x15, 0x36, 0x26, 0x28, 0x3a, 0x1c, 0x14, 0x0c, 0x3e, 0x10, 0x18, 0x06 + .byte 0x35, 0x37, 0x26, 0x36, 0x21, 0x26, 0x17, 0x3d, 0x1c, 0x2c, 0x16, 0x25, 0x1d, 0x1e, 0x0b, 0x1e, 0x1d, 0x0d, 0x32, 0x08, 0x1f, 0x1b, 0x12, 0x1c, 0x12, 0x20, 0x2a, 0x28, 0x06, 0x3b, 0x35, 0x39 + .byte 0x0e, 0x1e, 0x31, 0x30, 0x28, 0x02, 0x21, 0x14, 0x06, 0x1e, 0x29, 0x16, 0x09, 0x1c, 0x27, 0x32, 0x2d, 0x39, 0x03, 0x27, 0x29, 0x09, 0x1e, 0x1b, 0x11, 0x1c, 0x28, 0x3a, 0x2c, 0x03, 0x03, 0x18 + .byte 0x23, 0x09, 0x2f, 0x30, 0x17, 0x23, 0x0f, 0x25, 0x33, 0x06, 0x24, 0x37, 0x22, 0x09, 0x33, 0x2c, 0x09, 0x2a, 0x0c, 0x12, 0x2a, 0x28, 0x20, 0x10, 0x15, 0x29, 0x33, 0x0f, 0x1a, 0x13, 0x13, 0x18 + .byte 0x36, 0x2e, 0x16, 0x13, 0x3c, 0x1a, 0x15, 0x3a, 0x11, 0x32, 0x02, 0x0a, 0x2c, 0x19, 0x39, 0x11, 0x31, 0x3e, 0x1d, 0x32, 0x14, 0x32, 0x12, 0x2e, 0x34, 0x3e, 0x36, 0x23, 0x37, 0x3e, 0x15, 0x15 + .byte 0x35, 0x34, 0x01, 0x3a, 0x2c, 0x26, 0x25, 0x22, 0x01, 0x2b, 0x37, 0x1c, 0x3d, 0x33, 0x3e, 0x10, 0x1c, 0x26, 0x33, 0x19, 0x05, 0x19, 0x17, 0x12, 0x38, 0x1c, 0x15, 0x3c, 0x32, 0x3f, 0x0f, 0x37 + .byte 0x02, 0x39, 0x32, 0x13, 0x00, 0x1d, 0x1d, 0x2c, 0x10, 0x39, 0x13, 0x31, 0x0f, 0x37, 0x19, 0x09, 0x0d, 0x2a, 0x20, 0x2f, 0x32, 0x3b, 0x34, 0x22, 0x26, 0x14, 0x10, 0x24, 0x3d, 0x22, 0x0b, 0x31 + .byte 0x23, 0x2f, 0x2d, 0x2a, 0x30, 0x04, 0x35, 0x19, 0x20, 0x2a, 0x16, 0x36, 0x37, 0x14, 0x28, 0x37, 0x11, 0x0b, 0x27, 0x1d, 0x06, 0x29, 0x35, 0x16, 0x2e, 0x24, 0x2e, 0x29, 0x36, 0x14, 0x2a, 0x21 + .byte 0x0c, 0x1f, 0x3f, 0x39, 0x19, 0x27, 0x10, 0x2a, 0x1e, 0x12, 0x34, 0x10, 0x24, 0x34, 0x1d, 0x13, 0x1d, 0x17, 0x16, 0x37, 0x27, 0x1b, 0x27, 0x07, 0x24, 0x21, 0x37, 0x21, 0x11, 0x37, 0x28, 0x24 + .byte 0x19, 0x02, 0x1c, 0x14, 0x12, 0x1d, 0x1b, 0x24, 0x2e, 0x2e, 0x3a, 0x15, 0x37, 0x34, 0x21, 0x33, 0x2d, 0x29, 0x2f, 0x1e, 0x34, 0x29, 0x3c, 0x12, 0x05, 0x15, 0x20, 0x05, 0x3e, 0x19, 0x18, 0x0b + .byte 0x30, 0x2f, 0x02, 0x27, 0x14, 0x1c, 0x34, 0x12, 0x20, 0x30, 0x2b, 0x22, 0x1b, 0x06, 0x31, 0x28, 0x15, 0x2d, 0x12, 0x01, 0x0e, 0x13, 0x13, 0x0c, 0x28, 0x07, 0x2a, 0x14, 0x1d, 0x36, 0x14, 0x15 + .byte 0x2b, 0x26, 0x03, 0x25, 0x15, 0x3e, 0x3b, 0x20, 0x35, 0x0c, 0x25, 0x2b, 0x16, 0x35, 0x1e, 0x31, 0x2c, 0x06, 0x03, 0x29, 0x24, 0x07, 0x1f, 0x32, 0x2f, 0x19, 0x25, 0x21, 0x31, 0x22, 0x26, 0x1d + .byte 0x00, 0x1b, 0x18, 0x2a, 0x24, 0x31, 0x20, 0x06, 0x2f, 0x1e, 0x32, 0x26, 0x32, 0x39, 0x12, 0x20, 0x01, 0x19, 0x0f, 0x15, 0x15, 0x27, 0x10, 0x2e, 0x09, 0x25, 0x19, 0x29, 0x37, 0x30, 0x13, 0x1c + .byte 0x1d, 0x29, 0x2d, 0x26, 0x02, 0x1a, 0x16, 0x1d, 0x2b, 0x1c, 0x18, 0x04, 0x34, 0x28, 0x2a, 0x21, 0x15, 0x1b, 0x2e, 0x16, 0x01, 0x10, 0x05, 0x09, 0x14, 0x22, 0x03, 0x22, 0x02, 0x1b, 0x34, 0x29 + .byte 0x2a, 0x23, 0x26, 0x36, 0x13, 0x23, 0x3d, 0x1a, 0x1d, 0x10, 0x24, 0x25, 0x2b, 0x37, 0x19, 0x24, 0x26, 0x28, 0x13, 0x16, 0x17, 0x14, 0x19, 0x0b, 0x2f, 0x25, 0x37, 0x34, 0x37, 0x39, 0x21, 0x1b + .byte 0x0f, 0x3d, 0x2d, 0x0d, 0x10, 0x20, 0x05, 0x0b, 0x2d, 0x01, 0x12, 0x24, 0x18, 0x3d, 0x32, 0x09, 0x21, 0x26, 0x1a, 0x0e, 0x1f, 0x30, 0x06, 0x1f, 0x0b, 0x3c, 0x29, 0x07, 0x3e, 0x27, 0x13, 0x1e + .byte 0x1a, 0x13, 0x07, 0x23, 0x10, 0x34, 0x1e, 0x32, 0x17, 0x23, 0x35, 0x16, 0x31, 0x32, 0x2e, 0x1b, 0x28, 0x0e, 0x22, 0x14, 0x3a, 0x23, 0x22, 0x03, 0x29, 0x2a, 0x10, 0x20, 0x3e, 0x3c, 0x27, 0x16 + .byte 0x20, 0x12, 0x3f, 0x24, 0x31, 0x0d, 0x2e, 0x32, 0x2f, 0x17, 0x2d, 0x36, 0x3b, 0x17, 0x24, 0x23, 0x18, 0x37, 0x1d, 0x13, 0x17, 0x3a, 0x1a, 0x0a, 0x3d, 0x1e, 0x05, 0x12, 0x16, 0x33, 0x32, 0x25 + .byte 0x1d, 0x1f, 0x29, 0x34, 0x2c, 0x26, 0x20, 0x29, 0x35, 0x0e, 0x32, 0x17, 0x01, 0x39, 0x2d, 0x27, 0x24, 0x23, 0x28, 0x3f, 0x18, 0x39, 0x38, 0x25, 0x23, 0x11, 0x11, 0x19, 0x2c, 0x29, 0x30, 0x08 + .byte 0x28, 0x25, 0x27, 0x1d, 0x17, 0x25, 0x21, 0x09, 0x3d, 0x16, 0x1b, 0x0f, 0x2c, 0x1b, 0x12, 0x22, 0x28, 0x3e, 0x26, 0x34, 0x10, 0x1b, 0x02, 0x34, 0x15, 0x1a, 0x29, 0x19, 0x29, 0x11, 0x31, 0x12 + .byte 0x27, 0x17, 0x27, 0x27, 0x2f, 0x34, 0x27, 0x24, 0x03, 0x19, 0x36, 0x17, 0x1d, 0x33, 0x19, 0x25, 0x1a, 0x2b, 0x39, 0x13, 0x3b, 0x33, 0x1d, 0x27, 0x31, 0x34, 0x28, 0x33, 0x37, 0x09, 0x30, 0x1b + .byte 0x03, 0x3a, 0x27, 0x19, 0x11, 0x1f, 0x0b, 0x1a, 0x34, 0x3d, 0x2a, 0x15, 0x04, 0x24, 0x36, 0x30, 0x23, 0x30, 0x0f, 0x22, 0x1b, 0x3d, 0x3d, 0x24, 0x29, 0x1d, 0x12, 0x16, 0x19, 0x2e, 0x03, 0x12 + .byte 0x17, 0x18, 0x25, 0x33, 0x2f, 0x23, 0x1a, 0x1a, 0x35, 0x27, 0x21, 0x26, 0x19, 0x1b, 0x30, 0x18, 0x2b, 0x22, 0x2d, 0x2c, 0x1a, 0x34, 0x3e, 0x12, 0x19, 0x28, 0x27, 0x15, 0x1b, 0x11, 0x12, 0x17 + .byte 0x15, 0x10, 0x34, 0x37, 0x25, 0x12, 0x3f, 0x15, 0x31, 0x0d, 0x37, 0x3e, 0x2a, 0x2d, 0x0f, 0x24, 0x24, 0x3c, 0x3f, 0x1f, 0x1d, 0x34, 0x17, 0x1a, 0x23, 0x1f, 0x37, 0x0f, 0x10, 0x32, 0x34, 0x35 + .byte 0x19, 0x05, 0x22, 0x33, 0x16, 0x34, 0x1e, 0x14, 0x1e, 0x08, 0x13, 0x29, 0x3a, 0x37, 0x30, 0x1d, 0x36, 0x15, 0x29, 0x2e, 0x1d, 0x32, 0x2e, 0x23, 0x35, 0x17, 0x1c, 0x36, 0x1d, 0x13, 0x23, 0x34 + .byte 0x34, 0x24, 0x1a, 0x37, 0x2f, 0x26, 0x2e, 0x1e, 0x17, 0x1a, 0x1f, 0x15, 0x1f, 0x2b, 0x1f, 0x19, 0x0a, 0x33, 0x1a, 0x35, 0x31, 0x24, 0x2d, 0x17, 0x2c, 0x0c, 0x21, 0x36, 0x2c, 0x35, 0x35, 0x1b + .byte 0x03, 0x27, 0x01, 0x0d, 0x1d, 0x1c, 0x0e, 0x11, 0x11, 0x2b, 0x10, 0x25, 0x3b, 0x20, 0x1f, 0x17, 0x19, 0x20, 0x08, 0x36, 0x13, 0x38, 0x19, 0x1b, 0x2b, 0x24, 0x0b, 0x1f, 0x29, 0x27, 0x15, 0x2c + .byte 0x37, 0x39, 0x10, 0x3a, 0x15, 0x2e, 0x2f, 0x11, 0x36, 0x24, 0x04, 0x20, 0x3b, 0x2a, 0x35, 0x27, 0x35, 0x34, 0x0d, 0x1b, 0x20, 0x10, 0x22, 0x37, 0x1f, 0x38, 0x27, 0x31, 0x0f, 0x28, 0x28, 0x25 + .byte 0x15, 0x00, 0x1d, 0x25, 0x31, 0x28, 0x28, 0x0b, 0x3a, 0x1d, 0x2d, 0x13, 0x1b, 0x03, 0x37, 0x2e, 0x1d, 0x28, 0x19, 0x08, 0x2d, 0x22, 0x27, 0x39, 0x32, 0x3f, 0x2f, 0x1d, 0x33, 0x34, 0x28, 0x18 + .byte 0x08, 0x31, 0x23, 0x1f, 0x13, 0x0d, 0x2c, 0x23, 0x3a, 0x2d, 0x1a, 0x02, 0x25, 0x13, 0x20, 0x36, 0x34, 0x12, 0x2b, 0x2d, 0x35, 0x35, 0x34, 0x23, 0x20, 0x21, 0x3a, 0x19, 0x1b, 0x1f, 0x2b, 0x19 + .byte 0x35, 0x0e, 0x19, 0x26, 0x24, 0x37, 0x18, 0x08, 0x10, 0x0c, 0x16, 0x2d, 0x1f, 0x34, 0x21, 0x05, 0x38, 0x19, 0x14, 0x21, 0x24, 0x11, 0x31, 0x14, 0x3e, 0x38, 0x29, 0x3f, 0x08, 0x25, 0x2a, 0x1f + .byte 0x25, 0x25, 0x06, 0x28, 0x0b, 0x1e, 0x14, 0x1a, 0x38, 0x22, 0x24, 0x18, 0x29, 0x1a, 0x11, 0x20, 0x3b, 0x3a, 0x1e, 0x1c, 0x26, 0x1a, 0x05, 0x32, 0x19, 0x39, 0x2a, 0x31, 0x09, 0x07, 0x25, 0x05 + .byte 0x3e, 0x16, 0x34, 0x26, 0x14, 0x1b, 0x32, 0x26, 0x05, 0x08, 0x37, 0x0f, 0x03, 0x20, 0x2a, 0x39, 0x31, 0x08, 0x01, 0x1e, 0x1d, 0x23, 0x31, 0x28, 0x1b, 0x28, 0x1e, 0x37, 0x14, 0x13, 0x0e, 0x28 + .byte 0x2a, 0x3b, 0x37, 0x2f, 0x1c, 0x28, 0x30, 0x30, 0x1a, 0x36, 0x1f, 0x16, 0x3e, 0x0d, 0x15, 0x2e, 0x16, 0x18, 0x15, 0x37, 0x20, 0x2a, 0x33, 0x30, 0x2b, 0x0e, 0x25, 0x18, 0x20, 0x16, 0x02, 0x19 + .byte 0x25, 0x0a, 0x2e, 0x30, 0x16, 0x03, 0x11, 0x04, 0x27, 0x25, 0x1b, 0x1c, 0x21, 0x29, 0x04, 0x27, 0x3d, 0x20, 0x1e, 0x28, 0x33, 0x31, 0x1e, 0x39, 0x10, 0x31, 0x29, 0x1e, 0x06, 0x25, 0x28, 0x19 + .byte 0x3b, 0x12, 0x0b, 0x1b, 0x1c, 0x3e, 0x37, 0x20, 0x0a, 0x37, 0x33, 0x02, 0x2c, 0x25, 0x15, 0x18, 0x14, 0x3b, 0x20, 0x1c, 0x22, 0x3b, 0x1c, 0x24, 0x34, 0x35, 0x0f, 0x2f, 0x31, 0x3b, 0x17, 0x35 + .byte 0x30, 0x39, 0x37, 0x0d, 0x15, 0x11, 0x10, 0x03, 0x1e, 0x1a, 0x39, 0x33, 0x2f, 0x2e, 0x28, 0x1c, 0x28, 0x36, 0x28, 0x18, 0x1f, 0x15, 0x01, 0x30, 0x3e, 0x32, 0x28, 0x34, 0x2f, 0x23, 0x07, 0x0c + .byte 0x36, 0x28, 0x2c, 0x34, 0x2a, 0x0c, 0x1f, 0x3f, 0x20, 0x13, 0x2b, 0x17, 0x27, 0x28, 0x29, 0x2a, 0x3c, 0x13, 0x36, 0x26, 0x2d, 0x2a, 0x0a, 0x06, 0x1e, 0x20, 0x04, 0x1a, 0x02, 0x07, 0x35, 0x0e + .byte 0x18, 0x30, 0x00, 0x34, 0x34, 0x2f, 0x14, 0x37, 0x21, 0x30, 0x1f, 0x15, 0x37, 0x1b, 0x3a, 0x0b, 0x32, 0x22, 0x22, 0x21, 0x1b, 0x35, 0x23, 0x0d, 0x03, 0x1c, 0x23, 0x3b, 0x13, 0x0e, 0x1d, 0x1f + .byte 0x1d, 0x3f, 0x2e, 0x39, 0x27, 0x2e, 0x0f, 0x38, 0x20, 0x31, 0x3c, 0x35, 0x0b, 0x0f, 0x2e, 0x06, 0x06, 0x28, 0x25, 0x39, 0x23, 0x0a, 0x32, 0x15, 0x0f, 0x1d, 0x25, 0x0c, 0x0d, 0x34, 0x12, 0x2e + .byte 0x21, 0x36, 0x18, 0x1f, 0x1f, 0x34, 0x1b, 0x05, 0x3a, 0x36, 0x2b, 0x01, 0x17, 0x0e, 0x16, 0x2b, 0x0e, 0x0b, 0x26, 0x0d, 0x2d, 0x10, 0x21, 0x11, 0x27, 0x3d, 0x13, 0x32, 0x15, 0x25, 0x2a, 0x1b + .byte 0x2d, 0x35, 0x2c, 0x2b, 0x26, 0x26, 0x1f, 0x20, 0x22, 0x2b, 0x12, 0x3f, 0x3d, 0x27, 0x30, 0x0a, 0x36, 0x35, 0x1f, 0x17, 0x21, 0x08, 0x29, 0x1d, 0x20, 0x33, 0x34, 0x11, 0x16, 0x05, 0x38, 0x2d + diff --git a/data/data2b.s b/data/data2b.s index 6051b86cc..74e13cc7f 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -4750,74 +4750,74 @@ gUnknown_0831ABA0:: @ 831ABA0 .align 2 gBattleTerrainTable:: @ 831ABA8 @ tall_grass - .4byte gUnknown_08D77D68 - .4byte gUnknown_08D78350 - .4byte gUnknown_08D7E280 - .4byte gUnknown_08D7E808 - .4byte gUnknown_08D78318 + .4byte gBattleTerrainTiles_TallGrass + .4byte gBattleTerrainTilemap_TallGrass + .4byte gBattleTerrainAnimTiles_TallGrass + .4byte gBattleTerrainAnimTilemap_TallGrass + .4byte gBattleTerrainPalette_TallGrass @ long_grass - .4byte gUnknown_08D78600 - .4byte gUnknown_08D78CB8 - .4byte gUnknown_08D7E9C4 - .4byte gUnknown_08D7F0D4 - .4byte gUnknown_08D78C78 + .4byte gBattleTerrainTiles_LongGrass + .4byte gBattleTerrainTilemap_LongGrass + .4byte gBattleTerrainAnimTiles_LongGrass + .4byte gBattleTerrainAnimTilemap_LongGrass + .4byte gBattleTerrainPalette_LongGrass @ sand - .4byte gUnknown_08D78F68 - .4byte gUnknown_08D795A8 - .4byte gUnknown_08D7F30C - .4byte gUnknown_08D7F850 - .4byte gUnknown_08D79560 + .4byte gBattleTerrainTiles_Sand + .4byte gBattleTerrainTilemap_Sand + .4byte gBattleTerrainAnimTiles_Sand + .4byte gBattleTerrainAnimTilemap_Sand + .4byte gBattleTerrainPalette_Sand @ underwater - .4byte gUnknown_08D79858 - .4byte gUnknown_08D79E58 - .4byte gUnknown_08D7F9F8 - .4byte gUnknown_08D7FEC4 - .4byte gUnknown_08D79E10 + .4byte gBattleTerrainTiles_Underwater + .4byte gBattleTerrainTilemap_Underwater + .4byte gBattleTerrainAnimTiles_Underwater + .4byte gBattleTerrainAnimTilemap_Underwater + .4byte gBattleTerrainPalette_Underwater @ water - .4byte gUnknown_08D7A108 - .4byte gUnknown_08D7A720 - .4byte gUnknown_08D80054 - .4byte gUnknown_08D80660 - .4byte gUnknown_08D7A6DC + .4byte gBattleTerrainTiles_Water + .4byte gBattleTerrainTilemap_Water + .4byte gBattleTerrainAnimTiles_Water + .4byte gBattleTerrainAnimTilemap_Water + .4byte gBattleTerrainPalette_Water @ pond_water - .4byte gUnknown_08D7A9D0 - .4byte gUnknown_08D7AFB8 - .4byte gUnknown_08D80804 - .4byte gUnknown_08D80D50 - .4byte gUnknown_08D7AF78 + .4byte gBattleTerrainTiles_PondWater + .4byte gBattleTerrainTilemap_PondWater + .4byte gBattleTerrainAnimTiles_PondWater + .4byte gBattleTerrainAnimTilemap_PondWater + .4byte gBattleTerrainPalette_PondWater @ rock - .4byte gUnknown_08D7B268 - .4byte gUnknown_08D7B864 - .4byte gUnknown_08D80E9C - .4byte gUnknown_08D8147C - .4byte gUnknown_08D7B828 + .4byte gBattleTerrainTiles_Rock + .4byte gBattleTerrainTilemap_Rock + .4byte gBattleTerrainAnimTiles_Rock + .4byte gBattleTerrainAnimTilemap_Rock + .4byte gBattleTerrainPalette_Rock @ cave - .4byte gUnknown_08D7BB14 - .4byte gUnknown_08D7C154 - .4byte gUnknown_08D81610 - .4byte gUnknown_08D81E2C - .4byte gUnknown_08D7C10C + .4byte gBattleTerrainTiles_Cave + .4byte gBattleTerrainTilemap_Cave + .4byte gBattleTerrainAnimTiles_Cave + .4byte gBattleTerrainAnimTilemap_Cave + .4byte gBattleTerrainPalette_Cave @ building - .4byte gUnknown_08D7C440 - .4byte gUnknown_08D7CA28 - .4byte gUnknown_08D820D4 - .4byte gUnknown_08D824E4 - .4byte gUnknown_08D7DEB4 + .4byte gBattleTerrainTiles_Building + .4byte gBattleTerrainTilemap_Building + .4byte gBattleTerrainAnimTiles_Building + .4byte gBattleTerrainAnimTilemap_Building + .4byte gBattleTerrainPalette_Building @ plain - .4byte gUnknown_08D7C440 - .4byte gUnknown_08D7CA28 - .4byte gUnknown_08D820D4 - .4byte gUnknown_08D824E4 - .4byte gUnknown_08D7C404 + .4byte gBattleTerrainTiles_Building + .4byte gBattleTerrainTilemap_Building + .4byte gBattleTerrainAnimTiles_Building + .4byte gBattleTerrainAnimTilemap_Building + .4byte gBattleTerrainPalette_Plain .align 2 gUnknown_0831AC70:: @ 831AC70 diff --git a/data/data4c.s b/data/data4d.s index b86cd2add..57dc8befc 100644 --- a/data/data4c.s +++ b/data/data4d.s @@ -5,93 +5,6 @@ .section .rodata -gUnknown_085B21D4:: @ 85B21D4 - .incbin "baserom.gba", 0x5b21d4, 0x8 - -gUnknown_085B21DC:: @ 85B21DC - .incbin "baserom.gba", 0x5b21dc, 0x18 - -gUnknown_085B21F4:: @ 85B21F4 - .incbin "baserom.gba", 0x5b21f4, 0x8 - -gUnknown_085B21FC:: @ 85B21FC - .incbin "baserom.gba", 0x5b21fc, 0xc - -gUnknown_085B2208:: @ 85B2208 - .incbin "baserom.gba", 0x5b2208, 0x10 - -gUnknown_085B2218:: @ 85B2218 - .incbin "baserom.gba", 0x5b2218, 0x38 - -gUnknown_085B2250:: @ 85B2250 - .incbin "baserom.gba", 0x5b2250, 0x18 - -gUnknown_085B2268:: @ 85B2268 - .incbin "baserom.gba", 0x5b2268, 0x38 - -gUnknown_085B22A0:: @ 85B22A0 - .incbin "baserom.gba", 0x5b22a0, 0x18 - -gUnknown_085B22B8:: @ 85B22B8 - .incbin "baserom.gba", 0x5b22b8, 0x18 - -gUnknown_085B22D0:: @ 85B22D0 - .incbin "baserom.gba", 0x5b22d0, 0x2d0 - -gPokeblockFlavorCompatibilityTable:: @ 85B25A0 - .incbin "baserom.gba", 0x5b25a0, 0x80 - -gUnknown_085B2620:: @ 85B2620 - .incbin "baserom.gba", 0x5b2620, 0xc - -gPokeblockNames:: @ 85B262C - .incbin "baserom.gba", 0x5b262c, 0x3c - -gUnknown_085B2668:: @ 85B2668 - .incbin "baserom.gba", 0x5b2668, 0x30 - -gUnknown_085B2698:: @ 85B2698 - .incbin "baserom.gba", 0x5b2698, 0x3 - -gUnknown_085B269B:: @ 85B269B - .incbin "baserom.gba", 0x5b269b, 0x2 - -gUnknown_085B269D:: @ 85B269D - .incbin "baserom.gba", 0x5b269d, 0x2 - -gUnknown_085B269F:: @ 85B269F - .incbin "baserom.gba", 0x5b269f, 0x5 - -gUnknown_085B26A4:: @ 85B26A4 - .incbin "baserom.gba", 0x5b26a4, 0x4c - -gUnknown_085B26F0:: @ 85B26F0 - .incbin "baserom.gba", 0x5b26f0, 0x4 - -gUnknown_085B26F4:: @ 85B26F4 - .incbin "baserom.gba", 0x5b26f4, 0x8 - -gUnknown_085B26FC:: @ 85B26FC - .incbin "baserom.gba", 0x5b26fc, 0x8 - -gUnknown_085B2704:: @ 85B2704 - .incbin "baserom.gba", 0x5b2704, 0x18 - -gUnknown_085B271C:: @ 85B271C - .incbin "baserom.gba", 0x5b271c, 0x4 - -gUnknown_085B2720:: @ 85B2720 - .incbin "baserom.gba", 0x5b2720, 0x28 - -gUnknown_085B2748:: @ 85B2748 - .incbin "baserom.gba", 0x5b2748, 0x60 - -gUnknown_085B27A8:: @ 85B27A8 - .incbin "baserom.gba", 0x5b27a8, 0x8 - -gUnknown_085B27B0:: @ 85B27B0 - .incbin "baserom.gba", 0x5b27b0, 0x18 - gUnknown_085B27C8:: @ 85B27C8 .incbin "baserom.gba", 0x5b27c8, 0x88 @@ -830,4 +743,3 @@ gUnknown_085C9A30:: @ 85C9A30 gUnknown_085C9A53:: @ 85C9A53 .incbin "baserom.gba", 0x5c9a53, 0x41 - diff --git a/data/easy_chat.s b/data/easy_chat.s index a1a5e0c4a..3894cc13d 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -14,13 +14,42 @@ gUnknown_08597550:: @ 8597550 .incbin "baserom.gba", 0x597550, 0x1f8 gUnknown_08597748:: @ 8597748 - .incbin "baserom.gba", 0x597748, 0x1c + .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a gUnknown_08597764:: @ 8597764 - .incbin "baserom.gba", 0x597764, 0x8 + .2byte 0x0209, 0x140b, 0x1030, 0x102a gUnknown_0859776C:: @ 859776C - .incbin "baserom.gba", 0x59776c, 0x3a8 + .2byte 0x1240, 0x0628, 0x061f, 0x2204, 0x1422, 0x0197, 0x0415, 0x0198, 0x2207, 0x0449, 0x4bff, 0x4b1f, 0x2e3d, 0x1577, 0x6b5f, 0x5ade + .2byte 0x4218, 0x0000, 0x0000, 0x0000, 0x0000, 0x18c5, 0x318c, 0x5af6, 0x6f5b, 0x7fff, 0xccc0, 0x0000, 0xddc0, 0x000c, 0xddc0, 0x00cd + .2byte 0xddc0, 0x0cdd, 0xddc0, 0x0cdd, 0xddc0, 0x00cd, 0xddc0, 0x000c, 0xccc0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + .2byte 0x0000, 0x0000, 0x0000, 0xc000, 0x0000, 0x6c00, 0x0000, 0x66c0, 0x0000, 0x666c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + .2byte 0x0000, 0x0000, 0x000c, 0x0000, 0x00c6, 0x0000, 0x0c66, 0x0000, 0xc666, 0x0000, 0xc000, 0x6666, 0xc000, 0x6666, 0xc000, 0x6666 + .2byte 0xc000, 0xcccc, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6666, 0x000c, 0x6666, 0x000c, 0x6666, 0x000c + .2byte 0xcccc, 0x000c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + .2byte 0x0000, 0x0000, 0x0000, 0xc000, 0x0000, 0x6c00, 0x0000, 0x66c0, 0x0000, 0x666c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + .2byte 0x0000, 0x0000, 0x000c, 0x0000, 0x00c6, 0x0000, 0x0c66, 0x0000, 0xc666, 0x0000, 0xc000, 0x6666, 0xc000, 0x6666, 0xc000, 0x6666 + .2byte 0xc000, 0xcccc, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6666, 0x000c, 0x6666, 0x000c, 0x6666, 0x000c + .2byte 0xcccc, 0x000c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x99c0, 0x9999, 0xf99c, 0xff9f, 0xf99c, 0xf999 + .2byte 0xf99c, 0xf99f, 0x999c, 0xf99f, 0xf99c, 0xf99f, 0x99c0, 0x9999, 0xcc00, 0xcccc, 0x9999, 0x9999, 0xff9f, 0xff9f, 0x9f99, 0x9f9f + .2byte 0xff99, 0xff9f, 0x9f99, 0x9f9f, 0x9f99, 0x9f9f, 0x9999, 0x9999, 0xcccc, 0xcccc, 0x9999, 0x9999, 0xff9f, 0x999f, 0xf99f, 0x9999 + .2byte 0xf999, 0x9999, 0xf99f, 0xf999, 0xf99f, 0x9999, 0x9999, 0x9999, 0xcccc, 0xcccc, 0x9999, 0x0c99, 0x9999, 0xc999, 0x9ff9, 0xc999 + .2byte 0xffff, 0xc999, 0xffff, 0xc99f, 0x9999, 0xc999, 0x9999, 0xcc99, 0xcccc, 0x0ccc, 0x99c0, 0x9999, 0xf99c, 0xff9f, 0xf99c, 0x9f99 + .2byte 0xf99c, 0xff9f, 0x999c, 0x9f9f, 0xf99c, 0xff9f, 0x99c0, 0x9999, 0xcc00, 0xcccc, 0x9999, 0x9999, 0x99f9, 0xf9ff, 0x99f9, 0xf99f + .2byte 0x99f9, 0xf9ff, 0x99f9, 0xf99f, 0x9ff9, 0xf9ff, 0x9999, 0x9999, 0xcccc, 0xcccc, 0x9999, 0x9999, 0xff9f, 0x999f, 0xf999, 0xf999 + .2byte 0xf999, 0x9999, 0xf999, 0x9999, 0xf99f, 0x9999, 0x9999, 0x9999, 0xcccc, 0xcccc, 0x9999, 0x0c99, 0x9999, 0xc999, 0xffff, 0xc99f + .2byte 0xffff, 0xc999, 0x9ff9, 0xc999, 0x9999, 0xc999, 0x9999, 0xcc99, 0xcccc, 0x0ccc, 0x0000, 0x5fff, 0x67bd, 0x4b1a, 0x6fff, 0x0000 + .2byte 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0010, 0x0008, 0x003f, 0xf000, 0xf001, 0xf001 + .2byte 0xf001, 0xf001, 0xf001, 0xff01, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0xf0d5, 0x0001, 0x1001, 0x0300 + .2byte 0x0024, 0x1106, 0x0600, 0x2240, 0x1cd0, 0x1111, 0x1111, 0x2222, 0x223f, 0x5022, 0xf007, 0xf01f, 0xf01f, 0xf01f, 0xf01f, 0xfb1f + .2byte 0x1ff0, 0x1ff0, 0x1ff0, 0x1ff0, 0x01b0, 0x0001, 0x1003, 0x4f14, 0x0011, 0x2208, 0x3032, 0x3031, 0xf0e7, 0x1007, 0xff07, 0x4fd0 + .2byte 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0xf0ff, 0xf007, 0xd007, 0x3007, 0xf0e7, 0xf007, 0xf0ff, 0xf007, 0xffff + .2byte 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0xf0ff, 0xf007, 0xf0ff, 0xf0f7, 0xf0ff, 0xf007, 0xf0ff, 0xf007 + .2byte 0xff07, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0xf0ff, 0xf0f7, 0xf0ff, 0xf0f7, 0xf0ff, 0xf007, 0xf007 + .2byte 0xf007, 0xff07, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0xff60, 0xcd40, 0xf0db, 0x50ff, 0x40ff, 0x1224, 0x0300, 0xf430 + .2byte 0x704f, 0x0f4f, 0x3333, 0x3333, 0x1ff0, 0x1ff0, 0x1ff0, 0x1ff0, 0xf0fe, 0xf01f, 0xf01f, 0xf01f, 0xf01f, 0xd01f, 0x001f, 0x03e7 + .2byte 0x30ff, 0x00dc, 0xf006, 0xf001, 0xf001, 0xf001, 0xf001, 0xf001, 0xff01, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0 + .2byte 0x01f0, 0xf0c0, 0x0001, 0x0001 gUnknown_08597B14:: @ 8597B14 .incbin "baserom.gba", 0x597b14, 0x20 @@ -38,7 +67,8 @@ gUnknown_08597C24:: @ 8597C24 .incbin "baserom.gba", 0x597c24, 0xc gUnknown_08597C30:: @ 8597C30 - .incbin "baserom.gba", 0x597c30, 0x24 + .byte 0x83, 0x18, 0x04, 0x00, 0x63, 0x18, 0x06, 0x00, 0x03, 0x18, 0x0a, 0x00, 0xa3, 0x18, 0x02, 0x00, 0xb0, 0x0c, 0x02, 0x00, 0x83, 0x18, 0x04, 0x00, 0x89, 0x0c, 0x02, 0x01, 0x65, 0x14, 0x0a, 0x03 + .byte 0x03, 0x18, 0x0a, 0x02 gUnknown_08597C54:: @ 8597C54 .incbin "baserom.gba", 0x597c54, 0x10 @@ -53,7 +83,10 @@ gUnknown_08597C8C:: @ 8597C8C .incbin "baserom.gba", 0x597c8c, 0x4 gUnknown_08597C90:: @ 8597C90 - .incbin "baserom.gba", 0x597c90, 0x10 + .4byte gUnknown_862B810 + .4byte gUnknown_862B832 + .4byte gUnknown_862B84B + .4byte gUnknown_862B86C gUnknown_08597CA0:: @ 8597CA0 .incbin "baserom.gba", 0x597ca0, 0x20 @@ -65,7 +98,7 @@ gUnknown_08597CE8:: @ 8597CE8 .incbin "baserom.gba", 0x597ce8, 0x20 gUnknown_08597D08:: @ 8597D08 - .incbin "baserom.gba", 0x597d08, 0x10 + .byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00 gUnknown_08597D18:: @ 8597D18 .incbin "baserom.gba", 0x597d18, 0x50 @@ -86,7 +119,7 @@ gUnknown_08597E48:: @ 8597E48 .incbin "baserom.gba", 0x597e48, 0x18 gUnknown_08597E60:: @ 8597E60 - .incbin "baserom.gba", 0x597e60, 0xc + .byte 0x10, 0x6f, 0xc4, 0x00, 0x10, 0x4e, 0x82, 0xa0, 0x10, 0x50, 0x86, 0xaa gUnknown_08597E6C:: @ 8597E6C .incbin "baserom.gba", 0x597e6c, 0x30 @@ -101,16 +134,16 @@ gUnknown_08597E6C:: @ 8597E6C .include "data/text/easy_chat/easy_chat_group_name_pointers.inc" gUnknown_0859E62C:: @ 859E62C - .incbin "baserom.gba", 0x59e62c, 0x8 + .2byte 0x0a29, 0x1020, 0x020e, 0x0a33 gUnknown_0859E634:: @ 859E634 - .incbin "baserom.gba", 0x59e634, 0xc + .2byte 0x100f, 0x0a02, 0x0e25, 0x0c03, 0x0803, 0x0c00 gUnknown_0859E640:: @ 859E640 - .incbin "baserom.gba", 0x59e640, 0xc + .2byte 0x0c3a, 0x0c3a, 0x0c01, 0x0a2a, 0x0607, 0x0c01 gUnknown_0859E64C:: @ 859E64C - .incbin "baserom.gba", 0x59e64c, 0xc + .2byte 0x1039, 0x122e, 0x0c04, 0x0a3d, 0x0630, 0x0c04 gUnknown_0859E658:: @ 859E658 - .incbin "baserom.gba", 0x59e658, 0x4 + .2byte 0x019a, 0x0000 diff --git a/data/event_scripts.s b/data/event_scripts.s index d05eb1965..b5a490f80 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -474,7 +474,7 @@ EventScript_23B531:: @ 823B531 EventScript_23B568:: @ 823B568 msgbox Text_2766AA, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_23B4D3 closemessage special sub_80E9AC0 @@ -520,13 +520,13 @@ gUnknown_0823B5E9:: @ 823B5E9 EventScript_23B5F0:: @ 823B5F0 special sub_80E9BDC - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_23B62F - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq EventScript_23B652 special sub_80E980C msgbox Text_276707, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_23B5A1 msgbox Text_2767D1, 3 special sub_80E9C2C @@ -536,7 +536,7 @@ EventScript_23B5F0:: @ 823B5F0 EventScript_23B62F:: @ 823B62F msgbox Text_276731, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_23B5A1 msgbox Text_2767E9, 3 special sub_80E9C2C @@ -586,13 +586,13 @@ gUnknown_0823B684:: @ 823B684 gUnknown_0823B68C:: @ 823B68C special sub_80FAC78 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_23B6BC - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_23B6C5 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq EventScript_23B6CE - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq EventScript_23B6D7 end @@ -844,103 +844,103 @@ EventScript_271354:: @ 8271354 EventScript_271356:: @ 8271356 special SetUpTrainerEncounterMusic - special sub_80B45AC + special EndTrainerApproach waitstate - goto EventScript_27143C + goto EventScript_ShowTrainerIntroMsg EventScript_271362:: @ 8271362 lock faceplayer - applymovement 0x800F, Movement_27143A + applymovement VAR_LAST_TALKED, Movement_27143A waitmovement 0 - specialvar VAR_RESULT, check_trainer_flag - compare_var_to_value VAR_RESULT, 0 + specialvar VAR_RESULT, GetTrainerFlag + compare VAR_RESULT, 0 goto_if 5, EventScript_271389 special SetUpTrainerEncounterMusic special sub_80B16D8 - goto EventScript_27143C + goto EventScript_ShowTrainerIntroMsg EventScript_271389:: @ 8271389 - ontrainerbattleend + gotopostbattlescript -EventScript_27138A:: @ 827138A +EventScript_TryDoDoubleTrainerBattle:: @ 827138A lock faceplayer call EventScript_27142F - specialvar VAR_RESULT, check_trainer_flag - compare_var_to_value VAR_RESULT, 0 + specialvar VAR_RESULT, GetTrainerFlag + compare VAR_RESULT, 0 goto_if 5, EventScript_2713C1 - special sub_80F92F8 - compare_var_to_value VAR_RESULT, 0 - goto_if 5, EventScript_2713BA + special HasEnoughMonsForDoubleBattle + compare VAR_RESULT, 0 + goto_if 5, EventScript_NotEnoughMonsForDoubleBattle special SetUpTrainerEncounterMusic special sub_80B16D8 - goto EventScript_27143C + goto EventScript_ShowTrainerIntroMsg -EventScript_2713BA:: @ 82713BA - special special_trainer_unable_to_battle +EventScript_NotEnoughMonsForDoubleBattle:: @ 82713BA + special ShowTrainerCantBattleSpeech waitmessage waitbuttonpress release end EventScript_2713C1:: @ 82713C1 - ontrainerbattleend + gotopostbattlescript EventScript_2713C2:: @ 82713C2 - applymovement 0x800F, Movement_27143A + applymovement VAR_LAST_TALKED, Movement_27143A waitmovement 0 special SetUpTrainerEncounterMusic trainerbattlebegin - ontrainerbattleend + gotopostbattlescript EventScript_2713D1:: @ 82713D1 call EventScript_27142F - specialvar VAR_RESULT, sub_80B22A0 - compare_var_to_value VAR_RESULT, 0 + specialvar VAR_RESULT, IsTrainerReadyForRematch + compare VAR_RESULT, 0 goto_eq EventScript_2713F7 special SetUpTrainerEncounterMusic special sub_80B16D8 - special sub_80B1A14 + special ShowTrainerIntroSpeech waitmessage waitbuttonpress - special sub_80B19EC + special BattleSetup_StartRematchBattle waitstate releaseall end EventScript_2713F7:: @ 82713F7 - ontrainerbattleend + gotopostbattlescript -EventScript_2713F8:: @ 82713F8 - specialvar VAR_RESULT, sub_80B22A0 - compare_var_to_value VAR_RESULT, 0 +EventScript_TryDoDoubleRematchBattle:: @ 82713F8 + specialvar VAR_RESULT, IsTrainerReadyForRematch + compare VAR_RESULT, 0 goto_eq EventScript_271427 - special sub_80F92F8 - compare_var_to_value VAR_RESULT, 0 - goto_if 5, EventScript_271428 + special HasEnoughMonsForDoubleBattle + compare VAR_RESULT, 0 + goto_if 5, EventScript_NotEnoughMonsForDoubleRematchBattle special SetUpTrainerEncounterMusic special sub_80B16D8 - special sub_80B1A14 + special ShowTrainerIntroSpeech waitmessage waitbuttonpress - special sub_80B19EC + special BattleSetup_StartRematchBattle waitstate releaseall end EventScript_271427:: @ 8271427 - ontrainerbattleend + gotopostbattlescript -EventScript_271428:: @ 8271428 - special special_trainer_unable_to_battle +EventScript_NotEnoughMonsForDoubleRematchBattle:: @ 8271428 + special ShowTrainerCantBattleSpeech waitmessage waitbuttonpress release end EventScript_27142F:: @ 827142F - applymovement 0x800F, Movement_27143A + applymovement VAR_LAST_TALKED, Movement_27143A waitmovement 0 return @@ -948,31 +948,31 @@ Movement_27143A: @ 827143A step_59 step_end -EventScript_27143C:: @ 827143C - special sub_80B1A14 +EventScript_ShowTrainerIntroMsg:: @ 827143C + special ShowTrainerIntroSpeech waitmessage waitbuttonpress special sub_80B45D0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_271356 - goto EventScript_271454 + goto EventScript_DoTrainerBattle -EventScript_271454:: @ 8271454 +EventScript_DoTrainerBattle:: @ 8271454 trainerbattlebegin - specialvar VAR_RESULT, sub_80B170C - compare_var_to_value VAR_RESULT, 0 + specialvar VAR_RESULT, GetTrainerBattleMode + compare VAR_RESULT, 0 goto_eq EventScript_271491 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq EventScript_271491 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_271491 - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq EventScript_271491 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq EventScript_271491 EventScript_271491:: @ 8271491 - ontrainerbattleendgoto + gotobeatenscript releaseall end @@ -1233,7 +1233,7 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 special sub_81AFDD0 setflag FLAG_0x87F call EverGrandeCity_HallOfFame_EventScript_271829 - compare_var_to_value VAR_0x40CC, 0 + compare VAR_0x40CC, 0 call_if 1, EverGrandeCity_HallOfFame_EventScript_271839 clearflag FLAG_0x39D call EverGrandeCity_HallOfFame_EventScript_2718CC @@ -1255,7 +1255,7 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 call_if 0, EverGrandeCity_HallOfFame_EventScript_27183F setflag FLAG_0x2F8 setflag FLAG_0x2D2 - compare_var_to_value VAR_0x40D3, 0 + compare VAR_0x40D3, 0 call_if 1, EverGrandeCity_HallOfFame_EventScript_271851 return @@ -1291,11 +1291,11 @@ EverGrandeCity_HallOfFame_EventScript_271857:: @ 8271857 end EverGrandeCity_HallOfFame_EventScript_271862:: @ 8271862 - compare_var_to_value VAR_0x4096, 1 + compare VAR_0x4096, 1 goto_eq EverGrandeCity_HallOfFame_EventScript_271884 - compare_var_to_value VAR_0x4096, 2 + compare VAR_0x4096, 2 goto_eq EverGrandeCity_HallOfFame_EventScript_27189A - compare_var_to_value VAR_0x4096, 3 + compare VAR_0x4096, 3 goto_eq EverGrandeCity_HallOfFame_EventScript_2718B3 end @@ -1394,12 +1394,12 @@ VerdanturfTown_PokemonCenter_1F_EventScript_27191E:: @ 827191E faceplayer setvar VAR_0x8004, 0 specialvar VAR_RESULT, sub_80C2E40 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq OldaleTown_PokemonCenter_1F_EventScript_271A68 msgbox gUnknown_082726EB, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_1F_EventScript_27195A - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_1F_EventScript_271954 end @@ -1409,9 +1409,9 @@ OldaleTown_PokemonCenter_1F_EventScript_271954:: @ 8271954 OldaleTown_PokemonCenter_1F_EventScript_27195A:: @ 827195A incrementgamestat 15 - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 call_if 1, OldaleTown_PokemonCenter_1F_EventScript_271987 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 call_if 1, OldaleTown_PokemonCenter_1F_EventScript_27198D waitmessage call OldaleTown_PokemonCenter_1F_EventScript_271993 @@ -1435,23 +1435,23 @@ OldaleTown_PokemonCenter_1F_EventScript_271993:: @ 8271993 waitfieldeffect 25 applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_2725AA waitmovement 0 - special sp000_heal_pokemon + special HealPlayerParty return OldaleTown_PokemonCenter_1F_EventScript_2719B1:: @ 82719B1 specialvar VAR_RESULT, sub_8139ED0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_1F_EventScript_2719E2 specialvar VAR_RESULT, sp182_move_string copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 goto_eq OldaleTown_PokemonCenter_1F_EventScript_2719E2 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 goto_eq OldaleTown_PokemonCenter_1F_EventScript_271A19 end OldaleTown_PokemonCenter_1F_EventScript_2719E2:: @ 82719E2 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq OldaleTown_PokemonCenter_1F_EventScript_271A03 message gUnknown_08272798 waitmessage @@ -1482,9 +1482,9 @@ OldaleTown_PokemonCenter_1F_EventScript_271A19:: @ 8271A19 OldaleTown_PokemonCenter_1F_EventScript_271A43:: @ 8271A43 specialvar VAR_RESULT, sub_8139540 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_1F_EventScript_271A5F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_1F_EventScript_2719B1 end @@ -1504,14 +1504,14 @@ OldaleTown_PokemonCenter_1F_EventScript_271A68:: @ 8271A68 applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_27259A waitmovement 0 msgbox gUnknown_08272860, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_1F_EventScript_271AC5 message gUnknown_08272A07 return OldaleTown_PokemonCenter_1F_EventScript_271AAC:: @ 8271AAC msgbox gUnknown_08272982, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_1F_EventScript_271AC5 message gUnknown_08272A07 return @@ -1536,9 +1536,9 @@ EventScript_271AE3:: @ 8271AE3 bufferitemnameplural 1, VAR_0x8000, 32769 checkitemtype VAR_0x8000 call EventScript_271B08 - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if 1, EventScript_271B95 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 call_if 1, EventScript_271BA9 return @@ -1553,31 +1553,31 @@ EventScript_271B08:: @ 8271B08 EventScript_271B45:: @ 8271B45 bufferstdstring 2, 14 - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if 1, EventScript_271BAF return EventScript_271B55:: @ 8271B55 bufferstdstring 2, 15 - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if 1, EventScript_271BAF return EventScript_271B65:: @ 8271B65 bufferstdstring 2, 16 - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if 1, EventScript_271BAF return EventScript_271B75:: @ 8271B75 bufferstdstring 2, 17 - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if 1, EventScript_271BB3 return EventScript_271B85:: @ 8271B85 bufferstdstring 2, 18 - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if 1, EventScript_271BAF return @@ -1608,9 +1608,9 @@ Std_ObtainDecoration:: @ 8271BB7 EventScript_271BC5:: @ 8271BC5 bufferdecorationname 1, VAR_0x8000 - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if 1, EventScript_271BE0 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 call_if 1, EventScript_271BF7 return @@ -1637,9 +1637,9 @@ Std_FindItem:: @ 8271BFD bufferitemnameplural 1, VAR_0x8000, 32769 checkitemtype VAR_0x8000 call EventScript_271B08 - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 call_if 1, EventScript_271C3A - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 call_if 1, EventScript_271CA1 release return @@ -1649,16 +1649,16 @@ EventScript_271C3A:: @ 8271C3A giveitem VAR_0x8004, 32773 specialvar VAR_RESULT, sub_81398C0 copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, EventScript_271C8F - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, EventScript_271C9B waitfanfare waitmessage bufferitemnameplural 1, VAR_0x8004, 32773 setvar VAR_0x8004, 12 special sub_81A8E7C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_271C86 msgbox gUnknown_08272A9A, 4 return @@ -1690,9 +1690,9 @@ EventScript_271CB7:: @ 8271CB7 bufferitemnameplural 1, VAR_0x8005, 1 checkitemtype VAR_0x8005 call EventScript_271B08 - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 goto_eq EventScript_271CE8 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_eq EventScript_271D47 end @@ -1700,9 +1700,9 @@ EventScript_271CE8:: @ 8271CE8 copyvar VAR_0x8008, VAR_0x8004 copyvar VAR_0x8004, VAR_0x8005 specialvar VAR_RESULT, sub_81398C0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_271D0E - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_271D1F end @@ -1739,9 +1739,9 @@ EventScript_271D5E:: @ 8271D5E lock faceplayer msgbox Text_27260D, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_271D83 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_271D89 goto EventScript_271D89 @@ -1901,13 +1901,13 @@ Route109_EventScript_271E95:: @ 8271E95 EventScript_271EA0:: @ 8271EA0 checkpartymove MOVE_SURF - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq EventScript_271ED6 bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT lockall msgbox gUnknown_08272FD6, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_271ED5 msgbox gUnknown_0827300D, 4 dofieldeffect 9 @@ -1930,9 +1930,9 @@ Route110_EventScript_271ED7:: @ 8271ED7 Route119_EventScript_271ED7:: @ 8271ED7 RustboroCity_EventScript_271ED7:: @ 8271ED7 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_EventScript_271EEF - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_271EF5 end @@ -1948,9 +1948,9 @@ LavaridgeTown_EventScript_271EFB:: @ 8271EFB Route110_EventScript_271EFB:: @ 8271EFB Route119_EventScript_271EFB:: @ 8271EFB checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LavaridgeTown_EventScript_271F13 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LavaridgeTown_EventScript_271F19 end @@ -1964,9 +1964,9 @@ LavaridgeTown_EventScript_271F19:: @ 8271F19 EventScript_271F1F:: @ 8271F1F checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_271F37 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_271F3D end @@ -2194,7 +2194,7 @@ SSTidalRooms_EventScript_272083:: @ 8272083 fadescreen 1 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty fadescreen 0 return @@ -2224,25 +2224,25 @@ Route109_EventScript_2720A8:: @ 82720A8 LittlerootTown_ProfessorBirchsLab_EventScript_2720AD:: @ 82720AD Route101_EventScript_2720AD:: @ 82720AD Route103_EventScript_2720AD:: @ 82720AD - compare_var_to_value VAR_0x4085, 0 + compare VAR_0x4085, 0 goto_eq Route101_EventScript_27374E checkflag FLAG_SYS_GAME_CLEAR goto_eq Route101_EventScript_27211A - compare_var_to_value VAR_BIRCH_STATE, 0 + compare VAR_BIRCH_STATE, 0 call_if 1, Route101_EventScript_27211A - compare_var_to_value VAR_BIRCH_STATE, 1 + compare VAR_BIRCH_STATE, 1 call_if 1, Route101_EventScript_27211A - compare_var_to_value VAR_BIRCH_STATE, 2 + compare VAR_BIRCH_STATE, 2 call_if 1, Route101_EventScript_272127 - compare_var_to_value VAR_BIRCH_STATE, 3 + compare VAR_BIRCH_STATE, 3 call_if 1, Route101_EventScript_272127 - compare_var_to_value VAR_BIRCH_STATE, 4 + compare VAR_BIRCH_STATE, 4 call_if 1, Route101_EventScript_272134 - compare_var_to_value VAR_BIRCH_STATE, 5 + compare VAR_BIRCH_STATE, 5 call_if 1, Route101_EventScript_272134 - compare_var_to_value VAR_BIRCH_STATE, 6 + compare VAR_BIRCH_STATE, 6 call_if 1, Route101_EventScript_27211A - compare_var_to_value VAR_BIRCH_STATE, 7 + compare VAR_BIRCH_STATE, 7 call_if 1, Route101_EventScript_27211A return @@ -2272,14 +2272,14 @@ Route101_EventScript_272141:: @ 8272141 Route103_EventScript_272141:: @ 8272141 lock faceplayer - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_if 0, Route101_EventScript_272155 checkflag FLAG_0x119 goto_if 0, Route101_EventScript_1FA2D2 Route101_EventScript_272155:: @ 8272155 msgbox gUnknown_082A5C9C, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route101_EventScript_27216F call Route101_EventScript_272184 release @@ -2308,7 +2308,7 @@ Route101_EventScript_272184:: @ 8272184 buffernumberstring 1, VAR_0x8009 msgbox gUnknown_082A5D2C, 4 call Route101_EventScript_272179 - compare_var_to_value VAR_0x800A, 0 + compare VAR_0x800A, 0 goto_eq Route101_EventScript_27374E setvar VAR_0x8004, 1 specialvar VAR_RESULT, sub_8137A4C @@ -2378,9 +2378,9 @@ BirthIsland_Harbor_EventScript_272250:: @ 8272250 FarawayIsland_Entrance_EventScript_272250:: @ 8272250 NavelRock_Harbor_EventScript_272250:: @ 8272250 SouthernIsland_Exterior_EventScript_272250:: @ 8272250 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, BattleFrontier_OutsideWest_EventScript_242A21 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, BattleFrontier_OutsideWest_EventScript_242A2C delay 30 hideobjectat 255, PETALBURG_CITY @@ -2487,7 +2487,7 @@ Route119_EventScript_272329:: @ 8272329 Route119_EventScript_272336:: @ 8272336 Route120_EventScript_272336:: @ 8272336 checkitem ITEM_DEVON_SCOPE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route119_EventScript_272350 msgbox Route119_Text_1F5D00, 4 release @@ -2495,7 +2495,7 @@ Route120_EventScript_272336:: @ 8272336 Route119_EventScript_272350:: @ 8272350 msgbox Route119_Text_1F5D23, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route119_EventScript_272365 release end @@ -2516,11 +2516,11 @@ Route119_EventScript_272365:: @ 8272365 dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route119_EventScript_2723C1 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq Route119_EventScript_2723C1 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq Route119_EventScript_2723C1 release end @@ -3323,9 +3323,9 @@ EventScript_2736BC:: @ 82736BC lockall special sub_80F972C waitstate - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_2736D9 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq EventScript_2736F8 releaseall end @@ -3353,17 +3353,17 @@ EventScript_2736F8:: @ 82736F8 waitbuttonpress setvar VAR_0x8004, 16 special sub_81A703C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222 setvar VAR_0x8004, 12 special sub_81A8E7C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 setvar VAR_0x8004, 10 special sp194_trainer_tower - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq TrainerHill_1F_EventScript_2C83C9 special sub_80B05B4 waitstate @@ -3530,7 +3530,7 @@ RustboroCity_DevonCorp_2F_EventScript_2737A0:: @ 82737A0 LittlerootTown_ProfessorBirchsLab_EventScript_2737BB:: @ 82737BB specialvar VAR_RESULT, sub_813B21C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737D4 msgbox gText_PkmnTransferredSomeonesPC, 4 return @@ -3543,7 +3543,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_2737D4:: @ 82737D4 LittlerootTown_ProfessorBirchsLab_EventScript_2737E6:: @ 82737E6 specialvar VAR_RESULT, sub_813B21C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_2737FF msgbox gText_PkmnTransferredLanettesPC, 4 return @@ -3565,20 +3565,20 @@ RustboroCity_DevonCorp_2F_EventScript_273811:: @ 8273811 EventScript_27381B:: @ 827381B lockall msgbox gUnknown_0827339F, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_2738FD setvar VAR_0x8004, 20 call MauvilleCity_PokemonCenter_1F_EventScript_271E7C lock faceplayer specialvar VAR_0x8008, sub_813B490 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq EventScript_27386D - compare_var_to_value VAR_0x8004, 2 + compare VAR_0x8004, 2 goto_eq EventScript_2738B5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_2738FD - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_2738FF end @@ -3818,7 +3818,7 @@ gUnknown_08273D1F:: @ 8273D1F gUnknown_08273D1F:: @ 8273D1F lockall - compare_var_to_value VAR_0x4037, 9 + compare VAR_0x4037, 9 goto_if 4, Route105_EventScript_273D51 goto Route105_EventScript_273D5F end @@ -4086,15 +4086,15 @@ Std_8:: @ 82742C9 delay 30 return -LavaridgeTown_Gym_1F_EventScript_2742E6:: @ 82742E6 - special CheckIfMultipleTrainersWantBattle - compare_var_to_value VAR_RESULT, 1 - goto_eq LavaridgeTown_Gym_1F_EventScript_2742F6 +EventScript_TryGetTrainerScript:: @ 82742E6 + special ShouldTryGetTrainerScript + compare VAR_RESULT, 1 + goto_eq EventScript_GotoTrainerScript releaseall end -LavaridgeTown_Gym_1F_EventScript_2742F6:: @ 82742F6 - ontrainerbattleendgoto +EventScript_GotoTrainerScript:: @ 82742F6 + gotobeatenscript releaseall end @@ -4414,32 +4414,32 @@ SecretBase_RedCave1_Text_275944: @ 8275944 EventScript_2759F1:: @ 82759F1 special sub_80E8C98 special sub_80E8BC8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_275BE8 checkpartymove MOVE_SECRET_POWER setfieldeffectargument 0, VAR_RESULT buffermovename 1, MOVE_SECRET_POWER - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 goto_eq EventScript_275A50 - compare_var_to_value VAR_0x8007, 2 + compare VAR_0x8007, 2 goto_eq EventScript_275A50 - compare_var_to_value VAR_0x8007, 3 + compare VAR_0x8007, 3 goto_eq EventScript_275A50 - compare_var_to_value VAR_0x8007, 4 + compare VAR_0x8007, 4 goto_eq EventScript_275A50 - compare_var_to_value VAR_0x8007, 5 + compare VAR_0x8007, 5 goto_eq EventScript_275AA9 - compare_var_to_value VAR_0x8007, 6 + compare VAR_0x8007, 6 goto_eq EventScript_275B02 end EventScript_275A50:: @ 8275A50 lockall - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq EventScript_275A91 bufferpartymonnick 0, VAR_RESULT msgbox gText_23B704, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_275CDE msgbox Route103_Text_290771, 4 closemessage @@ -4467,11 +4467,11 @@ EventScript_275A9B:: @ 8275A9B EventScript_275AA9:: @ 8275AA9 lockall - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq EventScript_275AEA bufferpartymonnick 0, VAR_RESULT msgbox Text_274779, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_275CDE msgbox Route103_Text_290771, 4 closemessage @@ -4499,11 +4499,11 @@ EventScript_275AF4:: @ 8275AF4 EventScript_275B02:: @ 8275B02 lockall - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq EventScript_275B43 bufferpartymonnick 0, VAR_RESULT msgbox Text_274825, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_275CDE msgbox Route103_Text_290771, 4 closemessage @@ -4548,7 +4548,7 @@ SecretBase_RedCave1_EventScript_275B81:: @ 8275B81 waitmovement 0 setvar VAR_0x4097, 1 msgbox SecretBase_RedCave1_Text_23B759, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_275BAB closemessage playse SE_KAIDAN @@ -4572,7 +4572,7 @@ EventScript_275BB7:: @ 8275BB7 setvar VAR_0x4097, 1 playse SE_KAIDAN special sub_80E9744 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_275BDB clearflag FLAG_0x0AD special sub_80E9068 @@ -4589,58 +4589,58 @@ EventScript_275BDB:: @ 8275BDB EventScript_275BE8:: @ 8275BE8 checkpartymove MOVE_SECRET_POWER - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq EventScript_275C9A setfieldeffectargument 0, VAR_RESULT setorcopyvar VAR_0x8004, VAR_RESULT lockall special sub_8139200 msgbox Text_276A3D, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_275CDE msgbox Text_2766AA, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_275CDE fadescreenswapbuffers 1 special sub_80E9B70 closemessage fadescreenswapbuffers 0 msgbox Text_276A95, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_275CDE bufferpartymonnick 0, VAR_0x8004 buffermovename 1, MOVE_SECRET_POWER msgbox Route103_Text_290771, 4 closemessage closemessage - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 goto_eq EventScript_275A86 - compare_var_to_value VAR_0x8007, 2 + compare VAR_0x8007, 2 goto_eq EventScript_275A86 - compare_var_to_value VAR_0x8007, 3 + compare VAR_0x8007, 3 goto_eq EventScript_275A86 - compare_var_to_value VAR_0x8007, 4 + compare VAR_0x8007, 4 goto_eq EventScript_275A86 - compare_var_to_value VAR_0x8007, 5 + compare VAR_0x8007, 5 goto_eq EventScript_275ADF - compare_var_to_value VAR_0x8007, 6 + compare VAR_0x8007, 6 goto_eq EventScript_275B38 releaseall end EventScript_275C9A:: @ 8275C9A lockall - compare_var_to_value VAR_0x8007, 1 + compare VAR_0x8007, 1 goto_eq EventScript_275A91 - compare_var_to_value VAR_0x8007, 2 + compare VAR_0x8007, 2 goto_eq EventScript_275A91 - compare_var_to_value VAR_0x8007, 3 + compare VAR_0x8007, 3 goto_eq EventScript_275A91 - compare_var_to_value VAR_0x8007, 4 + compare VAR_0x8007, 4 goto_eq EventScript_275A91 - compare_var_to_value VAR_0x8007, 5 + compare VAR_0x8007, 5 goto_eq EventScript_275AEA - compare_var_to_value VAR_0x8007, 6 + compare VAR_0x8007, 6 goto_eq EventScript_275B43 end @@ -4691,10 +4691,10 @@ EventScript_275D2E:: @ 8275D2E EventScript_275D39:: @ 8275D39 special sub_8129708 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_275D63 addvar VAR_0x8004, 1 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 goto_eq EventScript_275D39 removeobject VAR_0x8006 setflag 0x8005 @@ -4729,25 +4729,25 @@ SecretBase_YellowCave2_EventScript_275D64:: @ 8275D64 SecretBase_YellowCave3_EventScript_275D64:: @ 8275D64 SecretBase_YellowCave4_EventScript_275D64:: @ 8275D64 special sub_80EA354 - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_eq SecretBase_RedCave1_EventScript_275DD6 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq SecretBase_RedCave1_EventScript_275E4E - compare_var_to_value VAR_0x8004, 2 + compare VAR_0x8004, 2 goto_eq SecretBase_RedCave1_EventScript_275EC6 - compare_var_to_value VAR_0x8004, 3 + compare VAR_0x8004, 3 goto_eq SecretBase_RedCave1_EventScript_275F3E - compare_var_to_value VAR_0x8004, 4 + compare VAR_0x8004, 4 goto_eq SecretBase_RedCave1_EventScript_275FB6 - compare_var_to_value VAR_0x8004, 5 + compare VAR_0x8004, 5 goto_eq SecretBase_RedCave1_EventScript_27602E - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_eq SecretBase_RedCave1_EventScript_2760A6 - compare_var_to_value VAR_0x8004, 7 + compare VAR_0x8004, 7 goto_eq SecretBase_RedCave1_EventScript_27611E - compare_var_to_value VAR_0x8004, 8 + compare VAR_0x8004, 8 goto_eq SecretBase_RedCave1_EventScript_276196 - compare_var_to_value VAR_0x8004, 9 + compare VAR_0x8004, 9 goto_eq SecretBase_RedCave1_EventScript_27620E end @@ -4756,15 +4756,15 @@ SecretBase_RedCave1_EventScript_275DD6:: @ 8275DD6 faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_275E25 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_275E44 msgbox SecretBase_RedCave1_Text_2748A0, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275E2F setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275E2F msgbox SecretBase_RedCave1_Text_274939, 4 goto SecretBase_RedCave1_EventScript_276286 @@ -4793,15 +4793,15 @@ SecretBase_RedCave1_EventScript_275E4E:: @ 8275E4E faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_275E9D - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_275EBC msgbox SecretBase_RedCave1_Text_274C13, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275EA7 setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275EA7 msgbox SecretBase_RedCave1_Text_274CB0, 4 goto SecretBase_RedCave1_EventScript_276286 @@ -4830,15 +4830,15 @@ SecretBase_RedCave1_EventScript_275EC6:: @ 8275EC6 faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_275F15 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_275F34 msgbox SecretBase_RedCave1_Text_274F39, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275F1F setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275F1F msgbox SecretBase_RedCave1_Text_274FCA, 4 goto SecretBase_RedCave1_EventScript_276286 @@ -4867,15 +4867,15 @@ SecretBase_RedCave1_EventScript_275F3E:: @ 8275F3E faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_275F8D - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_275FAC msgbox SecretBase_RedCave1_Text_275287, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275F97 setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_275F97 msgbox SecretBase_RedCave1_Text_275315, 4 goto SecretBase_RedCave1_EventScript_276286 @@ -4904,15 +4904,15 @@ SecretBase_RedCave1_EventScript_275FB6:: @ 8275FB6 faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_276005 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_276024 msgbox SecretBase_RedCave1_Text_2755D2, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_27600F setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_27600F msgbox SecretBase_RedCave1_Text_275679, 4 goto SecretBase_RedCave1_EventScript_276286 @@ -4941,15 +4941,15 @@ SecretBase_RedCave1_EventScript_27602E:: @ 827602E faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_27607D - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_27609C msgbox SecretBase_RedCave1_Text_274A64, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_276087 setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_276087 msgbox SecretBase_RedCave1_Text_274AFA, 4 goto SecretBase_RedCave1_EventScript_276286 @@ -4978,15 +4978,15 @@ SecretBase_RedCave1_EventScript_2760A6:: @ 82760A6 faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_2760F5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_276114 msgbox SecretBase_RedCave1_Text_274DD2, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_2760FF setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_2760FF msgbox SecretBase_RedCave1_Text_274E41, 4 goto SecretBase_RedCave1_EventScript_276286 @@ -5015,15 +5015,15 @@ SecretBase_RedCave1_EventScript_27611E:: @ 827611E faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_27616D - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_27618C msgbox SecretBase_RedCave1_Text_275114, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_276177 setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_276177 msgbox SecretBase_RedCave1_Text_2751AF, 4 goto SecretBase_RedCave1_EventScript_276286 @@ -5052,15 +5052,15 @@ SecretBase_RedCave1_EventScript_276196:: @ 8276196 faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_2761E5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_276204 msgbox SecretBase_RedCave1_Text_275405, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_2761EF setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_2761EF msgbox SecretBase_RedCave1_Text_2754B2, 4 goto SecretBase_RedCave1_EventScript_276286 @@ -5089,15 +5089,15 @@ SecretBase_RedCave1_EventScript_27620E:: @ 827620E faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_27625D - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SecretBase_RedCave1_EventScript_27627C msgbox SecretBase_RedCave1_Text_2757B5, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_276267 setvar VAR_RESULT, 1 special sub_80EA30C call SecretBase_RedCave1_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SecretBase_RedCave1_EventScript_276267 msgbox SecretBase_RedCave1_Text_275884, 4 goto SecretBase_RedCave1_EventScript_276286 @@ -5127,13 +5127,13 @@ SecretBase_RedCave1_EventScript_276286:: @ 8276286 setvar VAR_0x8005, 0 special sub_8163AC4 waitstate - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if 1, SecretBase_RedCave1_EventScript_2762BD - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, SecretBase_RedCave1_EventScript_2762C1 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, SecretBase_RedCave1_EventScript_2762C5 - special sp000_heal_pokemon + special HealPlayerParty release end @@ -5264,67 +5264,92 @@ gUnknown_0827EA0C:: @ 827EA0C gUnknown_0827EA17:: @ 827EA17 .string "CONTEST$" +gContestRankNormal:: .string "NORMAL RANK$" +gContestRankSuper:: .string "SUPER RANK$" +gContestRankHyper:: .string "HYPER RANK$" +gContestRankMaster:: .string "MASTER RANK$" +gContestLink:: .string "LINK$" +gContestCoolness:: .string "COOLNESS$" +gContestBeauty:: .string "BEAUTY$" +gContestCuteness:: .string "CUTENESS$" +gContestSmartness:: .string "SMARTNESS$" +gContestToughness:: .string "TOUGHNESS$" +gContestPaintingCool1:: .string "Nonstop supercool--\n" .string "the inestimable {STR_VAR_1}$" +gContestPaintingCool2:: .string "Hey, there!\n" .string "The good-looking POKéMON {STR_VAR_1}$" +gContestPaintingCool3:: .string "The marvelous, wonderful, and\n" .string "very great {STR_VAR_1}$" +gContestPaintingBeauty1:: .string "This century’s last Venus--\n" .string "the beautiful {STR_VAR_1}$" +gContestPaintingBeauty2:: .string "{STR_VAR_1}’s dazzling,\n" .string "glittering smile$" +gContestPaintingBeauty3:: .string "POKéMON CENTER’s super idol--\n" .string "the incomparable {STR_VAR_1}$" +gContestPaintingCute1:: .string "The lovely and sweet {STR_VAR_1}$" +gContestPaintingCute2:: .string "The pretty {STR_VAR_1}’s\n" .string "winning portrait$" +gContestPaintingCute3:: .string "Give us a wink!\n" .string "The cutie POKéMON {STR_VAR_1}$" +gContestPaintingSmart1:: .string "The smartness maestro--\n" .string "the wise POKéMON {STR_VAR_1}$" +gContestPaintingSmart2:: .string "{STR_VAR_1}--the one chosen\n" .string "above all POKéMON$" +gContestPaintingSmart3:: .string "The excellent {STR_VAR_1}’s\n" .string "moment of elegance$" +gContestPaintingTough1:: .string "The powerfully muscular\n" .string "speedster {STR_VAR_1}$" +gContestPaintingTough2:: .string "The strong, stronger, and\n" .string "strongest {STR_VAR_1}$" +gContestPaintingTough3:: .string "The mighty tough\n" .string "hyper POKéMON {STR_VAR_1}$" @@ -5478,13 +5503,13 @@ SlateportCity_PokemonFanClub_EventScript_28C7E9:: @ 828C7E9 SlateportCity_PokemonFanClub_EventScript_28C7F0:: @ 828C7F0 setvar VAR_0x8005, 1 special InterviewBefore - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_PokemonFanClub_EventScript_28C879 copyvar VAR_0x8009, VAR_0x8006 msgbox SlateportCity_PokemonFanClub_Text_280674, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_PokemonFanClub_EventScript_28C827 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_28C85C end @@ -5496,9 +5521,9 @@ SlateportCity_PokemonFanClub_EventScript_28C827:: @ 828C827 call SlateportCity_PokemonFanClub_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_PokemonFanClub_EventScript_28C866 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_28C85C end @@ -5523,24 +5548,24 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C883:: @ 828C883 faceplayer setvar VAR_0x8005, 2 special InterviewBefore - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C939 copyvar VAR_0x8009, VAR_0x8006 checkflag FLAG_0x069 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8C8 setflag FLAG_0x069 msgbox SlateportCity_OceanicMuseum_1F_Text_2811A0, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C end SlateportCity_OceanicMuseum_1F_EventScript_28C8C8:: @ 828C8C8 msgbox SlateportCity_OceanicMuseum_1F_Text_28126D, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C end @@ -5552,9 +5577,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C8E7:: @ 828C8E7 call SlateportCity_OceanicMuseum_1F_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C926 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_28C91C end @@ -5578,17 +5603,17 @@ SlateportCity_PokemonFanClub_EventScript_28C943:: @ 828C943 lock faceplayer specialvar VAR_RESULT, sub_80EF8F8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_28C7F0 setvar VAR_0x8005, 3 special InterviewBefore - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_PokemonFanClub_EventScript_28CA4F copyvar VAR_0x8009, VAR_0x8006 msgbox SlateportCity_PokemonFanClub_Text_280270, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_PokemonFanClub_EventScript_28C98C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_28CA45 end @@ -5624,14 +5649,14 @@ SlateportCity_PokemonFanClub_EventScript_28C9ED:: @ 828C9ED call SlateportCity_PokemonFanClub_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_28CA45 msgbox SlateportCity_PokemonFanClub_Text_2804AC, 4 setvar VAR_0x8006, 1 call SlateportCity_PokemonFanClub_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_28CA45 msgbox SlateportCity_PokemonFanClub_Text_280523, 4 copyvar VAR_0x8007, VAR_0x800A @@ -5656,13 +5681,13 @@ LilycoveCity_ContestLobby_EventScript_28CA59:: @ 828CA59 goto_eq LilycoveCity_ContestLobby_EventScript_28CB21 setvar VAR_0x8005, 6 special InterviewBefore - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_28CB21 copyvar VAR_0x8009, VAR_0x8006 msgbox LilycoveCity_ContestLobby_Text_27EF15, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_28CA9B - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_28CAD0 end @@ -5674,9 +5699,9 @@ LilycoveCity_ContestLobby_EventScript_28CA9B:: @ 828CA9B call LilycoveCity_ContestLobby_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_28CADA - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_28CAD0 end @@ -5695,7 +5720,7 @@ LilycoveCity_ContestLobby_EventScript_28CADA:: @ 828CADA call LilycoveCity_ContestLobby_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_28CAD0 msgbox LilycoveCity_ContestLobby_Text_27F0EC, 4 setflag FLAG_0x002 @@ -5709,11 +5734,11 @@ LilycoveCity_ContestLobby_EventScript_28CB21:: @ 828CB21 end LilycoveCity_ContestLobby_EventScript_28CB2B:: @ 828CB2B - compare_var_to_value VAR_0x4086, 2 + compare VAR_0x4086, 2 goto_if 5, LilycoveCity_ContestLobby_EventScript_28CB95 setvar VAR_0x8005, 6 special InterviewBefore - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_28CB95 switch VAR_0x4088 case 0, LilycoveCity_ContestLobby_EventScript_28CB95 @@ -5738,13 +5763,13 @@ BattleFrontier_BattleTowerLobby_EventScript_28CB96:: @ 828CB96 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A setvar VAR_0x8005, 7 special InterviewBefore - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC7A copyvar VAR_0x8009, VAR_0x8006 msgbox BattleFrontier_BattleTowerLobby_Text_27F704, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CBD8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC2E end @@ -5753,9 +5778,9 @@ BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 waitmessage multichoice 20, 8, 45, 1 copyvar VAR_0x8008, VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_28CC38 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_28CC41 msgbox BattleFrontier_BattleTowerLobby_Text_27F97A, 4 setvar VAR_0x8004, 12 @@ -5763,9 +5788,9 @@ BattleFrontier_BattleTowerLobby_EventScript_28CBD8:: @ 828CBD8 call BattleFrontier_BattleTowerLobby_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC4A - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 end @@ -5783,7 +5808,7 @@ BattleFrontier_BattleTowerLobby_EventScript_28CC41:: @ 828CC41 return BattleFrontier_BattleTowerLobby_EventScript_28CC4A:: @ 828CC4A - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CC70 msgbox BattleFrontier_BattleTowerLobby_Text_27F9FD, 4 setflag FLAG_0x002 @@ -5803,11 +5828,11 @@ BattleFrontier_BattleTowerLobby_EventScript_28CC7A:: @ 828CC7A end BattleFrontier_BattleTowerLobby_EventScript_28CC84:: @ 828CC84 - compare_var_to_value VAR_0x40BC, 0 + compare VAR_0x40BC, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 setvar VAR_0x8005, 7 special InterviewBefore - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6 clearflag FLAG_0x396 return @@ -5837,28 +5862,28 @@ EventScript_292DE5:: @ 8292DE5 .include "data/scripts/pokeblocks.inc" -Text_294295: @ 8294295 +gText_SoPretty:: @ 8294295 .string " so pretty!$" -Text_2942A1: @ 82942A1 +gText_SoDarling:: @ 82942A1 .string " so darling!$" -Text_2942AE: @ 82942AE +gText_SoRelaxed:: @ 82942AE .string " so relaxed!$" -Text_2942BB: @ 82942BB +gText_SoSunny:: @ 82942BB .string " so sunny!$" -Text_2942C6: @ 82942C6 +gText_SoDesirable:: @ 82942C6 .string " so desirable!$" -Text_2942D5: @ 82942D5 +gText_SoExciting:: @ 82942D5 .string " so exciting!$" -Text_2942E3: @ 82942E3 +gText_SoAmusing:: @ 82942E3 .string " so amusing!$" -Text_2942F0: @ 82942F0 +gText_SoMagical:: @ 82942F0 .string " so magical!$" gUnknown_082942FD:: @ 82942FD @@ -5913,11 +5938,11 @@ Text_RepelWoreOff: @ 82A4B33 MauvilleCity_GameCorner_EventScript_2A5AB1:: @ 82A5AB1 checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 0 getpricereduction 2 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_2A5B0D addvar VAR_0x8004, 128 goto MauvilleCity_GameCorner_EventScript_2A5B0D @@ -5925,11 +5950,11 @@ MauvilleCity_GameCorner_EventScript_2A5AB1:: @ 82A5AB1 MauvilleCity_GameCorner_EventScript_2A5ADF:: @ 82A5ADF checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 1 getpricereduction 2 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_2A5B0D addvar VAR_0x8004, 128 goto MauvilleCity_GameCorner_EventScript_2A5B0D @@ -6031,11 +6056,11 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8395:: @ 82A8395 faceplayer msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A69, 4 specialvar VAR_RESULT, sub_818DBE8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83D0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83C6 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8510 end @@ -6048,9 +6073,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A83D0:: @ 82A83D0 special sub_818DC2C msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A7D, 4 specialvar VAR_RESULT, sub_818DC60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8435 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83F7 end @@ -6058,9 +6083,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A83F7:: @ 82A83F7 special sub_818DCC8 special sub_818DD14 specialvar VAR_RESULT, sub_818DD54 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8419 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8427 end @@ -6076,9 +6101,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8427:: @ 82A8427 LilycoveCity_PokemonCenter_1F_EventScript_2A8435:: @ 82A8435 msgbox LilycoveCity_PokemonCenter_1F_Text_2A8B69, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A845E end @@ -6097,25 +6122,25 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A846C:: @ 82A846C setvar VAR_RESULT, 0 special sub_818DD78 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A848E - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84AD end LilycoveCity_PokemonCenter_1F_EventScript_2A848E:: @ 82A848E msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BEE, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A846C end LilycoveCity_PokemonCenter_1F_EventScript_2A84AD:: @ 82A84AD specialvar VAR_RESULT, sub_818DE44 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84C9 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84D6 end @@ -6127,9 +6152,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A84C9:: @ 82A84C9 LilycoveCity_PokemonCenter_1F_EventScript_2A84D6:: @ 82A84D6 specialvar VAR_RESULT, sub_818DE5C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84F2 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84FF end @@ -6150,9 +6175,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8510:: @ 82A8510 specialvar VAR_0x8004, sub_818DEA0 msgbox LilycoveCity_PokemonCenter_1F_Text_2A8D5D, 4 giveitem_std VAR_0x8004 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8545 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A854F end @@ -6171,29 +6196,29 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8554:: @ 82A8554 faceplayer msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E2B, 4 specialvar VAR_RESULT, sub_818E038 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8585 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85AC - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86EC end LilycoveCity_PokemonCenter_1F_EventScript_2A8585:: @ 82A8585 specialvar VAR_RESULT, sub_818E06C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85C8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85D2 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85E0 end LilycoveCity_PokemonCenter_1F_EventScript_2A85AC:: @ 82A85AC specialvar VAR_RESULT, sub_818E2D8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8759 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85C8 end @@ -6215,9 +6240,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A85E0:: @ 82A85E0 LilycoveCity_PokemonCenter_1F_EventScript_2A85EE:: @ 82A85EE setvar VAR_0x8004, 0 msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EEC, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8612 end @@ -6228,15 +6253,15 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8612:: @ 82A8612 LilycoveCity_PokemonCenter_1F_EventScript_2A861C:: @ 82A861C special sub_818E3BC - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A864C - compare_var_to_value VAR_0x8004, 15 + compare VAR_0x8004, 15 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8656 LilycoveCity_PokemonCenter_1F_EventScript_2A8635:: @ 82A8635 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8660 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8689 end @@ -6254,9 +6279,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8656:: @ 82A8656 LilycoveCity_PokemonCenter_1F_EventScript_2A8660:: @ 82A8660 msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F7E, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A867F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C end @@ -6269,9 +6294,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8689:: @ 82A8689 special sub_818E37C msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F4D, 4 specialvar VAR_RESULT, sub_818E308 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86C7 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86B0 end @@ -6296,9 +6321,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A86C7:: @ 82A86C7 LilycoveCity_PokemonCenter_1F_EventScript_2A86EC:: @ 82A86EC specialvar VAR_RESULT, sub_818E298 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8708 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8716 end @@ -6317,7 +6342,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8724:: @ 82A8724 special sub_818E358 special sub_818E37C giveitem_std VAR_0x8005 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A874C goto LilycoveCity_PokemonCenter_1F_EventScript_2A8759 end @@ -6330,9 +6355,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A874C:: @ 82A874C LilycoveCity_PokemonCenter_1F_EventScript_2A8759:: @ 82A8759 msgbox LilycoveCity_PokemonCenter_1F_Text_2A90FB, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8785 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 end @@ -6350,17 +6375,17 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A878D:: @ 82A878D setvar VAR_RESULT, 0 special sub_818E3E0 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87AF - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87CE end LilycoveCity_PokemonCenter_1F_EventScript_2A87AF:: @ 82A87AF msgbox LilycoveCity_PokemonCenter_1F_Text_2A9212, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A878D end @@ -6374,16 +6399,16 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A87E1:: @ 82A87E1 fadescreen 1 special sub_818E47C waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87F8 goto LilycoveCity_PokemonCenter_1F_EventScript_2A8817 end LilycoveCity_PokemonCenter_1F_EventScript_2A87F8:: @ 82A87F8 msgbox LilycoveCity_PokemonCenter_1F_Text_2A92D3, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87E1 end @@ -6400,17 +6425,17 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A882A:: @ 82A882A faceplayer msgbox LilycoveCity_PokemonCenter_1F_Text_2A93A7, 4 specialvar VAR_RESULT, sub_818E8B4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8850 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A886C end LilycoveCity_PokemonCenter_1F_EventScript_2A8850:: @ 82A8850 specialvar VAR_RESULT, sub_818E8E0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8876 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A886C end @@ -6423,12 +6448,12 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A8876:: @ 82A8876 special sub_818E914 msgbox LilycoveCity_PokemonCenter_1F_Text_2A93F4, 4 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A89AE msgbox LilycoveCity_PokemonCenter_1F_Text_2A94E8, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA end @@ -6441,17 +6466,17 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A88BA:: @ 82A88BA fadescreen 1 special sub_818E92C waitstate - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88D7 - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_if 5, LilycoveCity_PokemonCenter_1F_EventScript_2A88F6 end LilycoveCity_PokemonCenter_1F_EventScript_2A88D7:: @ 82A88D7 msgbox LilycoveCity_PokemonCenter_1F_Text_2A9537, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA end @@ -6473,7 +6498,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A890A:: @ 82A890A playmoncry VAR_0x8005, 0 delay 120 waitmoncry - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A893F goto LilycoveCity_PokemonCenter_1F_EventScript_2A894C end @@ -6487,9 +6512,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A894C:: @ 82A894C applymovement 4, LilycoveCity_PokemonCenter_1F_Movement_2A89C0 waitmovement 0 delay 60 - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8970 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A897E end @@ -6506,7 +6531,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A897E:: @ 82A897E LilycoveCity_PokemonCenter_1F_EventScript_2A898F:: @ 82A898F specialvar VAR_RESULT, sub_818E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A89A1 release end @@ -6551,15 +6576,15 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A89C7:: @ 82A89C7 specialvar VAR_RESULT, sub_818E990 special sub_818E914 special sub_818E960 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A0A - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A1D - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A30 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A43 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A56 end @@ -6871,6 +6896,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A9703: @ 82A9703 LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "{STR_VAR_1}: Umyaaaan!$" +BattleFrontier_PokeNav_2A971C:: @ 82A971C .string "Hi! {PLAYER}{STRING 5}, hello!\n" .string "This is {STR_VAR_1}.\p" .string "I saw this {STR_VAR_2} a while back\n" @@ -6878,6 +6904,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "It was so close, too!\n" .string "Well, see you again!$" +BattleFrontier_PokeNav_2A9798:: @ 82A9798 .string "Hello, {PLAYER}{STRING 5}.\n" .string "It’s {STR_VAR_1}.\p" .string "I tried to catch a nice {STR_VAR_2}\n" @@ -6886,6 +6913,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I was sure disappointed!\p" .string "Okay, bye!$" +BattleFrontier_PokeNav_2A9813:: @ 82A9813 .string "Hey there, {PLAYER}!\n" .string "It’s me, {STR_VAR_1}.\p" .string "I just took a shot at catching\n" @@ -6894,6 +6922,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "It spoiled my day…\n" .string "All right, see you!$" +BattleFrontier_PokeNav_2A98A8:: @ 82A98A8 .string "Hey, {PLAYER}{STRING 5}.\n" .string "{STR_VAR_1} here.\p" .string "You know the POKéMON {STR_VAR_2}?\n" @@ -6904,6 +6933,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "sure, though.\p" .string "Okay, catch you later.$" +BattleFrontier_PokeNav_2A9977:: @ 82A9977 .string "Hiya, {PLAYER}{STRING 5}!\n" .string "It’s {STR_VAR_1}.\l" .string "Catching any POKéMON lately?\p" @@ -6911,6 +6941,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "nabbing one, but it got loose.\p" .string "Right, take care!$" +BattleFrontier_PokeNav_2A99FD:: @ 82A99FD .string "Hey, {PLAYER}{STRING 5}.\n" .string "{STR_VAR_1} here.\l" .string "Caught any POKéMON lately?\p" @@ -6918,6 +6949,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "But it evaded me somehow.\p" .string "You take care.$" +BattleFrontier_PokeNav_2A9A78:: @ 82A9A78 .string "…Uh, {PLAYER}{STRING 5}?\n" .string "It’s me, {STR_VAR_1}.\p" .string "Oh, wait! Wait!\n" @@ -6925,6 +6957,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Aaarrrgh! It bolted loose!\n" .string "That wasn’t just close!$" +BattleFrontier_PokeNav_2A9AE8:: @ 82A9AE8 .string "Oh, {PLAYER}{STRING 5}, how do you do?\n" .string "This is {STR_VAR_1} speaking.\p" .string "Have you had success catching\n" @@ -6934,6 +6967,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I need to try harder!\n" .string "See you again!$" +BattleFrontier_PokeNav_2A9BA7:: @ 82A9BA7 .string "Oh, {PLAYER}{STRING 5}, hi there!\n" .string "This is {STR_VAR_1}!\p" .string "So? Are you getting more POKéMON\n" @@ -6942,6 +6976,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "They all get away from me!\p" .string "See you!$" +BattleFrontier_PokeNav_2A9C36:: @ 82A9C36 .string "Oh, {PLAYER}{STRING 5}, hello…\n" .string "This is {STR_VAR_1}.\p" .string "Listen, I came within a whisker of\n" @@ -6950,6 +6985,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I need to try harder.\n" .string "See you around.$" +BattleFrontier_PokeNav_2A9CC8:: @ 82A9CC8 .string "Ah, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\l" .string "How are things with you?\p" @@ -6957,6 +6993,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "earlier, but it managed to flee.\p" .string "I feel defeated…$" +BattleFrontier_PokeNav_2A9D44:: @ 82A9D44 .string "Hello, {PLAYER}{STRING 5}.\n" .string "It’s me, {STR_VAR_1}.\l" .string "Are you still catching POKéMON?\p" @@ -6964,6 +7001,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "myself, but it’s not so easy.\p" .string "The way of POKéMON is deep!$" +BattleFrontier_PokeNav_2A9DD7:: @ 82A9DD7 .string "Ah, hello, {PLAYER}{STRING 5}!\n" .string "This is {STR_VAR_1}!\l" .string "Have you been catching POKéMON?\p" @@ -6971,6 +7009,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "myself, but with little success.\p" .string "The way of POKéMON is deep!$" +BattleFrontier_PokeNav_2A9E70:: @ 82A9E70 .string "Oh, hi, {PLAYER}{STRING 5}, how do you do?\n" .string "This is {STR_VAR_1}.\p" .string "Just now, I tried to catch a cute\n" @@ -6979,6 +7018,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Oh, you bet I was disappointed!\p" .string "Bye-bye!$" +BattleFrontier_PokeNav_2A9EFD:: @ 82A9EFD .string "Hey, {PLAYER}!\n" .string "This is {STR_VAR_1}!\p" .string "I’ve been thinking about trying\n" @@ -6988,6 +7028,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’m at my wit’s end!\n" .string "See you around!$" +BattleFrontier_PokeNav_2A9FAB:: @ 82A9FAB .string "Hi! {PLAYER}{STRING 5}, hello!\n" .string "This is {STR_VAR_1}.\p" .string "I tried battling another TRAINER,\n" @@ -6995,6 +7036,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "It was really disappointing.\n" .string "Well, see you again!$" +BattleFrontier_PokeNav_2AA028:: @ 82AA028 .string "Hello, {PLAYER}{STRING 5}.\n" .string "It’s {STR_VAR_1}.\p" .string "I challenged someone else after\n" @@ -7002,12 +7044,14 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I came close, but I ended up\n" .string "losing. Oh, well!$" +BattleFrontier_PokeNav_2AA099:: @ 82AA099 .string "Hey there, {PLAYER}!\n" .string "It’s me, {STR_VAR_1}.\p" .string "I just got cleaned in a battle.\p" .string "I guess I need to raise my team\n" .string "some more!$" +BattleFrontier_PokeNav_2AA100:: @ 82AA100 .string "Hey, {PLAYER}.\n" .string "{STR_VAR_1} here.\p" .string "I tried another battle yesterday,\n" @@ -7015,6 +7059,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "My team needs more raising.\n" .string "Okay, catch you later.$" +BattleFrontier_PokeNav_2AA188:: @ 82AA188 .string "Hiya, {PLAYER}!\n" .string "It’s {STR_VAR_1}.\p" .string "How are things with you?\p" @@ -7023,6 +7068,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I can’t get it together.\n" .string "Right, take care!$" +BattleFrontier_PokeNav_2AA214:: @ 82AA214 .string "Hey, {PLAYER}.\n" .string "{STR_VAR_1} here.\p" .string "How’s it going for you?\p" @@ -7031,6 +7077,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I can’t get into the groove.\n" .string "You take care.$" +BattleFrontier_PokeNav_2AA2A1:: @ 82AA2A1 .string "{STR_VAR_1} here.\n" .string "How’s it going lately?\p" .string "I lost a battle yesterday,\n" @@ -7038,6 +7085,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I have to devise a plan…\n" .string "See you.$" +BattleFrontier_PokeNav_2AA31B:: @ 82AA31B .string "Oh, {PLAYER}{STRING 5}, how do you do?\n" .string "This is {STR_VAR_1} speaking.\p" .string "How are your POKéMON doing?\n" @@ -7045,6 +7093,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I need to try harder!\n" .string "See you again!$" +BattleFrontier_PokeNav_2AA3A8:: @ 82AA3A8 .string "Oh, {PLAYER}{STRING 5}, hi there!\n" .string "This is {STR_VAR_1}!\p" .string "Listen, listen, you have to hear\n" @@ -7053,6 +7102,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "but I lost at the last second.\p" .string "Oh, it burns me up!$" +BattleFrontier_PokeNav_2AA442:: @ 82AA442 .string "Oh, {PLAYER}{STRING 5}, hello…\n" .string "This is {STR_VAR_1}.\p" .string "A little earlier, I was in a battle.\n" @@ -7060,12 +7110,14 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I need to raise my POKéMON more.\n" .string "See you around.$" +BattleFrontier_PokeNav_2AA4C5:: @ 82AA4C5 .string "Ah, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\l" .string "How are your POKéMON?\p" .string "I just lost yet another battle.\p" .string "Well, see you!$" +BattleFrontier_PokeNav_2AA520:: @ 82AA520 .string "Hello, {PLAYER}{STRING 5}.\n" .string "It’s me, {STR_VAR_1}.\l" .string "Are you still battling hard?\p" @@ -7073,6 +7125,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "been training my team all over.\p" .string "Let’s meet again.$" +BattleFrontier_PokeNav_2AA5AD:: @ 82AA5AD .string "Ah, hello, {PLAYER}{STRING 5}!\n" .string "This is {STR_VAR_1}!\p" .string "I hope you’ve been keeping well.\p" @@ -7081,6 +7134,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "{PLAYER}{STRING 5}, try to be active like me.\n" .string "See you again!$" +BattleFrontier_PokeNav_2AA64D:: @ 82AA64D .string "Oh, hi, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\p" .string "Are you doing good?\p" @@ -7088,6 +7142,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "though.\p" .string "Bye-bye!$" +BattleFrontier_PokeNav_2AA6AF:: @ 82AA6AF .string "Hi! {PLAYER}{STRING 5}, hello!\n" .string "This is {STR_VAR_1}!\p" .string "I battled another TRAINER earlier.\n" @@ -7095,11 +7150,13 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "My {STR_VAR_2} really worked hard\n" .string "for me. This is so great!$" +BattleFrontier_PokeNav_2AA730:: @ 82AA730 .string "Hello, {PLAYER}{STRING 5}!\n" .string "It’s {STR_VAR_1}!\p" .string "I had a battle yesterday and\n" .string "I won! It’s fantastic!$" +BattleFrontier_PokeNav_2AA77A:: @ 82AA77A .string "Hey there, {PLAYER}!\n" .string "It’s me, {STR_VAR_1}!\l" .string "How’s your battling?\p" @@ -7108,6 +7165,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "The next time I battle you,\n" .string "{PLAYER}, it won’t be me losing!$" +BattleFrontier_PokeNav_2AA81C:: @ 82AA81C .string "Hey, {PLAYER}.\n" .string "{STR_VAR_1} here.\p" .string "I had a match earlier.\n" @@ -7115,6 +7173,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "My {STR_VAR_2} put on one\n" .string "inspired showing.$" +BattleFrontier_PokeNav_2AA88C:: @ 82AA88C .string "Hiya, {PLAYER}{STRING 5}!\n" .string "It’s {STR_VAR_1}.\p" .string "How are things with you?\n" @@ -7124,6 +7183,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "You wait. I’m going to beat you\n" .string "next time! Right, take care!$" +BattleFrontier_PokeNav_2AA934:: @ 82AA934 .string "Hey, {PLAYER}{STRING 5}.\n" .string "{STR_VAR_1} here.\p" .string "How’s it going for you?\p" @@ -7132,6 +7192,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "When we have our next battle,\n" .string "I’m sure not going to lose!$" +BattleFrontier_PokeNav_2AA9D3:: @ 82AA9D3 .string "{PLAYER}{STRING 5}?\n" .string "{STR_VAR_1} here.\p" .string "My {STR_VAR_2} is a force!\n" @@ -7139,6 +7200,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I can’t wait to have a rematch\n" .string "with you.$" +BattleFrontier_PokeNav_2AAA40:: @ 82AAA40 .string "Oh, {PLAYER}{STRING 5}, how do you do?\n" .string "This is {STR_VAR_1} speaking.\p" .string "I hope you’ve been well.\n" @@ -7147,6 +7209,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "hard to get the win.\p" .string "See you again!$" +BattleFrontier_PokeNav_2AAAE4:: @ 82AAAE4 .string "Oh, {PLAYER}{STRING 5}, hi there!\n" .string "This is {STR_VAR_1}!\p" .string "How are your POKéMON holding up?\n" @@ -7156,6 +7219,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I wish I could’ve shown you!\n" .string "See you again!$" +BattleFrontier_PokeNav_2AAB8C:: @ 82AAB8C .string "Oh, {PLAYER}{STRING 5}, hello…\n" .string "This is {STR_VAR_1}.\p" .string "How has life been treating you?\p" @@ -7164,6 +7228,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I just won a battle with them.\n" .string "See you around.$" +BattleFrontier_PokeNav_2AAC25:: @ 82AAC25 .string "Ah, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\p" .string "Been in any battles lately?\n" @@ -7171,6 +7236,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’m on a roll! Gahahaha!\n" .string "Well, see you!$" +BattleFrontier_PokeNav_2AAC9D:: @ 82AAC9D .string "Hello, {PLAYER}{STRING 5}.\n" .string "It’s me, {STR_VAR_1}.\p" .string "I trust you’ve been well?\n" @@ -7179,6 +7245,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’m not stepping aside to you\l" .string "youngsters yet!$" +BattleFrontier_PokeNav_2AAD41:: @ 82AAD41 .string "Ah, hello, {PLAYER}{STRING 5}!\n" .string "This is {STR_VAR_1}!\p" .string "I hope you’ve been keeping well.\n" @@ -7188,6 +7255,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "quite yet!\p" .string "See you again!$" +BattleFrontier_PokeNav_2AAE00:: @ 82AAE00 .string "Oh, hi, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\p" .string "I was in a battle recently, and my\n" @@ -7195,6 +7263,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I wish you could have seen it,\n" .string "{PLAYER}{STRING 5}. Bye-bye!$" +BattleFrontier_PokeNav_2AAE7F:: @ 82AAE7F .string "Hi! {PLAYER}, hello!\n" .string "This is {STR_VAR_1}.\p" .string "Huh? Wait, you’re near\n" @@ -7202,6 +7271,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Oh, wow, we have to battle, then!\n" .string "I’ll be waiting! See you!$" +BattleFrontier_PokeNav_2AAEF1:: @ 82AAEF1 .string "Hello, {PLAYER}!\n" .string "It’s {STR_VAR_1}.\p" .string "Oh? You happen to be around\n" @@ -7209,6 +7279,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Would you like to battle now?\n" .string "I’ll wait for you! See you!$" +BattleFrontier_PokeNav_2AAF69:: @ 82AAF69 .string "Hey there, {PLAYER}!\n" .string "It’s me, {STR_VAR_1}.\p" .string "Oh, hey, are you near\n" @@ -7218,6 +7289,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’m not losing again!\n" .string "I’ll be waiting! Catch you soon!$" +BattleFrontier_PokeNav_2AB010:: @ 82AB010 .string "Hey, {PLAYER}{STRING 5}.\n" .string "{STR_VAR_1} here.\p" .string "Whereabouts are you now?\n" @@ -7225,6 +7297,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Want to battle now?\n" .string "I’ll wait for you. See you!$" +BattleFrontier_PokeNav_2AB076:: @ 82AB076 .string "Hiya, {PLAYER}{STRING 5}!\n" .string "It’s {STR_VAR_1}.\l" .string "How are things with you?\p" @@ -7235,6 +7308,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’ll keep an eye out for you.\n" .string "See you soon!$" +BattleFrontier_PokeNav_2AB11A:: @ 82AB11A .string "Hey, {PLAYER}{STRING 5}.\n" .string "{STR_VAR_1} here.\l" .string "How are your POKéMON keeping?\p" @@ -7245,6 +7319,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I can wait, sure.\n" .string "See you!$" +BattleFrontier_PokeNav_2AB1B4:: @ 82AB1B4 .string "…Er, {PLAYER}{STRING 5}?\n" .string "{STR_VAR_1} here…\p" .string "Oh, you happen to be around\n" @@ -7254,6 +7329,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’ll show you my POKéMON.\n" .string "I’ll wait for you.$" +BattleFrontier_PokeNav_2AB23D:: @ 82AB23D .string "Oh, {PLAYER}{STRING 5}, how do you do?\n" .string "This is {STR_VAR_1} speaking.\p" .string "I hope you’re doing well.\n" @@ -7263,6 +7339,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’ll wait for you.\n" .string "See you soon!$" +BattleFrontier_PokeNav_2AB2E9:: @ 82AB2E9 .string "Oh, {PLAYER}{STRING 5}, hi there!\n" .string "This is {STR_VAR_1}!\p" .string "Are you keeping up?\n" @@ -7271,6 +7348,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "should battle?\p" .string "Don’t keep me waiting too long!$" +BattleFrontier_PokeNav_2AB382:: @ 82AB382 .string "Oh, {PLAYER}{STRING 5}, hello…\n" .string "This is {STR_VAR_1}.\p" .string "How are things with you?\n" @@ -7279,6 +7357,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’m ready and waiting.\n" .string "Be quick!$" +BattleFrontier_PokeNav_2AB410:: @ 82AB410 .string "Ah, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\p" .string "Ah, so where you are now is\n" @@ -7288,6 +7367,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’ll wait around for you!\n" .string "See you real quick!$" +BattleFrontier_PokeNav_2AB4B0:: @ 82AB4B0 .string "Hello, {PLAYER}{STRING 5}.\n" .string "It’s me, {STR_VAR_1}.\l" .string "Where might you be now?\p" @@ -7298,6 +7378,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I can wait.\n" .string "See you!$" +BattleFrontier_PokeNav_2AB538:: @ 82AB538 .string "Ah, hello, {PLAYER}{STRING 5}!\n" .string "This is {STR_VAR_1}!\p" .string "I hope you’ve been keeping well.\n" @@ -7307,6 +7388,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’ll wait for you.\n" .string "Bye for now.$" +BattleFrontier_PokeNav_2AB5E4:: @ 82AB5E4 .string "Oh, hi, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\p" .string "You’re what? …{STR_VAR_2}?\n" @@ -7316,12 +7398,14 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’ll be looking for you!\n" .string "Bye-bye!$" +BattleFrontier_PokeNav_2AB670:: @ 82AB670 .string "Hi! {PLAYER}, hello!\n" .string "This is {STR_VAR_1}.\p" .string "Want to have a battle with me?\p" .string "I’ll be waiting for you around\n" .string "{STR_VAR_2}!$" +BattleFrontier_PokeNav_2AB6CD:: @ 82AB6CD .string "Hello, {PLAYER}!\n" .string "It’s {STR_VAR_1}.\p" .string "Would you like to have a battle\n" @@ -7329,6 +7413,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "You can find me around\n" .string "{STR_VAR_2}. I’ll be waiting!$" +BattleFrontier_PokeNav_2AB73C:: @ 82AB73C .string "Hey there, {PLAYER}!\n" .string "It’s me, {STR_VAR_1}.\p" .string "My POKéMON have grown a lot\n" @@ -7339,6 +7424,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’ll be waiting for you around\n" .string "{STR_VAR_2}.$" +BattleFrontier_PokeNav_2AB808:: @ 82AB808 .string "Hey, {PLAYER}{STRING 5}.\n" .string "{STR_VAR_1} here.\l" .string "How are things with you?\p" @@ -7349,6 +7435,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Let’s meet up around\n" .string "{STR_VAR_2}, okay?$" +BattleFrontier_PokeNav_2AB8B7:: @ 82AB8B7 .string "Hiya, {PLAYER}{STRING 5}!\n" .string "It’s {STR_VAR_1}.\p" .string "My POKéMON are growing up in\n" @@ -7358,6 +7445,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’ll keep an eye out for you around\n" .string "{STR_VAR_2}. See you soon!$" +BattleFrontier_PokeNav_2AB95D:: @ 82AB95D .string "Hey, {PLAYER}{STRING 5}.\n" .string "{STR_VAR_1} here.\l" .string "I hope you’re on top of things.\p" @@ -7367,6 +7455,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "come to {STR_VAR_2}.\p" .string "See you!$" +BattleFrontier_PokeNav_2ABA03:: @ 82ABA03 .string "…Er, {PLAYER}{STRING 5}?\n" .string "{STR_VAR_1} here…\l" .string "So? Are your POKéMON growing?\p" @@ -7376,6 +7465,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Come see me for a match.\p" .string "See you around.$" +BattleFrontier_PokeNav_2ABA9F:: @ 82ABA9F .string "Oh, {PLAYER}{STRING 5}, how do you do?\n" .string "This is {STR_VAR_1} speaking.\p" .string "I hope you’re doing well.\n" @@ -7385,6 +7475,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’ll be around {STR_VAR_2}.\n" .string "Until then, good-bye!$" +BattleFrontier_PokeNav_2ABB62:: @ 82ABB62 .string "Oh, {PLAYER}{STRING 5}, hi there!\n" .string "This is {STR_VAR_1}!\l" .string "How are your POKéMON doing?\p" @@ -7394,6 +7485,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "so let’s battle if you’re close by.\p" .string "Hope I see you soon!$" +BattleFrontier_PokeNav_2ABC26:: @ 82ABC26 .string "Oh, {PLAYER}{STRING 5}, hello…\n" .string "This is {STR_VAR_1}.\l" .string "So, how are things with you?\p" @@ -7404,6 +7496,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’ll be around {STR_VAR_2}.\n" .string "Come see me if you’re close.$" +BattleFrontier_PokeNav_2ABCE9:: @ 82ABCE9 .string "Ah, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\l" .string "Where might you be now?\p" @@ -7413,6 +7506,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’m around {STR_VAR_2} now.\n" .string "I hope you’ll seek us out.$" +BattleFrontier_PokeNav_2ABDA2:: @ 82ABDA2 .string "Hello, {PLAYER}{STRING 5}.\n" .string "It’s me, {STR_VAR_1}.\p" .string "I should tell you, my POKéMON have\n" @@ -7422,6 +7516,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "We’ll be around {STR_VAR_2}.\n" .string "Come see us anytime!$" +BattleFrontier_PokeNav_2ABE5E:: @ 82ABE5E .string "Ah, hello, {PLAYER}{STRING 5}!\n" .string "This is {STR_VAR_1}!\l" .string "Are your POKéMON keeping well?\p" @@ -7432,6 +7527,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "If you’re near {STR_VAR_2},\n" .string "do come see us.$" +BattleFrontier_PokeNav_2ABF36:: @ 82ABF36 .string "Oh, hi, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\l" .string "Keeping well, I hope.\p" @@ -7443,6 +7539,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "{STR_VAR_2}.\p" .string "Come see us anytime, okay?$" +BattleFrontier_PokeNav_2AC009:: @ 82AC009 .string "It’s me, the mountain-loving\n" .string "{STR_VAR_1}!\p" .string "Well, since we met, have you grown\n" @@ -7451,6 +7548,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Next time, we’ll meet somewhere\n" .string "around {STR_VAR_2}.$" +BattleFrontier_PokeNav_2AC0BD:: @ 82AC0BD .string "This is {STR_VAR_1}.\n" .string "Hello.\p" .string "I was just telling a new TRAINER\n" @@ -7461,6 +7559,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "that everyone will admire.\p" .string "I hope we meet again!$" +BattleFrontier_PokeNav_2AC18C:: @ 82AC18C .string "Hello! It’s {STR_VAR_1}.\p" .string "I love where I am now.\n" .string "It’s pleasant with sweet aromas!\p" @@ -7468,6 +7567,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "and they burst into bloom.\p" .string "See you again sometime!$" +BattleFrontier_PokeNav_2AC228:: @ 82AC228 .string "Hello! Thirty years of exploration,\n" .string "{STR_VAR_1} at your service!\p" .string "It seems that you’re energetically\n" @@ -7477,6 +7577,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Now, if you’ll excuse me,\n" .string "I have ruins to explore.$" +BattleFrontier_PokeNav_2AC30C:: @ 82AC30C .string "It’s {STR_VAR_1}!\p" .string "Know what I’m doing today?\n" .string "Looking at waves from the beach!\p" @@ -7484,6 +7585,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "The sea is the prettiest from here.\l" .string "I’m getting hungry, so bye-bye!$" +BattleFrontier_PokeNav_2AC3B6:: @ 82AC3B6 .string "Munch-chew…\n" .string "Oh, hi, it’s {STR_VAR_1}.\l" .string "I love eating on the beach.\p" @@ -7491,6 +7593,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "great. We’re fully fueled!\l" .string "I’m going for a swim. Bye!$" +BattleFrontier_PokeNav_2AC446:: @ 82AC446 .string "Hello, this is {STR_VAR_1}…\p" .string "I’ve grown a little jaded with this\n" .string "whole COOLTRAINER thing…\p" @@ -7506,6 +7609,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "But when I see you next,\n" .string "don’t worry, I won’t whine!$" +BattleFrontier_PokeNav_2AC5C7:: @ 82AC5C7 .string "Yahoo, it’s {STR_VAR_1}!\n" .string "How do you do?\p" .string "I’ve been raising my POKéMON with\n" @@ -7515,6 +7619,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Isn’t it great to have TRAINER\n" .string "friends? Let’s meet again!$" +BattleFrontier_PokeNav_2AC682:: @ 82AC682 .string "It’s {STR_VAR_1}…\n" .string "Right now, behind you…\l" .string "Wasn’t there something…?\p" @@ -7526,6 +7631,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Giggle…\n" .string "Farewell…$" +BattleFrontier_PokeNav_2AC755:: @ 82AC755 .string "This is {STR_VAR_1}.\n" .string "How do you do?\p" .string "Isn’t it convenient that we can\n" @@ -7536,6 +7642,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I should be going now.\n" .string "I’m glad we had this chat.$" +BattleFrontier_PokeNav_2AC82C:: @ 82AC82C .string "It’s {STR_VAR_1}!\n" .string "Will you listen to this?\p" .string "I like the SAFARI ZONE a lot,\n" @@ -7547,6 +7654,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’m off to the SAFARI ZONE again!\n" .string "Catch you!$" +BattleFrontier_PokeNav_2AC914:: @ 82AC914 .string "Hello, {STR_VAR_1} here.\n" .string "Yes, correct, I am rich, yes.\p" .string "I should tell you, my wealth has\n" @@ -7560,6 +7668,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Oh, you must excuse me, I have this\n" .string "formal dinner to attend.$" +BattleFrontier_PokeNav_2ACA59:: @ 82ACA59 .string "Ufufufufu…\n" .string "It’s me, {STR_VAR_1}…\p" .string "Can you guess what I’m seeing?\n" @@ -7569,6 +7678,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I… I’m kind of busy now.\n" .string "I have to go.$" +BattleFrontier_PokeNav_2ACB02:: @ 82ACB02 .string "Oh, it’s {STR_VAR_1}!\p" .string "I was just thinking I’m getting\n" .string "bored of the ABANDONED SHIP.\p" @@ -7582,6 +7692,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "door to a match.\p" .string "Be seeing you!$" +BattleFrontier_PokeNav_2ACC3F:: @ 82ACC3F .string "I’m {STR_VAR_1}!\n" .string "The man of the sea!\p" .string "You know what I think?\p" @@ -7593,6 +7704,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "It’s a great training opportunity!\n" .string "Sorry, but I have to go!$" +BattleFrontier_PokeNav_2ACD2F:: @ 82ACD2F .string "It’s {STR_VAR_1}! Listen, I’ve been\n" .string "teaching karate to my POKéMON.\p" .string "But now they’re better than me!\n" @@ -7603,6 +7715,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "We have to battle again!\n" .string "Ugwaah!$" +BattleFrontier_PokeNav_2ACE1E:: @ 82ACE1E .string "It’s me, {STR_VAR_1}.\n" .string "How’re your travels unwinding?\p" .string "…Whoa, is that right?\n" @@ -7614,6 +7727,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’d better get this tune properly\n" .string "written, so I’ve got to fly! Later!$" +BattleFrontier_PokeNav_2ACF32:: @ 82ACF32 .string "This is {STR_VAR_1}…\n" .string "Hear my new song.\p" .string "Lalala, {STR_VAR_2}, {STR_VAR_2}!\n" @@ -7623,6 +7737,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "{STR_VAR_1} and {STR_VAR_2}…\p" .string "Repeat chorus, fade…$" +BattleFrontier_PokeNav_2ACFBE:: @ 82ACFBE .string "I’m {STR_VAR_1}, you know,\n" .string "the camping expert!\p" .string "When we battled, I couldn’t help\n" @@ -7634,6 +7749,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Battle with us again, okay?\n" .string "Oh, and let’s go camping, too!$" +BattleFrontier_PokeNav_2AD0AC:: @ 82AD0AC .string "It’s me, me, {STR_VAR_1}!\p" .string "I’d like to climb other mountains\n" .string "than this one, to be honest.\p" @@ -7643,6 +7759,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "with ladies around, let me know!\p" .string "Ehehehe, see you around!$" +BattleFrontier_PokeNav_2AD194:: @ 82AD194 .string "… … … … … …\n" .string "… … … … … …\l" .string "It’s {STR_VAR_1}…\p" @@ -7650,6 +7767,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "… … … … … …\l" .string "That’s all today…$" +BattleFrontier_PokeNav_2AD1DF:: @ 82AD1DF .string "This is {STR_VAR_1}. Today, I had\n" .string "this feeling I would chat with you.\p" .string "My desire to defeat you builds\n" @@ -7659,6 +7777,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’m glad you heard me out.\n" .string "See you!$" +BattleFrontier_PokeNav_2AD2A8:: @ 82AD2A8 .string "It’s {STR_VAR_1}.\p" .string "When there’s a strong TRAINER\n" .string "nearby, I can sometimes sense that\l" @@ -7668,6 +7787,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’ll be waiting for your visit.\n" .string "Bye!$" +BattleFrontier_PokeNav_2AD34F:: @ 82AD34F .string "Hello, this is {STR_VAR_1}.\n" .string "You sound well, {PLAYER}{STRING 5}.\p" .string "I’ve traveled around the world,\n" @@ -7679,6 +7799,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "techniques.\p" .string "I do hope for a rematch.$" +BattleFrontier_PokeNav_2AD44E:: @ 82AD44E .string "Snivel… It’s… {STR_VAR_1}…\n" .string "…Sob…\p" .string "ROXANNE chewed me out in class\n" @@ -7690,6 +7811,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "the TRAINER’S SCHOOL tomorrow!\p" .string "See you later!$" +BattleFrontier_PokeNav_2AD53A:: @ 82AD53A .string "It’s {STR_VAR_1}!\p" .string "ROXANNE let me battle with her\n" .string "yesterday.\p" @@ -7702,6 +7824,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’m going to really focus and work!\n" .string "I’d better go!$" +BattleFrontier_PokeNav_2AD642:: @ 82AD642 .string "Hi, it’s ANNA! I’m with my junior\n" .string "partner MEG again today.\p" .string "I really love caring for MEG and\n" @@ -7719,6 +7842,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I have to go now.\n" .string "It’s time for our snack!$" +BattleFrontier_PokeNav_2AD801:: @ 82AD801 .string "I love POKéMON!\n" .string "It’s {STR_VAR_1} from the FAN CLUB!\p" .string "You have to hear this!\n" @@ -7732,6 +7856,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Sorry, but I can’t talk now!\n" .string "You’ll have to hear this next time!$" +BattleFrontier_PokeNav_2AD92E:: @ 82AD92E .string "Ohoho!\p" .string "This is {STR_VAR_1}! I can’t wait to\n" .string "tell you about my darling POKéMON!\p" @@ -7747,6 +7872,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Well, I must be going.\n" .string "Bye, now!$" +BattleFrontier_PokeNav_2ADA8F:: @ 82ADA8F .string "I am… {STR_VAR_1}.\n" .string "People call me an EXPERT.\p" .string "But there is one thing I know.\n" @@ -7758,6 +7884,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "something deep and profound!\p" .string "I shall leave you in good spirits!$" +BattleFrontier_PokeNav_2ADB9B:: @ 82ADB9B .string "It’s {STR_VAR_1}.\n" .string "I’m glad to chat with you!\p" .string "I am feeling alive and refreshed\n" @@ -7768,6 +7895,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I imagine you’ll become an EXPERT\n" .string "in your old age! Ohohoho…$" +BattleFrontier_PokeNav_2ADC92:: @ 82ADC92 .string "Yay! This is {STR_VAR_1}!\n" .string "What’s up?\p" .string "I might be imagining this, but when\n" @@ -7783,6 +7911,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "You didn’t really believe that?\l" .string "Ehehehe, that’s all! Bye now!$" +BattleFrontier_PokeNav_2ADE08:: @ 82ADE08 .string "Ahoy!\n" .string "{STR_VAR_1} here!\p" .string "As always, I’m fishing with wild\n" @@ -7796,6 +7925,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Gotta go!\n" .string "Find me some new fishing spots!$" +BattleFrontier_PokeNav_2ADF07:: @ 82ADF07 .string "Hey, there! It’s {STR_VAR_1}.\n" .string "Are you taking it casually?\p" .string "Ever since I was a kid, you know,\n" @@ -7813,6 +7943,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "But, hey, be cool. Take it casual.\n" .string "See you around.$" +BattleFrontier_PokeNav_2AE0D9:: @ 82AE0D9 .string "This is {STR_VAR_1}!\n" .string "I’m cycling right now.\p" .string "I love swimming and running,\n" @@ -7826,6 +7957,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "You should make the challenge, too!\n" .string "See you!$" +BattleFrontier_PokeNav_2AE1FD:: @ 82AE1FD .string "Yo, this is {STR_VAR_1}! I’m smack\n" .string "in the middle of a triathlon!\p" .string "But, hey, I’ve always got time to\n" @@ -7839,6 +7971,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’m getting run down…\l" .string "Gasp… Have…to…go…$" +BattleFrontier_PokeNav_2AE327:: @ 82AE327 .string "Hi, it’s {STR_VAR_1}.\n" .string "If you want to improve endurance,\l" .string "high-altitude training is it!\p" @@ -7847,6 +7980,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’m getting oxygen starved, too!\n" .string "See you!$" +BattleFrontier_PokeNav_2AE3DA:: @ 82AE3DA .string "Oh, it’s {STR_VAR_1}, hello.\p" .string "I’ve been swimming a lot but I still\n" .string "can’t seem to reach EVERGRANDE.\p" @@ -7855,6 +7989,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Wahahaha.\l" .string "Take care!$" +BattleFrontier_PokeNav_2AE489:: @ 82AE489 .string "Hey, it’s {STR_VAR_1}…\n" .string "Whoops!\p" .string "Splash!\p" @@ -7870,6 +8005,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Anyways, I’m busy sunbathing,\n" .string "so let’s chat another time.$" +BattleFrontier_PokeNav_2AE5CD:: @ 82AE5CD .string "Hello, this is {STR_VAR_1}.\p" .string "Out of the three triathlon events,\n" .string "I like swimming best.\p" @@ -7878,12 +8014,14 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Ooh, triathlon is such a grueling\n" .string "test of human endurance! Bye!$" +BattleFrontier_PokeNav_2AE698:: @ 82AE698 .string "Hello, {PLAYER}{STRING 5}.\n" .string "{STR_VAR_1} here.\p" .string "How are your POKéMON doing?\p" .string "My DRAGON POKéMON appear to be\n" .string "in peak form. Bye for now.$" +BattleFrontier_PokeNav_2AE704:: @ 82AE704 .string "{STR_VAR_1} here.\p" .string "My {STR_VAR_2} has grown even more\n" .string "tough than that last time.\p" @@ -7891,6 +8029,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "You wait till next time!\p" .string "See you around!$" +BattleFrontier_PokeNav_2AE78F:: @ 82AE78F .string "It is {STR_VAR_1} here.\p" .string "I have continued with my studies\n" .string "in the art of concealment.\p" @@ -7900,6 +8039,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Like smoke I disappear!\n" .string "Farewell!$" +BattleFrontier_PokeNav_2AE859:: @ 82AE859 .string "This is {STR_VAR_1}.\n" .string "I kept up my training since we met.\p" .string "My {STR_VAR_2} is getting pretty\n" @@ -7907,6 +8047,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Training on a beach is effective,\n" .string "just as I thought. Bye now!$" +BattleFrontier_PokeNav_2AE8E6:: @ 82AE8E6 .string "How do you do?\n" .string "This is {STR_VAR_1}.\p" .string "I wonder when this yucky volcanic\n" @@ -7915,6 +8056,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "up the pattern on my parasol…\p" .string "Let’s promise to meet again!$" +BattleFrontier_PokeNav_2AE998:: @ 82AE998 .string "Hi, {STR_VAR_1} here.\p" .string "Did you know that it’s easier to\n" .string "float in the sea than a pool?\p" @@ -7926,6 +8068,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "…Where am I, anyway?\n" .string "I’d better go!$" +BattleFrontier_PokeNav_2AEA8F:: @ 82AEA8F .string "Oh, {PLAYER}{STRING 5}, hello!\n" .string "This is {STR_VAR_1}.\l" .string "I’m up in the mountains now.\p" @@ -7937,12 +8080,14 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’m going to try that!\n" .string "Bye-bye!$" +BattleFrontier_PokeNav_2AEB77:: @ 82AEB77 .string "Oh, hi, hi, this is {STR_VAR_1}!\p" .string "I’m raising POKéMON with LIV!\n" .string "We’re trying very hard!\p" .string "If we try harder, can we become\n" .string "number one? Bye-bye!$" +BattleFrontier_PokeNav_2AEBFA:: @ 82AEBFA .string "{STR_VAR_1} here!\p" .string "I’m a SAILOR, but I’m not on a boat\n" .string "now.\p" @@ -7952,6 +8097,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "while staring out across the waves.\p" .string "All right, next time!$" +BattleFrontier_PokeNav_2AECC1:: @ 82AECC1 .string "It’s {STR_VAR_1}.\n" .string "So? Get any more POKéMON?\p" .string "If you catch a new POKéMON,\n" @@ -7959,6 +8105,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I won’t whine for it, honest.\n" .string "I’ll be waiting. See you.$" +BattleFrontier_PokeNav_2AED52:: @ 82AED52 .string "This is {STR_VAR_1}.\p" .string "Are you raising your POKéMON\n" .string "in the optimal way?\p" @@ -7969,6 +8116,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "POKéMON, you should come out to\l" .string "{STR_VAR_2}. Take care now.$" +BattleFrontier_PokeNav_2AEE35:: @ 82AEE35 .string "Hi, this is {STR_VAR_1}.\p" .string "I gave a {POKEBLOCK} to my {STR_VAR_2}.\n" .string "It seemed to enjoy it very much.\p" @@ -7977,6 +8125,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I find that quite fascinating.\n" .string "Please do take care.$" +BattleFrontier_PokeNav_2AEEF4:: @ 82AEEF4 .string "{STR_VAR_1} here.\p" .string "If you cooperate with POKéMON,\n" .string "one can be comfortable in the wild.\p" @@ -7987,6 +8136,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I think you’re on the right track!\n" .string "Catch you later!$" +BattleFrontier_PokeNav_2AEFDA:: @ 82AEFDA .string "Hi, it’s {STR_VAR_1}. You know,\n" .string "the TRAINER who’s always prepared!\p" .string "{PLAYER}{STRING 5}, do you have enough items?\n" @@ -7997,6 +8147,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’d better go check my own\n" .string "supplies! Be vigilant!$" +BattleFrontier_PokeNav_2AF0E7:: @ 82AF0E7 .string "It’s {STR_VAR_1}!\n" .string "It’s {STR_VAR_1}!\p" .string "{STR_VAR_2} is a very busy\n" @@ -8007,6 +8158,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "How did you do today?\n" .string "Tell me about it next time, okay?$" +BattleFrontier_PokeNav_2AF1B8:: @ 82AF1B8 .string "It’s me, {STR_VAR_1}.\p" .string "I’m popular because I have lots\n" .string "of BUG POKéMON, right?\p" @@ -8019,6 +8171,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Snivel…\n" .string "See you!$" +BattleFrontier_PokeNav_2AF2C4:: @ 82AF2C4 .string "Hah! Hah! Hah! Hah!\p" .string "Hi! It’s {STR_VAR_1}! Hah! Hah!\p" .string "Trying to chat…\n" @@ -8029,6 +8182,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "We’ll chat…another time…\l" .string "Hah! Hah! Hah!$" +BattleFrontier_PokeNav_2AF371:: @ 82AF371 .string "Oh, hi!\p" .string "I’m still searching for treasures\n" .string "with KIRA!\p" @@ -8042,6 +8196,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "You’re my one and only!\p" .string "…{PLAYER}, I have to go, bye!$" +BattleFrontier_PokeNav_2AF480:: @ 82AF480 .string "This is {STR_VAR_1}!\p" .string "I went to DEWFORD’s GYM again\n" .string "for training.\p" @@ -8062,6 +8217,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Forget this chat ever happened,\n" .string "how about it? So long!$" +BattleFrontier_PokeNav_2AF671:: @ 82AF671 .string "It’s a pleasure to chat with\n" .string "a young TRAINER like you.\p" .string "I imagine that you will continue to\n" @@ -8076,6 +8232,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Hahaha!\n" .string "Never be discouraged!$" +BattleFrontier_PokeNav_2AF7D8:: @ 82AF7D8 .string "Hi, this is {STR_VAR_1}!\n" .string "We just won a battle!\p" .string "We don’t win often, but it was this\n" @@ -8089,6 +8246,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "to her next time?\p" .string "Okay, see you!$" +BattleFrontier_PokeNav_2AF8F7:: @ 82AF8F7 .string "{STR_VAR_1} here, yes.\n" .string "I headed out to sea yesterday.\p" .string "I had been hoping to find a new\n" @@ -8103,6 +8261,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That’s all I have to say!\n" .string "Farewell for now!$" +BattleFrontier_PokeNav_2AFA39:: @ 82AFA39 .string "Ahoy there!\n" .string "It’s me, {STR_VAR_1}!\l" .string "I’m out on ROUTE 108 now!\l" @@ -8114,6 +8273,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That’s all from ROUTE 108!\n" .string "Brought to you by {STR_VAR_1}!$" +BattleFrontier_PokeNav_2AFB26:: @ 82AFB26 .string "It’s {STR_VAR_1}!\p" .string "I’m kind of busy, but I figured\n" .string "I should let you know that I’ve\l" @@ -8123,6 +8283,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I think we’ll be good rivals,\n" .string "you and I. Good-bye for now!$" +BattleFrontier_PokeNav_2AFC07:: @ 82AFC07 .string "Hi! This is {STR_VAR_1}.\n" .string "I heard the news!\p" .string "They say you did excellent at\n" @@ -8130,6 +8291,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "It’s awesome, {STR_VAR_3} straight wins?\n" .string "See you!$" +BattleFrontier_PokeNav_2AFC78:: @ 82AFC78 .string "Hello, it’s {STR_VAR_1}!\n" .string "I heard about you!\p" .string "They said you won {STR_VAR_3} straight\n" @@ -8137,6 +8299,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That’s special! I should try\n" .string "harder, too! See you!$" +BattleFrontier_PokeNav_2AFCFF:: @ 82AFCFF .string "Hey there, {PLAYER}!\n" .string "It’s me, {STR_VAR_1}.\p" .string "I heard you went on a tear at\n" @@ -8146,6 +8309,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’d better get it together, too!\n" .string "Catch you soon!$" +BattleFrontier_PokeNav_2AFDA7:: @ 82AFDA7 .string "Hey, {PLAYER}{STRING 5}.\n" .string "{STR_VAR_1} here. What’s up?\p" .string "There’s a rumor going around that\n" @@ -8154,6 +8318,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’d better step it up, too.\n" .string "See you!$" +BattleFrontier_PokeNav_2AFE3D:: @ 82AFE3D .string "Hiya, {PLAYER}{STRING 5}!\n" .string "It’s {STR_VAR_1}.\p" .string "You were at the {STR_VAR_2}\n" @@ -8162,6 +8327,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’d better work on my POKéMON more.\n" .string "See you soon!$" +BattleFrontier_PokeNav_2AFECA:: @ 82AFECA .string "Hey, {PLAYER}{STRING 5}.\n" .string "{STR_VAR_1} here. How are you?\p" .string "By the way, I heard you pulled off\n" @@ -8170,6 +8336,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That inspires me to focus on\n" .string "raising my team.$" +BattleFrontier_PokeNav_2AFF64:: @ 82AFF64 .string "…Er, {PLAYER}{STRING 5}?\n" .string "{STR_VAR_1} here…\p" .string "Oh, yeah, you were over at\n" @@ -8178,6 +8345,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Oh, there goes a rare POKéMON!\n" .string "I have to go!$" +BattleFrontier_PokeNav_2AFFF0:: @ 82AFFF0 .string "Oh, {PLAYER}{STRING 5}, how do you do?\n" .string "This is {STR_VAR_1} speaking.\l" .string "I hope you’re doing well.\p" @@ -8187,6 +8355,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That’s very impressive!\n" .string "I hope you stay successful.$" +BattleFrontier_PokeNav_2B00B5:: @ 82B00B5 .string "Oh, {PLAYER}{STRING 5}, hi there!\n" .string "This is {STR_VAR_1}!\p" .string "I heard! Your {STR_VAR_3}-win streak at\n" @@ -8194,6 +8363,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That is so cool!\n" .string "I’d better try harder, too!$" +BattleFrontier_PokeNav_2B0129:: @ 82B0129 .string "Oh, {PLAYER}{STRING 5}, hello…\n" .string "This is {STR_VAR_1}.\p" .string "You won {STR_VAR_3} straight battles at\n" @@ -8201,6 +8371,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That’s quite the accomplishment.\n" .string "I need to work harder.$" +BattleFrontier_PokeNav_2B01A5:: @ 82B01A5 .string "Ah, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\p" .string "I hear you’re the terror of\n" @@ -8210,6 +8381,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "You’re good, you.\n" .string "I wonder how many I can win?$" +BattleFrontier_PokeNav_2B0232:: @ 82B0232 .string "Hello, {PLAYER}{STRING 5}.\n" .string "It’s me, {STR_VAR_1}.\l" .string "Are you keeping well?\p" @@ -8219,6 +8391,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That’s quite the tale.\n" .string "See you!$" +BattleFrontier_PokeNav_2B02D9:: @ 82B02D9 .string "Ah, hello, {PLAYER}{STRING 5}!\n" .string "This is {STR_VAR_1}!\l" .string "I hope you’ve been keeping well.\p" @@ -8227,6 +8400,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I admire your energy!\n" .string "Bye now.$" +BattleFrontier_PokeNav_2B0366:: @ 82B0366 .string "Oh, hi, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\p" .string "I heard about you!\n" @@ -8235,6 +8409,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "You’re an inspiration!\n" .string "Bye-bye!$" +BattleFrontier_PokeNav_2B03E6:: @ 82B03E6 .string "Hi! This is {STR_VAR_1}.\n" .string "I heard the news!\p" .string "They say you did excellent at\n" @@ -8242,6 +8417,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "It’s awesome--{STR_VAR_3} straight wins?\n" .string "See you!$" +BattleFrontier_PokeNav_2B0457:: @ 82B0457 .string "Hello, it’s {STR_VAR_1}!\n" .string "I heard about you!\p" .string "They said you won {STR_VAR_3} straight\n" @@ -8249,6 +8425,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That’s special! I should try\n" .string "harder, too! See you!$" +BattleFrontier_PokeNav_2B04DE:: @ 82B04DE .string "Hey there, {PLAYER}!\n" .string "It’s me, {STR_VAR_1}.\p" .string "I heard you went on a tear at\n" @@ -8258,6 +8435,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’d better get it together, too!\n" .string "Catch you soon!$" +BattleFrontier_PokeNav_2B0586:: @ 82B0586 .string "Hey, {PLAYER}{STRING 5}.\n" .string "{STR_VAR_1} here. What’s up?\p" .string "There’s a rumor going around that\n" @@ -8266,6 +8444,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’d better step it up, too.\n" .string "See you!$" +BattleFrontier_PokeNav_2B061C:: @ 82B061C .string "Hiya, {PLAYER}{STRING 5}!\n" .string "It’s {STR_VAR_1}.\p" .string "You were at the {STR_VAR_2}\n" @@ -8274,6 +8453,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Me? I’d say I’m coming along.\n" .string "See you soon!$" +BattleFrontier_PokeNav_2B06A3:: @ 82B06A3 .string "Hey, {PLAYER}{STRING 5}.\n" .string "{STR_VAR_1} here. How are you?\p" .string "By the way, I heard you pulled off\n" @@ -8282,6 +8462,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’d better try harder myself!\n" .string "See you soon!$" +BattleFrontier_PokeNav_2B073B:: @ 82B073B .string "…Er, {PLAYER}{STRING 5}?\n" .string "{STR_VAR_1} here…\p" .string "Oh, yeah, you were over at\n" @@ -8290,6 +8471,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Oh, there goes a rare POKéMON!\n" .string "I have to go!$" +BattleFrontier_PokeNav_2B07C7:: @ 82B07C7 .string "Oh, {PLAYER}{STRING 5}, how do you do?\n" .string "This is {STR_VAR_1} speaking.\l" .string "I hope you’re doing well.\p" @@ -8299,6 +8481,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That’s very impressive!\n" .string "I’d better work on my POKéMON, too!$" +BattleFrontier_PokeNav_2B0894:: @ 82B0894 .string "Oh, {PLAYER}{STRING 5}, hi there!\n" .string "This is {STR_VAR_1}!\p" .string "I heard! Your {STR_VAR_3}-win streak at\n" @@ -8306,6 +8489,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That is so cool!\n" .string "I’d better try harder, too!$" +BattleFrontier_PokeNav_2B0908:: @ 82B0908 .string "Oh, {PLAYER}{STRING 5}, hello…\n" .string "This is {STR_VAR_1}.\p" .string "You won {STR_VAR_3} straight battles at\n" @@ -8313,6 +8497,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That’s quite the accomplishment.\n" .string "I need to work harder.$" +BattleFrontier_PokeNav_2B0984:: @ 82B0984 .string "Ah, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\p" .string "I hear you’re the terror of\n" @@ -8322,6 +8507,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "You’re good, you.\n" .string "I wonder how many I can win?$" +BattleFrontier_PokeNav_2B0A11:: @ 82B0A11 .string "Hello, {PLAYER}{STRING 5}.\n" .string "It’s me, {STR_VAR_1}.\l" .string "Are you keeping well?\p" @@ -8331,6 +8517,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That’s quite the tale.\n" .string "See you!$" +BattleFrontier_PokeNav_2B0AB8:: @ 82B0AB8 .string "Ah, hello, {PLAYER}{STRING 5}!\n" .string "This is {STR_VAR_1}!\l" .string "I hope you’ve been keeping well.\p" @@ -8339,6 +8526,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I admire your energy!\n" .string "Bye now.$" +BattleFrontier_PokeNav_2B0B45:: @ 82B0B45 .string "Oh, hi, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\l" .string "I heard about you!\p" @@ -8347,6 +8535,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "You’re an inspiration!\n" .string "Bye-bye!$" +BattleFrontier_PokeNav_2B0BC5:: @ 82B0BC5 .string "Hi! {PLAYER}?\n" .string "Hello, this is {STR_VAR_1}!\l" .string "I heard the news!\p" @@ -8355,6 +8544,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "It’s awesome! I have to do better!\n" .string "See you!$" +BattleFrontier_PokeNav_2B0C4A:: @ 82B0C4A .string "Hello, it’s {STR_VAR_1}!\n" .string "I heard about you!\p" .string "They said you won {STR_VAR_3} titles\n" @@ -8362,6 +8552,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That’s super! I wonder if I can\n" .string "become a champion?$" +BattleFrontier_PokeNav_2B0CC7:: @ 82B0CC7 .string "Hey there, {PLAYER}!\n" .string "It’s me, {STR_VAR_1}.\l" .string "How’s it going?\p" @@ -8370,6 +8561,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Make it one more next time!\n" .string "Catch you soon!$" +BattleFrontier_PokeNav_2B0D4A:: @ 82B0D4A .string "Hey, {PLAYER}{STRING 5}.\n" .string "{STR_VAR_1} here.\p" .string "I heard you became the champion\n" @@ -8377,6 +8569,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Sounds like you’re working hard.\n" .string "I’ll try to keep up!$" +BattleFrontier_PokeNav_2B0DC8:: @ 82B0DC8 .string "Hiya, {PLAYER}{STRING 5}!\n" .string "It’s {STR_VAR_1}.\p" .string "I heard you won {STR_VAR_3} times\n" @@ -8384,6 +8577,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’d better get with it, too!\n" .string "See you soon!$" +BattleFrontier_PokeNav_2B0E35:: @ 82B0E35 .string "Hey, {PLAYER}{STRING 5}?\n" .string "{STR_VAR_1} here. How are you?\p" .string "By the way, I heard you became\n" @@ -8392,6 +8586,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’d better raise my POKéMON before\n" .string "you pull farther ahead.$" +BattleFrontier_PokeNav_2B0ED1:: @ 82B0ED1 .string "{PLAYER}{STRING 5}?\n" .string "{STR_VAR_1} here.\p" .string "You were at the {STR_VAR_2}\n" @@ -8401,6 +8596,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Oh, is that right.\n" .string "Okay, bye.$" +BattleFrontier_PokeNav_2B0F72:: @ 82B0F72 .string "Oh, {PLAYER}{STRING 5}, how do you do?\n" .string "This is {STR_VAR_1} speaking.\l" .string "I hope you’re doing well.\l" @@ -8410,6 +8606,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I must raise my POKéMON like you.\n" .string "See you again.$" +BattleFrontier_PokeNav_2B102A:: @ 82B102A .string "Oh, {PLAYER}{STRING 5}, hi there!\n" .string "This is {STR_VAR_1}!\p" .string "I heard! You took the title\n" @@ -8417,6 +8614,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That is so cool!\n" .string "I’d better try harder, too!$" +BattleFrontier_PokeNav_2B10A7:: @ 82B10A7 .string "Oh, {PLAYER}{STRING 5}, hello.\n" .string "This is {STR_VAR_1}.\p" .string "You won {STR_VAR_3} straight times at\n" @@ -8424,6 +8622,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That’s quite the accomplishment.\n" .string "I need to work harder.$" +BattleFrontier_PokeNav_2B1121:: @ 82B1121 .string "Ah, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\p" .string "I hear you’re the terror of\n" @@ -8435,6 +8634,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "…Pretty well impossible?\n" .string "Well, see you!$" +BattleFrontier_PokeNav_2B11D3:: @ 82B11D3 .string "Hello, {PLAYER}{STRING 5}.\n" .string "It’s me, {STR_VAR_1}.\l" .string "Are you keeping well?\p" @@ -8443,6 +8643,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That’s quite the tale.\n" .string "See you!$" +BattleFrontier_PokeNav_2B124D:: @ 82B124D .string "Ah, hello, {PLAYER}{STRING 5}!\n" .string "This is {STR_VAR_1}!\l" .string "I hope you’ve been keeping well.\p" @@ -8451,6 +8652,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I admire your energy!\n" .string "Bye now.$" +BattleFrontier_PokeNav_2B12D0:: @ 82B12D0 .string "Oh, hi, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\l" .string "I heard about you!\p" @@ -8459,6 +8661,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "You’re an inspiration!\n" .string "See you again!$" +BattleFrontier_PokeNav_2B1347:: @ 82B1347 .string "Hi! {PLAYER}?\n" .string "Hello, this is {STR_VAR_1}!\l" .string "I heard the news!\p" @@ -8467,6 +8670,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That’s awesome!\n" .string "See you!$" +BattleFrontier_PokeNav_2B13B1:: @ 82B13B1 .string "Hello, it’s {STR_VAR_1}!\n" .string "I heard about you!\p" .string "They said you won your way through\n" @@ -8474,6 +8678,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I have to try much harder!\n" .string "Bye!$" +BattleFrontier_PokeNav_2B142B:: @ 82B142B .string "Hey there, {PLAYER}!\n" .string "It’s me, {STR_VAR_1}.\l" .string "How’s it going?\p" @@ -8482,6 +8687,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Try to do even better next time!\n" .string "Catch you soon!$" +BattleFrontier_PokeNav_2B14B4:: @ 82B14B4 .string "Hey, {PLAYER}{STRING 5}.\n" .string "{STR_VAR_1} here.\p" .string "I heard you blew through {STR_VAR_3} rooms\n" @@ -8489,6 +8695,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’d better train my POKéMON and\n" .string "try to keep up!$" +BattleFrontier_PokeNav_2B1525:: @ 82B1525 .string "Hiya, {PLAYER}{STRING 5}!\n" .string "It’s {STR_VAR_1}.\p" .string "I heard you got past {STR_VAR_3} rooms\n" @@ -8496,6 +8703,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’d better get with it, too!\n" .string "See you soon!$" +BattleFrontier_PokeNav_2B158E:: @ 82B158E .string "Hey, {PLAYER}{STRING 5}?\n" .string "{STR_VAR_1} here. How are you?\p" .string "By the way, I heard you got through\n" @@ -8503,6 +8711,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’d better raise my POKéMON before\n" .string "you pull further ahead.$" +BattleFrontier_PokeNav_2B1622:: @ 82B1622 .string "{PLAYER}{STRING 5}?\n" .string "{STR_VAR_1} here.\p" .string "You were at the {STR_VAR_2}\n" @@ -8511,6 +8720,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Oh, there goes a rare POKéMON!\n" .string "Okay, bye.$" +BattleFrontier_PokeNav_2B169D:: @ 82B169D .string "Oh, {PLAYER}{STRING 5}, how do you do?\n" .string "This is {STR_VAR_1} speaking.\l" .string "I hope you’re doing well.\l" @@ -8521,6 +8731,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I must raise my POKéMON like you.\l" .string "See you again.$" +BattleFrontier_PokeNav_2B1775:: @ 82B1775 .string "Oh, {PLAYER}{STRING 5}, hi there!\n" .string "This is {STR_VAR_1}!\p" .string "I heard! You won your way through\n" @@ -8528,6 +8739,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That is so cool!\n" .string "I’d better try harder, too!$" +BattleFrontier_PokeNav_2B17F8:: @ 82B17F8 .string "Oh, {PLAYER}{STRING 5}, hello.\n" .string "This is {STR_VAR_1}.\p" .string "You won your way past {STR_VAR_3} rooms\n" @@ -8535,6 +8747,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That’s quite the accomplishment.\n" .string "I need to work harder.$" +BattleFrontier_PokeNav_2B1877:: @ 82B1877 .string "Ah, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\p" .string "I hear you’re the terror of\n" @@ -8546,6 +8759,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "…Pretty well impossible?\n" .string "Well, see you!$" +BattleFrontier_PokeNav_2B1946:: @ 82B1946 .string "Hello, {PLAYER}{STRING 5}.\n" .string "It’s me, {STR_VAR_1}.\l" .string "Are you keeping well?\p" @@ -8554,6 +8768,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That’s quite the tale.\n" .string "See you!$" +BattleFrontier_PokeNav_2B19C7:: @ 82B19C7 .string "Ah, hello, {PLAYER}{STRING 5}!\n" .string "This is {STR_VAR_1}!\l" .string "I hope you’ve been keeping well.\p" @@ -8562,6 +8777,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I admire your energy!\n" .string "Bye now.$" +BattleFrontier_PokeNav_2B1A4C:: @ 82B1A4C .string "Oh, hi, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\l" .string "I heard about you!\p" @@ -8570,6 +8786,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "You’re an inspiration!\n" .string "See you again!$" +BattleFrontier_PokeNav_2B1ACA:: @ 82B1ACA .string "Hi! {PLAYER}?\n" .string "Hello, this is {STR_VAR_1}!\l" .string "I heard the news!\p" @@ -8578,6 +8795,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That’s awesome!\n" .string "I should try that challenge.$" +BattleFrontier_PokeNav_2B1B50:: @ 82B1B50 .string "Hello, it’s {STR_VAR_1}!\n" .string "I heard about you!\p" .string "They said you won your way through\n" @@ -8585,6 +8803,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Wow, that’s fantastic!\n" .string "I’d better raise my POKéMON, too!$" +BattleFrontier_PokeNav_2B1BE4:: @ 82B1BE4 .string "Hey there, {PLAYER}!\n" .string "It’s me, {STR_VAR_1}.\l" .string "How’s it going?\p" @@ -8593,6 +8812,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "Try to do even better next time!\n" .string "Catch you soon!$" +BattleFrontier_PokeNav_2B1C6A:: @ 82B1C6A .string "Hey, {PLAYER}{STRING 5}.\n" .string "{STR_VAR_1} here.\p" .string "I heard you scaled {STR_VAR_3} floors\n" @@ -8600,6 +8820,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’d better work hard and try\n" .string "to keep up!$" +BattleFrontier_PokeNav_2B1CCF:: @ 82B1CCF .string "Hiya, {PLAYER}{STRING 5}!\n" .string "It’s {STR_VAR_1}.\p" .string "I heard you climbed {STR_VAR_3} floors\n" @@ -8607,6 +8828,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’d better get with it, too!\n" .string "See you soon!$" +BattleFrontier_PokeNav_2B1D38:: @ 82B1D38 .string "Hey, {PLAYER}{STRING 5}?\n" .string "{STR_VAR_1} here. How are you?\p" .string "By the way, I heard you got through\n" @@ -8614,6 +8836,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I’d better raise my POKéMON before\n" .string "you pull further ahead.$" +BattleFrontier_PokeNav_2B1DCD:: @ 82B1DCD .string "{PLAYER}{STRING 5}?\n" .string "{STR_VAR_1} here.\p" .string "You were at the {STR_VAR_2}\n" @@ -8623,6 +8846,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "No, huh?\n" .string "Okay, bye.$" +BattleFrontier_PokeNav_2B1E4B:: @ 82B1E4B .string "Oh, {PLAYER}{STRING 5}, how do you do?\n" .string "This is {STR_VAR_1} speaking.\l" .string "I hope you’re doing well.\l" @@ -8633,6 +8857,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I must raise my POKéMON like you.\l" .string "See you again.$" +BattleFrontier_PokeNav_2B1F24:: @ 82B1F24 .string "Oh, {PLAYER}{STRING 5}, hi there!\n" .string "This is {STR_VAR_1}!\p" .string "I heard! You won your way through\n" @@ -8640,6 +8865,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That is so cool!\n" .string "I’d better try harder, too!$" +BattleFrontier_PokeNav_2B1FA8:: @ 82B1FA8 .string "Oh, {PLAYER}{STRING 5}, hello.\n" .string "This is {STR_VAR_1}.\p" .string "You climbed {STR_VAR_3} floors inside\n" @@ -8647,6 +8873,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That’s quite the accomplishment.\n" .string "I need to work harder.$" +BattleFrontier_PokeNav_2B2022:: @ 82B2022 .string "Ah, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\p" .string "I hear you’re the terror of\n" @@ -8658,6 +8885,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "…Pretty well impossible?\n" .string "Well, see you!$" +BattleFrontier_PokeNav_2B20F3:: @ 82B20F3 .string "Hello, {PLAYER}{STRING 5}.\n" .string "It’s me, {STR_VAR_1}.\l" .string "Are you keeping well?\p" @@ -8666,6 +8894,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "That’s quite the tale.\n" .string "See you!$" +BattleFrontier_PokeNav_2B2175:: @ 82B2175 .string "Ah, hello, {PLAYER}{STRING 5}!\n" .string "This is {STR_VAR_1}!\l" .string "I hope you’ve been keeping well.\p" @@ -8674,6 +8903,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .string "I admire your energy!\n" .string "Bye now.$" +BattleFrontier_PokeNav_2B21FC:: @ 82B21FC .string "Oh, hi, {PLAYER}{STRING 5}.\n" .string "This is {STR_VAR_1}.\l" .string "I heard about you!\p" @@ -9518,11 +9748,11 @@ BattleFrontier_BattleTowerLobby_EventScript_2B688D:: @ 82B688D faceplayer setvar VAR_0x8004, 0 special sub_81A085C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6900 setvar VAR_0x8004, 10 special sub_81A085C - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B68BE checkflag FLAG_0x934 goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6E90 @@ -9530,15 +9760,15 @@ BattleFrontier_BattleTowerLobby_EventScript_2B688D:: @ 82B688D BattleFrontier_BattleTowerLobby_EventScript_2B68BE:: @ 82B68BE setvar VAR_0x8004, 11 special sub_81A085C - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B69D3 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6ACF - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6C77 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6D5C - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6DD4 release releaseall @@ -9560,7 +9790,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6925:: @ 82B6925 setvar VAR_0x8005, 6 special sub_81A085C waitstate - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B69BB setvar VAR_0x8004, 8 setvar VAR_0x8005, 0 @@ -9624,9 +9854,9 @@ BattleFrontier_BattleTowerLobby_EventScript_2B69D3:: @ 82B69D3 special sub_81A085C waitstate copyvar VAR_0x8005, VAR_RESULT - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6ABA - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6AC0 setvar VAR_0x8004, 12 special sub_81A085C @@ -9637,7 +9867,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B69D3:: @ 82B69D3 special sub_81A085C setvar VAR_0x8004, 12 special sub_81A085C - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6AC6 setvar VAR_0x8004, 16 setvar VAR_0x8005, 0 @@ -9693,11 +9923,11 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6B09:: @ 82B6B09 setvar VAR_0x8004, 19 special sub_81A085C waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B81 setvar VAR_0x8004, 20 special sub_81A085C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6C0C setvar VAR_0x8004, 16 setvar VAR_0x8005, 0 @@ -9737,7 +9967,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6B81:: @ 82B6B81 waitstate setvar VAR_0x8004, 15 special sub_81A085C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B09 BattleFrontier_BattleTowerLobby_EventScript_2B6BD4:: @ 82B6BD4 @@ -9779,7 +10009,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6C0C:: @ 82B6C0C waitstate setvar VAR_0x8004, 15 special sub_81A085C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6B09 goto BattleFrontier_BattleTowerLobby_EventScript_2B6BD4 end @@ -9810,9 +10040,9 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6C77:: @ 82B6C77 special sub_81A085C waitstate copyvar VAR_0x8005, VAR_RESULT - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6D50 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_2B6D56 setvar VAR_0x8004, 17 special sub_81A085C @@ -9918,7 +10148,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6E4D:: @ 82B6E4D BattleFrontier_BattleTowerLobby_EventScript_2B6E54:: @ 82B6E54 setvar VAR_0x8004, 24 special sub_81A085C - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6E93 applymovement 6, BattleFrontier_BattleTowerLobby_Movement_2B6E94 waitmovement 0 @@ -9927,7 +10157,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6E54:: @ 82B6E54 BattleFrontier_BattleTowerLobby_EventScript_2B6E72:: @ 82B6E72 setvar VAR_0x8004, 24 special sub_81A085C - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_2B6E93 applymovement 6, BattleFrontier_BattleTowerLobby_Movement_2B6E95 waitmovement 0 @@ -12202,232 +12432,346 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Thank you, my mentor!\n" .string "I apologize for my skepticism!$" +gBattleDomeOpponentPotential1:: .string "The best candidate to be a champ!$" +gBattleDomeOpponentPotential2:: .string "A sure-finalist team.$" +gBattleDomeOpponentPotential3:: .string "A likely top-three finisher.$" - + +gBattleDomeOpponentPotential4:: .string "A candidate to finish first.$" +gBattleDomeOpponentPotential5:: .string "A team with top-class potential.$" +gBattleDomeOpponentPotential6:: .string "The dark horse team this tournament.$" +gBattleDomeOpponentPotential7:: .string "A better-than-average team.$" +gBattleDomeOpponentPotential8:: .string "This tournament’s average team.$" +gBattleDomeOpponentPotential9:: .string "A team with average potential.$" +gBattleDomeOpponentPotential10:: .string "A weaker-than-average team.$" +gBattleDomeOpponentPotential11:: .string "A team looking for its first win.$" +gBattleDomeOpponentPotential12:: .string "One win will make this team proud.$" +gBattleDomeOpponentPotential13:: .string "Overall, a weak team.$" +gBattleDomeOpponentPotential14:: .string "A team with very low potential.$" +gBattleDomeOpponentPotential15:: .string "A team unlikely to win the tournament.$" +gBattleDomeOpponentPotential16:: .string "The team most unlikely to win.$" +gBattleDomeOpponentPotential17:: .string "The perfect, invincible superstar!$" +gBattleDomeOpponentStyle1:: .string "Willing to risk total disaster at times.$" +gBattleDomeOpponentStyle2:: .string "Skilled at enduring long battles.$" +gBattleDomeOpponentStyle3:: .string "Varies tactics to suit the opponent.$" +gBattleDomeOpponentStyle4:: .string "Has a tough winning pattern.$" +gBattleDomeOpponentStyle5:: .string "Occasionally uses a very rare move.$" +gBattleDomeOpponentStyle6:: .string "Uses startling and disruptive moves.$" +gBattleDomeOpponentStyle7:: .string "Constantly watches HP in battle.$" +gBattleDomeOpponentStyle8:: .string "Good at storing then loosing power.$" +gBattleDomeOpponentStyle9:: .string "Skilled at enfeebling foes.$" +gBattleDomeOpponentStyle10:: .string "Prefers tactics that rely on luck.$" +gBattleDomeOpponentStyle11:: .string "Attacks with a regal atmosphere.$" +gBattleDomeOpponentStyle12:: .string "Attacks with powerful, low-PP moves.$" +gBattleDomeOpponentStyle13:: .string "Skilled at enfeebling, then attacking.$" +gBattleDomeOpponentStyle14:: .string "Battles while enduring all attacks.$" +gBattleDomeOpponentStyle15:: .string "Skilled at upsetting foes emotionally.$" +gBattleDomeOpponentStyle16:: .string "Uses strong and straightforward moves.$" +gBattleDomeOpponentStyle17:: .string "Aggressively uses strong moves.$" +gBattleDomeOpponentStyle18:: .string "Battles while cleverly dodging attacks.$" +gBattleDomeOpponentStyle19:: .string "Skilled at using upsetting attacks.$" +gBattleDomeOpponentStyle20:: .string "Uses many popular moves.$" +gBattleDomeOpponentStyle21:: .string "Has moves for powerful combinations.$" +gBattleDomeOpponentStyle22:: .string "Uses high-probability attacks.$" +gBattleDomeOpponentStyle23:: .string "Aggressively uses spectacular moves.$" +gBattleDomeOpponentStyle24:: .string "Emphasizes offense over defense.$" +gBattleDomeOpponentStyle25:: .string "Emphasizes defense over offense.$" +gBattleDomeOpponentStyle26:: .string "Attacks quickly with strong moves.$" +gBattleDomeOpponentStyle27:: .string "Often uses moves with added effects.$" +gBattleDomeOpponentStyle28:: .string "Uses a well-balanced mix of moves.$" +gBattleDomeOpponentStyleUnused1:: .string "This is sample message 1.$" +gBattleDomeOpponentStyleUnused2:: .string "This is sample message 2.$" +gBattleDomeOpponentStyleUnused3:: .string "This is sample message 3.$" +gBattleDomeOpponentStyleUnused4:: .string "This is sample message 4.$" +gBattleDomeOpponentStats1:: .string "Emphasizes HP and ATTACK.$" +gBattleDomeOpponentStats2:: .string "Emphasizes HP and DEFENSE.$" +gBattleDomeOpponentStats3:: .string "Emphasizes HP and SPEED.$" +gBattleDomeOpponentStats4:: .string "Emphasizes HP and SP. ATTACK.$" +gBattleDomeOpponentStats5:: .string "Emphasizes HP and SP. DEFENSE.$" +gBattleDomeOpponentStats6:: .string "Emphasizes ATTACK and DEFENSE.$" +gBattleDomeOpponentStats7:: .string "Emphasizes ATTACK and SPEED.$" +gBattleDomeOpponentStats8:: .string "Emphasizes ATTACK and SP. ATTACK.$" +gBattleDomeOpponentStats9:: .string "Emphasizes ATTACK and SP. DEFENSE.$" +gBattleDomeOpponentStats10:: .string "Emphasizes DEFENSE and SPEED.$" +gBattleDomeOpponentStats11:: .string "Emphasizes DEFENSE and SP. ATTACK.$" +gBattleDomeOpponentStats12:: .string "Emphasizes DEFENSE and SP. DEFENSE.$" +gBattleDomeOpponentStats13:: .string "Emphasizes SPEED and SP. ATTACK.$" +gBattleDomeOpponentStats14:: .string "Emphasizes SPEED and SP. DEFENSE.$" +gBattleDomeOpponentStats15:: .string "Emphasizes SP. ATTACK and SP. DEFENSE.$" +gBattleDomeOpponentStats16:: .string "Emphasizes HP.$" +gBattleDomeOpponentStats17:: .string "Emphasizes ATTACK.$" +gBattleDomeOpponentStats18:: .string "Emphasizes DEFENSE.$" +gBattleDomeOpponentStats19:: .string "Emphasizes SPEED.$" +gBattleDomeOpponentStats20:: .string "Emphasizes SP. ATTACK.$" +gBattleDomeOpponentStats21:: .string "Emphasizes SP. DEFENSE.$" +gBattleDomeOpponentStats22:: .string "Neglects HP and ATTACK.$" +gBattleDomeOpponentStats23:: .string "Neglects HP and DEFENSE.$" +gBattleDomeOpponentStats24:: .string "Neglects HP and SPEED.$" +gBattleDomeOpponentStats25:: .string "Neglects HP and SP. ATTACK.$" +gBattleDomeOpponentStats26:: .string "Neglects HP and SP. DEFENSE.$" +gBattleDomeOpponentStats27:: .string "Neglects ATTACK and DEFENSE.$" +gBattleDomeOpponentStats28:: .string "Neglects ATTACK and SPEED.$" +gBattleDomeOpponentStats29:: .string "Neglects ATTACK and SP. ATTACK.$" +gBattleDomeOpponentStats30:: .string "Neglects ATTACK and SP. DEFENSE.$" +gBattleDomeOpponentStats31:: .string "Neglects DEFENSE and SPEED.$" +gBattleDomeOpponentStats32:: .string "Neglects DEFENSE and SP. ATTACK.$" +gBattleDomeOpponentStats33:: .string "Neglects DEFENSE and SP. DEFENSE.$" +gBattleDomeOpponentStats34:: .string "Neglects SPEED and SP. ATTACK.$" +gBattleDomeOpponentStats35:: .string "Neglects SPEED and SP. DEFENSE.$" +gBattleDomeOpponentStats36:: .string "Neglects SP. ATTACK and SP. DEFENSE.$" +gBattleDomeOpponentStats37:: .string "Neglects HP.$" +gBattleDomeOpponentStats38:: .string "Neglects ATTACK.$" +gBattleDomeOpponentStats39:: .string "Neglects DEFENSE.$" +gBattleDomeOpponentStats40:: .string "Neglects SPEED.$" +gBattleDomeOpponentStats41:: .string "Neglects SP. ATTACK.$" +gBattleDomeOpponentStats42:: .string "Neglects SP. DEFENSE.$" +gBattleDomeOpponentStats43:: .string "Raises POKéMON in a well-balanced way.$" +gBattleDomeWinStrings1:: .string "Let the battle begin!$" +gBattleDomeWinStrings2:: .string "{STR_VAR_1} won using {STR_VAR_2}!$" +gBattleDomeWinStrings3:: .string "{STR_VAR_1} became the champ!$" +gBattleDomeWinStrings4:: .string "{STR_VAR_1} won by default!$" +gBattleDomeWinStrings5:: .string "{STR_VAR_1} won outright by default!$" +gBattleDomeWinStrings6:: .string "{STR_VAR_1} won without using a move!$" +gBattleDomeWinStrings7:: .string "{STR_VAR_1} won outright with no moves!$" +gBattleDomeMatchNumber1:: .string "Round 1, Match 1$" +gBattleDomeMatchNumber2:: .string "Round 1, Match 2$" +gBattleDomeMatchNumber3:: .string "Round 1, Match 3$" +gBattleDomeMatchNumber4:: .string "Round 1, Match 4$" +gBattleDomeMatchNumber5:: .string "Round 1, Match 5$" +gBattleDomeMatchNumber6:: .string "Round 1, Match 6$" +gBattleDomeMatchNumber7:: .string "Round 1, Match 7$" +gBattleDomeMatchNumber8:: .string "Round 1, Match 8$" +gBattleDomeMatchNumber9:: .string "Round 2, Match 1$" +gBattleDomeMatchNumber10:: .string "Round 2, Match 2$" +gBattleDomeMatchNumber11:: .string "Round 2, Match 3$" +gBattleDomeMatchNumber12:: .string "Round 2, Match 4$" +gBattleDomeMatchNumber13:: .string "Semifinal Match 1$" +gBattleDomeMatchNumber14:: .string "Semifinal Match 2$" +gBattleDomeMatchNumber15:: .string "Final Match$" BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B @@ -12484,13 +12828,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8 setvar VAR_0x4010, 28 setvar VAR_0x8004, 5 special sub_81A703C - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F hideobjectat 2, BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM_1 setvar VAR_0x4004, 1 @@ -12601,9 +12945,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D:: @ 82C408D BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 setvar VAR_0x8004, 25 special sub_81A703C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4128 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4136 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 @@ -12623,9 +12967,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2:: @ 82C40A2 special sub_81A1780 setvar VAR_0x8004, 3 special sub_81A703C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4144 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C415C waitstate end @@ -12665,9 +13009,9 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 special sub_81A703C setvar VAR_0x8004, 25 special sub_81A703C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4128 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 5, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4136 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 @@ -12687,9 +13031,9 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174:: @ 82C4174 special sub_81A1780 setvar VAR_0x8004, 3 special sub_81A703C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4144 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C415C waitstate end @@ -12722,9 +13066,9 @@ BattleFrontier_BattlePikeThreePathRoom_MapScript1_2C423E: @ 82C423E setvar VAR_0x8004, 1 setvar VAR_0x8005, 0 special sub_81A1780 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_2C426B call BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271 @@ -13564,15 +13908,15 @@ SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16 checkflag FLAG_0x1B1 goto_eq SlateportCity_PokemonFanClub_EventScript_2C7F74 msgbox SlateportCity_PokemonFanClub_Text_2C6E37, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A call SlateportCity_PokemonFanClub_EventScript_2C832D - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A msgbox SlateportCity_PokemonFanClub_Text_2C6F66, 4 setvar VAR_0x8005, 23 call SlateportCity_PokemonFanClub_EventScript_2C8326 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A setflag FLAG_0x1B1 goto SlateportCity_PokemonFanClub_EventScript_2C7F74 @@ -13594,15 +13938,15 @@ MauvilleCity_EventScript_2C7F7E:: @ 82C7F7E checkflag FLAG_0x1B2 goto_eq MauvilleCity_EventScript_2C7FDC msgbox MauvilleCity_Text_2C6FDB, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_EventScript_2C7FD2 call MauvilleCity_EventScript_2C832D - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_EventScript_2C7FD2 msgbox MauvilleCity_Text_2C70F3, 4 setvar VAR_0x8005, 16 call MauvilleCity_EventScript_2C8326 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_EventScript_2C7FD2 setflag FLAG_0x1B2 goto MauvilleCity_EventScript_2C7FDC @@ -13624,15 +13968,15 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6:: @ 82C7FE6 checkflag FLAG_0x1B3 goto_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7174, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A call VerdanturfTown_PokemonCenter_1F_EventScript_2C832D - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7243, 4 setvar VAR_0x8005, 29 call VerdanturfTown_PokemonCenter_1F_EventScript_2C8326 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A setflag FLAG_0x1B3 goto VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 @@ -13654,15 +13998,15 @@ LavaridgeTown_House_EventScript_2C804E:: @ 82C804E checkflag FLAG_0x1B4 goto_eq LavaridgeTown_House_EventScript_2C80AC msgbox LavaridgeTown_House_Text_2C72B6, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LavaridgeTown_House_EventScript_2C80A2 call LavaridgeTown_House_EventScript_2C832D - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LavaridgeTown_House_EventScript_2C80A2 msgbox LavaridgeTown_House_Text_2C73B1, 4 setvar VAR_0x8005, 7 call LavaridgeTown_House_EventScript_2C8326 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LavaridgeTown_House_EventScript_2C80A2 setflag FLAG_0x1B4 goto LavaridgeTown_House_EventScript_2C80AC @@ -13684,15 +14028,15 @@ FallarborTown_Mart_EventScript_2C80B6:: @ 82C80B6 checkflag FLAG_0x1B5 goto_eq FallarborTown_Mart_EventScript_2C8114 msgbox FallarborTown_Mart_Text_2C7449, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FallarborTown_Mart_EventScript_2C810A call FallarborTown_Mart_EventScript_2C832D - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FallarborTown_Mart_EventScript_2C810A msgbox FallarborTown_Mart_Text_2C7582, 4 setvar VAR_0x8005, 8 call FallarborTown_Mart_EventScript_2C8326 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FallarborTown_Mart_EventScript_2C810A setflag FLAG_0x1B5 goto FallarborTown_Mart_EventScript_2C8114 @@ -13714,15 +14058,15 @@ FortreeCity_House2_EventScript_2C811E:: @ 82C811E checkflag FLAG_0x1B6 goto_eq FortreeCity_House2_EventScript_2C817C msgbox FortreeCity_House2_Text_2C7637, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FortreeCity_House2_EventScript_2C8172 call FortreeCity_House2_EventScript_2C832D - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FortreeCity_House2_EventScript_2C8172 msgbox FortreeCity_House2_Text_2C7721, 4 setvar VAR_0x8005, 24 call FortreeCity_House2_EventScript_2C8326 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FortreeCity_House2_EventScript_2C8172 setflag FLAG_0x1B6 goto FortreeCity_House2_EventScript_2C817C @@ -13744,15 +14088,15 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186:: @ 82C8186 checkflag FLAG_0x1B7 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C77C6, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA call LilycoveCity_DepartmentStoreRooftop_EventScript_2C832D - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C7911, 4 setvar VAR_0x8005, 14 call LilycoveCity_DepartmentStoreRooftop_EventScript_2C8326 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA setflag FLAG_0x1B7 goto LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 @@ -13774,15 +14118,15 @@ MossdeepCity_EventScript_2C81EE:: @ 82C81EE checkflag FLAG_0x1B8 goto_eq MossdeepCity_EventScript_2C824C msgbox MossdeepCity_Text_2C79A6, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_EventScript_2C8242 call MossdeepCity_EventScript_2C832D - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_EventScript_2C8242 msgbox MossdeepCity_Text_2C7B0D, 4 setvar VAR_0x8005, 15 call MossdeepCity_EventScript_2C8326 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_EventScript_2C8242 setflag FLAG_0x1B8 goto MossdeepCity_EventScript_2C824C @@ -13804,15 +14148,15 @@ SootopolisCity_PokemonCenter_1F_EventScript_2C8256:: @ 82C8256 checkflag FLAG_0x1B9 goto_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 msgbox SootopolisCity_PokemonCenter_1F_Text_2C7B8E, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA call SootopolisCity_PokemonCenter_1F_EventScript_2C832D - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C98, 4 setvar VAR_0x8005, 4 call SootopolisCity_PokemonCenter_1F_EventScript_2C8326 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA setflag FLAG_0x1B9 goto SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 @@ -13834,15 +14178,15 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE:: @ 82C82BE checkflag FLAG_0x1BA goto_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C831C msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7CFA, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 call PacifidlogTown_PokemonCenter_1F_EventScript_2C832D - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E40, 4 setvar VAR_0x8005, 12 call PacifidlogTown_PokemonCenter_1F_EventScript_2C8326 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 setflag FLAG_0x1BA goto PacifidlogTown_PokemonCenter_1F_EventScript_2C831C @@ -13898,11 +14242,11 @@ TrainerHill_Roof_MapScript1_2C8336: @ 82C8336 setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 special sub_81A1780 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq TrainerHill_1F_EventScript_2C83C9 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq TrainerHill_1F_EventScript_2C83C9 - compare_var_to_value VAR_RESULT, 9 + compare VAR_RESULT, 9 goto_eq TrainerHill_1F_EventScript_2C83C9 end @@ -13936,7 +14280,7 @@ TrainerHill_1F_EventScript_2C83A6:: @ 82C83A6 setvar VAR_0x4002, 1 setvar VAR_0x8004, 9 special sp194_trainer_tower - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq TrainerHill_1F_EventScript_2C83BF end @@ -13973,12 +14317,12 @@ EventScript_2C83F0:: @ 82C83F0 closemessage end -Text_2C840A:: @ 82C840A +Text_ThisIsATestSignpostMsg:: @ 82C840A .string "This is a test message.\n" .string "This is a signpost.$" -EventScript_2C8436:: @ 82C8436 - msgbox Text_2C840A, 3 +EventScript_TestSignpostMsg:: @ 82C8436 + msgbox Text_ThisIsATestSignpostMsg, 3 end .string "It’s very disappointing…$" diff --git a/data/field_effect_helpers.s b/data/field_effect_helpers.s index 97086af0d..6d0b0b3bb 100644 --- a/data/field_effect_helpers.s +++ b/data/field_effect_helpers.s @@ -7,19 +7,23 @@ gUnknown_085CDC38:: @ 85CDC38 .incbin "baserom.gba", 0x5cdc38, 0x6 gUnknown_085CDC3E:: @ 85CDC3E - .incbin "baserom.gba", 0x5cdc3e, 0x4 + .byte 0x00, 0x01, 0x02, 0x03 gUnknown_085CDC42:: @ 85CDC42 - .incbin "baserom.gba", 0x5cdc42, 0xa + .2byte 0x0004, 0x0004, 0x0004, 0x0010, 0x0000 gUnknown_085CDC4C:: @ 85CDC4C - .incbin "baserom.gba", 0x5cdc4c, 0x8 + .4byte sub_8154C7C + .4byte sub_8154CA0 gUnknown_085CDC54:: @ 85CDC54 - .incbin "baserom.gba", 0x5cdc54, 0xc + .4byte sub_815547C + .4byte sub_81554AC + .4byte sub_815550C gUnknown_085CDC60:: @ 85CDC60 .incbin "baserom.gba", 0x5cdc60, 0xa gUnknown_085CDC6A:: @ 85CDC6A .incbin "baserom.gba", 0x5cdc6a, 0x96 + diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index ceb327084..9457094f9 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -74,7 +74,7 @@ gFieldEffectScriptPointers:: @ 82DB9D4 .4byte gFieldEffectScript_Unknown66 gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0 - field_eff_callnative oei_exclamation_mark + field_eff_callnative FldEff_ExclamationMarkIcon1 field_eff_end gFieldEffectScript_UseCutOnTallGrass:: @ 82DBAE6 @@ -207,7 +207,7 @@ gFieldEffectScript_FlyIn:: @ 82DBBE9 field_eff_end gFieldEffectScript_ExclamationMarkIcon2:: @ 82DBBEF - field_eff_callnative sub_80B4658 + field_eff_callnative FldEff_ExclamationMarkIcon2 field_eff_end gFieldEffectScript_FeetInFlowingWater:: @ 82DBBF5 @@ -260,7 +260,7 @@ gFieldEffectScript_Unknown45:: @ 82DBC4B field_eff_end gFieldEffectScript_HeartIcon:: @ 82DBC56 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_80B4690 + field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_HeartIcon field_eff_end gFieldEffectScript_Unknown47:: @ 82DBC60 diff --git a/data/field_ground_effect.s b/data/field_ground_effect.s index 8b8b00cf9..be5639406 100644 --- a/data/field_ground_effect.s +++ b/data/field_ground_effect.s @@ -5,34 +5,100 @@ .align 2, 0 gUnknown_0850E5DC:: @ 850E5DC - .incbin "baserom.gba", 0x50e5dc, 0x8 + .4byte 0x00000020, 0x00000010 gUnknown_0850E5E4:: @ 850E5E4 - .incbin "baserom.gba", 0x50e5e4, 0x18 + .4byte MetatileBehavior_IsTallGrass + .4byte MetatileBehavior_IsLongGrass + .4byte MetatileBehavior_IsPuddle + .4byte MetatileBehavior_IsSurfableWaterOrUnderwater + .4byte MetatileBehavior_IsShallowFlowingWater + .4byte ShouldDoJumpLandingDustEffect gUnknown_0850E5FC:: @ 850E5FC - .incbin "baserom.gba", 0x50e5fc, 0x18 + .4byte 0x00001000, 0x00002000, 0x00004000, 0x00008000, 0x00004000, 0x00010000 gUnknown_0850E614:: @ 850E614 - .incbin "baserom.gba", 0x50e614, 0x10 + .4byte MetatileBehavior_IsJumpSouth + .4byte MetatileBehavior_IsJumpNorth + .4byte MetatileBehavior_IsJumpWest + .4byte MetatileBehavior_IsJumpEast gUnknown_0850E624:: @ 850E624 - .incbin "baserom.gba", 0x50e624, 0x10 + .byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73 gUnknown_0850E634:: @ 850E634 - .incbin "baserom.gba", 0x50e634, 0x10 + .byte 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x02 gUnknown_0850E644:: @ 850E644 - .incbin "baserom.gba", 0x50e644, 0x10 + .byte 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01 gUnknown_0850E654:: @ 850E654 - .incbin "baserom.gba", 0x50e654, 0xc + .4byte DoTracksGroundEffect_None + .4byte DoTracksGroundEffect_Footprints + .4byte DoTracksGroundEffect_BikeTireTracks gUnknown_0850E660:: @ 850E660 .incbin "baserom.gba", 0x50e660, 0x4 gUnknown_0850E664:: @ 850E664 - .incbin "baserom.gba", 0x50e664, 0x10 + .byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04 gUnknown_0850E674:: @ 850E674 - .incbin "baserom.gba", 0x50e674, 0xe0 + .4byte GroundEffect_SpawnOnTallGrass + .4byte GroundEffect_StepOnTallGrass + .4byte GroundEffect_SpawnOnLongGrass + .4byte GroundEffect_StepOnLongGrass + .4byte GroundEffect_WaterReflection + .4byte GroundEffect_IceReflection + .4byte GroundEffect_FlowingWater + .4byte GroundEffect_SandTracks + .4byte GroundEffect_DeepSandTracks + .4byte GroundEffect_Ripple + .4byte GroundEffect_StepOnPuddle + .4byte GroundEffect_SandHeap + .4byte GroundEffect_JumpOnTallGrass + .4byte GroundEffect_JumpOnLongGrass + .4byte GroundEffect_JumpOnShallowWater + .4byte GroundEffect_JumpOnWater + .4byte GroundEffect_JumpLandingDust + .4byte GroundEffect_ShortGrass + .4byte GroundEffect_HotSprings + .4byte GroundEffect_Seaweed + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte little_step + .4byte double_little_steps + .4byte double_little_steps + .4byte double_little_steps + .4byte double_little_steps + .4byte double_little_steps + .4byte double_little_steps + .4byte double_little_steps + .4byte double_little_steps + .4byte double_little_steps + .4byte triple_little_steps + .4byte triple_little_steps + .4byte double_little_steps + .4byte triple_little_steps + .4byte triple_little_steps + .4byte quad_little_steps + .4byte quad_little_steps + .4byte quad_little_steps + .4byte quad_little_steps + .4byte oct_little_steps + .4byte oct_little_steps + diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s index 952485463..efb2f34cb 100644 --- a/data/field_player_avatar.s +++ b/data/field_player_avatar.s @@ -8,52 +8,111 @@ gUnknown_084973FC:: @ 84973FC - .incbin "baserom.gba", 0x4973fc, 0x48 + .4byte MetatileBehavior_IsTrickHouseSlipperyFloor + .4byte MetatileBehavior_IsIce_2 + .4byte MetatileBehavior_IsWalkSouth + .4byte MetatileBehavior_IsWalkNorth + .4byte MetatileBehavior_IsWalkWest + .4byte MetatileBehavior_IsWalkEast + .4byte MetatileBehavior_IsSouthwardCurrent + .4byte MetatileBehavior_IsNorthwardCurrent + .4byte MetatileBehavior_IsWestwardCurrent + .4byte MetatileBehavior_IsEastwardCurrent + .4byte MetatileBehavior_IsSlideSouth + .4byte MetatileBehavior_IsSlideNorth + .4byte MetatileBehavior_IsSlideWest + .4byte MetatileBehavior_IsSlideEast + .4byte MetatileBehavior_IsWaterfall + .4byte MetatileBehavior_IsSecretBaseJumpMat + .4byte MetatileBehavior_IsSecretBaseSpinMat + .4byte MetatileBehavior_IsMuddySlope gUnknown_08497444:: @ 8497444 - .incbin "baserom.gba", 0x497444, 0x4c + .4byte ForcedMovement_None + .4byte ForcedMovement_Slip + .4byte ForcedMovement_Slip + .4byte ForcedMovement_WalkSouth + .4byte ForcedMovement_WalkNorth + .4byte ForcedMovement_WalkWest + .4byte ForcedMovement_WalkEast + .4byte ForcedMovement_PushedSouthByCurrent + .4byte ForcedMovement_PushedNorthByCurrent + .4byte ForcedMovement_PushedWestByCurrent + .4byte ForcedMovement_PushedEastByCurrent + .4byte ForcedMovement_SlideSouth + .4byte ForcedMovement_SlideNorth + .4byte ForcedMovement_SlideWest + .4byte ForcedMovement_SlideEast + .4byte ForcedMovement_PushedSouthByCurrent + .4byte ForcedMovement_0xBB + .4byte ForcedMovement_0xBC + .4byte ForcedMovement_MuddySlope gUnknown_08497490:: @ 8497490 - .incbin "baserom.gba", 0x497490, 0xc + .4byte PlayerNotOnBikeNotMoving + .4byte PlayerNotOnBikeTurningInPlace + .4byte PlayerNotOnBikeMoving gUnknown_0849749C:: @ 849749C - .incbin "baserom.gba", 0x49749c, 0x14 + .4byte MetatileBehavior_IsBumpySlope + .4byte MetatileBehavior_IsIsolatedVerticalRail + .4byte MetatileBehavior_IsIsolatedHorizontalRail + .4byte MetatileBehavior_IsVerticalRail + .4byte MetatileBehavior_IsHorizontalRail gUnknown_084974B0:: @ 84974B0 - .incbin "baserom.gba", 0x4974b0, 0x8 + .byte 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x00, 0x00, 0x00 gUnknown_084974B8:: @ 84974B8 - .incbin "baserom.gba", 0x4974b8, 0x20 + .4byte PlayerAvatarTransition_Normal + .4byte PlayerAvatarTransition_MachBike + .4byte PlayerAvatarTransition_AcroBike + .4byte PlayerAvatarTransition_Surfing + .4byte PlayerAvatarTransition_Underwater + .4byte PlayerAvatarTransition_ReturnToField + .4byte PlayerAvatarTransition_Dummy + .4byte PlayerAvatarTransition_Dummy gUnknown_084974D8:: @ 84974D8 - .incbin "baserom.gba", 0x4974d8, 0x10 + .4byte MetatileBehavior_IsSouthArrowWarp + .4byte MetatileBehavior_IsNorthArrowWarp + .4byte MetatileBehavior_IsWestArrowWarp + .4byte MetatileBehavior_IsEastArrowWarp gUnknown_084974E8:: @ 84974E8 - .incbin "baserom.gba", 0x4974e8, 0x10 + .byte 0x64, 0x69, 0x65, 0x6a, 0x66, 0x6b, 0x67, 0x6c, 0x6f, 0x70, 0x68, 0x6d, 0x89, 0x8a, 0xbf, 0xc0 gUnknown_084974F8:: @ 84974F8 - .incbin "baserom.gba", 0x4974f8, 0x10 + .byte 0x00, 0x59, 0x01, 0x5a, 0x3f, 0x5b, 0x02, 0x5c, 0x6f, 0x70, 0x03, 0x5d, 0x89, 0x8a, 0xbf, 0xc0 gUnknown_08497508:: @ 8497508 - .incbin "baserom.gba", 0x497508, 0x2 + .byte 0xe6, 0xe7 gUnknown_0849750A:: @ 849750A - .incbin "baserom.gba", 0x49750a, 0x2 + .byte 0xeb, 0xec gUnknown_0849750C:: @ 849750C - .incbin "baserom.gba", 0x49750c, 0x14 + .byte 0x00, 0x01, 0x01, 0x02, 0x3f, 0x04, 0x02, 0x08, 0x6f, 0x10, 0x59, 0x01, 0x5a, 0x02, 0x5b, 0x04, 0x5c, 0x08, 0x70, 0x10 gUnknown_08497520:: @ 8497520 - .incbin "baserom.gba", 0x497520, 0x10 + .4byte MetatileBehavior_IsSouthArrowWarp + .4byte MetatileBehavior_IsNorthArrowWarp + .4byte MetatileBehavior_IsWestArrowWarp + .4byte MetatileBehavior_IsEastArrowWarp gUnknown_08497530:: @ 8497530 - .incbin "baserom.gba", 0x497530, 0xc + .4byte sub_808C3A4 + .4byte do_boulder_dust + .4byte sub_808C484 gUnknown_0849753C:: @ 849753C - .incbin "baserom.gba", 0x49753c, 0x4 + .4byte sub_808C544 gUnknown_08497540:: @ 8497540 - .incbin "baserom.gba", 0x497540, 0x10 + .4byte sub_808C61C + .4byte sub_808C644 + .4byte sub_808C6BC + .4byte sub_808C6FC gUnknown_08497550:: @ 8497550 .incbin "baserom.gba", 0x497550, 0x4 @@ -62,7 +121,22 @@ gUnknown_08497554:: @ 8497554 .incbin "baserom.gba", 0x497554, 0x8 gUnknown_0849755C:: @ 849755C - .incbin "baserom.gba", 0x49755c, 0x40 + .4byte fish0 + .4byte fish1 + .4byte fish2 + .4byte fish3 + .4byte fish4 + .4byte fish5 + .4byte fish6 + .4byte fish7 + .4byte fish8 + .4byte fish9 + .4byte fishA_wait_for_a_pressed + .4byte fishB + .4byte fishC + .4byte fishD + .4byte fishE + .4byte fishF gUnknown_0849759C:: @ 849759C .incbin "baserom.gba", 0x49759c, 0x6 @@ -80,4 +154,5 @@ gUnknown_084975B0:: @ 84975B0 .incbin "baserom.gba", 0x4975b0, 0xc gUnknown_084975BC:: @ 84975BC - .incbin "baserom.gba", 0x4975bc, 0x8 + .byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00 + diff --git a/data/field_screen.s b/data/field_screen.s index fd1b1f466..fc89bcfdf 100644 --- a/data/field_screen.s +++ b/data/field_screen.s @@ -5,16 +5,1617 @@ .align 2, 0 gUnknown_0854014C:: @ 854014C - .incbin "baserom.gba", 0x54014c, 0xc000 +@ replacing .incbin "baserom.gba", 0x0054014c, 0xc000 //this is probably related to sunny weather +.2byte 0x0421, 0x0423, 0x0425, 0x0427, 0x0429, 0x042b, 0x042d, 0x0011, 0x0013, 0x0015, 0x0017, 0x0019, 0x001b, 0x001d, 0x001f, 0x0c7f +.2byte 0x0461, 0x0463, 0x0465, 0x0467, 0x0469, 0x046b, 0x046d, 0x0051, 0x0053, 0x0055, 0x0057, 0x0059, 0x005b, 0x005d, 0x005f, 0x0c9f +.2byte 0x04a1, 0x04a3, 0x04a5, 0x04a7, 0x04a9, 0x04ab, 0x04ad, 0x00b1, 0x00b3, 0x0095, 0x0097, 0x0099, 0x009b, 0x009d, 0x009f, 0x0cdf +.2byte 0x04e1, 0x04e3, 0x04e5, 0x04e7, 0x04e9, 0x04eb, 0x04ed, 0x00f1, 0x00f3, 0x00f5, 0x00d7, 0x00f9, 0x00fb, 0x00dd, 0x00df, 0x0d1f +.2byte 0x0521, 0x0523, 0x0525, 0x0527, 0x0529, 0x052b, 0x052d, 0x0131, 0x0133, 0x0135, 0x0137, 0x0139, 0x011b, 0x013d, 0x013f, 0x0d5f +.2byte 0x0561, 0x0563, 0x0565, 0x0567, 0x0569, 0x056b, 0x056d, 0x0191, 0x0193, 0x0175, 0x0177, 0x0179, 0x017b, 0x017d, 0x017f, 0x0d9f +.2byte 0x05a1, 0x05a3, 0x05a5, 0x05a7, 0x05a9, 0x05ab, 0x05ad, 0x01d1, 0x01d3, 0x01d5, 0x01b7, 0x01b9, 0x01db, 0x01bd, 0x01bf, 0x0ddf +.2byte 0x0220, 0x0223, 0x0225, 0x0227, 0x022a, 0x022c, 0x022e, 0x0231, 0x0213, 0x0215, 0x0217, 0x01f9, 0x01fb, 0x021d, 0x021f, 0x0e1f +.2byte 0x0260, 0x0263, 0x0265, 0x0267, 0x0269, 0x026c, 0x026e, 0x0271, 0x0273, 0x0255, 0x0257, 0x0259, 0x025b, 0x025d, 0x025f, 0x0e5f +.2byte 0x02a0, 0x02a2, 0x02a5, 0x02a7, 0x02a9, 0x02ac, 0x02ae, 0x02b0, 0x02b3, 0x02b5, 0x0297, 0x0299, 0x029b, 0x029d, 0x029f, 0x0e9f +.2byte 0x02e0, 0x02e2, 0x02e5, 0x02e7, 0x02e9, 0x02eb, 0x02ee, 0x02f0, 0x02f2, 0x02f5, 0x02f7, 0x02f9, 0x02db, 0x02dd, 0x02df, 0x0edf +.2byte 0x0320, 0x0322, 0x0324, 0x0327, 0x0329, 0x032c, 0x032e, 0x0330, 0x0332, 0x0335, 0x0337, 0x0339, 0x033b, 0x031d, 0x033f, 0x0eff +.2byte 0x0360, 0x0362, 0x0364, 0x0367, 0x0369, 0x036b, 0x036e, 0x0370, 0x0372, 0x0374, 0x0377, 0x0379, 0x037b, 0x037d, 0x037f, 0x0f3f +.2byte 0x03a0, 0x03a2, 0x03a5, 0x03a7, 0x03a9, 0x03ab, 0x03ae, 0x03b0, 0x03b2, 0x03b5, 0x03b7, 0x03b9, 0x03bb, 0x03bd, 0x03bf, 0x0f7f +.2byte 0x03e0, 0x03e2, 0x03e5, 0x03e7, 0x03e9, 0x03eb, 0x03ed, 0x03f0, 0x03f2, 0x03f4, 0x03f6, 0x03f9, 0x03fb, 0x03fd, 0x03ff, 0x0fbf +.2byte 0x0fe3, 0x0fe5, 0x0fe7, 0x0fe9, 0x0feb, 0x0fed, 0x0fee, 0x0ff0, 0x0ff2, 0x0ff4, 0x0ff6, 0x0ff8, 0x0ffa, 0x0ffc, 0x0ffe, 0x0fff +.2byte 0x0c21, 0x0c23, 0x0c25, 0x0c27, 0x0c29, 0x0c2b, 0x0c2d, 0x0c11, 0x0c13, 0x0815, 0x0817, 0x0819, 0x081b, 0x081d, 0x081f, 0x147f +.2byte 0x0c61, 0x0c63, 0x0c65, 0x0c67, 0x0c69, 0x0c6b, 0x084e, 0x0850, 0x0853, 0x0855, 0x0857, 0x0859, 0x085b, 0x085d, 0x109e, 0x14bf +.2byte 0x0ca1, 0x0ca3, 0x0ca5, 0x0ca7, 0x0ca9, 0x0cab, 0x08ae, 0x08b0, 0x08b3, 0x0895, 0x0897, 0x0899, 0x089b, 0x089d, 0x10de, 0x14ff +.2byte 0x0ce1, 0x0ce3, 0x0ce5, 0x0ce7, 0x0ce9, 0x0ceb, 0x08ee, 0x08f0, 0x08f3, 0x08f5, 0x08f7, 0x08d9, 0x08db, 0x08dd, 0x111e, 0x153f +.2byte 0x0d21, 0x0d23, 0x0d25, 0x0d27, 0x0d29, 0x0d2b, 0x092e, 0x0930, 0x0933, 0x0935, 0x0937, 0x0919, 0x093b, 0x093d, 0x115e, 0x155f +.2byte 0x0d61, 0x0d63, 0x0d65, 0x0d67, 0x0d69, 0x0d6b, 0x098e, 0x0990, 0x0993, 0x0975, 0x0977, 0x0979, 0x097b, 0x097d, 0x119e, 0x15bf +.2byte 0x0da1, 0x09c2, 0x09c5, 0x09c7, 0x09ca, 0x09cc, 0x09ce, 0x09d0, 0x09d3, 0x09d5, 0x09d7, 0x09d9, 0x09bb, 0x09bd, 0x11de, 0x15df +.2byte 0x0a20, 0x0a02, 0x0a05, 0x0a07, 0x0a09, 0x0a0c, 0x0a0e, 0x0a10, 0x0a13, 0x0a15, 0x0a17, 0x09f9, 0x09fb, 0x0a1d, 0x121e, 0x161f +.2byte 0x0a60, 0x0a62, 0x0a65, 0x0a67, 0x0a69, 0x0a6c, 0x0a6e, 0x0a70, 0x0a73, 0x0a55, 0x0a57, 0x0a59, 0x0a5b, 0x0a3d, 0x125e, 0x165f +.2byte 0x0aa0, 0x0aa2, 0x0aa5, 0x0aa7, 0x0aa9, 0x0aab, 0x0aae, 0x0ab0, 0x0ab3, 0x0ab5, 0x0ab7, 0x0a99, 0x0a9b, 0x0a9d, 0x129e, 0x169f +.2byte 0x0ae0, 0x0ae2, 0x0ae4, 0x0ae7, 0x0ae9, 0x0aeb, 0x0aee, 0x0af0, 0x0af2, 0x0af5, 0x0af7, 0x0ad9, 0x0adb, 0x0add, 0x12de, 0x16df +.2byte 0x0b20, 0x0b22, 0x0b24, 0x0b27, 0x0b29, 0x0b2b, 0x0b2e, 0x0b30, 0x0b32, 0x0b35, 0x0b37, 0x0b39, 0x0b3b, 0x0b1d, 0x131e, 0x171f +.2byte 0x0b60, 0x0b62, 0x0b64, 0x0b67, 0x0b69, 0x0b6b, 0x0b6e, 0x0b70, 0x0b72, 0x0b75, 0x0b77, 0x0b79, 0x0b7b, 0x0b7d, 0x135e, 0x175f +.2byte 0x0ba0, 0x0ba2, 0x0ba4, 0x0ba7, 0x0ba9, 0x0bab, 0x0bad, 0x0bb0, 0x0bb2, 0x0bb4, 0x0bb6, 0x0bb9, 0x0bbb, 0x0bbd, 0x139e, 0x179f +.2byte 0x0be0, 0x13c4, 0x13c6, 0x13c8, 0x13ca, 0x13cc, 0x13ce, 0x13d0, 0x13d3, 0x13d4, 0x13d7, 0x13d8, 0x13da, 0x13dd, 0x13de, 0x17bf +.2byte 0x13e3, 0x17e5, 0x17e7, 0x17e9, 0x17eb, 0x17ed, 0x17ef, 0x17f1, 0x17f2, 0x17f4, 0x17f6, 0x17f8, 0x17fa, 0x17fc, 0x17fe, 0x17ff +.2byte 0x1421, 0x1423, 0x1425, 0x1427, 0x1429, 0x142b, 0x142d, 0x1411, 0x1413, 0x1415, 0x1417, 0x1019, 0x101b, 0x141d, 0x141f, 0x1c7f +.2byte 0x1461, 0x1463, 0x1465, 0x1467, 0x1469, 0x146b, 0x144e, 0x1450, 0x1453, 0x1455, 0x1057, 0x1059, 0x105b, 0x105d, 0x189e, 0x1cbf +.2byte 0x14a1, 0x14a3, 0x14a5, 0x14a7, 0x14a9, 0x14ac, 0x14ae, 0x14b0, 0x1092, 0x1095, 0x1097, 0x1099, 0x109b, 0x18dc, 0x18de, 0x1cff +.2byte 0x14e1, 0x14e3, 0x14e5, 0x14e7, 0x14e9, 0x14ec, 0x14ee, 0x14f0, 0x10f2, 0x10f5, 0x10d7, 0x10d9, 0x10db, 0x191c, 0x191e, 0x1d3f +.2byte 0x1521, 0x1523, 0x1525, 0x1527, 0x1529, 0x152c, 0x152e, 0x1530, 0x1132, 0x1135, 0x1137, 0x1139, 0x111b, 0x195c, 0x195e, 0x1d7f +.2byte 0x1561, 0x1563, 0x1585, 0x1587, 0x158a, 0x158c, 0x158e, 0x1570, 0x1172, 0x1175, 0x1177, 0x1179, 0x117b, 0x199c, 0x199e, 0x1d9f +.2byte 0x15a1, 0x15c2, 0x15c5, 0x15c7, 0x15c9, 0x15cc, 0x15ce, 0x15d0, 0x11d2, 0x11d5, 0x11d7, 0x11b9, 0x11bb, 0x19dc, 0x19de, 0x1ddf +.2byte 0x1620, 0x1602, 0x1605, 0x1607, 0x1609, 0x160c, 0x160e, 0x1610, 0x1212, 0x1215, 0x1217, 0x1219, 0x121b, 0x1a1c, 0x1a1e, 0x1e1f +.2byte 0x1660, 0x1662, 0x1244, 0x1247, 0x1249, 0x124b, 0x124e, 0x1250, 0x1252, 0x1255, 0x1257, 0x1259, 0x123b, 0x1a5c, 0x1a5e, 0x1e5f +.2byte 0x12a0, 0x12a2, 0x12a4, 0x12a7, 0x12a9, 0x12ab, 0x12ae, 0x12b0, 0x12b2, 0x12b5, 0x1297, 0x1299, 0x129b, 0x1a9c, 0x1a9e, 0x1e9f +.2byte 0x12e0, 0x12e2, 0x12e4, 0x12e7, 0x12e9, 0x12eb, 0x12ee, 0x12f0, 0x12f2, 0x12f5, 0x12f7, 0x12d9, 0x12db, 0x1adc, 0x1ade, 0x1edf +.2byte 0x1320, 0x1322, 0x1324, 0x1327, 0x1329, 0x132b, 0x132e, 0x1330, 0x1332, 0x1334, 0x1337, 0x1339, 0x131b, 0x1b1c, 0x1b1e, 0x1f1f +.2byte 0x1360, 0x1362, 0x1364, 0x1367, 0x1369, 0x136b, 0x136d, 0x1370, 0x1372, 0x1374, 0x1376, 0x1379, 0x137b, 0x1b5c, 0x1b5e, 0x1f3f +.2byte 0x13a0, 0x13a2, 0x1b86, 0x1b88, 0x1b8a, 0x1b8d, 0x1b8e, 0x1b91, 0x1b92, 0x1b94, 0x1b96, 0x1b98, 0x1b9a, 0x1b9c, 0x1b9e, 0x1f7f +.2byte 0x13e0, 0x1bc4, 0x1bc6, 0x1bc8, 0x1bca, 0x1bcc, 0x1bce, 0x1bd0, 0x1bd2, 0x1bd4, 0x1bd6, 0x1bd8, 0x1bda, 0x1bdc, 0x1bde, 0x1fbf +.2byte 0x1be3, 0x1fe5, 0x1fe7, 0x1fe9, 0x1feb, 0x1fed, 0x1fef, 0x1ff0, 0x1ff3, 0x1ff5, 0x1ff6, 0x1ff8, 0x1ffa, 0x1ffc, 0x1ffe, 0x1fff +.2byte 0x1c21, 0x1c23, 0x1c25, 0x1c27, 0x1c29, 0x1c2b, 0x1c2d, 0x1c11, 0x1c13, 0x1c15, 0x1c17, 0x1c19, 0x1c1b, 0x1c1d, 0x1c1f, 0x247f +.2byte 0x1c61, 0x1c63, 0x1c65, 0x1c67, 0x1c69, 0x1c6b, 0x1c4e, 0x1c50, 0x1c53, 0x1c55, 0x1c57, 0x1c59, 0x1c5b, 0x1c5d, 0x209e, 0x24bf +.2byte 0x1ca1, 0x1ca3, 0x1ca5, 0x1ca7, 0x1ca9, 0x1cac, 0x1cae, 0x1cb0, 0x1c92, 0x1c95, 0x1c97, 0x1c99, 0x1c9b, 0x20dc, 0x20de, 0x24ff +.2byte 0x1ce1, 0x1ce3, 0x1ce5, 0x1ce7, 0x1ce9, 0x1cec, 0x1cee, 0x1cf0, 0x1cf2, 0x1cf4, 0x18d7, 0x1cf9, 0x211a, 0x211c, 0x211e, 0x253f +.2byte 0x1d21, 0x1d23, 0x1d25, 0x1d27, 0x1d29, 0x1d2c, 0x1d2e, 0x1d30, 0x1d32, 0x1d34, 0x1937, 0x1d39, 0x215a, 0x215c, 0x215e, 0x257f +.2byte 0x1d61, 0x1d63, 0x1d85, 0x1d87, 0x1d89, 0x1d8c, 0x1d6e, 0x1d70, 0x1d72, 0x1d74, 0x1977, 0x1d79, 0x219a, 0x219c, 0x219e, 0x25bf +.2byte 0x1da1, 0x1dc2, 0x1dc5, 0x1dc7, 0x1dc9, 0x1dcc, 0x1dce, 0x1dd0, 0x1db2, 0x1dd4, 0x19b7, 0x1db9, 0x21da, 0x21dc, 0x21de, 0x25ff +.2byte 0x1e20, 0x1e02, 0x1e05, 0x1e07, 0x1e09, 0x1e0b, 0x1e0e, 0x1e10, 0x1e12, 0x1e14, 0x1a17, 0x1e19, 0x221a, 0x221c, 0x221e, 0x261f +.2byte 0x1e60, 0x1e62, 0x1e44, 0x1e47, 0x1e49, 0x1e4b, 0x1e4e, 0x1e50, 0x1e52, 0x1e54, 0x1a57, 0x1e59, 0x225a, 0x225c, 0x225e, 0x265f +.2byte 0x1ea0, 0x1ea2, 0x1ea4, 0x1e87, 0x1e89, 0x1e8b, 0x1e8e, 0x1e90, 0x1e92, 0x1e94, 0x1a97, 0x1e99, 0x229a, 0x229c, 0x229e, 0x269f +.2byte 0x1ae0, 0x1ee2, 0x1ae4, 0x1ae6, 0x1ae9, 0x1aeb, 0x1aed, 0x1af0, 0x1af2, 0x1af5, 0x1af7, 0x1ed9, 0x22da, 0x22dc, 0x22de, 0x26df +.2byte 0x1f20, 0x1b22, 0x1b24, 0x1f27, 0x1f29, 0x1f2b, 0x1f2d, 0x1f30, 0x1f32, 0x1f34, 0x1f37, 0x1f39, 0x231a, 0x231c, 0x231e, 0x271f +.2byte 0x1f60, 0x1b62, 0x1b64, 0x2348, 0x234a, 0x234c, 0x234e, 0x2350, 0x2352, 0x2354, 0x2356, 0x2359, 0x235a, 0x235c, 0x235e, 0x275f +.2byte 0x1ba0, 0x1ba2, 0x2386, 0x2388, 0x238a, 0x238c, 0x238e, 0x2390, 0x2392, 0x2394, 0x2396, 0x2398, 0x239a, 0x239c, 0x239e, 0x277f +.2byte 0x1be0, 0x23c4, 0x23c6, 0x23c8, 0x23cb, 0x23cc, 0x23cf, 0x23d0, 0x23d3, 0x23d4, 0x23d6, 0x23d8, 0x23da, 0x23dd, 0x23de, 0x27bf +.2byte 0x23e3, 0x27e5, 0x27e7, 0x27e9, 0x27eb, 0x27ed, 0x27ef, 0x27f1, 0x27f3, 0x27f4, 0x27f6, 0x27f8, 0x27fa, 0x27fc, 0x27fe, 0x27ff +.2byte 0x2421, 0x2423, 0x2425, 0x2427, 0x2429, 0x242b, 0x242d, 0x2811, 0x2413, 0x2415, 0x2417, 0x2419, 0x241b, 0x241d, 0x241f, 0x2c7f +.2byte 0x2461, 0x2463, 0x2465, 0x2467, 0x2469, 0x246b, 0x284e, 0x2450, 0x2453, 0x2455, 0x2457, 0x2459, 0x245b, 0x245d, 0x289e, 0x2cbf +.2byte 0x24a1, 0x24a3, 0x24a5, 0x24a7, 0x24a9, 0x28ac, 0x24ae, 0x24b0, 0x2492, 0x2495, 0x2497, 0x2499, 0x249b, 0x28dc, 0x28de, 0x2cff +.2byte 0x24e1, 0x24e3, 0x24e5, 0x24e7, 0x24e9, 0x24ec, 0x24ee, 0x24f0, 0x24f2, 0x24f4, 0x24d7, 0x24f9, 0x291a, 0x291c, 0x2d1e, 0x2d3f +.2byte 0x2521, 0x2523, 0x2525, 0x2527, 0x2529, 0x252c, 0x252e, 0x2530, 0x2532, 0x2534, 0x2536, 0x2958, 0x295a, 0x295c, 0x295e, 0x2d7f +.2byte 0x2561, 0x2563, 0x2585, 0x2587, 0x2589, 0x258c, 0x256e, 0x2570, 0x2572, 0x2574, 0x2576, 0x2998, 0x299a, 0x299c, 0x299e, 0x2dbf +.2byte 0x25a1, 0x25c2, 0x25c5, 0x25c7, 0x25c9, 0x25cb, 0x25ce, 0x25d0, 0x25d2, 0x25b4, 0x25b6, 0x29d8, 0x29da, 0x29dc, 0x29de, 0x2dff +.2byte 0x2620, 0x2602, 0x2605, 0x2607, 0x2609, 0x260b, 0x260e, 0x2610, 0x2612, 0x2614, 0x2616, 0x2a18, 0x2a1a, 0x2a1c, 0x2a1e, 0x2e3f +.2byte 0x2660, 0x2662, 0x2644, 0x2647, 0x2649, 0x264b, 0x264e, 0x2650, 0x2652, 0x2654, 0x2656, 0x2a58, 0x2a5a, 0x2a5c, 0x2a5e, 0x2e5f +.2byte 0x26a0, 0x26a2, 0x26a4, 0x2687, 0x2689, 0x268b, 0x268d, 0x2690, 0x2692, 0x2694, 0x2696, 0x2a98, 0x2a9a, 0x2a9c, 0x2a9e, 0x2e9f +.2byte 0x26e0, 0x26e2, 0x26e4, 0x26e6, 0x26c9, 0x26cb, 0x26cd, 0x26d0, 0x26d2, 0x26d4, 0x26d6, 0x2ad8, 0x2ada, 0x2adc, 0x2ade, 0x2edf +.2byte 0x2720, 0x2322, 0x2724, 0x2727, 0x2b0a, 0x2b0c, 0x2b0e, 0x2b10, 0x2b12, 0x2b14, 0x2b16, 0x2b18, 0x2b1a, 0x2b1c, 0x2b1e, 0x2f1f +.2byte 0x2360, 0x2762, 0x2364, 0x2b48, 0x2b4a, 0x2b4c, 0x2b4e, 0x2b50, 0x2b52, 0x2b54, 0x2b56, 0x2b58, 0x2b5a, 0x2b5c, 0x2b5e, 0x2f5f +.2byte 0x27a0, 0x27a2, 0x2b86, 0x2b88, 0x2b8a, 0x2b8c, 0x2b8f, 0x2b90, 0x2b92, 0x2b95, 0x2b96, 0x2b98, 0x2b9a, 0x2b9c, 0x2b9e, 0x2f7f +.2byte 0x27e0, 0x2bc4, 0x2bc6, 0x2bc8, 0x2bca, 0x2bcc, 0x2bce, 0x2bd0, 0x2bd2, 0x2bd4, 0x2bd6, 0x2bd8, 0x2bda, 0x2bdc, 0x2bde, 0x2fbf +.2byte 0x2be3, 0x2be5, 0x2fe7, 0x2fe9, 0x2feb, 0x2fed, 0x2fef, 0x2ff1, 0x2ff3, 0x2ff5, 0x2ff6, 0x2ff8, 0x2ffa, 0x2ffc, 0x2ffe, 0x2fff +.2byte 0x2c21, 0x2c23, 0x2c25, 0x2c27, 0x2c29, 0x2c2b, 0x2c2d, 0x3011, 0x3013, 0x3015, 0x2c17, 0x3019, 0x2c1b, 0x2c1d, 0x2c1f, 0x347f +.2byte 0x2c61, 0x2c63, 0x2c65, 0x2c67, 0x2c69, 0x2c6b, 0x304e, 0x3050, 0x3053, 0x2c55, 0x2c57, 0x2c59, 0x2c5b, 0x2c5d, 0x309e, 0x34bf +.2byte 0x2ca1, 0x2ca3, 0x30a5, 0x30a7, 0x30a9, 0x30ac, 0x30ae, 0x30b0, 0x2c92, 0x2c95, 0x2c97, 0x2c99, 0x2c9b, 0x34dc, 0x30de, 0x34ff +.2byte 0x2ce1, 0x2ce3, 0x30e5, 0x30e7, 0x30e9, 0x30ec, 0x30ee, 0x2cf0, 0x2cf2, 0x2cf4, 0x2cd7, 0x2cf9, 0x311a, 0x311c, 0x311e, 0x353f +.2byte 0x2d21, 0x2d23, 0x3145, 0x3127, 0x3129, 0x312c, 0x2d2e, 0x2d30, 0x2d32, 0x2d34, 0x2d36, 0x3158, 0x315a, 0x315c, 0x315e, 0x357f +.2byte 0x2d61, 0x2d63, 0x3185, 0x3187, 0x3189, 0x2d6b, 0x2d6e, 0x2d70, 0x2d72, 0x2d74, 0x3196, 0x3198, 0x319a, 0x319c, 0x35be, 0x35bf +.2byte 0x2da1, 0x31c2, 0x31c5, 0x2dc7, 0x2dc9, 0x2dcb, 0x2dce, 0x2dd0, 0x2db2, 0x2db4, 0x31d6, 0x31d8, 0x31da, 0x31dc, 0x35de, 0x35ff +.2byte 0x3220, 0x3202, 0x2e05, 0x2e07, 0x2e09, 0x2e0b, 0x2e0e, 0x2e10, 0x2e12, 0x2e14, 0x3216, 0x3218, 0x321a, 0x321c, 0x361e, 0x363f +.2byte 0x3260, 0x3262, 0x2e44, 0x2e47, 0x2e49, 0x2e4b, 0x2e4d, 0x2e50, 0x2e52, 0x2e54, 0x3256, 0x3258, 0x325a, 0x325c, 0x365e, 0x365f +.2byte 0x2ea0, 0x2ea2, 0x2ea4, 0x2e87, 0x2e89, 0x2e8b, 0x2e8d, 0x2e90, 0x2e92, 0x2e94, 0x3296, 0x3298, 0x329a, 0x329c, 0x369e, 0x369f +.2byte 0x2ee0, 0x2ee2, 0x2ee4, 0x2ee6, 0x2ec9, 0x32cc, 0x32ce, 0x32d0, 0x32d2, 0x32d4, 0x32d6, 0x32d8, 0x32da, 0x32dc, 0x36de, 0x36df +.2byte 0x2f20, 0x2f22, 0x2f24, 0x2f27, 0x330a, 0x330c, 0x330e, 0x3310, 0x3312, 0x3314, 0x3316, 0x3318, 0x331a, 0x331c, 0x371e, 0x371f +.2byte 0x2f60, 0x2f62, 0x2f64, 0x3348, 0x334a, 0x334c, 0x334e, 0x3351, 0x3352, 0x3354, 0x3356, 0x3358, 0x335a, 0x335c, 0x375e, 0x375f +.2byte 0x2fa0, 0x2fa2, 0x3386, 0x3388, 0x338a, 0x338c, 0x338f, 0x3390, 0x3393, 0x3394, 0x3396, 0x3398, 0x339a, 0x339c, 0x379e, 0x379f +.2byte 0x2fe0, 0x33c4, 0x33c6, 0x33c8, 0x33ca, 0x37cd, 0x37cf, 0x37d1, 0x37d2, 0x37d5, 0x37d7, 0x37d8, 0x37da, 0x37dc, 0x37de, 0x37bf +.2byte 0x33e3, 0x37e5, 0x33e7, 0x37e9, 0x37eb, 0x37ed, 0x37ef, 0x37f1, 0x37f3, 0x37f5, 0x37f6, 0x37f8, 0x37fa, 0x37fc, 0x37fe, 0x37ff +.2byte 0x3421, 0x3423, 0x3425, 0x3427, 0x3429, 0x342b, 0x342d, 0x3811, 0x3813, 0x3815, 0x3817, 0x3819, 0x381b, 0x381d, 0x341f, 0x387f +.2byte 0x3461, 0x3842, 0x3845, 0x3847, 0x3849, 0x384c, 0x384e, 0x3850, 0x3853, 0x3855, 0x3857, 0x3859, 0x385b, 0x345d, 0x389e, 0x3cbf +.2byte 0x34a1, 0x38a2, 0x38a5, 0x38a7, 0x38a9, 0x38ac, 0x38ae, 0x38b0, 0x3892, 0x3895, 0x3897, 0x3899, 0x349b, 0x38dc, 0x38de, 0x3cff +.2byte 0x34e1, 0x38e2, 0x38e5, 0x38e7, 0x38e9, 0x38eb, 0x38ee, 0x38f0, 0x38f2, 0x38f4, 0x34d7, 0x34f9, 0x391a, 0x391c, 0x3d1e, 0x3d3f +.2byte 0x3521, 0x3942, 0x3925, 0x3927, 0x3929, 0x392b, 0x392e, 0x3930, 0x3932, 0x3534, 0x3536, 0x3958, 0x395a, 0x3d5c, 0x395e, 0x3d7f +.2byte 0x3561, 0x3982, 0x3985, 0x3987, 0x3969, 0x396b, 0x396e, 0x3970, 0x3572, 0x3574, 0x3996, 0x3998, 0x399a, 0x3d9c, 0x3dbe, 0x3dbf +.2byte 0x35a1, 0x39c2, 0x39c5, 0x39c7, 0x39c9, 0x39cb, 0x39ce, 0x35b0, 0x35b2, 0x39d4, 0x39d6, 0x39d8, 0x39da, 0x3dfc, 0x3dfe, 0x3dff +.2byte 0x3a20, 0x3a02, 0x3a05, 0x3a07, 0x3a09, 0x3a0b, 0x360d, 0x3610, 0x3612, 0x3a14, 0x3a16, 0x3a18, 0x3a1a, 0x3e1c, 0x3e1e, 0x3e3f +.2byte 0x3a60, 0x3a62, 0x3a44, 0x3647, 0x3a49, 0x364b, 0x364d, 0x3650, 0x3652, 0x3a54, 0x3a56, 0x3a58, 0x3a5a, 0x3e5c, 0x3e7e, 0x3e7f +.2byte 0x3aa0, 0x3aa2, 0x3aa4, 0x3a87, 0x3689, 0x368b, 0x3a8e, 0x3a90, 0x3a92, 0x3a94, 0x3a96, 0x3a98, 0x3a9a, 0x3e9c, 0x3e9e, 0x3ebf +.2byte 0x36e0, 0x3ae2, 0x3ae4, 0x36e6, 0x36c9, 0x3acc, 0x3ace, 0x3ad0, 0x3ad2, 0x3ad4, 0x3ad6, 0x3ad8, 0x3ada, 0x3edc, 0x3ede, 0x3edf +.2byte 0x3720, 0x3b22, 0x3724, 0x3727, 0x3b0a, 0x3b0c, 0x3b0e, 0x3b10, 0x3b12, 0x3b14, 0x3b16, 0x3b18, 0x3b1a, 0x3f1c, 0x3f1e, 0x3f1f +.2byte 0x3b60, 0x3762, 0x3764, 0x3b48, 0x3b4a, 0x3b4c, 0x3b4e, 0x3b50, 0x3b52, 0x3b54, 0x3b56, 0x3b58, 0x3b5a, 0x3f5c, 0x3f5e, 0x3f5f +.2byte 0x37a0, 0x37a2, 0x3b86, 0x3b88, 0x3b8a, 0x3b8c, 0x3f8f, 0x3f91, 0x3f93, 0x3f94, 0x3f97, 0x3f98, 0x3f9a, 0x3f9c, 0x3f9e, 0x3f9f +.2byte 0x37e0, 0x3bc4, 0x3bc6, 0x3bc8, 0x3bca, 0x3bcd, 0x3fcf, 0x3fd1, 0x3fd3, 0x3fd5, 0x3fd6, 0x3fd8, 0x3fda, 0x3fdc, 0x3fde, 0x3fdf +.2byte 0x3be3, 0x3be5, 0x3be7, 0x3fe9, 0x3feb, 0x3fed, 0x3fef, 0x3ff1, 0x3ff3, 0x3ff5, 0x3ff7, 0x3ff9, 0x3ffa, 0x3ffc, 0x3ffe, 0x3fff +.2byte 0x4400, 0x4402, 0x4405, 0x4407, 0x4409, 0x440c, 0x440e, 0x4411, 0x4413, 0x4015, 0x4017, 0x4019, 0x401b, 0x401d, 0x401f, 0x407f +.2byte 0x4460, 0x4042, 0x4045, 0x4047, 0x4049, 0x404c, 0x404e, 0x4050, 0x4053, 0x4055, 0x4057, 0x4059, 0x405b, 0x405d, 0x409e, 0x44bf +.2byte 0x44a0, 0x40a2, 0x40a5, 0x40a7, 0x40a9, 0x40ab, 0x40ae, 0x40b0, 0x4092, 0x4095, 0x4097, 0x4099, 0x409b, 0x44dc, 0x40de, 0x40ff +.2byte 0x44e0, 0x40e2, 0x40e5, 0x40e7, 0x40e9, 0x40eb, 0x40ee, 0x40f0, 0x40f2, 0x40f4, 0x40d7, 0x40f9, 0x411a, 0x411c, 0x411e, 0x453f +.2byte 0x4540, 0x4122, 0x4125, 0x4127, 0x4129, 0x412b, 0x412e, 0x4130, 0x4132, 0x4134, 0x4136, 0x4158, 0x415a, 0x415c, 0x415e, 0x457f +.2byte 0x4580, 0x4182, 0x4185, 0x4167, 0x4169, 0x416b, 0x416e, 0x4170, 0x4172, 0x4174, 0x4196, 0x4198, 0x459a, 0x419c, 0x45be, 0x45bf +.2byte 0x45c0, 0x41c2, 0x41c5, 0x41c7, 0x41c9, 0x41cb, 0x41ad, 0x41b0, 0x41b2, 0x41d4, 0x41d6, 0x41d8, 0x41da, 0x45fc, 0x45fe, 0x45ff +.2byte 0x4620, 0x4202, 0x4205, 0x4207, 0x4209, 0x420b, 0x420d, 0x4210, 0x4212, 0x4214, 0x4636, 0x4218, 0x463a, 0x463c, 0x463e, 0x463f +.2byte 0x4260, 0x4262, 0x4244, 0x4247, 0x4249, 0x424b, 0x424d, 0x4250, 0x4252, 0x4254, 0x4656, 0x4258, 0x465a, 0x465c, 0x467e, 0x467f +.2byte 0x42a0, 0x42a2, 0x42a4, 0x4287, 0x4289, 0x428b, 0x428e, 0x4290, 0x4292, 0x4294, 0x4696, 0x4298, 0x469a, 0x469c, 0x46be, 0x46bf +.2byte 0x42e0, 0x42e2, 0x42e4, 0x42e6, 0x42c9, 0x42cc, 0x42ce, 0x46d1, 0x46d2, 0x46d4, 0x46d6, 0x42d8, 0x46da, 0x46dc, 0x46de, 0x46ff +.2byte 0x3f20, 0x3f22, 0x4324, 0x4327, 0x430a, 0x430c, 0x430e, 0x4310, 0x4312, 0x4314, 0x4316, 0x4318, 0x471a, 0x471c, 0x471e, 0x471f +.2byte 0x3f60, 0x3f62, 0x4364, 0x4348, 0x434a, 0x434c, 0x434e, 0x4751, 0x4753, 0x4754, 0x4756, 0x4758, 0x475a, 0x475c, 0x475e, 0x475f +.2byte 0x43a0, 0x43a2, 0x4386, 0x4388, 0x438a, 0x438c, 0x438f, 0x4791, 0x4793, 0x4794, 0x4796, 0x4798, 0x479a, 0x479c, 0x479e, 0x479f +.2byte 0x43e0, 0x43c4, 0x43c6, 0x43c8, 0x43ca, 0x43cd, 0x43cf, 0x47d1, 0x47d3, 0x47d5, 0x47d7, 0x47d9, 0x47da, 0x47dc, 0x47de, 0x47df +.2byte 0x43e3, 0x43e5, 0x43e7, 0x43e9, 0x47eb, 0x47ed, 0x47ef, 0x47f1, 0x47f3, 0x47f5, 0x47f7, 0x47f8, 0x47fa, 0x47fc, 0x47fe, 0x47ff +.2byte 0x4c00, 0x4c02, 0x4c05, 0x4c07, 0x4c09, 0x4c0c, 0x4c0e, 0x4c10, 0x4c13, 0x4c15, 0x4817, 0x4819, 0x481b, 0x481d, 0x481f, 0x487f +.2byte 0x4c60, 0x4c42, 0x4c45, 0x4c47, 0x4c49, 0x4c4c, 0x4c4e, 0x4c50, 0x4c53, 0x4c55, 0x4857, 0x4859, 0x485b, 0x485d, 0x4c9e, 0x48bf +.2byte 0x4ca0, 0x4ca2, 0x4884, 0x4887, 0x4889, 0x488b, 0x488e, 0x4890, 0x4892, 0x4895, 0x4897, 0x4899, 0x489b, 0x48dc, 0x48de, 0x4cff +.2byte 0x4ce0, 0x4ce2, 0x48e4, 0x48e7, 0x48e9, 0x48eb, 0x48ed, 0x48f0, 0x48f2, 0x48f4, 0x48d7, 0x48f9, 0x491a, 0x491c, 0x4d1e, 0x4d3f +.2byte 0x4d20, 0x4d22, 0x4924, 0x4927, 0x4929, 0x492b, 0x492e, 0x4930, 0x4932, 0x4934, 0x4936, 0x4958, 0x495a, 0x495c, 0x495e, 0x4d7f +.2byte 0x4d80, 0x4d82, 0x4964, 0x4967, 0x4969, 0x496b, 0x496d, 0x4970, 0x4972, 0x4974, 0x4996, 0x4998, 0x499a, 0x4d9c, 0x49be, 0x4dbf +.2byte 0x4dc0, 0x4dc2, 0x49c4, 0x49c7, 0x49c9, 0x49ab, 0x49ad, 0x49b0, 0x49b2, 0x49d4, 0x49d6, 0x49d8, 0x49da, 0x4dfc, 0x4dfe, 0x4dff +.2byte 0x4e20, 0x4e02, 0x4a04, 0x4a07, 0x4a09, 0x4a0b, 0x4a0d, 0x4a10, 0x4a12, 0x4a14, 0x4a36, 0x4a18, 0x4e3a, 0x4e3c, 0x4e3e, 0x4e3f +.2byte 0x4e60, 0x4e62, 0x4a44, 0x4a47, 0x4a49, 0x4a4b, 0x4a4d, 0x4a50, 0x4a52, 0x4a54, 0x4e76, 0x4a58, 0x4e7a, 0x4e7c, 0x4e7e, 0x56bf +.2byte 0x4aa0, 0x4aa2, 0x4aa4, 0x4a87, 0x4a89, 0x4a8b, 0x4a8e, 0x4a90, 0x4a92, 0x4a94, 0x4e96, 0x4a98, 0x4eba, 0x4e9c, 0x4ebe, 0x56df +.2byte 0x4ae0, 0x4ae2, 0x4ae4, 0x4ae6, 0x4ac9, 0x4acc, 0x4ace, 0x4ad1, 0x4ed3, 0x4ed4, 0x4ed6, 0x4ad8, 0x4eda, 0x4edc, 0x4ede, 0x571f +.2byte 0x4b20, 0x4b22, 0x4b24, 0x4b27, 0x4b0a, 0x4b0c, 0x4b0e, 0x4b10, 0x4b12, 0x4b14, 0x4b16, 0x4b18, 0x4f1a, 0x4f1c, 0x4f1e, 0x573f +.2byte 0x4b60, 0x4b62, 0x4764, 0x4b48, 0x4b4a, 0x4b4c, 0x4b4e, 0x4b51, 0x4f53, 0x4f55, 0x4f56, 0x4f58, 0x4f5a, 0x4f5c, 0x4f5e, 0x577f +.2byte 0x4ba0, 0x47a2, 0x4b86, 0x4b88, 0x4b8a, 0x4b8c, 0x4b8f, 0x4b91, 0x4f93, 0x4f95, 0x4f96, 0x4f98, 0x4f9a, 0x4f9c, 0x4f9e, 0x579f +.2byte 0x4be0, 0x4bc4, 0x4bc6, 0x4bc8, 0x4bca, 0x4bcd, 0x4fcf, 0x4fd1, 0x4fd3, 0x4fd5, 0x4fd7, 0x4fd8, 0x4fda, 0x4fdc, 0x4fde, 0x57df +.2byte 0x4be3, 0x4be5, 0x4be7, 0x4be9, 0x4beb, 0x4bed, 0x4fef, 0x4ff1, 0x57f5, 0x57f6, 0x57f8, 0x57f9, 0x57fb, 0x57fc, 0x57fe, 0x57ff +.2byte 0x5400, 0x5402, 0x5404, 0x5407, 0x5409, 0x540b, 0x540e, 0x5410, 0x5412, 0x5415, 0x5417, 0x5419, 0x501b, 0x541d, 0x501f, 0x507f +.2byte 0x5440, 0x5442, 0x5444, 0x5447, 0x5449, 0x544b, 0x544e, 0x5450, 0x5452, 0x5455, 0x5457, 0x5459, 0x545b, 0x505d, 0x509e, 0x50bf +.2byte 0x54a0, 0x54a2, 0x5484, 0x5487, 0x5489, 0x548b, 0x548e, 0x5490, 0x5492, 0x5495, 0x5497, 0x5099, 0x509b, 0x50dc, 0x50de, 0x54ff +.2byte 0x54e0, 0x54e2, 0x54e4, 0x50e7, 0x50e9, 0x50eb, 0x50ee, 0x50f0, 0x50f2, 0x50f4, 0x54d7, 0x50f9, 0x511a, 0x511c, 0x511e, 0x513f +.2byte 0x5520, 0x5522, 0x5524, 0x5127, 0x5129, 0x512b, 0x512d, 0x5130, 0x5132, 0x5134, 0x5136, 0x5158, 0x515a, 0x555c, 0x515e, 0x557f +.2byte 0x5580, 0x5562, 0x5564, 0x5167, 0x5169, 0x516b, 0x516d, 0x5170, 0x5172, 0x5174, 0x5196, 0x5198, 0x519a, 0x519c, 0x55be, 0x55bf +.2byte 0x55c0, 0x55c2, 0x55c4, 0x51c7, 0x51a9, 0x51ab, 0x51ce, 0x51d0, 0x51d2, 0x51d4, 0x51d6, 0x51d8, 0x51da, 0x51fc, 0x55fe, 0x55ff +.2byte 0x5600, 0x5602, 0x5604, 0x5207, 0x5209, 0x520b, 0x520e, 0x5210, 0x5212, 0x5214, 0x5236, 0x5218, 0x523a, 0x523c, 0x563e, 0x563f +.2byte 0x5660, 0x5662, 0x5644, 0x5247, 0x5249, 0x524b, 0x524e, 0x5250, 0x5252, 0x5254, 0x5276, 0x5258, 0x567a, 0x567c, 0x567e, 0x5abf +.2byte 0x56a0, 0x56a2, 0x56a4, 0x5287, 0x5289, 0x528b, 0x528e, 0x5290, 0x5292, 0x5294, 0x5296, 0x56b8, 0x56ba, 0x56bc, 0x5ade, 0x5eff +.2byte 0x52e0, 0x56e2, 0x52e4, 0x52e6, 0x52c9, 0x52cc, 0x52ce, 0x52d1, 0x52d3, 0x52d4, 0x52d6, 0x56d8, 0x56da, 0x56fc, 0x5b1e, 0x5f1f +.2byte 0x5320, 0x5322, 0x5324, 0x5327, 0x530a, 0x530c, 0x530e, 0x5310, 0x5312, 0x5715, 0x5716, 0x5718, 0x571a, 0x571c, 0x5b3e, 0x5f5f +.2byte 0x5360, 0x5362, 0x5364, 0x5348, 0x534a, 0x534c, 0x534e, 0x5351, 0x5753, 0x5755, 0x5757, 0x5758, 0x575a, 0x575c, 0x5b7e, 0x5f7f +.2byte 0x53a0, 0x53a2, 0x5386, 0x5388, 0x538a, 0x538c, 0x538f, 0x5391, 0x5393, 0x5795, 0x5797, 0x5798, 0x579a, 0x579c, 0x5b9e, 0x5f9f +.2byte 0x53e0, 0x53c4, 0x53c6, 0x53c8, 0x53ca, 0x53cd, 0x53cf, 0x57d1, 0x57d3, 0x5bd6, 0x5bd8, 0x5bd9, 0x5bdb, 0x5bdd, 0x5bde, 0x5fdf +.2byte 0x53e3, 0x53e5, 0x53e7, 0x53e9, 0x53eb, 0x53ed, 0x57ef, 0x57f1, 0x5bf5, 0x5ff7, 0x5ff8, 0x5ffa, 0x5ffb, 0x5ffd, 0x5ffe, 0x5fff +.2byte 0x5c00, 0x5c02, 0x5c04, 0x5c06, 0x5c09, 0x5c0b, 0x5c0d, 0x5c10, 0x5c12, 0x5c14, 0x5c17, 0x5c19, 0x5c1b, 0x5c1d, 0x581f, 0x587f +.2byte 0x5c40, 0x5c42, 0x5c44, 0x5c47, 0x5c49, 0x5c4b, 0x5c4e, 0x5c50, 0x5c52, 0x5c55, 0x5c57, 0x5c59, 0x5c5b, 0x585d, 0x5c9e, 0x58bf +.2byte 0x5ca0, 0x5c82, 0x5c84, 0x5c86, 0x5c89, 0x5c8b, 0x5c8e, 0x5c90, 0x5c92, 0x5c94, 0x5c97, 0x5c99, 0x589b, 0x58dc, 0x58de, 0x58ff +.2byte 0x5ce0, 0x5ce2, 0x5ce4, 0x5cc6, 0x5cc9, 0x5ccb, 0x5ccd, 0x5cd0, 0x5cd2, 0x5cd4, 0x5cd7, 0x5cf9, 0x591a, 0x591c, 0x591e, 0x593f +.2byte 0x5d20, 0x5d22, 0x5d24, 0x5d26, 0x5929, 0x592b, 0x592d, 0x5930, 0x5932, 0x5934, 0x5936, 0x5958, 0x595a, 0x595c, 0x595e, 0x597f +.2byte 0x5d60, 0x5d62, 0x5d64, 0x5d66, 0x5969, 0x598c, 0x598e, 0x5990, 0x5992, 0x5994, 0x5996, 0x5998, 0x599a, 0x599c, 0x5dbe, 0x59bf +.2byte 0x5dc0, 0x5dc2, 0x5dc4, 0x5da6, 0x59a9, 0x59cc, 0x59ce, 0x59d0, 0x59d2, 0x59d4, 0x59d6, 0x59d8, 0x59da, 0x5dfc, 0x59fe, 0x5dff +.2byte 0x5e00, 0x5e02, 0x5e04, 0x5e06, 0x5a09, 0x5a0c, 0x5a0e, 0x5a31, 0x5a32, 0x5a34, 0x5a36, 0x5a18, 0x5a3a, 0x5a3c, 0x5e3e, 0x5e3f +.2byte 0x5e40, 0x5e42, 0x5e44, 0x5e46, 0x5a49, 0x5a4c, 0x5a4e, 0x5a51, 0x5a73, 0x5a74, 0x5a76, 0x5a58, 0x5a7a, 0x5a7c, 0x5e7e, 0x62bf +.2byte 0x5ea0, 0x5ea2, 0x5ea4, 0x5ea6, 0x5a89, 0x5a8c, 0x5a8e, 0x5a91, 0x5a93, 0x5a94, 0x5a96, 0x5ab8, 0x5eba, 0x5ebc, 0x62de, 0x62ff +.2byte 0x5ee0, 0x5ee2, 0x5ee4, 0x5ee6, 0x5ac9, 0x5acc, 0x5ace, 0x5ad1, 0x5ad3, 0x5ad4, 0x5ad6, 0x5ef8, 0x5efa, 0x631d, 0x631e, 0x673f +.2byte 0x5f20, 0x5b22, 0x5b24, 0x5b27, 0x5b0a, 0x5b0c, 0x5b0e, 0x5b10, 0x5b12, 0x5b15, 0x5f17, 0x5f18, 0x5f1a, 0x633d, 0x635e, 0x675f +.2byte 0x5b60, 0x5b62, 0x5b64, 0x5b48, 0x5b4a, 0x5b4c, 0x5b4e, 0x5b51, 0x5b53, 0x5b55, 0x5f57, 0x5f58, 0x5f5a, 0x637d, 0x637e, 0x677f +.2byte 0x5ba0, 0x5ba2, 0x5b86, 0x5b88, 0x5b8a, 0x5b8c, 0x5b8f, 0x5b91, 0x5b93, 0x5f95, 0x63b8, 0x63b9, 0x63bb, 0x63bd, 0x63be, 0x67bf +.2byte 0x5be0, 0x5bc4, 0x5bc6, 0x5bc8, 0x5bca, 0x5bcd, 0x5bcf, 0x5bd1, 0x5bd3, 0x63d6, 0x63d8, 0x63da, 0x63db, 0x63dd, 0x63de, 0x67df +.2byte 0x5be3, 0x5be5, 0x5be7, 0x5be9, 0x5beb, 0x5bed, 0x5bef, 0x5ff1, 0x63f5, 0x63f7, 0x67f9, 0x67fa, 0x67fc, 0x67fd, 0x67fe, 0x67ff +.2byte 0x6400, 0x6402, 0x6404, 0x6407, 0x6409, 0x640b, 0x640d, 0x640f, 0x6412, 0x6414, 0x6417, 0x6419, 0x641b, 0x641d, 0x641f, 0x607f +.2byte 0x6440, 0x6442, 0x6444, 0x6446, 0x6448, 0x644b, 0x644e, 0x644f, 0x6452, 0x6454, 0x6456, 0x6459, 0x645b, 0x645d, 0x609e, 0x60bf +.2byte 0x6480, 0x6482, 0x6484, 0x6486, 0x6489, 0x648b, 0x648d, 0x6490, 0x6492, 0x6494, 0x6496, 0x6499, 0x649b, 0x60dc, 0x60de, 0x60ff +.2byte 0x64e0, 0x64e2, 0x64e4, 0x64e7, 0x64e9, 0x64eb, 0x64ed, 0x64f0, 0x64f2, 0x64f4, 0x64f6, 0x64f9, 0x651a, 0x611c, 0x611e, 0x613f +.2byte 0x6520, 0x6522, 0x6524, 0x6527, 0x614a, 0x614c, 0x614e, 0x6150, 0x6152, 0x6154, 0x6156, 0x6158, 0x615a, 0x615c, 0x615e, 0x617f +.2byte 0x6580, 0x6562, 0x6564, 0x6567, 0x618a, 0x618c, 0x618e, 0x6190, 0x6192, 0x6194, 0x6196, 0x6198, 0x619a, 0x619c, 0x61be, 0x61bf +.2byte 0x65c0, 0x65c2, 0x65c4, 0x65a7, 0x61ca, 0x61cc, 0x61ce, 0x61d0, 0x61d2, 0x61d4, 0x61d6, 0x61d8, 0x61da, 0x61fc, 0x61fe, 0x65ff +.2byte 0x6600, 0x6602, 0x6604, 0x6607, 0x620a, 0x620c, 0x620e, 0x6210, 0x6212, 0x6214, 0x6216, 0x6218, 0x623a, 0x623c, 0x663e, 0x623f +.2byte 0x6640, 0x6642, 0x6644, 0x6647, 0x624a, 0x624c, 0x624e, 0x6250, 0x6252, 0x6254, 0x6256, 0x6258, 0x627a, 0x627c, 0x627e, 0x66bf +.2byte 0x66a0, 0x66a2, 0x6684, 0x6687, 0x628a, 0x628c, 0x628e, 0x6290, 0x6292, 0x62b5, 0x62b6, 0x62b8, 0x62ba, 0x62bc, 0x66de, 0x6aff +.2byte 0x66e0, 0x66e2, 0x66e4, 0x66e7, 0x62ca, 0x62cc, 0x62ce, 0x62d0, 0x62d2, 0x62d5, 0x62f7, 0x62f8, 0x62fa, 0x671d, 0x6b1e, 0x6b3f +.2byte 0x6720, 0x6722, 0x6724, 0x6727, 0x630a, 0x630c, 0x630e, 0x6310, 0x6312, 0x6315, 0x6317, 0x6318, 0x673b, 0x6b5d, 0x6b5e, 0x6f7f +.2byte 0x6760, 0x6762, 0x6364, 0x6348, 0x634a, 0x634c, 0x634e, 0x6351, 0x6353, 0x6355, 0x6357, 0x6779, 0x677b, 0x6b7d, 0x6b7e, 0x6f9f +.2byte 0x63a0, 0x63a2, 0x6386, 0x6388, 0x638a, 0x638c, 0x638f, 0x6391, 0x6393, 0x6395, 0x67b8, 0x6bba, 0x6bbb, 0x6bbd, 0x6bbe, 0x6fbf +.2byte 0x67e0, 0x63c4, 0x63c6, 0x63c8, 0x63ca, 0x63cd, 0x63cf, 0x63d1, 0x63d3, 0x67d6, 0x6bd8, 0x6bda, 0x6bdc, 0x6bdd, 0x6bde, 0x6fdf +.2byte 0x5fe3, 0x63e5, 0x63e7, 0x63e9, 0x63eb, 0x63ed, 0x63ef, 0x63f1, 0x67f5, 0x6bf7, 0x6bf9, 0x6ffb, 0x6ffc, 0x6ffd, 0x6ffe, 0x6fff +.2byte 0x6c00, 0x6c02, 0x6c04, 0x6c07, 0x6c08, 0x6c0b, 0x6c0e, 0x6c0f, 0x6c12, 0x6c14, 0x6c16, 0x6c19, 0x6c1b, 0x6c1d, 0x6c1f, 0x687f +.2byte 0x6c40, 0x6c42, 0x6c44, 0x6c46, 0x6c49, 0x6c4b, 0x6c4d, 0x6c4f, 0x6c52, 0x6c54, 0x6c56, 0x6c59, 0x6c5b, 0x6c5d, 0x689e, 0x68bf +.2byte 0x6c80, 0x6c82, 0x6c84, 0x6c86, 0x6c88, 0x6c8b, 0x6c8d, 0x6c90, 0x6c91, 0x6c94, 0x6c96, 0x6c98, 0x6c9b, 0x68dc, 0x68de, 0x68ff +.2byte 0x6ce0, 0x6ce2, 0x6ce4, 0x6908, 0x690a, 0x690c, 0x690e, 0x6910, 0x6912, 0x6914, 0x6916, 0x6918, 0x691a, 0x691c, 0x691e, 0x693f +.2byte 0x6d20, 0x6d22, 0x6d24, 0x6948, 0x694a, 0x694c, 0x694e, 0x6950, 0x6952, 0x6954, 0x6956, 0x6958, 0x695a, 0x695c, 0x695e, 0x697f +.2byte 0x6d60, 0x6d62, 0x6d64, 0x6988, 0x698a, 0x698c, 0x698e, 0x6990, 0x6992, 0x6994, 0x6996, 0x6998, 0x699a, 0x699c, 0x69be, 0x69bf +.2byte 0x6dc0, 0x6dc2, 0x6da4, 0x69c8, 0x69ca, 0x69cc, 0x69ce, 0x69d0, 0x69d2, 0x69d4, 0x69d6, 0x69d8, 0x69da, 0x69fc, 0x69fe, 0x69ff +.2byte 0x6e00, 0x6e02, 0x6e04, 0x6a08, 0x6a0a, 0x6a2c, 0x6a0e, 0x6a31, 0x6a32, 0x6a34, 0x6a36, 0x6a38, 0x6a3a, 0x6a3c, 0x6a3e, 0x6a3f +.2byte 0x6e40, 0x6e42, 0x6e44, 0x6a48, 0x6a4a, 0x6a4c, 0x6a4e, 0x6a71, 0x6a73, 0x6a75, 0x6a76, 0x6a78, 0x6a7a, 0x6a7c, 0x6a7e, 0x6ebf +.2byte 0x6e80, 0x6ea2, 0x6e84, 0x6a88, 0x6a8a, 0x6a8c, 0x6a8e, 0x6a91, 0x6ab3, 0x6ab5, 0x6ab6, 0x6ab8, 0x6aba, 0x6abc, 0x6ede, 0x6eff +.2byte 0x6ee0, 0x6ee2, 0x6ec4, 0x6ac8, 0x6aca, 0x6acc, 0x6ace, 0x6ad1, 0x6ad3, 0x6af5, 0x6af7, 0x6af8, 0x6afa, 0x6f1d, 0x6f1e, 0x733f +.2byte 0x6f20, 0x6f22, 0x6f24, 0x6b28, 0x6b0a, 0x6b0c, 0x6b0e, 0x6b11, 0x6b13, 0x6b15, 0x6b17, 0x6f39, 0x6f3b, 0x6f5d, 0x735e, 0x737f +.2byte 0x6f60, 0x6f62, 0x6f64, 0x6b48, 0x6b4a, 0x6b4c, 0x6b4e, 0x6b51, 0x6b53, 0x6b55, 0x6b57, 0x6f79, 0x6f7b, 0x739d, 0x739e, 0x77bf +.2byte 0x6fa0, 0x6fa2, 0x6b86, 0x6b88, 0x6b8a, 0x6b8c, 0x6b8f, 0x6b91, 0x6b93, 0x6b95, 0x6fb8, 0x6fba, 0x73bc, 0x73bd, 0x73be, 0x77df +.2byte 0x6fe0, 0x6bc4, 0x6bc6, 0x6bc8, 0x6bca, 0x6bcd, 0x6bcf, 0x6bd1, 0x6bd3, 0x6fd6, 0x6fd8, 0x6fda, 0x73dc, 0x73dd, 0x73de, 0x77ff +.2byte 0x67e3, 0x6be5, 0x67e7, 0x6be9, 0x6beb, 0x6bed, 0x6bef, 0x6bf1, 0x6ff5, 0x6ff7, 0x6ff9, 0x73fb, 0x77fd, 0x77fe, 0x77ff, 0x77ff +.2byte 0x7400, 0x7402, 0x7404, 0x7406, 0x7409, 0x740b, 0x740d, 0x7410, 0x7412, 0x7414, 0x7416, 0x7418, 0x741b, 0x741d, 0x741f, 0x707f +.2byte 0x7440, 0x7442, 0x7444, 0x7446, 0x7449, 0x744b, 0x744d, 0x7450, 0x7451, 0x7454, 0x7456, 0x7458, 0x745b, 0x745d, 0x749e, 0x70bf +.2byte 0x74a0, 0x7482, 0x70c6, 0x70c8, 0x70ca, 0x70cc, 0x70ce, 0x70d0, 0x70d2, 0x70d4, 0x70d6, 0x70d8, 0x70da, 0x70dc, 0x70de, 0x70ff +.2byte 0x74e0, 0x74e2, 0x7106, 0x7108, 0x710a, 0x710c, 0x710e, 0x7110, 0x7112, 0x7114, 0x7116, 0x7118, 0x711a, 0x711c, 0x751e, 0x713f +.2byte 0x7520, 0x7522, 0x7146, 0x7148, 0x714a, 0x714c, 0x714e, 0x7150, 0x7152, 0x7154, 0x7156, 0x7158, 0x715a, 0x715c, 0x715e, 0x717f +.2byte 0x7560, 0x7562, 0x71a6, 0x7188, 0x718a, 0x718c, 0x718e, 0x7190, 0x7192, 0x7194, 0x7196, 0x7198, 0x719a, 0x719c, 0x71be, 0x71bf +.2byte 0x75c0, 0x75a2, 0x71c6, 0x71c8, 0x71ea, 0x71ec, 0x71ef, 0x71f0, 0x71f2, 0x71f4, 0x71f6, 0x71f8, 0x71fa, 0x71fc, 0x71fe, 0x71ff +.2byte 0x7600, 0x7602, 0x7226, 0x7208, 0x720a, 0x720c, 0x722f, 0x7231, 0x7232, 0x7234, 0x7236, 0x7238, 0x723a, 0x723c, 0x723e, 0x723f +.2byte 0x7640, 0x7642, 0x7246, 0x7248, 0x724a, 0x726c, 0x726f, 0x7271, 0x7273, 0x7274, 0x7276, 0x7278, 0x727a, 0x727c, 0x727e, 0x72bf +.2byte 0x76a0, 0x7682, 0x7286, 0x7288, 0x72aa, 0x728c, 0x728f, 0x7291, 0x72b3, 0x72b5, 0x72b7, 0x72b8, 0x72ba, 0x72bc, 0x76de, 0x76ff +.2byte 0x76e0, 0x76c2, 0x72c6, 0x72c8, 0x72ca, 0x72cc, 0x72ef, 0x72d1, 0x72d3, 0x72f5, 0x7718, 0x7719, 0x771b, 0x771d, 0x771e, 0x773f +.2byte 0x7720, 0x7722, 0x7306, 0x7308, 0x730a, 0x730c, 0x730f, 0x7311, 0x7313, 0x7315, 0x7738, 0x775a, 0x775b, 0x775d, 0x775e, 0x777f +.2byte 0x7760, 0x7762, 0x7346, 0x7348, 0x734a, 0x734c, 0x734f, 0x7351, 0x7353, 0x7355, 0x7778, 0x777a, 0x779c, 0x779d, 0x779e, 0x7bbf +.2byte 0x77a0, 0x77a2, 0x7386, 0x7388, 0x738a, 0x738c, 0x738f, 0x7391, 0x7393, 0x7395, 0x77b8, 0x77ba, 0x77bc, 0x77bd, 0x7bdf, 0x7fff +.2byte 0x77e0, 0x73c4, 0x73c6, 0x73c8, 0x73ca, 0x73cd, 0x73cf, 0x73d1, 0x73d3, 0x73d6, 0x77d8, 0x77da, 0x77dc, 0x7bfe, 0x7bff, 0x7fff +.2byte 0x6fe3, 0x73e5, 0x6fe7, 0x6fe9, 0x6feb, 0x73ed, 0x73ef, 0x73f1, 0x73f5, 0x73f7, 0x77f9, 0x77fb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7c00, 0x7c02, 0x7c04, 0x7c06, 0x7c09, 0x7c0b, 0x7c0d, 0x7c10, 0x7c12, 0x7c14, 0x7c16, 0x7c19, 0x7c1b, 0x7c1d, 0x7c1f, 0x787f +.2byte 0x7c40, 0x7884, 0x7886, 0x7888, 0x788a, 0x788c, 0x788e, 0x7890, 0x7892, 0x7894, 0x7896, 0x7898, 0x789a, 0x789c, 0x789e, 0x78bf +.2byte 0x7ca0, 0x78c4, 0x78c6, 0x78c8, 0x78ca, 0x78cc, 0x78ce, 0x78d0, 0x78d2, 0x78d4, 0x78d6, 0x78d8, 0x78da, 0x78dc, 0x78de, 0x78ff +.2byte 0x7ce0, 0x7904, 0x7906, 0x7908, 0x790a, 0x790c, 0x790e, 0x7910, 0x7912, 0x7914, 0x7916, 0x7918, 0x791a, 0x791c, 0x791e, 0x793f +.2byte 0x7d20, 0x7944, 0x7946, 0x7968, 0x794a, 0x794c, 0x794e, 0x7950, 0x7952, 0x7954, 0x7956, 0x7958, 0x795a, 0x795c, 0x795e, 0x797f +.2byte 0x7d60, 0x7984, 0x7986, 0x7988, 0x798a, 0x79ad, 0x79ae, 0x79b0, 0x79b2, 0x79b4, 0x79b6, 0x79b8, 0x79ba, 0x79bc, 0x79be, 0x79bf +.2byte 0x7da0, 0x79c4, 0x79c6, 0x79e8, 0x79ca, 0x79ed, 0x79ef, 0x79f0, 0x79f3, 0x79f4, 0x79f6, 0x79f8, 0x79fa, 0x79fc, 0x79fe, 0x79ff +.2byte 0x7e00, 0x7a04, 0x7a06, 0x7a08, 0x7a0a, 0x7a2d, 0x7a2f, 0x7a31, 0x7a33, 0x7a35, 0x7a36, 0x7a38, 0x7a3a, 0x7a3c, 0x7a3e, 0x7a3f +.2byte 0x7e40, 0x7a64, 0x7a46, 0x7a68, 0x7a4a, 0x7a4d, 0x7a6f, 0x7a71, 0x7a73, 0x7a75, 0x7a76, 0x7a78, 0x7a7a, 0x7a7c, 0x7a7e, 0x7abf +.2byte 0x7e80, 0x7a84, 0x7a86, 0x7a88, 0x7a8a, 0x7aad, 0x7aaf, 0x7ab1, 0x7ab3, 0x7ad6, 0x7ad8, 0x7ad9, 0x7adb, 0x7adc, 0x7ade, 0x7aff +.2byte 0x7ec0, 0x7ae4, 0x7ac6, 0x7ac8, 0x7aca, 0x7aed, 0x7acf, 0x7af1, 0x7af3, 0x7b16, 0x7b18, 0x7b1a, 0x7b1b, 0x7b1d, 0x7b1e, 0x7b3f +.2byte 0x7f20, 0x7b04, 0x7b06, 0x7b08, 0x7b0a, 0x7b0d, 0x7b0f, 0x7b31, 0x7b13, 0x7b36, 0x7b58, 0x7b5a, 0x7b5b, 0x7b5d, 0x7b5e, 0x7b7f +.2byte 0x7f60, 0x7b44, 0x7b46, 0x7b48, 0x7b4a, 0x7b4d, 0x7b4f, 0x7b51, 0x7b53, 0x7b76, 0x7b78, 0x7b9a, 0x7b9c, 0x7b9d, 0x7b9e, 0x7fbf +.2byte 0x7fa0, 0x7ba4, 0x7b86, 0x7ba8, 0x7b8a, 0x7b8d, 0x7b8f, 0x7b91, 0x7b93, 0x7bb6, 0x7bb8, 0x7bba, 0x7bbc, 0x7fde, 0x7fdf, 0x7fff +.2byte 0x7fe0, 0x7bc4, 0x7bc6, 0x7bc8, 0x7bca, 0x7bcd, 0x7bcf, 0x7bd1, 0x7bd3, 0x7bd6, 0x7bd8, 0x7bda, 0x7bdc, 0x7ffe, 0x7fff, 0x7fff +.2byte 0x77e3, 0x77e5, 0x77e7, 0x77e9, 0x77eb, 0x77ed, 0x7bef, 0x7bf1, 0x7bf5, 0x7bf7, 0x7bf9, 0x7bfb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7c63, 0x7c64, 0x7c66, 0x7c68, 0x7c6a, 0x7c6c, 0x7c6e, 0x7c70, 0x7c72, 0x7c74, 0x7c76, 0x7c77, 0x7c79, 0x7c7b, 0x7c7d, 0x7c7f +.2byte 0x7ca3, 0x7ca5, 0x7ca7, 0x7ca9, 0x7caa, 0x7cad, 0x7cae, 0x7cb0, 0x7cb2, 0x7cb4, 0x7cb6, 0x7cb8, 0x7cba, 0x7cbc, 0x7cbd, 0x7cbf +.2byte 0x7ce3, 0x7ce5, 0x7ce7, 0x7ce9, 0x7ceb, 0x7cec, 0x7cee, 0x7cf0, 0x7cf2, 0x7cf4, 0x7cf6, 0x7cf8, 0x7cf9, 0x7cfb, 0x7cfd, 0x7cff +.2byte 0x7d23, 0x7d25, 0x7d27, 0x7d29, 0x7d2b, 0x7d2d, 0x7d2f, 0x7d30, 0x7d32, 0x7d34, 0x7d36, 0x7d38, 0x7d3a, 0x7d3b, 0x7d3d, 0x7d3f +.2byte 0x7d63, 0x7d65, 0x7d67, 0x7d69, 0x7d6b, 0x7d6d, 0x7d6f, 0x7d71, 0x7d72, 0x7d74, 0x7d76, 0x7d78, 0x7d7a, 0x7d7b, 0x7d7d, 0x7d7f +.2byte 0x7da3, 0x7da5, 0x7da7, 0x7da9, 0x7dab, 0x7dad, 0x7daf, 0x7db1, 0x7db2, 0x7db4, 0x7db6, 0x7db8, 0x7dba, 0x7dbc, 0x7dbd, 0x7dbf +.2byte 0x7dc3, 0x7de5, 0x7de7, 0x7de9, 0x7deb, 0x7ded, 0x7def, 0x7df1, 0x7df3, 0x7df5, 0x7df6, 0x7df8, 0x7dfa, 0x7dfc, 0x7dfe, 0x7dff +.2byte 0x7e03, 0x7e25, 0x7e07, 0x7e29, 0x7e2b, 0x7e2d, 0x7e2f, 0x7e31, 0x7e33, 0x7e35, 0x7e37, 0x7e38, 0x7e3a, 0x7e3c, 0x7e3e, 0x7e3f +.2byte 0x7e43, 0x7e45, 0x7e67, 0x7e69, 0x7e6b, 0x7e6d, 0x7e6f, 0x7e71, 0x7eb5, 0x7eb6, 0x7eb8, 0x7eb9, 0x7ebb, 0x7ebc, 0x7ebe, 0x7ebf +.2byte 0x7e83, 0x7e85, 0x7ea7, 0x7e89, 0x7eab, 0x7ead, 0x7eaf, 0x7eb1, 0x7ed5, 0x7ef7, 0x7ef8, 0x7efa, 0x7efb, 0x7efc, 0x7efe, 0x7eff +.2byte 0x7ec3, 0x7ec5, 0x7ec7, 0x7ec9, 0x7ecb, 0x7ecd, 0x7eef, 0x7ef1, 0x7f15, 0x7f17, 0x7f39, 0x7f3a, 0x7f3b, 0x7f3d, 0x7f3e, 0x7f3f +.2byte 0x7f03, 0x7f05, 0x7f07, 0x7f09, 0x7f0b, 0x7f0d, 0x7f2f, 0x7f11, 0x7f35, 0x7f57, 0x7f59, 0x7f7b, 0x7f7c, 0x7f7d, 0x7f7e, 0x7f7f +.2byte 0x7f43, 0x7f45, 0x7f47, 0x7f49, 0x7f4b, 0x7f4d, 0x7f4f, 0x7f51, 0x7f75, 0x7f77, 0x7f99, 0x7f9b, 0x7fbd, 0x7fbe, 0x7fbf, 0x7fbf +.2byte 0x7f83, 0x7f85, 0x7f87, 0x7f89, 0x7f8b, 0x7f8d, 0x7f8f, 0x7f91, 0x7f95, 0x7fb7, 0x7fb9, 0x7fbb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fc3, 0x7fc5, 0x7fc7, 0x7fc9, 0x7fcb, 0x7fcd, 0x7fcf, 0x7fd1, 0x7fd5, 0x7fd7, 0x7fd9, 0x7fdb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fe3, 0x7fe5, 0x7fe7, 0x7fe9, 0x7feb, 0x7fed, 0x7fef, 0x7ff1, 0x7ff5, 0x7ff7, 0x7ff9, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff +.2byte 0x0421, 0x0423, 0x0425, 0x0427, 0x0429, 0x042b, 0x042d, 0x0012, 0x0014, 0x0016, 0x0019, 0x001b, 0x001d, 0x001f, 0x043f, 0x109f +.2byte 0x0461, 0x0463, 0x0465, 0x0467, 0x0469, 0x046b, 0x046d, 0x0052, 0x0054, 0x0056, 0x0059, 0x005b, 0x003d, 0x005f, 0x047f, 0x10df +.2byte 0x04a1, 0x04a3, 0x04a5, 0x04a7, 0x04a9, 0x04ab, 0x04ad, 0x00b2, 0x00b4, 0x00b6, 0x0099, 0x009b, 0x009d, 0x009f, 0x04bf, 0x10ff +.2byte 0x04e1, 0x04e3, 0x04e5, 0x04e7, 0x04e9, 0x04eb, 0x04ed, 0x00f2, 0x00f4, 0x00f6, 0x00f9, 0x00fb, 0x00fd, 0x00df, 0x04ff, 0x113f +.2byte 0x0521, 0x0523, 0x0525, 0x0527, 0x0529, 0x052b, 0x052d, 0x0152, 0x0154, 0x0156, 0x0139, 0x013b, 0x013d, 0x013f, 0x055f, 0x117f +.2byte 0x0561, 0x0563, 0x0565, 0x0567, 0x0569, 0x056b, 0x056d, 0x01b2, 0x0194, 0x0196, 0x0199, 0x019b, 0x017d, 0x017f, 0x059f, 0x11bf +.2byte 0x05a1, 0x05a3, 0x05a5, 0x05a7, 0x05a9, 0x05ab, 0x05ad, 0x01f2, 0x01f4, 0x01d6, 0x01d9, 0x01db, 0x01dd, 0x01df, 0x05df, 0x11ff +.2byte 0x0240, 0x0243, 0x0245, 0x0248, 0x024b, 0x024d, 0x0250, 0x0252, 0x0254, 0x0236, 0x0239, 0x021b, 0x021d, 0x021f, 0x061f, 0x123f +.2byte 0x0280, 0x0283, 0x0285, 0x0288, 0x028a, 0x028d, 0x028f, 0x0292, 0x0294, 0x0296, 0x0279, 0x027b, 0x027d, 0x025f, 0x065f, 0x125f +.2byte 0x02c0, 0x02c2, 0x02c5, 0x02c7, 0x02ca, 0x02cd, 0x02cf, 0x02d1, 0x02d4, 0x02d6, 0x02d9, 0x02bb, 0x02bd, 0x02bf, 0x069f, 0x129f +.2byte 0x0320, 0x0322, 0x0325, 0x0327, 0x032a, 0x032c, 0x032f, 0x0331, 0x0334, 0x0336, 0x0339, 0x031b, 0x02fd, 0x02ff, 0x06df, 0x12df +.2byte 0x0360, 0x0362, 0x0365, 0x0367, 0x036a, 0x036c, 0x036e, 0x0371, 0x0373, 0x0376, 0x0378, 0x037b, 0x035d, 0x035f, 0x073f, 0x131f +.2byte 0x03a0, 0x03a2, 0x03a4, 0x03a7, 0x03a9, 0x03ac, 0x03ae, 0x03b1, 0x03b3, 0x03b5, 0x03b8, 0x03ba, 0x03bd, 0x039f, 0x077f, 0x135f +.2byte 0x03e0, 0x03e2, 0x03e5, 0x03e7, 0x03e9, 0x03ec, 0x03ee, 0x03f1, 0x03f3, 0x03f5, 0x03f8, 0x03fa, 0x03fd, 0x03ff, 0x07bf, 0x137f +.2byte 0x07e1, 0x07e3, 0x07e6, 0x07e8, 0x07ea, 0x07ec, 0x07ee, 0x07f0, 0x07f3, 0x07f5, 0x07f7, 0x07f9, 0x07fb, 0x07fd, 0x07ff, 0x13bf +.2byte 0x13e4, 0x13e6, 0x13e8, 0x13ea, 0x13ec, 0x13ed, 0x13ef, 0x13f1, 0x13f3, 0x13f5, 0x13f6, 0x13f8, 0x13fa, 0x13fc, 0x13fe, 0x13ff +.2byte 0x0c21, 0x0c23, 0x0c25, 0x0c27, 0x0c29, 0x0c2b, 0x0c2d, 0x0c12, 0x0c14, 0x0816, 0x0819, 0x081b, 0x081d, 0x081f, 0x0c3f, 0x189f +.2byte 0x0c61, 0x0c63, 0x0c65, 0x0c67, 0x0c69, 0x0c6b, 0x0c70, 0x0852, 0x0854, 0x0856, 0x0858, 0x085b, 0x085d, 0x0c7e, 0x14bf, 0x18df +.2byte 0x0ca1, 0x0ca3, 0x0ca5, 0x0ca7, 0x0ca9, 0x0cab, 0x0cb0, 0x08b2, 0x08b4, 0x08b6, 0x0898, 0x089b, 0x089d, 0x0cbe, 0x14ff, 0x191f +.2byte 0x0ce1, 0x0ce3, 0x0ce5, 0x0ce7, 0x0ce9, 0x0ceb, 0x0cf0, 0x08f2, 0x08f4, 0x08f6, 0x08f8, 0x08db, 0x08dd, 0x0cfe, 0x153f, 0x195f +.2byte 0x0d21, 0x0d23, 0x0d25, 0x0d27, 0x0d29, 0x0d2b, 0x0d50, 0x0952, 0x0954, 0x0936, 0x0938, 0x093b, 0x093d, 0x0d5e, 0x157f, 0x197f +.2byte 0x0d61, 0x0d63, 0x0d65, 0x0d67, 0x0d69, 0x0d6b, 0x0db0, 0x0992, 0x0994, 0x0996, 0x0998, 0x097b, 0x097d, 0x0d7e, 0x15bf, 0x19bf +.2byte 0x0da1, 0x0e03, 0x0e05, 0x0e08, 0x0e0a, 0x0e0d, 0x0e10, 0x09f2, 0x09f4, 0x09d6, 0x09d8, 0x09db, 0x09dd, 0x0dde, 0x15df, 0x19ff +.2byte 0x0a40, 0x0a42, 0x0a45, 0x0a47, 0x0a4a, 0x0a4d, 0x0a4f, 0x0a52, 0x0a34, 0x0a36, 0x0a38, 0x0a1b, 0x0a1d, 0x0e1e, 0x163f, 0x1a3f +.2byte 0x0a80, 0x0a82, 0x0a85, 0x0a88, 0x0a8a, 0x0a8d, 0x0a8f, 0x0a92, 0x0a94, 0x0a76, 0x0a78, 0x0a7b, 0x0a5d, 0x0e5e, 0x167f, 0x1a7f +.2byte 0x0ac0, 0x0ac2, 0x0ac5, 0x0ac7, 0x0aca, 0x0acc, 0x0acf, 0x0ad1, 0x0ad4, 0x0ad6, 0x0ad8, 0x0abb, 0x0abd, 0x0e9e, 0x169f, 0x1abf +.2byte 0x0b20, 0x0b02, 0x0b04, 0x0b07, 0x0b09, 0x0b0c, 0x0b0f, 0x0b11, 0x0b14, 0x0b16, 0x0b18, 0x0b1b, 0x0afd, 0x0efe, 0x16ff, 0x1adf +.2byte 0x0b60, 0x0b62, 0x0b64, 0x0b67, 0x0b69, 0x0b6c, 0x0b6e, 0x0b71, 0x0b73, 0x0b76, 0x0b78, 0x0b7b, 0x0b5d, 0x0f3e, 0x171f, 0x1b1f +.2byte 0x07a0, 0x0ba2, 0x0ba4, 0x0ba7, 0x0ba9, 0x0bac, 0x0bae, 0x0bb1, 0x0bb3, 0x0bb6, 0x0bb8, 0x0bba, 0x0bbd, 0x0f7e, 0x175f, 0x1b5f +.2byte 0x0be0, 0x0fc3, 0x0fc5, 0x0fc7, 0x0fca, 0x0fcc, 0x0fce, 0x0fd0, 0x0fd2, 0x0fd5, 0x0fd7, 0x0fd9, 0x0fdb, 0x0fde, 0x17bf, 0x1b9f +.2byte 0x0fe1, 0x17e5, 0x17e7, 0x17e9, 0x17eb, 0x17ed, 0x17ef, 0x17f1, 0x17f3, 0x17f5, 0x17f7, 0x17f9, 0x17fb, 0x17fd, 0x17ff, 0x1bbf +.2byte 0x1be4, 0x1be6, 0x1be8, 0x1bea, 0x1bec, 0x1bee, 0x1bf0, 0x1bf1, 0x1bf3, 0x1bf5, 0x1bf7, 0x1bf8, 0x1bfa, 0x1bfc, 0x1bfe, 0x1bff +.2byte 0x1421, 0x1423, 0x1425, 0x1427, 0x1429, 0x142b, 0x142d, 0x1412, 0x1414, 0x1416, 0x1419, 0x141b, 0x101d, 0x141f, 0x183f, 0x209f +.2byte 0x1461, 0x1463, 0x1465, 0x1467, 0x1469, 0x146b, 0x1470, 0x1452, 0x1454, 0x1456, 0x1058, 0x105b, 0x105d, 0x147e, 0x1cbf, 0x20df +.2byte 0x14a1, 0x14a3, 0x14a5, 0x14a7, 0x14a9, 0x14ad, 0x14af, 0x14b2, 0x1094, 0x1096, 0x1098, 0x109a, 0x14bb, 0x1cfd, 0x1cff, 0x211f +.2byte 0x14e1, 0x14e3, 0x14e5, 0x14e7, 0x14e9, 0x150d, 0x14ef, 0x14f2, 0x10f4, 0x10f6, 0x10f8, 0x10da, 0x14fb, 0x1d3d, 0x1d3f, 0x215f +.2byte 0x1521, 0x1523, 0x1525, 0x1527, 0x1529, 0x154d, 0x154f, 0x1552, 0x1134, 0x1136, 0x1138, 0x113a, 0x153b, 0x1d7d, 0x1d7f, 0x219f +.2byte 0x1561, 0x1563, 0x15a5, 0x15a8, 0x15aa, 0x15ad, 0x15af, 0x1592, 0x1194, 0x1196, 0x1198, 0x117a, 0x157b, 0x1dbd, 0x1dbf, 0x21bf +.2byte 0x15a1, 0x1603, 0x15e5, 0x15e7, 0x15ea, 0x15ed, 0x15ef, 0x15f2, 0x11d4, 0x11d6, 0x11d8, 0x11da, 0x15db, 0x1dfd, 0x1dff, 0x21ff +.2byte 0x1640, 0x1642, 0x1645, 0x1647, 0x164a, 0x164c, 0x164f, 0x1652, 0x1234, 0x1236, 0x1218, 0x121a, 0x161b, 0x1e3d, 0x1e3f, 0x223f +.2byte 0x1680, 0x1682, 0x1284, 0x1287, 0x128a, 0x128c, 0x128f, 0x1291, 0x1294, 0x1276, 0x1278, 0x125a, 0x165b, 0x1e7d, 0x1e7f, 0x227f +.2byte 0x16c0, 0x16c2, 0x12c4, 0x12c7, 0x12ca, 0x12cc, 0x12cf, 0x12d1, 0x12d4, 0x12d6, 0x12b8, 0x12ba, 0x169b, 0x1e9d, 0x1e9f, 0x22bf +.2byte 0x1320, 0x1302, 0x1304, 0x1307, 0x1309, 0x130c, 0x130e, 0x1311, 0x1313, 0x1316, 0x1318, 0x131a, 0x16db, 0x1efd, 0x1edf, 0x22df +.2byte 0x1360, 0x1362, 0x1344, 0x1347, 0x1349, 0x134c, 0x134e, 0x1351, 0x1353, 0x1355, 0x1358, 0x135a, 0x173b, 0x1f1d, 0x1f3f, 0x231f +.2byte 0x13a0, 0x13a2, 0x1765, 0x1767, 0x176a, 0x176c, 0x176e, 0x1770, 0x1772, 0x1775, 0x1777, 0x1779, 0x177b, 0x1f7d, 0x1f5f, 0x235f +.2byte 0x13e0, 0x17c3, 0x1fa7, 0x1fa9, 0x1fab, 0x1fad, 0x1faf, 0x1fb1, 0x1fb3, 0x1fb5, 0x1fb7, 0x1fb9, 0x1fbb, 0x1fbd, 0x1f9f, 0x239f +.2byte 0x17e1, 0x1fe5, 0x1fe7, 0x1fe9, 0x1feb, 0x1fed, 0x1fef, 0x1ff1, 0x1ff3, 0x1ff5, 0x1ff7, 0x1ff9, 0x1ffb, 0x1ffd, 0x1fff, 0x23df +.2byte 0x1fe4, 0x23e6, 0x23e8, 0x23ea, 0x23ec, 0x23ee, 0x23f0, 0x23f1, 0x23f3, 0x23f5, 0x23f7, 0x23f9, 0x23fa, 0x23fc, 0x23fe, 0x23ff +.2byte 0x1c21, 0x1c23, 0x1c25, 0x1c27, 0x1c29, 0x1c2b, 0x1c2d, 0x2012, 0x2014, 0x1c16, 0x1c19, 0x1c1b, 0x1c1d, 0x1c1f, 0x203f, 0x289f +.2byte 0x1c61, 0x1c63, 0x1c65, 0x1c67, 0x1c69, 0x1c6b, 0x2070, 0x1c52, 0x2054, 0x1c56, 0x1c58, 0x1c5b, 0x1c5d, 0x1c7e, 0x24bf, 0x28df +.2byte 0x1ca1, 0x1ca3, 0x1ca5, 0x1ca7, 0x1ca9, 0x20ad, 0x1caf, 0x1cb2, 0x1c94, 0x1c96, 0x1c98, 0x1c9a, 0x1cbb, 0x24fd, 0x24ff, 0x291f +.2byte 0x1ce1, 0x1ce3, 0x1ce5, 0x1ce7, 0x210a, 0x1ced, 0x1cef, 0x1cf1, 0x1cf3, 0x1cf6, 0x18d8, 0x1cf9, 0x253b, 0x253d, 0x253f, 0x295f +.2byte 0x1d21, 0x1d23, 0x1d25, 0x2148, 0x214a, 0x1d4d, 0x1d4f, 0x1d51, 0x1d33, 0x1d36, 0x1938, 0x1d39, 0x257b, 0x257d, 0x257f, 0x299f +.2byte 0x1d61, 0x1d63, 0x21a5, 0x1da7, 0x1daa, 0x1dad, 0x1d8f, 0x1d91, 0x1d93, 0x1d76, 0x1978, 0x1d99, 0x25bb, 0x25bd, 0x25bf, 0x29df +.2byte 0x1da1, 0x1e03, 0x1de5, 0x1de7, 0x1dea, 0x1dec, 0x1def, 0x1df1, 0x1dd3, 0x1dd6, 0x19d8, 0x1dd9, 0x25fb, 0x25fd, 0x25ff, 0x2a1f +.2byte 0x1e40, 0x1e42, 0x1e45, 0x1e27, 0x1e2a, 0x1e2c, 0x1e2f, 0x1e31, 0x1e33, 0x1e16, 0x1a18, 0x1e19, 0x263b, 0x263d, 0x263f, 0x2a3f +.2byte 0x1e80, 0x1e82, 0x1e84, 0x1e67, 0x1e69, 0x1e6c, 0x1e6e, 0x1e71, 0x1e73, 0x1e76, 0x1a78, 0x1e59, 0x267b, 0x267d, 0x267f, 0x2a7f +.2byte 0x1ec0, 0x1ec2, 0x1ec4, 0x1ec7, 0x1ec9, 0x1ecc, 0x1ece, 0x1ed1, 0x1ed3, 0x1ed6, 0x1ab8, 0x1eb9, 0x26bb, 0x26bd, 0x26bf, 0x2abf +.2byte 0x1f20, 0x1f02, 0x1f04, 0x1b06, 0x1b09, 0x1b0c, 0x1b0e, 0x1b11, 0x1b13, 0x1b16, 0x1b18, 0x1ef9, 0x26fb, 0x26dd, 0x26df, 0x2adf +.2byte 0x1f60, 0x1b62, 0x1b44, 0x1f27, 0x1f2a, 0x1f2c, 0x1f2e, 0x1f30, 0x1f33, 0x1f35, 0x1f37, 0x1f39, 0x273b, 0x271d, 0x273f, 0x2b1f +.2byte 0x1fa0, 0x1ba2, 0x1f65, 0x2769, 0x276b, 0x276d, 0x276f, 0x2771, 0x2773, 0x2775, 0x2777, 0x2779, 0x277b, 0x275d, 0x275f, 0x2b5f +.2byte 0x1be0, 0x1fc3, 0x27a7, 0x27a9, 0x27ab, 0x27ad, 0x27af, 0x27b1, 0x27b3, 0x27b5, 0x27b7, 0x27b9, 0x27bb, 0x27bd, 0x279f, 0x2b9f +.2byte 0x1fe1, 0x27e5, 0x27e7, 0x27e9, 0x27eb, 0x27ed, 0x27ef, 0x27f1, 0x27f3, 0x27f5, 0x27f7, 0x27f9, 0x27fb, 0x27fd, 0x27ff, 0x2bbf +.2byte 0x27e4, 0x2be6, 0x2be8, 0x2bea, 0x2bec, 0x2bee, 0x2bf0, 0x2bf1, 0x2bf3, 0x2bf5, 0x2bf7, 0x2bf8, 0x2bfa, 0x2bfc, 0x2bfe, 0x2bff +.2byte 0x2421, 0x2423, 0x2425, 0x2427, 0x2429, 0x242b, 0x242d, 0x2c12, 0x2814, 0x2816, 0x2819, 0x281b, 0x241d, 0x241f, 0x283f, 0x309f +.2byte 0x2461, 0x2463, 0x2465, 0x2467, 0x2469, 0x246b, 0x2870, 0x2852, 0x2854, 0x2856, 0x2458, 0x245b, 0x245d, 0x287e, 0x2cbf, 0x30df +.2byte 0x24a1, 0x24a3, 0x24a5, 0x24a7, 0x24a9, 0x28ad, 0x28af, 0x28b2, 0x2894, 0x2896, 0x2498, 0x249a, 0x28bb, 0x2cfd, 0x2cff, 0x311f +.2byte 0x24e1, 0x24e3, 0x24e5, 0x2908, 0x290a, 0x28ed, 0x28ef, 0x28f1, 0x24f3, 0x24f6, 0x24d8, 0x28f9, 0x2d3b, 0x2d3d, 0x2d3f, 0x315f +.2byte 0x2521, 0x2523, 0x2525, 0x2948, 0x294a, 0x294c, 0x294f, 0x2531, 0x2533, 0x2535, 0x2957, 0x2d79, 0x2d7b, 0x2d7d, 0x2d7f, 0x35bf +.2byte 0x2561, 0x2563, 0x29a5, 0x29a7, 0x298a, 0x298c, 0x298f, 0x2591, 0x2593, 0x2575, 0x2997, 0x2db9, 0x2dbb, 0x2dbd, 0x2dbf, 0x35df +.2byte 0x25a1, 0x2a03, 0x29e5, 0x29e7, 0x29ea, 0x29ec, 0x29ef, 0x25d1, 0x25d3, 0x25d5, 0x29d7, 0x2df9, 0x2dfb, 0x2dfd, 0x2dff, 0x361f +.2byte 0x2a40, 0x2a42, 0x2a45, 0x2a27, 0x2629, 0x262c, 0x262e, 0x2631, 0x2633, 0x2615, 0x2a17, 0x2e39, 0x2e3b, 0x2e3d, 0x2e3f, 0x365f +.2byte 0x2a80, 0x2a82, 0x2684, 0x2667, 0x2669, 0x266c, 0x266e, 0x2671, 0x2673, 0x2675, 0x2a57, 0x2e79, 0x2e7b, 0x2e7d, 0x2e7f, 0x367f +.2byte 0x2ac0, 0x26c2, 0x26c4, 0x26c7, 0x26a9, 0x26ab, 0x26ae, 0x26b0, 0x26b3, 0x26b5, 0x2a97, 0x2eb9, 0x2ebb, 0x2ebd, 0x2ebf, 0x36bf +.2byte 0x2720, 0x2702, 0x2704, 0x2706, 0x2aea, 0x2aec, 0x2aee, 0x2af0, 0x2af2, 0x2af5, 0x2af7, 0x2ef9, 0x2efb, 0x2efd, 0x2eff, 0x36ff +.2byte 0x2760, 0x2762, 0x2744, 0x2727, 0x2f2b, 0x2f2d, 0x2f2f, 0x2f31, 0x2f33, 0x2f35, 0x2f37, 0x2f39, 0x2f3b, 0x2f3d, 0x2f1f, 0x371f +.2byte 0x27a0, 0x27a2, 0x2765, 0x2f69, 0x2f6b, 0x2f6d, 0x2f6f, 0x2f71, 0x2f73, 0x2f75, 0x2f77, 0x2f79, 0x2f7b, 0x2f7d, 0x2f5f, 0x375f +.2byte 0x27e0, 0x2bc3, 0x2fa7, 0x2fa9, 0x2fab, 0x2fad, 0x2faf, 0x2fb1, 0x2fb3, 0x2fb5, 0x2fb7, 0x2fb9, 0x2fbb, 0x2fbd, 0x2f9f, 0x379f +.2byte 0x2be1, 0x2fe5, 0x2fe7, 0x2fe9, 0x2feb, 0x2fed, 0x2fef, 0x2ff1, 0x2ff3, 0x2ff5, 0x2ff7, 0x2ff9, 0x2ffb, 0x2ffd, 0x2fff, 0x37df +.2byte 0x2fe4, 0x2fe6, 0x33e8, 0x33ea, 0x37ed, 0x37ee, 0x37f0, 0x37f2, 0x37f3, 0x37f5, 0x37f7, 0x37f9, 0x37fa, 0x37fc, 0x37fe, 0x37ff +.2byte 0x2c21, 0x2c23, 0x2c25, 0x2c27, 0x2c29, 0x2c2b, 0x2c2d, 0x3412, 0x3414, 0x3416, 0x3019, 0x301b, 0x301d, 0x301f, 0x303f, 0x349f +.2byte 0x2c61, 0x2c63, 0x2c65, 0x2c67, 0x2c69, 0x2c6b, 0x3470, 0x3452, 0x3454, 0x3056, 0x3058, 0x305b, 0x305d, 0x307e, 0x34bf, 0x38df +.2byte 0x2ca1, 0x2ca3, 0x34a5, 0x34a8, 0x34aa, 0x34ad, 0x34af, 0x30b2, 0x3094, 0x3096, 0x3098, 0x309a, 0x30bb, 0x34fd, 0x34ff, 0x391f +.2byte 0x2ce1, 0x2ce3, 0x3505, 0x34e7, 0x34ea, 0x34ed, 0x30ef, 0x30f1, 0x30f3, 0x30f6, 0x30d8, 0x30f9, 0x353b, 0x353d, 0x353f, 0x395f +.2byte 0x2d21, 0x2d23, 0x3545, 0x3547, 0x314a, 0x314c, 0x314f, 0x3131, 0x3133, 0x2d35, 0x3157, 0x3579, 0x357b, 0x357d, 0x357f, 0x39bf +.2byte 0x2d61, 0x2d63, 0x35a5, 0x35a7, 0x318a, 0x318c, 0x318f, 0x3191, 0x3193, 0x3195, 0x35b7, 0x35b9, 0x35bb, 0x35bd, 0x39df, 0x3dff +.2byte 0x2da1, 0x3603, 0x35e5, 0x31e7, 0x31ea, 0x31ec, 0x31ef, 0x31d1, 0x31d3, 0x31d5, 0x35f7, 0x35f9, 0x35fb, 0x35fd, 0x39ff, 0x3e1f +.2byte 0x3640, 0x3242, 0x3245, 0x3227, 0x3229, 0x322c, 0x322e, 0x3231, 0x3213, 0x3215, 0x3637, 0x3639, 0x363b, 0x363d, 0x3a3f, 0x3e5f +.2byte 0x3280, 0x3282, 0x3284, 0x3267, 0x3269, 0x326c, 0x326e, 0x3270, 0x3273, 0x3275, 0x3677, 0x3679, 0x367b, 0x367d, 0x3a7f, 0x3e7f +.2byte 0x32c0, 0x32c2, 0x32c4, 0x2ec7, 0x2ea9, 0x32ac, 0x32ae, 0x32b0, 0x32b3, 0x32b5, 0x36b7, 0x36b9, 0x36bb, 0x36bd, 0x3abf, 0x3ebf +.2byte 0x3320, 0x3302, 0x3304, 0x2f06, 0x32ea, 0x36ed, 0x36ef, 0x36f1, 0x36f3, 0x36f5, 0x36f7, 0x36f9, 0x36fb, 0x36fd, 0x3aff, 0x3eff +.2byte 0x3360, 0x2f62, 0x2f44, 0x3327, 0x372b, 0x372d, 0x372f, 0x3731, 0x3733, 0x3735, 0x3737, 0x3739, 0x373b, 0x373d, 0x3b3f, 0x3f1f +.2byte 0x2fa0, 0x2fa2, 0x2f65, 0x3769, 0x376b, 0x376d, 0x376f, 0x3771, 0x3773, 0x3775, 0x3777, 0x3779, 0x377b, 0x377d, 0x3b7f, 0x3f5f +.2byte 0x2fe0, 0x2fc3, 0x37a7, 0x37a9, 0x37ab, 0x37ad, 0x37af, 0x37b1, 0x37b3, 0x37b5, 0x37b7, 0x37b9, 0x37bb, 0x37bd, 0x3bbf, 0x3f9f +.2byte 0x33e1, 0x37e5, 0x37e7, 0x37e9, 0x37eb, 0x3bee, 0x3bef, 0x3bf1, 0x3bf3, 0x3bf5, 0x3bf7, 0x3bf9, 0x3bfb, 0x3bfd, 0x3bff, 0x3fdf +.2byte 0x37e4, 0x37e6, 0x37e8, 0x3bea, 0x3bed, 0x3fef, 0x3ff0, 0x3ff2, 0x3ff4, 0x3ff5, 0x3ff7, 0x3ff9, 0x3ffa, 0x3ffc, 0x3ffe, 0x3fff +.2byte 0x3421, 0x3423, 0x3425, 0x3427, 0x3429, 0x342b, 0x342d, 0x4012, 0x3c14, 0x3c16, 0x3c19, 0x381b, 0x381d, 0x381f, 0x383f, 0x3c9f +.2byte 0x3461, 0x4063, 0x4065, 0x4067, 0x406a, 0x406d, 0x4070, 0x3c52, 0x3c54, 0x3c56, 0x3c58, 0x385b, 0x385d, 0x387e, 0x3cbf, 0x40df +.2byte 0x34a1, 0x40a3, 0x3ca5, 0x3ca7, 0x3caa, 0x3cad, 0x3caf, 0x3cb2, 0x3c94, 0x3c96, 0x3898, 0x389a, 0x38bb, 0x3cfd, 0x3cff, 0x411f +.2byte 0x34e1, 0x4103, 0x3ce5, 0x3ce7, 0x3cea, 0x3cec, 0x3cef, 0x3cf1, 0x38f3, 0x38f6, 0x38d8, 0x38f9, 0x3d3b, 0x3d3d, 0x3d3f, 0x415f +.2byte 0x3521, 0x4143, 0x3d45, 0x3d47, 0x3d4a, 0x3d4c, 0x3d4f, 0x3931, 0x3933, 0x3935, 0x3957, 0x3d79, 0x3d7b, 0x3d7d, 0x3d7f, 0x41bf +.2byte 0x3561, 0x41a3, 0x3da5, 0x3d87, 0x3d8a, 0x3d8c, 0x3d8f, 0x3991, 0x3993, 0x3995, 0x3db7, 0x3db9, 0x3dbb, 0x3dbd, 0x3ddf, 0x41ff +.2byte 0x35a1, 0x4203, 0x3de5, 0x3de7, 0x3dea, 0x3dec, 0x39ce, 0x39d1, 0x39d3, 0x3df5, 0x3df7, 0x3df9, 0x3dfb, 0x3dfd, 0x421e, 0x463f +.2byte 0x3e40, 0x3e42, 0x3e45, 0x3e27, 0x3a29, 0x3a2c, 0x3a2e, 0x3a31, 0x3a13, 0x3e35, 0x3e37, 0x3e39, 0x3e3b, 0x3e3d, 0x423e, 0x465f +.2byte 0x3e80, 0x3e82, 0x3a84, 0x3a67, 0x3a69, 0x3a6c, 0x3a6e, 0x3a70, 0x3a73, 0x3e75, 0x3e77, 0x3e79, 0x3e7b, 0x3e7d, 0x427e, 0x469f +.2byte 0x3ac0, 0x3ac2, 0x3ac4, 0x3ac7, 0x3aa9, 0x3aac, 0x3eaf, 0x3eb1, 0x3eb3, 0x3eb5, 0x3eb7, 0x3eb9, 0x3ebb, 0x3ebd, 0x42be, 0x46bf +.2byte 0x3b20, 0x3b02, 0x3b04, 0x3b06, 0x3aea, 0x3eed, 0x3eef, 0x3ef1, 0x3ef3, 0x3ef5, 0x3ef7, 0x3ef9, 0x3efb, 0x3efd, 0x42fe, 0x46ff +.2byte 0x3b60, 0x3b62, 0x3b44, 0x3b27, 0x3f2b, 0x3f2d, 0x3f2f, 0x3f31, 0x3f33, 0x3f35, 0x3f37, 0x3f39, 0x3f3b, 0x3f3d, 0x433e, 0x473f +.2byte 0x3ba0, 0x3ba2, 0x3b65, 0x3f69, 0x3f6b, 0x3f6d, 0x3f6f, 0x3f71, 0x3f73, 0x3f75, 0x3f77, 0x3f79, 0x3f7b, 0x3f7d, 0x437e, 0x475f +.2byte 0x3be0, 0x3bc3, 0x3fa7, 0x3fa9, 0x3fab, 0x3fad, 0x3faf, 0x3fb1, 0x3fb3, 0x3fb5, 0x3fb7, 0x3fb9, 0x3fbb, 0x3fbd, 0x439e, 0x479f +.2byte 0x3be1, 0x3be5, 0x3fe7, 0x3fe9, 0x3feb, 0x3fee, 0x43d0, 0x43d2, 0x43d3, 0x43d5, 0x43d7, 0x43d9, 0x43db, 0x43dd, 0x43de, 0x47df +.2byte 0x3fe4, 0x3fe6, 0x3fe8, 0x43ea, 0x43ed, 0x43ef, 0x47f1, 0x47f2, 0x47f4, 0x47f6, 0x47f7, 0x47f9, 0x47fb, 0x47fc, 0x47fe, 0x47ff +.2byte 0x4800, 0x4802, 0x4805, 0x4807, 0x480a, 0x480d, 0x480f, 0x4812, 0x4814, 0x4416, 0x4419, 0x441b, 0x441d, 0x441f, 0x403f, 0x449f +.2byte 0x4860, 0x4842, 0x4845, 0x4847, 0x484a, 0x484c, 0x484f, 0x4852, 0x4854, 0x4456, 0x4458, 0x445b, 0x445d, 0x407e, 0x44bf, 0x44df +.2byte 0x48a0, 0x48a2, 0x48a5, 0x48a7, 0x48aa, 0x48ac, 0x48af, 0x48b2, 0x4494, 0x4496, 0x4498, 0x449a, 0x40bb, 0x44fd, 0x44ff, 0x451f +.2byte 0x4900, 0x48e2, 0x48e5, 0x44e7, 0x44ea, 0x44ec, 0x44ef, 0x44f1, 0x44f3, 0x44f6, 0x44d8, 0x40f9, 0x453b, 0x453d, 0x453f, 0x455f +.2byte 0x4960, 0x4942, 0x4945, 0x4547, 0x4529, 0x452c, 0x452e, 0x4531, 0x4533, 0x4135, 0x4157, 0x4579, 0x457b, 0x457d, 0x457f, 0x49bf +.2byte 0x49a0, 0x49a2, 0x4985, 0x4587, 0x4589, 0x458c, 0x458e, 0x4591, 0x4193, 0x4195, 0x45b7, 0x45b9, 0x45bb, 0x45bd, 0x45df, 0x49ff +.2byte 0x4a00, 0x49e2, 0x49e5, 0x45e7, 0x45c9, 0x45cc, 0x45ce, 0x45d1, 0x41d3, 0x45f5, 0x45f7, 0x45f9, 0x45fb, 0x45fd, 0x4a1e, 0x4a3f +.2byte 0x4a40, 0x4a42, 0x4a45, 0x4627, 0x4629, 0x462c, 0x462e, 0x4211, 0x4633, 0x4635, 0x4637, 0x4639, 0x463b, 0x463d, 0x4a5e, 0x4e7f +.2byte 0x4a80, 0x4682, 0x4684, 0x4667, 0x4669, 0x426c, 0x426e, 0x4671, 0x4673, 0x4675, 0x4677, 0x4679, 0x467b, 0x467d, 0x4a7e, 0x4e9f +.2byte 0x46c0, 0x46c2, 0x46c4, 0x42c7, 0x42a9, 0x42ac, 0x46af, 0x46b1, 0x46b3, 0x46b5, 0x46b7, 0x46b9, 0x46bb, 0x46bd, 0x4abe, 0x4edf +.2byte 0x4720, 0x4702, 0x4304, 0x4306, 0x42ea, 0x46ed, 0x46ef, 0x46f1, 0x46f3, 0x46f5, 0x46f7, 0x46f9, 0x46fb, 0x46fd, 0x4afe, 0x4eff +.2byte 0x4360, 0x4362, 0x4344, 0x4327, 0x472b, 0x472d, 0x472f, 0x4731, 0x4733, 0x4735, 0x4737, 0x4739, 0x473b, 0x473d, 0x4b3e, 0x4f3f +.2byte 0x43a0, 0x43a2, 0x4365, 0x4769, 0x476b, 0x476d, 0x476f, 0x4771, 0x4773, 0x4775, 0x4777, 0x4779, 0x477b, 0x477d, 0x4b7e, 0x4f7f +.2byte 0x43e0, 0x43c3, 0x47a7, 0x47a9, 0x47ab, 0x47ad, 0x47af, 0x47b1, 0x47b3, 0x47b5, 0x47b7, 0x47b9, 0x47bb, 0x47bd, 0x4bbe, 0x4f9f +.2byte 0x43e1, 0x47e5, 0x47e7, 0x47e9, 0x47eb, 0x47ee, 0x47d0, 0x4bd2, 0x4bd4, 0x4bd6, 0x4bd7, 0x4bd9, 0x4bdb, 0x4bdd, 0x4bde, 0x4fdf +.2byte 0x47e4, 0x47e6, 0x47e8, 0x47ea, 0x4bed, 0x4bef, 0x4bf1, 0x4ff3, 0x4ff4, 0x4ff6, 0x4ff8, 0x4ff9, 0x4ffb, 0x4ffc, 0x4ffe, 0x4fff +.2byte 0x5000, 0x5002, 0x5005, 0x5007, 0x500a, 0x500c, 0x500f, 0x5012, 0x5014, 0x5016, 0x5019, 0x4c1b, 0x4c1d, 0x4c1f, 0x4c3f, 0x4c9f +.2byte 0x5060, 0x5042, 0x5045, 0x5047, 0x504a, 0x504c, 0x504f, 0x5051, 0x5054, 0x5056, 0x5058, 0x4c5b, 0x4c5d, 0x487e, 0x4cbf, 0x4cdf +.2byte 0x50a0, 0x50a2, 0x5084, 0x5087, 0x5089, 0x508c, 0x508e, 0x5091, 0x5094, 0x5096, 0x4c98, 0x4c9a, 0x48bb, 0x4cfd, 0x4cff, 0x4d1f +.2byte 0x5100, 0x5102, 0x50e4, 0x4ce7, 0x4ce9, 0x4cec, 0x4cee, 0x4cf1, 0x4cf3, 0x4cf6, 0x4cd8, 0x4cf9, 0x4d3b, 0x4d3d, 0x4d3f, 0x4d5f +.2byte 0x5140, 0x5142, 0x5144, 0x4d27, 0x4d29, 0x4d2c, 0x4d2e, 0x4d31, 0x4d33, 0x4d35, 0x4957, 0x4d79, 0x4d7b, 0x4d7d, 0x4d7f, 0x4dbf +.2byte 0x51a0, 0x51a2, 0x5184, 0x4d87, 0x4d89, 0x4d8c, 0x4d8e, 0x4d90, 0x4d93, 0x4d95, 0x4db7, 0x4db9, 0x4dbb, 0x4dbd, 0x4ddf, 0x51ff +.2byte 0x51e0, 0x51e2, 0x51e4, 0x4dc7, 0x4dc9, 0x4dcc, 0x4dce, 0x4dd0, 0x4dd3, 0x4df5, 0x4df7, 0x4df9, 0x4dfb, 0x4dfd, 0x4e1e, 0x523f +.2byte 0x5240, 0x5242, 0x5224, 0x4e27, 0x4e29, 0x4e0c, 0x4e0e, 0x4e31, 0x4e33, 0x4e35, 0x4e37, 0x4e39, 0x4e3b, 0x4e3d, 0x525e, 0x527f +.2byte 0x5280, 0x5282, 0x5284, 0x4e67, 0x4e69, 0x4e6c, 0x4e6e, 0x4e71, 0x4e73, 0x4e75, 0x4e77, 0x4e79, 0x4e7b, 0x529d, 0x529e, 0x5adf +.2byte 0x52c0, 0x4ec2, 0x4ec4, 0x4ec7, 0x4ea9, 0x4eac, 0x4eaf, 0x4eb1, 0x4eb3, 0x4eb5, 0x4eb7, 0x4eb9, 0x4ebb, 0x52bd, 0x52be, 0x5aff +.2byte 0x4f20, 0x4f02, 0x4f04, 0x4f06, 0x4aea, 0x4eed, 0x4eef, 0x4ef1, 0x4ef3, 0x4ef5, 0x4ef7, 0x4ef9, 0x4efb, 0x52fd, 0x52fe, 0x5b3f +.2byte 0x4f60, 0x4f62, 0x4b44, 0x4b27, 0x4f2b, 0x4f2d, 0x4f2f, 0x4f31, 0x4f33, 0x4f35, 0x4f37, 0x4f39, 0x4f3b, 0x533d, 0x533e, 0x5b5f +.2byte 0x4fa0, 0x4ba2, 0x4b65, 0x4f69, 0x4f6b, 0x4f6d, 0x4f6f, 0x4f71, 0x4f73, 0x4f75, 0x4f77, 0x4f79, 0x4f7b, 0x537d, 0x537e, 0x5b7f +.2byte 0x4be0, 0x4bc3, 0x4fa7, 0x4fa9, 0x4fab, 0x4fad, 0x4faf, 0x4fb1, 0x53b4, 0x53b5, 0x53b7, 0x53b9, 0x53bb, 0x53bd, 0x539e, 0x5bbf +.2byte 0x4be1, 0x4fe5, 0x4fe7, 0x4fe9, 0x4feb, 0x4fee, 0x4fd0, 0x4fd2, 0x53d4, 0x53d6, 0x53d7, 0x53d9, 0x53db, 0x53dd, 0x53de, 0x5bdf +.2byte 0x4be4, 0x4fe6, 0x4fe8, 0x4fea, 0x4fed, 0x4fef, 0x53f1, 0x53f3, 0x5bf6, 0x5bf7, 0x5bf9, 0x5bfa, 0x5bfc, 0x5bfd, 0x5bfe, 0x5bff +.2byte 0x5800, 0x5802, 0x5805, 0x5807, 0x580a, 0x580c, 0x580e, 0x5811, 0x5814, 0x5816, 0x5819, 0x581b, 0x541d, 0x541f, 0x543f, 0x549f +.2byte 0x5840, 0x5842, 0x5845, 0x5847, 0x5849, 0x584c, 0x584e, 0x5851, 0x5853, 0x5856, 0x5858, 0x585b, 0x585d, 0x547e, 0x54bf, 0x54df +.2byte 0x58a0, 0x58a2, 0x5884, 0x5887, 0x5889, 0x588c, 0x588e, 0x5891, 0x5893, 0x5896, 0x5898, 0x549a, 0x54bb, 0x54fd, 0x54ff, 0x551f +.2byte 0x58e0, 0x58e2, 0x58e4, 0x58e7, 0x58e9, 0x58eb, 0x58ee, 0x58f0, 0x58f3, 0x58f6, 0x58d8, 0x54f9, 0x553b, 0x553d, 0x553f, 0x555f +.2byte 0x5940, 0x5942, 0x5944, 0x5927, 0x5529, 0x552b, 0x552e, 0x5530, 0x5533, 0x5535, 0x5557, 0x5579, 0x557b, 0x557d, 0x557f, 0x55bf +.2byte 0x59a0, 0x5982, 0x5984, 0x5987, 0x5569, 0x558c, 0x558e, 0x5590, 0x5593, 0x5595, 0x55b7, 0x55b9, 0x55bb, 0x55bd, 0x55df, 0x55ff +.2byte 0x59e0, 0x59e2, 0x59e4, 0x59c7, 0x55c9, 0x55cc, 0x55ef, 0x55f1, 0x55f3, 0x55f5, 0x55f7, 0x55f9, 0x55fb, 0x55fd, 0x561e, 0x5a3f +.2byte 0x5a20, 0x5a22, 0x5a24, 0x5a27, 0x5609, 0x560c, 0x562f, 0x5631, 0x5633, 0x5635, 0x5637, 0x5639, 0x563b, 0x563d, 0x5a5e, 0x5a7f +.2byte 0x5a80, 0x5a82, 0x5a84, 0x5a67, 0x5669, 0x566c, 0x566f, 0x5671, 0x5673, 0x5675, 0x5677, 0x5679, 0x567b, 0x569d, 0x5a9e, 0x5edf +.2byte 0x5ac0, 0x5ac2, 0x5ac4, 0x5ac7, 0x56a9, 0x56ac, 0x56af, 0x56b1, 0x56b3, 0x56b5, 0x56b7, 0x56b9, 0x56bb, 0x5add, 0x5efe, 0x631f +.2byte 0x5b20, 0x5b02, 0x5704, 0x5706, 0x52ea, 0x56ed, 0x56ef, 0x56f1, 0x56f3, 0x56f5, 0x56f7, 0x56f9, 0x56fb, 0x5afd, 0x5f1e, 0x633f +.2byte 0x5760, 0x5762, 0x5744, 0x5727, 0x572b, 0x572d, 0x572f, 0x5731, 0x5733, 0x5735, 0x5737, 0x5739, 0x573b, 0x5b3d, 0x5f5e, 0x635f +.2byte 0x57a0, 0x57a2, 0x5365, 0x5769, 0x576b, 0x576d, 0x576f, 0x5771, 0x5773, 0x5775, 0x5777, 0x5779, 0x577b, 0x5b7d, 0x5f7e, 0x639f +.2byte 0x57e0, 0x53c3, 0x53a7, 0x57a9, 0x57ab, 0x57ad, 0x57af, 0x57b1, 0x57b4, 0x5bb6, 0x5bb7, 0x5bb9, 0x5bbb, 0x5bbd, 0x5fbe, 0x63bf +.2byte 0x53e1, 0x53e5, 0x53e7, 0x57e9, 0x57eb, 0x57ee, 0x57d0, 0x57d2, 0x57d4, 0x5fd7, 0x5fd9, 0x5fda, 0x5fdc, 0x5fdd, 0x5fde, 0x63df +.2byte 0x53e4, 0x57e6, 0x57e8, 0x57ea, 0x57ed, 0x57ef, 0x57f1, 0x5bf3, 0x5ff6, 0x63f8, 0x63f9, 0x63fb, 0x63fc, 0x63fd, 0x63fe, 0x63ff +.2byte 0x6400, 0x6402, 0x6404, 0x6407, 0x6409, 0x640c, 0x640e, 0x6411, 0x6413, 0x6416, 0x6419, 0x601b, 0x601d, 0x601f, 0x5c3f, 0x589f +.2byte 0x6440, 0x6042, 0x6044, 0x6047, 0x6049, 0x604c, 0x604e, 0x6051, 0x6053, 0x6056, 0x6058, 0x605b, 0x605d, 0x5c7e, 0x5cbf, 0x5cdf +.2byte 0x64a0, 0x6082, 0x6084, 0x6087, 0x6089, 0x608c, 0x608e, 0x6090, 0x6093, 0x6095, 0x6098, 0x609a, 0x5cbb, 0x5cfd, 0x5cff, 0x5d1f +.2byte 0x64e0, 0x60e2, 0x60e4, 0x60c6, 0x60c9, 0x60cb, 0x60ce, 0x60d0, 0x60d3, 0x60d5, 0x60d8, 0x5cf9, 0x5d3b, 0x5d3d, 0x5d3f, 0x5d5f +.2byte 0x6540, 0x6122, 0x6124, 0x6126, 0x5d4a, 0x5d4c, 0x5d4e, 0x5d50, 0x5d52, 0x5d54, 0x5d57, 0x5d79, 0x5d7b, 0x5d7d, 0x5d7f, 0x5dbf +.2byte 0x6580, 0x6182, 0x6184, 0x6186, 0x5d8a, 0x5dad, 0x5daf, 0x5db1, 0x5db3, 0x5db5, 0x5db7, 0x5db9, 0x5dbb, 0x5dbd, 0x5ddf, 0x5dff +.2byte 0x65e0, 0x61e2, 0x61c4, 0x61c6, 0x5dca, 0x5ded, 0x5def, 0x5df1, 0x5df3, 0x5df5, 0x5df7, 0x5df9, 0x5dfb, 0x5dfd, 0x5e1e, 0x5e3f +.2byte 0x6620, 0x6222, 0x6224, 0x6226, 0x5e0a, 0x5e2d, 0x5e2f, 0x5e31, 0x5e33, 0x5e35, 0x5e37, 0x5e39, 0x5e3b, 0x5e3d, 0x5e5e, 0x627f +.2byte 0x6680, 0x6282, 0x6264, 0x6266, 0x5e4a, 0x5e6d, 0x5e6f, 0x5e71, 0x5e73, 0x5e75, 0x5e77, 0x5e79, 0x5e7b, 0x5e9d, 0x5e9e, 0x66df +.2byte 0x66c0, 0x62c2, 0x62c4, 0x62c6, 0x5eaa, 0x5ead, 0x5eaf, 0x5eb1, 0x5eb3, 0x5eb5, 0x5eb7, 0x5eb9, 0x5ebb, 0x5edd, 0x66fe, 0x671f +.2byte 0x6720, 0x6302, 0x6304, 0x6306, 0x5eea, 0x5eed, 0x5eef, 0x5ef1, 0x5ef3, 0x5ef5, 0x5ef7, 0x5ef9, 0x5efb, 0x673d, 0x673e, 0x6b5f +.2byte 0x6360, 0x6362, 0x6344, 0x5f27, 0x5f2b, 0x5f2d, 0x5f2f, 0x5f31, 0x5f33, 0x5f35, 0x5f37, 0x5f39, 0x5f3b, 0x675d, 0x675e, 0x6b7f +.2byte 0x5fa0, 0x5fa2, 0x5b65, 0x5f69, 0x5f6b, 0x5f6d, 0x5f6f, 0x5f71, 0x5f73, 0x5f75, 0x5f77, 0x5f79, 0x5f7b, 0x677d, 0x679e, 0x6b9f +.2byte 0x5fe0, 0x5fc3, 0x5fa7, 0x5ba9, 0x5fab, 0x5fad, 0x5faf, 0x5fb1, 0x5fb4, 0x5fb6, 0x67b9, 0x67ba, 0x67bc, 0x67bd, 0x67be, 0x6bbf +.2byte 0x5be1, 0x5fe5, 0x5be7, 0x5be9, 0x5feb, 0x5fee, 0x5fd0, 0x5fd2, 0x5fd4, 0x63d7, 0x67d9, 0x67da, 0x67dc, 0x67dd, 0x67de, 0x6bdf +.2byte 0x5be4, 0x5be6, 0x5be8, 0x5bea, 0x5fed, 0x5fef, 0x5ff1, 0x5ff3, 0x67f6, 0x67f8, 0x6bfa, 0x6bfb, 0x6bfc, 0x6bfd, 0x6bfe, 0x6bff +.2byte 0x6c00, 0x6c02, 0x6c04, 0x6c07, 0x6c09, 0x6c0c, 0x6c0e, 0x6c10, 0x6c13, 0x6c15, 0x6c18, 0x6c1b, 0x681d, 0x681f, 0x643f, 0x609f +.2byte 0x6c40, 0x6c42, 0x6c44, 0x6c46, 0x6c49, 0x6c4b, 0x6c4e, 0x6c50, 0x6c53, 0x6c55, 0x6c58, 0x6c5b, 0x685d, 0x647e, 0x64bf, 0x60df +.2byte 0x6ca0, 0x6c82, 0x6884, 0x6886, 0x6889, 0x688b, 0x688e, 0x6890, 0x6892, 0x6895, 0x6898, 0x689a, 0x64bb, 0x64fd, 0x64ff, 0x651f +.2byte 0x6ce0, 0x6ce2, 0x68e4, 0x64e7, 0x64e9, 0x64ec, 0x64ee, 0x64f0, 0x64f2, 0x64f5, 0x64f7, 0x64f9, 0x653b, 0x653d, 0x653f, 0x615f +.2byte 0x6d40, 0x6d22, 0x6924, 0x6547, 0x656b, 0x656d, 0x656f, 0x6571, 0x6573, 0x6575, 0x6577, 0x6579, 0x657b, 0x657d, 0x657f, 0x65bf +.2byte 0x6d80, 0x6d82, 0x6984, 0x6587, 0x65ab, 0x65ad, 0x65af, 0x65b1, 0x65b3, 0x65b5, 0x65b7, 0x65b9, 0x65bb, 0x65bd, 0x65df, 0x65ff +.2byte 0x6dc0, 0x6dc2, 0x69c4, 0x65c7, 0x65eb, 0x65ed, 0x65ef, 0x65f1, 0x65f3, 0x65f5, 0x65f7, 0x65f9, 0x65fb, 0x65fd, 0x661e, 0x663f +.2byte 0x6e20, 0x6e22, 0x6a24, 0x6607, 0x662b, 0x662d, 0x662f, 0x6631, 0x6633, 0x6635, 0x6637, 0x6639, 0x663b, 0x663d, 0x665e, 0x667f +.2byte 0x6e60, 0x6e62, 0x6a64, 0x6667, 0x666b, 0x666d, 0x666f, 0x6671, 0x6673, 0x6675, 0x6677, 0x6679, 0x667b, 0x669d, 0x669e, 0x6adf +.2byte 0x6ec0, 0x6ec2, 0x6aa4, 0x66a7, 0x66ab, 0x66ad, 0x66af, 0x66b1, 0x66b3, 0x66b5, 0x66b7, 0x66b9, 0x66bb, 0x66dd, 0x6afe, 0x6f1f +.2byte 0x6f00, 0x6f02, 0x6b04, 0x66e7, 0x66eb, 0x66ed, 0x66ef, 0x66f1, 0x66f3, 0x66f5, 0x66f7, 0x66f9, 0x66fb, 0x6b3d, 0x6b3e, 0x6f5f +.2byte 0x6f60, 0x6f62, 0x6b44, 0x6727, 0x672b, 0x672d, 0x672f, 0x6731, 0x6733, 0x6735, 0x6737, 0x6739, 0x6b5c, 0x6b5d, 0x6f7f, 0x739f +.2byte 0x6ba0, 0x6ba2, 0x6765, 0x6769, 0x676b, 0x676d, 0x676f, 0x6771, 0x6773, 0x6775, 0x6777, 0x6b9a, 0x6b9c, 0x6b9d, 0x6f9f, 0x73bf +.2byte 0x6be0, 0x67c3, 0x63a7, 0x63a9, 0x67ab, 0x67ad, 0x67af, 0x67b1, 0x67b4, 0x67b6, 0x6bb9, 0x6bba, 0x6bbc, 0x6bbd, 0x6fbf, 0x73df +.2byte 0x67e1, 0x63e5, 0x67e7, 0x67e9, 0x63eb, 0x67ee, 0x67d0, 0x67d2, 0x67d4, 0x6bd7, 0x6bd9, 0x6ffb, 0x6ffc, 0x6ffd, 0x6fff, 0x73ff +.2byte 0x63e4, 0x63e6, 0x63e8, 0x63ea, 0x63ed, 0x63ef, 0x67f1, 0x67f3, 0x6bf6, 0x6bf8, 0x6ffa, 0x73fc, 0x73fd, 0x73fe, 0x73ff, 0x73ff +.2byte 0x7400, 0x7401, 0x7404, 0x7407, 0x7409, 0x740b, 0x740e, 0x7410, 0x7413, 0x7415, 0x7417, 0x741a, 0x741d, 0x741f, 0x6c3f, 0x689f +.2byte 0x7440, 0x7442, 0x7444, 0x7446, 0x7449, 0x744b, 0x744e, 0x7450, 0x7452, 0x7455, 0x7457, 0x745a, 0x745d, 0x6c7e, 0x6cbf, 0x68df +.2byte 0x7480, 0x7482, 0x6ca5, 0x6ca7, 0x6ca9, 0x6cab, 0x6cae, 0x6cb0, 0x6cb2, 0x6cb4, 0x6cb6, 0x6cb9, 0x6cbb, 0x6cfd, 0x6cff, 0x691f +.2byte 0x74e0, 0x74e2, 0x6ce5, 0x6d29, 0x6d2b, 0x6d2d, 0x6d2f, 0x6d31, 0x6d33, 0x6d35, 0x6d37, 0x6d39, 0x6d3b, 0x6d3d, 0x6d3f, 0x695f +.2byte 0x7520, 0x7522, 0x6d45, 0x6d69, 0x6d6b, 0x6d6d, 0x6d6f, 0x6d71, 0x6d73, 0x6d75, 0x6d77, 0x6d79, 0x6d7b, 0x6d7d, 0x6d7f, 0x69bf +.2byte 0x7580, 0x7582, 0x6d85, 0x6da9, 0x6dab, 0x6dad, 0x6daf, 0x6db1, 0x6db3, 0x6db5, 0x6db7, 0x6db9, 0x6dbb, 0x6dbd, 0x6ddf, 0x69ff +.2byte 0x75c0, 0x75c2, 0x6dc5, 0x6de9, 0x6deb, 0x6ded, 0x6def, 0x6df1, 0x6df3, 0x6df5, 0x6df7, 0x6df9, 0x6dfb, 0x6dfd, 0x6e1e, 0x6e3f +.2byte 0x7620, 0x7622, 0x6e05, 0x6e29, 0x6e2b, 0x6e2d, 0x6e2f, 0x6e31, 0x6e33, 0x6e35, 0x6e37, 0x6e39, 0x6e3b, 0x6e3d, 0x6e5e, 0x6e7f +.2byte 0x7660, 0x7662, 0x6e45, 0x6e69, 0x6e6b, 0x6e6d, 0x6e6f, 0x6e71, 0x6e73, 0x6e75, 0x6e77, 0x6e79, 0x6e7b, 0x6e9d, 0x6e9e, 0x72df +.2byte 0x76a0, 0x76c2, 0x6ea5, 0x6ea9, 0x6eab, 0x6ead, 0x6eaf, 0x6eb1, 0x6eb3, 0x6eb5, 0x6eb7, 0x6eb9, 0x6ebb, 0x6edd, 0x72fe, 0x731f +.2byte 0x7700, 0x7702, 0x6ee5, 0x6ee9, 0x6eeb, 0x6eed, 0x6eef, 0x6ef1, 0x6ef3, 0x6ef5, 0x6ef7, 0x6ef9, 0x6efb, 0x733d, 0x733e, 0x735f +.2byte 0x7740, 0x7742, 0x6f25, 0x6f29, 0x6f2b, 0x6f2d, 0x6f2f, 0x6f31, 0x6f33, 0x6f35, 0x6f37, 0x735a, 0x735c, 0x735d, 0x737f, 0x779f +.2byte 0x77a0, 0x77a2, 0x6f65, 0x6f69, 0x6f6b, 0x6f6d, 0x6f6f, 0x6f71, 0x6f73, 0x6f75, 0x6f77, 0x739a, 0x739c, 0x739d, 0x77bf, 0x7bdf +.2byte 0x73e0, 0x6fc3, 0x6fa7, 0x6ba9, 0x6fab, 0x6fad, 0x6faf, 0x6fb1, 0x6fb4, 0x6fb6, 0x6fb9, 0x73ba, 0x73bc, 0x73bd, 0x77df, 0x7bff +.2byte 0x6fe1, 0x6be5, 0x6be7, 0x6be9, 0x6beb, 0x6fee, 0x6fd0, 0x6fd2, 0x6fd4, 0x6fd7, 0x73d9, 0x73fb, 0x77fd, 0x77fe, 0x77ff, 0x7bff +.2byte 0x6be4, 0x6be6, 0x6be8, 0x6bea, 0x6bed, 0x6bef, 0x6bf1, 0x6ff3, 0x6ff6, 0x73f8, 0x73fa, 0x77fc, 0x7bfe, 0x7bff, 0x7bff, 0x7bff +.2byte 0x7c00, 0x7c02, 0x7c04, 0x7c06, 0x7c09, 0x7c0b, 0x7c0e, 0x7c10, 0x7c12, 0x7c15, 0x7c17, 0x7c1a, 0x7c1c, 0x7c1f, 0x743f, 0x709f +.2byte 0x7c40, 0x7863, 0x7865, 0x7867, 0x786a, 0x786b, 0x786e, 0x7870, 0x7872, 0x7874, 0x7877, 0x7879, 0x787b, 0x787e, 0x74bf, 0x70df +.2byte 0x7ca0, 0x78a3, 0x74e7, 0x74e9, 0x74eb, 0x74ed, 0x74ef, 0x74f1, 0x74f3, 0x74f4, 0x74f7, 0x74f8, 0x74fb, 0x74fd, 0x74ff, 0x711f +.2byte 0x7ce0, 0x78e3, 0x7527, 0x7529, 0x752b, 0x752d, 0x752f, 0x7531, 0x7533, 0x7535, 0x7536, 0x7538, 0x753a, 0x753d, 0x753f, 0x715f +.2byte 0x7d20, 0x7943, 0x7567, 0x7569, 0x756b, 0x756d, 0x756f, 0x7571, 0x7573, 0x7575, 0x7577, 0x7579, 0x757b, 0x757d, 0x757f, 0x71bf +.2byte 0x7d80, 0x7983, 0x75a7, 0x75a9, 0x75ab, 0x75ad, 0x75af, 0x75b1, 0x75b3, 0x75b5, 0x75b7, 0x75b9, 0x75bb, 0x75bd, 0x75df, 0x71ff +.2byte 0x7dc0, 0x79c3, 0x75e7, 0x75e9, 0x75eb, 0x75ed, 0x75ef, 0x75f1, 0x75f3, 0x75f5, 0x75f7, 0x75f9, 0x75fb, 0x75fd, 0x761e, 0x723f +.2byte 0x7e20, 0x7a03, 0x7627, 0x7629, 0x762b, 0x762d, 0x762f, 0x7631, 0x7633, 0x7635, 0x7637, 0x7639, 0x763b, 0x763d, 0x765e, 0x727f +.2byte 0x7e60, 0x7a43, 0x7667, 0x7669, 0x766b, 0x766d, 0x766f, 0x7671, 0x7694, 0x7695, 0x7697, 0x7699, 0x769b, 0x769d, 0x769e, 0x76df +.2byte 0x7ea0, 0x7aa3, 0x76a7, 0x76a9, 0x76ab, 0x76ad, 0x76af, 0x76b1, 0x76b4, 0x76d6, 0x76d7, 0x76d9, 0x76db, 0x76dd, 0x76fe, 0x771f +.2byte 0x7f00, 0x7ae3, 0x76e7, 0x76e9, 0x76eb, 0x76ed, 0x76ef, 0x76f1, 0x76f4, 0x76f6, 0x7739, 0x773a, 0x773b, 0x773d, 0x773e, 0x775f +.2byte 0x7f40, 0x7b23, 0x7727, 0x7729, 0x772b, 0x772d, 0x772f, 0x7731, 0x7734, 0x7736, 0x7759, 0x775a, 0x775c, 0x775d, 0x777f, 0x7b9f +.2byte 0x7fa0, 0x7b63, 0x7767, 0x7769, 0x776b, 0x776d, 0x776f, 0x7771, 0x7774, 0x7776, 0x7799, 0x779a, 0x779c, 0x779d, 0x7bbf, 0x7fdf +.2byte 0x7fe0, 0x7bc3, 0x77a7, 0x77a9, 0x77ab, 0x77ad, 0x77af, 0x77b1, 0x77b4, 0x77b6, 0x77b9, 0x77ba, 0x77bc, 0x7bde, 0x7fff, 0x7fff +.2byte 0x77e1, 0x77e5, 0x73e7, 0x73e9, 0x73eb, 0x77ee, 0x73d0, 0x77d2, 0x73d4, 0x77d7, 0x77d9, 0x77fb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff +.2byte 0x6fe4, 0x73e6, 0x73e8, 0x73ea, 0x73ed, 0x73ef, 0x73f1, 0x73f3, 0x77f6, 0x77f8, 0x77fa, 0x7bfc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7c21, 0x7c23, 0x7c25, 0x7c27, 0x7c2a, 0x7c2c, 0x7c2e, 0x7c30, 0x7c32, 0x7c34, 0x7c36, 0x7c39, 0x7c3b, 0x7c3d, 0x7c3f, 0x789f +.2byte 0x7c61, 0x7ca5, 0x7ca7, 0x7ca9, 0x7cab, 0x7cad, 0x7cae, 0x7cb1, 0x7cb3, 0x7cb4, 0x7cb7, 0x7cb8, 0x7cba, 0x7cbd, 0x7cbf, 0x78df +.2byte 0x7cc1, 0x7ce5, 0x7ce7, 0x7ce9, 0x7ceb, 0x7ced, 0x7cef, 0x7cf1, 0x7cf3, 0x7cf4, 0x7cf6, 0x7cf9, 0x7cfa, 0x7cfc, 0x7cff, 0x791f +.2byte 0x7d01, 0x7d25, 0x7d27, 0x7d29, 0x7d2b, 0x7d2d, 0x7d2f, 0x7d31, 0x7d33, 0x7d35, 0x7d36, 0x7d39, 0x7d3a, 0x7d3c, 0x7d3f, 0x795f +.2byte 0x7d41, 0x7d65, 0x7d67, 0x7d69, 0x7d6b, 0x7d6d, 0x7d6f, 0x7d71, 0x7d73, 0x7d75, 0x7d77, 0x7d78, 0x7d7a, 0x7d7c, 0x7d7f, 0x79bf +.2byte 0x7d81, 0x7da5, 0x7da7, 0x7da9, 0x7dab, 0x7dce, 0x7dcf, 0x7dd1, 0x7dd3, 0x7dd5, 0x7dd7, 0x7dd9, 0x7ddb, 0x7ddd, 0x7ddf, 0x79ff +.2byte 0x7dc1, 0x7de5, 0x7de7, 0x7de9, 0x7deb, 0x7dee, 0x7a10, 0x7a11, 0x7a13, 0x7a15, 0x7a17, 0x7a19, 0x7a1b, 0x7a1c, 0x7a1e, 0x7a3f +.2byte 0x7e01, 0x7e25, 0x7e27, 0x7e29, 0x7e2b, 0x7e2e, 0x7a50, 0x7a52, 0x7a53, 0x7a55, 0x7a57, 0x7a59, 0x7a5b, 0x7a5d, 0x7a5e, 0x7a7f +.2byte 0x7e61, 0x7e65, 0x7e67, 0x7e69, 0x7e6b, 0x7e6e, 0x7a70, 0x7a92, 0x7a94, 0x7a95, 0x7a97, 0x7a99, 0x7a9b, 0x7a9c, 0x7a9e, 0x7adf +.2byte 0x7ea1, 0x7ea5, 0x7ea7, 0x7ea9, 0x7eab, 0x7eae, 0x7ab0, 0x7ad2, 0x7ad4, 0x7af7, 0x7af8, 0x7afa, 0x7afb, 0x7afd, 0x7afe, 0x7b1f +.2byte 0x7ee1, 0x7ee5, 0x7ee7, 0x7ee9, 0x7eeb, 0x7eee, 0x7af0, 0x7af2, 0x7af4, 0x7b37, 0x7b39, 0x7b3a, 0x7b3c, 0x7b3d, 0x7b3e, 0x7b5f +.2byte 0x7f21, 0x7f25, 0x7f27, 0x7f29, 0x7f2b, 0x7f2e, 0x7b30, 0x7b32, 0x7b34, 0x7b57, 0x7b59, 0x7f7b, 0x7f7c, 0x7f7d, 0x7f7f, 0x7f9f +.2byte 0x7f61, 0x7f65, 0x7f67, 0x7f69, 0x7f6b, 0x7f6e, 0x7b70, 0x7b72, 0x7b74, 0x7b97, 0x7b99, 0x7f9b, 0x7fbd, 0x7fbe, 0x7fbf, 0x7fdf +.2byte 0x7fa1, 0x7fa5, 0x7fa7, 0x7fa9, 0x7fab, 0x7fae, 0x7bb0, 0x7bb2, 0x7bb4, 0x7bb7, 0x7bb9, 0x7fbb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fe1, 0x7fe5, 0x7fe7, 0x7fe9, 0x7feb, 0x7fee, 0x7bd0, 0x7bd2, 0x7bd4, 0x7bd7, 0x7bd9, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff +.2byte 0x77e4, 0x77e6, 0x7be8, 0x77ea, 0x7bed, 0x7bef, 0x7bf1, 0x7bf3, 0x7bf6, 0x7bf8, 0x7bfa, 0x7ffc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7c84, 0x7c86, 0x7c87, 0x7c89, 0x7c8b, 0x7c8d, 0x7c8f, 0x7c91, 0x7c92, 0x7c94, 0x7c96, 0x7c98, 0x7c9a, 0x7c9b, 0x7c9d, 0x7c9f +.2byte 0x7cc4, 0x7cc6, 0x7cc8, 0x7cca, 0x7ccb, 0x7ccd, 0x7ccf, 0x7cd1, 0x7cd3, 0x7cd5, 0x7cd6, 0x7cd8, 0x7cda, 0x7cdc, 0x7cdd, 0x7cdf +.2byte 0x7d04, 0x7d06, 0x7d08, 0x7d0a, 0x7d0c, 0x7d0d, 0x7d0f, 0x7d11, 0x7d13, 0x7d15, 0x7d16, 0x7d18, 0x7d1a, 0x7d1c, 0x7d1e, 0x7d1f +.2byte 0x7d44, 0x7d46, 0x7d48, 0x7d4a, 0x7d4c, 0x7d4e, 0x7d50, 0x7d51, 0x7d53, 0x7d55, 0x7d56, 0x7d58, 0x7d5a, 0x7d5c, 0x7d5d, 0x7d5f +.2byte 0x7d84, 0x7d86, 0x7d88, 0x7d8a, 0x7dad, 0x7dae, 0x7db0, 0x7db2, 0x7db3, 0x7db5, 0x7db7, 0x7db8, 0x7dba, 0x7dbc, 0x7dbe, 0x7dbf +.2byte 0x7da4, 0x7dc6, 0x7dc8, 0x7dca, 0x7dcd, 0x7def, 0x7df0, 0x7df2, 0x7df3, 0x7df5, 0x7df7, 0x7df8, 0x7dfa, 0x7dfc, 0x7dfe, 0x7dff +.2byte 0x7de4, 0x7e06, 0x7e08, 0x7e0a, 0x7e0d, 0x7e0f, 0x7e31, 0x7e32, 0x7e34, 0x7e35, 0x7e37, 0x7e39, 0x7e3a, 0x7e3c, 0x7e3e, 0x7e3f +.2byte 0x7e24, 0x7e26, 0x7e28, 0x7e2a, 0x7e4d, 0x7e4f, 0x7e51, 0x7e73, 0x7e74, 0x7e76, 0x7e77, 0x7e79, 0x7e7b, 0x7e7c, 0x7e7e, 0x7e7f +.2byte 0x7e64, 0x7e66, 0x7e68, 0x7e6a, 0x7e6d, 0x7e8f, 0x7e91, 0x7e93, 0x7ed6, 0x7ed7, 0x7ed9, 0x7eda, 0x7edb, 0x7edd, 0x7ede, 0x7edf +.2byte 0x7ea4, 0x7ea6, 0x7ea8, 0x7eaa, 0x7ead, 0x7eaf, 0x7ed1, 0x7ed3, 0x7ef6, 0x7f18, 0x7f19, 0x7f1a, 0x7f1c, 0x7f1d, 0x7f1e, 0x7f1f +.2byte 0x7ec4, 0x7ee6, 0x7ee8, 0x7eea, 0x7eed, 0x7eef, 0x7ef1, 0x7f13, 0x7f36, 0x7f38, 0x7f5a, 0x7f5b, 0x7f5c, 0x7f5d, 0x7f5e, 0x7f5f +.2byte 0x7f04, 0x7f06, 0x7f28, 0x7f0a, 0x7f2d, 0x7f2f, 0x7f31, 0x7f33, 0x7f56, 0x7f78, 0x7f7a, 0x7f9c, 0x7f9d, 0x7f9e, 0x7f9f, 0x7f9f +.2byte 0x7f44, 0x7f46, 0x7f48, 0x7f4a, 0x7f4d, 0x7f4f, 0x7f71, 0x7f73, 0x7f96, 0x7f98, 0x7f9a, 0x7fbc, 0x7fde, 0x7fdf, 0x7fdf, 0x7fdf +.2byte 0x7f84, 0x7f86, 0x7f88, 0x7f8a, 0x7f8d, 0x7f8f, 0x7f91, 0x7f93, 0x7fb6, 0x7fb8, 0x7fba, 0x7fdc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fc4, 0x7fc6, 0x7fc8, 0x7fca, 0x7fcd, 0x7fcf, 0x7fd1, 0x7fd3, 0x7fd6, 0x7fd8, 0x7fda, 0x7ffc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fe4, 0x7fe6, 0x7fe8, 0x7fea, 0x7fed, 0x7fef, 0x7ff1, 0x7ff3, 0x7ff6, 0x7ff8, 0x7ffa, 0x7ffc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff +.2byte 0x0421, 0x0423, 0x0425, 0x0427, 0x0429, 0x042b, 0x042d, 0x0013, 0x0016, 0x0018, 0x001a, 0x001c, 0x001e, 0x001f, 0x085f, 0x18df +.2byte 0x0461, 0x0463, 0x0465, 0x0467, 0x0469, 0x046b, 0x046d, 0x0053, 0x0056, 0x0058, 0x005a, 0x005c, 0x005e, 0x005f, 0x089f, 0x18ff +.2byte 0x04a1, 0x04a3, 0x04a5, 0x04a7, 0x04a9, 0x04ab, 0x04ad, 0x00b3, 0x00b6, 0x00b8, 0x009a, 0x009c, 0x009e, 0x00bf, 0x08df, 0x193f +.2byte 0x04e1, 0x04e3, 0x04e5, 0x04e7, 0x04e9, 0x04eb, 0x04ed, 0x0113, 0x0116, 0x00f8, 0x00fa, 0x00fc, 0x00fe, 0x00ff, 0x091f, 0x195f +.2byte 0x0521, 0x0523, 0x0525, 0x0527, 0x0529, 0x052b, 0x052d, 0x0173, 0x0176, 0x0158, 0x015a, 0x013c, 0x013e, 0x015f, 0x097f, 0x199f +.2byte 0x0561, 0x0563, 0x0565, 0x0567, 0x0569, 0x056b, 0x056d, 0x01d3, 0x01b6, 0x01b8, 0x01ba, 0x019c, 0x019e, 0x019f, 0x099f, 0x19df +.2byte 0x05a1, 0x05a3, 0x05a5, 0x05a7, 0x05a9, 0x05ab, 0x05ad, 0x0233, 0x0216, 0x01f8, 0x01fa, 0x01fc, 0x01fe, 0x01df, 0x09df, 0x19ff +.2byte 0x0260, 0x0263, 0x0266, 0x0268, 0x026b, 0x026e, 0x0271, 0x0273, 0x0276, 0x0258, 0x025a, 0x023c, 0x023e, 0x023f, 0x0a3f, 0x1a3f +.2byte 0x02c0, 0x02c3, 0x02c5, 0x02c8, 0x02cb, 0x02ce, 0x02d0, 0x02d3, 0x02d6, 0x02b8, 0x029a, 0x029c, 0x027e, 0x027f, 0x0a7f, 0x1a7f +.2byte 0x0300, 0x0302, 0x0305, 0x0308, 0x030a, 0x030d, 0x0310, 0x0313, 0x0315, 0x0318, 0x02fa, 0x02dc, 0x02de, 0x02df, 0x0abf, 0x1abf +.2byte 0x0340, 0x0342, 0x0345, 0x0347, 0x034a, 0x034d, 0x034f, 0x0352, 0x0355, 0x0357, 0x035a, 0x033c, 0x031e, 0x031f, 0x0aff, 0x1adf +.2byte 0x0380, 0x0382, 0x0385, 0x0388, 0x038a, 0x038d, 0x038f, 0x0392, 0x0394, 0x0397, 0x039a, 0x039c, 0x037e, 0x035f, 0x0b3f, 0x1b1f +.2byte 0x03c0, 0x03c2, 0x03c5, 0x03c7, 0x03ca, 0x03cc, 0x03cf, 0x03d1, 0x03d4, 0x03d6, 0x03d9, 0x03dc, 0x03de, 0x03bf, 0x0b7f, 0x1b5f +.2byte 0x03e0, 0x03e3, 0x03e5, 0x03e7, 0x03ea, 0x03ec, 0x03ef, 0x03f1, 0x03f3, 0x03f6, 0x03f8, 0x03fb, 0x03fd, 0x03ff, 0x0bbf, 0x1b9f +.2byte 0x0be2, 0x0be5, 0x0be7, 0x0be9, 0x0beb, 0x0bed, 0x0bef, 0x0bf1, 0x0bf3, 0x0bf5, 0x0bf7, 0x0bfa, 0x0bfc, 0x0bfe, 0x0bff, 0x1bbf +.2byte 0x1be6, 0x1be7, 0x1be9, 0x1beb, 0x1bec, 0x1bee, 0x1bf0, 0x1bf2, 0x1bf3, 0x1bf5, 0x1bf7, 0x1bf9, 0x1bfa, 0x1bfc, 0x1bfe, 0x1bff +.2byte 0x0c21, 0x0c23, 0x0c25, 0x0c27, 0x0c29, 0x0c2b, 0x0c2d, 0x0c13, 0x0c16, 0x0818, 0x081a, 0x081c, 0x081e, 0x0c1f, 0x145f, 0x1cdf +.2byte 0x0c61, 0x0c63, 0x0c65, 0x0c67, 0x0c69, 0x0c6b, 0x0c71, 0x0853, 0x0855, 0x0857, 0x085a, 0x085c, 0x085e, 0x109e, 0x18df, 0x211f +.2byte 0x0ca1, 0x0ca3, 0x0ca5, 0x0ca7, 0x0ca9, 0x0cab, 0x0cb1, 0x08b3, 0x08b5, 0x08b7, 0x089a, 0x089c, 0x089e, 0x10be, 0x191f, 0x213f +.2byte 0x0ce1, 0x0ce3, 0x0ce5, 0x0ce7, 0x0ce9, 0x0ceb, 0x0d11, 0x0913, 0x0915, 0x08f7, 0x08fa, 0x08dc, 0x08fe, 0x111e, 0x195f, 0x217f +.2byte 0x0d21, 0x0d23, 0x0d25, 0x0d27, 0x0d29, 0x0d2b, 0x0d71, 0x0973, 0x0955, 0x0957, 0x093a, 0x093c, 0x093e, 0x115e, 0x197f, 0x219f +.2byte 0x0d61, 0x0d63, 0x0d65, 0x0d67, 0x0d69, 0x0d6b, 0x0dd1, 0x09b3, 0x09b5, 0x09b7, 0x099a, 0x099c, 0x099e, 0x119e, 0x19df, 0x21df +.2byte 0x0da1, 0x0e23, 0x0e25, 0x0e28, 0x0e2b, 0x0e2e, 0x0e31, 0x0a13, 0x09f5, 0x09f7, 0x09fa, 0x09fc, 0x09de, 0x11de, 0x19ff, 0x221f +.2byte 0x0a60, 0x0a62, 0x0a65, 0x0a68, 0x0a6b, 0x0a6d, 0x0a70, 0x0a73, 0x0a55, 0x0a57, 0x0a3a, 0x0a3c, 0x0a3e, 0x123e, 0x1a3f, 0x225f +.2byte 0x0ac0, 0x0aa2, 0x0aa5, 0x0aa8, 0x0aaa, 0x0aad, 0x0ab0, 0x0ab3, 0x0ab5, 0x0ab7, 0x0a9a, 0x0a9c, 0x0a7e, 0x127e, 0x1a7f, 0x229f +.2byte 0x0b00, 0x0ae2, 0x0ae5, 0x0ae7, 0x0aea, 0x0aed, 0x0af0, 0x0af2, 0x0af5, 0x0af7, 0x0afa, 0x0adc, 0x0ade, 0x12be, 0x1abf, 0x22bf +.2byte 0x0b40, 0x0b42, 0x0b44, 0x0b47, 0x0b4a, 0x0b4d, 0x0b4f, 0x0b52, 0x0b55, 0x0b57, 0x0b5a, 0x0b3c, 0x0b1e, 0x12fe, 0x1aff, 0x22ff +.2byte 0x0b80, 0x0b82, 0x0b84, 0x0b87, 0x0b89, 0x0b8c, 0x0b8f, 0x0b91, 0x0b94, 0x0b97, 0x0b99, 0x0b9c, 0x0b7e, 0x133e, 0x1b3f, 0x231f +.2byte 0x0bc0, 0x0bc2, 0x0bc5, 0x0bc7, 0x0bca, 0x0bcc, 0x0bcf, 0x0bd1, 0x0bd4, 0x0bd6, 0x0bd9, 0x0bdb, 0x0bde, 0x137e, 0x1b7f, 0x235f +.2byte 0x0be0, 0x13c4, 0x13c6, 0x13c8, 0x13ca, 0x13cc, 0x13cf, 0x13d1, 0x13d3, 0x13d5, 0x13d7, 0x13da, 0x13dc, 0x13de, 0x1bbf, 0x239f +.2byte 0x13e2, 0x1be6, 0x1be8, 0x1bea, 0x1bec, 0x1bee, 0x1bf0, 0x1bf2, 0x1bf4, 0x1bf5, 0x1bf8, 0x1bf9, 0x1bfb, 0x1bfd, 0x1bff, 0x23df +.2byte 0x1fe6, 0x23e8, 0x23ea, 0x23eb, 0x23ed, 0x23ef, 0x23f0, 0x23f2, 0x23f4, 0x23f6, 0x23f7, 0x23f9, 0x23fb, 0x23fc, 0x23fe, 0x23ff +.2byte 0x1421, 0x1423, 0x1425, 0x1427, 0x1429, 0x142b, 0x142d, 0x1813, 0x1416, 0x1418, 0x141a, 0x141c, 0x141e, 0x141f, 0x1c5f, 0x24df +.2byte 0x1461, 0x1463, 0x1465, 0x1467, 0x1469, 0x146b, 0x1471, 0x1453, 0x1455, 0x1457, 0x105a, 0x105c, 0x145e, 0x189e, 0x20df, 0x291f +.2byte 0x14a1, 0x14a3, 0x14a5, 0x14a7, 0x14a9, 0x14ae, 0x14b0, 0x14b3, 0x1095, 0x1097, 0x1099, 0x14bb, 0x18dc, 0x211d, 0x211f, 0x295f +.2byte 0x14e1, 0x14e3, 0x14e5, 0x14e7, 0x14e9, 0x150e, 0x1510, 0x14f3, 0x10f5, 0x10f7, 0x10f9, 0x14fb, 0x191c, 0x215d, 0x215f, 0x297f +.2byte 0x1521, 0x1523, 0x1525, 0x1527, 0x1529, 0x156e, 0x1570, 0x1553, 0x1155, 0x1157, 0x1139, 0x153b, 0x195c, 0x217d, 0x219f, 0x29bf +.2byte 0x1561, 0x1563, 0x15c5, 0x15c8, 0x15cb, 0x15ce, 0x15b0, 0x15b3, 0x11b5, 0x1197, 0x1199, 0x159b, 0x199c, 0x21dd, 0x21df, 0x29df +.2byte 0x15a1, 0x1623, 0x1605, 0x1608, 0x160b, 0x160d, 0x1610, 0x1613, 0x11f5, 0x11f7, 0x11f9, 0x15db, 0x19dc, 0x21fd, 0x21ff, 0x2a1f +.2byte 0x1660, 0x1662, 0x1665, 0x1667, 0x166a, 0x166d, 0x1670, 0x1673, 0x1255, 0x1257, 0x1239, 0x163b, 0x1a3c, 0x223d, 0x223f, 0x2a5f +.2byte 0x16c0, 0x16a2, 0x12a4, 0x12a7, 0x12aa, 0x12ad, 0x12af, 0x12b2, 0x12b5, 0x1297, 0x1299, 0x167b, 0x1a7c, 0x227d, 0x229f, 0x2a7f +.2byte 0x1700, 0x16e2, 0x12e4, 0x12e7, 0x12ea, 0x12ec, 0x12ef, 0x12f2, 0x12f5, 0x12f7, 0x12f9, 0x16db, 0x1abc, 0x22bd, 0x22bf, 0x2abf +.2byte 0x1340, 0x1342, 0x1324, 0x1327, 0x1329, 0x132c, 0x132f, 0x1332, 0x1334, 0x1337, 0x1339, 0x171b, 0x1afc, 0x22fd, 0x22ff, 0x2aff +.2byte 0x1380, 0x1382, 0x1765, 0x1767, 0x176a, 0x176c, 0x176f, 0x1771, 0x1774, 0x1776, 0x1779, 0x177b, 0x1b3c, 0x233d, 0x233f, 0x2b3f +.2byte 0x13c0, 0x13c2, 0x1b86, 0x1b88, 0x1b8a, 0x1b8c, 0x1b8f, 0x1b91, 0x1b93, 0x1b95, 0x1b97, 0x1b9a, 0x1b9c, 0x237d, 0x237f, 0x2b5f +.2byte 0x17e0, 0x17c4, 0x23a8, 0x23aa, 0x23ac, 0x23ae, 0x23b0, 0x23b2, 0x23b4, 0x23b5, 0x23b7, 0x23b9, 0x23bb, 0x23bd, 0x23bf, 0x2b9f +.2byte 0x1be2, 0x23e6, 0x23e8, 0x23ea, 0x23ec, 0x23ee, 0x23f0, 0x23f2, 0x23f4, 0x23f5, 0x23f7, 0x23f9, 0x23fb, 0x23fd, 0x23ff, 0x2bdf +.2byte 0x27e6, 0x27e8, 0x2bea, 0x2beb, 0x2bed, 0x2bef, 0x2bf1, 0x2bf2, 0x2bf4, 0x2bf6, 0x2bf7, 0x2bf9, 0x2bfa, 0x2bfc, 0x2bfe, 0x2bff +.2byte 0x1c21, 0x1c23, 0x1c25, 0x1c27, 0x1c29, 0x1c2b, 0x1c2d, 0x2013, 0x2016, 0x2018, 0x1c1a, 0x201c, 0x1c1e, 0x1c1f, 0x245f, 0x2cdf +.2byte 0x1c61, 0x1c63, 0x1c65, 0x1c67, 0x1c69, 0x1c6b, 0x2071, 0x2053, 0x2055, 0x1c57, 0x1c5a, 0x1c5c, 0x1c5e, 0x209e, 0x28df, 0x2d1f +.2byte 0x1ca1, 0x1ca3, 0x1ca5, 0x1ca7, 0x1ca9, 0x20ae, 0x20b0, 0x1cb3, 0x1c95, 0x1c97, 0x1c99, 0x1cbb, 0x20dc, 0x291d, 0x291f, 0x2d5f +.2byte 0x1ce1, 0x1ce3, 0x1ce5, 0x1ce7, 0x210b, 0x210e, 0x1cf0, 0x1cf2, 0x1cf5, 0x1cf7, 0x1cf9, 0x211a, 0x295b, 0x295d, 0x295f, 0x319f +.2byte 0x1d21, 0x1d23, 0x1d25, 0x2168, 0x216b, 0x216e, 0x1d50, 0x1d52, 0x1d35, 0x1d37, 0x1d39, 0x215a, 0x297b, 0x299d, 0x299f, 0x31bf +.2byte 0x1d61, 0x1d63, 0x21c5, 0x21c8, 0x21cb, 0x21ce, 0x1db0, 0x1db2, 0x1d95, 0x1d97, 0x1d99, 0x219a, 0x29db, 0x29dd, 0x29df, 0x31ff +.2byte 0x1da1, 0x2223, 0x2205, 0x1e07, 0x1e0a, 0x1e0d, 0x1e10, 0x1e12, 0x1df5, 0x1df7, 0x1dd9, 0x21da, 0x29fb, 0x29fd, 0x2a1f, 0x323f +.2byte 0x2260, 0x2262, 0x1e65, 0x1e47, 0x1e4a, 0x1e4d, 0x1e50, 0x1e52, 0x1e55, 0x1e37, 0x1e39, 0x223a, 0x2a3b, 0x2a3d, 0x2a3f, 0x325f +.2byte 0x22c0, 0x22a2, 0x1ea4, 0x1ea7, 0x1eaa, 0x1eac, 0x1eaf, 0x1eb2, 0x1eb5, 0x1e97, 0x1e79, 0x227a, 0x2a7b, 0x2a9d, 0x2a9f, 0x329f +.2byte 0x1f00, 0x1ee2, 0x1ee4, 0x1ee7, 0x1ee9, 0x1eec, 0x1eef, 0x1ef1, 0x1ef4, 0x1ef7, 0x1ed9, 0x22ba, 0x2abb, 0x2abd, 0x2abf, 0x32df +.2byte 0x1f40, 0x1f42, 0x1f24, 0x1f27, 0x1f29, 0x1f2c, 0x1f2f, 0x1f31, 0x1f34, 0x1f36, 0x1f39, 0x22fa, 0x2afb, 0x2afd, 0x2aff, 0x32ff +.2byte 0x1f80, 0x1b82, 0x1f65, 0x2348, 0x234a, 0x234c, 0x234f, 0x2351, 0x2353, 0x2355, 0x2358, 0x235a, 0x2b3b, 0x2b3d, 0x2b3f, 0x333f +.2byte 0x1fc0, 0x1fc2, 0x2386, 0x2b6a, 0x2b6c, 0x2b6e, 0x2b70, 0x2b72, 0x2b74, 0x2b75, 0x2b77, 0x2b7a, 0x2b7b, 0x2b7d, 0x2b7f, 0x337f +.2byte 0x1fe0, 0x23c4, 0x2ba8, 0x2baa, 0x2bac, 0x2bae, 0x2bb0, 0x2bb2, 0x2bb4, 0x2bb5, 0x2bb7, 0x2bb9, 0x2bbb, 0x2bbd, 0x2bbf, 0x339f +.2byte 0x23e2, 0x2be6, 0x2be8, 0x2bea, 0x2bec, 0x2bee, 0x2bf0, 0x2bf2, 0x2bf4, 0x2bf6, 0x2bf7, 0x2bf9, 0x2bfb, 0x2bfd, 0x2bff, 0x33df +.2byte 0x2be6, 0x2fe8, 0x2fea, 0x33ec, 0x33ed, 0x33ef, 0x33f1, 0x33f2, 0x33f4, 0x33f6, 0x33f7, 0x33f9, 0x33fb, 0x33fc, 0x33fe, 0x33ff +.2byte 0x2421, 0x2423, 0x2425, 0x2427, 0x2429, 0x242b, 0x242d, 0x2c13, 0x2c16, 0x2818, 0x281a, 0x281c, 0x281e, 0x281f, 0x2c5f, 0x30df +.2byte 0x2461, 0x2463, 0x2465, 0x2467, 0x2469, 0x246b, 0x2c71, 0x2c53, 0x2855, 0x2857, 0x285a, 0x245c, 0x285e, 0x289e, 0x30df, 0x351f +.2byte 0x24a1, 0x24a3, 0x24a5, 0x24a7, 0x24a9, 0x2cae, 0x2cb0, 0x28b3, 0x2895, 0x2897, 0x2499, 0x28bb, 0x28dc, 0x311d, 0x311f, 0x355f +.2byte 0x24e1, 0x24e3, 0x24e5, 0x2d08, 0x2d0b, 0x2d0e, 0x28f0, 0x28f2, 0x28f5, 0x24f7, 0x24f9, 0x291a, 0x315b, 0x315d, 0x315f, 0x359f +.2byte 0x2521, 0x2523, 0x2525, 0x2d68, 0x294b, 0x294d, 0x2950, 0x2532, 0x2534, 0x2536, 0x2958, 0x3199, 0x319b, 0x319d, 0x319f, 0x39df +.2byte 0x2561, 0x2563, 0x2dc5, 0x2dc8, 0x29aa, 0x29ad, 0x29b0, 0x2592, 0x2594, 0x2596, 0x2998, 0x31d9, 0x31db, 0x31dd, 0x31df, 0x39ff +.2byte 0x25a1, 0x2e23, 0x2e05, 0x2a07, 0x2a0a, 0x2a0d, 0x2a10, 0x25f2, 0x25f4, 0x25d6, 0x29d8, 0x3219, 0x321b, 0x321d, 0x321f, 0x3a3f +.2byte 0x2e60, 0x2e62, 0x2a65, 0x2a47, 0x2649, 0x264c, 0x264f, 0x2652, 0x2654, 0x2636, 0x2a38, 0x3239, 0x323b, 0x323d, 0x325f, 0x3a7f +.2byte 0x2ec0, 0x2aa2, 0x2aa4, 0x26a7, 0x2689, 0x268c, 0x268f, 0x2692, 0x2694, 0x2696, 0x2a78, 0x3279, 0x329b, 0x327d, 0x327f, 0x3a9f +.2byte 0x2b00, 0x2ae2, 0x2ae4, 0x26e7, 0x26c9, 0x26cc, 0x26cf, 0x26d1, 0x26d4, 0x26d6, 0x2ab8, 0x32b9, 0x32bb, 0x32bd, 0x32df, 0x3adf +.2byte 0x2b40, 0x2742, 0x2724, 0x2727, 0x2b0a, 0x2b0c, 0x2b0f, 0x2b11, 0x2b13, 0x2b15, 0x2b18, 0x32f9, 0x32fb, 0x32fd, 0x32ff, 0x3aff +.2byte 0x2780, 0x2782, 0x2765, 0x2b48, 0x332c, 0x332e, 0x3330, 0x3332, 0x3334, 0x3335, 0x3338, 0x3339, 0x333b, 0x333d, 0x333f, 0x3b3f +.2byte 0x27c0, 0x27c2, 0x2b86, 0x2f6a, 0x336c, 0x336e, 0x3370, 0x3372, 0x3374, 0x3376, 0x3377, 0x3379, 0x337b, 0x337d, 0x337f, 0x3b5f +.2byte 0x2be0, 0x2bc4, 0x2fa8, 0x33aa, 0x33ac, 0x33ae, 0x33b0, 0x33b2, 0x33b4, 0x33b6, 0x33b7, 0x33b9, 0x33bb, 0x33bd, 0x33bf, 0x3b9f +.2byte 0x2fe2, 0x2fe6, 0x33e8, 0x33ea, 0x33ec, 0x33ee, 0x33f0, 0x33f2, 0x33f4, 0x33f6, 0x33f7, 0x33f9, 0x33fb, 0x33fd, 0x33ff, 0x3bdf +.2byte 0x33e6, 0x33e8, 0x37ea, 0x37ec, 0x3bee, 0x3bf0, 0x3bf1, 0x3bf3, 0x3bf4, 0x3bf6, 0x3bf8, 0x3bf9, 0x3bfb, 0x3bfc, 0x3bfe, 0x3bff +.2byte 0x2c21, 0x2c23, 0x2c25, 0x2c27, 0x2c29, 0x2c2b, 0x2c2d, 0x3813, 0x3816, 0x3418, 0x341a, 0x341c, 0x301e, 0x301f, 0x345f, 0x38df +.2byte 0x2c61, 0x2c63, 0x2c65, 0x2c67, 0x2c69, 0x2c6b, 0x3871, 0x3453, 0x3455, 0x3457, 0x345a, 0x305c, 0x305e, 0x309e, 0x38df, 0x3d1f +.2byte 0x2ca1, 0x2ca3, 0x38a5, 0x38a8, 0x38ab, 0x38ae, 0x34b0, 0x34b3, 0x3495, 0x3097, 0x3099, 0x30bb, 0x30dc, 0x391d, 0x391f, 0x3d5f +.2byte 0x2ce1, 0x2ce3, 0x3905, 0x3908, 0x390b, 0x390e, 0x34f0, 0x34f2, 0x30f5, 0x30f7, 0x30f9, 0x311a, 0x395b, 0x395d, 0x395f, 0x3d9f +.2byte 0x2d21, 0x2d23, 0x3965, 0x3968, 0x354a, 0x354d, 0x3550, 0x3132, 0x3134, 0x3136, 0x3158, 0x3999, 0x399b, 0x399d, 0x399f, 0x41df +.2byte 0x2d61, 0x2d63, 0x39c5, 0x39c8, 0x35aa, 0x318d, 0x3190, 0x3192, 0x3194, 0x3196, 0x35b8, 0x39d9, 0x39db, 0x39dd, 0x3dff, 0x421f +.2byte 0x2da1, 0x3a23, 0x3605, 0x3607, 0x360a, 0x320c, 0x3210, 0x31f2, 0x31d4, 0x31d6, 0x35f8, 0x39f9, 0x3a1b, 0x3a1d, 0x3e1f, 0x423f +.2byte 0x3a60, 0x3662, 0x3665, 0x3647, 0x3249, 0x324c, 0x324f, 0x3252, 0x3234, 0x3236, 0x3638, 0x3a39, 0x3a5b, 0x3a5d, 0x3e5f, 0x427f +.2byte 0x36c0, 0x36a2, 0x36a4, 0x32a7, 0x3289, 0x328c, 0x328e, 0x3291, 0x3294, 0x3276, 0x3678, 0x3a99, 0x3a7b, 0x3a9d, 0x3e9f, 0x429f +.2byte 0x3700, 0x36e2, 0x32e4, 0x32e7, 0x32c9, 0x32cc, 0x32ce, 0x32d1, 0x32d3, 0x32d6, 0x36b8, 0x3ab9, 0x3abb, 0x3add, 0x3edf, 0x42df +.2byte 0x3740, 0x3342, 0x3324, 0x3327, 0x330a, 0x370d, 0x370f, 0x3711, 0x3714, 0x3716, 0x3718, 0x3af9, 0x3afb, 0x3afd, 0x3eff, 0x431f +.2byte 0x3380, 0x3382, 0x3365, 0x3348, 0x3b2c, 0x3b2e, 0x3b30, 0x3b32, 0x3b34, 0x3b35, 0x3b37, 0x3b39, 0x3b3b, 0x3b3d, 0x3f3f, 0x433f +.2byte 0x33c0, 0x33c2, 0x3386, 0x3b6a, 0x3b6c, 0x3b6e, 0x3b70, 0x3b72, 0x3b74, 0x3b76, 0x3b77, 0x3b7a, 0x3b7b, 0x3b7d, 0x3f7f, 0x437f +.2byte 0x33e0, 0x33c4, 0x3ba8, 0x3baa, 0x3bac, 0x3bae, 0x3bb0, 0x3bb2, 0x3bb4, 0x3bb6, 0x3bb8, 0x3bb9, 0x3bbb, 0x3bbd, 0x3fbf, 0x439f +.2byte 0x33e2, 0x3be6, 0x3be8, 0x3bea, 0x3bec, 0x3fef, 0x3ff0, 0x3ff2, 0x3ff4, 0x3ff6, 0x3ff8, 0x3ff9, 0x3ffb, 0x3ffd, 0x3fff, 0x43df +.2byte 0x3be6, 0x3be8, 0x3bea, 0x3fec, 0x3fee, 0x43f0, 0x43f1, 0x43f3, 0x43f5, 0x43f6, 0x43f8, 0x43f9, 0x43fb, 0x43fc, 0x43fe, 0x43ff +.2byte 0x3421, 0x3423, 0x3425, 0x3427, 0x3429, 0x342b, 0x342d, 0x4413, 0x4016, 0x4018, 0x3c1a, 0x3c1c, 0x3c1e, 0x3c1f, 0x3c5f, 0x40df +.2byte 0x3461, 0x4463, 0x4465, 0x4468, 0x446b, 0x446e, 0x4471, 0x4053, 0x4055, 0x4057, 0x3c5a, 0x3c5c, 0x3c5e, 0x3c9e, 0x40df, 0x411f +.2byte 0x34a1, 0x44a3, 0x40a5, 0x40a8, 0x40ab, 0x40ad, 0x40b0, 0x40b3, 0x3c95, 0x3c97, 0x3c99, 0x3cbb, 0x3cdc, 0x411d, 0x411f, 0x455f +.2byte 0x34e1, 0x4503, 0x4105, 0x40e7, 0x40ea, 0x40ed, 0x40f0, 0x40f2, 0x3cf5, 0x3cf7, 0x3cf9, 0x3d1a, 0x415b, 0x415d, 0x415f, 0x459f +.2byte 0x3521, 0x4563, 0x4165, 0x4147, 0x414a, 0x414d, 0x4150, 0x3d32, 0x3d34, 0x3d36, 0x3d58, 0x4199, 0x419b, 0x419d, 0x419f, 0x45df +.2byte 0x3561, 0x45c3, 0x41a5, 0x41a7, 0x41aa, 0x418c, 0x4190, 0x3d92, 0x3994, 0x3996, 0x3db8, 0x41d9, 0x41db, 0x41dd, 0x41ff, 0x461f +.2byte 0x35a1, 0x4623, 0x4205, 0x4207, 0x420a, 0x420c, 0x39cf, 0x39d2, 0x39d3, 0x3df6, 0x3df8, 0x4219, 0x421b, 0x421d, 0x463f, 0x4a5f +.2byte 0x4660, 0x4262, 0x4265, 0x4247, 0x3e49, 0x3e4c, 0x3a4e, 0x3a52, 0x3a33, 0x3e36, 0x3e38, 0x4259, 0x425b, 0x425d, 0x465f, 0x4a7f +.2byte 0x42c0, 0x3ea2, 0x3ea4, 0x3ea7, 0x3e89, 0x3a8c, 0x3a6e, 0x3a71, 0x3a73, 0x3e76, 0x3e98, 0x4279, 0x429b, 0x429d, 0x469f, 0x4abf +.2byte 0x3f00, 0x3ee2, 0x3ee4, 0x3ee7, 0x3ac9, 0x3acc, 0x3ecf, 0x3ed1, 0x3ed4, 0x3ed6, 0x3ed8, 0x42b9, 0x42db, 0x42dd, 0x46df, 0x4adf +.2byte 0x3f40, 0x3f42, 0x3f24, 0x3b27, 0x3b0a, 0x3f0d, 0x3f0f, 0x3f11, 0x3f14, 0x3f16, 0x3f18, 0x42f9, 0x42fb, 0x42fd, 0x471f, 0x4b1f +.2byte 0x3f80, 0x3f82, 0x3b65, 0x3b48, 0x432c, 0x3f2e, 0x4330, 0x4332, 0x4334, 0x4336, 0x4337, 0x4339, 0x433b, 0x433d, 0x473f, 0x4b3f +.2byte 0x3fc0, 0x3bc2, 0x3b86, 0x3f6a, 0x436c, 0x436e, 0x4370, 0x4372, 0x4374, 0x4376, 0x4378, 0x4379, 0x437b, 0x437d, 0x477f, 0x4b7f +.2byte 0x3be0, 0x3bc4, 0x3fa8, 0x3faa, 0x43ac, 0x43ae, 0x43b0, 0x43b2, 0x43b4, 0x43b6, 0x43b8, 0x43b9, 0x43bb, 0x43bd, 0x47bf, 0x4b9f +.2byte 0x3be2, 0x3fe6, 0x3fe8, 0x43ea, 0x43ec, 0x43ef, 0x47f1, 0x47f3, 0x47f4, 0x47f6, 0x47f8, 0x47fa, 0x47fb, 0x47fd, 0x47ff, 0x4bdf +.2byte 0x3fe6, 0x43e8, 0x43ea, 0x47ec, 0x47ee, 0x47f0, 0x4bf2, 0x4bf3, 0x4bf5, 0x4bf6, 0x4bf8, 0x4bfa, 0x4bfb, 0x4bfd, 0x4bfe, 0x4bff +.2byte 0x4c00, 0x4c02, 0x4c05, 0x4c08, 0x4c0b, 0x4c0e, 0x4c11, 0x4c13, 0x4c16, 0x4c18, 0x481a, 0x481c, 0x441e, 0x441f, 0x445f, 0x48df +.2byte 0x4c60, 0x4c42, 0x4c45, 0x4c48, 0x4c4b, 0x4c4d, 0x4c50, 0x4c53, 0x4c55, 0x4857, 0x485a, 0x445c, 0x445e, 0x449e, 0x48df, 0x491f +.2byte 0x4cc0, 0x4ca2, 0x4ca5, 0x4ca7, 0x4caa, 0x4cad, 0x4cb0, 0x4cb3, 0x4895, 0x4897, 0x4899, 0x44bb, 0x44dc, 0x491d, 0x491f, 0x495f +.2byte 0x4d00, 0x4d02, 0x4ce5, 0x48e7, 0x48ea, 0x48ed, 0x48f0, 0x48f2, 0x48f5, 0x44f7, 0x44f9, 0x451a, 0x495b, 0x495d, 0x495f, 0x499f +.2byte 0x4d60, 0x4d62, 0x4d45, 0x4947, 0x4929, 0x492c, 0x492f, 0x4932, 0x4934, 0x4536, 0x4558, 0x4999, 0x499b, 0x499d, 0x499f, 0x4ddf +.2byte 0x4dc0, 0x4da2, 0x4da5, 0x49a7, 0x4989, 0x498c, 0x498f, 0x4992, 0x4594, 0x4596, 0x45b8, 0x49d9, 0x49db, 0x49dd, 0x49ff, 0x4e1f +.2byte 0x4e20, 0x4e02, 0x4e05, 0x4a07, 0x49e9, 0x49ec, 0x49ce, 0x49d2, 0x45d3, 0x45f6, 0x45f8, 0x4a19, 0x4a1b, 0x4a1d, 0x4e3f, 0x4e5f +.2byte 0x4e60, 0x4e62, 0x4e65, 0x4a47, 0x4a49, 0x4a4c, 0x4a4e, 0x4211, 0x4634, 0x4636, 0x4a58, 0x4a59, 0x4a5b, 0x4a5d, 0x4e7f, 0x529f +.2byte 0x4ec0, 0x4aa2, 0x4aa4, 0x4aa7, 0x4a89, 0x468c, 0x466e, 0x4691, 0x4694, 0x4696, 0x4a78, 0x4a99, 0x4a9b, 0x4a9d, 0x4e9f, 0x52bf +.2byte 0x4b00, 0x4ae2, 0x4ae4, 0x46e7, 0x46c9, 0x46cc, 0x46cf, 0x46d1, 0x46d4, 0x46d6, 0x4ab8, 0x4ad9, 0x4adb, 0x4add, 0x4edf, 0x52ff +.2byte 0x4b40, 0x4742, 0x4724, 0x4727, 0x470a, 0x470d, 0x470f, 0x4b12, 0x4b14, 0x4b16, 0x4b18, 0x4b19, 0x4afb, 0x4b1d, 0x4f1f, 0x531f +.2byte 0x4780, 0x4782, 0x4765, 0x4748, 0x472c, 0x472e, 0x4b30, 0x4b32, 0x4b34, 0x4b36, 0x4b38, 0x4b39, 0x4b3b, 0x4b3d, 0x4f3f, 0x535f +.2byte 0x47c0, 0x47c2, 0x4786, 0x476a, 0x476c, 0x4b6e, 0x4b70, 0x4b72, 0x4b74, 0x4b76, 0x4b78, 0x4b79, 0x4b7b, 0x4b7d, 0x4f7f, 0x537f +.2byte 0x47e0, 0x47c4, 0x47a8, 0x47aa, 0x47ac, 0x4bae, 0x4bb0, 0x4bb2, 0x4bb4, 0x4bb6, 0x4bb8, 0x4bb9, 0x4bbb, 0x4bbd, 0x4fbf, 0x53bf +.2byte 0x47e2, 0x47e6, 0x47e8, 0x47ea, 0x4bec, 0x4bef, 0x4bf1, 0x4ff3, 0x4ff5, 0x4ff6, 0x4ff8, 0x4ffa, 0x4ffb, 0x4ffd, 0x4fff, 0x53df +.2byte 0x47e6, 0x4be8, 0x4bea, 0x4bec, 0x4fee, 0x4ff0, 0x4ff2, 0x53f4, 0x53f6, 0x53f7, 0x53f8, 0x53fa, 0x53fb, 0x53fd, 0x53fe, 0x53ff +.2byte 0x5800, 0x5802, 0x5805, 0x5808, 0x580b, 0x580d, 0x5810, 0x5813, 0x5816, 0x5418, 0x541a, 0x501c, 0x501e, 0x4c1f, 0x4c5f, 0x4cdf +.2byte 0x5860, 0x5442, 0x5445, 0x5448, 0x544a, 0x544d, 0x544f, 0x5452, 0x5455, 0x5457, 0x545a, 0x505c, 0x505e, 0x4c9e, 0x50df, 0x511f +.2byte 0x58a0, 0x54a2, 0x5484, 0x5487, 0x548a, 0x548d, 0x548f, 0x5492, 0x5495, 0x5497, 0x5099, 0x50bb, 0x4cdc, 0x511d, 0x511f, 0x515f +.2byte 0x5900, 0x5502, 0x54e4, 0x54e7, 0x54e9, 0x54ec, 0x54ef, 0x54f2, 0x54f5, 0x50f7, 0x50f9, 0x4d1a, 0x515b, 0x515d, 0x515f, 0x519f +.2byte 0x5960, 0x5542, 0x5544, 0x5547, 0x5129, 0x512c, 0x512f, 0x5132, 0x5134, 0x5136, 0x4d58, 0x5199, 0x519b, 0x519d, 0x519f, 0x51df +.2byte 0x59c0, 0x55a2, 0x55a4, 0x5587, 0x5189, 0x518c, 0x518e, 0x5191, 0x5194, 0x4d96, 0x51b8, 0x51d9, 0x51db, 0x51dd, 0x51ff, 0x561f +.2byte 0x5a00, 0x5602, 0x55e4, 0x55e7, 0x51e9, 0x51cc, 0x4dce, 0x4dd1, 0x4dd3, 0x51f6, 0x51f8, 0x5219, 0x521b, 0x521d, 0x523f, 0x565f +.2byte 0x5a60, 0x5662, 0x5644, 0x5647, 0x5249, 0x522c, 0x4e2e, 0x5231, 0x5234, 0x5236, 0x5258, 0x5259, 0x525b, 0x525d, 0x567f, 0x5a9f +.2byte 0x5ac0, 0x56a2, 0x56a4, 0x56a7, 0x5289, 0x528c, 0x4e6e, 0x5291, 0x4e74, 0x4e76, 0x5298, 0x529a, 0x529b, 0x529d, 0x56bf, 0x5eff +.2byte 0x5700, 0x56e2, 0x52e4, 0x52e7, 0x52c9, 0x4ecc, 0x4ecf, 0x52d1, 0x4ed3, 0x4ed6, 0x52d8, 0x52da, 0x52db, 0x52dd, 0x56df, 0x5f1f +.2byte 0x5340, 0x5342, 0x5324, 0x4f27, 0x4f0a, 0x4f0d, 0x530f, 0x4f12, 0x5314, 0x5316, 0x5318, 0x531a, 0x531b, 0x531d, 0x571f, 0x5f5f +.2byte 0x5380, 0x5382, 0x4f65, 0x4f48, 0x4f2c, 0x532e, 0x4f30, 0x5332, 0x5354, 0x5356, 0x5358, 0x535a, 0x533b, 0x533d, 0x575f, 0x5f7f +.2byte 0x4fc0, 0x4fc2, 0x4f86, 0x4f6a, 0x536c, 0x4f6e, 0x5370, 0x5372, 0x5374, 0x5376, 0x5378, 0x5379, 0x537b, 0x537d, 0x577f, 0x5f9f +.2byte 0x4fe0, 0x4fc4, 0x4fa8, 0x53aa, 0x4fac, 0x53ae, 0x53b0, 0x53b2, 0x53b4, 0x53b6, 0x53b8, 0x53ba, 0x53bb, 0x53bd, 0x57bf, 0x5fbf +.2byte 0x4fe2, 0x4fe6, 0x53e8, 0x53ea, 0x4fec, 0x53ef, 0x53f1, 0x53f3, 0x57f5, 0x57f6, 0x57f8, 0x57fa, 0x57fb, 0x57fd, 0x57ff, 0x5fdf +.2byte 0x4fe6, 0x53e8, 0x4fea, 0x53ec, 0x53ee, 0x53f0, 0x57f2, 0x57f4, 0x5ff7, 0x5ff9, 0x5ffa, 0x5ffb, 0x5ffc, 0x5ffd, 0x5ffe, 0x5fff +.2byte 0x6000, 0x6002, 0x6005, 0x6007, 0x600a, 0x600d, 0x600f, 0x6012, 0x6015, 0x6018, 0x5c1a, 0x5c1c, 0x581e, 0x581f, 0x545f, 0x54df +.2byte 0x6040, 0x5c42, 0x5c45, 0x5c47, 0x5c4a, 0x5c4d, 0x5c4f, 0x5c52, 0x5c55, 0x5c57, 0x5c5a, 0x5c5c, 0x585e, 0x549e, 0x54df, 0x591f +.2byte 0x60a0, 0x5ca2, 0x5c84, 0x5c87, 0x5c8a, 0x5c8c, 0x5c8f, 0x5c92, 0x5c94, 0x5c97, 0x5c99, 0x58bb, 0x54dc, 0x551d, 0x551f, 0x595f +.2byte 0x6100, 0x5ce2, 0x5ce4, 0x5ce7, 0x5ce9, 0x5cec, 0x5cef, 0x5cf1, 0x5cf4, 0x5cf7, 0x58f9, 0x551a, 0x555b, 0x555d, 0x595f, 0x599f +.2byte 0x6140, 0x5d42, 0x5d44, 0x5d27, 0x5929, 0x592c, 0x592e, 0x5931, 0x5934, 0x5936, 0x5558, 0x5599, 0x599b, 0x599d, 0x599f, 0x59df +.2byte 0x61a0, 0x5da2, 0x5d84, 0x5d87, 0x5989, 0x598c, 0x598e, 0x5991, 0x5993, 0x5996, 0x59b8, 0x55d9, 0x59db, 0x59dd, 0x59ff, 0x5a1f +.2byte 0x6200, 0x5e02, 0x5de4, 0x5de7, 0x59e9, 0x59cc, 0x59ef, 0x59f1, 0x59f3, 0x59f6, 0x59f8, 0x5a19, 0x5a1b, 0x5a1d, 0x5a3f, 0x5a5f +.2byte 0x6260, 0x5e42, 0x5e44, 0x5e27, 0x5a29, 0x5a2c, 0x5a2f, 0x5a31, 0x5a34, 0x5a36, 0x5a58, 0x5a59, 0x5a5b, 0x5a5d, 0x5a7f, 0x5e9f +.2byte 0x62a0, 0x5ea2, 0x5ea4, 0x5e87, 0x5a89, 0x5a6c, 0x5a8f, 0x5a91, 0x5a73, 0x5a76, 0x5a98, 0x5a9a, 0x5a9b, 0x5a9d, 0x5abf, 0x66ff +.2byte 0x6300, 0x5ee2, 0x5ee4, 0x5ee7, 0x5ac9, 0x5acc, 0x5acf, 0x5ad1, 0x5ad3, 0x56b6, 0x56b8, 0x5ada, 0x5adb, 0x5add, 0x631f, 0x673f +.2byte 0x5f40, 0x5f42, 0x5f24, 0x5b27, 0x570a, 0x570d, 0x5b0f, 0x5712, 0x5b14, 0x5715, 0x5718, 0x5b1a, 0x5b1b, 0x5b1d, 0x633f, 0x675f +.2byte 0x5b80, 0x5b82, 0x5b65, 0x5748, 0x572c, 0x572e, 0x5730, 0x5b32, 0x5b54, 0x5b56, 0x5b58, 0x5b5a, 0x5b3b, 0x5b5d, 0x637f, 0x677f +.2byte 0x5bc0, 0x5bc2, 0x5786, 0x576a, 0x576c, 0x576e, 0x5b70, 0x5b72, 0x5b74, 0x5b76, 0x5b78, 0x5b7a, 0x5b7b, 0x5b7d, 0x639f, 0x679f +.2byte 0x5be0, 0x57c4, 0x57a8, 0x57aa, 0x57ac, 0x5bae, 0x5bb0, 0x5bb2, 0x5bb4, 0x5bb6, 0x5bb8, 0x5bba, 0x5bbb, 0x5bbd, 0x63bf, 0x67bf +.2byte 0x57e2, 0x57e6, 0x57e8, 0x57ea, 0x5bec, 0x5bef, 0x5bf1, 0x5bf3, 0x5bf5, 0x63f8, 0x63f9, 0x63fb, 0x63fc, 0x63fd, 0x63ff, 0x67df +.2byte 0x57e6, 0x57e8, 0x57ea, 0x5bec, 0x5bee, 0x5bf0, 0x5bf2, 0x5ff4, 0x63f7, 0x67f9, 0x67fa, 0x67fb, 0x67fc, 0x67fd, 0x67fe, 0x67ff +.2byte 0x6800, 0x6802, 0x6804, 0x6807, 0x680a, 0x680d, 0x680f, 0x6812, 0x6814, 0x6817, 0x681a, 0x681c, 0x641e, 0x601f, 0x5c5f, 0x5cdf +.2byte 0x6840, 0x6842, 0x6844, 0x6847, 0x6849, 0x684c, 0x684f, 0x6851, 0x6854, 0x6857, 0x685a, 0x645c, 0x645e, 0x5c9e, 0x60df, 0x5d1f +.2byte 0x68a0, 0x6882, 0x6484, 0x6487, 0x6489, 0x648c, 0x648f, 0x6491, 0x6494, 0x6497, 0x6499, 0x64bb, 0x5cdc, 0x5d1d, 0x5d1f, 0x5d5f +.2byte 0x68e0, 0x68e2, 0x64e4, 0x64e7, 0x64e9, 0x64ec, 0x64ee, 0x64f1, 0x64f3, 0x64f6, 0x64f9, 0x611a, 0x5d5b, 0x5d5d, 0x5d5f, 0x5d9f +.2byte 0x6940, 0x6942, 0x6524, 0x6527, 0x614a, 0x614c, 0x614e, 0x6151, 0x6153, 0x6155, 0x6158, 0x6199, 0x5d9b, 0x5d9d, 0x5d9f, 0x61df +.2byte 0x69a0, 0x69a2, 0x6584, 0x6587, 0x618a, 0x61ad, 0x61af, 0x61b1, 0x61b3, 0x61b5, 0x61b8, 0x5dd9, 0x5ddb, 0x61dd, 0x61ff, 0x621f +.2byte 0x69e0, 0x69e2, 0x65e4, 0x65e7, 0x61ea, 0x61ed, 0x61ef, 0x61f1, 0x61f4, 0x61f6, 0x61f8, 0x5e19, 0x621b, 0x621d, 0x623f, 0x625f +.2byte 0x6a40, 0x6a42, 0x6644, 0x6627, 0x622a, 0x622d, 0x622f, 0x6252, 0x6253, 0x6255, 0x6258, 0x6259, 0x625b, 0x625d, 0x627f, 0x629f +.2byte 0x6aa0, 0x6aa2, 0x6684, 0x6687, 0x626a, 0x628d, 0x628f, 0x6292, 0x6294, 0x6296, 0x6298, 0x629a, 0x629b, 0x629d, 0x62bf, 0x6aff +.2byte 0x6ae0, 0x6ae2, 0x66e4, 0x66c7, 0x62aa, 0x62cd, 0x62cf, 0x62d2, 0x62d4, 0x62b5, 0x62b8, 0x62da, 0x62db, 0x62dd, 0x671f, 0x6b3f +.2byte 0x6b40, 0x6b42, 0x6724, 0x6727, 0x630a, 0x630d, 0x630f, 0x6312, 0x6314, 0x6315, 0x5ef8, 0x631a, 0x631c, 0x673d, 0x6b5f, 0x6f7f +.2byte 0x6780, 0x6782, 0x6365, 0x5f48, 0x5f2c, 0x5f2e, 0x5f30, 0x6332, 0x6354, 0x6356, 0x6358, 0x635a, 0x635c, 0x677d, 0x6b7f, 0x6f9f +.2byte 0x63c0, 0x63c2, 0x5f86, 0x5f6a, 0x5f6c, 0x5f6e, 0x5f70, 0x5f72, 0x6374, 0x6376, 0x6398, 0x639a, 0x639c, 0x679d, 0x6b9f, 0x6fbf +.2byte 0x63e0, 0x5fc4, 0x5fa8, 0x5faa, 0x5fac, 0x5fae, 0x5fb0, 0x63b2, 0x63b4, 0x63b6, 0x67b9, 0x67bb, 0x67bc, 0x67bd, 0x6bdf, 0x6fdf +.2byte 0x5fe2, 0x5fe6, 0x5fe8, 0x5fea, 0x5fec, 0x5fef, 0x63f1, 0x63f3, 0x63f5, 0x67f8, 0x6bfa, 0x6bfb, 0x6bfc, 0x6bfe, 0x6bff, 0x6fff +.2byte 0x5be6, 0x5fe8, 0x5fea, 0x5fec, 0x5fee, 0x63f0, 0x63f2, 0x63f4, 0x6bf7, 0x6bf9, 0x6ffb, 0x6ffc, 0x6ffd, 0x6ffe, 0x6fff, 0x6fff +.2byte 0x7000, 0x7002, 0x7004, 0x7007, 0x7009, 0x700c, 0x700f, 0x7011, 0x7014, 0x7016, 0x7019, 0x701c, 0x701e, 0x6c1f, 0x685f, 0x64df +.2byte 0x7040, 0x7042, 0x7044, 0x7046, 0x7049, 0x704c, 0x704f, 0x7051, 0x7054, 0x7056, 0x7059, 0x705c, 0x6c5e, 0x689e, 0x64df, 0x651f +.2byte 0x70a0, 0x7082, 0x6ca5, 0x6ca7, 0x6ca9, 0x6cac, 0x6cae, 0x6cb1, 0x6cb3, 0x6cb6, 0x6cb8, 0x6cbb, 0x68dc, 0x651d, 0x651f, 0x655f +.2byte 0x7100, 0x70e2, 0x6ce5, 0x6908, 0x690a, 0x690c, 0x690e, 0x6911, 0x6913, 0x6915, 0x6917, 0x691a, 0x695b, 0x655d, 0x655f, 0x659f +.2byte 0x7140, 0x7122, 0x6d45, 0x6948, 0x658c, 0x658e, 0x6590, 0x6591, 0x6593, 0x6595, 0x6597, 0x6599, 0x659b, 0x659d, 0x659f, 0x65df +.2byte 0x71a0, 0x7182, 0x6d85, 0x6988, 0x65cc, 0x65ce, 0x65cf, 0x65d1, 0x65d4, 0x65d5, 0x65d7, 0x65d9, 0x69db, 0x65dd, 0x65ff, 0x661f +.2byte 0x71e0, 0x71e2, 0x6de5, 0x69e8, 0x660c, 0x660e, 0x6610, 0x6612, 0x6613, 0x6615, 0x6617, 0x6619, 0x661b, 0x661d, 0x6a3f, 0x6a5f +.2byte 0x7240, 0x7222, 0x6e25, 0x6a28, 0x664c, 0x664e, 0x6650, 0x6652, 0x6654, 0x6656, 0x6658, 0x6659, 0x665b, 0x665d, 0x6a7f, 0x6a9f +.2byte 0x7280, 0x7282, 0x6e85, 0x6a68, 0x668c, 0x668e, 0x6690, 0x6692, 0x6a94, 0x6a96, 0x6a98, 0x6a9a, 0x669b, 0x6a9d, 0x6abf, 0x6eff +.2byte 0x72e0, 0x72e2, 0x6ec5, 0x6aa8, 0x66ac, 0x66ae, 0x66d0, 0x66d2, 0x6ad4, 0x6ad6, 0x6ad8, 0x6ada, 0x6adb, 0x6add, 0x6f1f, 0x6f3f +.2byte 0x7340, 0x7322, 0x6f25, 0x6b08, 0x670c, 0x66ee, 0x66f0, 0x6712, 0x6b14, 0x6b16, 0x6b18, 0x6b1a, 0x6b1c, 0x6f3d, 0x6f5f, 0x737f +.2byte 0x7380, 0x7382, 0x6f65, 0x6b48, 0x672c, 0x672e, 0x6730, 0x6732, 0x6b54, 0x6b56, 0x6b58, 0x6b5a, 0x6f7c, 0x6f7e, 0x739f, 0x77bf +.2byte 0x6fc0, 0x6fc2, 0x6786, 0x676a, 0x676c, 0x676e, 0x6770, 0x6772, 0x6774, 0x6776, 0x6b98, 0x6f9b, 0x6f9c, 0x6f9e, 0x73bf, 0x77df +.2byte 0x6be0, 0x67c4, 0x67a8, 0x67aa, 0x67ac, 0x67ae, 0x67b0, 0x67b2, 0x67b4, 0x6bb6, 0x6fb9, 0x6fdb, 0x6fdc, 0x6fde, 0x73df, 0x77df +.2byte 0x67e2, 0x67e6, 0x67e8, 0x67ea, 0x67ec, 0x67ef, 0x67f1, 0x67f3, 0x6bf5, 0x6ff8, 0x6ffa, 0x73fc, 0x73fd, 0x73fe, 0x73ff, 0x77ff +.2byte 0x63e6, 0x63e8, 0x67ea, 0x67ec, 0x67ee, 0x67f0, 0x67f2, 0x6bf4, 0x6ff7, 0x6ff9, 0x73fb, 0x77fd, 0x77fe, 0x77fe, 0x77ff, 0x77ff +.2byte 0x7800, 0x7802, 0x7804, 0x7807, 0x7809, 0x780c, 0x780f, 0x7811, 0x7813, 0x7816, 0x7818, 0x781b, 0x781e, 0x741f, 0x705f, 0x68df +.2byte 0x7840, 0x7842, 0x7844, 0x7847, 0x7849, 0x784c, 0x784e, 0x7851, 0x7853, 0x7856, 0x7858, 0x785b, 0x785e, 0x709e, 0x6cdf, 0x6d1f +.2byte 0x78a0, 0x78a2, 0x70c6, 0x70c8, 0x70ca, 0x70cc, 0x70ce, 0x70d1, 0x70d3, 0x70d5, 0x70d7, 0x70d9, 0x70dc, 0x6d1d, 0x6d1f, 0x695f +.2byte 0x78e0, 0x78e2, 0x7106, 0x6d4a, 0x6d4b, 0x6d4e, 0x6d4f, 0x6d51, 0x6d53, 0x6d55, 0x6d57, 0x6d59, 0x6d5b, 0x6d5d, 0x6d5f, 0x6d9f +.2byte 0x7940, 0x7942, 0x7146, 0x6d8a, 0x6d8c, 0x6d8e, 0x6d90, 0x6d91, 0x6d94, 0x6d95, 0x6d97, 0x6d99, 0x6d9b, 0x6d9d, 0x6d9f, 0x6ddf +.2byte 0x7980, 0x7982, 0x7186, 0x6dca, 0x6dcc, 0x6dce, 0x6dd0, 0x6dd2, 0x6dd3, 0x6dd5, 0x6dd7, 0x6dd9, 0x6ddb, 0x6ddd, 0x6dff, 0x6e1f +.2byte 0x79e0, 0x79e2, 0x71e6, 0x6e0a, 0x6e0c, 0x6e0e, 0x6e10, 0x6e12, 0x6e14, 0x6e16, 0x6e17, 0x6e19, 0x6e1b, 0x6e1d, 0x6e3f, 0x6e5f +.2byte 0x7a20, 0x7a22, 0x7226, 0x6e4a, 0x6e4c, 0x6e4e, 0x6e50, 0x6e52, 0x6e54, 0x6e56, 0x6e57, 0x6e59, 0x6e5b, 0x6e5d, 0x6e7f, 0x6e9f +.2byte 0x7a80, 0x7a82, 0x7266, 0x6e8a, 0x6e8c, 0x6e8e, 0x6e90, 0x6e92, 0x6e94, 0x6e96, 0x6e98, 0x6e99, 0x6e9b, 0x6e9d, 0x6ebf, 0x72ff +.2byte 0x7ac0, 0x7ac2, 0x72a6, 0x6eaa, 0x6ecc, 0x6ece, 0x6ed0, 0x6ed2, 0x6ed4, 0x6ed6, 0x6ed8, 0x6ed9, 0x6edb, 0x6edd, 0x731f, 0x733f +.2byte 0x7b20, 0x7b22, 0x72e6, 0x6eea, 0x6eec, 0x6eee, 0x6f10, 0x6f12, 0x6f14, 0x6f16, 0x7318, 0x731a, 0x731c, 0x733d, 0x735f, 0x777f +.2byte 0x7b80, 0x7b62, 0x7346, 0x6f4a, 0x6f2c, 0x6f4e, 0x6f30, 0x6f32, 0x6f34, 0x6f56, 0x7358, 0x737b, 0x737c, 0x737e, 0x779f, 0x7bbf +.2byte 0x7bc0, 0x7bc2, 0x7386, 0x6f6a, 0x6f6c, 0x6f6e, 0x6f70, 0x6f72, 0x6f74, 0x6f76, 0x7398, 0x739b, 0x739d, 0x77be, 0x7bdf, 0x7fff +.2byte 0x77e0, 0x6fc4, 0x6fa8, 0x6faa, 0x6fac, 0x6fae, 0x6fb0, 0x6fb2, 0x6fb4, 0x6fb6, 0x73b9, 0x73db, 0x77dd, 0x77de, 0x7bdf, 0x7fff +.2byte 0x6fe2, 0x6fe6, 0x6fe8, 0x6fea, 0x6fec, 0x6fef, 0x6ff1, 0x6ff3, 0x6ff5, 0x73f8, 0x73fa, 0x77fc, 0x7bfe, 0x7bfe, 0x7bff, 0x7fff +.2byte 0x6be6, 0x6be8, 0x6bea, 0x6fec, 0x6bee, 0x6ff0, 0x6ff2, 0x6ff4, 0x73f7, 0x73f9, 0x77fb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7c00, 0x7c02, 0x7c05, 0x7c07, 0x7c0a, 0x7c0c, 0x7c0e, 0x7c11, 0x7c13, 0x7c16, 0x7c18, 0x7c1a, 0x7c1d, 0x7c1f, 0x785f, 0x70df +.2byte 0x7c60, 0x7884, 0x7885, 0x7888, 0x788a, 0x788c, 0x788e, 0x7891, 0x7893, 0x7895, 0x7897, 0x7899, 0x789b, 0x789e, 0x74df, 0x711f +.2byte 0x7ca0, 0x78c4, 0x7508, 0x750a, 0x750b, 0x750e, 0x750f, 0x7511, 0x7513, 0x7515, 0x7517, 0x7519, 0x751b, 0x751d, 0x751f, 0x715f +.2byte 0x7ce0, 0x7904, 0x7548, 0x754a, 0x754c, 0x754e, 0x754f, 0x7551, 0x7554, 0x7555, 0x7557, 0x7559, 0x755b, 0x755d, 0x755f, 0x719f +.2byte 0x7d40, 0x7944, 0x7588, 0x758a, 0x758c, 0x758e, 0x7590, 0x7591, 0x7593, 0x7595, 0x7597, 0x7599, 0x759b, 0x759d, 0x759f, 0x71df +.2byte 0x7d80, 0x7984, 0x75c8, 0x75ca, 0x75cc, 0x75ce, 0x75d0, 0x75d2, 0x75d4, 0x75d6, 0x75d7, 0x75d9, 0x75db, 0x75dd, 0x75ff, 0x721f +.2byte 0x7de0, 0x79e4, 0x7608, 0x760a, 0x760c, 0x760e, 0x7610, 0x7612, 0x7614, 0x7616, 0x7617, 0x7619, 0x761b, 0x761d, 0x763f, 0x765f +.2byte 0x7e20, 0x7a24, 0x7648, 0x764a, 0x764c, 0x764e, 0x7650, 0x7652, 0x7654, 0x7656, 0x7658, 0x7659, 0x765b, 0x765d, 0x767f, 0x769f +.2byte 0x7e60, 0x7a64, 0x7688, 0x768a, 0x768c, 0x768e, 0x7690, 0x7692, 0x7694, 0x7696, 0x7698, 0x7699, 0x769b, 0x769d, 0x76bf, 0x76ff +.2byte 0x7ec0, 0x7aa4, 0x76a8, 0x76aa, 0x76cc, 0x76ce, 0x76d0, 0x76d2, 0x76d4, 0x76d6, 0x76d8, 0x76da, 0x76db, 0x76dd, 0x771f, 0x773f +.2byte 0x7f00, 0x7ae4, 0x76e8, 0x76ea, 0x76ec, 0x770e, 0x7710, 0x7712, 0x7714, 0x7716, 0x7739, 0x773b, 0x773c, 0x773d, 0x7b5f, 0x7b7f +.2byte 0x7f60, 0x7b44, 0x7728, 0x772a, 0x772c, 0x772e, 0x7730, 0x7732, 0x7754, 0x7756, 0x7779, 0x7b7b, 0x7b7c, 0x7b7e, 0x7b9f, 0x7bbf +.2byte 0x7fa0, 0x7b84, 0x7768, 0x776a, 0x776c, 0x776e, 0x7770, 0x7772, 0x7774, 0x7776, 0x7799, 0x7b9b, 0x7bbd, 0x7bbe, 0x7bdf, 0x7fff +.2byte 0x7fe0, 0x7bc4, 0x77a8, 0x77aa, 0x77ac, 0x77ae, 0x77b0, 0x77b2, 0x77b4, 0x77b6, 0x77b9, 0x7bdb, 0x7bdd, 0x7bdf, 0x7fff, 0x7fff +.2byte 0x77e2, 0x77e6, 0x77e8, 0x77ea, 0x77ec, 0x77ef, 0x77f1, 0x77f3, 0x77f5, 0x77f8, 0x7bfa, 0x7bfc, 0x7bfe, 0x7fff, 0x7fff, 0x7fff +.2byte 0x73e6, 0x73e8, 0x73ea, 0x73ec, 0x73ee, 0x73f0, 0x73f2, 0x77f4, 0x77f7, 0x77f9, 0x7bfb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7c42, 0x7c44, 0x7c46, 0x7c48, 0x7c4b, 0x7c4c, 0x7c4e, 0x7c51, 0x7c53, 0x7c55, 0x7c57, 0x7c59, 0x7c5b, 0x7c5d, 0x7c5f, 0x78df +.2byte 0x7ca2, 0x7cc6, 0x7cc8, 0x7cca, 0x7ccb, 0x7cce, 0x7ccf, 0x7cd1, 0x7cd3, 0x7cd5, 0x7cd7, 0x7cd9, 0x7cdb, 0x7cdd, 0x7cdf, 0x791f +.2byte 0x7ce2, 0x7d06, 0x7d08, 0x7d0a, 0x7d0c, 0x7d0e, 0x7d0f, 0x7d11, 0x7d14, 0x7d15, 0x7d17, 0x7d19, 0x7d1b, 0x7d1d, 0x7d1f, 0x795f +.2byte 0x7d22, 0x7d46, 0x7d48, 0x7d4a, 0x7d4c, 0x7d4e, 0x7d50, 0x7d51, 0x7d54, 0x7d55, 0x7d57, 0x7d59, 0x7d5b, 0x7d5d, 0x7d5f, 0x799f +.2byte 0x7d62, 0x7d86, 0x7d88, 0x7d8a, 0x7d8c, 0x7d8e, 0x7d90, 0x7d92, 0x7d93, 0x7d96, 0x7d97, 0x7d99, 0x7d9b, 0x7d9d, 0x7d9f, 0x79df +.2byte 0x7da2, 0x7dc6, 0x7dc8, 0x7dca, 0x7dcc, 0x7def, 0x7df0, 0x7df2, 0x7df4, 0x7df6, 0x7df7, 0x7df9, 0x7dfb, 0x7dfd, 0x7dff, 0x7a1f +.2byte 0x7de2, 0x7e06, 0x7e08, 0x7e0a, 0x7e0c, 0x7e0f, 0x7e31, 0x7e32, 0x7e34, 0x7e36, 0x7e38, 0x7e39, 0x7e3b, 0x7e3d, 0x7e3f, 0x7a5f +.2byte 0x7e22, 0x7e46, 0x7e48, 0x7e4a, 0x7e4c, 0x7e4f, 0x7e71, 0x7e73, 0x7e74, 0x7e76, 0x7e78, 0x7e79, 0x7e7b, 0x7e7d, 0x7e7f, 0x7a9f +.2byte 0x7e62, 0x7e86, 0x7e88, 0x7e8a, 0x7e8c, 0x7e8f, 0x7e91, 0x7eb3, 0x7eb5, 0x7eb6, 0x7eb8, 0x7eba, 0x7ebb, 0x7ebd, 0x7ebf, 0x7aff +.2byte 0x7ea2, 0x7ea6, 0x7ea8, 0x7eca, 0x7ecc, 0x7ecf, 0x7ed1, 0x7ed3, 0x7ed5, 0x7f18, 0x7f19, 0x7f1b, 0x7f1c, 0x7f1d, 0x7f1f, 0x7b3f +.2byte 0x7ee2, 0x7f06, 0x7ee8, 0x7eea, 0x7eec, 0x7f0f, 0x7f11, 0x7f13, 0x7f15, 0x7f38, 0x7f5a, 0x7f5b, 0x7f5c, 0x7f5e, 0x7f5f, 0x7f7f +.2byte 0x7f42, 0x7f26, 0x7f28, 0x7f2a, 0x7f2c, 0x7f2f, 0x7f51, 0x7f53, 0x7f55, 0x7f78, 0x7f7a, 0x7f9c, 0x7f9d, 0x7f9e, 0x7f9f, 0x7fbf +.2byte 0x7f82, 0x7f66, 0x7f68, 0x7f6a, 0x7f6c, 0x7f6f, 0x7f71, 0x7f73, 0x7f75, 0x7f98, 0x7f9a, 0x7fbc, 0x7fde, 0x7fde, 0x7fdf, 0x7fff +.2byte 0x7fc2, 0x7fa6, 0x7fa8, 0x7faa, 0x7fac, 0x7faf, 0x7fb1, 0x7fb3, 0x7fb5, 0x7fb8, 0x7fda, 0x7fdc, 0x7fde, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fe2, 0x7fe6, 0x7fe8, 0x7fea, 0x7fec, 0x7fef, 0x7ff1, 0x7ff3, 0x7ff5, 0x7ff8, 0x7ffa, 0x7ffc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff +.2byte 0x77e6, 0x7be8, 0x7bea, 0x7bec, 0x7bee, 0x7bf0, 0x7bf2, 0x7bf4, 0x7bf7, 0x7bf9, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7cc6, 0x7cc7, 0x7cc9, 0x7cca, 0x7ccc, 0x7cce, 0x7ccf, 0x7cd1, 0x7cd3, 0x7cd5, 0x7cd6, 0x7cd8, 0x7cda, 0x7cdc, 0x7cdd, 0x7cdf +.2byte 0x7ce6, 0x7d08, 0x7d09, 0x7d0b, 0x7d0c, 0x7d0e, 0x7d10, 0x7d12, 0x7d14, 0x7d15, 0x7d17, 0x7d18, 0x7d1a, 0x7d1c, 0x7d1e, 0x7d1f +.2byte 0x7d26, 0x7d48, 0x7d4a, 0x7d4b, 0x7d4d, 0x7d4e, 0x7d50, 0x7d52, 0x7d53, 0x7d55, 0x7d57, 0x7d59, 0x7d5a, 0x7d5c, 0x7d5e, 0x7d5f +.2byte 0x7d66, 0x7d68, 0x7d6a, 0x7d8c, 0x7d8d, 0x7d8f, 0x7d91, 0x7d92, 0x7d94, 0x7d96, 0x7d97, 0x7d99, 0x7d9b, 0x7d9c, 0x7d9e, 0x7d9f +.2byte 0x7d86, 0x7da8, 0x7daa, 0x7dac, 0x7dce, 0x7dcf, 0x7dd1, 0x7dd3, 0x7dd4, 0x7dd6, 0x7dd7, 0x7dd9, 0x7dda, 0x7ddc, 0x7dde, 0x7ddf +.2byte 0x7dc6, 0x7de8, 0x7dea, 0x7dec, 0x7e0e, 0x7e10, 0x7e11, 0x7e13, 0x7e14, 0x7e16, 0x7e18, 0x7e19, 0x7e1b, 0x7e1c, 0x7e1e, 0x7e1f +.2byte 0x7e06, 0x7e08, 0x7e2a, 0x7e2c, 0x7e2e, 0x7e30, 0x7e52, 0x7e53, 0x7e55, 0x7e56, 0x7e58, 0x7e59, 0x7e5b, 0x7e5c, 0x7e5e, 0x7e5f +.2byte 0x7e46, 0x7e48, 0x7e4a, 0x7e4c, 0x7e6e, 0x7e70, 0x7e72, 0x7e94, 0x7e95, 0x7e97, 0x7e98, 0x7e9a, 0x7e9b, 0x7e9d, 0x7e9e, 0x7e9f +.2byte 0x7e66, 0x7e88, 0x7e8a, 0x7e8c, 0x7e8e, 0x7eb0, 0x7eb2, 0x7ed4, 0x7ef7, 0x7ef8, 0x7efa, 0x7efb, 0x7efc, 0x7efd, 0x7efe, 0x7eff +.2byte 0x7ea6, 0x7ec8, 0x7eca, 0x7ecc, 0x7ece, 0x7ed0, 0x7ed2, 0x7ef4, 0x7f37, 0x7f39, 0x7f3a, 0x7f3b, 0x7f3c, 0x7f3d, 0x7f3e, 0x7f3f +.2byte 0x7ee6, 0x7ee8, 0x7eea, 0x7eec, 0x7f0e, 0x7f10, 0x7f12, 0x7f14, 0x7f57, 0x7f59, 0x7f7b, 0x7f7c, 0x7f7d, 0x7f7e, 0x7f7f, 0x7f7f +.2byte 0x7f26, 0x7f28, 0x7f2a, 0x7f2c, 0x7f2e, 0x7f30, 0x7f52, 0x7f54, 0x7f77, 0x7f79, 0x7f9b, 0x7fbd, 0x7fbe, 0x7fbe, 0x7fbf, 0x7fbf +.2byte 0x7f46, 0x7f68, 0x7f4a, 0x7f6c, 0x7f6e, 0x7f70, 0x7f72, 0x7f74, 0x7f97, 0x7f99, 0x7fbb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7f86, 0x7f88, 0x7f8a, 0x7f8c, 0x7f8e, 0x7f90, 0x7fb2, 0x7fb4, 0x7fb7, 0x7fb9, 0x7fdb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fc6, 0x7fc8, 0x7fca, 0x7fcc, 0x7fce, 0x7fd0, 0x7fd2, 0x7fd4, 0x7fd7, 0x7fd9, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fe6, 0x7fe8, 0x7fea, 0x7fec, 0x7fee, 0x7ff0, 0x7ff2, 0x7ff4, 0x7ff7, 0x7ff9, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x0421, 0x0423, 0x0425, 0x0427, 0x0429, 0x042b, 0x042d, 0x0015, 0x0017, 0x0019, 0x001b, 0x001d, 0x001f, 0x043f, 0x0c7f, 0x1cff +.2byte 0x0461, 0x0463, 0x0465, 0x0467, 0x0469, 0x046b, 0x046d, 0x0055, 0x0057, 0x0059, 0x005b, 0x005d, 0x005f, 0x047f, 0x0cbf, 0x1d1f +.2byte 0x04a1, 0x04a3, 0x04a5, 0x04a7, 0x04a9, 0x04ab, 0x04ad, 0x00d5, 0x00b7, 0x00b9, 0x00bb, 0x009d, 0x009f, 0x04df, 0x0cff, 0x1d5f +.2byte 0x04e1, 0x04e3, 0x04e5, 0x04e7, 0x04e9, 0x04eb, 0x04ed, 0x0115, 0x0117, 0x0119, 0x00fb, 0x00fd, 0x00ff, 0x051f, 0x0d3f, 0x1d7f +.2byte 0x0521, 0x0523, 0x0525, 0x0527, 0x0529, 0x052b, 0x052d, 0x0195, 0x0177, 0x0179, 0x015b, 0x015d, 0x015f, 0x055f, 0x0d7f, 0x1dbf +.2byte 0x0561, 0x0563, 0x0565, 0x0567, 0x0569, 0x056b, 0x056d, 0x01f5, 0x01d7, 0x01d9, 0x01bb, 0x01bd, 0x019f, 0x059f, 0x0dbf, 0x1dff +.2byte 0x05a1, 0x05a3, 0x05a5, 0x05a7, 0x05a9, 0x05ab, 0x05ad, 0x0255, 0x0237, 0x0219, 0x021b, 0x01fd, 0x01ff, 0x05ff, 0x0dff, 0x1e1f +.2byte 0x02a0, 0x02a3, 0x02a6, 0x02a9, 0x02ac, 0x02af, 0x02b2, 0x02b5, 0x0297, 0x0279, 0x025b, 0x025d, 0x025f, 0x063f, 0x0e3f, 0x1e5f +.2byte 0x02e0, 0x02e3, 0x02e5, 0x02e9, 0x02eb, 0x02ee, 0x02f1, 0x02f4, 0x02f7, 0x02d9, 0x02bb, 0x02bd, 0x029f, 0x067f, 0x0e7f, 0x1e9f +.2byte 0x0320, 0x0322, 0x0325, 0x0328, 0x032b, 0x032e, 0x0331, 0x0334, 0x0337, 0x0339, 0x031b, 0x02fd, 0x02ff, 0x06df, 0x0ebf, 0x1ebf +.2byte 0x0360, 0x0362, 0x0365, 0x0368, 0x036b, 0x036d, 0x0370, 0x0373, 0x0376, 0x0378, 0x037b, 0x035d, 0x033f, 0x071f, 0x0eff, 0x1eff +.2byte 0x03a0, 0x03a2, 0x03a5, 0x03a8, 0x03aa, 0x03ad, 0x03b0, 0x03b2, 0x03b5, 0x03b8, 0x03bb, 0x03bd, 0x039f, 0x075f, 0x0f3f, 0x1f1f +.2byte 0x03e0, 0x03e2, 0x03e5, 0x03e7, 0x03ea, 0x03ed, 0x03ef, 0x03f2, 0x03f5, 0x03f7, 0x03fa, 0x03fd, 0x03ff, 0x07bf, 0x0f7f, 0x1f5f +.2byte 0x07e1, 0x07e4, 0x07e6, 0x07e8, 0x07eb, 0x07ed, 0x07ef, 0x07f2, 0x07f4, 0x07f6, 0x07f8, 0x07fb, 0x07fd, 0x07ff, 0x0fbf, 0x1f9f +.2byte 0x0fe3, 0x0fe6, 0x0fe8, 0x0fea, 0x0fec, 0x0fee, 0x0ff0, 0x0ff1, 0x0ff4, 0x0ff6, 0x0ff8, 0x0ffa, 0x0ffc, 0x0ffe, 0x0fff, 0x1fbf +.2byte 0x1fe7, 0x1fe8, 0x1fea, 0x1fec, 0x1fed, 0x1fef, 0x1ff1, 0x1ff2, 0x1ff4, 0x1ff6, 0x1ff7, 0x1ff9, 0x1ffb, 0x1ffc, 0x1ffe, 0x1fff +.2byte 0x0c21, 0x0c23, 0x0c25, 0x0c27, 0x0c29, 0x0c2b, 0x0c2d, 0x0c15, 0x0c17, 0x0819, 0x081b, 0x081d, 0x081f, 0x103f, 0x187f, 0x20ff +.2byte 0x0c61, 0x0c63, 0x0c65, 0x0c67, 0x0c69, 0x0c6b, 0x0852, 0x0854, 0x0857, 0x0859, 0x043b, 0x043e, 0x0c7e, 0x14be, 0x1cff, 0x253f +.2byte 0x0ca1, 0x0ca3, 0x0ca5, 0x0ca7, 0x0ca9, 0x0cab, 0x08b2, 0x08b4, 0x08b7, 0x08b9, 0x049b, 0x049e, 0x0cbe, 0x14de, 0x1d3f, 0x255f +.2byte 0x0ce1, 0x0ce3, 0x0ce5, 0x0ce7, 0x0ce9, 0x0ceb, 0x0912, 0x0914, 0x0917, 0x0919, 0x04fb, 0x04de, 0x0cfe, 0x151e, 0x1d7f, 0x259f +.2byte 0x0d21, 0x0d23, 0x0d25, 0x0d27, 0x0d29, 0x0d2b, 0x0992, 0x0974, 0x0977, 0x0959, 0x055b, 0x053e, 0x0d5e, 0x157e, 0x1d9f, 0x25bf +.2byte 0x0d61, 0x0d63, 0x0d65, 0x0d67, 0x0d69, 0x0d6b, 0x09f2, 0x09d4, 0x09d7, 0x09b9, 0x05bb, 0x059e, 0x0d9e, 0x15be, 0x1ddf, 0x25ff +.2byte 0x0da1, 0x0a42, 0x0a46, 0x0a49, 0x0a4c, 0x0a4f, 0x0a52, 0x0a34, 0x0a17, 0x0a19, 0x061b, 0x05fe, 0x0dfe, 0x15fe, 0x1e1f, 0x263f +.2byte 0x0aa0, 0x0a82, 0x0a85, 0x0a88, 0x0a8b, 0x0a8e, 0x0a91, 0x0a94, 0x0a77, 0x0a79, 0x065b, 0x065e, 0x0e3e, 0x163e, 0x1e5f, 0x265f +.2byte 0x0ae0, 0x0ae2, 0x0ae5, 0x0ae8, 0x0aeb, 0x0aee, 0x0af1, 0x0af4, 0x0af7, 0x0ad9, 0x06bb, 0x06be, 0x0e9e, 0x167e, 0x1e9f, 0x269f +.2byte 0x0b20, 0x0b22, 0x0b25, 0x0b28, 0x0b2b, 0x0b2d, 0x0b30, 0x0b33, 0x0b36, 0x0b39, 0x071b, 0x06fe, 0x0ede, 0x16be, 0x1edf, 0x26df +.2byte 0x0b60, 0x0761, 0x0764, 0x0767, 0x076a, 0x076d, 0x0770, 0x0773, 0x0776, 0x0779, 0x077b, 0x075e, 0x0f3e, 0x171e, 0x1f1f, 0x26ff +.2byte 0x0ba0, 0x07c1, 0x07c4, 0x07c7, 0x07ca, 0x07cd, 0x07cf, 0x07d2, 0x07d5, 0x07d8, 0x07db, 0x07de, 0x0f7e, 0x175e, 0x1f3f, 0x273f +.2byte 0x0be0, 0x0fc3, 0x0fc6, 0x0fc8, 0x0fcb, 0x0fcd, 0x0fd0, 0x0fd2, 0x0fd4, 0x0fd7, 0x0fd9, 0x0fdc, 0x0fde, 0x179e, 0x1f7f, 0x277f +.2byte 0x0fe1, 0x17c5, 0x17c7, 0x17c9, 0x17cb, 0x17cd, 0x17cf, 0x17d1, 0x17d4, 0x17d6, 0x17d8, 0x17da, 0x17dc, 0x17de, 0x1fbf, 0x279f +.2byte 0x17e3, 0x1fe7, 0x1fe9, 0x1feb, 0x1fed, 0x1fef, 0x1ff0, 0x1ff2, 0x1ff4, 0x1ff6, 0x1ff8, 0x1ffa, 0x1ffc, 0x1ffe, 0x1fff, 0x27df +.2byte 0x23e7, 0x27e9, 0x27eb, 0x27ec, 0x27ee, 0x27f0, 0x27f1, 0x27f3, 0x27f4, 0x27f6, 0x27f8, 0x27f9, 0x27fb, 0x27fc, 0x27fe, 0x27ff +.2byte 0x1421, 0x1423, 0x1425, 0x1427, 0x1429, 0x142b, 0x142d, 0x1815, 0x1417, 0x1419, 0x141b, 0x141d, 0x141f, 0x183f, 0x207f, 0x28ff +.2byte 0x1461, 0x1463, 0x1465, 0x1467, 0x1469, 0x146b, 0x1852, 0x1454, 0x1457, 0x1459, 0x103b, 0x103e, 0x187e, 0x1cbe, 0x24ff, 0x2d3f +.2byte 0x14a1, 0x14a3, 0x14a5, 0x14a7, 0x14a9, 0x14af, 0x14b1, 0x14b4, 0x1096, 0x1099, 0x109b, 0x14bc, 0x1cfc, 0x253d, 0x253f, 0x2d7f +.2byte 0x14e1, 0x14e3, 0x14e5, 0x14e7, 0x14e9, 0x150f, 0x1511, 0x14f4, 0x10f6, 0x10f9, 0x10fb, 0x151c, 0x1d3c, 0x257d, 0x257f, 0x2d9f +.2byte 0x1521, 0x1523, 0x1525, 0x1527, 0x1529, 0x158f, 0x1571, 0x1574, 0x1156, 0x1159, 0x115b, 0x155c, 0x1d7c, 0x259d, 0x259f, 0x2ddf +.2byte 0x1561, 0x1563, 0x15e5, 0x15e9, 0x15ec, 0x15ef, 0x15d1, 0x15d4, 0x11b6, 0x11b9, 0x119b, 0x159c, 0x1dbc, 0x25dd, 0x25ff, 0x2dff +.2byte 0x15a1, 0x1642, 0x1625, 0x1628, 0x162b, 0x162e, 0x1631, 0x1634, 0x1216, 0x1219, 0x11fb, 0x15fc, 0x1dfc, 0x261d, 0x261f, 0x2e3f +.2byte 0x1aa0, 0x1682, 0x1685, 0x1688, 0x168b, 0x168e, 0x1691, 0x1694, 0x1276, 0x1259, 0x125b, 0x165c, 0x1e3c, 0x265d, 0x265f, 0x2e5f +.2byte 0x16e0, 0x16e2, 0x12c4, 0x12c7, 0x12ca, 0x12cd, 0x12d0, 0x12d3, 0x12d6, 0x12b9, 0x12bb, 0x169c, 0x1e7c, 0x269d, 0x269f, 0x2e9f +.2byte 0x1720, 0x1722, 0x1324, 0x1327, 0x132a, 0x132d, 0x1330, 0x1333, 0x1336, 0x1339, 0x131b, 0x16dc, 0x1ebc, 0x26dd, 0x26df, 0x2edf +.2byte 0x1760, 0x1361, 0x1364, 0x1367, 0x136a, 0x136d, 0x136f, 0x1372, 0x1375, 0x1378, 0x137b, 0x173c, 0x1f1c, 0x271d, 0x26ff, 0x2eff +.2byte 0x13a0, 0x13c1, 0x1785, 0x1788, 0x178a, 0x178d, 0x178f, 0x1792, 0x1794, 0x1797, 0x1799, 0x179c, 0x1f5c, 0x273d, 0x275f, 0x2f3f +.2byte 0x13e0, 0x17c3, 0x1f87, 0x1f89, 0x1f8b, 0x1f8d, 0x1f8f, 0x1f91, 0x1f94, 0x1f96, 0x1f98, 0x1f9a, 0x1f9c, 0x277d, 0x277f, 0x2f5f +.2byte 0x1be1, 0x1bc5, 0x27a9, 0x27ab, 0x27ad, 0x27af, 0x27b0, 0x27b2, 0x27b4, 0x27b6, 0x27b8, 0x27ba, 0x27bc, 0x27bd, 0x27bf, 0x2f9f +.2byte 0x1fe3, 0x27e7, 0x27e9, 0x27eb, 0x27ed, 0x27ef, 0x27f0, 0x27f2, 0x27f4, 0x27f6, 0x27f8, 0x27fa, 0x27fc, 0x27fd, 0x27ff, 0x2fdf +.2byte 0x2be7, 0x2be9, 0x2feb, 0x2fed, 0x2fee, 0x2ff0, 0x2ff1, 0x2ff3, 0x2ff5, 0x2ff6, 0x2ff8, 0x2ff9, 0x2ffb, 0x2ffc, 0x2ffe, 0x2fff +.2byte 0x1c21, 0x1c23, 0x1c25, 0x1c27, 0x1c29, 0x1c2b, 0x1c2d, 0x2415, 0x2417, 0x2019, 0x201b, 0x201d, 0x1c1f, 0x203f, 0x287f, 0x30ff +.2byte 0x1c61, 0x1c63, 0x1c65, 0x1c67, 0x1c69, 0x1c6b, 0x2452, 0x2054, 0x2057, 0x2059, 0x1c3b, 0x1c3e, 0x207e, 0x24be, 0x2cff, 0x313f +.2byte 0x1ca1, 0x1ca3, 0x1ca5, 0x1ca7, 0x1ca9, 0x24af, 0x20b1, 0x20b4, 0x1c96, 0x1c99, 0x1c9b, 0x20bc, 0x24fc, 0x2d3d, 0x2d3f, 0x357f +.2byte 0x1ce1, 0x1ce3, 0x1ce5, 0x1ce7, 0x210c, 0x210f, 0x1cf1, 0x1cf3, 0x1cf6, 0x1cf8, 0x1cf9, 0x253a, 0x2d7c, 0x2d7d, 0x2d7f, 0x35bf +.2byte 0x1d21, 0x1d23, 0x1d25, 0x2188, 0x218c, 0x216f, 0x1d71, 0x1d53, 0x1d56, 0x1d38, 0x1d59, 0x257a, 0x2d9c, 0x2dbd, 0x2dbf, 0x35df +.2byte 0x1d61, 0x1d63, 0x21e5, 0x21e8, 0x21eb, 0x21ef, 0x1dd1, 0x1db3, 0x1db6, 0x1d98, 0x1db9, 0x25ba, 0x2ddc, 0x2ddd, 0x2dff, 0x361f +.2byte 0x1da1, 0x2242, 0x2225, 0x1e27, 0x1e2b, 0x1e2e, 0x1e31, 0x1e13, 0x1e16, 0x1df8, 0x1df9, 0x25fa, 0x2e1c, 0x2e1d, 0x2e3f, 0x365f +.2byte 0x22a0, 0x2282, 0x1e85, 0x1e67, 0x1e6a, 0x1e6d, 0x1e70, 0x1e73, 0x1e76, 0x1e58, 0x1e59, 0x263a, 0x2e5c, 0x2e5d, 0x2e5f, 0x367f +.2byte 0x22e0, 0x22e2, 0x1ec4, 0x1ec7, 0x1eca, 0x1ecd, 0x1ed0, 0x1ed3, 0x1ed6, 0x1eb8, 0x1e99, 0x269a, 0x2e9c, 0x2e9d, 0x2e9f, 0x369f +.2byte 0x2320, 0x2322, 0x1f24, 0x1f07, 0x1f0a, 0x1f0d, 0x1f0f, 0x1f12, 0x1f15, 0x1f18, 0x1ef9, 0x26da, 0x2edc, 0x2edd, 0x2edf, 0x36df +.2byte 0x1f60, 0x1f61, 0x1f64, 0x1f27, 0x1f2a, 0x1f2d, 0x1f2f, 0x1f32, 0x1f34, 0x1f37, 0x1f39, 0x271a, 0x2f1c, 0x2f1d, 0x2f1f, 0x36ff +.2byte 0x1fa0, 0x1bc1, 0x2385, 0x2749, 0x274b, 0x274d, 0x274f, 0x2751, 0x2754, 0x2756, 0x2758, 0x275a, 0x2f5c, 0x2f3d, 0x2f3f, 0x373f +.2byte 0x1fe0, 0x1fc3, 0x2787, 0x2f8b, 0x2f8d, 0x2f8f, 0x2f90, 0x2f92, 0x2f94, 0x2f96, 0x2f98, 0x2f9a, 0x2f9c, 0x2f7d, 0x2f7f, 0x377f +.2byte 0x23e1, 0x23c5, 0x2fa9, 0x2fab, 0x2fad, 0x2faf, 0x2fb0, 0x2fb2, 0x2fb4, 0x2fb6, 0x2fb8, 0x2fba, 0x2fbc, 0x2fbd, 0x2fbf, 0x379f +.2byte 0x27e3, 0x2fe7, 0x2fe9, 0x2feb, 0x2fed, 0x2fef, 0x2ff1, 0x2ff3, 0x2ff5, 0x2ff6, 0x2ff8, 0x2ffa, 0x2ffb, 0x2ffd, 0x2fff, 0x37df +.2byte 0x2fe7, 0x33e9, 0x33eb, 0x37ed, 0x37ef, 0x37f0, 0x37f2, 0x37f3, 0x37f5, 0x37f6, 0x37f8, 0x37f9, 0x37fb, 0x37fc, 0x37fe, 0x37ff +.2byte 0x2421, 0x2423, 0x2425, 0x2427, 0x2429, 0x242b, 0x242d, 0x3015, 0x2c17, 0x2c19, 0x2c1b, 0x281d, 0x281f, 0x2c3f, 0x307f, 0x34ff +.2byte 0x2461, 0x2463, 0x2465, 0x2467, 0x2469, 0x246b, 0x3052, 0x2c54, 0x2c57, 0x2c59, 0x283b, 0x283e, 0x2c7e, 0x2cbe, 0x34ff, 0x393f +.2byte 0x24a1, 0x24a3, 0x24a5, 0x24a7, 0x24a9, 0x30af, 0x2cb1, 0x2cb4, 0x2896, 0x2899, 0x289b, 0x28bc, 0x2cfc, 0x353d, 0x353f, 0x397f +.2byte 0x24e1, 0x24e3, 0x24e5, 0x3108, 0x310c, 0x2d0f, 0x2cf1, 0x28f3, 0x28f6, 0x28f8, 0x28f9, 0x2d3a, 0x357c, 0x357d, 0x357f, 0x3dbf +.2byte 0x2521, 0x2523, 0x2525, 0x3188, 0x2d6c, 0x294e, 0x2951, 0x2533, 0x2536, 0x2957, 0x2d78, 0x319a, 0x35bc, 0x35bd, 0x35bf, 0x3dff +.2byte 0x2561, 0x2563, 0x31e5, 0x2de8, 0x29ca, 0x29ce, 0x29b1, 0x25b3, 0x2596, 0x2997, 0x2db8, 0x31da, 0x35dc, 0x35fd, 0x35ff, 0x3e1f +.2byte 0x25a1, 0x3242, 0x2e25, 0x2e27, 0x2a2a, 0x2a2d, 0x2a31, 0x2613, 0x25f6, 0x29f7, 0x2df8, 0x321a, 0x361c, 0x363d, 0x363f, 0x3e5f +.2byte 0x32a0, 0x2e82, 0x2e85, 0x2a67, 0x2669, 0x266d, 0x2670, 0x2673, 0x2656, 0x2a57, 0x2e38, 0x325a, 0x365c, 0x365d, 0x365f, 0x3e7f +.2byte 0x2ee0, 0x2ee2, 0x2ac4, 0x2ac7, 0x26c9, 0x26cc, 0x26cf, 0x26d2, 0x26d6, 0x2a97, 0x2e78, 0x329a, 0x369c, 0x369d, 0x369f, 0x3ebf +.2byte 0x2f20, 0x2b22, 0x2b24, 0x2707, 0x2aea, 0x2aed, 0x2aef, 0x2af2, 0x2af4, 0x2af7, 0x2ed8, 0x32da, 0x36dc, 0x36dd, 0x36df, 0x3edf +.2byte 0x2b60, 0x2b61, 0x2b64, 0x2b27, 0x2f0b, 0x2f0d, 0x2f0f, 0x2f11, 0x2f14, 0x2f16, 0x2f18, 0x331a, 0x371c, 0x371d, 0x371f, 0x3f1f +.2byte 0x2ba0, 0x27c1, 0x2b85, 0x2f49, 0x334c, 0x334e, 0x3350, 0x3352, 0x3354, 0x3356, 0x3358, 0x335a, 0x375c, 0x375d, 0x373f, 0x3f3f +.2byte 0x2be0, 0x2bc3, 0x2f87, 0x338b, 0x378d, 0x378f, 0x3790, 0x3792, 0x3794, 0x3796, 0x3798, 0x379a, 0x379c, 0x377d, 0x377f, 0x3f7f +.2byte 0x2be1, 0x2fc5, 0x33a9, 0x37ab, 0x37ad, 0x37af, 0x37b1, 0x37b2, 0x37b4, 0x37b6, 0x37b8, 0x37ba, 0x37bc, 0x37bd, 0x37bf, 0x3f9f +.2byte 0x2fe3, 0x33e7, 0x33e9, 0x37eb, 0x37ed, 0x37ef, 0x37f1, 0x37f3, 0x37f4, 0x37f6, 0x37f8, 0x37fa, 0x37fc, 0x37fd, 0x37ff, 0x3fdf +.2byte 0x37e7, 0x37e9, 0x3beb, 0x3bed, 0x3fef, 0x3ff1, 0x3ff2, 0x3ff4, 0x3ff5, 0x3ff7, 0x3ff8, 0x3ff9, 0x3ffb, 0x3ffc, 0x3ffe, 0x3fff +.2byte 0x2c21, 0x2c23, 0x2c25, 0x2c27, 0x2c29, 0x2c2b, 0x2c2d, 0x3c15, 0x3817, 0x3819, 0x341b, 0x341d, 0x341f, 0x343f, 0x387f, 0x3cff +.2byte 0x2c61, 0x2c63, 0x2c65, 0x2c67, 0x2c69, 0x2c6b, 0x3c52, 0x3854, 0x3857, 0x3459, 0x343b, 0x343e, 0x347e, 0x34be, 0x3cff, 0x413f +.2byte 0x2ca1, 0x2ca3, 0x3ca5, 0x3ca8, 0x3cac, 0x3caf, 0x38b1, 0x38b4, 0x3496, 0x3499, 0x349b, 0x34bc, 0x34fc, 0x3d3d, 0x3d3f, 0x417f +.2byte 0x2ce1, 0x2ce3, 0x3d25, 0x3d08, 0x3d0b, 0x3d0f, 0x38f1, 0x34f3, 0x34f6, 0x34f8, 0x34f9, 0x353a, 0x3d7c, 0x3d7d, 0x3d7f, 0x41bf +.2byte 0x2d21, 0x2d23, 0x3d85, 0x3d68, 0x394a, 0x394e, 0x3551, 0x3533, 0x3136, 0x3557, 0x3578, 0x399a, 0x3dbc, 0x3dbd, 0x3dbf, 0x45ff +.2byte 0x2d61, 0x2d63, 0x3de5, 0x3de8, 0x39ca, 0x35ae, 0x3190, 0x3193, 0x3195, 0x35b6, 0x39d8, 0x39da, 0x3dfc, 0x3dfd, 0x421f, 0x463f +.2byte 0x2da1, 0x3e42, 0x3a25, 0x3a27, 0x362a, 0x320c, 0x3210, 0x31f3, 0x31f5, 0x35f6, 0x3a18, 0x3a1a, 0x3e1c, 0x3e3d, 0x423f, 0x465f +.2byte 0x3ea0, 0x3a82, 0x3a85, 0x3667, 0x3669, 0x326c, 0x326f, 0x3273, 0x3255, 0x3636, 0x3a58, 0x3a5a, 0x3e5c, 0x3e7d, 0x427f, 0x469f +.2byte 0x3ae0, 0x3ae2, 0x36c4, 0x36c7, 0x32c9, 0x32ac, 0x32af, 0x32b2, 0x32b5, 0x3696, 0x3a98, 0x3a9a, 0x3e9c, 0x3e9d, 0x429f, 0x46bf +.2byte 0x3b20, 0x3722, 0x3724, 0x3307, 0x32ea, 0x36cd, 0x36cf, 0x36d1, 0x36d4, 0x36d6, 0x3ad8, 0x3ada, 0x3edc, 0x3edd, 0x42df, 0x46ff +.2byte 0x3760, 0x3761, 0x3364, 0x3727, 0x370b, 0x3b0e, 0x3b10, 0x3b12, 0x3b14, 0x3b16, 0x3b18, 0x3b1a, 0x3f1c, 0x3f1d, 0x431f, 0x471f +.2byte 0x37a0, 0x33c1, 0x3385, 0x3749, 0x3b4c, 0x3b4e, 0x3b50, 0x3b52, 0x3b54, 0x3b56, 0x3b58, 0x3b5a, 0x3f5c, 0x3f5d, 0x435f, 0x473f +.2byte 0x33e0, 0x33c3, 0x3787, 0x3b8b, 0x3b8d, 0x3f8f, 0x3f91, 0x3f93, 0x3f94, 0x3f96, 0x3f98, 0x3f9a, 0x3f9c, 0x3f7d, 0x437f, 0x477f +.2byte 0x33e1, 0x37c5, 0x3ba9, 0x3bab, 0x3fad, 0x3faf, 0x3fb1, 0x3fb3, 0x3fb5, 0x3fb6, 0x3fb8, 0x3fba, 0x3fbc, 0x3fbd, 0x43bf, 0x479f +.2byte 0x37e3, 0x3be7, 0x3fe9, 0x3feb, 0x3fed, 0x43f0, 0x43f1, 0x43f3, 0x43f5, 0x43f6, 0x43f8, 0x43fa, 0x43fc, 0x43fd, 0x43ff, 0x47df +.2byte 0x3fe7, 0x3fe9, 0x3feb, 0x43ed, 0x43ef, 0x47f1, 0x47f3, 0x47f4, 0x47f5, 0x47f7, 0x47f8, 0x47fa, 0x47fb, 0x47fd, 0x47fe, 0x47ff +.2byte 0x3421, 0x3423, 0x3425, 0x3427, 0x3429, 0x342b, 0x342d, 0x4815, 0x4417, 0x4419, 0x401b, 0x401d, 0x3c1f, 0x3c3f, 0x407f, 0x44ff +.2byte 0x3461, 0x4842, 0x4845, 0x4848, 0x484c, 0x484f, 0x4852, 0x4454, 0x4457, 0x4059, 0x403b, 0x3c3e, 0x407e, 0x3cbe, 0x40ff, 0x453f +.2byte 0x34a1, 0x48c2, 0x44a5, 0x44a8, 0x44ab, 0x44ae, 0x44b1, 0x44b4, 0x4096, 0x4099, 0x3c9b, 0x3cbc, 0x3cfc, 0x413d, 0x413f, 0x457f +.2byte 0x34e1, 0x4922, 0x4505, 0x44e7, 0x44eb, 0x44ee, 0x44f1, 0x40f3, 0x40f6, 0x3cf8, 0x3cf9, 0x3d3a, 0x417c, 0x417d, 0x457f, 0x49bf +.2byte 0x3521, 0x4982, 0x4565, 0x4567, 0x454a, 0x454d, 0x4551, 0x4133, 0x3d36, 0x3d57, 0x3d78, 0x419a, 0x41bc, 0x45bd, 0x45bf, 0x49ff +.2byte 0x3561, 0x49e2, 0x45c5, 0x45c7, 0x45aa, 0x418c, 0x4190, 0x3d93, 0x3d95, 0x3db6, 0x41d8, 0x41da, 0x45fc, 0x45fd, 0x461f, 0x4e3f +.2byte 0x35a1, 0x4a42, 0x4625, 0x4627, 0x462a, 0x420c, 0x39d0, 0x39d2, 0x3df4, 0x4216, 0x4218, 0x421a, 0x463c, 0x463d, 0x4a5f, 0x4e7f +.2byte 0x4aa0, 0x4682, 0x4685, 0x4267, 0x4269, 0x3e6c, 0x3a4e, 0x3a52, 0x3e34, 0x4256, 0x4258, 0x425a, 0x465c, 0x467d, 0x4a7f, 0x4e9f +.2byte 0x46e0, 0x42e2, 0x42c4, 0x42c7, 0x3ec9, 0x3eac, 0x3e8f, 0x3e91, 0x3e94, 0x4296, 0x4298, 0x429a, 0x469c, 0x46bd, 0x4abf, 0x4edf +.2byte 0x4320, 0x4322, 0x4324, 0x3f07, 0x3eea, 0x3ecd, 0x42d0, 0x42d2, 0x42d4, 0x42d6, 0x42d8, 0x42da, 0x46dc, 0x46dd, 0x4aff, 0x4eff +.2byte 0x4360, 0x4361, 0x3f64, 0x3f27, 0x3f0b, 0x430e, 0x4310, 0x4312, 0x4314, 0x4316, 0x4318, 0x431a, 0x471c, 0x471d, 0x4b1f, 0x4f3f +.2byte 0x3fa0, 0x3fc1, 0x3f85, 0x3f49, 0x434c, 0x434e, 0x4350, 0x4352, 0x4354, 0x4356, 0x4358, 0x435a, 0x475c, 0x475d, 0x4b5f, 0x4f5f +.2byte 0x3fe0, 0x3fc3, 0x3f87, 0x438b, 0x438d, 0x438f, 0x4791, 0x4793, 0x4794, 0x4796, 0x4798, 0x479a, 0x479c, 0x477d, 0x4b9f, 0x4f7f +.2byte 0x3fe1, 0x3fc5, 0x43a9, 0x43ab, 0x47ad, 0x47af, 0x47b1, 0x47b3, 0x47b5, 0x47b6, 0x47b8, 0x47ba, 0x47bc, 0x47bd, 0x4bbf, 0x4fbf +.2byte 0x3fe3, 0x43e7, 0x43e9, 0x47eb, 0x47ed, 0x47f0, 0x4bf2, 0x4bf3, 0x4bf5, 0x4bf7, 0x4bf8, 0x4bfa, 0x4bfc, 0x4bfd, 0x4bff, 0x4fdf +.2byte 0x43e7, 0x47e9, 0x47eb, 0x4bed, 0x4bef, 0x4bf1, 0x4ff3, 0x4ff5, 0x4ff6, 0x4ff7, 0x4ff9, 0x4ffa, 0x4ffb, 0x4ffd, 0x4ffe, 0x4fff +.2byte 0x5400, 0x5402, 0x5406, 0x5408, 0x540c, 0x540f, 0x5412, 0x5415, 0x5017, 0x5019, 0x4c1b, 0x481d, 0x481f, 0x483f, 0x447f, 0x48ff +.2byte 0x5460, 0x5042, 0x5045, 0x5048, 0x504b, 0x504e, 0x5051, 0x5054, 0x5057, 0x4c59, 0x4c3b, 0x483e, 0x487e, 0x44be, 0x48ff, 0x4d3f +.2byte 0x54c0, 0x50a2, 0x50a5, 0x50a7, 0x50ab, 0x50ae, 0x50b1, 0x50b4, 0x4c96, 0x4c99, 0x489b, 0x48bc, 0x44fc, 0x493d, 0x493f, 0x4d7f +.2byte 0x5520, 0x5102, 0x5105, 0x4ce7, 0x4cea, 0x4ced, 0x4cf0, 0x4cf3, 0x4cf6, 0x48f8, 0x48f9, 0x453a, 0x497c, 0x497d, 0x4d7f, 0x4dbf +.2byte 0x5580, 0x5162, 0x5165, 0x4d47, 0x4d29, 0x4d2d, 0x4d30, 0x4d33, 0x4936, 0x4957, 0x4578, 0x499a, 0x49bc, 0x49bd, 0x4dbf, 0x51ff +.2byte 0x55e0, 0x51c2, 0x51c5, 0x4da7, 0x4da9, 0x4d8c, 0x4d8f, 0x4d93, 0x4995, 0x45b6, 0x49d8, 0x49da, 0x4dfc, 0x4dfd, 0x4e1f, 0x523f +.2byte 0x5640, 0x5222, 0x5225, 0x4e07, 0x4e09, 0x4dec, 0x49ce, 0x49d2, 0x45f4, 0x4a16, 0x4a18, 0x4a1a, 0x4e3c, 0x4e3d, 0x4e5f, 0x567f +.2byte 0x56a0, 0x5282, 0x5285, 0x4e67, 0x4e69, 0x4e6c, 0x4a4e, 0x4632, 0x4a55, 0x4a56, 0x4a58, 0x4a5a, 0x4e7c, 0x4e7d, 0x529f, 0x56bf +.2byte 0x52e0, 0x4ee2, 0x4ec4, 0x4ec7, 0x4ac9, 0x4aac, 0x468f, 0x4ab2, 0x4ab5, 0x4a96, 0x4a98, 0x4a9a, 0x4e9c, 0x4ebd, 0x52bf, 0x56df +.2byte 0x4f20, 0x4f22, 0x4b24, 0x4b07, 0x4aea, 0x46cd, 0x4ad0, 0x4ad2, 0x4ad4, 0x4ad6, 0x4ad8, 0x4ada, 0x4edc, 0x4edd, 0x52ff, 0x571f +.2byte 0x4b60, 0x4b61, 0x4b64, 0x4b27, 0x470b, 0x4b0e, 0x4b10, 0x4b12, 0x4b14, 0x4b16, 0x4b18, 0x4b1a, 0x4f1c, 0x4f1d, 0x531f, 0x573f +.2byte 0x4ba0, 0x4bc1, 0x4b85, 0x4749, 0x4b4c, 0x4b4e, 0x4b50, 0x4b52, 0x4b54, 0x4b56, 0x4b58, 0x4b5a, 0x4f5c, 0x4f5d, 0x535f, 0x575f +.2byte 0x4be0, 0x47c3, 0x4787, 0x4b8b, 0x4b8d, 0x4b8f, 0x4b91, 0x4f93, 0x4f95, 0x4f96, 0x4f98, 0x4f9a, 0x4f9c, 0x4f7d, 0x539f, 0x579f +.2byte 0x47e1, 0x47c5, 0x4ba9, 0x4bab, 0x4bad, 0x4faf, 0x4fb1, 0x4fb3, 0x4fb5, 0x4fb7, 0x4fb8, 0x4fba, 0x4fbc, 0x4fbd, 0x53bf, 0x57bf +.2byte 0x47e3, 0x4be7, 0x4be9, 0x4beb, 0x4bed, 0x4ff0, 0x4ff2, 0x53f4, 0x53f5, 0x53f7, 0x53f9, 0x53fa, 0x53fc, 0x53fd, 0x53ff, 0x57df +.2byte 0x4be7, 0x4be9, 0x4beb, 0x4fed, 0x4fef, 0x53f1, 0x53f3, 0x57f5, 0x57f7, 0x57f8, 0x57f9, 0x57fa, 0x57fc, 0x57fd, 0x57fe, 0x57ff +.2byte 0x5c00, 0x5c02, 0x5c05, 0x5c08, 0x5c0b, 0x5c0e, 0x5c11, 0x5c14, 0x5c17, 0x5c19, 0x581b, 0x541d, 0x541f, 0x503f, 0x507f, 0x50ff +.2byte 0x5c60, 0x5c42, 0x5c45, 0x5c48, 0x5c4b, 0x5c4e, 0x5c50, 0x5c53, 0x5c57, 0x5859, 0x583b, 0x543e, 0x507e, 0x50be, 0x50ff, 0x513f +.2byte 0x5ca0, 0x5ca2, 0x5884, 0x5887, 0x588a, 0x588d, 0x5890, 0x5893, 0x5896, 0x5899, 0x549b, 0x50bc, 0x50fc, 0x513d, 0x513f, 0x557f +.2byte 0x5d20, 0x5d02, 0x58e4, 0x58e7, 0x58ea, 0x58ed, 0x58f0, 0x58f3, 0x58f6, 0x54f8, 0x50f9, 0x513a, 0x517c, 0x517d, 0x557f, 0x55bf +.2byte 0x5d60, 0x5d62, 0x5944, 0x5947, 0x5929, 0x592c, 0x592f, 0x5932, 0x5936, 0x5157, 0x5178, 0x519a, 0x51bc, 0x51bd, 0x51bf, 0x55ff +.2byte 0x5dc0, 0x5dc2, 0x59a4, 0x59a7, 0x5989, 0x558c, 0x558f, 0x5592, 0x5595, 0x51b6, 0x51d8, 0x51da, 0x51fc, 0x55fd, 0x561f, 0x563f +.2byte 0x5e20, 0x5e22, 0x5a04, 0x5a07, 0x59e9, 0x55ec, 0x51ef, 0x51f1, 0x51f4, 0x5216, 0x5218, 0x521a, 0x523c, 0x563d, 0x565f, 0x5a7f +.2byte 0x5e80, 0x5e82, 0x5a64, 0x5a67, 0x5a49, 0x564c, 0x522f, 0x5652, 0x5655, 0x5256, 0x5258, 0x525a, 0x567c, 0x567d, 0x569f, 0x5ebf +.2byte 0x5ee0, 0x5ee2, 0x5ac4, 0x5ac7, 0x5ac9, 0x56ac, 0x528f, 0x56b2, 0x5295, 0x5297, 0x5298, 0x529a, 0x56bc, 0x56bd, 0x5adf, 0x673f +.2byte 0x5b20, 0x5b22, 0x5724, 0x5707, 0x52ea, 0x52cd, 0x52d0, 0x52d2, 0x52f4, 0x52f7, 0x52d8, 0x52da, 0x56fc, 0x56fd, 0x5aff, 0x673f +.2byte 0x5760, 0x5761, 0x5764, 0x5327, 0x4f0b, 0x530e, 0x5310, 0x5312, 0x5314, 0x5316, 0x5318, 0x531a, 0x571c, 0x571d, 0x5b3f, 0x677f +.2byte 0x57a0, 0x57c1, 0x5385, 0x5349, 0x534c, 0x534e, 0x5350, 0x5352, 0x5354, 0x5356, 0x5358, 0x535a, 0x575c, 0x575d, 0x5b5f, 0x677f +.2byte 0x53e0, 0x53c3, 0x4f87, 0x538b, 0x538d, 0x538f, 0x5391, 0x5393, 0x5795, 0x5797, 0x5798, 0x579a, 0x579c, 0x579d, 0x5b9f, 0x679f +.2byte 0x4fe1, 0x4fc5, 0x53a9, 0x53ab, 0x53ad, 0x53af, 0x57b1, 0x57b3, 0x57b5, 0x57b7, 0x57b9, 0x57ba, 0x57bc, 0x57bd, 0x5bbf, 0x67bf +.2byte 0x4fe3, 0x53e7, 0x53e9, 0x53eb, 0x53ed, 0x53f0, 0x57f2, 0x57f4, 0x5bf6, 0x5bf7, 0x5bf9, 0x5bfa, 0x5bfc, 0x5bfd, 0x5bff, 0x67df +.2byte 0x53e7, 0x53e9, 0x53eb, 0x53ed, 0x57ef, 0x57f1, 0x5bf3, 0x5bf5, 0x67f9, 0x67fa, 0x67fb, 0x67fc, 0x67fd, 0x67fe, 0x67ff, 0x67ff +.2byte 0x6400, 0x6402, 0x6405, 0x6408, 0x640b, 0x640e, 0x6410, 0x6413, 0x6416, 0x6419, 0x601b, 0x601d, 0x5c1f, 0x583f, 0x587f, 0x58ff +.2byte 0x6440, 0x6442, 0x6445, 0x6448, 0x644a, 0x644d, 0x6450, 0x6453, 0x6456, 0x6459, 0x643b, 0x603e, 0x5c7e, 0x58be, 0x58ff, 0x593f +.2byte 0x64a0, 0x64a2, 0x6484, 0x6487, 0x648a, 0x648d, 0x6490, 0x6492, 0x6495, 0x6499, 0x609b, 0x5cbc, 0x58fc, 0x593d, 0x593f, 0x597f +.2byte 0x6500, 0x6502, 0x64e4, 0x60e7, 0x60e9, 0x60ec, 0x60ef, 0x60f2, 0x60f5, 0x60f8, 0x5cf9, 0x593a, 0x597c, 0x597d, 0x597f, 0x59bf +.2byte 0x6560, 0x6562, 0x6544, 0x6147, 0x5d4a, 0x5d4c, 0x5d4f, 0x5d52, 0x5d54, 0x5d57, 0x5978, 0x599a, 0x59bc, 0x59bd, 0x59bf, 0x5dff +.2byte 0x65c0, 0x65a2, 0x65a4, 0x61a7, 0x5daa, 0x59ad, 0x59af, 0x59b1, 0x59b4, 0x59b6, 0x59d8, 0x59da, 0x59fc, 0x59fd, 0x5a1f, 0x5e3f +.2byte 0x6620, 0x6602, 0x6604, 0x61e7, 0x5dea, 0x59ed, 0x5a10, 0x5a12, 0x5a14, 0x5a16, 0x5a18, 0x5a1a, 0x5a3c, 0x5a3d, 0x5e5f, 0x5e7f +.2byte 0x6680, 0x6662, 0x6664, 0x6247, 0x5e4a, 0x5a2d, 0x5a50, 0x5a52, 0x5a54, 0x5a56, 0x5a58, 0x5a5a, 0x5a7c, 0x5e7d, 0x5e9f, 0x62bf +.2byte 0x66e0, 0x66c2, 0x66c4, 0x62a7, 0x5e8a, 0x5a8d, 0x5a90, 0x5a92, 0x5e94, 0x5e97, 0x5a98, 0x5a9a, 0x5ebc, 0x5ebd, 0x5edf, 0x6b3f +.2byte 0x6720, 0x6722, 0x6724, 0x6307, 0x5eea, 0x5acd, 0x5ad0, 0x5ad2, 0x5ef4, 0x5ad7, 0x5ad8, 0x5ada, 0x5efc, 0x5efd, 0x673f, 0x6f7f +.2byte 0x6360, 0x6361, 0x6364, 0x5f27, 0x5b0b, 0x5b0e, 0x5b10, 0x5b12, 0x5b14, 0x5b16, 0x5b18, 0x5b1a, 0x5f1c, 0x5f3d, 0x675f, 0x6f7f +.2byte 0x5fa0, 0x5fc1, 0x5b85, 0x5b49, 0x5b4c, 0x5b4e, 0x5b50, 0x5b52, 0x5b54, 0x5b56, 0x5b58, 0x5b5a, 0x5f5c, 0x5f5d, 0x677f, 0x6f9f +.2byte 0x5fe0, 0x5bc3, 0x5787, 0x5b8b, 0x5b8d, 0x5b8f, 0x5b91, 0x5b93, 0x5f95, 0x5f97, 0x5f98, 0x5f9a, 0x5f9c, 0x5f9d, 0x679f, 0x6fbf +.2byte 0x5be1, 0x57c5, 0x5ba9, 0x5bab, 0x5bad, 0x5baf, 0x5bb1, 0x5bb3, 0x5fb5, 0x5fb7, 0x5fb9, 0x5fba, 0x5fbc, 0x5fbd, 0x67df, 0x6fdf +.2byte 0x57e3, 0x5be7, 0x5be9, 0x5beb, 0x5bed, 0x5bf0, 0x5ff2, 0x5ff4, 0x5ff6, 0x67f9, 0x67fa, 0x67fb, 0x67fd, 0x67fe, 0x67ff, 0x6fff +.2byte 0x57e7, 0x5be9, 0x5beb, 0x5bed, 0x5bef, 0x5ff1, 0x5ff3, 0x63f5, 0x67f9, 0x6ffb, 0x6ffb, 0x6ffc, 0x6ffd, 0x6ffe, 0x6fff, 0x6fff +.2byte 0x6c00, 0x6c02, 0x6c05, 0x6c07, 0x6c0a, 0x6c0d, 0x6c10, 0x6c12, 0x6c15, 0x6c18, 0x6c1b, 0x6c1d, 0x681f, 0x603f, 0x607f, 0x5cff +.2byte 0x6c40, 0x6c21, 0x6c24, 0x6c27, 0x6c2a, 0x6c2d, 0x6c30, 0x6c32, 0x6c35, 0x6c38, 0x6c3b, 0x6c3e, 0x647e, 0x60be, 0x60ff, 0x613f +.2byte 0x6ca0, 0x6c81, 0x6c84, 0x6c87, 0x6c8a, 0x6c8c, 0x6c8f, 0x6c92, 0x6c95, 0x6c98, 0x6c9b, 0x64bc, 0x60fc, 0x613d, 0x613f, 0x617f +.2byte 0x6d00, 0x6ce1, 0x6ce4, 0x64e7, 0x64ea, 0x64ed, 0x64ef, 0x64f2, 0x64f4, 0x64f7, 0x64f9, 0x613a, 0x617c, 0x617d, 0x617f, 0x61bf +.2byte 0x6d60, 0x6d41, 0x6d44, 0x6547, 0x616b, 0x616d, 0x616f, 0x6171, 0x6173, 0x6176, 0x6178, 0x619a, 0x61bc, 0x61bd, 0x61bf, 0x61ff +.2byte 0x6da0, 0x6da1, 0x6da4, 0x65a7, 0x61ab, 0x61ce, 0x61d0, 0x61d2, 0x61d4, 0x61d6, 0x61d8, 0x61da, 0x61fc, 0x61fd, 0x621f, 0x623f +.2byte 0x6e00, 0x6e01, 0x6de4, 0x65e7, 0x61eb, 0x620e, 0x6210, 0x6212, 0x6214, 0x6216, 0x6218, 0x621a, 0x623c, 0x623d, 0x625f, 0x667f +.2byte 0x6e60, 0x6e61, 0x6e44, 0x6647, 0x622b, 0x624e, 0x6250, 0x6252, 0x6254, 0x6256, 0x6258, 0x625a, 0x627c, 0x627d, 0x669f, 0x66bf +.2byte 0x6ec0, 0x6ec1, 0x6ea4, 0x6687, 0x628b, 0x628e, 0x6290, 0x6292, 0x6294, 0x6296, 0x6298, 0x629a, 0x62bc, 0x66bd, 0x66df, 0x6f3f +.2byte 0x6f00, 0x6f21, 0x6f04, 0x66e7, 0x62cb, 0x62ce, 0x62d0, 0x62d2, 0x62d4, 0x62d6, 0x62d8, 0x62da, 0x62fc, 0x66fd, 0x6b3f, 0x6f7f +.2byte 0x6f60, 0x6f61, 0x6f64, 0x6727, 0x630b, 0x630e, 0x6310, 0x6312, 0x6314, 0x6316, 0x6319, 0x631a, 0x673c, 0x6b5e, 0x6f7f, 0x77bf +.2byte 0x6ba0, 0x6bc1, 0x6785, 0x6349, 0x634c, 0x634e, 0x6350, 0x6352, 0x6354, 0x6356, 0x6358, 0x635a, 0x675c, 0x6b7e, 0x6f9f, 0x77bf +.2byte 0x67e0, 0x67c3, 0x6387, 0x638b, 0x638d, 0x638f, 0x6391, 0x6393, 0x6395, 0x6397, 0x6799, 0x679a, 0x679c, 0x6bbe, 0x6fbf, 0x77df +.2byte 0x63e1, 0x63c5, 0x63a9, 0x63ab, 0x63ad, 0x63af, 0x63b1, 0x63b3, 0x63b5, 0x67b7, 0x6bda, 0x6bdb, 0x6bdd, 0x6bde, 0x6fdf, 0x77df +.2byte 0x5fe3, 0x63e7, 0x5fe9, 0x63eb, 0x63ed, 0x63f0, 0x63f2, 0x63f4, 0x67f6, 0x6bf9, 0x6ffb, 0x6ffc, 0x6ffd, 0x6ffe, 0x6fff, 0x77ff +.2byte 0x5fe7, 0x5fe9, 0x5feb, 0x5fed, 0x63ef, 0x63f1, 0x67f3, 0x67f5, 0x6ff9, 0x6ffb, 0x77fd, 0x77fd, 0x77fe, 0x77fe, 0x77ff, 0x77ff +.2byte 0x7400, 0x7402, 0x7404, 0x7407, 0x740a, 0x740d, 0x740f, 0x7412, 0x7415, 0x7417, 0x741a, 0x741d, 0x741f, 0x6c3f, 0x687f, 0x64ff +.2byte 0x7440, 0x7821, 0x7824, 0x7826, 0x7829, 0x782c, 0x782f, 0x7832, 0x7835, 0x7837, 0x783a, 0x783e, 0x707e, 0x68be, 0x68ff, 0x653f +.2byte 0x74a0, 0x7881, 0x70a5, 0x70a8, 0x70aa, 0x70ac, 0x70af, 0x70b2, 0x70b4, 0x70b6, 0x70b9, 0x70bc, 0x68fc, 0x693d, 0x693f, 0x657f +.2byte 0x7500, 0x78e1, 0x7105, 0x6929, 0x692b, 0x692d, 0x692f, 0x6931, 0x6934, 0x6936, 0x6938, 0x693a, 0x697c, 0x697d, 0x697f, 0x65bf +.2byte 0x7540, 0x7941, 0x7145, 0x6969, 0x698c, 0x698e, 0x6990, 0x6992, 0x6994, 0x6996, 0x6998, 0x699a, 0x69bc, 0x69bd, 0x69bf, 0x65ff +.2byte 0x75a0, 0x79a1, 0x71a5, 0x69a9, 0x69cc, 0x69ce, 0x69d0, 0x69d2, 0x69d4, 0x69d6, 0x69d8, 0x69da, 0x69fc, 0x69fd, 0x6a1f, 0x6a3f +.2byte 0x7600, 0x79e1, 0x71e5, 0x69e9, 0x6a0c, 0x6a0e, 0x6a10, 0x6a12, 0x6a14, 0x6a16, 0x6a18, 0x6a1a, 0x6a3c, 0x6a3d, 0x6a5f, 0x6a7f +.2byte 0x7640, 0x7a41, 0x7245, 0x6a29, 0x6a4c, 0x6a4e, 0x6a50, 0x6a52, 0x6a54, 0x6a56, 0x6a58, 0x6a5a, 0x6a7c, 0x6a7d, 0x6a9f, 0x6abf +.2byte 0x76a0, 0x7aa1, 0x7285, 0x6a89, 0x6a8c, 0x6a8e, 0x6a90, 0x6a92, 0x6a94, 0x6a96, 0x6a98, 0x6a9a, 0x6abc, 0x6abd, 0x6adf, 0x733f +.2byte 0x7700, 0x7b01, 0x72e5, 0x6ac9, 0x6acc, 0x6ace, 0x6ad0, 0x6ad2, 0x6ad4, 0x6ad6, 0x6ad8, 0x6ada, 0x6afc, 0x6afd, 0x6f3f, 0x737f +.2byte 0x7760, 0x7b61, 0x7325, 0x6b09, 0x6b0c, 0x6b0e, 0x6b10, 0x6b12, 0x6b14, 0x6b16, 0x6b18, 0x6b1a, 0x6b3c, 0x6f5e, 0x737f, 0x77bf +.2byte 0x77a0, 0x7bc1, 0x7385, 0x6b49, 0x6b4c, 0x6b4e, 0x6b50, 0x6b52, 0x6b54, 0x6b56, 0x6b58, 0x6b5b, 0x6f7d, 0x739e, 0x77bf, 0x7fff +.2byte 0x73e0, 0x6fc3, 0x6b87, 0x6b8b, 0x6b8d, 0x6b8f, 0x6b91, 0x6b93, 0x6b95, 0x6b97, 0x6b99, 0x6fbb, 0x6fbd, 0x73be, 0x77df, 0x7fff +.2byte 0x6be1, 0x6bc5, 0x67a9, 0x67ab, 0x6bad, 0x6baf, 0x6bb1, 0x6bb3, 0x6bb5, 0x6bb7, 0x6fda, 0x73dc, 0x73dd, 0x73de, 0x77df, 0x7fff +.2byte 0x67e3, 0x67e7, 0x6be9, 0x67eb, 0x67ed, 0x6bf0, 0x6bf2, 0x6bf4, 0x6bf6, 0x6ff9, 0x73fb, 0x77fd, 0x77fe, 0x77fe, 0x77ff, 0x7fff +.2byte 0x63e7, 0x67e9, 0x67eb, 0x67ed, 0x67ef, 0x67f1, 0x6bf3, 0x6bf5, 0x6ff9, 0x73fb, 0x77fd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7c00, 0x7c02, 0x7c04, 0x7c07, 0x7c0a, 0x7c0c, 0x7c0f, 0x7c12, 0x7c14, 0x7c17, 0x7c19, 0x7c1c, 0x7c1f, 0x743f, 0x707f, 0x6cff +.2byte 0x7c40, 0x7863, 0x7865, 0x7867, 0x786a, 0x786c, 0x786f, 0x7871, 0x7874, 0x7876, 0x7879, 0x787b, 0x787e, 0x70be, 0x70ff, 0x6d3f +.2byte 0x7ca0, 0x78c3, 0x70e7, 0x70e9, 0x70eb, 0x70ed, 0x70ef, 0x70f1, 0x70f3, 0x70f5, 0x70f8, 0x70fa, 0x70fc, 0x713d, 0x713f, 0x6d7f +.2byte 0x7ce0, 0x7903, 0x7127, 0x716b, 0x716c, 0x716e, 0x7170, 0x7172, 0x7174, 0x7176, 0x7178, 0x717a, 0x717c, 0x717d, 0x6d7f, 0x6dbf +.2byte 0x7d40, 0x7963, 0x7167, 0x71ab, 0x71ad, 0x71ae, 0x71b0, 0x71b2, 0x71b4, 0x71b6, 0x71b8, 0x71ba, 0x71bc, 0x71bd, 0x71bf, 0x6dff +.2byte 0x7da0, 0x79a3, 0x71a7, 0x71eb, 0x71ed, 0x71ef, 0x71f0, 0x71f2, 0x71f4, 0x71f6, 0x71f8, 0x71fa, 0x71fc, 0x71fd, 0x721f, 0x6e3f +.2byte 0x7de0, 0x7a03, 0x71e7, 0x720b, 0x720d, 0x722f, 0x7231, 0x7232, 0x7234, 0x7236, 0x7238, 0x723a, 0x723c, 0x723d, 0x725f, 0x6e7f +.2byte 0x7e40, 0x7a43, 0x7227, 0x724b, 0x724d, 0x726f, 0x7271, 0x7273, 0x7274, 0x7276, 0x7278, 0x727a, 0x727c, 0x727d, 0x729f, 0x72bf +.2byte 0x7ea0, 0x7a83, 0x7287, 0x728b, 0x728d, 0x728f, 0x7291, 0x72b3, 0x72b5, 0x72b7, 0x72b8, 0x72ba, 0x72bc, 0x72bd, 0x72df, 0x773f +.2byte 0x7ee0, 0x7ae3, 0x72c7, 0x72cb, 0x72cd, 0x72cf, 0x72d1, 0x72d3, 0x72f5, 0x72f7, 0x72f8, 0x72fa, 0x72fc, 0x72fd, 0x773f, 0x777f +.2byte 0x7f40, 0x7b23, 0x7307, 0x730b, 0x730d, 0x730f, 0x7311, 0x7313, 0x7315, 0x7317, 0x7339, 0x733a, 0x733c, 0x775e, 0x777f, 0x7bbf +.2byte 0x7fa0, 0x7b83, 0x7347, 0x734b, 0x734d, 0x734f, 0x7351, 0x7353, 0x7355, 0x7357, 0x7359, 0x777b, 0x777d, 0x779e, 0x7bbf, 0x7fff +.2byte 0x7fe0, 0x7bc3, 0x7387, 0x738b, 0x738d, 0x738f, 0x7391, 0x7393, 0x7395, 0x7397, 0x7399, 0x77bb, 0x77bd, 0x7bde, 0x7fff, 0x7fff +.2byte 0x77e1, 0x73c5, 0x6fa9, 0x6fab, 0x6fad, 0x6faf, 0x6fb1, 0x6fb3, 0x73b5, 0x73b7, 0x77da, 0x77dc, 0x7bde, 0x7bde, 0x7fff, 0x7fff +.2byte 0x6fe3, 0x6fe7, 0x6fe9, 0x6feb, 0x6fed, 0x6ff0, 0x73f2, 0x73f4, 0x73f6, 0x73f9, 0x77fb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x6be7, 0x6fe9, 0x6beb, 0x6fed, 0x6fef, 0x6ff1, 0x6ff3, 0x73f5, 0x73f9, 0x77fb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7c21, 0x7c23, 0x7c26, 0x7c28, 0x7c2a, 0x7c2c, 0x7c2f, 0x7c31, 0x7c33, 0x7c36, 0x7c38, 0x7c3a, 0x7c3d, 0x7c3f, 0x787f, 0x70ff +.2byte 0x7c81, 0x78a5, 0x78a6, 0x78a8, 0x78ab, 0x78ad, 0x78af, 0x78b1, 0x78b3, 0x78b5, 0x78b8, 0x78ba, 0x78bc, 0x78be, 0x78ff, 0x713f +.2byte 0x7cc1, 0x78e5, 0x7529, 0x752b, 0x752c, 0x752e, 0x7530, 0x7532, 0x7534, 0x7536, 0x7538, 0x7539, 0x753b, 0x753d, 0x753f, 0x717f +.2byte 0x7d01, 0x7925, 0x7569, 0x756b, 0x756d, 0x756e, 0x7570, 0x7572, 0x7574, 0x7576, 0x7578, 0x7579, 0x757b, 0x757d, 0x757f, 0x71bf +.2byte 0x7d61, 0x7965, 0x75a9, 0x75ab, 0x75ad, 0x75af, 0x75b1, 0x75b2, 0x75b4, 0x75b6, 0x75b8, 0x75ba, 0x75bb, 0x75bd, 0x75bf, 0x71ff +.2byte 0x7da1, 0x79a5, 0x75e9, 0x75eb, 0x75ed, 0x75ef, 0x75f1, 0x75f3, 0x75f4, 0x75f6, 0x75f8, 0x75fa, 0x75fb, 0x75fd, 0x761f, 0x763f +.2byte 0x7de1, 0x79e5, 0x7609, 0x760b, 0x762d, 0x762f, 0x7631, 0x7633, 0x7635, 0x7636, 0x7638, 0x763a, 0x763b, 0x763d, 0x765f, 0x767f +.2byte 0x7e41, 0x7a25, 0x7649, 0x764b, 0x764d, 0x766f, 0x7671, 0x7673, 0x7675, 0x7676, 0x7678, 0x767a, 0x767b, 0x767d, 0x769f, 0x76bf +.2byte 0x7e81, 0x7a85, 0x7689, 0x768b, 0x768d, 0x76af, 0x76b1, 0x76b3, 0x76b5, 0x76b7, 0x76b8, 0x76ba, 0x76bc, 0x76bd, 0x76df, 0x7b3f +.2byte 0x7ec1, 0x7ac5, 0x76c9, 0x76cb, 0x76cd, 0x76cf, 0x76d1, 0x76f3, 0x76f5, 0x76f7, 0x76f9, 0x76fa, 0x76fc, 0x76fd, 0x7b3f, 0x7b7f +.2byte 0x7f01, 0x7b05, 0x7709, 0x770b, 0x770d, 0x770f, 0x7711, 0x7713, 0x7735, 0x7737, 0x7b5a, 0x7b5b, 0x7b5d, 0x7b5e, 0x7b7f, 0x7bbf +.2byte 0x7f61, 0x7b45, 0x7749, 0x774b, 0x774d, 0x774f, 0x7751, 0x7753, 0x7755, 0x7757, 0x7b7a, 0x7b9c, 0x7b9d, 0x7b9e, 0x7bbf, 0x7fff +.2byte 0x7fa1, 0x7b85, 0x7789, 0x778b, 0x778d, 0x778f, 0x7791, 0x7793, 0x7795, 0x7797, 0x7bba, 0x7bbc, 0x7bde, 0x7bde, 0x7fff, 0x7fff +.2byte 0x7fe1, 0x7bc5, 0x77a9, 0x77ab, 0x77ad, 0x77af, 0x77b1, 0x77b3, 0x77b5, 0x77b7, 0x7bda, 0x7bdc, 0x7bde, 0x7fff, 0x7fff, 0x7fff +.2byte 0x77e3, 0x77e7, 0x77e9, 0x77eb, 0x77ed, 0x77f0, 0x77f2, 0x77f4, 0x77f6, 0x7bf9, 0x7bfb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x73e7, 0x73e9, 0x73eb, 0x73ed, 0x73ef, 0x73f1, 0x77f3, 0x77f5, 0x77f9, 0x7bfb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7c63, 0x7c65, 0x7c67, 0x7c69, 0x7c6b, 0x7c6d, 0x7c6f, 0x7c71, 0x7c73, 0x7c75, 0x7c77, 0x7c79, 0x7c7b, 0x7c7d, 0x7c7f, 0x78ff +.2byte 0x7cc3, 0x7ce7, 0x7ce9, 0x7ceb, 0x7cec, 0x7cee, 0x7cf0, 0x7cf2, 0x7cf4, 0x7cf6, 0x7cf8, 0x7cf9, 0x7cfb, 0x7cfd, 0x7cff, 0x793f +.2byte 0x7d03, 0x7d27, 0x7d29, 0x7d2b, 0x7d2c, 0x7d2f, 0x7d30, 0x7d32, 0x7d34, 0x7d36, 0x7d37, 0x7d3a, 0x7d3b, 0x7d3d, 0x7d3f, 0x797f +.2byte 0x7d43, 0x7d67, 0x7d69, 0x7d6b, 0x7d6d, 0x7d6f, 0x7d71, 0x7d72, 0x7d74, 0x7d76, 0x7d78, 0x7d79, 0x7d7b, 0x7d7d, 0x7d7f, 0x79bf +.2byte 0x7d83, 0x7da7, 0x7da9, 0x7dab, 0x7dad, 0x7daf, 0x7db1, 0x7db2, 0x7db4, 0x7db6, 0x7db8, 0x7db9, 0x7dbb, 0x7dbd, 0x7dbf, 0x79ff +.2byte 0x7dc3, 0x7de7, 0x7de9, 0x7deb, 0x7ded, 0x7e10, 0x7e11, 0x7e13, 0x7e14, 0x7e16, 0x7e18, 0x7e1a, 0x7e1b, 0x7e1d, 0x7e1f, 0x7a3f +.2byte 0x7e03, 0x7e07, 0x7e09, 0x7e2b, 0x7e2d, 0x7e30, 0x7e52, 0x7e53, 0x7e55, 0x7e57, 0x7e58, 0x7e5a, 0x7e5c, 0x7e5d, 0x7e5f, 0x7a7f +.2byte 0x7e23, 0x7e47, 0x7e49, 0x7e6b, 0x7e6d, 0x7e70, 0x7e72, 0x7e94, 0x7e95, 0x7e97, 0x7e98, 0x7e9a, 0x7e9c, 0x7e9d, 0x7e9f, 0x7abf +.2byte 0x7e83, 0x7e87, 0x7e89, 0x7eab, 0x7e8d, 0x7eb0, 0x7eb2, 0x7eb4, 0x7ed6, 0x7ed7, 0x7ed9, 0x7eda, 0x7edc, 0x7edd, 0x7edf, 0x7f3f +.2byte 0x7ec3, 0x7ec7, 0x7ec9, 0x7ecb, 0x7ecd, 0x7ed0, 0x7ef2, 0x7ef4, 0x7ef6, 0x7f39, 0x7f3a, 0x7f3b, 0x7f3c, 0x7f3e, 0x7f3f, 0x7f7f +.2byte 0x7f03, 0x7f07, 0x7f09, 0x7f0b, 0x7f0d, 0x7f10, 0x7f12, 0x7f34, 0x7f36, 0x7f59, 0x7f7b, 0x7f7c, 0x7f7d, 0x7f7e, 0x7f7f, 0x7fbf +.2byte 0x7f43, 0x7f47, 0x7f49, 0x7f4b, 0x7f4d, 0x7f50, 0x7f52, 0x7f54, 0x7f56, 0x7f79, 0x7f9b, 0x7fbd, 0x7fbe, 0x7fbe, 0x7fbf, 0x7fff +.2byte 0x7f83, 0x7f87, 0x7f89, 0x7f6b, 0x7f8d, 0x7f90, 0x7f92, 0x7f94, 0x7f96, 0x7fb9, 0x7fbb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fc3, 0x7fc7, 0x7fa9, 0x7fab, 0x7fad, 0x7fb0, 0x7fb2, 0x7fb4, 0x7fb6, 0x7fd9, 0x7fdb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fe3, 0x7fe7, 0x7fe9, 0x7feb, 0x7fed, 0x7ff0, 0x7ff2, 0x7ff4, 0x7ff6, 0x7ff9, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x77e7, 0x7be9, 0x7beb, 0x7bed, 0x7bef, 0x7bf1, 0x7bf3, 0x7bf5, 0x7bf9, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7ce7, 0x7ce8, 0x7cea, 0x7ceb, 0x7ced, 0x7cef, 0x7cf0, 0x7cf2, 0x7cf4, 0x7cf5, 0x7cf7, 0x7cf8, 0x7cfa, 0x7cfc, 0x7cfd, 0x7cff +.2byte 0x7d07, 0x7d29, 0x7d2a, 0x7d2c, 0x7d2d, 0x7d2f, 0x7d31, 0x7d32, 0x7d34, 0x7d36, 0x7d37, 0x7d39, 0x7d3b, 0x7d3c, 0x7d3e, 0x7d3f +.2byte 0x7d47, 0x7d69, 0x7d6b, 0x7d6c, 0x7d6e, 0x7d6f, 0x7d71, 0x7d72, 0x7d74, 0x7d76, 0x7d77, 0x7d79, 0x7d7a, 0x7d7c, 0x7d7e, 0x7d7f +.2byte 0x7d87, 0x7d89, 0x7dab, 0x7dad, 0x7dae, 0x7db0, 0x7db2, 0x7db3, 0x7db4, 0x7db6, 0x7db7, 0x7db9, 0x7dbb, 0x7dbc, 0x7dbe, 0x7dbf +.2byte 0x7da7, 0x7dc9, 0x7dcb, 0x7ded, 0x7def, 0x7df0, 0x7df2, 0x7df3, 0x7df5, 0x7df6, 0x7df8, 0x7df9, 0x7dfb, 0x7dfc, 0x7dfe, 0x7dff +.2byte 0x7de7, 0x7e09, 0x7e0b, 0x7e0d, 0x7e2f, 0x7e31, 0x7e32, 0x7e34, 0x7e35, 0x7e37, 0x7e38, 0x7e39, 0x7e3b, 0x7e3c, 0x7e3e, 0x7e3f +.2byte 0x7e27, 0x7e29, 0x7e2b, 0x7e4d, 0x7e4f, 0x7e71, 0x7e73, 0x7e74, 0x7e76, 0x7e77, 0x7e79, 0x7e7a, 0x7e7b, 0x7e7d, 0x7e7e, 0x7e7f +.2byte 0x7e47, 0x7e69, 0x7e6b, 0x7e6d, 0x7e8f, 0x7e91, 0x7eb3, 0x7eb5, 0x7eb6, 0x7eb8, 0x7eb9, 0x7eba, 0x7ebc, 0x7ebd, 0x7ebe, 0x7ebf +.2byte 0x7e87, 0x7e89, 0x7eab, 0x7ead, 0x7eaf, 0x7eb1, 0x7ed3, 0x7ef5, 0x7f39, 0x7f39, 0x7f3b, 0x7f3b, 0x7f3c, 0x7f3d, 0x7f3e, 0x7f3f +.2byte 0x7ec7, 0x7ec9, 0x7ecb, 0x7ecd, 0x7eef, 0x7ef1, 0x7ef3, 0x7f15, 0x7f59, 0x7f7b, 0x7f7b, 0x7f7c, 0x7f7d, 0x7f7e, 0x7f7f, 0x7f7f +.2byte 0x7ee7, 0x7f09, 0x7f0b, 0x7f0d, 0x7f0f, 0x7f11, 0x7f33, 0x7f35, 0x7f79, 0x7f7b, 0x7fbd, 0x7fbd, 0x7fbe, 0x7fbe, 0x7fbf, 0x7fbf +.2byte 0x7f27, 0x7f29, 0x7f2b, 0x7f2d, 0x7f2f, 0x7f51, 0x7f53, 0x7f55, 0x7f99, 0x7f9b, 0x7fbd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7f67, 0x7f69, 0x7f6b, 0x7f6d, 0x7f6f, 0x7f71, 0x7f73, 0x7f95, 0x7fb9, 0x7fbb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7f87, 0x7f89, 0x7f8b, 0x7f8d, 0x7f8f, 0x7fb1, 0x7fb3, 0x7fb5, 0x7fd9, 0x7fdb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fc7, 0x7fc9, 0x7fcb, 0x7fcd, 0x7fcf, 0x7fd1, 0x7fd3, 0x7fd5, 0x7ff9, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fe7, 0x7fe9, 0x7feb, 0x7fed, 0x7fef, 0x7ff1, 0x7ff3, 0x7ff5, 0x7ff9, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x0421, 0x0423, 0x0425, 0x0427, 0x0429, 0x042b, 0x042d, 0x0016, 0x0018, 0x001a, 0x001c, 0x001f, 0x043f, 0x0c7f, 0x14bf, 0x211f +.2byte 0x0461, 0x0463, 0x0465, 0x0467, 0x0469, 0x046b, 0x046d, 0x0076, 0x0058, 0x005a, 0x005c, 0x005f, 0x047f, 0x0cbf, 0x14df, 0x213f +.2byte 0x04a1, 0x04a3, 0x04a5, 0x04a7, 0x04a9, 0x04ab, 0x04ad, 0x00d6, 0x00d8, 0x00ba, 0x00bc, 0x00bf, 0x04bf, 0x0cff, 0x151f, 0x217f +.2byte 0x04e1, 0x04e3, 0x04e5, 0x04e7, 0x04e9, 0x04eb, 0x04ed, 0x0136, 0x0138, 0x011a, 0x011c, 0x011f, 0x051f, 0x0d3f, 0x155f, 0x219f +.2byte 0x0521, 0x0523, 0x0525, 0x0527, 0x0529, 0x052b, 0x052d, 0x0196, 0x0198, 0x017a, 0x017c, 0x015f, 0x055f, 0x0d7f, 0x159f, 0x21df +.2byte 0x0561, 0x0563, 0x0565, 0x0567, 0x0569, 0x056b, 0x056d, 0x01f6, 0x01f8, 0x01da, 0x01dc, 0x01bf, 0x05bf, 0x0dbf, 0x15df, 0x21ff +.2byte 0x05a1, 0x05a3, 0x05a5, 0x05a7, 0x05a9, 0x05ab, 0x05ad, 0x0276, 0x0258, 0x023a, 0x021c, 0x021f, 0x061f, 0x0e1f, 0x161f, 0x223f +.2byte 0x02c0, 0x02c3, 0x02c6, 0x02c9, 0x02cd, 0x02d0, 0x02d3, 0x02d6, 0x02b8, 0x029a, 0x027c, 0x027f, 0x065f, 0x0e5f, 0x165f, 0x227f +.2byte 0x0300, 0x0303, 0x0306, 0x0309, 0x030c, 0x030f, 0x0312, 0x0315, 0x0318, 0x02fa, 0x02dc, 0x02df, 0x06bf, 0x0e9f, 0x169f, 0x229f +.2byte 0x0340, 0x0343, 0x0346, 0x0348, 0x034c, 0x034f, 0x0351, 0x0355, 0x0358, 0x035a, 0x033c, 0x031f, 0x071f, 0x0edf, 0x16df, 0x22df +.2byte 0x0380, 0x0382, 0x0385, 0x0388, 0x038b, 0x038e, 0x0391, 0x0394, 0x0397, 0x039a, 0x039c, 0x037f, 0x075f, 0x0f1f, 0x16ff, 0x22ff +.2byte 0x03e0, 0x03e3, 0x03e5, 0x03e8, 0x03eb, 0x03ee, 0x03f1, 0x03f3, 0x03f6, 0x03f9, 0x03fc, 0x03ff, 0x079f, 0x0f7f, 0x175f, 0x233f +.2byte 0x07e1, 0x07e3, 0x07e6, 0x07e8, 0x07eb, 0x07ed, 0x07f0, 0x07f3, 0x07f5, 0x07f8, 0x07fa, 0x07fd, 0x07ff, 0x0fbf, 0x177f, 0x235f +.2byte 0x0fe3, 0x0fe5, 0x0fe7, 0x0fe9, 0x0fec, 0x0fee, 0x0ff0, 0x0ff3, 0x0ff4, 0x0ff7, 0x0ff9, 0x0ffb, 0x0ffe, 0x0fff, 0x17bf, 0x239f +.2byte 0x17e5, 0x17e7, 0x17e9, 0x17eb, 0x17ed, 0x17ef, 0x17f0, 0x17f2, 0x17f4, 0x17f6, 0x17f8, 0x17fa, 0x17fc, 0x17fe, 0x17ff, 0x23df +.2byte 0x23e8, 0x23ea, 0x23eb, 0x23ed, 0x23ee, 0x23f0, 0x23f1, 0x23f3, 0x23f5, 0x23f6, 0x23f8, 0x23f9, 0x23fb, 0x23fc, 0x23fe, 0x23ff +.2byte 0x0c21, 0x0c23, 0x0c25, 0x0c27, 0x0c29, 0x0c2b, 0x0c2d, 0x0c16, 0x0c18, 0x0c1a, 0x081c, 0x0c1f, 0x0c3f, 0x147f, 0x1cbf, 0x291f +.2byte 0x0c61, 0x0c63, 0x0c65, 0x0c67, 0x0c69, 0x0c6b, 0x0853, 0x0856, 0x0858, 0x085a, 0x043d, 0x085e, 0x109e, 0x18df, 0x211f, 0x295f +.2byte 0x0ca1, 0x0ca3, 0x0ca5, 0x0ca7, 0x0ca9, 0x0cab, 0x08d3, 0x08b6, 0x08b8, 0x08ba, 0x049d, 0x089e, 0x10de, 0x18ff, 0x215f, 0x299f +.2byte 0x0ce1, 0x0ce3, 0x0ce5, 0x0ce7, 0x0ce9, 0x0ceb, 0x0933, 0x0916, 0x0918, 0x091a, 0x04fd, 0x08fe, 0x111e, 0x193f, 0x219f, 0x29bf +.2byte 0x0d21, 0x0d23, 0x0d25, 0x0d27, 0x0d29, 0x0d2b, 0x0993, 0x0996, 0x0978, 0x097a, 0x055d, 0x095e, 0x117e, 0x199f, 0x21bf, 0x29df +.2byte 0x0d61, 0x0d63, 0x0d65, 0x0d67, 0x0d69, 0x0d6b, 0x0a13, 0x09f6, 0x09d8, 0x09da, 0x05bd, 0x09be, 0x11be, 0x19bf, 0x21ff, 0x2a1f +.2byte 0x0da1, 0x0a62, 0x0a66, 0x0a69, 0x0a6d, 0x0a70, 0x0a73, 0x0a56, 0x0a38, 0x0a3a, 0x061d, 0x0a1e, 0x121e, 0x1a1f, 0x223f, 0x2a5f +.2byte 0x0ec0, 0x0ac2, 0x0ac5, 0x0ac9, 0x0acc, 0x0acf, 0x0ad2, 0x0ad6, 0x0ab8, 0x0a9a, 0x067d, 0x0a5e, 0x125e, 0x1a5f, 0x227f, 0x2a7f +.2byte 0x0b00, 0x0b02, 0x0b05, 0x0b09, 0x0b0b, 0x0b0f, 0x0b12, 0x0b15, 0x0b18, 0x0afa, 0x06dd, 0x0abe, 0x129e, 0x1a9f, 0x22bf, 0x2abf +.2byte 0x0b40, 0x0b42, 0x0b45, 0x0b48, 0x0b4b, 0x0b4e, 0x0b51, 0x0b54, 0x0b57, 0x0b5a, 0x075d, 0x0b1e, 0x12fe, 0x1adf, 0x22df, 0x2adf +.2byte 0x0b80, 0x07a1, 0x07a4, 0x07a8, 0x07aa, 0x07ae, 0x07b1, 0x07b4, 0x07b7, 0x07ba, 0x07bd, 0x0b7e, 0x133e, 0x1b1f, 0x231f, 0x2b1f +.2byte 0x0be0, 0x0bc2, 0x0bc5, 0x0bc8, 0x0bca, 0x0bcd, 0x0bd0, 0x0bd3, 0x0bd6, 0x0bd8, 0x0bdb, 0x0bde, 0x139e, 0x1b5f, 0x235f, 0x2b3f +.2byte 0x0fe1, 0x13c4, 0x13c6, 0x13c9, 0x13cb, 0x13ce, 0x13d0, 0x13d2, 0x13d5, 0x13d7, 0x13d9, 0x13dc, 0x13de, 0x1b9f, 0x239f, 0x2b7f +.2byte 0x17e3, 0x1be6, 0x1be8, 0x1bea, 0x1bec, 0x1bee, 0x1bf0, 0x1bf2, 0x1bf4, 0x1bf6, 0x1bf8, 0x1bfa, 0x1bfd, 0x1bff, 0x23df, 0x2b9f +.2byte 0x1be5, 0x23e8, 0x23ea, 0x23ec, 0x23ee, 0x23ef, 0x23f1, 0x23f3, 0x23f5, 0x23f7, 0x23f8, 0x23fa, 0x23fc, 0x23fe, 0x23ff, 0x2bdf +.2byte 0x27e8, 0x2bea, 0x2bec, 0x2bed, 0x2bef, 0x2bf1, 0x2bf2, 0x2bf3, 0x2bf5, 0x2bf7, 0x2bf8, 0x2bf9, 0x2bfb, 0x2bfd, 0x2bfe, 0x2bff +.2byte 0x1421, 0x1423, 0x1425, 0x1427, 0x1429, 0x142b, 0x142d, 0x1816, 0x1818, 0x181a, 0x141c, 0x141f, 0x183f, 0x1c7f, 0x24bf, 0x2d1f +.2byte 0x1461, 0x1463, 0x1465, 0x1467, 0x1469, 0x146b, 0x1853, 0x1456, 0x1458, 0x145a, 0x103d, 0x145e, 0x189e, 0x20df, 0x291f, 0x315f +.2byte 0x14a1, 0x14a3, 0x14a5, 0x14a7, 0x14a9, 0x18d0, 0x14b3, 0x14b5, 0x1098, 0x109a, 0x14bb, 0x18dc, 0x211d, 0x295e, 0x295f, 0x319f +.2byte 0x14e1, 0x14e3, 0x14e5, 0x14e7, 0x14e9, 0x1930, 0x1533, 0x1515, 0x10f8, 0x10fa, 0x14fb, 0x191c, 0x213d, 0x297e, 0x299f, 0x31bf +.2byte 0x1521, 0x1523, 0x1525, 0x1527, 0x1529, 0x1990, 0x1593, 0x1575, 0x1158, 0x115a, 0x155b, 0x197c, 0x217d, 0x29be, 0x29bf, 0x31ff +.2byte 0x1561, 0x1563, 0x1a06, 0x1a09, 0x1a0d, 0x1a10, 0x15f3, 0x15d5, 0x11d8, 0x11ba, 0x15bb, 0x19bc, 0x21dd, 0x29fe, 0x29ff, 0x321f +.2byte 0x15a1, 0x1a62, 0x1665, 0x1669, 0x166c, 0x166f, 0x1673, 0x1655, 0x1238, 0x121a, 0x161b, 0x1a1c, 0x221d, 0x2a3e, 0x2a3f, 0x325f +.2byte 0x1ac0, 0x16c2, 0x16a5, 0x16a8, 0x16ab, 0x16af, 0x16b2, 0x16b5, 0x1298, 0x127a, 0x167b, 0x1a5c, 0x225d, 0x2a7e, 0x2a7f, 0x327f +.2byte 0x1b00, 0x1702, 0x1304, 0x1308, 0x130b, 0x130e, 0x1311, 0x1314, 0x1318, 0x12fa, 0x16db, 0x1a9c, 0x229d, 0x2a9e, 0x2abf, 0x32bf +.2byte 0x1740, 0x1742, 0x1344, 0x1347, 0x134b, 0x134e, 0x1351, 0x1354, 0x1357, 0x135a, 0x171b, 0x1afc, 0x22dd, 0x2ade, 0x2adf, 0x32df +.2byte 0x1780, 0x13a1, 0x1765, 0x1768, 0x176a, 0x176d, 0x1770, 0x1773, 0x1776, 0x1779, 0x177b, 0x1b3c, 0x231d, 0x2b1e, 0x2b1f, 0x331f +.2byte 0x17e0, 0x13c2, 0x1b86, 0x1b89, 0x1b8b, 0x1b8d, 0x1b90, 0x1b93, 0x1b95, 0x1b97, 0x1b9a, 0x1b9c, 0x235d, 0x2b5e, 0x2b5f, 0x333f +.2byte 0x17e1, 0x1bc4, 0x23a8, 0x23aa, 0x23ac, 0x23ae, 0x23b0, 0x23b2, 0x23b4, 0x23b6, 0x23b8, 0x23bb, 0x23bd, 0x2b9e, 0x2b9f, 0x337f +.2byte 0x1fe3, 0x1fe6, 0x2bca, 0x2bcc, 0x2bcd, 0x2bcf, 0x2bd1, 0x2bd3, 0x2bd5, 0x2bd6, 0x2bd8, 0x2bda, 0x2bdc, 0x2bde, 0x2bbf, 0x339f +.2byte 0x23e5, 0x2be8, 0x2bea, 0x2bec, 0x2bee, 0x2bef, 0x2bf1, 0x2bf3, 0x2bf5, 0x2bf7, 0x2bf8, 0x2bfa, 0x2bfc, 0x2bfe, 0x2bff, 0x33df +.2byte 0x2fe8, 0x33ea, 0x33ec, 0x33ee, 0x33ef, 0x33f1, 0x33f2, 0x33f4, 0x33f5, 0x33f7, 0x33f8, 0x33fa, 0x33fb, 0x33fd, 0x33fe, 0x33ff +.2byte 0x1c21, 0x1c23, 0x1c25, 0x1c27, 0x1c29, 0x1c2b, 0x1c2d, 0x2416, 0x2418, 0x201a, 0x201c, 0x201f, 0x203f, 0x247f, 0x2cbf, 0x351f +.2byte 0x1c61, 0x1c63, 0x1c65, 0x1c67, 0x1c69, 0x1c6b, 0x2453, 0x2456, 0x2458, 0x205a, 0x203d, 0x205e, 0x249e, 0x28df, 0x311f, 0x355f +.2byte 0x1ca1, 0x1ca3, 0x1ca5, 0x1ca7, 0x1ca9, 0x24d0, 0x24b3, 0x20b5, 0x2098, 0x1c9a, 0x20bb, 0x24dc, 0x291d, 0x315e, 0x315f, 0x399f +.2byte 0x1ce1, 0x1ce3, 0x1ce5, 0x1ce7, 0x252d, 0x2110, 0x2112, 0x1cf5, 0x1cf7, 0x1cf9, 0x211a, 0x253b, 0x2d7c, 0x319e, 0x319f, 0x39df +.2byte 0x1d21, 0x1d23, 0x1d25, 0x25a9, 0x25ad, 0x2190, 0x2172, 0x1d75, 0x1d57, 0x1d59, 0x217a, 0x257b, 0x2dbc, 0x31be, 0x31df, 0x39ff +.2byte 0x1d61, 0x1d63, 0x2606, 0x2208, 0x220c, 0x2210, 0x21f2, 0x1dd5, 0x1db7, 0x1db9, 0x21ba, 0x25db, 0x2dfc, 0x31fe, 0x31ff, 0x3a3f +.2byte 0x1da1, 0x2662, 0x2665, 0x2248, 0x224b, 0x224f, 0x2252, 0x1e35, 0x1e17, 0x1e19, 0x221a, 0x261b, 0x2e3c, 0x323e, 0x323f, 0x3a7f +.2byte 0x26c0, 0x22c2, 0x22a5, 0x1ea7, 0x1eab, 0x1eae, 0x1eb1, 0x1eb5, 0x1e97, 0x1e79, 0x225a, 0x265b, 0x2e7c, 0x327e, 0x327f, 0x3a9f +.2byte 0x2700, 0x2302, 0x1f04, 0x1ee7, 0x1eea, 0x1eed, 0x1ef1, 0x1ef4, 0x1ef7, 0x1ed9, 0x22ba, 0x269b, 0x2ebc, 0x32be, 0x32bf, 0x3abf +.2byte 0x2340, 0x2342, 0x1f44, 0x1f27, 0x1f2a, 0x1f2d, 0x1f30, 0x1f33, 0x1f36, 0x1f39, 0x22fa, 0x26db, 0x2edc, 0x32de, 0x32df, 0x3aff +.2byte 0x2380, 0x1fa1, 0x1f65, 0x2348, 0x234b, 0x234e, 0x2350, 0x2353, 0x2355, 0x2358, 0x235a, 0x271b, 0x2f1c, 0x331e, 0x331f, 0x3b1f +.2byte 0x23e0, 0x1fc2, 0x2386, 0x2769, 0x276c, 0x276e, 0x2770, 0x2772, 0x2774, 0x2776, 0x2779, 0x277b, 0x2f5c, 0x335e, 0x335f, 0x3b3f +.2byte 0x23e1, 0x23c4, 0x27a8, 0x2f8b, 0x2f8d, 0x2f8f, 0x2f91, 0x2f93, 0x2f95, 0x2f97, 0x2f99, 0x2f9a, 0x2f9c, 0x339e, 0x339f, 0x3b7f +.2byte 0x27e3, 0x27e6, 0x2fca, 0x33cc, 0x33ce, 0x33cf, 0x33d1, 0x33d3, 0x33d5, 0x33d7, 0x33d8, 0x33da, 0x33dc, 0x33de, 0x33bf, 0x3b9f +.2byte 0x2be5, 0x33e8, 0x33ea, 0x33ec, 0x33ee, 0x33f0, 0x33f2, 0x33f3, 0x33f5, 0x33f7, 0x33f8, 0x33fa, 0x33fc, 0x33fe, 0x33ff, 0x3bdf +.2byte 0x33e8, 0x37ea, 0x37ec, 0x3bee, 0x3bf0, 0x3bf1, 0x3bf3, 0x3bf4, 0x3bf5, 0x3bf7, 0x3bf8, 0x3bfa, 0x3bfb, 0x3bfd, 0x3bfe, 0x3bff +.2byte 0x2421, 0x2423, 0x2425, 0x2427, 0x2429, 0x242b, 0x242d, 0x3416, 0x3018, 0x301a, 0x2c1c, 0x2c1f, 0x2c3f, 0x307f, 0x34bf, 0x391f +.2byte 0x2461, 0x2463, 0x2465, 0x2467, 0x2469, 0x246b, 0x3453, 0x3056, 0x2c58, 0x2c5a, 0x283d, 0x285e, 0x2c9e, 0x30df, 0x391f, 0x3d5f +.2byte 0x24a1, 0x24a3, 0x24a5, 0x24a7, 0x24a9, 0x34d0, 0x30b3, 0x2cb5, 0x2c98, 0x2c9a, 0x28bb, 0x2cdc, 0x311d, 0x355e, 0x395f, 0x3d9f +.2byte 0x24e1, 0x24e3, 0x24e5, 0x3529, 0x352d, 0x3110, 0x2d12, 0x2cf5, 0x28f7, 0x28f9, 0x2d1a, 0x313b, 0x357c, 0x399e, 0x399f, 0x41df +.2byte 0x2521, 0x2523, 0x2525, 0x35a9, 0x2d6d, 0x2d6f, 0x2952, 0x2954, 0x2956, 0x2d78, 0x2d79, 0x35ba, 0x35bc, 0x39de, 0x39df, 0x421f +.2byte 0x2561, 0x2563, 0x3206, 0x3208, 0x2deb, 0x2def, 0x29d2, 0x29b4, 0x29b6, 0x2db8, 0x2db9, 0x35fa, 0x35fc, 0x3a1e, 0x3a1f, 0x425f +.2byte 0x25a1, 0x3262, 0x3265, 0x2e48, 0x2a4a, 0x2a4e, 0x2a52, 0x2a34, 0x2a16, 0x2e18, 0x2e19, 0x363a, 0x363c, 0x3a3e, 0x3a5f, 0x427f +.2byte 0x32c0, 0x32c2, 0x2ea5, 0x2ea7, 0x2a8a, 0x2a8d, 0x2a91, 0x2a94, 0x2a76, 0x2e58, 0x2e59, 0x367a, 0x367c, 0x3a7e, 0x3a7f, 0x429f +.2byte 0x3300, 0x2f02, 0x2b04, 0x2ae7, 0x2aca, 0x2acd, 0x2ad0, 0x2ad3, 0x2ad6, 0x2eb8, 0x2e99, 0x36ba, 0x36bc, 0x3abe, 0x3abf, 0x42df +.2byte 0x2f40, 0x2f42, 0x2b44, 0x2b27, 0x2f0b, 0x2f0d, 0x2f10, 0x2f12, 0x2f15, 0x2f18, 0x2ed9, 0x36da, 0x36fc, 0x3afe, 0x3aff, 0x42ff +.2byte 0x2f80, 0x2ba1, 0x2b65, 0x2f48, 0x2f2b, 0x2f2e, 0x2f30, 0x2f32, 0x2f34, 0x2f37, 0x2f39, 0x371a, 0x371c, 0x3b1e, 0x3b1f, 0x431f +.2byte 0x2be0, 0x2bc2, 0x2f86, 0x2f69, 0x374d, 0x374f, 0x3751, 0x3753, 0x3755, 0x3757, 0x3759, 0x375a, 0x375c, 0x3b5e, 0x3b5f, 0x435f +.2byte 0x2be1, 0x2fc4, 0x2fa8, 0x378b, 0x378d, 0x378f, 0x3791, 0x3793, 0x3795, 0x3797, 0x3798, 0x379a, 0x379c, 0x3b9e, 0x3b9f, 0x437f +.2byte 0x2fe3, 0x33e6, 0x37ca, 0x37cc, 0x3bce, 0x3bd0, 0x3bd2, 0x3bd3, 0x3bd5, 0x3bd7, 0x3bd8, 0x3bda, 0x3bdc, 0x3bde, 0x3bbf, 0x439f +.2byte 0x33e5, 0x37e8, 0x37ea, 0x3bec, 0x3bee, 0x3bf0, 0x3bf2, 0x3bf4, 0x3bf5, 0x3bf7, 0x3bf9, 0x3bfa, 0x3bfc, 0x3bfe, 0x3bff, 0x43df +.2byte 0x3be8, 0x3bea, 0x3fec, 0x3fee, 0x43f0, 0x43f2, 0x43f3, 0x43f5, 0x43f6, 0x43f7, 0x43f9, 0x43fa, 0x43fb, 0x43fd, 0x43fe, 0x43ff +.2byte 0x2c21, 0x2c23, 0x2c25, 0x2c27, 0x2c29, 0x2c2b, 0x2c2d, 0x4016, 0x3c18, 0x3c1a, 0x381c, 0x381f, 0x343f, 0x387f, 0x3cbf, 0x411f +.2byte 0x2c61, 0x2c63, 0x2c65, 0x2c67, 0x2c69, 0x2c6b, 0x4053, 0x3c56, 0x3c58, 0x385a, 0x383d, 0x345e, 0x389e, 0x38df, 0x3d1f, 0x455f +.2byte 0x2ca1, 0x2ca3, 0x40c6, 0x40c9, 0x40cc, 0x40d0, 0x3cb3, 0x3cb5, 0x3898, 0x389a, 0x34bb, 0x34dc, 0x391d, 0x3d5e, 0x3d5f, 0x459f +.2byte 0x2ce1, 0x2ce3, 0x4126, 0x4108, 0x410c, 0x4110, 0x3d12, 0x38f5, 0x34f7, 0x34f9, 0x391a, 0x393b, 0x3d7c, 0x3d9e, 0x419f, 0x45df +.2byte 0x2d21, 0x2d23, 0x41a6, 0x4188, 0x3d6b, 0x3d6f, 0x3952, 0x3554, 0x3556, 0x3578, 0x3979, 0x3dba, 0x3dbc, 0x41de, 0x41df, 0x4a1f +.2byte 0x2d61, 0x2d63, 0x4206, 0x4208, 0x3deb, 0x35af, 0x35b2, 0x3194, 0x35b5, 0x35b7, 0x3df9, 0x3dfa, 0x3dfc, 0x421e, 0x463f, 0x4a5f +.2byte 0x2da1, 0x4262, 0x3e65, 0x3e48, 0x3a4a, 0x364d, 0x3652, 0x3214, 0x3615, 0x3617, 0x3e39, 0x3e3a, 0x3e3c, 0x425e, 0x465f, 0x4a7f +.2byte 0x3ec0, 0x3ec2, 0x3aa5, 0x3aa7, 0x368a, 0x328c, 0x3290, 0x3294, 0x3655, 0x3657, 0x3e79, 0x3e7a, 0x3e7c, 0x427e, 0x469f, 0x4abf +.2byte 0x3f00, 0x3b02, 0x3b04, 0x36e7, 0x36ca, 0x36ad, 0x36b0, 0x36b2, 0x36b5, 0x36b7, 0x3eb9, 0x3eba, 0x3ebc, 0x42be, 0x46bf, 0x4adf +.2byte 0x3b40, 0x3b42, 0x3744, 0x3727, 0x370b, 0x36ed, 0x36f0, 0x36f2, 0x36f5, 0x36f7, 0x3ef9, 0x3eda, 0x3efc, 0x42fe, 0x46ff, 0x4aff +.2byte 0x3b80, 0x37a1, 0x3765, 0x3748, 0x372b, 0x3f2f, 0x3f31, 0x3f33, 0x3f35, 0x3f37, 0x3f39, 0x3f1a, 0x3f1c, 0x431e, 0x473f, 0x4b3f +.2byte 0x37e0, 0x37c2, 0x3786, 0x3b69, 0x3f4d, 0x3f4f, 0x3f51, 0x3f53, 0x3f55, 0x3f57, 0x3f59, 0x3f5a, 0x3f5c, 0x435e, 0x475f, 0x4b5f +.2byte 0x37e1, 0x37c4, 0x3ba8, 0x3f8b, 0x3f8d, 0x3f8f, 0x3f91, 0x3f93, 0x3f95, 0x3f97, 0x3f99, 0x3f9a, 0x3f9c, 0x439e, 0x479f, 0x4b7f +.2byte 0x37e3, 0x37e6, 0x3fca, 0x3fcc, 0x43ce, 0x43d0, 0x43d2, 0x43d3, 0x43d5, 0x43d7, 0x43d9, 0x43da, 0x43dc, 0x43de, 0x47bf, 0x4bbf +.2byte 0x3be5, 0x3fe8, 0x3fea, 0x3fec, 0x43ee, 0x47f1, 0x47f2, 0x47f4, 0x47f5, 0x47f7, 0x47f9, 0x47fa, 0x47fc, 0x47fe, 0x47ff, 0x4bdf +.2byte 0x3fe8, 0x43ea, 0x43ec, 0x47ee, 0x4bf0, 0x4bf2, 0x4bf4, 0x4bf5, 0x4bf6, 0x4bf8, 0x4bf9, 0x4bfa, 0x4bfc, 0x4bfd, 0x4bfe, 0x4bff +.2byte 0x3421, 0x3423, 0x3425, 0x3427, 0x3429, 0x342b, 0x342d, 0x4c16, 0x4818, 0x441a, 0x441c, 0x441f, 0x403f, 0x407f, 0x40bf, 0x451f +.2byte 0x3461, 0x4c42, 0x4c46, 0x4c49, 0x4c4c, 0x4c50, 0x4c53, 0x4856, 0x4858, 0x445a, 0x443d, 0x405e, 0x409e, 0x40df, 0x451f, 0x495f +.2byte 0x34a1, 0x4cc2, 0x4ca5, 0x4ca9, 0x4cac, 0x4caf, 0x4cb3, 0x48b5, 0x4498, 0x449a, 0x40bb, 0x40dc, 0x411d, 0x455e, 0x455f, 0x499f +.2byte 0x34e1, 0x4d22, 0x4d25, 0x4908, 0x490b, 0x490f, 0x4912, 0x44f5, 0x44f7, 0x40f9, 0x411a, 0x413b, 0x457c, 0x459e, 0x499f, 0x4ddf +.2byte 0x3521, 0x4da2, 0x4d85, 0x4968, 0x494a, 0x494e, 0x4952, 0x4554, 0x4156, 0x4178, 0x4179, 0x45ba, 0x45bc, 0x49de, 0x49df, 0x4e1f +.2byte 0x3561, 0x4e02, 0x4de5, 0x49e8, 0x49ca, 0x49ad, 0x49b2, 0x4194, 0x41b5, 0x41b7, 0x45f9, 0x45fa, 0x45fc, 0x4a1e, 0x4a3f, 0x525f +.2byte 0x35a1, 0x4e62, 0x4e65, 0x4a48, 0x4a4a, 0x4a4d, 0x3df1, 0x3df3, 0x3df5, 0x4637, 0x4639, 0x463a, 0x4a5c, 0x4a5e, 0x4e7f, 0x529f +.2byte 0x4ec0, 0x4ac2, 0x4aa5, 0x46a7, 0x468a, 0x428c, 0x3e6f, 0x3e73, 0x3e55, 0x4677, 0x4679, 0x467a, 0x4a7c, 0x4a9e, 0x4e9f, 0x52df +.2byte 0x4b00, 0x4702, 0x4704, 0x42e7, 0x42ca, 0x42ad, 0x3eaf, 0x3eb2, 0x3eb5, 0x46b7, 0x46b9, 0x46ba, 0x4abc, 0x4abe, 0x4edf, 0x52ff +.2byte 0x4740, 0x4742, 0x4344, 0x4327, 0x430b, 0x42ed, 0x46f1, 0x46f3, 0x46f5, 0x46f7, 0x46f9, 0x46fa, 0x4afc, 0x4afe, 0x4eff, 0x531f +.2byte 0x4380, 0x43a1, 0x4365, 0x4348, 0x432b, 0x472f, 0x4731, 0x4733, 0x4735, 0x4737, 0x4739, 0x471a, 0x4b1c, 0x4b3e, 0x4f3f, 0x533f +.2byte 0x43e0, 0x43c2, 0x4386, 0x4369, 0x474d, 0x474f, 0x4751, 0x4753, 0x4755, 0x4757, 0x4759, 0x475a, 0x4b5c, 0x4b5e, 0x4f5f, 0x537f +.2byte 0x43e1, 0x43c4, 0x43a8, 0x478b, 0x478d, 0x478f, 0x4b92, 0x4b93, 0x4b95, 0x4b97, 0x4b99, 0x4b9a, 0x4b9c, 0x4b9e, 0x4f9f, 0x539f +.2byte 0x43e3, 0x43e6, 0x47ca, 0x47cc, 0x47ce, 0x4bd0, 0x4bd2, 0x4bd4, 0x4bd6, 0x4bd7, 0x4bd9, 0x4bda, 0x4bdc, 0x4bde, 0x4fbf, 0x53bf +.2byte 0x43e5, 0x47e8, 0x47ea, 0x47ec, 0x4bee, 0x4bf1, 0x4ff3, 0x4ff4, 0x4ff6, 0x4ff7, 0x4ff9, 0x4ffb, 0x4ffc, 0x4ffe, 0x4fff, 0x53df +.2byte 0x47e8, 0x4bea, 0x4bec, 0x4fee, 0x4ff0, 0x4ff2, 0x53f4, 0x53f6, 0x53f7, 0x53f8, 0x53f9, 0x53fb, 0x53fc, 0x53fd, 0x53fe, 0x53ff +.2byte 0x5800, 0x5803, 0x5806, 0x5809, 0x580c, 0x580f, 0x5813, 0x5816, 0x5418, 0x541a, 0x501c, 0x4c1f, 0x4c3f, 0x4c7f, 0x48bf, 0x4d1f +.2byte 0x5860, 0x5842, 0x5845, 0x5848, 0x584c, 0x584f, 0x5852, 0x5856, 0x5458, 0x505a, 0x503d, 0x4c5e, 0x489e, 0x48df, 0x4d1f, 0x4d5f +.2byte 0x58c0, 0x58a2, 0x54a5, 0x54a8, 0x54ab, 0x54ae, 0x54b2, 0x54b5, 0x5098, 0x509a, 0x4cbb, 0x4cdc, 0x491d, 0x4d5e, 0x4d5f, 0x519f +.2byte 0x5920, 0x5922, 0x5505, 0x54e7, 0x54eb, 0x54ee, 0x54f1, 0x54f5, 0x50f7, 0x4cf9, 0x4d1a, 0x493b, 0x4d7c, 0x4d9e, 0x4d9f, 0x51df +.2byte 0x59a0, 0x5982, 0x5565, 0x5567, 0x514a, 0x514d, 0x5151, 0x5154, 0x4d56, 0x4978, 0x4979, 0x4dba, 0x4dbc, 0x4dde, 0x51df, 0x561f +.2byte 0x5a00, 0x59e2, 0x55e5, 0x55c7, 0x51aa, 0x518c, 0x5190, 0x5194, 0x49b5, 0x49b7, 0x4df9, 0x4dfa, 0x4dfc, 0x4e1e, 0x523f, 0x565f +.2byte 0x5a60, 0x5a42, 0x5645, 0x5627, 0x522a, 0x520c, 0x4def, 0x4df3, 0x49f5, 0x4e37, 0x4e39, 0x4e3a, 0x4e5c, 0x525e, 0x527f, 0x5a9f +.2byte 0x5ac0, 0x5ac2, 0x56a5, 0x56a7, 0x528a, 0x528c, 0x4e6f, 0x4633, 0x4a55, 0x4a57, 0x4e79, 0x4e7b, 0x529c, 0x529e, 0x56bf, 0x5adf +.2byte 0x5700, 0x5702, 0x5304, 0x52e7, 0x4eca, 0x4aad, 0x4aaf, 0x4ab2, 0x4ab5, 0x4ab7, 0x4eb9, 0x4ebb, 0x52bc, 0x52de, 0x56df, 0x5b1f +.2byte 0x5340, 0x5342, 0x4f44, 0x4f27, 0x4b0b, 0x4aed, 0x4ef1, 0x4af2, 0x4af5, 0x4af7, 0x4ef9, 0x4efb, 0x52fc, 0x52fe, 0x571f, 0x5b3f +.2byte 0x4f80, 0x4fa1, 0x4f65, 0x4b48, 0x4b2b, 0x4f2f, 0x4f31, 0x4f33, 0x4f35, 0x4f37, 0x4f39, 0x4f3b, 0x533c, 0x533e, 0x573f, 0x5b5f +.2byte 0x4fe0, 0x4bc2, 0x4b86, 0x4b69, 0x4f4d, 0x4f4f, 0x4f51, 0x4f73, 0x4f75, 0x4f77, 0x4f79, 0x4f7b, 0x535c, 0x535e, 0x577f, 0x5b7f +.2byte 0x4be1, 0x4bc4, 0x4ba8, 0x4f8b, 0x4f8d, 0x4f8f, 0x4f92, 0x5394, 0x5395, 0x5397, 0x5399, 0x539a, 0x539c, 0x539e, 0x579f, 0x5b9f +.2byte 0x4be3, 0x4be6, 0x4fca, 0x4fcc, 0x4fce, 0x4fd0, 0x53d2, 0x53d4, 0x53d6, 0x53d7, 0x53d9, 0x53da, 0x53dc, 0x53de, 0x57df, 0x5bbf +.2byte 0x4be5, 0x4fe8, 0x4fea, 0x4fec, 0x4fee, 0x53f1, 0x53f3, 0x57f5, 0x57f6, 0x57f8, 0x57f9, 0x57fb, 0x57fc, 0x57fe, 0x57ff, 0x5bdf +.2byte 0x4fe8, 0x4fea, 0x4fec, 0x53ee, 0x53f0, 0x57f2, 0x5bf4, 0x5bf6, 0x5bf8, 0x5bf9, 0x5bfa, 0x5bfb, 0x5bfc, 0x5bfd, 0x5bfe, 0x5bff +.2byte 0x6000, 0x6002, 0x6006, 0x6009, 0x600c, 0x600f, 0x6012, 0x6015, 0x6018, 0x601a, 0x5c1c, 0x581f, 0x543f, 0x507f, 0x50bf, 0x551f +.2byte 0x6060, 0x6042, 0x6045, 0x6048, 0x604b, 0x604e, 0x6051, 0x6055, 0x6058, 0x5c5a, 0x5c3d, 0x585e, 0x549e, 0x50df, 0x551f, 0x555f +.2byte 0x60c0, 0x60a2, 0x6084, 0x6087, 0x608a, 0x608e, 0x6091, 0x6094, 0x6098, 0x5c9a, 0x58bb, 0x54dc, 0x511d, 0x555e, 0x555f, 0x559f +.2byte 0x6120, 0x6122, 0x6104, 0x5ce7, 0x5cea, 0x5ced, 0x5cf0, 0x5cf4, 0x5cf7, 0x58f9, 0x551a, 0x513b, 0x557c, 0x559e, 0x559f, 0x55df +.2byte 0x6180, 0x6162, 0x6164, 0x5d47, 0x594a, 0x594d, 0x5950, 0x5953, 0x5956, 0x5578, 0x5179, 0x55ba, 0x55bc, 0x55de, 0x55df, 0x5a1f +.2byte 0x61e0, 0x61e2, 0x61c4, 0x5da7, 0x59aa, 0x55ad, 0x55b0, 0x55b2, 0x55b5, 0x55b7, 0x55f9, 0x55fa, 0x55fc, 0x561e, 0x563f, 0x5a5f +.2byte 0x6240, 0x6242, 0x6224, 0x5e27, 0x5a0a, 0x560d, 0x55ef, 0x55f2, 0x55f5, 0x5637, 0x5639, 0x563a, 0x565c, 0x5a5e, 0x5a7f, 0x5e9f +.2byte 0x62a0, 0x62a2, 0x6284, 0x5e87, 0x5a6a, 0x564d, 0x564f, 0x5652, 0x5655, 0x5657, 0x5679, 0x567b, 0x569c, 0x5a9e, 0x5abf, 0x62df +.2byte 0x6300, 0x6302, 0x6304, 0x5ee7, 0x5aca, 0x56ad, 0x56af, 0x56b2, 0x5296, 0x5297, 0x56b9, 0x56bb, 0x5adc, 0x5ade, 0x5eff, 0x6b5f +.2byte 0x5f40, 0x5f42, 0x5f44, 0x5b27, 0x570b, 0x56ed, 0x56f1, 0x56f2, 0x52f4, 0x52f7, 0x56f9, 0x56fb, 0x5afc, 0x5b1e, 0x5f1f, 0x6b7f +.2byte 0x5b80, 0x5ba1, 0x5b65, 0x5748, 0x532b, 0x572f, 0x5731, 0x5733, 0x5735, 0x5737, 0x5739, 0x573b, 0x5b3c, 0x5b3e, 0x5f5f, 0x6b7f +.2byte 0x5be0, 0x57c2, 0x5386, 0x5369, 0x574d, 0x574f, 0x5751, 0x5773, 0x5775, 0x5777, 0x5779, 0x577b, 0x5b7c, 0x5b7e, 0x5f7f, 0x6b9f +.2byte 0x57e1, 0x53c4, 0x53a8, 0x578b, 0x578d, 0x578f, 0x5792, 0x5794, 0x5b96, 0x5b97, 0x5b99, 0x5b9b, 0x5b9c, 0x5b9e, 0x5f9f, 0x6bbf +.2byte 0x53e3, 0x53e6, 0x53ca, 0x57cc, 0x57ce, 0x57d0, 0x57d2, 0x5bd4, 0x5bd6, 0x5bd8, 0x5bd9, 0x5bdb, 0x5bdc, 0x5bde, 0x5fdf, 0x6bdf +.2byte 0x53e5, 0x57e8, 0x57ea, 0x57ec, 0x57ee, 0x57f1, 0x5bf3, 0x5bf5, 0x5ff7, 0x5ff8, 0x5ffa, 0x5ffb, 0x5ffc, 0x5ffe, 0x5fff, 0x6bff +.2byte 0x53e8, 0x57ea, 0x57ec, 0x57ee, 0x5bf0, 0x5bf2, 0x5ff4, 0x63f6, 0x6bfa, 0x6bfb, 0x6bfc, 0x6bfc, 0x6bfd, 0x6bfe, 0x6bff, 0x6bff +.2byte 0x6800, 0x6802, 0x6805, 0x6808, 0x680b, 0x680e, 0x6811, 0x6814, 0x6817, 0x681a, 0x681c, 0x641f, 0x603f, 0x5c7f, 0x58bf, 0x591f +.2byte 0x6860, 0x6842, 0x6845, 0x6848, 0x684b, 0x684e, 0x6851, 0x6854, 0x6857, 0x685a, 0x683d, 0x605e, 0x5c9e, 0x58df, 0x5d1f, 0x5d5f +.2byte 0x68c0, 0x68a2, 0x6884, 0x6887, 0x688a, 0x688d, 0x6890, 0x6893, 0x6897, 0x689a, 0x64bb, 0x5cdc, 0x591d, 0x595e, 0x5d5f, 0x5d9f +.2byte 0x6900, 0x6902, 0x68e4, 0x64e7, 0x64ea, 0x64ed, 0x64f0, 0x64f3, 0x64f6, 0x64f9, 0x611a, 0x593b, 0x5d7c, 0x5d9e, 0x5d9f, 0x5ddf +.2byte 0x6980, 0x6962, 0x6964, 0x6547, 0x616b, 0x616d, 0x6170, 0x6172, 0x6175, 0x6178, 0x5d79, 0x5dba, 0x5dbc, 0x5dde, 0x5ddf, 0x5e1f +.2byte 0x69e0, 0x69c2, 0x69c4, 0x65a7, 0x61ab, 0x5dad, 0x5db0, 0x5db2, 0x5db5, 0x5db7, 0x5df9, 0x5dfa, 0x5dfc, 0x5e1e, 0x5e3f, 0x625f +.2byte 0x6a20, 0x6a22, 0x6a24, 0x6607, 0x620b, 0x5e0d, 0x5e31, 0x5e33, 0x5e35, 0x5e37, 0x5e39, 0x5e3a, 0x5e5c, 0x5e5e, 0x5e7f, 0x629f +.2byte 0x6aa0, 0x6a82, 0x6a84, 0x6667, 0x624b, 0x5e4d, 0x5e71, 0x5e52, 0x5e55, 0x5e57, 0x5e79, 0x5e7b, 0x5e9c, 0x5e9e, 0x62bf, 0x66df +.2byte 0x6b00, 0x6ae2, 0x6ae4, 0x66c7, 0x62ab, 0x5ead, 0x5eb1, 0x5eb2, 0x5e94, 0x5e97, 0x5eb9, 0x5ebb, 0x5edc, 0x62de, 0x62ff, 0x6f5f +.2byte 0x6b40, 0x6b42, 0x6b44, 0x6727, 0x630b, 0x5eed, 0x5ef1, 0x5ef2, 0x5ef4, 0x5ad8, 0x5ef9, 0x5efb, 0x631c, 0x631e, 0x6b5f, 0x739f +.2byte 0x6780, 0x6ba1, 0x6365, 0x5f48, 0x5b2b, 0x5f2f, 0x5f31, 0x5f33, 0x5f35, 0x5f37, 0x5f39, 0x5f3b, 0x633c, 0x635e, 0x6b7f, 0x739f +.2byte 0x63e0, 0x63c2, 0x5f86, 0x5b69, 0x5b4d, 0x5b4f, 0x5f51, 0x5f73, 0x5f75, 0x5f77, 0x5f79, 0x5f7b, 0x637c, 0x637e, 0x6b9f, 0x73bf +.2byte 0x63e1, 0x5fc4, 0x5ba8, 0x5b8b, 0x5f8d, 0x5f8f, 0x5f92, 0x5f94, 0x5f96, 0x6398, 0x6399, 0x639b, 0x639c, 0x639e, 0x6bbf, 0x73df +.2byte 0x5be3, 0x5be6, 0x5bca, 0x5bcc, 0x5fce, 0x5fd0, 0x5fd2, 0x5fd4, 0x63d6, 0x63d8, 0x63da, 0x63db, 0x63dc, 0x63de, 0x6bdf, 0x73df +.2byte 0x5be5, 0x5be8, 0x5bea, 0x5bec, 0x5fee, 0x5ff1, 0x5ff3, 0x63f5, 0x63f7, 0x6bfa, 0x6bfb, 0x6bfc, 0x6bfd, 0x6bfe, 0x6bff, 0x73ff +.2byte 0x5be8, 0x5bea, 0x5bec, 0x5fee, 0x5ff0, 0x5ff2, 0x63f4, 0x67f6, 0x6ffa, 0x73fc, 0x73fc, 0x73fd, 0x73fe, 0x73fe, 0x73ff, 0x73ff +.2byte 0x7000, 0x7002, 0x7005, 0x7008, 0x700b, 0x700e, 0x7010, 0x7013, 0x7016, 0x7019, 0x701c, 0x701f, 0x683f, 0x647f, 0x60bf, 0x611f +.2byte 0x7040, 0x7421, 0x7424, 0x7427, 0x742a, 0x742d, 0x7430, 0x7433, 0x7436, 0x743a, 0x743d, 0x6c5e, 0x649e, 0x60df, 0x611f, 0x615f +.2byte 0x70a0, 0x7481, 0x6ca5, 0x6ca7, 0x6caa, 0x6cad, 0x6cb0, 0x6cb3, 0x6cb6, 0x6cb8, 0x6cbb, 0x68dc, 0x611d, 0x615e, 0x615f, 0x619f +.2byte 0x7100, 0x7501, 0x6d05, 0x6908, 0x690b, 0x690d, 0x6910, 0x6912, 0x6915, 0x6917, 0x691a, 0x653b, 0x657c, 0x619e, 0x619f, 0x61df +.2byte 0x7160, 0x7541, 0x6d45, 0x6968, 0x656b, 0x656d, 0x6570, 0x6572, 0x6574, 0x6576, 0x6579, 0x65ba, 0x61bc, 0x61de, 0x65df, 0x661f +.2byte 0x71c0, 0x75c1, 0x6da5, 0x69c8, 0x65cb, 0x65ef, 0x65f1, 0x65f3, 0x65f5, 0x65f7, 0x65f9, 0x65fa, 0x65fc, 0x661e, 0x663f, 0x665f +.2byte 0x7220, 0x7621, 0x6e05, 0x6a08, 0x660b, 0x662f, 0x6631, 0x6633, 0x6635, 0x6637, 0x6639, 0x663a, 0x665c, 0x665e, 0x667f, 0x669f +.2byte 0x7280, 0x7681, 0x6e65, 0x6a68, 0x664b, 0x666f, 0x6671, 0x6673, 0x6675, 0x6677, 0x6679, 0x667b, 0x669c, 0x669e, 0x66bf, 0x6adf +.2byte 0x72e0, 0x76e1, 0x6ec5, 0x6aa8, 0x668b, 0x66af, 0x66b1, 0x66b3, 0x66b5, 0x66b7, 0x66b9, 0x66bb, 0x66dc, 0x66de, 0x6aff, 0x735f +.2byte 0x7340, 0x7741, 0x6f25, 0x6b08, 0x66eb, 0x66ef, 0x66f1, 0x66f3, 0x66f5, 0x66f7, 0x66f9, 0x66fb, 0x671c, 0x6b1e, 0x6f5f, 0x739f +.2byte 0x7380, 0x77a1, 0x6f65, 0x6b48, 0x672b, 0x672f, 0x6731, 0x6733, 0x6735, 0x6737, 0x6319, 0x673b, 0x673d, 0x6f7e, 0x739f, 0x7bdf +.2byte 0x6fe0, 0x6fc2, 0x6786, 0x6369, 0x634d, 0x634f, 0x6351, 0x6773, 0x6775, 0x6777, 0x6779, 0x677b, 0x677d, 0x6f9e, 0x73bf, 0x7bdf +.2byte 0x6be1, 0x67c4, 0x63a8, 0x638b, 0x638d, 0x638f, 0x6392, 0x6794, 0x6796, 0x6798, 0x67b9, 0x67bb, 0x67bd, 0x6fbe, 0x73df, 0x7bff +.2byte 0x63e3, 0x63e6, 0x63ca, 0x63cc, 0x63ce, 0x63d0, 0x67d2, 0x67d4, 0x67d6, 0x6bd8, 0x6fdb, 0x6fdc, 0x6fdd, 0x6fde, 0x73df, 0x7bff +.2byte 0x5fe5, 0x63e8, 0x63ea, 0x63ec, 0x63ee, 0x67f1, 0x67f3, 0x67f5, 0x6bf7, 0x6ffa, 0x73fc, 0x73fd, 0x73fe, 0x73fe, 0x73ff, 0x7bff +.2byte 0x5fe8, 0x63ea, 0x63ec, 0x63ee, 0x63f0, 0x67f2, 0x67f4, 0x6bf6, 0x6ffa, 0x73fc, 0x7bfe, 0x7bfe, 0x7bff, 0x7bff, 0x7bff, 0x7bff +.2byte 0x7c00, 0x7c02, 0x7c05, 0x7c08, 0x7c0a, 0x7c0d, 0x7c10, 0x7c13, 0x7c16, 0x7c18, 0x7c1b, 0x7c1f, 0x743f, 0x6c7f, 0x68bf, 0x651f +.2byte 0x7c60, 0x7842, 0x7844, 0x7847, 0x784a, 0x784d, 0x7850, 0x7852, 0x7855, 0x7858, 0x785b, 0x785e, 0x709e, 0x68df, 0x691f, 0x655f +.2byte 0x7ca0, 0x78a2, 0x70c6, 0x70c8, 0x70cb, 0x70cd, 0x70d0, 0x70d2, 0x70d4, 0x70d7, 0x70d9, 0x70dc, 0x6d1d, 0x695e, 0x695f, 0x699f +.2byte 0x7d00, 0x7902, 0x7126, 0x6d29, 0x6d2b, 0x6d2e, 0x6d30, 0x6d32, 0x6d34, 0x6d36, 0x6d38, 0x6d3b, 0x697c, 0x699e, 0x699f, 0x69df +.2byte 0x7d60, 0x7942, 0x7166, 0x6d89, 0x69ad, 0x69af, 0x69b1, 0x69b3, 0x69b5, 0x69b6, 0x69b8, 0x69ba, 0x69bc, 0x69de, 0x69df, 0x6a1f +.2byte 0x7dc0, 0x79a2, 0x71a6, 0x6dc9, 0x69ed, 0x69ef, 0x69f1, 0x69f3, 0x69f5, 0x69f6, 0x69f8, 0x69fa, 0x69fc, 0x6a1e, 0x6a3f, 0x6a5f +.2byte 0x7e20, 0x7a02, 0x7206, 0x6e09, 0x6a2d, 0x6a2f, 0x6a31, 0x6a33, 0x6a35, 0x6a37, 0x6a38, 0x6a3a, 0x6a5c, 0x6a5e, 0x6e7f, 0x6e9f +.2byte 0x7e60, 0x7a62, 0x7266, 0x6e49, 0x6a6d, 0x6a6f, 0x6a71, 0x6e73, 0x6e75, 0x6e77, 0x6e79, 0x6e7b, 0x6a9c, 0x6a9e, 0x6ebf, 0x6edf +.2byte 0x7ec0, 0x7ac2, 0x72a6, 0x6e89, 0x6aad, 0x6aaf, 0x6ab1, 0x6eb3, 0x6eb5, 0x6eb7, 0x6eb9, 0x6ebb, 0x6edc, 0x6ede, 0x6eff, 0x735f +.2byte 0x7f20, 0x7b02, 0x72e6, 0x6ec9, 0x6aed, 0x6aef, 0x6af1, 0x6ef3, 0x6ef5, 0x6ef7, 0x6ef9, 0x6efb, 0x6f1c, 0x6f1e, 0x735f, 0x779f +.2byte 0x7f80, 0x7b62, 0x7346, 0x6f29, 0x6b2d, 0x6b2f, 0x6b31, 0x6f33, 0x6f35, 0x6f37, 0x6f39, 0x6f3b, 0x6f3d, 0x737e, 0x779f, 0x7bdf +.2byte 0x7fe0, 0x7bc2, 0x7386, 0x6f69, 0x6b4d, 0x6b4f, 0x6b51, 0x6f73, 0x6f75, 0x6f77, 0x6f79, 0x6f7b, 0x739d, 0x77be, 0x7bdf, 0x7fff +.2byte 0x73e1, 0x73c4, 0x6ba8, 0x6b8b, 0x6b8d, 0x6b8f, 0x6b92, 0x6b94, 0x6f96, 0x6f98, 0x6fb9, 0x73bc, 0x73bd, 0x77de, 0x7bdf, 0x7fff +.2byte 0x6fe3, 0x6be6, 0x6bca, 0x6bcc, 0x6bce, 0x6bd0, 0x6bd2, 0x6bd4, 0x6fd6, 0x6fd8, 0x73db, 0x77dd, 0x77de, 0x77de, 0x7bff, 0x7fff +.2byte 0x6be5, 0x6be8, 0x6bea, 0x6bec, 0x6bee, 0x6bf1, 0x6bf3, 0x6ff5, 0x6ff7, 0x73fa, 0x77fc, 0x7bfe, 0x7bff, 0x7bff, 0x7bff, 0x7fff +.2byte 0x67e8, 0x67ea, 0x67ec, 0x67ee, 0x6bf0, 0x6bf2, 0x6ff4, 0x6ff6, 0x73fa, 0x77fc, 0x7bfe, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7c21, 0x7c23, 0x7c25, 0x7c28, 0x7c2a, 0x7c2d, 0x7c30, 0x7c32, 0x7c35, 0x7c38, 0x7c3a, 0x7c3c, 0x7c3f, 0x787f, 0x70bf, 0x6d1f +.2byte 0x7c61, 0x7884, 0x7886, 0x7888, 0x788b, 0x788d, 0x7890, 0x7892, 0x7894, 0x7897, 0x7899, 0x789c, 0x789e, 0x74df, 0x711f, 0x6d5f +.2byte 0x7cc1, 0x78c4, 0x7508, 0x7509, 0x750b, 0x750e, 0x7510, 0x7512, 0x7514, 0x7516, 0x7518, 0x751a, 0x751d, 0x715e, 0x715f, 0x6d9f +.2byte 0x7d01, 0x7924, 0x7548, 0x716b, 0x716d, 0x716f, 0x7171, 0x7173, 0x7175, 0x7176, 0x7178, 0x717a, 0x717c, 0x719e, 0x719f, 0x6ddf +.2byte 0x7d61, 0x7964, 0x7588, 0x71ab, 0x71ad, 0x71af, 0x71b1, 0x71b3, 0x71b5, 0x71b7, 0x71b8, 0x71ba, 0x71bc, 0x71de, 0x71df, 0x6e1f +.2byte 0x7da1, 0x79c4, 0x75c8, 0x71eb, 0x71ed, 0x71ef, 0x71f1, 0x71f3, 0x71f5, 0x71f7, 0x71f8, 0x71fa, 0x71fc, 0x721e, 0x723f, 0x725f +.2byte 0x7e01, 0x7a04, 0x7608, 0x722b, 0x722d, 0x722f, 0x7252, 0x7253, 0x7255, 0x7257, 0x7258, 0x725a, 0x725c, 0x725e, 0x727f, 0x729f +.2byte 0x7e61, 0x7a44, 0x7648, 0x726b, 0x726d, 0x726f, 0x7272, 0x7294, 0x7295, 0x7297, 0x7299, 0x729a, 0x729c, 0x729e, 0x72bf, 0x72df +.2byte 0x7ea1, 0x7aa4, 0x7688, 0x72ab, 0x72ad, 0x72af, 0x72b2, 0x72b4, 0x72d6, 0x72d7, 0x72d9, 0x72db, 0x72dc, 0x72de, 0x72ff, 0x775f +.2byte 0x7f01, 0x7ae4, 0x76c8, 0x72eb, 0x72ed, 0x72ef, 0x72f2, 0x72f4, 0x72f6, 0x7318, 0x7319, 0x731b, 0x731c, 0x731e, 0x775f, 0x7b9f +.2byte 0x7f41, 0x7b24, 0x7708, 0x732b, 0x730d, 0x732f, 0x7332, 0x7334, 0x7336, 0x7338, 0x7739, 0x773b, 0x773d, 0x777e, 0x7b9f, 0x7fdf +.2byte 0x7fa1, 0x7b84, 0x7768, 0x734b, 0x734d, 0x734f, 0x7352, 0x7354, 0x7376, 0x7378, 0x7779, 0x779c, 0x779d, 0x7bbe, 0x7fdf, 0x7fff +.2byte 0x7fe1, 0x7bc4, 0x77a8, 0x738b, 0x738d, 0x738f, 0x7392, 0x7394, 0x7396, 0x7398, 0x77b9, 0x77bc, 0x7bde, 0x7bdf, 0x7fff, 0x7fff +.2byte 0x77e3, 0x73e6, 0x73ca, 0x73cc, 0x73ce, 0x73d0, 0x73d2, 0x73d4, 0x73d6, 0x73d8, 0x77db, 0x7bdd, 0x7bfe, 0x7bff, 0x7fff, 0x7fff +.2byte 0x6fe5, 0x73e8, 0x73ea, 0x73ec, 0x73ee, 0x73f1, 0x73f3, 0x73f5, 0x73f7, 0x77fa, 0x7bfc, 0x7bfe, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x6be8, 0x6fea, 0x6fec, 0x6fee, 0x6ff0, 0x6ff2, 0x73f4, 0x73f6, 0x77fa, 0x7bfc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7c63, 0x7c65, 0x7c67, 0x7c69, 0x7c6b, 0x7c6d, 0x7c70, 0x7c72, 0x7c74, 0x7c76, 0x7c78, 0x7c7b, 0x7c7d, 0x7c7f, 0x78bf, 0x711f +.2byte 0x7ca3, 0x7cc6, 0x7cc7, 0x7cc9, 0x7ccc, 0x7ccd, 0x7cd0, 0x7cd2, 0x7cd4, 0x7cd6, 0x7cd8, 0x7cda, 0x7cdc, 0x7cdf, 0x791f, 0x755f +.2byte 0x7ce3, 0x7d06, 0x794a, 0x794b, 0x794d, 0x794f, 0x7951, 0x7953, 0x7954, 0x7956, 0x7958, 0x795a, 0x795c, 0x795e, 0x795f, 0x759f +.2byte 0x7d23, 0x7d46, 0x798a, 0x798c, 0x798d, 0x798f, 0x7991, 0x7993, 0x7995, 0x7996, 0x7998, 0x799a, 0x799c, 0x799e, 0x799f, 0x75df +.2byte 0x7d83, 0x7d86, 0x79aa, 0x79cc, 0x79ce, 0x79d0, 0x79d1, 0x79d3, 0x79d5, 0x79d7, 0x79d8, 0x79da, 0x79dc, 0x79de, 0x79df, 0x761f +.2byte 0x7dc3, 0x7dc6, 0x79ea, 0x79ec, 0x7a0e, 0x7a10, 0x7a12, 0x7a13, 0x7a15, 0x7a17, 0x7a18, 0x7a1a, 0x7a1c, 0x7a1e, 0x7a3f, 0x765f +.2byte 0x7e03, 0x7e06, 0x7a2a, 0x7a2c, 0x7a4e, 0x7a50, 0x7a52, 0x7a54, 0x7a55, 0x7a57, 0x7a59, 0x7a5a, 0x7a5c, 0x7a5e, 0x7a7f, 0x769f +.2byte 0x7e63, 0x7e46, 0x7a6a, 0x7a6c, 0x7a6e, 0x7a70, 0x7a92, 0x7a94, 0x7a96, 0x7a97, 0x7a99, 0x7a9a, 0x7a9c, 0x7a9e, 0x7abf, 0x76df +.2byte 0x7e83, 0x7e86, 0x7aaa, 0x7aac, 0x7aae, 0x7ab0, 0x7ad2, 0x7ad4, 0x7ad6, 0x7ad8, 0x7ad9, 0x7adb, 0x7adc, 0x7ade, 0x7aff, 0x7b5f +.2byte 0x7ee3, 0x7ec6, 0x7aca, 0x7aec, 0x7aee, 0x7af0, 0x7af2, 0x7af4, 0x7b16, 0x7b18, 0x7b1a, 0x7b1b, 0x7b1c, 0x7b1e, 0x7b5f, 0x7b9f +.2byte 0x7f23, 0x7f06, 0x7b0a, 0x7b0c, 0x7b0e, 0x7b30, 0x7b32, 0x7b34, 0x7b36, 0x7b58, 0x7b7b, 0x7b7c, 0x7b7d, 0x7b7e, 0x7b9f, 0x7fdf +.2byte 0x7f63, 0x7f46, 0x7b4a, 0x7b4c, 0x7b4e, 0x7b50, 0x7b52, 0x7b54, 0x7b76, 0x7b78, 0x7b9b, 0x7bbd, 0x7bbe, 0x7bbe, 0x7fdf, 0x7fff +.2byte 0x7fc3, 0x7fa6, 0x7b8a, 0x7b8c, 0x7b8e, 0x7b90, 0x7b92, 0x7b94, 0x7b96, 0x7b98, 0x7bbb, 0x7bdd, 0x7fde, 0x7fdf, 0x7fff, 0x7fff +.2byte 0x7fe3, 0x7fe6, 0x7bca, 0x7bcc, 0x7bce, 0x7bd0, 0x7bd2, 0x7bd4, 0x7bd6, 0x7bd8, 0x7bdb, 0x7bdd, 0x7ffe, 0x7fff, 0x7fff, 0x7fff +.2byte 0x77e5, 0x7be8, 0x77ea, 0x77ec, 0x77ee, 0x77f1, 0x77f3, 0x7bf5, 0x7bf7, 0x7bfa, 0x7bfc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x73e8, 0x73ea, 0x73ec, 0x73ee, 0x73f0, 0x77f2, 0x77f4, 0x77f6, 0x7bfa, 0x7bfc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7ca5, 0x7ca6, 0x7ca8, 0x7caa, 0x7cac, 0x7cae, 0x7cb0, 0x7cb2, 0x7cb4, 0x7cb6, 0x7cb7, 0x7cba, 0x7cbb, 0x7cbd, 0x7cbf, 0x791f +.2byte 0x7ce5, 0x7d08, 0x7d0a, 0x7d0c, 0x7d0d, 0x7d0f, 0x7d11, 0x7d13, 0x7d15, 0x7d16, 0x7d18, 0x7d1a, 0x7d1c, 0x7d1e, 0x7d1f, 0x795f +.2byte 0x7d25, 0x7d48, 0x7d4a, 0x7d4c, 0x7d4d, 0x7d4f, 0x7d51, 0x7d53, 0x7d55, 0x7d56, 0x7d58, 0x7d5a, 0x7d5c, 0x7d5d, 0x7d5f, 0x799f +.2byte 0x7d65, 0x7d88, 0x7d8a, 0x7d8c, 0x7d8e, 0x7d8f, 0x7d91, 0x7d93, 0x7d95, 0x7d96, 0x7d98, 0x7d9a, 0x7d9c, 0x7d9d, 0x7d9f, 0x79df +.2byte 0x7da5, 0x7dc8, 0x7dca, 0x7dcc, 0x7dce, 0x7dd0, 0x7dd2, 0x7dd3, 0x7dd5, 0x7dd7, 0x7dd8, 0x7dda, 0x7ddc, 0x7ddd, 0x7ddf, 0x7a1f +.2byte 0x7de5, 0x7de8, 0x7dea, 0x7e0c, 0x7e0e, 0x7e31, 0x7e32, 0x7e34, 0x7e35, 0x7e37, 0x7e39, 0x7e3a, 0x7e3c, 0x7e3d, 0x7e3f, 0x7a5f +.2byte 0x7e05, 0x7e28, 0x7e2a, 0x7e4c, 0x7e4e, 0x7e51, 0x7e73, 0x7e74, 0x7e76, 0x7e77, 0x7e79, 0x7e7a, 0x7e7c, 0x7e7d, 0x7e7f, 0x7a9f +.2byte 0x7e45, 0x7e68, 0x7e6a, 0x7e6c, 0x7e8e, 0x7e91, 0x7e93, 0x7eb5, 0x7eb6, 0x7eb8, 0x7eb9, 0x7ebb, 0x7ebc, 0x7ebe, 0x7ebf, 0x7adf +.2byte 0x7e85, 0x7ea8, 0x7eaa, 0x7eac, 0x7eae, 0x7eb1, 0x7ed3, 0x7ed5, 0x7ef7, 0x7ef8, 0x7efa, 0x7efb, 0x7efc, 0x7efe, 0x7eff, 0x7f5f +.2byte 0x7ec5, 0x7ee8, 0x7eea, 0x7eec, 0x7eee, 0x7ef1, 0x7ef3, 0x7f15, 0x7f17, 0x7f5a, 0x7f5b, 0x7f5c, 0x7f5d, 0x7f5e, 0x7f5f, 0x7f9f +.2byte 0x7f05, 0x7f08, 0x7f0a, 0x7f0c, 0x7f2e, 0x7f31, 0x7f33, 0x7f35, 0x7f57, 0x7f7a, 0x7f9c, 0x7f9d, 0x7f9e, 0x7f9e, 0x7f9f, 0x7fdf +.2byte 0x7f45, 0x7f48, 0x7f4a, 0x7f4c, 0x7f4e, 0x7f51, 0x7f73, 0x7f75, 0x7f77, 0x7f9a, 0x7fbc, 0x7fde, 0x7fde, 0x7fdf, 0x7fdf, 0x7fff +.2byte 0x7f85, 0x7f88, 0x7f8a, 0x7f8c, 0x7f8e, 0x7f91, 0x7f93, 0x7f95, 0x7f97, 0x7fba, 0x7fdc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fc5, 0x7fc8, 0x7fca, 0x7fcc, 0x7fce, 0x7fd1, 0x7fd3, 0x7fd5, 0x7fd7, 0x7fda, 0x7fdc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fe5, 0x7fe8, 0x7fea, 0x7fec, 0x7fee, 0x7ff1, 0x7ff3, 0x7ff5, 0x7ff7, 0x7ffa, 0x7ffc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7be8, 0x7bea, 0x7bec, 0x7bee, 0x7bf0, 0x7bf2, 0x7bf4, 0x7bf6, 0x7ffa, 0x7ffc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7d08, 0x7d09, 0x7d0b, 0x7d0c, 0x7d0e, 0x7d0f, 0x7d11, 0x7d13, 0x7d14, 0x7d16, 0x7d17, 0x7d19, 0x7d1a, 0x7d1c, 0x7d1e, 0x7d1f +.2byte 0x7d48, 0x7d4a, 0x7d4c, 0x7d4d, 0x7d4e, 0x7d50, 0x7d52, 0x7d53, 0x7d55, 0x7d56, 0x7d58, 0x7d59, 0x7d5b, 0x7d5c, 0x7d5e, 0x7d5f +.2byte 0x7d68, 0x7d8a, 0x7d8c, 0x7d8d, 0x7d8f, 0x7d90, 0x7d92, 0x7d93, 0x7d95, 0x7d96, 0x7d98, 0x7d99, 0x7d9b, 0x7d9c, 0x7d9e, 0x7d9f +.2byte 0x7da8, 0x7daa, 0x7dcc, 0x7dce, 0x7dcf, 0x7dd1, 0x7dd3, 0x7dd4, 0x7dd5, 0x7dd7, 0x7dd8, 0x7dd9, 0x7ddb, 0x7ddc, 0x7dde, 0x7ddf +.2byte 0x7dc8, 0x7dea, 0x7dec, 0x7e0e, 0x7e10, 0x7e12, 0x7e13, 0x7e14, 0x7e16, 0x7e17, 0x7e18, 0x7e1a, 0x7e1b, 0x7e1c, 0x7e1e, 0x7e1f +.2byte 0x7e08, 0x7e2a, 0x7e2c, 0x7e2e, 0x7e50, 0x7e52, 0x7e53, 0x7e55, 0x7e56, 0x7e57, 0x7e59, 0x7e5a, 0x7e5b, 0x7e5d, 0x7e5e, 0x7e5f +.2byte 0x7e28, 0x7e4a, 0x7e4c, 0x7e6e, 0x7e70, 0x7e92, 0x7e94, 0x7e96, 0x7e97, 0x7e98, 0x7e99, 0x7e9b, 0x7e9c, 0x7e9d, 0x7e9e, 0x7e9f +.2byte 0x7e68, 0x7e6a, 0x7e8c, 0x7e8e, 0x7eb0, 0x7eb2, 0x7ed4, 0x7ed6, 0x7ed8, 0x7ed9, 0x7eda, 0x7edb, 0x7edc, 0x7edd, 0x7ede, 0x7edf +.2byte 0x7ea8, 0x7eaa, 0x7eac, 0x7eae, 0x7ed0, 0x7ed2, 0x7ef4, 0x7f16, 0x7f5a, 0x7f5b, 0x7f5b, 0x7f5c, 0x7f5d, 0x7f5e, 0x7f5f, 0x7f5f +.2byte 0x7ec8, 0x7eea, 0x7eec, 0x7eee, 0x7ef0, 0x7f12, 0x7f14, 0x7f36, 0x7f7a, 0x7f9c, 0x7f9c, 0x7f9d, 0x7f9e, 0x7f9e, 0x7f9f, 0x7f9f +.2byte 0x7f08, 0x7f0a, 0x7f0c, 0x7f0e, 0x7f30, 0x7f32, 0x7f34, 0x7f56, 0x7f9a, 0x7f9c, 0x7fde, 0x7fde, 0x7fdf, 0x7fdf, 0x7fdf, 0x7fdf +.2byte 0x7f28, 0x7f2a, 0x7f4c, 0x7f4e, 0x7f50, 0x7f52, 0x7f74, 0x7f76, 0x7f9a, 0x7fbc, 0x7fde, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7f68, 0x7f6a, 0x7f6c, 0x7f6e, 0x7f70, 0x7f92, 0x7f94, 0x7f96, 0x7fba, 0x7fdc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7f88, 0x7faa, 0x7fac, 0x7fae, 0x7fb0, 0x7fb2, 0x7fb4, 0x7fb6, 0x7fda, 0x7fdc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fc8, 0x7fca, 0x7fcc, 0x7fce, 0x7fd0, 0x7fd2, 0x7fd4, 0x7fd6, 0x7ffa, 0x7ffc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fe8, 0x7fea, 0x7fec, 0x7fee, 0x7ff0, 0x7ff2, 0x7ff4, 0x7ff6, 0x7ffa, 0x7ffc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x0421, 0x0423, 0x0425, 0x0427, 0x0429, 0x042b, 0x042d, 0x0018, 0x001a, 0x001c, 0x001e, 0x001f, 0x085f, 0x109f, 0x18df, 0x253f +.2byte 0x0461, 0x0463, 0x0465, 0x0467, 0x0469, 0x046b, 0x046d, 0x0078, 0x007a, 0x005c, 0x005e, 0x005f, 0x089f, 0x10df, 0x191f, 0x255f +.2byte 0x04a1, 0x04a3, 0x04a5, 0x04a7, 0x04a9, 0x04ab, 0x04ad, 0x00d8, 0x00da, 0x00dc, 0x00be, 0x00bf, 0x08df, 0x111f, 0x193f, 0x259f +.2byte 0x04e1, 0x04e3, 0x04e5, 0x04e7, 0x04e9, 0x04eb, 0x04ed, 0x0158, 0x013a, 0x011c, 0x011e, 0x011f, 0x093f, 0x115f, 0x197f, 0x25bf +.2byte 0x0521, 0x0523, 0x0525, 0x0527, 0x0529, 0x052b, 0x052d, 0x01b8, 0x01ba, 0x019c, 0x017e, 0x017f, 0x097f, 0x119f, 0x19bf, 0x25ff +.2byte 0x0561, 0x0563, 0x0565, 0x0567, 0x0569, 0x056b, 0x056d, 0x0218, 0x021a, 0x01fc, 0x01fe, 0x01df, 0x09df, 0x11df, 0x19ff, 0x261f +.2byte 0x05a1, 0x05a3, 0x05a5, 0x05a7, 0x05a9, 0x05ab, 0x05ad, 0x0298, 0x027a, 0x025c, 0x023e, 0x023f, 0x0a3f, 0x121f, 0x1a3f, 0x265f +.2byte 0x0300, 0x0303, 0x0307, 0x030a, 0x030e, 0x0311, 0x0314, 0x0318, 0x02da, 0x02bc, 0x029e, 0x027f, 0x0a7f, 0x127f, 0x1a7f, 0x267f +.2byte 0x0340, 0x0343, 0x0346, 0x0349, 0x034d, 0x0350, 0x0353, 0x0357, 0x035a, 0x031c, 0x02fe, 0x02ff, 0x0abf, 0x129f, 0x1a9f, 0x26bf +.2byte 0x0380, 0x0383, 0x0386, 0x0389, 0x038c, 0x038f, 0x0392, 0x0396, 0x0399, 0x039c, 0x035e, 0x033f, 0x0b1f, 0x12ff, 0x1adf, 0x26df +.2byte 0x03c0, 0x03c3, 0x03c6, 0x03c9, 0x03cc, 0x03cf, 0x03d2, 0x03d5, 0x03d8, 0x03db, 0x03de, 0x039f, 0x0b5f, 0x133f, 0x1b1f, 0x271f +.2byte 0x03e0, 0x03e3, 0x03e6, 0x03e9, 0x03eb, 0x03ef, 0x03f1, 0x03f4, 0x03f7, 0x03fa, 0x03fd, 0x03ff, 0x0bbf, 0x137f, 0x1b5f, 0x273f +.2byte 0x0be2, 0x0be4, 0x0be7, 0x0be9, 0x0bec, 0x0bee, 0x0bf1, 0x0bf3, 0x0bf6, 0x0bf8, 0x0bfb, 0x0bfd, 0x0bff, 0x13bf, 0x1b9f, 0x277f +.2byte 0x13e4, 0x13e6, 0x13e8, 0x13ea, 0x13ed, 0x13ee, 0x13f1, 0x13f3, 0x13f5, 0x13f7, 0x13f9, 0x13fb, 0x13fe, 0x13ff, 0x1bbf, 0x279f +.2byte 0x1be6, 0x1be8, 0x1bea, 0x1beb, 0x1bee, 0x1bef, 0x1bf1, 0x1bf3, 0x1bf5, 0x1bf7, 0x1bf8, 0x1bfa, 0x1bfc, 0x1bfe, 0x1bff, 0x27df +.2byte 0x27e9, 0x27eb, 0x27ec, 0x27ee, 0x27ef, 0x27f1, 0x27f2, 0x27f4, 0x27f5, 0x27f7, 0x27f8, 0x27fa, 0x27fb, 0x27fd, 0x27fe, 0x27ff +.2byte 0x0c21, 0x0c23, 0x0c25, 0x0c27, 0x0c29, 0x0c2b, 0x0c2d, 0x0c18, 0x0c1a, 0x0c1c, 0x0c1e, 0x0c1f, 0x105f, 0x189f, 0x20df, 0x2d3f +.2byte 0x0c61, 0x0c63, 0x0c65, 0x0c67, 0x0c69, 0x0c6b, 0x0855, 0x0857, 0x0859, 0x085c, 0x043e, 0x0c7e, 0x14bf, 0x1cff, 0x253f, 0x2d7f +.2byte 0x0ca1, 0x0ca3, 0x0ca5, 0x0ca7, 0x0ca9, 0x0cab, 0x08d5, 0x08b7, 0x08b9, 0x08bc, 0x049e, 0x0cbe, 0x14ff, 0x1d1f, 0x257f, 0x2dbf +.2byte 0x0ce1, 0x0ce3, 0x0ce5, 0x0ce7, 0x0ce9, 0x0ceb, 0x0935, 0x0937, 0x0919, 0x091c, 0x04fe, 0x0d1e, 0x153f, 0x1d5f, 0x25bf, 0x2ddf +.2byte 0x0d21, 0x0d23, 0x0d25, 0x0d27, 0x0d29, 0x0d2b, 0x09b5, 0x09b7, 0x0999, 0x097c, 0x055e, 0x0d7e, 0x159f, 0x1dbf, 0x25df, 0x2dff +.2byte 0x0d61, 0x0d63, 0x0d65, 0x0d67, 0x0d69, 0x0d6b, 0x0a35, 0x0a17, 0x09f9, 0x09fc, 0x05de, 0x0dbe, 0x15df, 0x1ddf, 0x261f, 0x2e3f +.2byte 0x0da1, 0x0aa2, 0x0aa6, 0x0aaa, 0x0aad, 0x0ab1, 0x0ab5, 0x0a77, 0x0a59, 0x0a5c, 0x063e, 0x0e3e, 0x161f, 0x1e1f, 0x263f, 0x2e5f +.2byte 0x0f00, 0x0ae2, 0x0ae6, 0x0ae9, 0x0aed, 0x0af0, 0x0af4, 0x0af7, 0x0ad9, 0x0abc, 0x069e, 0x0e7e, 0x167f, 0x1e7f, 0x267f, 0x2e9f +.2byte 0x0f40, 0x0b22, 0x0b25, 0x0b29, 0x0b2c, 0x0b30, 0x0b33, 0x0b36, 0x0b39, 0x0b1c, 0x06fe, 0x0ede, 0x16bf, 0x1e9f, 0x26bf, 0x2ebf +.2byte 0x0b80, 0x0b82, 0x0b85, 0x0b88, 0x0b8c, 0x0b8f, 0x0b92, 0x0b95, 0x0b99, 0x0b9c, 0x077e, 0x0f1e, 0x16ff, 0x1edf, 0x26ff, 0x2eff +.2byte 0x0bc0, 0x07c1, 0x07c5, 0x07c8, 0x07cb, 0x07ce, 0x07d2, 0x07d4, 0x07d8, 0x07db, 0x07de, 0x0f7e, 0x173f, 0x1f3f, 0x271f, 0x2f1f +.2byte 0x0be0, 0x0fc3, 0x0fc6, 0x0fc8, 0x0fcb, 0x0fce, 0x0fd1, 0x0fd3, 0x0fd6, 0x0fd9, 0x0fdc, 0x0fde, 0x179f, 0x1f5f, 0x275f, 0x2f3f +.2byte 0x13e2, 0x17e5, 0x17e7, 0x17e9, 0x17ec, 0x17ee, 0x17f1, 0x17f3, 0x17f5, 0x17f8, 0x17fa, 0x17fd, 0x17ff, 0x1f9f, 0x279f, 0x2f7f +.2byte 0x1be4, 0x1fe7, 0x1fe9, 0x1feb, 0x1fed, 0x1fef, 0x1ff1, 0x1ff3, 0x1ff5, 0x1ff7, 0x1ff9, 0x1ffb, 0x1ffd, 0x1fff, 0x27df, 0x2f9f +.2byte 0x23e6, 0x27e9, 0x27eb, 0x27ed, 0x27ee, 0x27f0, 0x27f2, 0x27f4, 0x27f6, 0x27f7, 0x27f9, 0x27fa, 0x27fc, 0x27fe, 0x27ff, 0x2fdf +.2byte 0x2be9, 0x2feb, 0x2fed, 0x2fee, 0x2ff0, 0x2ff1, 0x2ff3, 0x2ff4, 0x2ff5, 0x2ff7, 0x2ff8, 0x2ffa, 0x2ffb, 0x2ffd, 0x2ffe, 0x2fff +.2byte 0x1421, 0x1423, 0x1425, 0x1427, 0x1429, 0x142b, 0x142d, 0x1c18, 0x181a, 0x181c, 0x181e, 0x181f, 0x1c5f, 0x209f, 0x28df, 0x313f +.2byte 0x1461, 0x1463, 0x1465, 0x1467, 0x1469, 0x146b, 0x1855, 0x1857, 0x1459, 0x145c, 0x143e, 0x187e, 0x1cbf, 0x24ff, 0x2d3f, 0x357f +.2byte 0x14a1, 0x14a3, 0x14a5, 0x14a7, 0x14a9, 0x18d1, 0x14b4, 0x14b7, 0x1099, 0x109b, 0x18dc, 0x1cfc, 0x211d, 0x2d7e, 0x2d7f, 0x35bf +.2byte 0x14e1, 0x14e3, 0x14e5, 0x14e7, 0x14e9, 0x1931, 0x1534, 0x1517, 0x10f9, 0x10fb, 0x191c, 0x1d3c, 0x215d, 0x2d9e, 0x2dbf, 0x35ff +.2byte 0x1521, 0x1523, 0x1525, 0x1527, 0x1529, 0x19b1, 0x15b4, 0x1577, 0x1179, 0x117b, 0x197c, 0x1d9c, 0x219d, 0x2dde, 0x2ddf, 0x361f +.2byte 0x1561, 0x1563, 0x1a26, 0x1a2a, 0x1a2d, 0x1a31, 0x1614, 0x15f7, 0x11f9, 0x11db, 0x19dc, 0x1ddc, 0x21dd, 0x2e1e, 0x2e1f, 0x363f +.2byte 0x15a1, 0x1aa2, 0x1685, 0x1689, 0x168d, 0x1690, 0x1694, 0x1677, 0x1259, 0x123b, 0x1a3c, 0x1e1c, 0x221d, 0x2e3e, 0x2e5f, 0x367f +.2byte 0x1b00, 0x16e2, 0x16e5, 0x16e8, 0x16ec, 0x16ef, 0x16f3, 0x16f7, 0x12b9, 0x129b, 0x1a7c, 0x1e7c, 0x227d, 0x2e7e, 0x2e7f, 0x369f +.2byte 0x1b40, 0x1722, 0x1324, 0x1328, 0x132b, 0x132f, 0x1332, 0x1335, 0x1339, 0x131b, 0x1adc, 0x1ebc, 0x229d, 0x2ebe, 0x2ebf, 0x36df +.2byte 0x1b80, 0x1782, 0x1364, 0x1368, 0x136b, 0x136e, 0x1372, 0x1375, 0x1378, 0x137b, 0x1b3c, 0x1efc, 0x22dd, 0x2efe, 0x2eff, 0x36ff +.2byte 0x17c0, 0x13c1, 0x1b86, 0x1b88, 0x1b8b, 0x1b8e, 0x1b91, 0x1b94, 0x1b96, 0x1b99, 0x1b9c, 0x1f5c, 0x233d, 0x2f3e, 0x2f1f, 0x371f +.2byte 0x17e0, 0x17c3, 0x1f87, 0x1f89, 0x1f8c, 0x1f8e, 0x1f91, 0x1f93, 0x1f95, 0x1f98, 0x1f9a, 0x1f9c, 0x237d, 0x2f5e, 0x2f5f, 0x375f +.2byte 0x1be2, 0x1fe5, 0x23a8, 0x23ab, 0x23ad, 0x23af, 0x23b1, 0x23b3, 0x23b5, 0x23b7, 0x23b9, 0x23bb, 0x23bd, 0x2f9e, 0x2f9f, 0x377f +.2byte 0x23e4, 0x23e7, 0x2fcb, 0x2fcd, 0x2fce, 0x2fd0, 0x2fd2, 0x2fd4, 0x2fd5, 0x2fd7, 0x2fd9, 0x2fdb, 0x2fdc, 0x2fde, 0x2fbf, 0x379f +.2byte 0x27e6, 0x2fe9, 0x2feb, 0x2fed, 0x2fef, 0x2ff0, 0x2ff2, 0x2ff4, 0x2ff5, 0x2ff7, 0x2ff9, 0x2ffa, 0x2ffc, 0x2ffe, 0x2fff, 0x37df +.2byte 0x33e9, 0x37eb, 0x37ed, 0x37ef, 0x37f0, 0x37f2, 0x37f3, 0x37f4, 0x37f6, 0x37f7, 0x37f9, 0x37fa, 0x37fb, 0x37fd, 0x37fe, 0x37ff +.2byte 0x1c21, 0x1c23, 0x1c25, 0x1c27, 0x1c29, 0x1c2b, 0x1c2d, 0x2818, 0x241a, 0x241c, 0x241e, 0x241f, 0x245f, 0x289f, 0x2cdf, 0x393f +.2byte 0x1c61, 0x1c63, 0x1c65, 0x1c67, 0x1c69, 0x1c6b, 0x2855, 0x2457, 0x2459, 0x205c, 0x203e, 0x207e, 0x24bf, 0x2cff, 0x353f, 0x397f +.2byte 0x1ca1, 0x1ca3, 0x1ca5, 0x1ca7, 0x1ca9, 0x28d1, 0x24b4, 0x20b7, 0x2099, 0x209b, 0x20dc, 0x24fc, 0x2d1d, 0x357e, 0x357f, 0x3dbf +.2byte 0x1ce1, 0x1ce3, 0x1ce5, 0x1ce7, 0x252e, 0x2111, 0x2113, 0x1cf6, 0x1cf8, 0x2119, 0x253a, 0x295b, 0x319d, 0x35be, 0x35bf, 0x3dff +.2byte 0x1d21, 0x1d23, 0x1d25, 0x25c9, 0x25ce, 0x21b1, 0x2173, 0x1d76, 0x1d58, 0x2179, 0x257a, 0x299b, 0x31dd, 0x35de, 0x35ff, 0x3e3f +.2byte 0x1d61, 0x1d63, 0x2626, 0x2228, 0x222d, 0x2231, 0x21f3, 0x1df6, 0x1dd8, 0x21d9, 0x25da, 0x29db, 0x321d, 0x361e, 0x361f, 0x3e5f +.2byte 0x1da1, 0x26a2, 0x2685, 0x2268, 0x226c, 0x2270, 0x2273, 0x1e56, 0x1e38, 0x2239, 0x261a, 0x2a1b, 0x323d, 0x365e, 0x365f, 0x3e7f +.2byte 0x2b00, 0x26e2, 0x22e5, 0x1ec7, 0x1ecb, 0x1ecf, 0x1ed2, 0x1ed6, 0x1e98, 0x2279, 0x267a, 0x2a7b, 0x327d, 0x367e, 0x369f, 0x3ebf +.2byte 0x2740, 0x2322, 0x1f24, 0x1f07, 0x1f0b, 0x1f0e, 0x1f11, 0x1f15, 0x1f18, 0x22d9, 0x26ba, 0x2abb, 0x32bd, 0x36be, 0x36df, 0x3edf +.2byte 0x2380, 0x2382, 0x1f64, 0x2328, 0x232b, 0x232e, 0x2331, 0x2334, 0x2336, 0x2339, 0x271a, 0x2afb, 0x32fd, 0x36fe, 0x36ff, 0x3eff +.2byte 0x23c0, 0x1fc1, 0x2386, 0x2749, 0x274c, 0x274e, 0x2751, 0x2753, 0x2756, 0x2758, 0x275a, 0x2b3b, 0x333d, 0x373e, 0x373f, 0x3f3f +.2byte 0x23e0, 0x23c3, 0x2787, 0x2b6a, 0x2b6c, 0x2b6e, 0x2b71, 0x2b73, 0x2b75, 0x2b77, 0x2b79, 0x2b7b, 0x337d, 0x375e, 0x375f, 0x3f5f +.2byte 0x27e2, 0x27e5, 0x2ba8, 0x33ac, 0x33ae, 0x33b0, 0x33b2, 0x33b4, 0x33b5, 0x33b7, 0x33b9, 0x33bb, 0x33bd, 0x379e, 0x379f, 0x3f7f +.2byte 0x2be4, 0x2be7, 0x33cb, 0x37cd, 0x37cf, 0x37d0, 0x37d2, 0x37d4, 0x37d5, 0x37d7, 0x37d9, 0x37db, 0x37dc, 0x37de, 0x37df, 0x3fbf +.2byte 0x2fe6, 0x37e9, 0x37eb, 0x37ed, 0x37ef, 0x37f1, 0x37f3, 0x37f4, 0x37f6, 0x37f7, 0x37f9, 0x37fb, 0x37fc, 0x37fe, 0x37ff, 0x3fdf +.2byte 0x37e9, 0x3beb, 0x3fed, 0x3fef, 0x3ff1, 0x3ff2, 0x3ff3, 0x3ff5, 0x3ff6, 0x3ff7, 0x3ff9, 0x3ffa, 0x3ffb, 0x3ffd, 0x3ffe, 0x3fff +.2byte 0x2421, 0x2423, 0x2425, 0x2427, 0x2429, 0x242b, 0x242d, 0x3818, 0x341a, 0x301c, 0x301e, 0x2c1f, 0x305f, 0x349f, 0x38df, 0x3d3f +.2byte 0x2461, 0x2463, 0x2465, 0x2467, 0x2469, 0x246b, 0x3455, 0x3457, 0x3059, 0x305c, 0x2c3e, 0x2c7e, 0x30bf, 0x34ff, 0x393f, 0x417f +.2byte 0x24a1, 0x24a3, 0x24a5, 0x24a7, 0x24a9, 0x34d1, 0x34b4, 0x30b7, 0x2c99, 0x2c9b, 0x2cdc, 0x30fc, 0x351d, 0x397e, 0x3d7f, 0x41bf +.2byte 0x24e1, 0x24e3, 0x24e5, 0x3929, 0x392e, 0x3511, 0x3113, 0x2cf6, 0x2cf8, 0x2d19, 0x313a, 0x315b, 0x399d, 0x3dbe, 0x3dbf, 0x45ff +.2byte 0x2521, 0x2523, 0x2525, 0x39c9, 0x2d6e, 0x2d70, 0x2953, 0x2955, 0x2957, 0x2d78, 0x3199, 0x39db, 0x39dd, 0x3dfe, 0x421f, 0x4a5f +.2byte 0x2561, 0x2563, 0x3626, 0x3628, 0x2e0b, 0x2e10, 0x29f3, 0x29b5, 0x29d7, 0x2dd8, 0x31d9, 0x3a1b, 0x3a1d, 0x3e1e, 0x423f, 0x4a7f +.2byte 0x25a1, 0x36a2, 0x3685, 0x2e68, 0x2a6a, 0x2a6f, 0x2a73, 0x2a35, 0x2a37, 0x2e18, 0x3219, 0x3a5b, 0x3a5d, 0x3e5e, 0x425f, 0x4a9f +.2byte 0x3700, 0x36e2, 0x2ee5, 0x2ec7, 0x2aaa, 0x2aae, 0x2ab2, 0x2ab5, 0x2a97, 0x2e78, 0x3279, 0x3a7b, 0x3a9d, 0x3e9e, 0x429f, 0x4abf +.2byte 0x3740, 0x3322, 0x2f24, 0x2b07, 0x2aea, 0x2aee, 0x2af1, 0x2af4, 0x2af7, 0x2eb8, 0x32b9, 0x3abb, 0x3abd, 0x3ebe, 0x42df, 0x4adf +.2byte 0x3380, 0x2f82, 0x2f64, 0x2f28, 0x2f0b, 0x2f0e, 0x2f10, 0x2f13, 0x2f16, 0x2f18, 0x32f9, 0x3afb, 0x3afd, 0x3efe, 0x42ff, 0x4b1f +.2byte 0x2fc0, 0x2bc1, 0x2f86, 0x2f49, 0x332c, 0x332e, 0x3331, 0x3333, 0x3335, 0x3337, 0x3339, 0x3b3b, 0x3b3d, 0x3f3e, 0x433f, 0x4b3f +.2byte 0x2fe0, 0x2fc3, 0x3387, 0x336a, 0x3b6e, 0x3b70, 0x3b72, 0x3b74, 0x3b75, 0x3b77, 0x3b79, 0x3b7b, 0x3b7d, 0x3f5e, 0x435f, 0x4b5f +.2byte 0x2fe2, 0x33e5, 0x33a8, 0x3bac, 0x3bae, 0x3bb0, 0x3bb2, 0x3bb4, 0x3bb5, 0x3bb7, 0x3bb9, 0x3bbb, 0x3bbd, 0x3f9e, 0x439f, 0x4b9f +.2byte 0x33e4, 0x37e7, 0x3bcb, 0x3bcd, 0x3fcf, 0x3fd1, 0x3fd2, 0x3fd4, 0x3fd6, 0x3fd7, 0x3fd9, 0x3fdb, 0x3fdc, 0x3fde, 0x43df, 0x4bbf +.2byte 0x37e6, 0x3be9, 0x3beb, 0x3fed, 0x43f0, 0x43f1, 0x43f3, 0x43f4, 0x43f6, 0x43f7, 0x43f9, 0x43fb, 0x43fc, 0x43fe, 0x43ff, 0x4bdf +.2byte 0x3fe9, 0x3feb, 0x43ed, 0x47ef, 0x4bf2, 0x4bf3, 0x4bf4, 0x4bf5, 0x4bf7, 0x4bf8, 0x4bf9, 0x4bfa, 0x4bfc, 0x4bfd, 0x4bfe, 0x4bff +.2byte 0x2c21, 0x2c23, 0x2c25, 0x2c27, 0x2c29, 0x2c2b, 0x2c2d, 0x4418, 0x401a, 0x3c1c, 0x3c1e, 0x3c1f, 0x385f, 0x389f, 0x3cdf, 0x453f +.2byte 0x2c61, 0x2c63, 0x2c65, 0x2c67, 0x2c69, 0x2c6b, 0x4455, 0x4057, 0x4059, 0x3c5c, 0x383e, 0x387e, 0x38bf, 0x3cff, 0x413f, 0x457f +.2byte 0x2ca1, 0x2ca3, 0x44c6, 0x44c9, 0x44cd, 0x44d1, 0x40b4, 0x3cb7, 0x3c99, 0x389b, 0x38dc, 0x38fc, 0x3d1d, 0x417e, 0x417f, 0x49bf +.2byte 0x2ce1, 0x2ce3, 0x4546, 0x4508, 0x450d, 0x4511, 0x4113, 0x3cf6, 0x38f8, 0x3919, 0x393a, 0x395b, 0x419d, 0x41be, 0x45bf, 0x49ff +.2byte 0x2d21, 0x2d23, 0x45a6, 0x45a8, 0x416b, 0x4170, 0x3d53, 0x3955, 0x3957, 0x3978, 0x3999, 0x41db, 0x41dd, 0x45fe, 0x461f, 0x4e5f +.2byte 0x2d61, 0x2d63, 0x4626, 0x4628, 0x420b, 0x35b0, 0x35b3, 0x35b4, 0x35b6, 0x39d8, 0x3df9, 0x421b, 0x421d, 0x463e, 0x4a5f, 0x529f +.2byte 0x2da1, 0x46a2, 0x4285, 0x3e68, 0x3e6a, 0x366d, 0x3673, 0x3634, 0x3616, 0x3a18, 0x3e39, 0x425b, 0x425d, 0x467e, 0x4a7f, 0x52bf +.2byte 0x4300, 0x42e2, 0x3ee5, 0x3ec7, 0x36aa, 0x368d, 0x3691, 0x3694, 0x3676, 0x3a78, 0x3e79, 0x427b, 0x429d, 0x469e, 0x4abf, 0x52df +.2byte 0x4340, 0x3f22, 0x3f24, 0x3b07, 0x3aea, 0x36cd, 0x36d0, 0x36d3, 0x36d6, 0x3ab8, 0x3eb9, 0x42bb, 0x42bd, 0x46de, 0x4adf, 0x52ff +.2byte 0x3f80, 0x3f82, 0x3b64, 0x3b28, 0x3b0b, 0x3b0e, 0x3b10, 0x3b13, 0x3b15, 0x3b18, 0x3ef9, 0x42fb, 0x42fd, 0x46fe, 0x4b1f, 0x531f +.2byte 0x3fc0, 0x3bc1, 0x3b86, 0x3b49, 0x3b2c, 0x3f2f, 0x3f31, 0x3f33, 0x3f35, 0x3f37, 0x3f39, 0x433b, 0x433d, 0x473e, 0x4b3f, 0x535f +.2byte 0x3be0, 0x37c3, 0x3b87, 0x3b6a, 0x436e, 0x4370, 0x4372, 0x4374, 0x4375, 0x4377, 0x4379, 0x437b, 0x437d, 0x477e, 0x4b7f, 0x537f +.2byte 0x3be2, 0x3be5, 0x3ba8, 0x43ac, 0x43ae, 0x43b0, 0x43b2, 0x43b4, 0x43b6, 0x43b7, 0x43b9, 0x43bb, 0x43bd, 0x479e, 0x4b9f, 0x539f +.2byte 0x3be4, 0x3be7, 0x43cb, 0x43cd, 0x43cf, 0x47d1, 0x47d3, 0x47d4, 0x47d6, 0x47d7, 0x47d9, 0x47db, 0x47dc, 0x47de, 0x4bdf, 0x53bf +.2byte 0x3fe6, 0x43e9, 0x43eb, 0x43ed, 0x47f0, 0x4bf2, 0x4bf3, 0x4bf5, 0x4bf6, 0x4bf8, 0x4bf9, 0x4bfb, 0x4bfc, 0x4bfe, 0x4bff, 0x53df +.2byte 0x43e9, 0x47eb, 0x47ed, 0x4bef, 0x4ff2, 0x53f4, 0x53f5, 0x53f6, 0x53f7, 0x53f8, 0x53fa, 0x53fb, 0x53fc, 0x53fd, 0x53fe, 0x53ff +.2byte 0x3421, 0x3423, 0x3425, 0x3427, 0x3429, 0x342b, 0x342d, 0x5018, 0x4c1a, 0x481c, 0x481e, 0x441f, 0x445f, 0x449f, 0x44df, 0x493f +.2byte 0x3461, 0x5442, 0x5446, 0x5449, 0x544d, 0x5451, 0x5455, 0x5057, 0x4c59, 0x485c, 0x483e, 0x447e, 0x44bf, 0x44ff, 0x493f, 0x4d7f +.2byte 0x34a1, 0x54c2, 0x50a5, 0x50a9, 0x50ad, 0x50b0, 0x50b4, 0x4cb7, 0x4899, 0x489b, 0x44dc, 0x44fc, 0x451d, 0x497e, 0x497f, 0x4dbf +.2byte 0x34e1, 0x5542, 0x5125, 0x4d08, 0x4d0b, 0x4d0f, 0x4d13, 0x48f6, 0x44f8, 0x4519, 0x453a, 0x455b, 0x499d, 0x49be, 0x4dbf, 0x4dff +.2byte 0x3521, 0x55a2, 0x51a5, 0x4d88, 0x4d4a, 0x4d4f, 0x4d53, 0x4955, 0x4557, 0x4178, 0x4599, 0x49db, 0x49dd, 0x49fe, 0x4e1f, 0x525f +.2byte 0x3561, 0x5622, 0x5205, 0x4e08, 0x4dea, 0x4dad, 0x4db3, 0x45b4, 0x41b6, 0x41d8, 0x45f9, 0x4a1b, 0x4a1d, 0x4e3e, 0x4e5f, 0x569f +.2byte 0x35a1, 0x56a2, 0x5285, 0x4e68, 0x4e6a, 0x4e6d, 0x3df2, 0x3df4, 0x4216, 0x4638, 0x4639, 0x4a5b, 0x4a5d, 0x4e7e, 0x529f, 0x5adf +.2byte 0x5300, 0x4ee2, 0x4ee5, 0x4ac7, 0x46aa, 0x468d, 0x3e8f, 0x3e94, 0x4276, 0x4678, 0x4679, 0x4a9b, 0x4a9d, 0x4ebe, 0x52bf, 0x5aff +.2byte 0x4f40, 0x4b22, 0x4b24, 0x4707, 0x46ea, 0x42cd, 0x42d0, 0x42d3, 0x42d6, 0x46b8, 0x46b9, 0x4abb, 0x4add, 0x4ede, 0x52ff, 0x5b1f +.2byte 0x4b80, 0x4b82, 0x4764, 0x4728, 0x430b, 0x430e, 0x4711, 0x4713, 0x4715, 0x4718, 0x46f9, 0x4afb, 0x4afd, 0x4f1e, 0x531f, 0x5b3f +.2byte 0x47c0, 0x47c1, 0x4786, 0x4349, 0x432c, 0x472f, 0x4731, 0x4733, 0x4735, 0x4737, 0x4739, 0x4b3b, 0x4b3d, 0x4f3e, 0x535f, 0x5b5f +.2byte 0x47e0, 0x47c3, 0x4387, 0x436a, 0x4b6e, 0x4b70, 0x4b72, 0x4b74, 0x4b76, 0x4b77, 0x4b79, 0x4b7b, 0x4b7d, 0x4f7e, 0x537f, 0x5b7f +.2byte 0x47e2, 0x43e5, 0x43a8, 0x47ac, 0x4bae, 0x4bb0, 0x4bb2, 0x4bb4, 0x4bb6, 0x4bb7, 0x4bb9, 0x4bbb, 0x4bbd, 0x4f9e, 0x539f, 0x5b9f +.2byte 0x43e4, 0x43e7, 0x47cb, 0x4bcd, 0x4bcf, 0x4fd1, 0x4fd3, 0x4fd5, 0x4fd6, 0x4fd8, 0x4fd9, 0x4fdb, 0x4fdc, 0x4fde, 0x53df, 0x5bbf +.2byte 0x47e6, 0x47e9, 0x4beb, 0x4bed, 0x4bf0, 0x4ff2, 0x53f4, 0x53f5, 0x53f7, 0x53f8, 0x53fa, 0x53fb, 0x53fc, 0x53fe, 0x53ff, 0x5bdf +.2byte 0x4be9, 0x4beb, 0x4fed, 0x4fef, 0x53f2, 0x57f4, 0x5bf6, 0x5bf7, 0x5bf8, 0x5bf9, 0x5bfa, 0x5bfb, 0x5bfc, 0x5bfd, 0x5bff, 0x5bff +.2byte 0x6000, 0x6003, 0x6006, 0x600a, 0x600d, 0x6010, 0x6014, 0x6018, 0x5c1a, 0x581c, 0x541e, 0x501f, 0x4c5f, 0x4c9f, 0x4cdf, 0x513f +.2byte 0x6060, 0x5c42, 0x5c45, 0x5c49, 0x5c4d, 0x5c50, 0x5c53, 0x5c57, 0x5859, 0x545c, 0x503e, 0x4c7e, 0x4cbf, 0x4cff, 0x513f, 0x517f +.2byte 0x60e0, 0x5cc2, 0x5ca5, 0x5ca8, 0x5cab, 0x5caf, 0x5cb3, 0x5cb7, 0x5499, 0x549b, 0x50dc, 0x4cfc, 0x4d1d, 0x517e, 0x517f, 0x51bf +.2byte 0x6140, 0x5d22, 0x5d05, 0x58e7, 0x58eb, 0x58ef, 0x58f2, 0x58f6, 0x54f8, 0x5119, 0x4d3a, 0x4d5b, 0x519d, 0x51be, 0x51bf, 0x55ff +.2byte 0x61c0, 0x5da2, 0x5d85, 0x5967, 0x554a, 0x554d, 0x5551, 0x5555, 0x5157, 0x4d78, 0x4d99, 0x51db, 0x51dd, 0x51fe, 0x521f, 0x565f +.2byte 0x6220, 0x5e02, 0x5de5, 0x59e7, 0x55ca, 0x51ad, 0x51b1, 0x51b4, 0x4db6, 0x4dd8, 0x4df9, 0x521b, 0x521d, 0x523e, 0x565f, 0x5a9f +.2byte 0x6280, 0x5e82, 0x5e65, 0x5a47, 0x564a, 0x522d, 0x51ef, 0x51f4, 0x4e16, 0x4e38, 0x4e39, 0x525b, 0x525d, 0x567e, 0x569f, 0x5edf +.2byte 0x6300, 0x5ee2, 0x5ee5, 0x5ac7, 0x56aa, 0x528d, 0x528f, 0x4634, 0x4e76, 0x4e78, 0x4e79, 0x529b, 0x56bd, 0x56be, 0x5adf, 0x631f +.2byte 0x5b40, 0x5b22, 0x5724, 0x5307, 0x52ea, 0x4ecd, 0x4ed0, 0x4ed3, 0x4ed6, 0x4eb8, 0x4eb9, 0x52db, 0x56dd, 0x56de, 0x5aff, 0x633f +.2byte 0x5780, 0x5782, 0x5364, 0x4f28, 0x4f0b, 0x4f0e, 0x4f11, 0x4f13, 0x4f15, 0x4f18, 0x4ef9, 0x52fb, 0x571d, 0x571e, 0x5b3f, 0x635f +.2byte 0x53c0, 0x53c1, 0x4f86, 0x4f49, 0x4f2c, 0x4f2f, 0x4f31, 0x4f33, 0x4f35, 0x4f37, 0x4f39, 0x533b, 0x573d, 0x575e, 0x5b5f, 0x637f +.2byte 0x4fe0, 0x4fc3, 0x4f87, 0x4f6a, 0x4f6e, 0x4f70, 0x5372, 0x5374, 0x5376, 0x5377, 0x5379, 0x537b, 0x577d, 0x577e, 0x5b7f, 0x639f +.2byte 0x4fe2, 0x4fe5, 0x4fa8, 0x4fac, 0x53ae, 0x53b0, 0x53b2, 0x57b5, 0x57b6, 0x57b8, 0x57b9, 0x57bb, 0x57bd, 0x579e, 0x5b9f, 0x63bf +.2byte 0x4fe4, 0x4fe7, 0x4fcb, 0x4fcd, 0x53cf, 0x53d1, 0x57d3, 0x57d5, 0x57d7, 0x57d8, 0x57da, 0x57db, 0x57dc, 0x57de, 0x5bdf, 0x63df +.2byte 0x4fe6, 0x4fe9, 0x4feb, 0x53ed, 0x53f0, 0x57f2, 0x57f4, 0x5bf6, 0x5bf7, 0x5bf9, 0x5bfa, 0x5bfb, 0x5bfd, 0x5bfe, 0x5bff, 0x63df +.2byte 0x4fe9, 0x53eb, 0x53ed, 0x57ef, 0x57f2, 0x5bf4, 0x5ff6, 0x63f8, 0x63f9, 0x63fa, 0x63fb, 0x63fc, 0x63fd, 0x63fe, 0x63ff, 0x63ff +.2byte 0x6800, 0x6803, 0x6806, 0x6809, 0x680d, 0x6810, 0x6813, 0x6816, 0x681a, 0x641c, 0x601e, 0x5c1f, 0x585f, 0x549f, 0x54df, 0x553f +.2byte 0x6860, 0x6442, 0x6445, 0x6448, 0x644c, 0x644f, 0x6452, 0x6456, 0x6459, 0x645c, 0x603e, 0x587e, 0x54bf, 0x54ff, 0x593f, 0x557f +.2byte 0x68c0, 0x64a2, 0x6484, 0x6487, 0x648b, 0x648f, 0x6492, 0x6495, 0x6499, 0x609b, 0x58dc, 0x54fc, 0x551d, 0x557e, 0x557f, 0x59bf +.2byte 0x6920, 0x6522, 0x6504, 0x60e7, 0x60ea, 0x60ee, 0x60f1, 0x60f4, 0x60f8, 0x5919, 0x593a, 0x555b, 0x559d, 0x55be, 0x59bf, 0x59ff +.2byte 0x69a0, 0x6582, 0x6564, 0x6167, 0x5d4a, 0x5d4e, 0x5d51, 0x5d54, 0x5d57, 0x5978, 0x5599, 0x55db, 0x55dd, 0x59fe, 0x5a1f, 0x5e5f +.2byte 0x6a00, 0x6602, 0x65e4, 0x61c7, 0x5dca, 0x59ad, 0x59b0, 0x59b3, 0x59b6, 0x55d8, 0x55f9, 0x561b, 0x5a1d, 0x5a3e, 0x5a5f, 0x5e9f +.2byte 0x6a60, 0x6662, 0x6644, 0x6227, 0x5e2a, 0x5a0d, 0x5a10, 0x5a13, 0x5a16, 0x5638, 0x5639, 0x5a5b, 0x5a5d, 0x5a7e, 0x5e9f, 0x62df +.2byte 0x6ae0, 0x66c2, 0x66a4, 0x62a7, 0x5e8a, 0x5a6d, 0x5a70, 0x5a73, 0x5a76, 0x5678, 0x5679, 0x5a9b, 0x5abd, 0x5ebe, 0x5edf, 0x671f +.2byte 0x6b40, 0x6722, 0x6724, 0x6307, 0x5eea, 0x5acd, 0x5ad0, 0x5ad3, 0x5296, 0x56b8, 0x56ba, 0x5adb, 0x5add, 0x5efe, 0x631f, 0x6f7f +.2byte 0x6380, 0x6382, 0x6364, 0x5b28, 0x570b, 0x570e, 0x5711, 0x5713, 0x5715, 0x5718, 0x56fa, 0x5b1b, 0x5b1d, 0x5f1e, 0x633f, 0x6f9f +.2byte 0x5fc0, 0x5fc1, 0x5b86, 0x5749, 0x572c, 0x572f, 0x5731, 0x5733, 0x5755, 0x5757, 0x575a, 0x5b3b, 0x5b5d, 0x5f5e, 0x635f, 0x6f9f +.2byte 0x5fe0, 0x5bc3, 0x5787, 0x576a, 0x576e, 0x5770, 0x5772, 0x5b74, 0x5b76, 0x5b78, 0x5b79, 0x5b7b, 0x5b7d, 0x5f7e, 0x639f, 0x6fbf +.2byte 0x57e2, 0x57e5, 0x53a8, 0x57ac, 0x57ae, 0x57b0, 0x5bb2, 0x5bb5, 0x5bb6, 0x5bb8, 0x5bba, 0x5bbb, 0x5bbd, 0x5fbe, 0x63bf, 0x6fdf +.2byte 0x53e4, 0x53e7, 0x57cb, 0x57cd, 0x57cf, 0x5bd1, 0x5bd3, 0x5bd5, 0x5fd7, 0x5fd9, 0x5fda, 0x5fdb, 0x5fdd, 0x5fde, 0x63df, 0x6fdf +.2byte 0x53e6, 0x57e9, 0x57eb, 0x5bed, 0x5bf0, 0x5bf2, 0x5ff4, 0x5ff6, 0x63f8, 0x63f9, 0x63fa, 0x63fc, 0x63fd, 0x63fe, 0x63ff, 0x6fff +.2byte 0x57e9, 0x57eb, 0x5bed, 0x5bef, 0x5bf2, 0x5ff4, 0x63f6, 0x67f8, 0x6ffb, 0x6ffc, 0x6ffc, 0x6ffd, 0x6ffe, 0x6ffe, 0x6fff, 0x6fff +.2byte 0x7000, 0x7002, 0x7006, 0x7008, 0x700c, 0x700f, 0x7012, 0x7015, 0x7018, 0x701c, 0x6c1e, 0x681f, 0x605f, 0x5c9f, 0x5cdf, 0x5d3f +.2byte 0x7060, 0x7042, 0x7045, 0x7048, 0x704b, 0x704f, 0x7052, 0x7055, 0x7058, 0x705c, 0x6c3e, 0x647e, 0x60bf, 0x5cff, 0x5d3f, 0x5d7f +.2byte 0x70c0, 0x70a2, 0x6c84, 0x6c87, 0x6c8b, 0x6c8e, 0x6c91, 0x6c94, 0x6c98, 0x6c9b, 0x64dc, 0x60fc, 0x5d1d, 0x5d7e, 0x5d7f, 0x5dbf +.2byte 0x7120, 0x7102, 0x6d04, 0x6508, 0x650b, 0x650e, 0x6511, 0x6513, 0x6516, 0x6519, 0x613a, 0x5d5b, 0x5d9d, 0x5dbe, 0x5dbf, 0x5dff +.2byte 0x7180, 0x7182, 0x6d64, 0x6568, 0x616b, 0x616e, 0x6170, 0x6173, 0x6175, 0x6178, 0x5d99, 0x5ddb, 0x5ddd, 0x5dfe, 0x5e1f, 0x625f +.2byte 0x71e0, 0x71e2, 0x6dc4, 0x65c8, 0x61cb, 0x61ce, 0x61d0, 0x61d3, 0x61d5, 0x61d8, 0x5df9, 0x5e1b, 0x5e1d, 0x5e3e, 0x625f, 0x629f +.2byte 0x7240, 0x7242, 0x6e44, 0x6628, 0x620b, 0x620e, 0x6231, 0x6233, 0x6235, 0x6238, 0x5e39, 0x5e5b, 0x5e5d, 0x627e, 0x629f, 0x66df +.2byte 0x72c0, 0x72a2, 0x6ea4, 0x6688, 0x626b, 0x626e, 0x6271, 0x6273, 0x6275, 0x6278, 0x5e79, 0x5e9b, 0x62bd, 0x62be, 0x66df, 0x6b1f +.2byte 0x7320, 0x7322, 0x6f04, 0x66c8, 0x62cb, 0x62ae, 0x62b1, 0x62b3, 0x62b5, 0x62b8, 0x5eba, 0x62db, 0x62dd, 0x66fe, 0x671f, 0x737f +.2byte 0x7380, 0x7382, 0x6f64, 0x6728, 0x630b, 0x630e, 0x6311, 0x6313, 0x6315, 0x5ef8, 0x5efa, 0x631b, 0x631d, 0x673e, 0x6f7f, 0x77bf +.2byte 0x6bc0, 0x6fc1, 0x6786, 0x6349, 0x5f2c, 0x5f2f, 0x5f31, 0x5f33, 0x5f55, 0x5f57, 0x5f5a, 0x635b, 0x635d, 0x675e, 0x6f9f, 0x77bf +.2byte 0x67e0, 0x63c3, 0x5f87, 0x5f6a, 0x5f6e, 0x5f70, 0x5f72, 0x5f74, 0x6376, 0x6378, 0x637a, 0x637b, 0x637d, 0x679e, 0x6fbf, 0x77df +.2byte 0x63e2, 0x5fe5, 0x5ba8, 0x5fac, 0x5fae, 0x5fb0, 0x5fb2, 0x63b5, 0x63b6, 0x63b8, 0x63ba, 0x63bb, 0x63bd, 0x67be, 0x6fdf, 0x77df +.2byte 0x5fe4, 0x5be7, 0x5fcb, 0x5fcd, 0x5fcf, 0x5fd1, 0x63d3, 0x63d5, 0x63d7, 0x67d9, 0x67da, 0x67dc, 0x67dd, 0x67de, 0x6fdf, 0x77ff +.2byte 0x5be6, 0x5fe9, 0x5feb, 0x5fed, 0x5ff0, 0x63f2, 0x63f4, 0x67f6, 0x67f8, 0x6ffb, 0x6ffc, 0x6ffd, 0x6ffe, 0x6ffe, 0x6fff, 0x77ff +.2byte 0x5be9, 0x5feb, 0x5fed, 0x5fef, 0x63f2, 0x63f4, 0x67f6, 0x6bf8, 0x73fb, 0x77fd, 0x77fe, 0x77fe, 0x77fe, 0x77ff, 0x77ff, 0x77ff +.2byte 0x7800, 0x7802, 0x7805, 0x7808, 0x780b, 0x780f, 0x7811, 0x7814, 0x7817, 0x781a, 0x781e, 0x741f, 0x6c5f, 0x649f, 0x60df, 0x613f +.2byte 0x7860, 0x7821, 0x7824, 0x7827, 0x782a, 0x782e, 0x7831, 0x7834, 0x7837, 0x783b, 0x783e, 0x707e, 0x68bf, 0x64ff, 0x653f, 0x617f +.2byte 0x78c0, 0x78a1, 0x70c6, 0x70c8, 0x70cb, 0x70ce, 0x70d1, 0x70d3, 0x70d6, 0x70d9, 0x70dc, 0x68fc, 0x651d, 0x657e, 0x657f, 0x65bf +.2byte 0x7920, 0x7901, 0x7106, 0x6929, 0x692b, 0x692e, 0x6930, 0x6933, 0x6935, 0x6938, 0x693a, 0x655b, 0x659d, 0x65be, 0x65bf, 0x65ff +.2byte 0x7980, 0x7961, 0x7166, 0x6989, 0x658c, 0x658e, 0x6590, 0x6593, 0x6595, 0x6597, 0x6599, 0x65db, 0x65dd, 0x65fe, 0x661f, 0x665f +.2byte 0x79e0, 0x79c1, 0x71c6, 0x69c9, 0x65cc, 0x65ef, 0x65f1, 0x65f3, 0x65f5, 0x65f7, 0x65f9, 0x661b, 0x661d, 0x663e, 0x665f, 0x6a9f +.2byte 0x7a40, 0x7a41, 0x7226, 0x6a29, 0x662c, 0x662f, 0x6631, 0x6633, 0x6635, 0x6637, 0x6639, 0x665b, 0x665d, 0x667e, 0x6a9f, 0x6adf +.2byte 0x7aa0, 0x7a81, 0x7286, 0x6a69, 0x666c, 0x666f, 0x6671, 0x6673, 0x6675, 0x6677, 0x6679, 0x669b, 0x66bd, 0x6abe, 0x6adf, 0x6f1f +.2byte 0x7b00, 0x7b01, 0x72c6, 0x6ac9, 0x66ac, 0x66af, 0x66b1, 0x66b3, 0x6ab5, 0x6ab7, 0x6aba, 0x66db, 0x6add, 0x6afe, 0x6b1f, 0x737f +.2byte 0x7b60, 0x7b61, 0x7326, 0x6b09, 0x66ec, 0x66ef, 0x66f1, 0x66f3, 0x6af5, 0x6af7, 0x6afa, 0x6b1b, 0x6b1d, 0x6b3e, 0x737f, 0x7bbf +.2byte 0x7bc0, 0x7bc1, 0x7386, 0x6b49, 0x672c, 0x672f, 0x6731, 0x6733, 0x6b55, 0x6b57, 0x673a, 0x6b5c, 0x6b5d, 0x739e, 0x77bf, 0x7fff +.2byte 0x73e0, 0x6fc3, 0x6b87, 0x676a, 0x676e, 0x6770, 0x6772, 0x6774, 0x6776, 0x6b78, 0x6b9a, 0x6b9c, 0x6b9d, 0x73be, 0x77df, 0x7fff +.2byte 0x6be2, 0x67e5, 0x67a8, 0x67ac, 0x67ae, 0x67b0, 0x67b2, 0x67b5, 0x6bb6, 0x6bb8, 0x6bba, 0x6bbc, 0x6bbd, 0x73de, 0x77df, 0x7fff +.2byte 0x67e4, 0x67e7, 0x67cb, 0x67cd, 0x67cf, 0x67d1, 0x67d3, 0x6bd5, 0x6bd7, 0x6bd9, 0x73dc, 0x73dd, 0x73de, 0x73de, 0x77ff, 0x7fff +.2byte 0x63e6, 0x63e9, 0x63eb, 0x67ed, 0x67f0, 0x67f2, 0x6bf4, 0x6bf6, 0x6bf8, 0x73fb, 0x77fd, 0x77fe, 0x77fe, 0x77ff, 0x77ff, 0x7fff +.2byte 0x63e9, 0x63eb, 0x63ed, 0x67ef, 0x67f2, 0x6bf4, 0x6bf6, 0x6ff8, 0x73fb, 0x77fd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7c00, 0x7c02, 0x7c05, 0x7c08, 0x7c0b, 0x7c0e, 0x7c11, 0x7c13, 0x7c17, 0x7c19, 0x7c1c, 0x7c1f, 0x745f, 0x6c9f, 0x68df, 0x693f +.2byte 0x7c60, 0x7863, 0x7865, 0x7868, 0x786b, 0x786d, 0x7871, 0x7873, 0x7876, 0x7878, 0x787b, 0x787e, 0x74bf, 0x6cff, 0x693f, 0x697f +.2byte 0x7cc0, 0x78c3, 0x70e7, 0x70e9, 0x70ec, 0x70ee, 0x70f0, 0x70f3, 0x70f5, 0x70f7, 0x70fa, 0x70fc, 0x6d1d, 0x6d7e, 0x697f, 0x69bf +.2byte 0x7d20, 0x7903, 0x7127, 0x6d4a, 0x6d4c, 0x6d4e, 0x6d50, 0x6d53, 0x6d55, 0x6d57, 0x6d59, 0x6d5b, 0x6d9d, 0x6dbe, 0x6dbf, 0x69ff +.2byte 0x7d60, 0x7963, 0x7187, 0x6d8a, 0x6dce, 0x6dd0, 0x6dd2, 0x6dd3, 0x6dd5, 0x6dd7, 0x6dd9, 0x6ddb, 0x6ddd, 0x6dfe, 0x6e1f, 0x6a5f +.2byte 0x7de0, 0x79c3, 0x71c7, 0x6dca, 0x6e0e, 0x6e10, 0x6e12, 0x6e13, 0x6e15, 0x6e17, 0x6e19, 0x6e1b, 0x6e1d, 0x6e3e, 0x6e5f, 0x6e9f +.2byte 0x7e20, 0x7a23, 0x7227, 0x6e2a, 0x6e4e, 0x6e50, 0x6e52, 0x6e54, 0x6e55, 0x6e57, 0x6e59, 0x6e5b, 0x6e5d, 0x6e7e, 0x6e9f, 0x6edf +.2byte 0x7e80, 0x7a63, 0x7267, 0x6e6a, 0x6e8e, 0x6e90, 0x6e92, 0x6e94, 0x6e96, 0x6e97, 0x6e99, 0x6e9b, 0x6ebd, 0x6ebe, 0x6edf, 0x731f +.2byte 0x7ee0, 0x7ac3, 0x72a7, 0x6eaa, 0x6eae, 0x6eb0, 0x6ed2, 0x6ed4, 0x6ed6, 0x6ed8, 0x6ed9, 0x6edb, 0x6edd, 0x6efe, 0x731f, 0x777f +.2byte 0x7f40, 0x7b23, 0x7307, 0x6eea, 0x6eee, 0x6ef0, 0x6ef2, 0x6ef4, 0x6f16, 0x6f18, 0x6f1a, 0x6f1b, 0x6f1d, 0x733e, 0x777f, 0x7bbf +.2byte 0x7fa0, 0x7b83, 0x7347, 0x6f2a, 0x6f2e, 0x6f30, 0x6f32, 0x6f34, 0x6f36, 0x6f58, 0x735a, 0x735c, 0x735d, 0x779e, 0x7bbf, 0x7fff +.2byte 0x7fe0, 0x7bc3, 0x7387, 0x6f6a, 0x6f6e, 0x6f70, 0x6f72, 0x6f74, 0x6f76, 0x6f78, 0x739a, 0x6f7c, 0x77be, 0x7bdf, 0x7fff, 0x7fff +.2byte 0x77e2, 0x73e5, 0x6fa8, 0x6fac, 0x6fae, 0x6fb0, 0x6fb2, 0x6fb5, 0x6fb6, 0x6fb8, 0x73ba, 0x77dd, 0x77de, 0x7bdf, 0x7fff, 0x7fff +.2byte 0x6fe4, 0x6be7, 0x6bcb, 0x6bcd, 0x6bcf, 0x6fd1, 0x6fd3, 0x6fd5, 0x6fd7, 0x73d9, 0x77dc, 0x7bfe, 0x7bfe, 0x7bff, 0x7fff, 0x7fff +.2byte 0x6be6, 0x6be9, 0x6beb, 0x6bed, 0x6bf0, 0x6ff2, 0x6ff4, 0x6ff6, 0x73f8, 0x77fb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x67e9, 0x67eb, 0x6bed, 0x6bef, 0x6bf2, 0x6ff4, 0x6ff6, 0x73f8, 0x77fb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7c42, 0x7c44, 0x7c46, 0x7c49, 0x7c4b, 0x7c4e, 0x7c51, 0x7c53, 0x7c55, 0x7c58, 0x7c5a, 0x7c5d, 0x7c5f, 0x789f, 0x70df, 0x6d3f +.2byte 0x7c82, 0x7ca5, 0x7ca7, 0x7ca9, 0x7cac, 0x7cae, 0x7cb0, 0x7cb3, 0x7cb5, 0x7cb7, 0x7cb9, 0x7cbc, 0x7cbf, 0x74ff, 0x713f, 0x6d7f +.2byte 0x7ce2, 0x7ce5, 0x7508, 0x750a, 0x750c, 0x750e, 0x7510, 0x7513, 0x7514, 0x7516, 0x7519, 0x751b, 0x751d, 0x717e, 0x717f, 0x6dbf +.2byte 0x7d22, 0x7d25, 0x7568, 0x758c, 0x758e, 0x7590, 0x7591, 0x7593, 0x7595, 0x7597, 0x7599, 0x759b, 0x759d, 0x71be, 0x71bf, 0x6dff +.2byte 0x7d82, 0x7d85, 0x75a8, 0x75cc, 0x75ce, 0x75d0, 0x75d2, 0x75d4, 0x75d5, 0x75d7, 0x75d9, 0x75db, 0x75dd, 0x71fe, 0x721f, 0x725f +.2byte 0x7dc2, 0x7dc5, 0x75e8, 0x760c, 0x760e, 0x7610, 0x7612, 0x7614, 0x7615, 0x7617, 0x7619, 0x761b, 0x761d, 0x723e, 0x725f, 0x729f +.2byte 0x7e22, 0x7e25, 0x7628, 0x764c, 0x764e, 0x7650, 0x7652, 0x7654, 0x7656, 0x7657, 0x7659, 0x765b, 0x765d, 0x727e, 0x729f, 0x72df +.2byte 0x7e62, 0x7e65, 0x7668, 0x768c, 0x768e, 0x7690, 0x7692, 0x76b5, 0x76b6, 0x76b8, 0x76b9, 0x76bb, 0x76bd, 0x72be, 0x76df, 0x771f +.2byte 0x7ec2, 0x7ea5, 0x76a8, 0x76ac, 0x76ae, 0x76d0, 0x76d2, 0x76d5, 0x76d6, 0x76d8, 0x76da, 0x76db, 0x76dd, 0x76fe, 0x771f, 0x7b7f +.2byte 0x7f02, 0x7f05, 0x76e8, 0x76ec, 0x76ee, 0x76f0, 0x76f2, 0x7715, 0x7716, 0x7718, 0x771a, 0x771b, 0x771d, 0x773e, 0x7b7f, 0x7bbf +.2byte 0x7f62, 0x7f45, 0x7728, 0x772c, 0x772e, 0x7730, 0x7732, 0x7735, 0x7756, 0x7758, 0x775a, 0x775c, 0x775d, 0x7b9e, 0x7bbf, 0x7fff +.2byte 0x7fa2, 0x7fa5, 0x7768, 0x776c, 0x776e, 0x7770, 0x7772, 0x7775, 0x7776, 0x7778, 0x779a, 0x7bbd, 0x7bbe, 0x7bdf, 0x7fff, 0x7fff +.2byte 0x7fe2, 0x7fe5, 0x77a8, 0x77ac, 0x77ae, 0x77b0, 0x77b2, 0x77b5, 0x77b6, 0x77b8, 0x77ba, 0x7bdd, 0x7bde, 0x7fff, 0x7fff, 0x7fff +.2byte 0x77e4, 0x73e7, 0x73cb, 0x73cd, 0x73cf, 0x73d1, 0x73d3, 0x73d5, 0x77d7, 0x77d9, 0x7bdc, 0x7bfe, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x73e6, 0x73e9, 0x73eb, 0x73ed, 0x73f0, 0x73f2, 0x73f4, 0x73f6, 0x77f8, 0x7bfb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x6fe9, 0x6feb, 0x6fed, 0x6fef, 0x73f2, 0x73f4, 0x73f6, 0x77f8, 0x7bfb, 0x7bfd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7c84, 0x7c86, 0x7c88, 0x7c8a, 0x7c8c, 0x7c8e, 0x7c90, 0x7c93, 0x7c94, 0x7c97, 0x7c99, 0x7c9b, 0x7c9d, 0x7c9f, 0x78df, 0x753f +.2byte 0x7cc4, 0x7ce7, 0x7ce8, 0x7cea, 0x7ced, 0x7cee, 0x7cf0, 0x7cf3, 0x7cf4, 0x7cf6, 0x7cf9, 0x7cfa, 0x7cfc, 0x7cff, 0x793f, 0x757f +.2byte 0x7d04, 0x7d27, 0x796b, 0x796c, 0x796e, 0x7970, 0x7971, 0x7973, 0x7975, 0x7977, 0x7979, 0x797a, 0x797c, 0x797e, 0x797f, 0x75bf +.2byte 0x7d44, 0x7d67, 0x79ab, 0x79ad, 0x79ae, 0x79b0, 0x79b2, 0x79b3, 0x79b5, 0x79b7, 0x79b9, 0x79ba, 0x79bc, 0x79be, 0x79bf, 0x75ff +.2byte 0x7da4, 0x7da7, 0x79cb, 0x79ed, 0x79ef, 0x79f0, 0x79f2, 0x79f4, 0x79f5, 0x79f7, 0x79f9, 0x79fa, 0x79fc, 0x79fe, 0x7a1f, 0x765f +.2byte 0x7dc4, 0x7de7, 0x7a0b, 0x7a0d, 0x7a2f, 0x7a31, 0x7a33, 0x7a34, 0x7a36, 0x7a37, 0x7a39, 0x7a3b, 0x7a3c, 0x7a3e, 0x7a5f, 0x769f +.2byte 0x7e24, 0x7e27, 0x7a4b, 0x7a4d, 0x7a4f, 0x7a71, 0x7a73, 0x7a75, 0x7a76, 0x7a78, 0x7a79, 0x7a7b, 0x7a7c, 0x7a7e, 0x7a9f, 0x76df +.2byte 0x7e64, 0x7e67, 0x7a8b, 0x7a8d, 0x7a8f, 0x7a91, 0x7ab3, 0x7ab5, 0x7ab6, 0x7ab8, 0x7aba, 0x7abb, 0x7abc, 0x7abe, 0x7adf, 0x7b1f +.2byte 0x7ea4, 0x7ea7, 0x7aab, 0x7aad, 0x7acf, 0x7ad1, 0x7ad3, 0x7af5, 0x7af7, 0x7af8, 0x7afa, 0x7afb, 0x7afd, 0x7afe, 0x7b1f, 0x7b7f +.2byte 0x7ee4, 0x7ee7, 0x7aeb, 0x7aed, 0x7aef, 0x7af1, 0x7b13, 0x7b15, 0x7b37, 0x7b39, 0x7b3a, 0x7b3c, 0x7b3d, 0x7b3e, 0x7b7f, 0x7fbf +.2byte 0x7f24, 0x7f27, 0x7b2b, 0x7b2d, 0x7b2f, 0x7b31, 0x7b33, 0x7b55, 0x7b57, 0x7b59, 0x7b9c, 0x7b9d, 0x7b9e, 0x7b9e, 0x7fbf, 0x7fff +.2byte 0x7f64, 0x7f67, 0x7b6b, 0x7b6d, 0x7b6f, 0x7b71, 0x7b73, 0x7b75, 0x7b77, 0x7b99, 0x7bbc, 0x7fde, 0x7fde, 0x7fdf, 0x7fff, 0x7fff +.2byte 0x7fc4, 0x7fa7, 0x7b8b, 0x7b8d, 0x7b8f, 0x7b91, 0x7b93, 0x7b95, 0x7bb7, 0x7bb9, 0x7bdc, 0x7fde, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fe4, 0x7fe7, 0x7bcb, 0x7bcd, 0x7bcf, 0x7bd1, 0x7bd3, 0x7bd5, 0x7bd7, 0x7bd9, 0x7bdc, 0x7ffe, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x77e6, 0x7be9, 0x77eb, 0x7bed, 0x7bf0, 0x7bf2, 0x7bf4, 0x7bf6, 0x7bf8, 0x7bfb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x73e9, 0x73eb, 0x73ed, 0x77ef, 0x77f2, 0x77f4, 0x77f6, 0x7bf8, 0x7bfb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7cc6, 0x7cc8, 0x7cc9, 0x7ccb, 0x7ccd, 0x7ccf, 0x7cd1, 0x7cd3, 0x7cd4, 0x7cd6, 0x7cd8, 0x7cda, 0x7cdc, 0x7cdd, 0x7cdf, 0x793f +.2byte 0x7d06, 0x7d29, 0x7d2b, 0x7d2d, 0x7d2e, 0x7d30, 0x7d31, 0x7d33, 0x7d35, 0x7d37, 0x7d38, 0x7d3a, 0x7d3c, 0x7d3e, 0x7d3f, 0x797f +.2byte 0x7d46, 0x7d69, 0x7d6b, 0x7d6d, 0x7d6e, 0x7d70, 0x7d72, 0x7d73, 0x7d75, 0x7d77, 0x7d78, 0x7d7a, 0x7d7c, 0x7d7d, 0x7d7f, 0x79bf +.2byte 0x7d66, 0x7da9, 0x7dab, 0x7dad, 0x7daf, 0x7db0, 0x7db2, 0x7db4, 0x7db6, 0x7db7, 0x7db9, 0x7dba, 0x7dbc, 0x7dbe, 0x7dbf, 0x79ff +.2byte 0x7dc6, 0x7dc9, 0x7deb, 0x7ded, 0x7e10, 0x7e11, 0x7e12, 0x7e14, 0x7e16, 0x7e17, 0x7e19, 0x7e1a, 0x7e1c, 0x7e1e, 0x7e1f, 0x7a5f +.2byte 0x7de6, 0x7e09, 0x7e0b, 0x7e2d, 0x7e30, 0x7e52, 0x7e53, 0x7e55, 0x7e56, 0x7e58, 0x7e59, 0x7e5b, 0x7e5c, 0x7e5e, 0x7e5f, 0x7a9f +.2byte 0x7e26, 0x7e49, 0x7e4b, 0x7e6d, 0x7e70, 0x7e72, 0x7e94, 0x7e95, 0x7e97, 0x7e98, 0x7e9a, 0x7e9b, 0x7e9c, 0x7e9e, 0x7e9f, 0x7edf +.2byte 0x7e66, 0x7e89, 0x7e8b, 0x7e8d, 0x7e90, 0x7eb2, 0x7eb4, 0x7ed6, 0x7ed7, 0x7ed9, 0x7eda, 0x7edb, 0x7edc, 0x7ede, 0x7edf, 0x7f1f +.2byte 0x7ea6, 0x7ec9, 0x7eab, 0x7ecd, 0x7ed0, 0x7ed2, 0x7ef4, 0x7ef6, 0x7f18, 0x7f19, 0x7f1a, 0x7f1c, 0x7f1d, 0x7f1e, 0x7f1f, 0x7f7f +.2byte 0x7ee6, 0x7ee9, 0x7eeb, 0x7eed, 0x7ef0, 0x7f12, 0x7f14, 0x7f36, 0x7f38, 0x7f7b, 0x7f7c, 0x7f7d, 0x7f7e, 0x7f7e, 0x7f7f, 0x7fbf +.2byte 0x7f06, 0x7f29, 0x7f2b, 0x7f2d, 0x7f30, 0x7f32, 0x7f54, 0x7f56, 0x7f58, 0x7f9b, 0x7fbd, 0x7fbe, 0x7fbe, 0x7fbf, 0x7fbf, 0x7fff +.2byte 0x7f46, 0x7f49, 0x7f4b, 0x7f6d, 0x7f70, 0x7f72, 0x7f74, 0x7f76, 0x7f98, 0x7fbb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7f86, 0x7f89, 0x7f8b, 0x7f8d, 0x7f90, 0x7f92, 0x7f94, 0x7fb6, 0x7fb8, 0x7fdb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fc6, 0x7fc9, 0x7fcb, 0x7fcd, 0x7fd0, 0x7fd2, 0x7fd4, 0x7fd6, 0x7fd8, 0x7fdb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fe6, 0x7fe9, 0x7feb, 0x7fed, 0x7ff0, 0x7ff2, 0x7ff4, 0x7ff6, 0x7ff8, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7be9, 0x7beb, 0x7bed, 0x7bef, 0x7bf2, 0x7bf4, 0x7bf6, 0x7bf8, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7d29, 0x7d2a, 0x7d2c, 0x7d2d, 0x7d2f, 0x7d30, 0x7d32, 0x7d33, 0x7d35, 0x7d36, 0x7d38, 0x7d39, 0x7d3b, 0x7d3c, 0x7d3e, 0x7d3f +.2byte 0x7d69, 0x7d6b, 0x7d6d, 0x7d6e, 0x7d6f, 0x7d71, 0x7d72, 0x7d74, 0x7d75, 0x7d77, 0x7d78, 0x7d79, 0x7d7b, 0x7d7c, 0x7d7e, 0x7d7f +.2byte 0x7d89, 0x7dab, 0x7dad, 0x7daf, 0x7db0, 0x7db1, 0x7db3, 0x7db4, 0x7db6, 0x7db7, 0x7db8, 0x7dba, 0x7dbb, 0x7dbc, 0x7dbe, 0x7dbf +.2byte 0x7dc9, 0x7dcb, 0x7ded, 0x7def, 0x7df1, 0x7df2, 0x7df3, 0x7df5, 0x7df6, 0x7df7, 0x7df9, 0x7dfa, 0x7dfb, 0x7dfd, 0x7dfe, 0x7dff +.2byte 0x7de9, 0x7e0b, 0x7e0d, 0x7e2f, 0x7e52, 0x7e53, 0x7e54, 0x7e55, 0x7e56, 0x7e58, 0x7e59, 0x7e5a, 0x7e5c, 0x7e5d, 0x7e5e, 0x7e5f +.2byte 0x7e29, 0x7e2b, 0x7e4d, 0x7e4f, 0x7e72, 0x7e94, 0x7e95, 0x7e96, 0x7e97, 0x7e98, 0x7e9a, 0x7e9b, 0x7e9c, 0x7e9d, 0x7e9e, 0x7e9f +.2byte 0x7e49, 0x7e6b, 0x7e6d, 0x7e6f, 0x7e92, 0x7eb4, 0x7ed6, 0x7ed7, 0x7ed8, 0x7ed9, 0x7eda, 0x7edb, 0x7edc, 0x7edd, 0x7ede, 0x7edf +.2byte 0x7e89, 0x7e8b, 0x7e8d, 0x7eaf, 0x7eb2, 0x7ed4, 0x7ef6, 0x7f18, 0x7f19, 0x7f1a, 0x7f1b, 0x7f1c, 0x7f1d, 0x7f1e, 0x7f1e, 0x7f1f +.2byte 0x7ea9, 0x7eab, 0x7ecd, 0x7ecf, 0x7ef2, 0x7ef4, 0x7f16, 0x7f38, 0x7f7b, 0x7f7c, 0x7f7c, 0x7f7d, 0x7f7e, 0x7f7e, 0x7f7f, 0x7f7f +.2byte 0x7ee9, 0x7eeb, 0x7eed, 0x7eef, 0x7f12, 0x7f14, 0x7f36, 0x7f58, 0x7f9b, 0x7fbd, 0x7fbd, 0x7fbe, 0x7fbe, 0x7fbf, 0x7fbf, 0x7fbf +.2byte 0x7f09, 0x7f0b, 0x7f2d, 0x7f2f, 0x7f32, 0x7f54, 0x7f56, 0x7f78, 0x7f9b, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7f49, 0x7f4b, 0x7f4d, 0x7f4f, 0x7f52, 0x7f74, 0x7f76, 0x7f98, 0x7fbb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7f69, 0x7f6b, 0x7f6d, 0x7f6f, 0x7f92, 0x7f94, 0x7f96, 0x7fb8, 0x7fdb, 0x7fdd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fa9, 0x7fab, 0x7fad, 0x7faf, 0x7fb2, 0x7fb4, 0x7fb6, 0x7fd8, 0x7fdb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fc9, 0x7fcb, 0x7fcd, 0x7fcf, 0x7fd2, 0x7fd4, 0x7ff6, 0x7ff8, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff +.2byte 0x7fe9, 0x7feb, 0x7fed, 0x7fef, 0x7ff2, 0x7ff4, 0x7ff6, 0x7ff8, 0x7ffb, 0x7ffd, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff, 0x7fff gUnknown_0854C14C:: @ 854C14C - .incbin "baserom.gba", 0x54c14c, 0x4 +@ replacing .incbin "baserom.gba", 0x0054c14c, 0x4 +.4byte gUnknown_02038454 gUnknown_0854C150:: @ 854C150 - .incbin "baserom.gba", 0x54c150, 0xf0 +@ replacing .incbin "baserom.gba", 0x0054c150, 0xf0 +.4byte sub_80AB26C +.4byte nullsub_36 +.4byte sub_80AB26C +.4byte sub_80AB290 +.4byte sub_80AC438 +.4byte sub_80AC4B4 +.4byte sub_80AC484 +.4byte sub_80AC514 +.4byte sub_80AC55C +.4byte nullsub_95 +.4byte sub_80AC580 +.4byte sub_80AC590 +.4byte sub_80AC928 +.4byte sub_80AC9C4 +.4byte sub_80AC994 +.4byte sub_80ACA24 +.4byte sub_80ACF8C +.4byte snowflakes_progress2 +.4byte sub_80ACFDC +.4byte sub_80AD084 +.4byte sub_80AD444 +.4byte sub_80AD584 +.4byte sub_80AD4B8 +.4byte sub_80AD910 +.4byte sub_80ADA60 +.4byte sub_80ADAF0 +.4byte sub_80ADAC0 +.4byte sub_80ADBB0 +.4byte sub_80ADDBC +.4byte sub_80ADE48 +.4byte sub_80ADE18 +.4byte sub_80ADEF4 +.4byte sub_80AE45C +.4byte sub_80AE50C +.4byte sub_80AE4DC +.4byte sub_80AE588 +.4byte sub_80AE0E4 +.4byte sub_80AE198 +.4byte sub_80AE168 +.4byte sub_80AE1FC +.4byte sub_80ADA60 +.4byte sub_80ADAF0 +.4byte sub_80ADAC0 +.4byte sub_80ADBB0 +.4byte sub_80AE9F0 +.4byte nullsub_96 +.4byte sub_80AEA20 +.4byte sub_80AEA30 +.4byte sub_80AC6D0 +.4byte sub_80AC734 +.4byte sub_80AC704 +.4byte sub_80AC818 +.4byte sub_80AD4E8 +.4byte sub_80AD584 +.4byte sub_80AD554 +.4byte sub_80AD910 +.4byte sub_80AEA34 +.4byte sub_80AEAB8 +.4byte sub_80AEA88 +.4byte sub_80AEB2C gUnknown_0854C240:: @ 854C240 - .incbin "baserom.gba", 0x54c240, 0x10 +@ replacing .incbin "baserom.gba", 0x0054c240, 0x10 +.4byte sub_80AB3A8 +.4byte sub_80AB434 +.4byte nullsub_94 +.4byte nullsub_94 gUnknown_0854C250:: @ 854C250 .incbin "baserom.gba", 0x54c250, 0x20 @@ -32,7 +1633,8 @@ gUnknown_0854CAD0:: @ 854CAD0 .incbin "baserom.gba", 0x54cad0, 0x3080 gUnknown_0854FB50:: @ 854FB50 - .incbin "baserom.gba", 0x54fb50, 0xc +@ replacing .incbin "baserom.gba", 0x0054fb50, 0xc +.2byte 0x0000, 0x0042, 0x0005, 0x0049, 0x000a, 0x004e gUnknown_0854FB5C:: @ 854FB5C .incbin "baserom.gba", 0x54fb5c, 0x1c @@ -83,10 +1685,12 @@ gUnknown_0854FDDC:: @ 854FDDC .incbin "baserom.gba", 0x54fddc, 0x8 gUnknown_0854FDE4:: @ 854FDE4 - .incbin "baserom.gba", 0x54fde4, 0xc +@ replacing .incbin "baserom.gba", 0x0054fde4, 0xc +.2byte 0x0000, 0x0078, 0x0050, 0x00a0, 0x0028, 0x0000 gUnknown_0854FDF0:: @ 854FDF0 - .incbin "baserom.gba", 0x54fdf0, 0x8 +@ replacing .incbin "baserom.gba", 0x0054fdf0, 0x8 +.byte 0x28, 0x5a, 0x3c, 0x5a, 0x02, 0x3c, 0x28, 0x1e gUnknown_0854FDF8:: @ 854FDF8 .incbin "baserom.gba", 0x54fdf8, 0x8 @@ -98,16 +1702,21 @@ gUnknown_0854FE44:: @ 854FE44 .incbin "baserom.gba", 0x54fe44, 0x18 gUnknown_0854FE5C:: @ 854FE5C - .incbin "baserom.gba", 0x54fe5c, 0x4 +@ replacing .incbin "baserom.gba", 0x0054fe5c, 0x4 +.byte 0x02, 0x03, 0x05, 0x03 gUnknown_0854FE60:: @ 854FE60 - .incbin "baserom.gba", 0x54fe60, 0x4 +@ replacing .incbin "baserom.gba", 0x0054fe60, 0x4 +.byte 0x02, 0x02, 0x03, 0x02 gUnknown_0854FE64:: @ 854FE64 .incbin "baserom.gba", 0x54fe64, 0x14 gUnknown_0854FE78:: @ 854FE78 - .incbin "baserom.gba", 0x54fe78, 0x4 +@ replacing .incbin "baserom.gba", 0x0054fe78, 0x4 +.4byte 0x00000008 gUnknown_0854FE7C:: @ 854FE7C - .incbin "baserom.gba", 0x54fe7c, 0xc +@ replacing .incbin "baserom.gba", 0x0054fe7c, 0xc +.4byte 0x04000040, 0xa2600001, 0x00000001 + diff --git a/data/fieldmap.s b/data/fieldmap.s index e2cc537da..1daa3efdf 100644 --- a/data/fieldmap.s +++ b/data/fieldmap.s @@ -5,4 +5,4 @@ .align 2, 0 gUnknown_08486EF8:: @ 8486EF8 - .incbin "baserom.gba", 0x486ef8, 0x4 + .4byte 0x00000000 diff --git a/data/fldeff_cut.s b/data/fldeff_cut.s index 96bdcede4..f9d72e088 100644 --- a/data/fldeff_cut.s +++ b/data/fldeff_cut.s @@ -8,7 +8,9 @@ gUnknown_0857C608:: @ 857C608 .incbin "baserom.gba", 0x57c608, 0x2 gUnknown_0857C60A:: @ 857C60A - .incbin "baserom.gba", 0x57c60a, 0x5a + .byte 0x01, 0x00, 0xff, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x01, 0xfe, 0x03, 0x00, 0x02, 0xfe, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x02, 0xff, 0x03, 0x00, 0xfe, 0x00, 0x04, 0x00, 0x02, 0x00 + .byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x01, 0x14, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0xfe, 0xff, 0x00, 0x00, 0x50, 0xc6, 0x57, 0x08, 0x58, 0x6e, 0x4f, 0x08, 0x20, 0x00, 0x00, 0x00 .align 2 gFieldEffectObjectPaletteInfo6:: @ 857C664 diff --git a/data/graphics.s b/data/graphics.s index 06c4b9e18..aebe35093 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1,12 +1,12 @@ .section gfx_data, "aw", %progbits -gUnknown_08C00000:: @ 8C00000 +gBattleTextboxTiles:: @ 8C00000 .incbin "baserom.gba", 0xc00000, 0x4e0 -gUnknown_08C004E0:: @ 8C004E0 +gBattleTextboxPalette:: @ 8C004E0 .incbin "baserom.gba", 0xc004e0, 0x44 -gUnknown_08C00524:: @ 8C00524 +gBattleTextboxTilemap:: @ 8C00524 .incbin "baserom.gba", 0xc00524, 0x22c @ 8C00750 @@ -352,199 +352,199 @@ gUnknown_08D77AE4:: @ 8D77AE4 gUnknown_08D77B0C:: @ 8D77B0C .incbin "baserom.gba", 0xd77b0c, 0x25c -gUnknown_08D77D68:: @ 8D77D68 +gBattleTerrainTiles_TallGrass:: @ 8D77D68 .incbin "baserom.gba", 0xd77d68, 0x5b0 -gUnknown_08D78318:: @ 8D78318 +gBattleTerrainPalette_TallGrass:: @ 8D78318 .incbin "baserom.gba", 0xd78318, 0x38 -gUnknown_08D78350:: @ 8D78350 +gBattleTerrainTilemap_TallGrass:: @ 8D78350 .incbin "baserom.gba", 0xd78350, 0x2b0 -gUnknown_08D78600:: @ 8D78600 +gBattleTerrainTiles_LongGrass:: @ 8D78600 .incbin "baserom.gba", 0xd78600, 0x678 -gUnknown_08D78C78:: @ 8D78C78 +gBattleTerrainPalette_LongGrass:: @ 8D78C78 .incbin "baserom.gba", 0xd78C78, 0x40 -gUnknown_08D78CB8:: @ 8D78CB8 +gBattleTerrainTilemap_LongGrass:: @ 8D78CB8 .incbin "baserom.gba", 0xd78CB8, 0x2b0 -gUnknown_08D78F68:: @ 8D78F68 +gBattleTerrainTiles_Sand:: @ 8D78F68 .incbin "baserom.gba", 0xd78f68, 0x5f8 -gUnknown_08D79560:: @ 8D79560 +gBattleTerrainPalette_Sand:: @ 8D79560 .incbin "baserom.gba", 0xd79560, 0x48 -gUnknown_08D795A8:: @ 8D795A8 +gBattleTerrainTilemap_Sand:: @ 8D795A8 .incbin "baserom.gba", 0xd795A8, 0x2b0 -gUnknown_08D79858:: @ 8D79858 +gBattleTerrainTiles_Underwater:: @ 8D79858 .incbin "baserom.gba", 0xd79858, 0x5b8 -gUnknown_08D79E10:: @ 8D79E10 +gBattleTerrainPalette_Underwater:: @ 8D79E10 .incbin "baserom.gba", 0xd79E10, 0x48 -gUnknown_08D79E58:: @ 8D79E58 +gBattleTerrainTilemap_Underwater:: @ 8D79E58 .incbin "baserom.gba", 0xd79e58, 0x2b0 -gUnknown_08D7A108:: @ 8D7A108 +gBattleTerrainTiles_Water:: @ 8D7A108 .incbin "baserom.gba", 0xd7a108, 0x5d4 -gUnknown_08D7A6DC:: @ 8D7A6DC +gBattleTerrainPalette_Water:: @ 8D7A6DC .incbin "baserom.gba", 0xd7a6DC, 0x44 -gUnknown_08D7A720:: @ 8D7A720 +gBattleTerrainTilemap_Water:: @ 8D7A720 .incbin "baserom.gba", 0xd7a720, 0x2b0 -gUnknown_08D7A9D0:: @ 8D7A9D0 +gBattleTerrainTiles_PondWater:: @ 8D7A9D0 .incbin "baserom.gba", 0xd7a9D0, 0x5a8 -gUnknown_08D7AF78:: @ 8D7AF78 +gBattleTerrainPalette_PondWater:: @ 8D7AF78 .incbin "baserom.gba", 0xd7af78, 0x40 -gUnknown_08D7AFB8:: @ 8D7AFB8 +gBattleTerrainTilemap_PondWater:: @ 8D7AFB8 .incbin "baserom.gba", 0xd7aFB8, 0x2b0 -gUnknown_08D7B268:: @ 8D7B268 +gBattleTerrainTiles_Rock:: @ 8D7B268 .incbin "baserom.gba", 0xd7b268, 0x5c0 -gUnknown_08D7B828:: @ 8D7B828 +gBattleTerrainPalette_Rock:: @ 8D7B828 .incbin "baserom.gba", 0xd7b828, 0x3c -gUnknown_08D7B864:: @ 8D7B864 +gBattleTerrainTilemap_Rock:: @ 8D7B864 .incbin "baserom.gba", 0xd7b864, 0x2b0 -gUnknown_08D7BB14:: @ 8D7BB14 +gBattleTerrainTiles_Cave:: @ 8D7BB14 .incbin "baserom.gba", 0xd7bb14, 0x5f8 -gUnknown_08D7C10C:: @ 8D7C10C +gBattleTerrainPalette_Cave:: @ 8D7C10C .incbin "baserom.gba", 0xd7c10c, 0x48 -gUnknown_08D7C154:: @ 8D7C154 +gBattleTerrainTilemap_Cave:: @ 8D7C154 .incbin "baserom.gba", 0xd7c154, 0x2b0 -gUnknown_08D7C404:: @ 8D7C404 +gBattleTerrainPalette_Plain:: @ 8D7C404 .incbin "baserom.gba", 0xd7c404, 0x3c -gUnknown_08D7C440:: @ 8D7C440 +gBattleTerrainTiles_Building:: @ 8D7C440 .incbin "baserom.gba", 0xd7c440, 0x5ac -gUnknown_08D7C9EC:: @ 8D7C9EC +gBattleTerrainPalette_Frontier:: @ 8D7C9EC .incbin "baserom.gba", 0xd7c9ec, 0x3c -gUnknown_08D7CA28:: @ 8D7CA28 +gBattleTerrainTilemap_Building:: @ 8D7CA28 .incbin "baserom.gba", 0xd7ca28, 0x2b0 -gUnknown_08D7CCD8:: @ 8D7CCD8 +gBattleTerrainTiles_Stadium:: @ 8D7CCD8 .incbin "baserom.gba", 0xd7ccd8, 0x608 -gUnknown_08D7D2E0:: @ 8D7D2E0 +gBattleTerrainTilemap_Stadium:: @ 8D7D2E0 .incbin "baserom.gba", 0xd7d2e0, 0x2b0 -gUnknown_08D7D590:: @ 8D7D590 +gBattleTerrainTiles_Rayquaza:: @ 8D7D590 .incbin "baserom.gba", 0xd7d590, 0x674 -gUnknown_08D7DC04:: @ 8D7DC04 +gBattleTerrainTilemap_Rayquaza:: @ 8D7DC04 .incbin "baserom.gba", 0xd7dc04, 0x2b0 -gUnknown_08D7DEB4:: @ 8D7DEB4 +gBattleTerrainPalette_Building:: @ 8D7DEB4 .incbin "baserom.gba", 0xd7deb4, 0x40 -gUnknown_08D7DEF4:: @ 8D7DEF4 +gBattleTerrainPalette_Kyogre:: @ 8D7DEF4 .incbin "baserom.gba", 0xd7def4, 0x3c -gUnknown_08D7DF30:: @ 8D7DF30 +gBattleTerrainPalette_Groudon:: @ 8D7DF30 .incbin "baserom.gba", 0xd7df30, 0x58 -gUnknown_08D7DF88:: @ 8D7DF88 +gBattleTerrainPalette_BuildingGym:: @ 8D7DF88 .incbin "baserom.gba", 0xd7df88, 0x3c -gUnknown_08D7DFC4:: @ 8D7DFC4 +gBattleTerrainPalette_BuildingLeader:: @ 8D7DFC4 .incbin "baserom.gba", 0xd7dfc4, 0x3c -gUnknown_08D7E000:: @ 8D7E000 +gBattleTerrainPalette_StadiumAqua:: @ 8D7E000 .incbin "baserom.gba", 0xd7e000, 0x60 -gUnknown_08D7E060:: @ 8D7E060 +gBattleTerrainPalette_StadiumMagma:: @ 8D7E060 .incbin "baserom.gba", 0xd7e060, 0x6c -gUnknown_08D7E0CC:: @ 8D7E0CC +gBattleTerrainPalette_StadiumSidney:: @ 8D7E0CC .incbin "baserom.gba", 0xd7e0cc, 0x50 -gUnknown_08D7E11C:: @ 8D7E11C +gBattleTerrainPalette_StadiumPhoebe:: @ 8D7E11C .incbin "baserom.gba", 0xd7e11c, 0x48 -gUnknown_08D7E164:: @ 8D7E164 +gBattleTerrainPalette_StadiumGlacia:: @ 8D7E164 .incbin "baserom.gba", 0xd7e164, 0x44 -gUnknown_08D7E1A8:: @ 8D7E1A8 +gBattleTerrainPalette_StadiumDrake:: @ 8D7E1A8 .incbin "baserom.gba", 0xd7e1a8, 0x50 -gUnknown_08D7E1F8:: @ 8D7E1F8 +gBattleTerrainPalette_StadiumWallace:: @ 8D7E1F8 .incbin "baserom.gba", 0xd7e1f8, 0x3c -gUnknown_08D7E234:: @ 8D7E234 +gBattleTerrainPalette_Rayquaza:: @ 8D7E234 .incbin "baserom.gba", 0xd7e234, 0x4c -gUnknown_08D7E280:: @ 8D7E280 +gBattleTerrainAnimTiles_TallGrass:: @ 8D7E280 .incbin "baserom.gba", 0xd7e280, 0x588 -gUnknown_08D7E808:: @ 8D7E808 +gBattleTerrainAnimTilemap_TallGrass:: @ 8D7E808 .incbin "baserom.gba", 0xd7e808, 0x1bc -gUnknown_08D7E9C4:: @ 8D7E9C4 +gBattleTerrainAnimTiles_LongGrass:: @ 8D7E9C4 .incbin "baserom.gba", 0xd7e9C4, 0x710 -gUnknown_08D7F0D4:: @ 8D7F0D4 +gBattleTerrainAnimTilemap_LongGrass:: @ 8D7F0D4 .incbin "baserom.gba", 0xd7F0D4, 0x238 -gUnknown_08D7F30C:: @ 8D7F30C +gBattleTerrainAnimTiles_Sand:: @ 8D7F30C .incbin "baserom.gba", 0xd7F30c, 0x544 -gUnknown_08D7F850:: @ 8D7F850 +gBattleTerrainAnimTilemap_Sand:: @ 8D7F850 .incbin "baserom.gba", 0xd7F850, 0x1a8 -gUnknown_08D7F9F8:: @ 8D7F9F8 +gBattleTerrainAnimTiles_Underwater:: @ 8D7F9F8 .incbin "baserom.gba", 0xd7f9f8, 0x4cc -gUnknown_08D7FEC4:: @ 8D7FEC4 +gBattleTerrainAnimTilemap_Underwater:: @ 8D7FEC4 .incbin "baserom.gba", 0xd7fec4, 0x190 -gUnknown_08D80054:: @ 8D80054 +gBattleTerrainAnimTiles_Water:: @ 8D80054 .incbin "baserom.gba", 0xd80054, 0x60c -gUnknown_08D80660:: @ 8D80660 +gBattleTerrainAnimTilemap_Water:: @ 8D80660 .incbin "baserom.gba", 0xd80660, 0x1a4 -gUnknown_08D80804:: @ 8D80804 +gBattleTerrainAnimTiles_PondWater:: @ 8D80804 .incbin "baserom.gba", 0xd80804, 0x54c -gUnknown_08D80D50:: @ 8D80D50 +gBattleTerrainAnimTilemap_PondWater:: @ 8D80D50 .incbin "baserom.gba", 0xd80d50, 0x14C -gUnknown_08D80E9C:: @ 8D80E9C +gBattleTerrainAnimTiles_Rock:: @ 8D80E9C .incbin "baserom.gba", 0xd80e9c, 0x5e0 -gUnknown_08D8147C:: @ 8D8147C +gBattleTerrainAnimTilemap_Rock:: @ 8D8147C .incbin "baserom.gba", 0xd8147C, 0x194 -gUnknown_08D81610:: @ 8D81610 +gBattleTerrainAnimTiles_Cave:: @ 8D81610 .incbin "baserom.gba", 0xd81610, 0x81c -gUnknown_08D81E2C:: @ 8D81E2C +gBattleTerrainAnimTilemap_Cave:: @ 8D81E2C .incbin "baserom.gba", 0xd81e2c, 0x2a8 -gUnknown_08D820D4:: @ 8D820D4 +gBattleTerrainAnimTiles_Building:: @ 8D820D4 .incbin "baserom.gba", 0xd820d4, 0x410 -gUnknown_08D824E4:: @ 8D824E4 +gBattleTerrainAnimTilemap_Building:: @ 8D824E4 .incbin "baserom.gba", 0xd824e4, 0x124 -gUnknown_08D82608:: @ 8D82608 +gBattleTerrainAnimTiles_Rayquaza:: @ 8D82608 .incbin "baserom.gba", 0xd82608, 0x668 -gUnknown_08D82C70:: @ 8D82C70 +gBattleTerrainAnimTilemap_Rayquaza:: @ 8D82C70 .incbin "baserom.gba", 0xd82c70, 0x2a0 gUnknown_08D82F10:: @ 8D82F10 @@ -880,14 +880,80 @@ gBuyMenuFrame_Tilemap:: @ 8D9B0F0 gMenuMoneyGfx:: @ 8D9B230 .incbin "baserom.gba", 0xd9b230, 0x84 -gUnknown_08D9B2B4:: @ 8D9B2B4 +gMenuPokeblock_Gfx:: @ 8D9B2B4 .incbin "baserom.gba", 0xd9b2b4, 0x1bc -gUnknown_08D9B470:: @ 8D9B470 - .incbin "baserom.gba", 0xd9b470, 0x358 +gMenuPokeblock_Pal:: @ 8D9B470 + .incbin "baserom.gba", 0xd9b470, 0x70 + +gMenuPokeblockDevice_Gfx:: @ 8D9B4E0 + .incbin "baserom.gba", 0xd9b4e0, 0x2c0 + +gMenuPokeblockDevice_Pal:: @ 8D9B7A0 + .incbin "baserom.gba", 0xd9b7a0, 0x28 -gUnknown_08D9B7C8:: @ 8D9B7C8 - .incbin "baserom.gba", 0xd9b7c8, 0x27c +gMenuPokeblock_Tilemap:: @ 8D9B7C8 + .incbin "baserom.gba", 0xd9b7c8, 0x148 + + .align 2 +gPokeblock_Gfx:: + .incbin "graphics/pokeblock/pokeblock.4bpp.lz" + + .align 2 +gPokeblockRed_Pal:: + .incbin "graphics/pokeblock/red.gbapal.lz" + + .align 2 +gPokeblockBlue_Pal:: + .incbin "graphics/pokeblock/blue.gbapal.lz" + + .align 2 +gPokeblockPink_Pal:: + .incbin "graphics/pokeblock/pink.gbapal.lz" + + .align 2 +gPokeblockGreen_Pal:: + .incbin "graphics/pokeblock/green.gbapal.lz" + + .align 2 +gPokeblockYellow_Pal:: + .incbin "graphics/pokeblock/yellow.gbapal.lz" + + .align 2 +gPokeblockPurple_Pal:: + .incbin "graphics/pokeblock/purple.gbapal.lz" + + .align 2 +gPokeblockIndigo_Pal:: + .incbin "graphics/pokeblock/indigo.gbapal.lz" + + .align 2 +gPokeblockBrown_Pal:: + .incbin "graphics/pokeblock/brown.gbapal.lz" + + .align 2 +gPokeblockLiteBlue_Pal:: + .incbin "graphics/pokeblock/liteblue.gbapal.lz" + + .align 2 +gPokeblockOlive_Pal:: + .incbin "graphics/pokeblock/olive.gbapal.lz" + + .align 2 +gPokeblockGray_Pal:: + .incbin "graphics/pokeblock/gray.gbapal.lz" + + .align 2 +gPokeblockBlack_Pal:: + .incbin "graphics/pokeblock/black.gbapal.lz" + + .align 2 +gPokeblockWhite_Pal:: + .incbin "graphics/pokeblock/white.gbapal.lz" + + .align 2 +gPokeblockGold_Pal:: + .incbin "graphics/pokeblock/gold.gbapal.lz" gUnknown_08D9BA44:: @ 8D9BA44 .incbin "baserom.gba", 0xd9ba44, 0x100 @@ -1461,8 +1527,11 @@ gUnknown_08DD4620:: @ 8DD4620 .incbin "baserom.gba", 0xdd4620, 0xc0 gUnknown_08DD46E0:: @ 8DD46E0 - .incbin "baserom.gba", 0xdd46e0, 0x180 + .incbin "baserom.gba", 0xdd46e0, 0xc0 +gUnknown_08DD47A0:: @ 8DD47A0 + .incbin "baserom.gba", 0xdd47a0, 0xc0 + gUnknown_08DD4860:: @ 8DD4860 .incbin "baserom.gba", 0xdd4860, 0x20 diff --git a/data/librtc_rodata.s b/data/librtc_rodata.s index 30cc8427f..0ed8b9ade 100644 --- a/data/librtc_rodata.s +++ b/data/librtc_rodata.s @@ -13,4 +13,4 @@ .4byte 0x3001A7E .4byte 0x3001A7E .4byte 0x3001A7E - .4byte 0x80000C6 + .4byte GPIOPortDirection diff --git a/data/link_strings.s b/data/link_strings.s index 6836863e0..345903e0b 100644 --- a/data/link_strings.s +++ b/data/link_strings.s @@ -1,24 +1,56 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" + .include "asm/macros.inc" + .include "constants/constants.inc" - .section .rodata + .section .rodata - .align 2 - .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$" + .align 2 + +gUnknown_862B810:: @ 862B810 + .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$" + +gUnknown_862B832:: @ 862B832 .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$" + +gUnknown_862B84B:: @ 862B84B .string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $" + +gUnknown_862B86C:: @ 862B86C .string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $" + +gUnknown_0862B88D:: @ 862B88D .string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 30}.$" + +gUnknown_0862B8AE:: @ 862B8AE .string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 7}k{CLEAR 7}l{CLEAR 7} {CLEAR 30},$" + +gUnknown_0862B8CF:: @ 862B8CF .string "{CLEAR 11}m{CLEAR 6}n{CLEAR 6}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $" + +gUnknown_0862B8F0:: @ 862B8F0 .string "{CLEAR 11}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $" + +gUnknown_0862B911:: @ 862B911 .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 30}.$" + +gUnknown_0862B932:: @ 862B932 .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 30},$" + +gUnknown_0862B953:: @ 862B953 .string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $" + +gUnknown_0862B974:: @ 862B974 .string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $" + +gUnknown_0862B995:: @ 862B995 .string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $" + +gUnknown_0862B9AE:: @ 862B9AE .string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $" - .string "{CLEAR 12}!{CLEAR 17}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 17}-$" + +gUnknown_0862B9C7:: @ 862B9C7 + .string "{CLEAR 12}!{CLEAR 17}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 17}-$" + +gUnknown_0862B9E0:: @ 862B9E0 .string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 19}’{CLEAR 18} $" gUnknown_0862B9F9:: @ 862B9F9 diff --git a/data/mauville_old_man.s b/data/mauville_old_man.s index c9e096f19..d7832b761 100644 --- a/data/mauville_old_man.s +++ b/data/mauville_old_man.s @@ -8,10 +8,24 @@ gUnknown_0859EFE4:: @ 859EFE4 .2byte 0x2811, 0x1029, 0x1018, 0xE0D, 0x1A1A, 0x1A1D gUnknown_0859EFF0:: @ 859EFF0 - .incbin "baserom.gba", 0x59eff0, 0x20 + .4byte gText_SoPretty + .4byte gText_SoDarling + .4byte gText_SoRelaxed + .4byte gText_SoSunny + .4byte gText_SoDesirable + .4byte gText_SoExciting + .4byte gText_SoAmusing + .4byte gText_SoMagical gUnknown_0859F010:: @ 859F010 - .incbin "baserom.gba", 0x59f010, 0x20 + .4byte gUnknown_08294313 + .4byte gUnknown_08294359 + .4byte gUnknown_08294398 + .4byte gUnknown_082943DA + .4byte gUnknown_0829441C + .4byte gUnknown_08294460 + .4byte gUnknown_082944A0 + .4byte gUnknown_082944D5 gUnknown_0859F030:: @ 859F030 .incbin "baserom.gba", 0x59f030, 0x18 @@ -23,4 +37,4 @@ gUnknown_0859F278:: @ 859F278 .incbin "baserom.gba", 0x59f278, 0x10 gUnknown_0859F288:: @ 859F288 - .incbin "baserom.gba", 0x59f288, 0x8 + .4byte 0x00000024, 0x00000008 diff --git a/data/menu_indicators.s b/data/menu_indicators.s index ee97261cd..43fc0e139 100644 --- a/data/menu_indicators.s +++ b/data/menu_indicators.s @@ -10,28 +10,31 @@ gUnknown_08614244:: @ 8614244 .incbin "baserom.gba", 0x614244, 0x18 gUnknown_0861425C:: @ 861425C - .incbin "baserom.gba", 0x61425c, 0x4 + .4byte 0x00000000 gUnknown_08614260:: @ 8614260 - .incbin "baserom.gba", 0x614260, 0x4 + .4byte 0x00100000 gUnknown_08614264:: @ 8614264 - .incbin "baserom.gba", 0x614264, 0x4 + .4byte 0x00200000 gUnknown_08614268:: @ 8614268 - .incbin "baserom.gba", 0x614268, 0x4 + .4byte 0x00300000 gUnknown_0861426C:: @ 861426C - .incbin "baserom.gba", 0x61426c, 0x4 + .4byte 0x00400000 gUnknown_08614270:: @ 8614270 - .incbin "baserom.gba", 0x614270, 0x4 + .4byte 0x00500000 gUnknown_08614274:: @ 8614274 - .incbin "baserom.gba", 0x614274, 0x4 + .4byte 0x00600000 gUnknown_08614278:: @ 8614278 - .incbin "baserom.gba", 0x614278, 0x18 + .4byte 0x00700000 + +gUnknown_0861427C:: @ 861427C + .incbin "baserom.gba", 0x61427C, 0x14 gUnknown_08614290:: @ 8614290 .incbin "baserom.gba", 0x614290, 0x18 diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index 60de34b81..e5525477d 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -3,32 +3,94 @@ .section .rodata -gUnknown_08674AE4:: @ 8674AE4 - .incbin "baserom.gba", 0x674ae4, 0x32 +gText_MysteryGiftBerry:: @ 8674AE4 + .string "Obtained a {STR_VAR_2} BERRY!\nDad has it at PETALBURG GYM.$" -gUnknown_08674B16:: @ 8674B16 - .incbin "baserom.gba", 0x674b16, 0x2c +gText_MysteryGiftBerryTransform:: @ 8674B16 + .string "The {STR_VAR_1} BERRY transformed into\none {STR_VAR_2} BERRY.$" -gUnknown_08674B42:: @ 8674B42 - .incbin "baserom.gba", 0x674b42, 0x28 +gText_MysteryGiftBerryObtained:: @ 8674B42 + .string "The {STR_VAR_1} BERRY has already been\nobtained.$" -gUnknown_08674B6A:: @ 8674B6A - .incbin "baserom.gba", 0x674b6a, 0x34 +gText_MysteryGiftSpecialRibbon:: @ 8674B6A + .string "A special RIBBON was awarded to\nyour party POKéMON.$" -gUnknown_08674B9E:: @ 8674B9E - .incbin "baserom.gba", 0x674b9e, 0x36 +gText_MysteryGiftNationalDex:: @ 8674B9E + .string "The POKéDEX has been upgraded\nwith the NATIONAL MODE.$" -gUnknown_08674BD4:: @ 8674BD4 - .incbin "baserom.gba", 0x674bd4, 0x1c +gText_MysteryGiftRareWord:: @ 8674BD4 + .string "A rare word has been added.$" -gUnknown_08674BF0:: @ 8674BF0 - .incbin "baserom.gba", 0x674bf0, 0x12 +gText_MysteryGiftSentOver:: @ 8674BF0 + .string "{STR_VAR_1} was sent over!$" -gUnknown_08674C02:: @ 8674C02 - .incbin "baserom.gba", 0x674c02, 0x2f +gText_MysteryGiftFullParty:: @ 8674C02 + .string "Your party is full.\n{STR_VAR_1} could not be sent over.$" -gUnknown_08674C31:: @ 8674C31 - .incbin "baserom.gba", 0x674c31, 0x55 +gText_MysteryGiftNewTrainer:: @ 8674C31 + .string "A new TRAINER has arrived in\nHOENN.$" + .string "A new adversary has arrived in the\nBATTLE TOWER.$" -gUnknown_08674C86:: @ 8674C86 - .incbin "baserom.gba", 0x674c86, 0xd5a +gText_MysteryGiftCantBeUsed:: @ 8674C86 + .string "This data can’t be used in\nthis version.$" + +gUnknown_08674CAF:: @ 8674CAF + .incbin "baserom.gba", 0x00674caf, 0x2e + +gText_MysteryGiftStampCard:: + .string "Thank you for using the STAMP CARD\nSystem.\pYou have {STR_VAR_1} more to collect to\nfill your STAMP CARD.$" + +gUnknown_08674D3D:: @ 8674D3D + .incbin "baserom.gba", 0x00674d3d, 0xa1 + +gText_MysteryGiftEgg:: + .string "Thank you for using the MYSTERY\nGIFT System.\pFrom the POKéMON CENTER we\nhave a gift--a POKéMON EGG!\pPlease raise it with love and\nkindness.$" + .string "Oh, your party appears to be full.\pPlease come see me after storing\na POKéMON on a PC.$" + +gUnknown_08674EC1:: @ 8674EC1 + .incbin "baserom.gba", 0x00674ec1, 0x29 + +gText_MysteryGiftVisitingTrainer:: + .string "Thank you for using the MYSTERY\nGIFT System.\pBy holding this WONDER CARD, you\nmay take part in a survey at a\lPOKéMON MART.\pUse these surveys to invite\nTRAINERS to SOOTOPOLIS CITY.\p…Let me give you a secret\npassword for a survey:\p“GIVE ME\nAWESOME TRAINER”\pWrite that in on a survey and send\nit to the WIRELESS\lCOMMUNICATION SYSTEM.$" + .string "Thank you for using the MYSTERY\nGIFT System.\pA TRAINER has arrived in\nSOOTOPOLIS CITY looking for you.\pWe hope you will enjoy\nbattling the visiting TRAINER.\pYou may invite other TRAINERS by\nentering other passwords.\pTry looking for other passwords\nthat may work.$" + +gUnknown_0867513C:: @ 867513C + .incbin "baserom.gba", 0x0067513c, 0x48 + +gText_MysteryGiftBattleCountCard:: + .string "Thank you for using the MYSTERY\nGIFT System.\pYour BATTLE COUNT CARD keeps\ntrack of your battle record against\lTRAINERS with the same CARD.\pLook for and battle TRAINERS who\nhave the same CARD as you.\pYou may check the overall rankings\nby reading the NEWS.\pPlease do give it a try!$" + .string "Thank you for using the MYSTERY\nGIFT System.\pCongratulations!\pYou have won a prize for winning\nthree battles!\pWe hope you will be inspired to\nbattle some more.$" + +gUnknown_0867533C:: @ 867533C + .incbin "baserom.gba", 0x0067533c, 0x6d + +gText_MysteryGiftTicket1:: + .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" + .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" + .string "Thank you for using the MYSTERY\nGIFT System.$" + .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" + +gUnknown_0867550B:: @ 867550B + .incbin "baserom.gba", 0x0067550b, 0x76 + +gText_MysteryGiftTicket2:: + .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" + .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" + .string "Thank you for using the MYSTERY\nGIFT System.$" + .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" + +gUnknown_086756E3:: @ 86756E3 + .incbin "baserom.gba", 0x006756e3, 0x25 + +gText_MysteryGiftAlteringCave:: + .string "Thank you for using the MYSTERY\nGIFT System.\pThere appears to be a rumor about\nrare POKéMON sightings.\pThe sightings reportedly came from\nthe ALTERING CAVE on ROUTE 103.\pPerhaps it would be worthwhile for\nyou to investigate this rumor.$" + +gUnknown_086757F4:: @ 86757F4 + .incbin "baserom.gba", 0x006757f4, 0x6d + +gText_MysteryGiftOldSeaMap:: + .string "Thank you for using the MYSTERY\nGIFT System.\pLet me confirm--you are {PLAYER}?\pWe received this OLD SEA MAP\naddressed to you.$" + .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" + .string "Thank you for using the MYSTERY\nGIFT System.$" + .string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" + .align 2 diff --git a/data/naming_screen.s b/data/naming_screen.s index 80cbd0b09..607842f58 100644 --- a/data/naming_screen.s +++ b/data/naming_screen.s @@ -7,10 +7,14 @@ gUnknown_0858BD78:: @ 858BD78 .incbin "baserom.gba", 0x58bd78, 0x40 gUnknown_0858BDB8:: @ 858BDB8 - .incbin "baserom.gba", 0x58bdb8, 0x10 + .4byte gText_PkmnTransferredSomeonesPC + .4byte gText_PkmnTransferredLanettesPC + .4byte gText_PkmnBoxSomeonesPCFull + .4byte gText_PkmnBoxLanettesPCFull gUnknown_0858BDC8:: @ 858BDC8 - .incbin "baserom.gba", 0x58bdc8, 0x38 + .string "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!$" + .align 2 gUnknown_0858BE00:: @ 858BE00 .incbin "baserom.gba", 0x58be00, 0x10 @@ -19,52 +23,67 @@ gUnknown_0858BE10:: @ 858BE10 .incbin "baserom.gba", 0x58be10, 0x30 gUnknown_0858BE40:: @ 858BE40 - .incbin "baserom.gba", 0x58be40, 0x60 + .string "abcdef .ghijkl ,mnopqrs tuvwxyz ABCDEF .GHIJKL ,MNOPQRS TUVWXYZ 01234 56789 !?♂♀/- …“”‘’ " gUnknown_0858BEA0:: @ 858BEA0 - .incbin "baserom.gba", 0x58bea0, 0x3 + .byte 0x08, 0x08, 0x06 gUnknown_0858BEA3:: @ 858BEA3 - .incbin "baserom.gba", 0x58bea3, 0x18 + .byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x7b, 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x7b, 0x00, 0x16, 0x2c, 0x42, 0x58, 0x6e, 0x00, 0x00 gUnknown_0858BEBB:: @ 858BEBB - .incbin "baserom.gba", 0x58bebb, 0x3 + .byte 0x00, 0x02, 0x01 gUnknown_0858BEBE:: @ 858BEBE - .incbin "baserom.gba", 0x58bebe, 0x3 + .byte 0x01, 0x00, 0x02 gUnknown_0858BEC1:: @ 858BEC1 - .incbin "baserom.gba", 0x58bec1, 0x3 + .byte 0x02, 0x01, 0x00 gUnknown_0858BEC4:: @ 858BEC4 - .incbin "baserom.gba", 0x58bec4, 0x10 + .4byte sub_80E37B4 + .4byte sub_80E37DC + .4byte sub_80E3870 + .4byte sub_80E3904 gUnknown_0858BED4:: @ 858BED4 - .incbin "baserom.gba", 0x58bed4, 0x8 + .2byte 0x0000, 0xfffc, 0xfffe, 0xffff gUnknown_0858BEDC:: @ 858BEDC - .incbin "baserom.gba", 0x58bedc, 0x8 + .2byte 0x0002, 0x0003, 0x0002, 0x0001 gUnknown_0858BEE4:: @ 858BEE4 - .incbin "baserom.gba", 0x58bee4, 0x4 + .byte 0x01, 0x02, 0x03, 0x00 gUnknown_0858BEE8:: @ 858BEE8 - .incbin "baserom.gba", 0x58bee8, 0x10 + .4byte sub_80E40AC + .4byte sub_80E4100 + .4byte sub_80E4104 + .4byte sub_80E4178 gUnknown_0858BEF8:: @ 858BEF8 - .incbin "baserom.gba", 0x58bef8, 0x6 + .2byte 0x0001, 0x0003, 0x0002 gUnknown_0858BEFE:: @ 858BEFE - .incbin "baserom.gba", 0x58befe, 0x6 + .2byte 0x0004, 0x0006, 0x0005 gUnknown_0858BF04:: @ 858BF04 - .incbin "baserom.gba", 0x58bf04, 0x14 + .4byte TaskDummy2 + .4byte sub_80E4384 + .4byte sub_80E43E0 + .4byte sub_80E4420 + .4byte sub_80E447C gUnknown_0858BF18:: @ 858BF18 - .incbin "baserom.gba", 0x58bf18, 0x10 + .4byte sub_80E450C + .4byte sub_80E4558 + .4byte sub_80E4580 + .4byte sub_80E45A4 gUnknown_0858BF28:: @ 858BF28 - .incbin "baserom.gba", 0x58bf28, 0xc + .4byte sub_80E468C + .4byte sub_80E4692 + .4byte sub_80E46E8 gUnknown_0858BF34:: @ 858BF34 .incbin "baserom.gba", 0x58bf34, 0xa @@ -79,29 +98,66 @@ gUnknown_0858BF50:: @ 858BF50 .incbin "baserom.gba", 0x58bf50, 0x8 gUnknown_0858BF58:: @ 858BF58 - .incbin "baserom.gba", 0x58bf58, 0x14 + .4byte sub_80E4894 + .4byte sub_80E4894 + .4byte sub_80E48E8 + .4byte sub_80E48E8 + .4byte sub_80E4894 gUnknown_0858BF6C:: @ 858BF6C - .incbin "baserom.gba", 0x58bf6c, 0x8 + .4byte TaskDummy3 + .4byte sub_80E49BC gUnknown_0858BF74:: @ 858BF74 - .incbin "baserom.gba", 0x58bf74, 0x14 + .incbin "baserom.gba", 0x58bf74, 0x8 + +gUnknown_0858BF7C:: @ 858BF7C + .4byte 0x0002010D + +gUnknown_0858BF80:: @ 858BF80 + .4byte 0x0002010E + +gUnknown_0858BF84:: @ 858BF84 + .4byte 0x0002010F gUnknown_0858BF88:: @ 858BF88 - .incbin "baserom.gba", 0x58bf88, 0x4 + .byte 0xee, 0xdd, 0xff, 0x00 gUnknown_0858BF8C:: @ 858BF8C - .incbin "baserom.gba", 0x58bf8c, 0xc + .4byte gUnknown_0858BF80 + .4byte gUnknown_0858BF7C + .4byte gUnknown_0858BF84 gUnknown_0858BF98:: @ 858BF98 - .incbin "baserom.gba", 0x58bf98, 0xc + .4byte gUnknown_08DD4620 + .4byte gUnknown_08DD46E0 + .4byte gUnknown_08DD47A0 gUnknown_0858BFA4:: @ 858BFA4 - .incbin "baserom.gba", 0x58bfa4, 0x34 + .incbin "baserom.gba", 0x58bfa4, 0x4 + +gUnknown_0858BFA8:: @ 858BFA8 + .incbin "baserom.gba", 0x58bfa8, 0xc + +gUnknown_0858BFB4:: @ 858BFB4 + .incbin "baserom.gba", 0x58bfb4, 0xc + +gUnknown_0858BFC0:: @ 858BFC0 + .incbin "baserom.gba", 0x58bfc0, 0xc + +gUnknown_0858BFCC:: @ 858BFCC + .incbin "baserom.gba", 0x58bfcc, 0xc gUnknown_0858BFD8:: @ 858BFD8 - .incbin "baserom.gba", 0x58bfd8, 0x78 - + .4byte gUnknown_0858BFA8 + .4byte gUnknown_0858BFB4 + .4byte gUnknown_0858BFC0 + .4byte gUnknown_0858BFC0 + .4byte gUnknown_0858BFCC + +gUnknown_0858BFEC:: @ 858BFEC + .incbin "baserom.gba", 0x58bfec, 0x64 + gUnknown_0858C050:: @ 858C050 .incbin "baserom.gba", 0x58c050, 0x8 @@ -142,7 +198,18 @@ gUnknown_0858C180:: @ 858C180 .incbin "baserom.gba", 0x58c180, 0x18 gUnknown_0858C198:: @ 858C198 - .incbin "baserom.gba", 0x58c198, 0x30 + .4byte gUnknown_0862B88D + .4byte gUnknown_0862B8AE + .4byte gUnknown_0862B8CF + .4byte gUnknown_0862B8F0 + .4byte gUnknown_0862B911 + .4byte gUnknown_0862B932 + .4byte gUnknown_0862B953 + .4byte gUnknown_0862B974 + .4byte gUnknown_0862B995 + .4byte gUnknown_0862B9AE + .4byte gUnknown_0862B9C7 + .4byte gUnknown_0862B9E0 gUnknown_0858C1C8:: @ 858C1C8 .incbin "baserom.gba", 0x58c1c8, 0x68 diff --git a/data/pokeblock_feed.s b/data/pokeblock_feed.s deleted file mode 100644 index b4d3d192d..000000000 --- a/data/pokeblock_feed.s +++ /dev/null @@ -1,43 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_085EFEBC:: @ 85EFEBC - .incbin "baserom.gba", 0x5efebc, 0x32 - -gUnknown_085EFEEE:: @ 85EFEEE - .incbin "baserom.gba", 0x5efeee, 0x12 - -gUnknown_085EFF00:: @ 85EFF00 - .incbin "baserom.gba", 0x5eff00, 0x5fc - -gUnknown_085F04FC:: @ 85F04FC - .incbin "baserom.gba", 0x5f04fc, 0x54 - -gUnknown_085F0550:: @ 85F0550 - .incbin "baserom.gba", 0x5f0550, 0x8 - -gUnknown_085F0558:: @ 85F0558 - .incbin "baserom.gba", 0x5f0558, 0x10 - -gUnknown_085F0568:: @ 85F0568 - .incbin "baserom.gba", 0x5f0568, 0x48 - -gUnknown_085F05B0:: @ 85F05B0 - .incbin "baserom.gba", 0x5f05b0, 0xb4 - -gUnknown_085F0664:: @ 85F0664 - .incbin "baserom.gba", 0x5f0664, 0x4 - -gUnknown_085F0668:: @ 85F0668 - .incbin "baserom.gba", 0x5f0668, 0x4 - -gUnknown_085F066C:: @ 85F066C - .incbin "baserom.gba", 0x5f066c, 0x34 - -gUnknown_085F06A0:: @ 85F06A0 - .incbin "baserom.gba", 0x5f06a0, 0x8 - -gUnknown_085F06A8:: @ 85F06A8 - .incbin "baserom.gba", 0x5f06a8, 0x18 diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index b33db9218..07b22dda2 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -94,8 +94,8 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_turnobject .4byte ScrCmd_trainerbattle .4byte ScrCmd_dotrainerbattle - .4byte ScrCmd_ontrainerbattleend - .4byte ScrCmd_ontrainerbattleendgoto + .4byte ScrCmd_gotopostbattlescript + .4byte ScrCmd_gotobeatenscript .4byte ScrCmd_checktrainerflag .4byte ScrCmd_settrainerflag .4byte ScrCmd_cleartrainerflag @@ -139,7 +139,7 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_pokemartdecoration2 .4byte ScrCmd_playslotmachine .4byte ScrCmd_setberrytree - .4byte ScrCmd_choosecontestpkmn + .4byte ScrCmd_choosecontestmon .4byte ScrCmd_startcontest .4byte ScrCmd_showcontestresults .4byte ScrCmd_contestlinktransfer diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index d11b7df20..ebe7b9e0b 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -22,7 +22,7 @@ Route102_EventScript_274359:: @ 8274359 lock faceplayer specialvar VAR_RESULT, PlayerHasBerries - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route102_EventScript_274374 message Route102_Text_2744F0 waitmessage @@ -32,9 +32,9 @@ Route102_EventScript_274359:: @ 8274359 Route102_EventScript_274374:: @ 8274374 msgbox Route102_Text_274507, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route102_EventScript_274393 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route102_EventScript_2743AF end @@ -43,7 +43,7 @@ Route102_EventScript_274393:: @ 8274393 closemessage special Bag_ChooseBerry waitstate - compare_var_to_value VAR_ITEM_ID, 0 + compare VAR_ITEM_ID, 0 goto_eq Route102_EventScript_2743AF takeitem VAR_ITEM_ID, 1 call Route102_EventScript_2744DD @@ -86,9 +86,9 @@ Route102_EventScript_2743E1:: @ 82743E1 goto Route102_EventScript_27448D Route102_EventScript_2743F6:: @ 82743F6 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 goto_eq Route102_EventScript_27441A - compare_var_to_value VAR_0x8005, 4 + compare VAR_0x8005, 4 goto_eq Route102_EventScript_274413 bufferstring 1, Route102_Text_2745E5 return @@ -107,14 +107,14 @@ Route102_EventScript_274421:: @ 8274421 faceplayer special FieldObjectInteractionGetBerryCountString msgbox Route102_Text_2745EE, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route102_EventScript_274448 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route102_EventScript_274479 Route102_EventScript_274448:: @ 8274448 special FieldObjectInteractionPickBerryTree - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_eq Route102_EventScript_274470 special sub_80EED34 special FieldObjectInteractionRemoveBerryTree @@ -152,13 +152,13 @@ Route102_EventScript_274482:: @ 8274482 Route102_EventScript_27448D:: @ 827448D checkitem ITEM_WAILMER_PAIL, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route102_EventScript_2744BE special FieldObjectInteractionGetBerryName msgbox Route102_Text_2746E4, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route102_EventScript_2744C4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route102_EventScript_2744BE Route102_EventScript_2744BE:: @ 82744BE diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 71e3303b5..5418e6e4e 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -20,10 +20,10 @@ VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF OldaleTown_PokemonCenter_2F_EventScript_276AD5:: @ 8276AD5 specialvar VAR_RESULT, sub_813B514 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276AFB specialvar VAR_RESULT, sub_801B27C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276AFF goto OldaleTown_PokemonCenter_2F_EventScript_276AFB end @@ -54,7 +54,7 @@ SlateportCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 SootopolisCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 VerdanturfTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03 specialvar VAR_RESULT, sub_813B514 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276B23 goto OldaleTown_PokemonCenter_2F_EventScript_276B19 end @@ -68,7 +68,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276B1A:: @ 8276B1A OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23 checkitem ITEM_EON_TICKET, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276B19 checkflag FLAG_SYS_HAS_EON_TICKET goto_eq OldaleTown_PokemonCenter_2F_EventScript_276B19 @@ -114,7 +114,7 @@ VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C MossdeepCity_GameCorner_1F_EventScript_276BAE:: @ 8276BAE OldaleTown_PokemonCenter_2F_EventScript_276BAE:: @ 8276BAE - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276BBD turnobject VAR_0x8007, 3 @@ -139,21 +139,21 @@ RustboroCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE SlateportCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE SootopolisCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE - compare_var_to_value VAR_0x4087, 1 + compare VAR_0x4087, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare_var_to_value VAR_0x4087, 2 + compare VAR_0x4087, 2 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare_var_to_value VAR_0x4087, 5 + compare VAR_0x4087, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C17 - compare_var_to_value VAR_0x4087, 3 + compare VAR_0x4087, 3 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C1D - compare_var_to_value VAR_0x4087, 4 + compare VAR_0x4087, 4 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C23 - compare_var_to_value VAR_0x4087, 6 + compare VAR_0x4087, 6 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C29 - compare_var_to_value VAR_0x4087, 7 + compare VAR_0x4087, 7 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C2F - compare_var_to_value VAR_0x4087, 8 + compare VAR_0x4087, 8 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C35 end @@ -233,7 +233,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276C9D:: @ 8276C9D OldaleTown_PokemonCenter_2F_EventScript_276CB5:: @ 8276CB5 special sub_80097E8 setvar VAR_0x4087, 0 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D waitmovement 0 @@ -256,7 +256,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276CE7:: @ 8276CE7 OldaleTown_PokemonCenter_2F_EventScript_276CFF:: @ 8276CFF special sub_80097E8 setvar VAR_0x4087, 0 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735E waitmovement 0 @@ -280,7 +280,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D44:: @ 8276D44 setvar VAR_0x4087, 0 applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27734F waitmovement 0 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276D6B applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_277349 waitmovement 0 @@ -300,7 +300,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D6C:: @ 8276D6C OldaleTown_PokemonCenter_2F_EventScript_276D84:: @ 8276D84 setvar VAR_0x4087, 0 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5 applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735E waitmovement 0 @@ -409,8 +409,8 @@ OldaleTown_PokemonCenter_2F_EventScript_276F23:: @ 8276F23 end OldaleTown_PokemonCenter_2F_EventScript_276F2E:: @ 8276F2E - special sub_80F92F8 - compare_var_to_value VAR_RESULT, 0 + special HasEnoughMonsForDoubleBattle + compare VAR_RESULT, 0 goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_276F47 setvar VAR_0x8004, 2 goto OldaleTown_PokemonCenter_2F_EventScript_276F60 @@ -428,28 +428,28 @@ OldaleTown_PokemonCenter_2F_EventScript_276F55:: @ 8276F55 OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60 call OldaleTown_PokemonCenter_2F_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC message OldaleTown_PokemonCenter_2F_Text_278091 waitmessage special sub_80B2DA4 waitstate - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276FBD - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277046 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 end OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD - special sp000_heal_pokemon + special HealPlayerParty special copy_player_party_to_sav1 special copy_bags_and_unk_data_from_save_blocks copyvar VAR_0x4087, VAR_0x8004 @@ -472,7 +472,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD closedoor 9, 1 waitdooranim release - compare_var_to_value VAR_0x8004, 5 + compare VAR_0x8004, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277036 special sub_809D2BC warp SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 @@ -527,30 +527,30 @@ OldaleTown_PokemonCenter_2F_EventScript_2770A5:: @ 82770A5 OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2 copyvar VAR_0x8007, VAR_LAST_TALKED call OldaleTown_PokemonCenter_2F_EventScript_277199 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC call OldaleTown_PokemonCenter_2F_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC message OldaleTown_PokemonCenter_2F_Text_278091 waitmessage special sub_80B2E4C waitstate - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27713A - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27730E - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772AB - compare_var_to_value VAR_RESULT, 9 + compare VAR_RESULT, 9 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772B8 end @@ -584,10 +584,10 @@ OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A OldaleTown_PokemonCenter_2F_EventScript_277199:: @ 8277199 specialvar VAR_RESULT, CalculatePlayerPartyCount - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_2771BF specialvar VAR_RESULT, sub_80F9370 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2771CD setvar VAR_RESULT, 1 return @@ -605,7 +605,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771CD:: @ 82771CD OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB copyvar VAR_0x8007, VAR_LAST_TALKED call OldaleTown_PokemonCenter_2F_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC message OldaleTown_PokemonCenter_2F_Text_278091 waitmessage @@ -613,19 +613,19 @@ OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB waitstate special sub_80B2EA8 waitstate - compare_var_to_value VAR_RESULT, 12 + compare VAR_RESULT, 12 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277328 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27724C - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27730E - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5 end @@ -809,7 +809,7 @@ gUnknown_08277388:: @ 8277388 fadescreen 1 special sub_80F9438 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DoubleBattleColosseum_EventScript_2773F4 setvar VAR_0x8005, 0 special sub_80B3968 @@ -820,7 +820,7 @@ gUnknown_082773A3:: @ 82773A3 fadescreen 1 special sub_80F9438 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DoubleBattleColosseum_EventScript_2773F4 setvar VAR_0x8005, 1 special sub_80B3968 @@ -831,7 +831,7 @@ gUnknown_082773BE:: @ 82773BE fadescreen 1 special sub_80F9438 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DoubleBattleColosseum_EventScript_2773F4 setvar VAR_0x8005, 2 special sub_80B3968 @@ -842,7 +842,7 @@ gUnknown_082773D9:: @ 82773D9 fadescreen 1 special sub_80F9438 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DoubleBattleColosseum_EventScript_2773F4 setvar VAR_0x8005, 3 special sub_80B3968 @@ -880,7 +880,7 @@ gUnknown_0827741D:: @ 827741D setvar VAR_0x8005, 0 special sub_80E6BE8 waitstate - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 goto_if 5, RecordCorner_EventScript_277471 end @@ -888,7 +888,7 @@ gUnknown_08277432:: @ 8277432 setvar VAR_0x8005, 1 special sub_80E6BE8 waitstate - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 goto_if 5, RecordCorner_EventScript_277471 end @@ -896,7 +896,7 @@ gUnknown_08277447:: @ 8277447 setvar VAR_0x8005, 2 special sub_80E6BE8 waitstate - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 goto_if 5, RecordCorner_EventScript_277471 end @@ -904,7 +904,7 @@ gUnknown_0827745C:: @ 827745C setvar VAR_0x8005, 3 special sub_80E6BE8 waitstate - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 goto_if 5, RecordCorner_EventScript_277471 end @@ -950,7 +950,7 @@ TradeCenter_EventScript_2774B6:: @ 82774B6 end RecordCorner_EventScript_2774C6:: @ 82774C6 - compare_var_to_value VAR_0x4000, 0 + compare VAR_0x4000, 0 goto_if 5, RecordCorner_EventScript_2774E0 special sub_8098574 message RecordCorner_Text_27861C @@ -971,7 +971,7 @@ RecordCorner_EventScript_2774E0:: @ 82774E0 gUnknown_082774EF:: @ 82774EF msgbox Text_2783A8, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq gUnknown_08277509 erasebox 0, 0, 29, 19 releaseall @@ -996,11 +996,11 @@ OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_277335 specialvar VAR_RESULT, sub_813990C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27731B copyvar VAR_0x8007, VAR_LAST_TALKED specialvar VAR_RESULT, sub_80093CC - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277668 message OldaleTown_PokemonCenter_2F_Text_27940D waitmessage @@ -1024,14 +1024,14 @@ OldaleTown_PokemonCenter_2F_EventScript_277593:: @ 8277593 OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F call OldaleTown_PokemonCenter_2F_EventScript_277626 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC call OldaleTown_PokemonCenter_2F_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC msgbox OldaleTown_PokemonCenter_2F_Text_27961C, 4 closemessage - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 6 copyvar VAR_0x4087, VAR_0x8004 call OldaleTown_PokemonCenter_2F_EventScript_277BBE @@ -1059,10 +1059,10 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F OldaleTown_PokemonCenter_2F_EventScript_277626:: @ 8277626 specialvar VAR_RESULT, CountPartyNonEggMons - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_27764C specialvar VAR_RESULT, sub_80F9370 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27765A setvar VAR_RESULT, 1 return @@ -1088,7 +1088,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277672:: @ 8277672 checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_277335 msgbox OldaleTown_PokemonCenter_2F_Text_279937, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27769A msgbox OldaleTown_PokemonCenter_2F_Text_2799AA, 4 release @@ -1106,10 +1106,10 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4 checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_277335 specialvar VAR_RESULT, sub_813990C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27731B specialvar VAR_RESULT, sub_80093CC - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_276E13 message OldaleTown_PokemonCenter_2F_Text_279013 waitmessage @@ -1119,7 +1119,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4 OldaleTown_PokemonCenter_2F_EventScript_2776E3:: @ 82776E3 checkitem ITEM_POWDER_JAR, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_27778B checkflag FLAG_VISITED_MAUVILLE_CITY goto_eq OldaleTown_PokemonCenter_2F_EventScript_27773E @@ -1166,10 +1166,10 @@ OldaleTown_PokemonCenter_2F_EventScript_2777CB:: @ 82777CB OldaleTown_PokemonCenter_2F_EventScript_27780D:: @ 827780D msgbox OldaleTown_PokemonCenter_2F_Text_27909D, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC call OldaleTown_PokemonCenter_2F_EventScript_277199 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC setvar VAR_0x8004, 3 goto OldaleTown_PokemonCenter_2F_EventScript_277931 @@ -1194,8 +1194,8 @@ OldaleTown_PokemonCenter_2F_EventScript_27788E:: @ 827788E end OldaleTown_PokemonCenter_2F_EventScript_277899:: @ 8277899 - special sub_80F92F8 - compare_var_to_value VAR_RESULT, 0 + special HasEnoughMonsForDoubleBattle + compare VAR_RESULT, 0 goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_2778B2 setvar VAR_0x8004, 1 goto OldaleTown_PokemonCenter_2F_EventScript_277931 @@ -1218,7 +1218,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2778CB:: @ 82778CB OldaleTown_PokemonCenter_2F_EventScript_2778D9:: @ 82778D9 msgbox OldaleTown_PokemonCenter_2F_Text_2790E8, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC setvar VAR_0x8004, 12 goto OldaleTown_PokemonCenter_2F_EventScript_277931 @@ -1226,10 +1226,10 @@ OldaleTown_PokemonCenter_2F_EventScript_2778D9:: @ 82778D9 OldaleTown_PokemonCenter_2F_EventScript_2778F7:: @ 82778F7 msgbox OldaleTown_PokemonCenter_2F_Text_279114, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC special HasAtLeastOneBerry - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277923 setvar VAR_0x8004, 5 goto OldaleTown_PokemonCenter_2F_EventScript_277931 @@ -1242,7 +1242,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277923:: @ 8277923 OldaleTown_PokemonCenter_2F_EventScript_277931:: @ 8277931 call OldaleTown_PokemonCenter_2F_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC switch VAR_0x8004 case 3, OldaleTown_PokemonCenter_2F_EventScript_277989 @@ -1266,22 +1266,22 @@ OldaleTown_PokemonCenter_2F_EventScript_277989:: @ 8277989 OldaleTown_PokemonCenter_2F_EventScript_2779C6:: @ 82779C6 call OldaleTown_PokemonCenter_2F_EventScript_277B30 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277989 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2779C6 release return OldaleTown_PokemonCenter_2F_EventScript_2779EE:: @ 82779EE call OldaleTown_PokemonCenter_2F_EventScript_277B35 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277989 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq OldaleTown_PokemonCenter_2F_EventScript_2779EE release return @@ -1299,22 +1299,22 @@ OldaleTown_PokemonCenter_2F_EventScript_277A16:: @ 8277A16 OldaleTown_PokemonCenter_2F_EventScript_277A53:: @ 8277A53 call OldaleTown_PokemonCenter_2F_EventScript_277B30 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277A16 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277A53 release return OldaleTown_PokemonCenter_2F_EventScript_277A7B:: @ 8277A7B call OldaleTown_PokemonCenter_2F_EventScript_277B35 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277A16 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277A7B release return @@ -1332,22 +1332,22 @@ OldaleTown_PokemonCenter_2F_EventScript_277AA3:: @ 8277AA3 OldaleTown_PokemonCenter_2F_EventScript_277AE0:: @ 8277AE0 call OldaleTown_PokemonCenter_2F_EventScript_277B30 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277AA3 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277AE0 release return OldaleTown_PokemonCenter_2F_EventScript_277B08:: @ 8277B08 call OldaleTown_PokemonCenter_2F_EventScript_277B35 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277AA3 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B08 release return @@ -1397,7 +1397,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277B8A:: @ 8277B8A checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_27733F specialvar VAR_RESULT, sub_80093CC - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_277BB4 fadescreen 1 special sub_801A42C @@ -1496,7 +1496,7 @@ MossdeepCity_GameCorner_1F_EventScript_277C91:: @ 8277C91 message MossdeepCity_GameCorner_1F_Text_278CEB waitmessage specialvar VAR_RESULT, sub_80093CC - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_GameCorner_1F_EventScript_277E48 delay 60 message MossdeepCity_GameCorner_1F_Text_278DAD @@ -1512,17 +1512,17 @@ MossdeepCity_GameCorner_1F_EventScript_277C91:: @ 8277C91 MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9 setvar VAR_0x8005, 0 special sub_802C920 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_GameCorner_1F_EventScript_277E55 msgbox MossdeepCity_GameCorner_1F_Text_278DD9, 4 fadescreen 1 setvar VAR_0x8005, 0 special sub_81B8958 waitstate - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if 4, MossdeepCity_GameCorner_1F_EventScript_2772F9 call MossdeepCity_GameCorner_1F_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 setvar VAR_0x8004, 4 goto MossdeepCity_GameCorner_1F_EventScript_277D81 @@ -1531,17 +1531,17 @@ MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9 MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35 setvar VAR_0x8005, 1 special sub_8027A5C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_GameCorner_1F_EventScript_277E55 msgbox MossdeepCity_GameCorner_1F_Text_278DD9, 4 fadescreen 1 setvar VAR_0x8005, 1 special sub_81B8958 waitstate - compare_var_to_value VAR_0x8004, 6 + compare VAR_0x8004, 6 goto_if 4, MossdeepCity_GameCorner_1F_EventScript_2772F9 call MossdeepCity_GameCorner_1F_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 setvar VAR_0x8004, 6 goto MossdeepCity_GameCorner_1F_EventScript_277D81 @@ -1560,22 +1560,22 @@ MossdeepCity_GameCorner_1F_EventScript_277D81:: @ 8277D81 MossdeepCity_GameCorner_1F_EventScript_277DBE:: @ 8277DBE call MossdeepCity_GameCorner_1F_EventScript_277B30 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MossdeepCity_GameCorner_1F_EventScript_277E0E - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq MossdeepCity_GameCorner_1F_EventScript_277D81 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq MossdeepCity_GameCorner_1F_EventScript_277DBE release return MossdeepCity_GameCorner_1F_EventScript_277DE6:: @ 8277DE6 call MossdeepCity_GameCorner_1F_EventScript_277B35 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MossdeepCity_GameCorner_1F_EventScript_277E0E - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq MossdeepCity_GameCorner_1F_EventScript_277D81 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq MossdeepCity_GameCorner_1F_EventScript_277DE6 release return @@ -1608,11 +1608,11 @@ MossdeepCity_GameCorner_1F_EventScript_277E48:: @ 8277E48 MossdeepCity_GameCorner_1F_EventScript_277E55:: @ 8277E55 msgbox MossdeepCity_GameCorner_1F_Text_278E60, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_GameCorner_1F_EventScript_2772F9 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, MossdeepCity_GameCorner_1F_EventScript_277E84 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, MossdeepCity_GameCorner_1F_EventScript_277E8D goto MossdeepCity_GameCorner_1F_EventScript_2772F9 end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index ad828d7e0..bfe87dfc2 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1,7 +1,7 @@ LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5 lock faceplayer - compare_var_to_value VAR_0x408A, 0 + compare VAR_0x408A, 0 goto_if 5, LilycoveCity_ContestLobby_EventScript_279D13 checkflag FLAG_0x05F call_if 1, LilycoveCity_ContestLobby_EventScript_279CEA @@ -29,7 +29,7 @@ LilycoveCity_ContestLobby_EventScript_279D13:: @ 8279D13 LilycoveCity_ContestLobby_EventScript_279D2C:: @ 8279D2C giveitem_std ITEM_LUXURY_BALL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_279D4B setvar VAR_0x408A, 0 closemessage @@ -87,19 +87,19 @@ LilycoveCity_ContestLobby_EventScript_279E09:: @ 8279E09 LilycoveCity_ContestLobby_EventScript_279E13:: @ 8279E13 msgbox LilycoveCity_ContestLobby_Text_27B44A, 4 - choosecontestpkmn - compare_var_to_value VAR_0x8004, 255 + choosecontestmon + compare VAR_0x8004, 255 goto_eq LilycoveCity_ContestLobby_EventScript_279E09 special sub_80F7F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_279F12 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_279F87 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq LilycoveCity_ContestLobby_EventScript_279F45 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq LilycoveCity_ContestLobby_EventScript_279F69 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq LilycoveCity_ContestLobby_EventScript_279F78 end @@ -273,7 +273,7 @@ LinkContestRoom1_EventScript_27A097:: @ 827A097 return LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1 - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A0C7 lockall msgbox LinkContestRoom1_Text_27B711, 4 @@ -282,7 +282,7 @@ LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1 LinkContestRoom1_EventScript_27A0C7:: @ 827A0C7 specialvar VAR_RESULT, sub_80F9160 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LinkContestRoom1_EventScript_27A0DE messageautoscroll LinkContestRoom1_Text_27B78F waitmessage @@ -306,7 +306,7 @@ LinkContestRoom1_EventScript_27A0F5:: @ 827A0F5 call LinkContestRoom1_EventScript_27A133 call LinkContestRoom1_EventScript_27A133 addvar VAR_0x8006, 1 - compare_var_to_value VAR_0x8006, 4 + compare VAR_0x8006, 4 goto_if 5, LinkContestRoom1_EventScript_27A0F5 call LinkContestRoom1_EventScript_27A230 setvar VAR_0x4001, 6 @@ -314,7 +314,7 @@ LinkContestRoom1_EventScript_27A0F5:: @ 827A0F5 LinkContestRoom1_EventScript_27A133:: @ 827A133 specialvar VAR_RESULT, sub_80F9160 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LinkContestRoom1_EventScript_27A144 return @@ -324,13 +324,13 @@ LinkContestRoom1_EventScript_27A144:: @ 827A144 return LinkContestRoom1_EventScript_27A149:: @ 827A149 - compare_var_to_value VAR_0x8006, 0 + compare VAR_0x8006, 0 goto_eq LinkContestRoom1_EventScript_27A176 - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 goto_eq LinkContestRoom1_EventScript_27A18D - compare_var_to_value VAR_0x8006, 2 + compare VAR_0x8006, 2 goto_eq LinkContestRoom1_EventScript_27A1A4 - compare_var_to_value VAR_0x8006, 3 + compare VAR_0x8006, 3 goto_eq LinkContestRoom1_EventScript_27A1BB return @@ -393,7 +393,7 @@ LinkContestRoom1_EventScript_27A1D2:: @ 827A1D2 return LinkContestRoom1_EventScript_27A217:: @ 827A217 - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A229 message LinkContestRoom1_Text_27B815 waitmessage @@ -421,14 +421,14 @@ LinkContestRoom1_EventScript_27A230:: @ 827A230 return LinkContestRoom1_EventScript_27A26C:: @ 827A26C - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A280 msgbox LinkContestRoom1_Text_27B830, 4 return LinkContestRoom1_EventScript_27A280:: @ 827A280 specialvar VAR_RESULT, sub_80F9160 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LinkContestRoom1_EventScript_27A297 messageautoscroll LinkContestRoom1_Text_27B830 waitmessage @@ -447,7 +447,7 @@ LinkContestRoom1_EventScript_27A297:: @ 827A297 return LinkContestRoom1_EventScript_27A2B9:: @ 827A2B9 - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A2CA message LinkContestRoom1_Text_27B8F2 return @@ -485,15 +485,15 @@ LinkContestRoom1_EventScript_27A2D5:: @ 827A2D5 LinkContestRoom1_EventScript_27A34F:: @ 827A34F special sub_80F82FC - compare_var_to_value VAR_0x4088, 1 + compare VAR_0x4088, 1 call_if 1, LinkContestRoom1_EventScript_27A454 - compare_var_to_value VAR_0x4088, 2 + compare VAR_0x4088, 2 call_if 1, LinkContestRoom1_EventScript_27A4B2 - compare_var_to_value VAR_0x4088, 3 + compare VAR_0x4088, 3 call_if 1, LinkContestRoom1_EventScript_27A510 - compare_var_to_value VAR_0x4088, 4 + compare VAR_0x4088, 4 call_if 1, LinkContestRoom1_EventScript_27A56E - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 call_if 1, LinkContestRoom1_EventScript_27A5CC setvar VAR_0x4001, 9 setvar VAR_0x4002, 9 @@ -503,7 +503,7 @@ LinkContestRoom1_EventScript_27A34F:: @ 827A34F setvar VAR_0x4006, 9 setvar VAR_0x4007, 9 setvar VAR_0x4008, 9 - compare_var_to_value VAR_0x4000, 0 + compare VAR_0x4000, 0 call_if 2, LinkContestRoom1_EventScript_27A3E5 setvar VAR_0x4001, 0 setvar VAR_0x4002, 0 @@ -518,123 +518,123 @@ LinkContestRoom1_EventScript_27A34F:: @ 827A34F LinkContestRoom1_EventScript_27A3E5:: @ 827A3E5 setvar VAR_RESULT, 8 special sub_80F8FE8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LinkContestRoom1_EventScript_27A65A - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LinkContestRoom1_EventScript_27A67E - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, LinkContestRoom1_EventScript_27A6A2 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if 1, LinkContestRoom1_EventScript_27A6C6 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 call_if 1, LinkContestRoom1_EventScript_27A6EA - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 call_if 1, LinkContestRoom1_EventScript_27A70E - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 call_if 1, LinkContestRoom1_EventScript_27A732 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 call_if 1, LinkContestRoom1_EventScript_27A756 - compare_var_to_value VAR_0x4000, 0 + compare VAR_0x4000, 0 goto_if 2, LinkContestRoom1_EventScript_27A3E5 waitmovement 0 return LinkContestRoom1_EventScript_27A454:: @ 827A454 - compare_var_to_value VAR_0x8004, 80 + compare VAR_0x8004, 80 goto_if 2, LinkContestRoom1_EventScript_27A654 - compare_var_to_value VAR_0x8004, 70 + compare VAR_0x8004, 70 goto_if 2, LinkContestRoom1_EventScript_27A64E - compare_var_to_value VAR_0x8004, 60 + compare VAR_0x8004, 60 goto_if 2, LinkContestRoom1_EventScript_27A648 - compare_var_to_value VAR_0x8004, 50 + compare VAR_0x8004, 50 goto_if 2, LinkContestRoom1_EventScript_27A642 - compare_var_to_value VAR_0x8004, 40 + compare VAR_0x8004, 40 goto_if 2, LinkContestRoom1_EventScript_27A63C - compare_var_to_value VAR_0x8004, 30 + compare VAR_0x8004, 30 goto_if 2, LinkContestRoom1_EventScript_27A636 - compare_var_to_value VAR_0x8004, 20 + compare VAR_0x8004, 20 goto_if 2, LinkContestRoom1_EventScript_27A630 - compare_var_to_value VAR_0x8004, 10 + compare VAR_0x8004, 10 goto_if 2, LinkContestRoom1_EventScript_27A62A setvar VAR_0x4000, 0 return LinkContestRoom1_EventScript_27A4B2:: @ 827A4B2 - compare_var_to_value VAR_0x8004, 230 + compare VAR_0x8004, 230 goto_if 2, LinkContestRoom1_EventScript_27A654 - compare_var_to_value VAR_0x8004, 210 + compare VAR_0x8004, 210 goto_if 2, LinkContestRoom1_EventScript_27A64E - compare_var_to_value VAR_0x8004, 190 + compare VAR_0x8004, 190 goto_if 2, LinkContestRoom1_EventScript_27A648 - compare_var_to_value VAR_0x8004, 170 + compare VAR_0x8004, 170 goto_if 2, LinkContestRoom1_EventScript_27A642 - compare_var_to_value VAR_0x8004, 150 + compare VAR_0x8004, 150 goto_if 2, LinkContestRoom1_EventScript_27A63C - compare_var_to_value VAR_0x8004, 130 + compare VAR_0x8004, 130 goto_if 2, LinkContestRoom1_EventScript_27A636 - compare_var_to_value VAR_0x8004, 110 + compare VAR_0x8004, 110 goto_if 2, LinkContestRoom1_EventScript_27A630 - compare_var_to_value VAR_0x8004, 90 + compare VAR_0x8004, 90 goto_if 2, LinkContestRoom1_EventScript_27A62A setvar VAR_0x4000, 0 return LinkContestRoom1_EventScript_27A510:: @ 827A510 - compare_var_to_value VAR_0x8004, 380 + compare VAR_0x8004, 380 goto_if 2, LinkContestRoom1_EventScript_27A654 - compare_var_to_value VAR_0x8004, 350 + compare VAR_0x8004, 350 goto_if 2, LinkContestRoom1_EventScript_27A64E - compare_var_to_value VAR_0x8004, 320 + compare VAR_0x8004, 320 goto_if 2, LinkContestRoom1_EventScript_27A648 - compare_var_to_value VAR_0x8004, 290 + compare VAR_0x8004, 290 goto_if 2, LinkContestRoom1_EventScript_27A642 - compare_var_to_value VAR_0x8004, 260 + compare VAR_0x8004, 260 goto_if 2, LinkContestRoom1_EventScript_27A63C - compare_var_to_value VAR_0x8004, 230 + compare VAR_0x8004, 230 goto_if 2, LinkContestRoom1_EventScript_27A636 - compare_var_to_value VAR_0x8004, 200 + compare VAR_0x8004, 200 goto_if 2, LinkContestRoom1_EventScript_27A630 - compare_var_to_value VAR_0x8004, 170 + compare VAR_0x8004, 170 goto_if 2, LinkContestRoom1_EventScript_27A62A setvar VAR_0x4000, 0 return LinkContestRoom1_EventScript_27A56E:: @ 827A56E - compare_var_to_value VAR_0x8004, 600 + compare VAR_0x8004, 600 goto_if 2, LinkContestRoom1_EventScript_27A654 - compare_var_to_value VAR_0x8004, 560 + compare VAR_0x8004, 560 goto_if 2, LinkContestRoom1_EventScript_27A64E - compare_var_to_value VAR_0x8004, 520 + compare VAR_0x8004, 520 goto_if 2, LinkContestRoom1_EventScript_27A648 - compare_var_to_value VAR_0x8004, 480 + compare VAR_0x8004, 480 goto_if 2, LinkContestRoom1_EventScript_27A642 - compare_var_to_value VAR_0x8004, 440 + compare VAR_0x8004, 440 goto_if 2, LinkContestRoom1_EventScript_27A63C - compare_var_to_value VAR_0x8004, 400 + compare VAR_0x8004, 400 goto_if 2, LinkContestRoom1_EventScript_27A636 - compare_var_to_value VAR_0x8004, 360 + compare VAR_0x8004, 360 goto_if 2, LinkContestRoom1_EventScript_27A630 - compare_var_to_value VAR_0x8004, 320 + compare VAR_0x8004, 320 goto_if 2, LinkContestRoom1_EventScript_27A62A setvar VAR_0x4000, 0 return LinkContestRoom1_EventScript_27A5CC:: @ 827A5CC - compare_var_to_value VAR_0x8004, 600 + compare VAR_0x8004, 600 goto_if 2, LinkContestRoom1_EventScript_27A654 - compare_var_to_value VAR_0x8004, 550 + compare VAR_0x8004, 550 goto_if 2, LinkContestRoom1_EventScript_27A64E - compare_var_to_value VAR_0x8004, 500 + compare VAR_0x8004, 500 goto_if 2, LinkContestRoom1_EventScript_27A648 - compare_var_to_value VAR_0x8004, 450 + compare VAR_0x8004, 450 goto_if 2, LinkContestRoom1_EventScript_27A642 - compare_var_to_value VAR_0x8004, 400 + compare VAR_0x8004, 400 goto_if 2, LinkContestRoom1_EventScript_27A63C - compare_var_to_value VAR_0x8004, 300 + compare VAR_0x8004, 300 goto_if 2, LinkContestRoom1_EventScript_27A636 - compare_var_to_value VAR_0x8004, 200 + compare VAR_0x8004, 200 goto_if 2, LinkContestRoom1_EventScript_27A630 - compare_var_to_value VAR_0x8004, 100 + compare VAR_0x8004, 100 goto_if 2, LinkContestRoom1_EventScript_27A62A setvar VAR_0x4000, 0 return @@ -672,7 +672,7 @@ LinkContestRoom1_EventScript_27A654:: @ 827A654 return LinkContestRoom1_EventScript_27A65A:: @ 827A65A - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 goto_eq LinkContestRoom1_EventScript_27A67D applymovement 6, LinkContestRoom1_Movement_27AD11 playse SE_PIN @@ -685,7 +685,7 @@ LinkContestRoom1_EventScript_27A67D:: @ 827A67D return LinkContestRoom1_EventScript_27A67E:: @ 827A67E - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_eq LinkContestRoom1_EventScript_27A6A1 applymovement 12, LinkContestRoom1_Movement_27AD11 playse SE_PIN @@ -698,7 +698,7 @@ LinkContestRoom1_EventScript_27A6A1:: @ 827A6A1 return LinkContestRoom1_EventScript_27A6A2:: @ 827A6A2 - compare_var_to_value VAR_0x4003, 1 + compare VAR_0x4003, 1 goto_eq LinkContestRoom1_EventScript_27A6C5 applymovement 7, LinkContestRoom1_Movement_27AD11 playse SE_PIN @@ -711,7 +711,7 @@ LinkContestRoom1_EventScript_27A6C5:: @ 827A6C5 return LinkContestRoom1_EventScript_27A6C6:: @ 827A6C6 - compare_var_to_value VAR_0x4004, 1 + compare VAR_0x4004, 1 goto_eq LinkContestRoom1_EventScript_27A6E9 applymovement 8, LinkContestRoom1_Movement_27AD11 playse SE_PIN @@ -724,7 +724,7 @@ LinkContestRoom1_EventScript_27A6E9:: @ 827A6E9 return LinkContestRoom1_EventScript_27A6EA:: @ 827A6EA - compare_var_to_value VAR_0x4005, 1 + compare VAR_0x4005, 1 goto_eq LinkContestRoom1_EventScript_27A70D applymovement 9, LinkContestRoom1_Movement_27AD11 playse SE_PIN @@ -737,7 +737,7 @@ LinkContestRoom1_EventScript_27A70D:: @ 827A70D return LinkContestRoom1_EventScript_27A70E:: @ 827A70E - compare_var_to_value VAR_0x4006, 1 + compare VAR_0x4006, 1 goto_eq LinkContestRoom1_EventScript_27A731 applymovement 10, LinkContestRoom1_Movement_27AD11 playse SE_PIN @@ -750,7 +750,7 @@ LinkContestRoom1_EventScript_27A731:: @ 827A731 return LinkContestRoom1_EventScript_27A732:: @ 827A732 - compare_var_to_value VAR_0x4007, 1 + compare VAR_0x4007, 1 goto_eq LinkContestRoom1_EventScript_27A755 applymovement 11, LinkContestRoom1_Movement_27AD11 playse SE_PIN @@ -763,7 +763,7 @@ LinkContestRoom1_EventScript_27A755:: @ 827A755 return LinkContestRoom1_EventScript_27A756:: @ 827A756 - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 goto_eq LinkContestRoom1_EventScript_27A779 applymovement 15, LinkContestRoom1_Movement_27AD11 playse SE_PIN @@ -845,14 +845,14 @@ LinkContestRoom1_EventScript_27A801:: @ 827A801 return LinkContestRoom1_EventScript_27A853:: @ 827A853 - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A867 msgbox LinkContestRoom1_Text_27B904, 4 return LinkContestRoom1_EventScript_27A867:: @ 827A867 specialvar VAR_RESULT, sub_80F9160 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LinkContestRoom1_EventScript_27A87E messageautoscroll LinkContestRoom1_Text_27B904 waitmessage @@ -895,7 +895,7 @@ LinkContestRoom1_EventScript_27A8A5:: @ 827A8A5 return LinkContestRoom1_EventScript_27A8FB:: @ 827A8FB - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A90F msgbox LinkContestRoom1_Text_27BA15, 4 return @@ -908,7 +908,7 @@ LinkContestRoom1_EventScript_27A90F:: @ 827A90F return LinkContestRoom1_EventScript_27A91E:: @ 827A91E - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A932 msgbox LinkContestRoom1_Text_27BA30, 4 return @@ -921,7 +921,7 @@ LinkContestRoom1_EventScript_27A932:: @ 827A932 return LinkContestRoom1_EventScript_27A941:: @ 827A941 - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A955 msgbox LinkContestRoom1_Text_27BAAC, 4 return @@ -934,7 +934,7 @@ LinkContestRoom1_EventScript_27A955:: @ 827A955 return LinkContestRoom1_EventScript_27A964:: @ 827A964 - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27A978 msgbox LinkContestRoom1_Text_27BB25, 4 return @@ -985,7 +985,7 @@ LinkContestRoom1_EventScript_27A9D4:: @ 827A9D4 return LinkContestRoom1_EventScript_27AA00:: @ 827AA00 - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27AA14 msgbox LinkContestRoom1_Text_27BB4C, 4 return @@ -998,7 +998,7 @@ LinkContestRoom1_EventScript_27AA14:: @ 827AA14 LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B addvar VAR_0x4001, 1 lockall - compare_var_to_value VAR_0x4088, 1 + compare VAR_0x4088, 1 call_if 2, LinkContestRoom1_EventScript_27AA6F applymovement 9, LinkContestRoom1_Movement_27AD3B applymovement 12, LinkContestRoom1_Movement_27AD3F @@ -1008,7 +1008,7 @@ LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B applymovement 11, LinkContestRoom1_Movement_27AD3F applymovement 6, LinkContestRoom1_Movement_27AD37 applymovement 8, LinkContestRoom1_Movement_27AD33 - compare_var_to_value VAR_0x4001, 4 + compare VAR_0x4001, 4 goto_if 5, LinkContestRoom1_EventScript_27AA1B delay 30 return @@ -1083,7 +1083,7 @@ LinkContestRoom1_EventScript_27AA6F:: @ 827AA6F return LinkContestRoom1_EventScript_27AB36:: @ 827AB36 - compare_var_to_value VAR_0x4088, 5 + compare VAR_0x4088, 5 goto_eq LinkContestRoom1_EventScript_27ABD8 call LinkContestRoom1_EventScript_27AB9E checkflag FLAG_0x002 @@ -1098,7 +1098,7 @@ LinkContestRoom1_EventScript_27AB36:: @ 827AB36 call LinkContestRoom1_EventScript_27AA1B delay 30 special sub_80F88E8 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq LinkContestRoom1_EventScript_27ABD2 return @@ -1108,24 +1108,24 @@ LinkContestRoom1_EventScript_27AB82:: @ 827AB82 releaseall delay 90 special sub_80F88E8 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq LinkContestRoom1_EventScript_27ABD2 return LinkContestRoom1_EventScript_27AB9E:: @ 827AB9E specialvar VAR_RESULT, sub_80F7F7C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LinkContestRoom1_EventScript_27ABAF return LinkContestRoom1_EventScript_27ABAF:: @ 827ABAF special sub_80F831C - compare_var_to_value VAR_0x8005, 3 + compare VAR_0x8005, 3 goto_eq LinkContestRoom1_EventScript_27ABBE return LinkContestRoom1_EventScript_27ABBE:: @ 827ABBE - compare_var_to_value VAR_CONTEST_RANK, 3 + compare VAR_CONTEST_RANK, 3 goto_eq LinkContestRoom1_EventScript_27ABCD setflag FLAG_0x002 return @@ -1146,7 +1146,7 @@ LinkContestRoom1_EventScript_27ABD8:: @ 827ABD8 special sub_80F84B0 special sub_80F831C special sub_80F88E8 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq LinkContestRoom1_EventScript_27ABF1 closemessage return @@ -1196,7 +1196,7 @@ LinkContestRoom1_EventScript_27AC51:: @ 827AC51 LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E special sub_80F831C - compare_var_to_value VAR_0x8005, 3 + compare VAR_0x8005, 3 goto_eq LinkContestRoom1_EventScript_27AC77 lockall msgbox LinkContestRoom1_Text_27BB7A, 4 @@ -1204,12 +1204,12 @@ LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E return LinkContestRoom1_EventScript_27AC77:: @ 827AC77 - compare_var_to_value VAR_0x4088, 2 + compare VAR_0x4088, 2 call_if 1, LinkContestRoom1_EventScript_27ABCE specialvar VAR_RESULT, sub_80F7F7C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LinkContestRoom1_EventScript_27ACDF - compare_var_to_value VAR_CONTEST_RANK, 3 + compare VAR_CONTEST_RANK, 3 goto_eq LinkContestRoom1_EventScript_27ACBD lockall msgbox LinkContestRoom1_Text_27BB7A, 4 @@ -1226,7 +1226,7 @@ LinkContestRoom1_EventScript_27ACA8:: @ 827ACA8 LinkContestRoom1_EventScript_27ACBD:: @ 827ACBD giveitem_std ITEM_LUXURY_BALL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LinkContestRoom1_EventScript_27ACA8 lockall msgbox LinkContestRoom1_Text_27BB7A, 4 @@ -1432,7 +1432,7 @@ LinkContestRoom1_Movement_27AD7E: @ 827AD7E LinkContestRoom1_EventScript_27AD80:: @ 827AD80 specialvar VAR_RESULT, sub_80F9134 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LinkContestRoom1_EventScript_27AD91 return @@ -1441,7 +1441,7 @@ LinkContestRoom1_EventScript_27AD91:: @ 827AD91 LilycoveCity_ContestLobby_EventScript_27AD92:: @ 827AD92 specialvar VAR_RESULT, sub_80F9134 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_27ADA3 return diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 27e617128..7074951d7 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -3,11 +3,11 @@ Route117_EventScript_291C18:: @ 8291C18 faceplayer special GetDaycareMonNicknames specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_EventScript_291C4D - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq Route117_EventScript_291CD1 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq Route117_EventScript_291CE8 msgbox Route117_Text_291FCF, 4 release @@ -15,10 +15,10 @@ Route117_EventScript_291C18:: @ 8291C18 Route117_EventScript_291C4D:: @ 8291C4D msgbox Route117_Text_29205D, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_EventScript_291C83 msgbox Route117_Text_2922C6, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_EventScript_291C83 msgbox Route117_Text_292149, 4 clearflag FLAG_PENDING_DAYCARE_EGG @@ -28,7 +28,7 @@ Route117_EventScript_291C4D:: @ 8291C4D Route117_EventScript_291C83:: @ 8291C83 specialvar VAR_RESULT, CalculatePlayerPartyCount - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if 5, Route117_EventScript_291C9D msgbox Route117_Text_29216A, 4 release @@ -47,7 +47,7 @@ Route117_EventScript_291C9D:: @ 8291C9D Route117_EventScript_291CB7:: @ 8291CB7 specialvar VAR_RESULT, sub_8071614 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route117_EventScript_291CC8 return @@ -81,14 +81,14 @@ Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11 lock faceplayer specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291E0B - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291E2F - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq Route117_PokemonDayCare_EventScript_291F5C msgbox Route117_PokemonDayCare_Text_2922F4, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291D56 msgbox Route117_PokemonDayCare_Text_292416, 4 release @@ -96,19 +96,19 @@ Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11 Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 specialvar VAR_RESULT, CountPartyNonEggMons - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291DED specialvar VAR_RESULT, sub_80722E0 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291E01 msgbox Route117_PokemonDayCare_Text_292349, 4 fadescreen 1 special ChooseSendDaycareMon waitstate - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq Route117_PokemonDayCare_EventScript_291DCA specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route117_PokemonDayCare_EventScript_291DF7 specialvar VAR_0x8005, GetSelectedMonNickAndSpecies waitse @@ -118,7 +118,7 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 special StoreSelectedPokemonInDaycare incrementgamestat 47 specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291DD4 release end @@ -130,7 +130,7 @@ Route117_PokemonDayCare_EventScript_291DCA:: @ 8291DCA Route117_PokemonDayCare_EventScript_291DD4:: @ 8291DD4 msgbox Route117_PokemonDayCare_Text_2923AF, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291D56 goto Route117_PokemonDayCare_EventScript_291DCA end @@ -161,7 +161,7 @@ Route117_PokemonDayCare_EventScript_291E15:: @ 8291E15 Route117_PokemonDayCare_EventScript_291E1E:: @ 8291E1E specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 5, Route117_PokemonDayCare_EventScript_291E15 return @@ -170,26 +170,26 @@ Route117_PokemonDayCare_EventScript_291E2F:: @ 8291E2F setvar VAR_0x8004, 0 call Route117_PokemonDayCare_EventScript_291E1E msgbox Route117_PokemonDayCare_Text_2923AF, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291D56 msgbox Route117_PokemonDayCare_Text_2925F6, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291E6D goto Route117_PokemonDayCare_EventScript_291DCA end Route117_PokemonDayCare_EventScript_291E6D:: @ 8291E6D specialvar VAR_RESULT, CalculatePlayerPartyCount - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq Route117_PokemonDayCare_EventScript_291F3D specialvar VAR_RESULT, GetDaycareState setvar VAR_0x8004, 0 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291EAC special ShowDaycareLevelMenu waitstate copyvar VAR_0x8004, VAR_RESULT - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291DCA goto Route117_PokemonDayCare_EventScript_291EAC end @@ -197,14 +197,14 @@ Route117_PokemonDayCare_EventScript_291E6D:: @ 8291E6D Route117_PokemonDayCare_EventScript_291EAC:: @ 8291EAC special GetDaycareCost msgbox Route117_PokemonDayCare_Text_292549, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291EC8 goto Route117_PokemonDayCare_EventScript_291DCA end Route117_PokemonDayCare_EventScript_291EC8:: @ 8291EC8 specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291EE2 msgbox Route117_PokemonDayCare_Text_292432, 4 release @@ -222,14 +222,14 @@ Route117_PokemonDayCare_EventScript_291EE2:: @ 8291EE2 msgbox Route117_PokemonDayCare_Text_292593, 4 waitmoncry specialvar VAR_RESULT, GetDaycareState - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291F24 goto Route117_PokemonDayCare_EventScript_291DCA end Route117_PokemonDayCare_EventScript_291F24:: @ 8291F24 msgbox Route117_PokemonDayCare_Text_29244F, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291E6D goto Route117_PokemonDayCare_EventScript_291DCA end @@ -271,7 +271,7 @@ Route117_PokemonDayCare_EventScript_291F5C:: @ 8291F5C setvar VAR_0x8004, 1 call Route117_PokemonDayCare_EventScript_291E1E msgbox Route117_PokemonDayCare_Text_2925F6, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291E6D msgbox Route117_PokemonDayCare_Text_292476, 4 release @@ -280,7 +280,7 @@ Route117_PokemonDayCare_EventScript_291F5C:: @ 8291F5C Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95 special ShowDaycareLevelMenu waitstate - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq Route117_PokemonDayCare_EventScript_291DCA copyvar VAR_0x8004, VAR_RESULT specialvar VAR_RESULT, TakePokemonFromDaycare diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index 76f2aac6b..44631cc20 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -13,13 +13,13 @@ Route123_EventScript_2906BB:: @ 82906BB checkflag FLAG_BADGE01_GET goto_if 0, Route103_EventScript_290721 checkpartymove MOVE_CUT - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq Route103_EventScript_290721 setfieldeffectargument 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT buffermovename 1, MOVE_CUT msgbox Route103_Text_29072E, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route103_EventScript_29072B msgbox Route103_Text_290771, 4 closemessage @@ -87,13 +87,13 @@ VictoryRoad_B1F_EventScript_2907A6:: @ 82907A6 checkflag FLAG_BADGE03_GET goto_if 0, Route111_EventScript_29082D checkpartymove MOVE_ROCK_SMASH - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq Route111_EventScript_29082D setfieldeffectargument 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT buffermovename 1, MOVE_ROCK_SMASH msgbox Route111_Text_29083A, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_EventScript_290837 msgbox Route111_Text_290771, 4 closemessage @@ -114,10 +114,10 @@ Route111_EventScript_2907FB:: @ 82907FB waitmovement 0 removeobject VAR_LAST_TALKED specialvar VAR_RESULT, sub_81393FC - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route111_EventScript_290829 special RockSmashWildEncounter - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_EventScript_290829 waitstate releaseall @@ -165,11 +165,11 @@ VictoryRoad_B1F_EventScript_2908BA:: @ 82908BA checkflag FLAG_SYS_USE_STRENGTH goto_eq FieryPath_EventScript_29091F checkpartymove MOVE_STRENGTH - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq FieryPath_EventScript_290915 setfieldeffectargument 0, VAR_RESULT msgbox FieryPath_Text_29092C, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FieryPath_EventScript_290929 closemessage dofieldeffect 40 @@ -226,12 +226,12 @@ FieryPath_Text_290A16: @ 8290A16 EventScript_290A49:: @ 8290A49 lockall checkpartymove MOVE_WATERFALL - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq EventScript_290A84 bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT msgbox Text_290AC3, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_290A8C msgbox Text_290AFC, 4 dofieldeffect 43 @@ -261,13 +261,13 @@ Text_290AFC: @ 8290AFC EventScript_290B0F:: @ 8290B0F lockall checkpartymove MOVE_DIVE - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq EventScript_290B4E bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 1, 1 msgbox Text_290BE8, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_290B58 msgbox Text_290C1A, 4 dofieldeffect 44 @@ -286,13 +286,13 @@ EventScript_290B58:: @ 8290B58 EventScript_290B5A:: @ 8290B5A lockall checkpartymove MOVE_DIVE - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq EventScript_290B99 bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 1, 1 msgbox Text_290C6E, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_290BA8 msgbox Text_290C1A, 4 dofieldeffect 44 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index d4b05a096..269ef2530 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -1,7 +1,7 @@ EventScript_28CCAA:: @ 828CCAA setvar VAR_0x8005, 8 special InterviewBefore - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_28CCC6 setvar VAR_0x8005, 8 special InterviewAfter @@ -214,11 +214,11 @@ Route120_EventScript_28CF36:: @ 828CF36 Route111_EventScript_28CF56:: @ 828CF56 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToFieldObjectLocalIds - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, Route111_EventScript_28CF94 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, Route111_EventScript_28CF9F - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, Route111_EventScript_28CFB1 checkflag FLAG_0x001 goto_eq Route111_EventScript_28D0EE @@ -248,16 +248,16 @@ Route118_EventScript_28CFC3:: @ 828CFC3 Route120_EventScript_28CFC3:: @ 828CFC3 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToFieldObjectLocalIds - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, Route111_EventScript_28CF94 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, Route111_EventScript_28CF9F - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, Route111_EventScript_28CFB1 checkflag FLAG_0x001 goto_eq Route111_EventScript_28D0EE specialvar VAR_RESULT, GabbyAndTyGetLastQuote - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_EventScript_28D053 msgbox Route111_Text_28B137, 4 specialvar VAR_RESULT, GabbyAndTyGetLastBattleTrivia @@ -312,14 +312,14 @@ Route111_EventScript_28D099:: @ 828D099 end Route111_EventScript_28D0A7:: @ 828D0A7 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_EventScript_28D0E1 msgbox Route111_Text_28B433, 4 setvar VAR_0x8004, 10 call Route111_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_EventScript_28D0E1 msgbox Route111_Text_28B4AB, 4 special GabbyAndTyAfterInterview diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc index 97034e97a..5b3941dd2 100644 --- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc +++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc @@ -7,7 +7,7 @@ AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2 checkflag FLAG_0x126 goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A checkitem ITEM_SCANNER, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq AbandonedShip_CaptainsOffice_EventScript_238810 checkflag FLAG_0x436 goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index 72784cac7..3f019f4d8 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -31,7 +31,7 @@ AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8 checkflag FLAG_0x0EF goto_eq AbandonedShip_Corridors_B1F_EventScript_237E09 checkitem ITEM_STORAGE_KEY, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq AbandonedShip_Corridors_B1F_EventScript_237DFF msgbox AbandonedShip_Corridors_B1F_Text_237F4B, 4 playse SE_PIN diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index b21bcfa7a..b1bca85aa 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -63,7 +63,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19 checkflag FLAG_0x0F0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D checkitem ITEM_ROOM_1_KEY, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5 msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 playse SE_PIN @@ -79,7 +79,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50 checkflag FLAG_0x0F1 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D checkitem ITEM_ROOM_2_KEY, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 playse SE_PIN @@ -95,7 +95,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87 checkflag FLAG_0x0F2 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D checkitem ITEM_ROOM_4_KEY, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09 msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 playse SE_PIN @@ -111,7 +111,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE checkflag FLAG_0x0F3 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D checkitem ITEM_ROOM_6_KEY, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13 msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 playse SE_PIN diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index cf77399b1..23532b275 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -10,11 +10,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_238C59:: @ 8238C59 setvar VAR_0x4001, 1 getplayerxy VAR_0x4002, VAR_0x4003 setvar VAR_0x4004, 1 - compare_var_to_value VAR_0x4002, 21 + compare VAR_0x4002, 21 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CD1 - compare_var_to_value VAR_0x4002, 36 + compare VAR_0x4002, 36 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CD7 - compare_var_to_value VAR_0x4003, 2 + compare VAR_0x4003, 2 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CDD switch VAR_0x4004 case 1, AbandonedShip_HiddenFloorRooms_EventScript_238CE3 @@ -44,7 +44,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3 setfieldeffectargument 2, 0 dofieldeffect 54 specialvar VAR_RESULT, sub_81392F8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DD3 waitfieldeffect 54 delay 10 @@ -55,10 +55,10 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D0C:: @ 8238D0C AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D specialvar VAR_RESULT, sub_81392AC - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32 delay 20 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DB3 waitfieldeffect 54 delay 10 @@ -78,7 +78,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33 setfieldeffectargument 2, 0 dofieldeffect 54 specialvar VAR_RESULT, sub_8139320 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DE3 waitfieldeffect 54 delay 10 @@ -99,7 +99,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B setfieldeffectargument 2, 0 dofieldeffect 54 specialvar VAR_RESULT, sub_81392D4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DC3 waitfieldeffect 54 delay 10 diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc index 7d86c6f3f..ab710546b 100644 --- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc @@ -3,8 +3,8 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 82380A6 AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7 trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq AbandonedShip_Rooms2_1F_EventScript_2380F0 msgbox AbandonedShip_Rooms2_1F_Text_23820F, 4 release @@ -26,8 +26,8 @@ AbandonedShip_Rooms2_1F_EventScript_2380F0:: @ 82380F0 AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq AbandonedShip_Rooms2_1F_EventScript_238154 msgbox AbandonedShip_Rooms2_1F_Text_23830A, 4 release diff --git a/data/scripts/maps/AbandonedShip_Rooms_1F.inc b/data/scripts/maps/AbandonedShip_Rooms_1F.inc index 025b497dd..00fde5ccb 100644 --- a/data/scripts/maps/AbandonedShip_Rooms_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms_1F.inc @@ -12,8 +12,8 @@ AbandonedShip_Rooms_1F_EventScript_237A9C:: @ 8237A9C AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3 trainerbattle 2, TRAINER_THALIA_1, 0, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq AbandonedShip_Rooms_1F_EventScript_237AFE msgbox AbandonedShip_Rooms_1F_Text_237BDB, 4 release diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 85a1d708d..f97c3fc5a 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -11,7 +11,7 @@ AncientTomb_MapScript1_238FC3: @ 8238FC3 AncientTomb_EventScript_238FCD:: @ 8238FCD specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, AncientTomb_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -72,15 +72,15 @@ AncientTomb_EventScript_23905A:: @ 823905A waitmoncry setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0A74 + special StartRegiBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq AncientTomb_EventScript_2390A1 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq AncientTomb_EventScript_2390AA - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq AncientTomb_EventScript_2390AA setflag FLAG_0x1BD release diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/scripts/maps/AquaHideout_B1F.inc index be50d205d..cf59bdacc 100644 --- a/data/scripts/maps/AquaHideout_B1F.inc +++ b/data/scripts/maps/AquaHideout_B1F.inc @@ -10,7 +10,7 @@ AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 AquaHideout_B1F_EventScript_2339BC:: @ 82339BC specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, AquaHideout_B1F_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -42,11 +42,11 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq AquaHideout_B1F_EventScript_233A2F - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq AquaHideout_B1F_EventScript_233A2F - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq AquaHideout_B1F_EventScript_233A2F setflag FLAG_0x1C4 release @@ -69,11 +69,11 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38 dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq AquaHideout_B1F_EventScript_233A7C - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq AquaHideout_B1F_EventScript_233A7C - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq AquaHideout_B1F_EventScript_233A7C setflag FLAG_0x1C5 release diff --git a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc index 27886b8a5..3bc582c93 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc @@ -17,9 +17,9 @@ BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0 BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC return @@ -43,7 +43,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08 applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB @@ -143,31 +143,31 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 special sub_81A1780 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0 setvar VAR_0x8004, 9 special sub_81A1780 copyvar VAR_0x400F, VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257870 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257877 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25787E - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257885 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25788C - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257893 call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257768 multichoice 19, 4, 103, 1 switch VAR_RESULT @@ -275,7 +275,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A end BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC:: @ 82578BC - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 msgbox BattleFrontier_BattleArenaBattleRoom_Text_257F45, 4 setvar VAR_0x4002, 1 @@ -284,7 +284,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4:: @ 82578D4 message BattleFrontier_BattleArenaBattleRoom_Text_257FBB waitmessage call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25792B multichoice 19, 4, 103, 1 switch VAR_RESULT @@ -333,7 +333,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, 4 closemessage @@ -351,7 +351,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F:: @ 8257A3F msgbox BattleFrontier_BattleArenaBattleRoom_Text_25810D, 4 call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB @@ -359,7 +359,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257852 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 waitmovement 0 @@ -377,7 +377,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, 4 closemessage @@ -395,7 +395,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5 BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8:: @ 8257AF8 msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582F9, 4 call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257B15 goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB @@ -403,7 +403,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15 call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9 setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 waitmovement 0 @@ -430,14 +430,14 @@ FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special sub_81A1780 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 5 setvar VAR_0x8005, 0 special sub_8163AC4 waitstate setvar VAR_0x8004, 18 special sub_81A1780 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 21 special sub_81A1780 return diff --git a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc index dbd4d2db6..303a2c4c9 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc @@ -49,7 +49,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255CCF:: @ 8255CCF lockall setvar VAR_0x8004, 10 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0 msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, 4 goto BattleFrontier_BattleArenaLobby_EventScript_255CF8 @@ -90,14 +90,14 @@ BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59 setvar VAR_0x8004, 8 special sub_81A1780 special copy_player_party_from_sav1 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 special sub_81A5238 playse SE_SAVE waitse call BattleFrontier_BattleArenaLobby_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaLobby_EventScript_255DBF message BattleFrontier_BattleArenaLobby_Text_256B19 waitmessage @@ -156,7 +156,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 case 127, BattleFrontier_BattleArenaLobby_EventScript_255FFB setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -169,7 +169,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 setvar VAR_0x8005, 3 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FF8 msgbox BattleFrontier_BattleArenaLobby_Text_2564CE, 5 switch VAR_RESULT @@ -201,7 +201,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8 delay 2 call BattleFrontier_BattleArenaLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1 BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 @@ -214,9 +214,9 @@ BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256005 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256050 warp BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13 setvar VAR_0x4000, 0 diff --git a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc index 963e8e6c2..9fb734a71 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc @@ -12,7 +12,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 setvar VAR_0x8005, 2 special sub_81A1780 copyvar VAR_0x400F, VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C919 call BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC end @@ -20,9 +20,9 @@ BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1 BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC:: @ 824BCDC BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA return @@ -41,7 +41,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00: @ 824BD00 BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A lockall call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C938 applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 waitmovement 0 @@ -49,9 +49,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, 4 closemessage showobjectat 13, BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM - compare_var_to_value VAR_0x400F, 3 + compare VAR_0x400F, 3 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E - compare_var_to_value VAR_0x400E, 0 + compare VAR_0x400E, 0 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD5A BattleFrontier_BattleDomeBattleRoom_EventScript_24BD4E:: @ 824BD4E @@ -65,9 +65,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61 playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E waitmovement 0 - compare_var_to_value VAR_0x400F, 3 + compare VAR_0x400F, 3 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82 - compare_var_to_value VAR_0x400E, 0 + compare VAR_0x400E, 0 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 @@ -106,7 +106,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7 delay 180 applymovement 9, BattleFrontier_BattleDomeBattleRoom_Movement_24C96B waitmovement 0 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F setvar VAR_0x8004, 19 special sub_818E9AC @@ -118,11 +118,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F waitmovement 0 setvar VAR_0x8004, 4 special sub_818E9AC - compare_var_to_value VAR_0x4002, 0 + compare VAR_0x4002, 0 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEB1 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEC5 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9 playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E @@ -165,9 +165,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9:: @ 824BED9 BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0 applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 waitmovement 0 - compare_var_to_value VAR_0x4002, 0 + compare VAR_0x4002, 0 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E @@ -228,17 +228,17 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5 setvar VAR_0x8004, 1 setvar VAR_0x8005, 6 special sub_818E9AC - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C023 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_818E9AC - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C076 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_818E9AC - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9 return @@ -302,7 +302,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C2:: @ 824C0C2 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C0C9:: @ 824C0C9 - compare_var_to_value VAR_0x400F, 3 + compare VAR_0x400F, 3 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C105 switch VAR_0x400E case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C158 @@ -429,7 +429,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, 4 setvar VAR_0x8004, 2 @@ -449,7 +449,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 special sub_818E9AC setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 closemessage applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B @@ -468,7 +468,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, 4 setvar VAR_0x8004, 2 @@ -488,7 +488,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373 special sub_818E9AC setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 closemessage applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B @@ -528,7 +528,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special sub_81A1780 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 setvar VAR_0x4009, 1 @@ -537,7 +537,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440 setvar VAR_0x4009, 0 setvar VAR_0x8004, 17 special sub_818E9AC - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 16 special sub_818E9AC return @@ -555,12 +555,12 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C48B:: @ 824C48B setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF setvar VAR_0x8004, 9 special sub_81A1780 copyvar VAR_0x400E, VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF call BattleFrontier_BattleDomeBattleRoom_EventScript_242170 setobjectxyperm 15, 13, 9 @@ -572,7 +572,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C4EF:: @ 824C4EF end BattleFrontier_BattleDomeBattleRoom_MapScript1_24C4F0: @ 824C4F0 - compare_var_to_value VAR_0x4009, 1 + compare VAR_0x4009, 1 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC end @@ -581,13 +581,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C4FC:: @ 824C4FC return BattleFrontier_BattleDomeBattleRoom_EventScript_24C502:: @ 824C502 - compare_var_to_value VAR_0x400F, 0 + compare VAR_0x400F, 0 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C52F - compare_var_to_value VAR_0x400F, 1 + compare VAR_0x400F, 1 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C530 - compare_var_to_value VAR_0x400F, 2 + compare VAR_0x400F, 2 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C594 - compare_var_to_value VAR_0x400F, 3 + compare VAR_0x400F, 3 call_if 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24C652 return @@ -951,7 +951,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E:: @ 824C82E BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5:: @ 824C8F5 BattleFrontier_BattleDomePreBattleRoom_EventScript_24C8F5:: @ 824C8F5 copyvar VAR_RESULT, VAR_0x40CE - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F warp BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11 waitstate @@ -965,14 +965,14 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24C90F:: @ 824C90F BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919 random 2 copyvar VAR_0x400D, VAR_RESULT - compare_var_to_value VAR_0x400D, 0 + compare VAR_0x400D, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E setobjectxyperm 6, 2, 0 setobjectmovementtype 6, 10 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938 - compare_var_to_value VAR_0x400D, 0 + compare VAR_0x400D, 0 goto_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E return diff --git a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc index 87bf0aa63..9cb4f3187 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc @@ -12,7 +12,7 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B10E:: @ 824B10E setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomeCorridor_EventScript_24B161 applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_24B1B2 applymovement 255, BattleFrontier_BattleDomeCorridor_Movement_24B1A1 diff --git a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc index 397793888..33b5654d0 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc @@ -61,7 +61,7 @@ BattleFrontier_BattleDomeLobby_EventScript_24989B:: @ 824989B lockall setvar VAR_0x8004, 10 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1 msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, 4 goto BattleFrontier_BattleDomeLobby_EventScript_2498C9 @@ -95,7 +95,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9 setvar VAR_0x8006, 1 special sub_818E9AC special copy_player_party_from_sav1 - special sp000_heal_pokemon + special HealPlayerParty goto BattleFrontier_BattleDomeLobby_EventScript_249991 BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940 @@ -118,7 +118,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940 setvar VAR_0x8006, 1 special sub_818E9AC special copy_player_party_from_sav1 - special sp000_heal_pokemon + special HealPlayerParty BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991 setvar VAR_0x8004, 13 @@ -127,7 +127,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991 playse SE_SAVE waitse call BattleFrontier_BattleDomeLobby_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomeLobby_EventScript_2499E9 message BattleFrontier_BattleDomeLobby_Text_24AE17 waitmessage @@ -182,15 +182,15 @@ BattleFrontier_BattleDomeLobby_EventScript_249A47:: @ 8249A47 BattleFrontier_BattleDomeLobby_EventScript_249A59:: @ 8249A59 special copy_player_party_to_sav1 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CFD - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D06 BattleFrontier_BattleDomeLobby_EventScript_249A72:: @ 8249A72 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D0F - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D15 waitmessage multichoice 17, 6, 23, 0 @@ -209,7 +209,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF case 127, BattleFrontier_BattleDomeLobby_EventScript_249C64 setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C15 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -222,7 +222,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF setvar VAR_0x8005, 3 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C61 msgbox BattleFrontier_BattleDomeLobby_Text_24A1C6, 5 switch VAR_RESULT @@ -250,7 +250,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60 delay 2 call BattleFrontier_BattleDomeLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C4A setvar VAR_0x8004, 22 special sub_818E9AC @@ -265,16 +265,16 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 msgbox BattleFrontier_BattleDomeLobby_Text_24A437, 4 closemessage call BattleFrontier_BattleDomeLobby_EventScript_249C6E - special sp000_heal_pokemon + special HealPlayerParty warp BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 255, 23, 6 setvar VAR_0x4000, 0 waitstate end BattleFrontier_BattleDomeLobby_EventScript_249BFA:: @ 8249BFA - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D1B - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D24 goto BattleFrontier_BattleDomeLobby_EventScript_249A72 @@ -309,26 +309,26 @@ BattleFrontier_BattleDomeLobby_EventScript_249C6C:: @ 8249C6C end BattleFrontier_BattleDomeLobby_EventScript_249C6E:: @ 8249C6E - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CDD - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CE5 applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D45 waitmovement 0 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D2D - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D33 waitdooranim - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CED - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CF5 applymovement 255, BattleFrontier_BattleDomeLobby_Movement_249D4E waitmovement 0 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D39 - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249D3F waitdooranim return @@ -434,13 +434,13 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84 setvar VAR_0x8004, 1 setvar VAR_0x8005, 9 special sub_818E9AC - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DC9 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DD2 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DDB - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249DE4 fadescreen 1 setvar VAR_0x8004, 8 diff --git a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc index 30b6d5d39..188fe4649 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc @@ -17,7 +17,7 @@ BattleFrontier_BattleDomePreBattleRoom_MapScript2_24B218: @ 824B218 .2byte 0 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B222:: @ 824B222 - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7 setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 @@ -33,7 +33,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F:: @ 824B24F waitmessage switch VAR_RESULT call BattleFrontier_BattleDomePreBattleRoom_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B2C1 multichoice 16, 0, 73, 1 switch VAR_RESULT @@ -158,7 +158,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D waitstate setvar VAR_0x8004, 21 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F setvar VAR_0x8004, 2 setvar VAR_0x8005, 8 @@ -249,7 +249,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7 special sub_81A1780 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600 fadescreen 1 setvar VAR_0x8004, 11 diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc index 2d21f080c..3652d576f 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc @@ -8,14 +8,14 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB setvar VAR_0x8004, 5 special sub_81A1780 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B setvar VAR_0x8004, 9 special sub_81A1780 copyvar VAR_0x400F, VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25ADF3 end @@ -31,7 +31,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE00: @ 825AE00 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE0A:: @ 825AE0A setvar VAR_0x4001, 1 hideobjectat 255, BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM - compare_var_to_value VAR_0x400F, 0 + compare VAR_0x400F, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24 hideobjectat 2, BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM @@ -62,7 +62,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B end BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67 - compare_var_to_value VAR_0x400F, 0 + compare VAR_0x400F, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B applymovement 255, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B @@ -77,7 +77,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE67:: @ 825AE67 waitmovement 0 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 - compare_var_to_value VAR_0x400F, 0 + compare VAR_0x400F, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C setvar VAR_0x8004, 5 special sub_8195960 @@ -89,7 +89,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special sub_81A1780 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 6 setvar VAR_0x8005, 0 special sub_8163AC4 @@ -110,7 +110,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F:: @ 825AF0F setvar VAR_0x8004, 1 setvar VAR_0x8005, 3 special sub_81A5E74 - compare_var_to_value VAR_RESULT, 9999 + compare VAR_RESULT, 9999 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E addvar VAR_RESULT, 1 setorcopyvar VAR_0x8006, VAR_RESULT @@ -151,7 +151,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, 4 setvar VAR_0x8004, 2 @@ -161,14 +161,14 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, 4 call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, 4 closemessage @@ -187,7 +187,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, 4 setvar VAR_0x8004, 2 @@ -197,14 +197,14 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, 4 call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEF8 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, 4 waitmessage @@ -225,7 +225,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special sub_81A1780 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 6 setvar VAR_0x8005, 0 special sub_8163AC4 @@ -236,7 +236,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105 setvar VAR_0x8004, 1 setvar VAR_0x8005, 3 special sub_81A5E74 - compare_var_to_value VAR_RESULT, 9999 + compare VAR_RESULT, 9999 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF3E addvar VAR_RESULT, 1 setorcopyvar VAR_0x8006, VAR_RESULT @@ -246,7 +246,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_81A5E74 - compare_var_to_value VAR_RESULT, 9999 + compare VAR_RESULT, 9999 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF43 addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 @@ -292,7 +292,7 @@ BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B: @ 825B18B BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190:: @ 825B190 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B190:: @ 825B190 copyvar VAR_RESULT, VAR_0x40CE - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA warp BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8 waitstate diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc index 3ceb3276c..791a666d5 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc @@ -55,7 +55,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25849B:: @ 825849B lockall setvar VAR_0x8004, 10 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, 4 waitmessage @@ -102,7 +102,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506 BattleFrontier_BattleFactoryLobby_EventScript_25853B:: @ 825853B call BattleFrontier_BattleFactoryLobby_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryLobby_EventScript_258582 message BattleFrontier_BattleFactoryLobby_Text_259388 waitmessage @@ -155,15 +155,15 @@ BattleFrontier_BattleFactoryLobby_EventScript_2585DD:: @ 82585DD BattleFrontier_BattleFactoryLobby_EventScript_2585ED:: @ 82585ED special copy_player_party_to_sav1 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587B1 - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587BA BattleFrontier_BattleFactoryLobby_EventScript_258606:: @ 8258606 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C3 - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587C9 waitmessage multichoice 17, 6, 23, 0 @@ -210,7 +210,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 delay 2 call BattleFrontier_BattleFactoryLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleFactoryLobby_EventScript_258783 setvar VAR_0x8006, 0 @@ -218,9 +218,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A special copy_player_party_to_sav1 msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, 4 closemessage - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_25875C - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_258762 applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_2587A7 applymovement 255, BattleFrontier_BattleFactoryLobby_Movement_2587AC @@ -239,9 +239,9 @@ BattleFrontier_BattleFactoryLobby_EventScript_258762:: @ 8258762 return BattleFrontier_BattleFactoryLobby_EventScript_258768:: @ 8258768 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587CF - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587D8 goto BattleFrontier_BattleFactoryLobby_EventScript_258606 diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc index cd34a1d15..ffc3744f6 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc @@ -9,7 +9,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AC5: @ 8259AC5 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259ACF:: @ 8259ACF setvar VAR_0x4001, 1 - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AEA setobjectxy 1, 8, 7 turnobject 1, 1 @@ -23,13 +23,13 @@ BattleFrontier_BattleFactoryPreBattleRoom_MapScript2_259AEF: @ 8259AEF .2byte 0 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9 - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5 setvar VAR_0x4000, 1 applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC applymovement 255, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A waitmovement 0 - compare_var_to_value VAR_0x8006, 2 + compare VAR_0x8006, 2 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69 setvar VAR_0x8004, 13 special sub_81A5E74 @@ -55,9 +55,9 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74 msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB96, 4 closemessage call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23F2B7 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A17C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B waitmovement 0 warp BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11 @@ -72,10 +72,10 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D, 4 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 9 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26 playse 263 waitse @@ -96,27 +96,27 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13:: @ 8259C13 setvar VAR_0x8004, 9 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E24 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E2B - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E32 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E39 - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E40 call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259CC6 multichoice 19, 4, 103, 1 switch VAR_RESULT @@ -185,7 +185,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2:: @ 8259DF2 setvar VAR_0x8004, 7 special sub_81A5E74 waitstate - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 setvar VAR_0x8004, 8 special sub_81A5E74 @@ -249,41 +249,41 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93:: @ 8259E93 msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4, 4 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B - compare_var_to_value VAR_0x8005, 2 + compare VAR_0x8005, 2 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74 - compare_var_to_value VAR_0x8005, 3 + compare VAR_0x8005, 3 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D - compare_var_to_value VAR_0x8005, 4 + compare VAR_0x8005, 4 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86 - compare_var_to_value VAR_0x8005, 5 + compare VAR_0x8005, 5 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F - compare_var_to_value VAR_0x8005, 6 + compare VAR_0x8005, 6 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98 - compare_var_to_value VAR_0x8005, 7 + compare VAR_0x8005, 7 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1 - compare_var_to_value VAR_0x8005, 8 + compare VAR_0x8005, 8 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA - compare_var_to_value VAR_0x8005, 10 + compare VAR_0x8005, 10 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3 - compare_var_to_value VAR_0x8005, 11 + compare VAR_0x8005, 11 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC - compare_var_to_value VAR_0x8005, 12 + compare VAR_0x8005, 12 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5 - compare_var_to_value VAR_0x8005, 13 + compare VAR_0x8005, 13 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE - compare_var_to_value VAR_0x8005, 14 + compare VAR_0x8005, 14 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7 - compare_var_to_value VAR_0x8005, 15 + compare VAR_0x8005, 15 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0 - compare_var_to_value VAR_0x8005, 16 + compare VAR_0x8005, 16 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9 - compare_var_to_value VAR_0x8005, 17 + compare VAR_0x8005, 17 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2 - compare_var_to_value VAR_0x8005, 18 + compare VAR_0x8005, 18 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB return @@ -360,23 +360,23 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB:: @ 8259FFB return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004:: @ 825A004 - compare_var_to_value VAR_0x8006, 0 + compare VAR_0x8006, 0 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068 - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071 - compare_var_to_value VAR_0x8006, 2 + compare VAR_0x8006, 2 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A - compare_var_to_value VAR_0x8006, 3 + compare VAR_0x8006, 3 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083 - compare_var_to_value VAR_0x8006, 4 + compare VAR_0x8006, 4 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C - compare_var_to_value VAR_0x8006, 5 + compare VAR_0x8006, 5 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095 - compare_var_to_value VAR_0x8006, 6 + compare VAR_0x8006, 6 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E - compare_var_to_value VAR_0x8006, 7 + compare VAR_0x8006, 7 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7 - compare_var_to_value VAR_0x8006, 8 + compare VAR_0x8006, 8 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0 return @@ -420,7 +420,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9:: @ 825A0B9 message BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD20 waitmessage call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110 multichoice 19, 4, 103, 1 switch VAR_RESULT diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc index 9178ca8bd..6646694f7 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc @@ -12,9 +12,9 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856 return @@ -37,7 +37,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F86B:: @ 824F86B setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8B5 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B waitmovement 0 @@ -100,31 +100,31 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911 special sub_81A1780 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A:: @ 824F98A setvar VAR_0x8004, 9 special sub_81A1780 copyvar VAR_0x400F, VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE66 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE6D - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE74 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE7B - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE82 - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 call_if 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89 call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FA42 multichoice 19, 4, 103, 1 switch VAR_RESULT @@ -198,7 +198,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F end BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61:: @ 824FB61 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2500DD, 4 setvar VAR_0x4002, 1 @@ -207,7 +207,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79:: @ 824FB79 message BattleFrontier_BattlePalaceBattleRoom_Text_25014A waitmessage call BattleFrontier_BattlePalaceBattleRoom_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0 multichoice 19, 4, 103, 1 switch VAR_RESULT @@ -247,7 +247,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, 4 setvar VAR_0x8004, 2 @@ -257,7 +257,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502C4, 4 call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7 goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA @@ -266,7 +266,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 special sub_8195960 setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502FF, 4 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 @@ -290,7 +290,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, 4 setvar VAR_0x8004, 2 @@ -300,7 +300,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250572, 4 call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84 goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8FA @@ -309,7 +309,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 special sub_8195960 setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25057E, 4 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 @@ -337,14 +337,14 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7 setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special sub_81A1780 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 4 setvar VAR_0x8005, 0 special sub_8163AC4 waitstate setvar VAR_0x8004, 18 special sub_81A1780 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 21 special sub_81A1780 return @@ -460,7 +460,7 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB6: @ 824FEB6 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB:: @ 824FEBB copyvar VAR_RESULT, VAR_0x40CE - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5 warp BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7 waitstate diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc index 183dbdaec..5c71cf4d6 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc @@ -14,21 +14,21 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F4B3:: @ 824F4B3 lockall setvar VAR_0x8004, 3 special sub_8195960 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F58B - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F594 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F59D - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 call_if 1, BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF closemessage setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceCorridor_EventScript_24F553 applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_24F5BD applymovement 255, BattleFrontier_BattlePalaceCorridor_Movement_24F5C4 diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc index d62bc4412..2e0f152b4 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc @@ -49,7 +49,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817 lockall setvar VAR_0x8004, 10 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838 msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, 4 goto BattleFrontier_BattlePalaceLobby_EventScript_24D840 @@ -90,14 +90,14 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1 setvar VAR_0x8004, 8 special sub_81A1780 special copy_player_party_from_sav1 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 special sub_8195960 playse SE_SAVE waitse call BattleFrontier_BattlePalaceLobby_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D907 message BattleFrontier_BattlePalaceLobby_Text_24EF16 waitmessage @@ -150,18 +150,18 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968 setvar VAR_0x8004, 1 setvar VAR_0x8005, 0 special sub_8195960 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceLobby_EventScript_24D817 special copy_player_party_to_sav1 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB9E - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBA7 BattleFrontier_BattlePalaceLobby_EventScript_24D999:: @ 824D999 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB0 - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DBB6 waitmessage multichoice 17, 6, 23, 0 @@ -180,7 +180,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 case 127, BattleFrontier_BattlePalaceLobby_EventScript_24DB94 setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB45 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -193,7 +193,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 setvar VAR_0x8005, 3 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB91 msgbox BattleFrontier_BattlePalaceLobby_Text_24E3C8, 5 switch VAR_RESULT @@ -225,7 +225,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87 delay 2 call BattleFrontier_BattlePalaceLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 @@ -242,7 +242,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 end BattleFrontier_BattlePalaceLobby_EventScript_24DB20:: @ 824DB20 - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38 msgbox BattleFrontier_BattlePalaceLobby_Text_24DE17, 4 goto BattleFrontier_BattlePalaceLobby_EventScript_24D999 @@ -298,24 +298,24 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DBB6:: @ 824DBB6 return BattleFrontier_BattlePalaceLobby_EventScript_24DBBC:: @ 824DBBC - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC23 - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC29 applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC47 applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC47 waitmovement 0 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC2F - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC35 waitdooranim applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_24DC49 applymovement 255, BattleFrontier_BattlePalaceLobby_Movement_24DC4C waitmovement 0 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC3B - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DC41 waitdooranim return diff --git a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc index 66226b9ce..40b5e437f 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc @@ -25,7 +25,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707 end BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 27 special sub_81A703C lockall @@ -51,7 +51,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B762:: @ 825B762 lockall setvar VAR_0x8004, 10 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeLobby_EventScript_25B784 msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, 4 waitmessage @@ -77,7 +77,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D copyvar VAR_0x8006, VAR_RESULT special sub_81A703C special copy_player_party_from_sav1 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 27 special sub_81A703C message BattleFrontier_BattlePikeLobby_Text_25C1DF @@ -108,7 +108,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806 setvar VAR_0x8006, 0 special sub_81A703C special copy_player_party_from_sav1 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 27 special sub_81A703C setvar VAR_0x8004, 8 @@ -149,7 +149,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB case 127, BattleFrontier_BattlePikeLobby_EventScript_25BA76 setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA27 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -162,7 +162,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB setvar VAR_0x8005, 3 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA73 msgbox BattleFrontier_BattlePikeLobby_Text_25C0D8, 5 switch VAR_RESULT @@ -199,7 +199,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C setvar VAR_0x4000, 255 setvar VAR_0x8004, 26 special sub_81A703C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C special copy_player_party_to_sav1 setvar VAR_0x8004, 3 @@ -210,7 +210,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C setvar VAR_0x8004, 5 special sub_81A1780 call BattleFrontier_BattlePikeLobby_EventScript_25BA94 - special sp000_heal_pokemon + special HealPlayerParty call BattleFrontier_BattlePikeLobby_EventScript_25BB49 warpsilent BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 255, 6, 7 setvar VAR_0x4000, 0 diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc index 69dc87eaa..2aafa58a6 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc @@ -89,7 +89,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285:: @ 825D285 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F, 4 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE94, 4 closemessage release @@ -145,7 +145,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, 4 setvar VAR_0x8004, 2 @@ -155,14 +155,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, 4 call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, 4 waitmessage @@ -180,7 +180,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, 4 setvar VAR_0x8004, 2 @@ -190,14 +190,14 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, 4 call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460 goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D20A BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, 4 waitmessage @@ -257,7 +257,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E:: @ 825D50E waitmessage playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA13, 4 closemessage applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798 @@ -320,9 +320,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605 setvar VAR_0x8004, 12 special sub_81A703C copyvar VAR_0x8004, VAR_RESULT - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5 msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, 4 closemessage @@ -337,13 +337,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 waitmoncry setvar VAR_0x8004, 11 special sub_81A703C - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D758 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766 setvar VAR_0x8004, 15 special sub_81A703C @@ -374,9 +374,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5 waitmoncry setvar VAR_0x8004, 11 special sub_81A703C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774 setvar VAR_0x8004, 15 special sub_81A703C @@ -607,9 +607,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831:: @ 825D831 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E setvar VAR_0x8004, 13 special sub_81A703C - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875 playfanfare BGM_ME_ASA waitfanfare diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc index ebdfd5b69..c651a9e68 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc @@ -38,9 +38,9 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 special sub_81A1780 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 end diff --git a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc index c1dcce822..74da4c01c 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc @@ -168,7 +168,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78 setvar VAR_0x8004, 17 special sub_81A703C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91 setvar VAR_0x4005, 255 end @@ -191,7 +191,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB setvar VAR_0x8004, 19 special sub_81A703C - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2 lock faceplayer diff --git a/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc index 54d72c398..9184f3cd3 100644 --- a/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc +++ b/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc @@ -14,29 +14,29 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D:: @ 825F07D BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A:: @ 825F08A specialvar VAR_0x4001, sub_813AA04 - compare_var_to_var VAR_0x4001, VAR_0x8008 + compare VAR_0x4001, VAR_0x8008 goto_if 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86, 4 - compare_var_to_value VAR_0x4002, 0 + compare VAR_0x4002, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9:: @ 825F0C9 - compare_var_to_value VAR_0x4002, 0 + compare VAR_0x4002, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5 checkdecorspace VAR_0x8009 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D copyvar VAR_0x8004, VAR_0x8008 special sub_813A9A4 @@ -44,7 +44,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5 special sub_813A8FC playse SE_REGI msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45, 4 - compare_var_to_value VAR_0x4002, 0 + compare VAR_0x4002, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E end @@ -57,7 +57,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D:: @ 825F11D BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A checkitemspace VAR_0x8009, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166 copyvar VAR_0x8004, VAR_0x8008 special sub_813A9A4 @@ -65,7 +65,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A special sub_813A8FC playse SE_REGI msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72, 4 - compare_var_to_value VAR_0x4002, 2 + compare VAR_0x4002, 2 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 end @@ -107,7 +107,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185:: @ 825F185 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 16 setvar VAR_0x8009, 75 @@ -116,7 +116,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 32 setvar VAR_0x8009, 103 @@ -125,7 +125,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 32 setvar VAR_0x8009, 87 @@ -134,7 +134,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 setvar VAR_0x8009, 79 @@ -143,7 +143,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 setvar VAR_0x8009, 84 @@ -152,7 +152,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 setvar VAR_0x8009, 85 @@ -161,7 +161,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 setvar VAR_0x8009, 86 @@ -170,7 +170,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 setvar VAR_0x8009, 80 @@ -179,7 +179,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 setvar VAR_0x8009, 81 @@ -188,7 +188,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359:: @ 825F359 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 setvar VAR_0x8009, 82 @@ -221,7 +221,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E:: @ 825F38E BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 128 setvar VAR_0x8009, 113 @@ -230,7 +230,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 128 setvar VAR_0x8009, 111 @@ -239,7 +239,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 setvar VAR_0x8009, 114 @@ -248,7 +248,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 setvar VAR_0x8009, 115 @@ -257,7 +257,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C:: @ 825F47C msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 setvar VAR_0x8009, 116 @@ -291,7 +291,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1:: @ 825F4B1 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 64 @@ -300,7 +300,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 67 @@ -309,7 +309,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 65 @@ -318,7 +318,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 70 @@ -327,7 +327,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 66 @@ -336,7 +336,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD:: @ 825F5CD msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 setvar VAR_0x8009, 63 @@ -373,7 +373,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602:: @ 825F602 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 setvar VAR_0x8009, 200 @@ -382,7 +382,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 setvar VAR_0x8009, 180 @@ -391,7 +391,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 setvar VAR_0x8009, 183 @@ -400,7 +400,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 setvar VAR_0x8009, 185 @@ -409,7 +409,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, 179 @@ -418,7 +418,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, 186 @@ -427,7 +427,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, 187 @@ -436,7 +436,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, 196 @@ -445,7 +445,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8:: @ 825F7A8 msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 setvar VAR_0x8009, 198 diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc index 85fd5e417..b4bfcbe40 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc @@ -21,7 +21,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77 special sub_81A8E7C delay 2 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77 setvar VAR_0x400D, 0 releaseall @@ -49,17 +49,17 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 special sub_81A1780 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 - compare_var_to_value VAR_RESULT, 9 + compare VAR_RESULT, 9 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252B42 setvar VAR_0x8004, 14 setvar VAR_0x8005, 8 @@ -90,7 +90,7 @@ BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66 special sub_81A8E7C setvar VAR_0x8004, 14 special sub_81A8E7C - special sp000_heal_pokemon + special HealPlayerParty warpsilent BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 waitstate end @@ -134,7 +134,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8 setvar VAR_0x8005, 2 copyvar VAR_0x8006, VAR_RESULT special sub_81A1780 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45 setvar VAR_0x8004, 6 special sub_81A8E7C @@ -166,7 +166,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A:: @ 8252C6A setvar VAR_0x8004, 7 special sub_81A8E7C callstd 1 - compare_var_to_value VAR_0x8007, 0 + compare VAR_0x8007, 0 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87 setvar VAR_0x8004, 8 special sub_81A8E7C diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc index f5043f13e..9455479a7 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc @@ -52,7 +52,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1 lockall setvar VAR_0x8004, 10 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2 msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, 4 goto BattleFrontier_BattlePyramidLobby_EventScript_2507DA @@ -62,7 +62,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507D2:: @ 82507D2 BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA special sub_81B95E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattlePyramidLobby_EventScript_250DDB clearflag FLAG_SPECIAL_FLAG_0x4004 setvar VAR_0x8004, 8 @@ -70,7 +70,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA special copy_player_party_from_sav1 setvar VAR_0x8004, 14 special sub_81A8E7C - special sp000_heal_pokemon + special HealPlayerParty message BattleFrontier_BattlePyramidLobby_Text_2519F8 waitmessage playse SE_EXPMAX @@ -100,7 +100,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852 special copy_player_party_from_sav1 setvar VAR_0x8004, 14 special sub_81A8E7C - special sp000_heal_pokemon + special HealPlayerParty lockall message BattleFrontier_BattlePyramidLobby_Text_251B5A waitmessage @@ -153,7 +153,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 case 127, BattleFrontier_BattlePyramidLobby_EventScript_250AC4 setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250A75 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -166,7 +166,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 setvar VAR_0x8005, 3 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AC1 msgbox BattleFrontier_BattlePyramidLobby_Text_2514E6, 5 switch VAR_RESULT @@ -202,7 +202,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 delay 2 call BattleFrontier_BattlePyramidLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 @@ -218,7 +218,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 setvar VAR_0x8006, 0 special sub_81A1780 setvar VAR_RESULT, 0 - special sp000_heal_pokemon + special HealPlayerParty warp BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE, 255, 1, 1 setvar VAR_0x4000, 0 waitstate @@ -285,7 +285,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28 setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 special sub_81A8E7C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B53 setvar VAR_RESULT, 0 goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 @@ -303,7 +303,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66 setvar VAR_0x8004, 1 setvar VAR_0x8005, 6 special sub_81A8E7C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidLobby_EventScript_250B91 setvar VAR_RESULT, 0 goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 @@ -440,7 +440,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_81A8E7C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250D94 msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, 4 goto BattleFrontier_BattlePyramidLobby_EventScript_250D9C @@ -496,7 +496,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB msgbox BattleFrontier_BattlePyramidLobby_Text_2517FC, 4 setflag FLAG_SPECIAL_FLAG_0x4004 special sub_81C6A94 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250E00 message BattleFrontier_BattlePyramidLobby_Text_2518C6 waitmessage @@ -534,7 +534,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250E50:: @ 8250E50 BattleFrontier_BattlePyramidLobby_EventScript_250E60:: @ 8250E60 special sub_81B95E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250E6F return diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc index 5249a28d6..f10606ded 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc @@ -20,7 +20,7 @@ BattleFrontier_BattlePyramidTop_MapScript2_2550CE: @ 82550CE BattleFrontier_BattlePyramidTop_EventScript_2550D8:: @ 82550D8 setvar VAR_0x4001, 1 turnobject 255, 2 - compare_var_to_value VAR_0x400C, 0 + compare VAR_0x400C, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2550F3 setobjectxyperm 2, 0, 0 @@ -30,7 +30,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2550F3:: @ 82550F3 BattleFrontier_BattlePyramidTop_MapScript1_2550F4: @ 82550F4 setvar VAR_0x8004, 9 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePyramidTop_EventScript_25510C call BattleFrontier_BattlePyramidTop_EventScript_242170 @@ -45,11 +45,11 @@ BattleFrontier_BattlePyramidTop_EventScript_25510C:: @ 825510C setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 special sub_81A1780 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - compare_var_to_value VAR_RESULT, 9 + compare VAR_RESULT, 9 goto_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 end @@ -88,9 +88,9 @@ BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193 BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0 lock faceplayer - compare_var_to_value VAR_0x400D, 0 + compare VAR_0x400D, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255236 - compare_var_to_value VAR_0x400C, 0 + compare VAR_0x400C, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255240 msgbox BattleFrontier_BattlePyramidTop_Text_255410, 4 closemessage @@ -136,7 +136,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2552D0 special SpawnScriptFieldObject applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C @@ -160,14 +160,14 @@ BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA msgbox BattleFrontier_BattlePyramidTop_Text_255846, 4 call BattleFrontier_BattlePyramidTop_EventScript_2553ED playbgm BGM_BATTLE_PYRAMID_SUMMIT, 0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePyramidTop_EventScript_2552FB goto BattleFrontier_BattlePyramidTop_EventScript_252B42 BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_25521A msgbox BattleFrontier_BattlePyramidTop_Text_255873, 4 playfanfare BGM_ME_BATTLE_SYMBOL @@ -183,7 +183,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255388 special SpawnScriptFieldObject applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C @@ -207,14 +207,14 @@ BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392 msgbox BattleFrontier_BattlePyramidTop_Text_255AA1, 4 call BattleFrontier_BattlePyramidTop_EventScript_2553ED playbgm BGM_BATTLE_PYRAMID_SUMMIT, 0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePyramidTop_EventScript_2553B3 goto BattleFrontier_BattlePyramidTop_EventScript_252B42 BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3 setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePyramidTop_EventScript_25521A msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, 4 playfanfare BGM_ME_BATTLE_SYMBOL diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc index 71f0cff2d..e8af66842 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc @@ -23,7 +23,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241B6C:: @ 8241B6C setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D waitmovement 0 @@ -75,7 +75,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F removeobject 1 setvar VAR_0x8004, 9 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3 applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_24218D waitmovement 0 @@ -84,20 +84,20 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, 4 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F:: @ 8241C8F setvar VAR_0x8004, 9 special sub_81A1780 copyvar VAR_0x400F, VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 call BattleFrontier_BattleTowerBattleRoom_EventScript_241E44 call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241D0A multichoice 19, 4, 103, 1 switch VAR_RESULT @@ -245,7 +245,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 return BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A:: @ 8241F0A - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2424C2, 4 setvar VAR_0x4002, 1 @@ -254,7 +254,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241F22:: @ 8241F22 message BattleFrontier_BattleTowerBattleRoom_Text_242542 waitmessage call BattleFrontier_BattleTowerBattleRoom_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F79 multichoice 19, 4, 103, 1 switch VAR_RESULT @@ -289,7 +289,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_242029 msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, 4 setvar VAR_0x8004, 2 @@ -299,7 +299,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029 msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, 4 call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_242046 goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03 @@ -307,7 +307,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046 call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, 4 playfanfare BGM_ME_BATTLE_SYMBOL @@ -323,7 +323,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085 setvar VAR_0x8004, 1 setvar VAR_0x8005, 7 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, 4 setvar VAR_0x8004, 2 @@ -333,7 +333,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085 BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, 4 call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03 @@ -341,7 +341,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF call BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA setvar VAR_0x8004, 12 special sub_81A1780 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, 4 playfanfare BGM_ME_BATTLE_SYMBOL @@ -361,17 +361,17 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E setvar VAR_0x8005, 6 setvar VAR_0x8006, 0 special sub_81A1780 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 0 setvar VAR_0x8005, 0 special sub_8163AC4 waitstate copyvar VAR_0x8004, VAR_0x40CE - compare_var_to_value VAR_0x8004, 3 + compare VAR_0x8004, 3 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_24215A setvar VAR_0x8004, 18 special sub_81A1780 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 21 special sub_81A1780 @@ -485,11 +485,11 @@ BattleFrontier_BattleTowerBattleRoom_Movement_2421B2: @ 82421B2 BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8:: @ 82421B8 BattleFrontier_BattleTowerBattleRoom_EventScript_2421B8:: @ 82421B8 copyvar VAR_RESULT, VAR_0x40CE - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421E8 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421F2 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC warp BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc index 2ea9c897b..1ee49477f 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc @@ -5,9 +5,9 @@ BattleFrontier_BattleTowerBattleRoom2_MapScripts:: @ 8248EE8 .byte 0 BattleFrontier_BattleTowerBattleRoom2_MapScript1_248EF8: @ 8248EF8 - compare_var_to_value VAR_0x40CE, 2 + compare VAR_0x40CE, 2 call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F end @@ -15,7 +15,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F setvar VAR_0x8004, 14 special sub_8161F74 checkplayergender - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29 setvar VAR_0x401F, 0 return @@ -48,7 +48,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F4D:: @ 8248F4D setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4 applymovement 2, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E applymovement 3, BattleFrontier_BattleTowerBattleRoom2_Movement_24953E @@ -70,7 +70,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4 applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249528 applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_24952E waitmovement 0 - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249026 setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 @@ -142,7 +142,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA applymovement 5, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 applymovement 6, BattleFrontier_BattleTowerBattleRoom2_Movement_249524 waitmovement 0 - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118 msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, 4 goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121 @@ -157,21 +157,21 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121 setvar VAR_0x8004, 3 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 call_if 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_249514 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty BattleFrontier_BattleTowerBattleRoom2_EventScript_249143:: @ 8249143 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 call BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249283 call BattleFrontier_BattleTowerBattleRoom2_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2491B1 multichoice 19, 4, 103, 1 switch VAR_RESULT @@ -256,7 +256,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB end BattleFrontier_BattleTowerBattleRoom2_EventScript_2492FD:: @ 82492FD - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_24937E copyvar VAR_0x400F, VAR_RESULT switch VAR_0x400F @@ -374,7 +374,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249483:: @ 8249483 waitmessage special sub_813B568 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom2_EventScript_24907E goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249412 end @@ -395,7 +395,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2494DD:: @ 82494DD message BattleFrontier_BattleTowerBattleRoom2_Text_24244C waitmessage multichoicedefault 20, 8, 94, 1, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_2494FA goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc index 3369e4d75..fc1327f41 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc @@ -4,7 +4,7 @@ BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA .byte 0 BattleFrontier_BattleTowerCorridor_MapScript1_241AB5: @ 8241AB5 - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 goto_eq BattleFrontier_BattleTowerCorridor_EventScript_241AD3 setmetatile 12, 0, 519, 0 setmetatile 12, 1, 527, 0 @@ -21,7 +21,7 @@ BattleFrontier_BattleTowerCorridor_MapScript2_241AE6: @ 8241AE6 BattleFrontier_BattleTowerCorridor_EventScript_241AF0:: @ 8241AF0 setvar VAR_0x4000, 1 - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 goto_eq BattleFrontier_BattleTowerCorridor_EventScript_241B16 applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_241B3A applymovement 255, BattleFrontier_BattleTowerCorridor_Movement_241B39 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc index 9910296df..cd81b47fd 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc @@ -5,9 +5,9 @@ BattleFrontier_BattleTowerCorridor2_MapScripts:: @ 8248D4A .byte 0 BattleFrontier_BattleTowerCorridor2_MapScript1_248D5A: @ 8248D5A - compare_var_to_value VAR_0x40CE, 2 + compare VAR_0x40CE, 2 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D71 - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248D91 end @@ -15,7 +15,7 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71 setvar VAR_0x8004, 14 special sub_8161F74 checkplayergender - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B setvar VAR_0x401F, 0 return @@ -87,13 +87,13 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC end BattleFrontier_BattleTowerCorridor2_EventScript_248E71:: @ 8248E71 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248E9E - compare_var_to_value VAR_0x40CE, 2 + compare VAR_0x40CE, 2 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EA8 - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 call_if 1, BattleFrontier_BattleTowerCorridor2_EventScript_248EB2 return diff --git a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc index ed5917c45..fe824b1ea 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc @@ -24,13 +24,13 @@ BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0 end BattleFrontier_BattleTowerElevator_EventScript_241A28:: @ 8241A28 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55 - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A55 - compare_var_to_value VAR_0x40CE, 2 + compare VAR_0x40CE, 2 call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A5F - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 call_if 1, BattleFrontier_BattleTowerElevator_EventScript_241A72 return diff --git a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc index d21c607d8..a7ff05bfb 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc @@ -13,7 +13,7 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694 call BattleFrontier_BattleTowerLobby_EventScript_28CC84 setvar VAR_0x8004, 10 special sub_81A085C - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5 checkflag FLAG_0x934 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6C1 @@ -78,7 +78,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E758:: @ 823E758 faceplayer setvar VAR_0x8004, 10 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E778 message BattleFrontier_BattleTowerLobby_Text_23F60D waitmessage @@ -90,7 +90,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E778:: @ 823E778 BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780 setvar VAR_0x8004, 5 special sub_8161F74 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E7A5 message BattleFrontier_BattleTowerLobby_Text_23F844 waitmessage @@ -107,7 +107,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_8161F74 - compare_var_to_value VAR_RESULT, 49 + compare VAR_RESULT, 49 goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E7E2 msgbox BattleFrontier_BattleTowerLobby_Text_23F79D, 4 @@ -119,14 +119,14 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2 end BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2 - compare_var_to_value VAR_0x40CE, 2 + compare VAR_0x40CE, 2 goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E81E checkflag FLAG_0x152 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E81E setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_8161F74 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E830 BattleFrontier_BattleTowerLobby_EventScript_23E81E:: @ 823E81E @@ -153,14 +153,14 @@ BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D setvar VAR_0x8004, 8 special sub_81A1780 special copy_player_party_from_sav1 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 6 setvar VAR_0x8005, 0 special sub_8161F74 playse SE_SAVE waitse call BattleFrontier_BattleTowerLobby_EventScript_23E8E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8DF message BattleFrontier_BattleTowerLobby_Text_23FE3C waitmessage @@ -183,7 +183,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_23E8B4:: @ 823E8B4 BattleFrontier_BattleTowerLobby_EventScript_23E8B4:: @ 823E8B4 setvar VAR_0x8004, 19 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8D7 playse SE_SAVE msgbox BattleFrontier_BattleTowerLobby_Text_2423CD, 4 @@ -214,7 +214,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8E0:: @ 823E8E0 BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE lock faceplayer - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23E930 message BattleFrontier_BattleTowerLobby_Text_23F737 waitmessage @@ -263,7 +263,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -276,7 +276,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 setvar VAR_0x8005, 3 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 switch VAR_RESULT @@ -304,7 +304,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A delay 2 call BattleFrontier_BattleTowerLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 setvar VAR_0x40BC, 1 @@ -343,7 +343,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -356,7 +356,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED setvar VAR_0x8005, 4 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 switch VAR_RESULT @@ -384,7 +384,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 delay 2 call BattleFrontier_BattleTowerLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 setvar VAR_0x40BC, 0 @@ -424,7 +424,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -437,7 +437,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 setvar VAR_0x8005, 2 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 switch VAR_RESULT @@ -465,7 +465,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF delay 2 call BattleFrontier_BattleTowerLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 setvar VAR_0x40BC, 0 @@ -504,7 +504,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 case 127, BattleFrontier_BattleTowerLobby_EventScript_23F0E6 setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -517,7 +517,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 setvar VAR_0x8005, 2 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 switch VAR_RESULT @@ -548,11 +548,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68 special sub_8161F74 call BattleFrontier_BattleTowerLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0 incrementgamestat 30 specialvar VAR_RESULT, sub_80093CC - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3E8 goto BattleFrontier_BattleTowerLobby_EventScript_23F2C5 end @@ -605,9 +605,9 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF80:: @ 823EF80 end BattleFrontier_BattleTowerLobby_EventScript_23EF8A:: @ 823EF8A - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23EFA1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23EFAB end @@ -743,7 +743,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108 setvar VAR_0x8004, 12 special sub_8161F74 delay 1 - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23F108 call BattleFrontier_BattleTowerLobby_EventScript_23F135 clearflag FLAG_0x077 @@ -754,7 +754,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108 BattleFrontier_BattleTowerLobby_EventScript_23F135:: @ 823F135 call BattleFrontier_BattleTowerLobby_EventScript_23F1A7 - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F152 msgbox BattleFrontier_BattleTowerLobby_Text_23FE11, 4 goto BattleFrontier_BattleTowerLobby_EventScript_23F15B @@ -807,13 +807,13 @@ BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0 step_end BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D4 - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1D9 - compare_var_to_value VAR_0x40CE, 2 + compare VAR_0x40CE, 2 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1DE - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F1E3 return @@ -834,13 +834,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F1E3:: @ 823F1E3 return BattleFrontier_BattleTowerLobby_EventScript_23F1E8:: @ 823F1E8 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F215 - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F21B - compare_var_to_value VAR_0x40CE, 2 + compare VAR_0x40CE, 2 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F221 - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F227 return @@ -861,13 +861,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F227:: @ 823F227 return BattleFrontier_BattleTowerLobby_EventScript_23F22D:: @ 823F22D - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F25A - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F260 - compare_var_to_value VAR_0x40CE, 2 + compare VAR_0x40CE, 2 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F266 - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F26C return @@ -888,13 +888,13 @@ BattleFrontier_BattleTowerLobby_EventScript_23F26C:: @ 823F26C return BattleFrontier_BattleTowerLobby_EventScript_23F272:: @ 823F272 - compare_var_to_value VAR_0x40CE, 0 + compare VAR_0x40CE, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F29F - compare_var_to_value VAR_0x40CE, 1 + compare VAR_0x40CE, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2A5 - compare_var_to_value VAR_0x40CE, 2 + compare VAR_0x40CE, 2 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2AB - compare_var_to_value VAR_0x40CE, 3 + compare VAR_0x40CE, 3 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F2B1 return @@ -934,25 +934,25 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5 setvar VAR_0x8005, 0 special sub_80B2DA4 waitstate - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3AF - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleTowerLobby_EventScript_2772D2 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F327 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F351 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E6 - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq BattleFrontier_BattleTowerLobby_EventScript_2772C5 - compare_var_to_value VAR_RESULT, 11 + compare VAR_RESULT, 11 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 end BattleFrontier_BattleTowerLobby_EventScript_23F327:: @ 823F327 special sub_80097E8 - compare_var_to_value VAR_0x8005, 3 + compare VAR_0x8005, 3 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F msgbox BattleFrontier_BattleTowerLobby_Text_278255, 4 release @@ -973,11 +973,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351 BattleFrontier_BattleTowerLobby_EventScript_23F366:: @ 823F366 special sub_80097E8 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F394 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F39D - compare_var_to_value VAR_0x8005, 2 + compare VAR_0x8005, 2 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F3A6 msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, 4 release @@ -1034,26 +1034,26 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3F3:: @ 823F3F3 BattleFrontier_BattleTowerLobby_EventScript_23F430:: @ 823F430 call BattleFrontier_BattleTowerLobby_EventScript_277B30 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F430 - compare_var_to_value VAR_RESULT, 11 + compare VAR_RESULT, 11 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 release return BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463 call BattleFrontier_BattleTowerLobby_EventScript_277B35 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F496 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F3F3 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F463 - compare_var_to_value VAR_RESULT, 11 + compare VAR_RESULT, 11 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F366 release return diff --git a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc index b2d411b64..c3ed02996 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc @@ -68,7 +68,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 waitmovement 0 msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, 4 - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x4001, 1 releaseall end @@ -88,7 +88,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A message BattleFrontier_BattleTowerMultiBattleRoom_Text_244094 waitmessage multichoicedefault 20, 8, 94, 1, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C, 4 release @@ -192,9 +192,9 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36 waitmessage waitbuttonpress closemessage - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 5, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF removeobject VAR_LAST_TALKED setflag FLAG_0x152 diff --git a/data/scripts/maps/BattleFrontier_Lounge1.inc b/data/scripts/maps/BattleFrontier_Lounge1.inc index 72a3659f7..5449fa8ee 100644 --- a/data/scripts/maps/BattleFrontier_Lounge1.inc +++ b/data/scripts/maps/BattleFrontier_Lounge1.inc @@ -15,9 +15,9 @@ BattleFrontier_Lounge1_EventScript_25E775:: @ 825E775 BattleFrontier_Lounge1_EventScript_25E792:: @ 825E792 special sub_81B94B0 waitstate - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_if 5, BattleFrontier_Lounge1_EventScript_25E7BF - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq BattleFrontier_Lounge1_EventScript_25E943 end @@ -31,16 +31,16 @@ BattleFrontier_Lounge1_EventScript_25E7B6:: @ 825E7B6 BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF specialvar VAR_RESULT, sub_81396E0 - compare_var_to_value VAR_RESULT, 412 + compare VAR_RESULT, 412 goto_eq BattleFrontier_Lounge1_EventScript_25E7FF special sub_8139D98 - compare_var_to_value VAR_0x8005, 90 + compare VAR_0x8005, 90 goto_if 3, BattleFrontier_Lounge1_EventScript_25E87F - compare_var_to_value VAR_0x8005, 120 + compare VAR_0x8005, 120 goto_if 3, BattleFrontier_Lounge1_EventScript_25E88D - compare_var_to_value VAR_0x8005, 150 + compare VAR_0x8005, 150 goto_if 3, BattleFrontier_Lounge1_EventScript_25E89B - compare_var_to_value VAR_0x8005, 151 + compare VAR_0x8005, 151 goto_if 4, BattleFrontier_Lounge1_EventScript_25E8A9 end @@ -50,28 +50,28 @@ BattleFrontier_Lounge1_EventScript_25E7FF:: @ 825E7FF end BattleFrontier_Lounge1_EventScript_25E80D:: @ 825E80D - compare_var_to_value VAR_0x8006, 0 + compare VAR_0x8006, 0 goto_eq BattleFrontier_Lounge1_EventScript_25E8B7 - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 goto_eq BattleFrontier_Lounge1_EventScript_25E8C5 - compare_var_to_value VAR_0x8006, 2 + compare VAR_0x8006, 2 goto_eq BattleFrontier_Lounge1_EventScript_25E8D3 - compare_var_to_value VAR_0x8006, 3 + compare VAR_0x8006, 3 goto_eq BattleFrontier_Lounge1_EventScript_25E8E1 - compare_var_to_value VAR_0x8006, 4 + compare VAR_0x8006, 4 goto_eq BattleFrontier_Lounge1_EventScript_25E8EF - compare_var_to_value VAR_0x8006, 5 + compare VAR_0x8006, 5 goto_eq BattleFrontier_Lounge1_EventScript_25E8FD end BattleFrontier_Lounge1_EventScript_25E850:: @ 825E850 - compare_var_to_value VAR_0x8007, 15 + compare VAR_0x8007, 15 goto_if 3, BattleFrontier_Lounge1_EventScript_25E90B - compare_var_to_value VAR_0x8007, 25 + compare VAR_0x8007, 25 goto_if 3, BattleFrontier_Lounge1_EventScript_25E919 - compare_var_to_value VAR_0x8007, 30 + compare VAR_0x8007, 30 goto_if 3, BattleFrontier_Lounge1_EventScript_25E927 - compare_var_to_value VAR_0x8007, 31 + compare VAR_0x8007, 31 goto_if 4, BattleFrontier_Lounge1_EventScript_25E935 end diff --git a/data/scripts/maps/BattleFrontier_Lounge2.inc b/data/scripts/maps/BattleFrontier_Lounge2.inc index 6b43747cc..d5fee28e9 100644 --- a/data/scripts/maps/BattleFrontier_Lounge2.inc +++ b/data/scripts/maps/BattleFrontier_Lounge2.inc @@ -17,29 +17,29 @@ BattleFrontier_Lounge2_EventScript_26065F:: @ 826065F end BattleFrontier_Lounge2_EventScript_26066D:: @ 826066D - compare_var_to_value VAR_0x402F, 0 + compare VAR_FRONTIER_MANIAC_FACILITY, 0 call_if 1, BattleFrontier_Lounge2_EventScript_26070A - compare_var_to_value VAR_0x402F, 1 + compare VAR_FRONTIER_MANIAC_FACILITY, 1 call_if 1, BattleFrontier_Lounge2_EventScript_26070F - compare_var_to_value VAR_0x402F, 2 + compare VAR_FRONTIER_MANIAC_FACILITY, 2 call_if 1, BattleFrontier_Lounge2_EventScript_260714 - compare_var_to_value VAR_0x402F, 3 + compare VAR_FRONTIER_MANIAC_FACILITY, 3 call_if 1, BattleFrontier_Lounge2_EventScript_260719 - compare_var_to_value VAR_0x402F, 4 + compare VAR_FRONTIER_MANIAC_FACILITY, 4 call_if 1, BattleFrontier_Lounge2_EventScript_26071E - compare_var_to_value VAR_0x402F, 5 + compare VAR_FRONTIER_MANIAC_FACILITY, 5 call_if 1, BattleFrontier_Lounge2_EventScript_260723 - compare_var_to_value VAR_0x402F, 6 + compare VAR_FRONTIER_MANIAC_FACILITY, 6 call_if 1, BattleFrontier_Lounge2_EventScript_260728 - compare_var_to_value VAR_0x402F, 7 + compare VAR_FRONTIER_MANIAC_FACILITY, 7 call_if 1, BattleFrontier_Lounge2_EventScript_26072D - compare_var_to_value VAR_0x402F, 8 + compare VAR_FRONTIER_MANIAC_FACILITY, 8 call_if 1, BattleFrontier_Lounge2_EventScript_260732 - compare_var_to_value VAR_0x402F, 9 + compare VAR_FRONTIER_MANIAC_FACILITY, 9 call_if 1, BattleFrontier_Lounge2_EventScript_260737 - compare_var_to_value VAR_0x402F, 3 + compare VAR_FRONTIER_MANIAC_FACILITY, 3 call_if 3, BattleFrontier_Lounge2_EventScript_2606F8 - compare_var_to_value VAR_0x402F, 4 + compare VAR_FRONTIER_MANIAC_FACILITY, 4 call_if 4, BattleFrontier_Lounge2_EventScript_260701 special sub_8139F20 waitmessage diff --git a/data/scripts/maps/BattleFrontier_Lounge3.inc b/data/scripts/maps/BattleFrontier_Lounge3.inc index 0612ccb8e..b8d52deec 100644 --- a/data/scripts/maps/BattleFrontier_Lounge3.inc +++ b/data/scripts/maps/BattleFrontier_Lounge3.inc @@ -7,7 +7,7 @@ BattleFrontier_Lounge3_EventScript_261D83:: @ 8261D83 checkflag FLAG_0x157 goto_eq BattleFrontier_Lounge3_EventScript_261EF9 call BattleFrontier_Lounge3_EventScript_261EA0 - compare_var_to_value VAR_0x8004, 2 + compare VAR_0x8004, 2 goto_if 3, BattleFrontier_Lounge3_EventScript_261EEB setflag FLAG_0x157 msgbox BattleFrontier_Lounge3_Text_262061, 4 @@ -19,10 +19,10 @@ BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF waitmessage waitbuttonpress msgbox BattleFrontier_Lounge3_Text_262A60, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge3_EventScript_261FA5 msgbox BattleFrontier_Lounge3_Text_262ABD, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge3_EventScript_261FA5 message BattleFrontier_Lounge3_Text_262B42 waitmessage @@ -32,7 +32,7 @@ BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF BattleFrontier_Lounge3_EventScript_261DE9:: @ 8261DE9 multichoice 20, 4, 87, 0 - copyvar VAR_0x4032, VAR_RESULT + copyvar VAR_FRONTIER_GAMBLER_AMOUNT_BET, VAR_RESULT switch VAR_RESULT case 0, BattleFrontier_Lounge3_EventScript_261E30 case 1, BattleFrontier_Lounge3_EventScript_261E3B @@ -58,7 +58,7 @@ BattleFrontier_Lounge3_EventScript_261E46:: @ 8261E46 BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51 specialvar VAR_0x4001, sub_813AA04 - compare_var_to_var VAR_0x4001, VAR_0x8008 + compare VAR_0x4001, VAR_0x8008 goto_if 4, BattleFrontier_Lounge3_EventScript_261E75 msgbox BattleFrontier_Lounge3_Text_262B6E, 4 message BattleFrontier_Lounge3_Text_262B42 @@ -69,7 +69,7 @@ BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51 BattleFrontier_Lounge3_EventScript_261E75:: @ 8261E75 copyvar VAR_0x8004, VAR_0x8008 special sub_813A9A4 - setvar VAR_0x4033, 1 + setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 special sub_813A8FC playse SE_REGI msgbox BattleFrontier_Lounge3_Text_262BE0, 4 @@ -113,37 +113,37 @@ BattleFrontier_Lounge3_EventScript_261EEB:: @ 8261EEB BattleFrontier_Lounge3_EventScript_261EF9:: @ 8261EF9 msgbox BattleFrontier_Lounge3_Text_26346B, 4 - compare_var_to_value VAR_0x4033, 1 + compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 goto_if 4, BattleFrontier_Lounge3_EventScript_261F12 goto BattleFrontier_Lounge3_EventScript_261DAF end BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12 - compare_var_to_value VAR_0x4033, 1 + compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 goto_eq BattleFrontier_Lounge3_EventScript_261F9E - compare_var_to_value VAR_0x4033, 2 + compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 2 goto_eq BattleFrontier_Lounge3_EventScript_261F2E goto BattleFrontier_Lounge3_EventScript_261F71 end BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E msgbox BattleFrontier_Lounge3_Text_263334, 4 - compare_var_to_value VAR_0x4032, 0 + compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 0 call_if 1, BattleFrontier_Lounge3_EventScript_261F80 - compare_var_to_value VAR_0x4032, 1 + compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 1 call_if 1, BattleFrontier_Lounge3_EventScript_261F8A - compare_var_to_value VAR_0x4032, 2 + compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 2 call_if 1, BattleFrontier_Lounge3_EventScript_261F94 msgbox BattleFrontier_Lounge3_Text_2633D4, 9 special sub_813A9D0 msgbox BattleFrontier_Lounge3_Text_2633F2, 4 - setvar VAR_0x4033, 0 + setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0 release end BattleFrontier_Lounge3_EventScript_261F71:: @ 8261F71 msgbox BattleFrontier_Lounge3_Text_263298, 4 - setvar VAR_0x4033, 0 + setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0 release end diff --git a/data/scripts/maps/BattleFrontier_Lounge5.inc b/data/scripts/maps/BattleFrontier_Lounge5.inc index 545fef22f..497857b63 100644 --- a/data/scripts/maps/BattleFrontier_Lounge5.inc +++ b/data/scripts/maps/BattleFrontier_Lounge5.inc @@ -5,16 +5,16 @@ BattleFrontier_Lounge5_EventScript_2645C6:: @ 82645C6 lock faceplayer msgbox BattleFrontier_Lounge5_Text_264632, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge5_EventScript_26460D special sub_81B94B0 waitstate lock faceplayer - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq BattleFrontier_Lounge5_EventScript_26460D specialvar VAR_RESULT, sub_81396E0 - compare_var_to_value VAR_RESULT, 412 + compare VAR_RESULT, 412 goto_eq BattleFrontier_Lounge5_EventScript_264603 special sub_813A7B8 waitmessage diff --git a/data/scripts/maps/BattleFrontier_Lounge6.inc b/data/scripts/maps/BattleFrontier_Lounge6.inc index eacc18413..c779e7c76 100644 --- a/data/scripts/maps/BattleFrontier_Lounge6.inc +++ b/data/scripts/maps/BattleFrontier_Lounge6.inc @@ -11,17 +11,17 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT msgbox BattleFrontier_Lounge6_Text_26508D, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge6_EventScript_26506B special sub_81B94B0 waitstate copyvar VAR_0x800A, VAR_0x8004 - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq BattleFrontier_Lounge6_EventScript_26506B copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, sub_807E9D4 copyvar VAR_0x800B, VAR_RESULT - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if 5, BattleFrontier_Lounge6_EventScript_265075 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A diff --git a/data/scripts/maps/BattleFrontier_Lounge7.inc b/data/scripts/maps/BattleFrontier_Lounge7.inc index 53f0ed8d1..b12c911ce 100644 --- a/data/scripts/maps/BattleFrontier_Lounge7.inc +++ b/data/scripts/maps/BattleFrontier_Lounge7.inc @@ -250,10 +250,10 @@ BattleFrontier_Lounge7_EventScript_26564F:: @ 826564F buffernumberstring 1, VAR_0x8008 copyvar VAR_0x8004, VAR_0x400C msgbox BattleFrontier_Lounge7_Text_265921, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge7_EventScript_2656CA specialvar VAR_0x4001, sub_813AA04 - compare_var_to_var VAR_0x4001, VAR_0x8008 + compare VAR_0x4001, VAR_0x8008 goto_if 4, BattleFrontier_Lounge7_EventScript_265696 msgbox BattleFrontier_Lounge7_Text_265997, 4 goto BattleFrontier_Lounge7_EventScript_2656CA @@ -267,7 +267,7 @@ BattleFrontier_Lounge7_EventScript_265696:: @ 8265696 special sub_813ADB8 special sub_81B892C waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge7_EventScript_265645 msgbox BattleFrontier_Lounge7_Text_2659C7, 4 copyvar VAR_0x8004, VAR_0x8008 @@ -276,7 +276,7 @@ BattleFrontier_Lounge7_EventScript_265696:: @ 8265696 end BattleFrontier_Lounge7_EventScript_2656CA:: @ 82656CA - compare_var_to_value VAR_0x400E, 0 + compare VAR_0x400E, 0 goto_eq BattleFrontier_Lounge7_EventScript_26532F goto BattleFrontier_Lounge7_EventScript_26551F end diff --git a/data/scripts/maps/BattleFrontier_OutsideEast.inc b/data/scripts/maps/BattleFrontier_OutsideEast.inc index d1dc4d8e2..bf0d3ff16 100644 --- a/data/scripts/maps/BattleFrontier_OutsideEast.inc +++ b/data/scripts/maps/BattleFrontier_OutsideEast.inc @@ -10,7 +10,7 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, BattleFrontier_OutsideEast_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -135,11 +135,11 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_OutsideEast_EventScript_242D60 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq BattleFrontier_OutsideEast_EventScript_242D60 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq BattleFrontier_OutsideEast_EventScript_242D60 setflag FLAG_0x1C6 release diff --git a/data/scripts/maps/BattleFrontier_OutsideWest.inc b/data/scripts/maps/BattleFrontier_OutsideWest.inc index f35e5320e..f5886bfff 100644 --- a/data/scripts/maps/BattleFrontier_OutsideWest.inc +++ b/data/scripts/maps/BattleFrontier_OutsideWest.inc @@ -12,7 +12,7 @@ BattleFrontier_OutsideWest_EventScript_23D3F0:: @ 823D3F0 faceplayer msgbox BattleFrontier_OutsideWest_Text_23D808, 4 checkitem ITEM_SS_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_OutsideWest_EventScript_23D44E message BattleFrontier_OutsideWest_Text_23D89D waitmessage @@ -35,7 +35,7 @@ BattleFrontier_OutsideWest_EventScript_23D44E:: @ 823D44E BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458 msgbox BattleFrontier_OutsideWest_Text_23D8F2, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE msgbox BattleFrontier_OutsideWest_Text_23D94B, 4 call BattleFrontier_OutsideWest_EventScript_23D4BA @@ -46,7 +46,7 @@ BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458 BattleFrontier_OutsideWest_EventScript_23D483:: @ 823D483 msgbox BattleFrontier_OutsideWest_Text_23D90E, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE msgbox BattleFrontier_OutsideWest_Text_23D94B, 4 call BattleFrontier_OutsideWest_EventScript_23D4BA @@ -144,13 +144,13 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F lock faceplayer delay 20 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, BattleFrontier_OutsideWest_EventScript_23D5C5 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA msgbox BattleFrontier_OutsideWest_Text_23DC36, 4 release @@ -169,13 +169,13 @@ BattleFrontier_OutsideWest_EventScript_23D5C6:: @ 823D5C6 faceplayer message BattleFrontier_OutsideWest_Text_23DCB0 waitmessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, BattleFrontier_OutsideWest_EventScript_23D5FD - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, BattleFrontier_OutsideWest_EventScript_23D608 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, BattleFrontier_OutsideWest_EventScript_23D613 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, BattleFrontier_OutsideWest_EventScript_23D61E waitbuttonpress release @@ -226,7 +226,7 @@ BattleFrontier_OutsideWest_EventScript_23D635:: @ 823D635 faceplayer msgbox BattleFrontier_OutsideWest_Text_23DD3B, 4 random 2 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_OutsideWest_EventScript_23D653 goto BattleFrontier_OutsideWest_EventScript_23D65D end diff --git a/data/scripts/maps/BattleFrontier_RankingHall.inc b/data/scripts/maps/BattleFrontier_RankingHall.inc index 0d8c5cf24..b13bfe343 100644 --- a/data/scripts/maps/BattleFrontier_RankingHall.inc +++ b/data/scripts/maps/BattleFrontier_RankingHall.inc @@ -86,7 +86,7 @@ BattleFrontier_RankingHall_EventScript_25E54A:: @ 825E54A lock faceplayer msgbox BattleFrontier_RankingHall_Text_25E666, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_RankingHall_EventScript_25E569 msgbox BattleFrontier_RankingHall_Text_25E6B6, 4 release diff --git a/data/scripts/maps/BattleFrontier_ScottsHouse.inc b/data/scripts/maps/BattleFrontier_ScottsHouse.inc index bfeed5e49..5be72b9b5 100644 --- a/data/scripts/maps/BattleFrontier_ScottsHouse.inc +++ b/data/scripts/maps/BattleFrontier_ScottsHouse.inc @@ -48,7 +48,7 @@ BattleFrontier_ScottsHouse_EventScript_263704:: @ 8263704 goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC msgbox BattleFrontier_ScottsHouse_Text_2640BC, 4 giveitem_std ITEM_LANSAT_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0 setflag FLAG_0x05C setflag FLAG_0x004 @@ -72,7 +72,7 @@ BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC msgbox BattleFrontier_ScottsHouse_Text_264216, 4 giveitem_std ITEM_STARF_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0 setflag FLAG_0x1D2 setflag FLAG_0x004 @@ -91,9 +91,9 @@ BattleFrontier_ScottsHouse_EventScript_2637DA:: @ 82637DA BattleFrontier_ScottsHouse_EventScript_2637E4:: @ 82637E4 random 3 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BattleFrontier_ScottsHouse_EventScript_263807 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq BattleFrontier_ScottsHouse_EventScript_263811 msgbox BattleFrontier_ScottsHouse_Text_263DDD, 4 release @@ -118,7 +118,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_8161F74 - compare_var_to_value VAR_RESULT, 50 + compare VAR_RESULT, 50 goto_if 4, BattleFrontier_ScottsHouse_EventScript_26387A setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -127,7 +127,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_8161F74 - compare_var_to_value VAR_RESULT, 50 + compare VAR_RESULT, 50 goto_if 4, BattleFrontier_ScottsHouse_EventScript_26387A goto BattleFrontier_ScottsHouse_EventScript_2637E4 end @@ -135,7 +135,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A msgbox BattleFrontier_ScottsHouse_Text_264412, 4 givedecoration_std 42 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0 setflag FLAG_0x0ED setflag FLAG_0x003 @@ -161,7 +161,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_8161F74 - compare_var_to_value VAR_RESULT, 100 + compare VAR_RESULT, 100 goto_if 4, BattleFrontier_ScottsHouse_EventScript_263913 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -170,7 +170,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_8161F74 - compare_var_to_value VAR_RESULT, 100 + compare VAR_RESULT, 100 goto_if 4, BattleFrontier_ScottsHouse_EventScript_263913 goto BattleFrontier_ScottsHouse_EventScript_2637E4 end @@ -178,7 +178,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4 BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913 msgbox BattleFrontier_ScottsHouse_Text_26449F, 4 givedecoration_std 43 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0 setflag FLAG_0x0EE setflag FLAG_0x003 @@ -194,23 +194,23 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943 msgbox BattleFrontier_ScottsHouse_Text_263A3F, 4 closemessage delay 30 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, BattleFrontier_ScottsHouse_EventScript_263A13 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, BattleFrontier_ScottsHouse_EventScript_263A1E - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, BattleFrontier_ScottsHouse_EventScript_263A29 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, BattleFrontier_ScottsHouse_EventScript_263A34 msgbox BattleFrontier_ScottsHouse_Text_263B29, 4 applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E waitmovement 0 msgbox BattleFrontier_ScottsHouse_Text_263BD4, 4 - compare_var_to_value VAR_0x40D1, 13 + compare VAR_0x40D1, 13 goto_eq BattleFrontier_ScottsHouse_EventScript_2639BC - compare_var_to_value VAR_0x40D1, 9 + compare VAR_0x40D1, 9 goto_if 4, BattleFrontier_ScottsHouse_EventScript_2639CB - compare_var_to_value VAR_0x40D1, 6 + compare VAR_0x40D1, 6 goto_if 4, BattleFrontier_ScottsHouse_EventScript_2639DA goto BattleFrontier_ScottsHouse_EventScript_2639E9 end diff --git a/data/scripts/maps/BirthIsland_Exterior.inc b/data/scripts/maps/BirthIsland_Exterior.inc index 8ea18a673..7d521e6df 100644 --- a/data/scripts/maps/BirthIsland_Exterior.inc +++ b/data/scripts/maps/BirthIsland_Exterior.inc @@ -38,7 +38,7 @@ BirthIsland_Exterior_MapScript1_267F65: @ 8267F65 BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, BirthIsland_Exterior_EventScript_27374E removeobject 2 return @@ -88,15 +88,15 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1 setvar VAR_0x8006, 0 special DoScriptedWildBattle setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq BirthIsland_Exterior_EventScript_26803B - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq BirthIsland_Exterior_EventScript_268049 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq BirthIsland_Exterior_EventScript_268049 setflag FLAG_0x1AD release diff --git a/data/scripts/maps/BirthIsland_Harbor.inc b/data/scripts/maps/BirthIsland_Harbor.inc index 8021a1de6..bf82aa6d1 100644 --- a/data/scripts/maps/BirthIsland_Harbor.inc +++ b/data/scripts/maps/BirthIsland_Harbor.inc @@ -5,7 +5,7 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D lock faceplayer msgbox BirthIsland_Harbor_Text_2C6B90, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq BirthIsland_Harbor_EventScript_2680A2 msgbox BirthIsland_Harbor_Text_2A6A5D, 4 closemessage diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index bb2f6d23d..fdd8515e9 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -11,7 +11,7 @@ DesertRuins_MapScript1_22D96B: @ 822D96B DesertRuins_EventScript_22D975:: @ 822D975 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, DesertRuins_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -72,15 +72,15 @@ DesertRuins_EventScript_22DA02:: @ 822DA02 waitmoncry setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0A74 + special StartRegiBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq DesertRuins_EventScript_22DA49 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq DesertRuins_EventScript_22DA52 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq DesertRuins_EventScript_22DA52 setflag FLAG_0x1BB release diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index c00586316..f78d4ea15 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -43,7 +43,7 @@ DewfordTown_EventScript_1E957A:: @ 81E957A DewfordTown_EventScript_1E9585:: @ 81E9585 msgbox DewfordTown_Text_1E9B24, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq DewfordTown_EventScript_1E95A2 msgbox DewfordTown_Text_1E9BD9, 4 release @@ -77,9 +77,9 @@ DewfordTown_EventScript_1E95D5:: @ 81E95D5 checkflag FLAG_0x101 goto_eq DewfordTown_EventScript_1E962A msgbox DewfordTown_Text_1E9DD1, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq DewfordTown_EventScript_1E95FF - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DewfordTown_EventScript_1E9620 end @@ -100,9 +100,9 @@ DewfordTown_EventScript_1E962A:: @ 81E962A message DewfordTown_Text_1E9FB8 waitmessage multichoice 20, 8, 50, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DewfordTown_EventScript_1E964C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq DewfordTown_EventScript_1E9656 end @@ -599,9 +599,9 @@ DewfordTown_EventScript_1E9922:: @ 81E9922 faceplayer call DewfordTown_EventScript_271E8B msgbox DewfordTown_Text_1EA136, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq DewfordTown_EventScript_1E9948 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DewfordTown_EventScript_1E9952 end @@ -616,15 +616,15 @@ DewfordTown_EventScript_1E9952:: @ 81E9952 call DewfordTown_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq DewfordTown_EventScript_1E997D - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DewfordTown_EventScript_1E9994 end DewfordTown_EventScript_1E997D:: @ 81E997D incrementgamestat 2 - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_eq DewfordTown_EventScript_1E999E msgbox DewfordTown_Text_1EA2AA, 4 release diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index a3f996f25..b5b7c603c 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -11,17 +11,17 @@ DewfordTown_Gym_EventScript_1FC648:: @ 81FC648 goto_eq DewfordTown_Gym_EventScript_1FC6A2 call DewfordTown_Gym_EventScript_1FC768 copyvar VAR_0x8001, VAR_0x8000 - compare_var_to_value VAR_0x8000, 0 + compare VAR_0x8000, 0 goto_eq DewfordTown_Gym_EventScript_1FC6BE - compare_var_to_value VAR_0x8000, 1 + compare VAR_0x8000, 1 goto_eq DewfordTown_Gym_EventScript_1FC6BA - compare_var_to_value VAR_0x8000, 2 + compare VAR_0x8000, 2 goto_eq DewfordTown_Gym_EventScript_1FC6B6 - compare_var_to_value VAR_0x8000, 3 + compare VAR_0x8000, 3 goto_eq DewfordTown_Gym_EventScript_1FC6B2 - compare_var_to_value VAR_0x8000, 4 + compare VAR_0x8000, 4 goto_eq DewfordTown_Gym_EventScript_1FC6AE - compare_var_to_value VAR_0x8000, 5 + compare VAR_0x8000, 5 goto_eq DewfordTown_Gym_EventScript_1FC6AA goto DewfordTown_Gym_EventScript_1FC6A6 @@ -60,20 +60,20 @@ DewfordTown_Gym_EventScript_1FC6BE:: @ 81FC6BE DewfordTown_Gym_EventScript_1FC6C2:: @ 81FC6C2 call DewfordTown_Gym_EventScript_1FC768 nop1 - compare_var_to_var VAR_0x8000, VAR_0x8001 + compare VAR_0x8000, VAR_0x8001 goto_eq DewfordTown_Gym_EventScript_1FC71A copyvar VAR_0x8001, VAR_0x8000 - compare_var_to_value VAR_0x8000, 1 + compare VAR_0x8000, 1 goto_eq DewfordTown_Gym_EventScript_1FC71B - compare_var_to_value VAR_0x8000, 2 + compare VAR_0x8000, 2 goto_eq DewfordTown_Gym_EventScript_1FC726 - compare_var_to_value VAR_0x8000, 3 + compare VAR_0x8000, 3 goto_eq DewfordTown_Gym_EventScript_1FC731 - compare_var_to_value VAR_0x8000, 4 + compare VAR_0x8000, 4 goto_eq DewfordTown_Gym_EventScript_1FC73C - compare_var_to_value VAR_0x8000, 5 + compare VAR_0x8000, 5 goto_eq DewfordTown_Gym_EventScript_1FC747 - compare_var_to_value VAR_0x8000, 6 + compare VAR_0x8000, 6 goto_eq DewfordTown_Gym_EventScript_1FC752 DewfordTown_Gym_EventScript_1FC71A:: @ 81FC71A @@ -157,8 +157,8 @@ DewfordTown_Gym_EventScript_1FC7C1:: @ 81FC7C1 DewfordTown_Gym_EventScript_1FC7C2:: @ 81FC7C2 trainerbattle 1, TRAINER_BRAWLY_1, 0, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq DewfordTown_Gym_EventScript_1FC89C checkflag FLAG_0x0A6 goto_if 0, DewfordTown_Gym_EventScript_1FC878 @@ -175,7 +175,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 setflag FLAG_0x4F1 setflag FLAG_BADGE02_GET addvar VAR_0x4085, 1 - compare_var_to_value VAR_0x4085, 6 + compare VAR_0x4085, 6 call_if 1, DewfordTown_Gym_EventScript_271E84 setvar VAR_0x8008, 2 call DewfordTown_Gym_EventScript_271F43 @@ -195,7 +195,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 giveitem_std ITEM_TM08 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DewfordTown_Gym_EventScript_27205E msgbox DewfordTown_Gym_Text_1FD181, 4 setflag FLAG_0x0A6 @@ -203,7 +203,7 @@ DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 DewfordTown_Gym_EventScript_1FC878:: @ 81FC878 giveitem_std ITEM_TM08 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DewfordTown_Gym_EventScript_272054 msgbox DewfordTown_Gym_Text_1FD181, 4 setflag FLAG_0x0A6 diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 9da607c27..3f9518722 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -6,7 +6,7 @@ DewfordTown_Hall_EventScript_1FD4D0:: @ 81FD4D0 faceplayer call DewfordTown_Hall_EventScript_271E8B special sub_81229C8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq DewfordTown_Hall_EventScript_1FD4EF msgbox DewfordTown_Hall_Text_1FD818, 4 release @@ -31,9 +31,9 @@ DewfordTown_Hall_EventScript_1FD50A:: @ 81FD50A call DewfordTown_Hall_EventScript_271E8B special sub_811EF6C msgbox DewfordTown_Hall_Text_1FD948, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq DewfordTown_Hall_EventScript_1FD533 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DewfordTown_Hall_EventScript_1FD53D end @@ -191,14 +191,14 @@ DewfordTown_Hall_EventScript_1FD739:: @ 81FD739 DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A applymovement 8, DewfordTown_Hall_Movement_1FD7D6 waitmovement 0 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 goto_eq DewfordTown_Hall_EventScript_1FD75B - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 goto_eq DewfordTown_Hall_EventScript_1FD771 end DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 goto_eq DewfordTown_Hall_EventScript_1FD739 applymovement 255, DewfordTown_Hall_Movement_2725A8 waitmovement 0 @@ -210,16 +210,16 @@ DewfordTown_Hall_EventScript_1FD771:: @ 81FD771 DewfordTown_Hall_EventScript_1FD772:: @ 81FD772 applymovement 7, DewfordTown_Hall_Movement_1FD7D8 waitmovement 0 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 goto_eq DewfordTown_Hall_EventScript_1FD793 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 goto_eq DewfordTown_Hall_EventScript_1FD7C0 end DewfordTown_Hall_EventScript_1FD793:: @ 81FD793 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, DewfordTown_Hall_EventScript_1FD7AA - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, DewfordTown_Hall_EventScript_1FD7B5 return @@ -234,7 +234,7 @@ DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5 return DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 goto_eq DewfordTown_Hall_EventScript_1FD739 applymovement 255, DewfordTown_Hall_Movement_2725A4 waitmovement 0 @@ -256,7 +256,7 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA goto_eq DewfordTown_Hall_EventScript_1FD80E msgbox DewfordTown_Hall_Text_1FE142, 4 giveitem_std ITEM_TM36 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DewfordTown_Hall_EventScript_272054 setflag FLAG_0x0E6 release diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc index ad7f530fc..1805164af 100644 --- a/data/scripts/maps/DewfordTown_House2.inc +++ b/data/scripts/maps/DewfordTown_House2.inc @@ -8,7 +8,7 @@ DewfordTown_House2_EventScript_1FE22E:: @ 81FE22E goto_eq DewfordTown_House2_EventScript_1FE267 msgbox DewfordTown_House2_Text_1FE27A, 4 giveitem_std ITEM_SILK_SCARF - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq DewfordTown_House2_EventScript_1FE25D setflag FLAG_0x121 release diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 605d2874e..15e03f092 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -53,16 +53,16 @@ EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61 closemessage playse SE_DOOR checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228ABC - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228AC1 addobject 2 call EverGrandeCity_ChampionsRoom_EventScript_228BFD checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EverGrandeCity_ChampionsRoom_EventScript_228AC6 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EverGrandeCity_ChampionsRoom_EventScript_228AFB end @@ -128,9 +128,9 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, 4 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BEB - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BF4 closemessage applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index b732f7e88..8d42978d9 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -26,7 +26,7 @@ EverGrandeCity_DrakesRoom_EventScript_2286C5:: @ 82286C5 EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2 checkflag FLAG_0x4FE call_if 1, EverGrandeCity_DrakesRoom_EventScript_2286E7 - compare_var_to_value VAR_0x409C, 4 + compare VAR_0x409C, 4 call_if 1, EverGrandeCity_DrakesRoom_EventScript_2286ED end diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index b0c5b40a1..ccca35370 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -26,7 +26,7 @@ EverGrandeCity_GlaciasRoom_EventScript_22843B:: @ 822843B EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448 checkflag FLAG_0x4FD call_if 1, EverGrandeCity_GlaciasRoom_EventScript_22845D - compare_var_to_value VAR_0x409C, 3 + compare VAR_0x409C, 3 call_if 1, EverGrandeCity_GlaciasRoom_EventScript_228463 end diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 5942aa1e0..20192a4e6 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -44,9 +44,9 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 setvar VAR_0x4001, 1 call EverGrandeCity_HallOfFame_EventScript_2717C1 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EverGrandeCity_HallOfFame_EventScript_2298E9 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EverGrandeCity_HallOfFame_EventScript_2298F5 end diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 1d1f45742..e26763e2f 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -26,7 +26,7 @@ EverGrandeCity_PhoebesRoom_EventScript_22819D:: @ 822819D EverGrandeCity_PhoebesRoom_MapScript1_2281AA: @ 82281AA checkflag FLAG_0x4FC call_if 1, EverGrandeCity_PhoebesRoom_EventScript_2281BF - compare_var_to_value VAR_0x409C, 2 + compare VAR_0x409C, 2 call_if 1, EverGrandeCity_PhoebesRoom_EventScript_2281C5 end diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc index 488cd0e67..a9e27ec73 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc @@ -36,11 +36,11 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79 faceplayer msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, 4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AB6 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 addvar VAR_0x40D1, 1 setflag FLAG_0x1CF diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc index fca1a9861..910523a87 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc @@ -51,9 +51,9 @@ EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636 checkflag FLAG_0x107 goto_eq EverGrandeCity_PokemonLeague_1F_EventScript_2296BB getplayerxy VAR_0x4000, VAR_0x4001 - compare_var_to_value VAR_0x4000, 11 + compare VAR_0x4000, 11 call_if 4, EverGrandeCity_PokemonLeague_1F_EventScript_229698 - compare_var_to_value VAR_0x4000, 8 + compare VAR_0x4000, 8 call_if 3, EverGrandeCity_PokemonLeague_1F_EventScript_2296A3 message EverGrandeCity_PokemonLeague_1F_Text_2296E8 waitmessage diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 782538b1e..405ffcfd6 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -13,7 +13,7 @@ EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16 EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D checkflag FLAG_0x4FB call_if 1, EverGrandeCity_SidneysRoom_EventScript_227F32 - compare_var_to_value VAR_0x409C, 1 + compare VAR_0x409C, 1 call_if 1, EverGrandeCity_SidneysRoom_EventScript_227F38 end diff --git a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc index a20ca4f1c..6fbc4266b 100644 --- a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc @@ -10,9 +10,9 @@ FallarborTown_BattleTentBattleRoom_MapScript1_2008A9: @ 82008A9 FallarborTown_BattleTentBattleRoom_EventScript_2008AF:: @ 82008AF checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2008C7 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2008D2 return @@ -38,7 +38,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2008E7:: @ 82008E7 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, FallarborTown_BattleTentBattleRoom_EventScript_200B73 FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F @@ -110,15 +110,15 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 special sub_81A1780 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B43 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, FallarborTown_BattleTentBattleRoom_EventScript_200B4A multichoice 20, 6, 104, 1 switch VAR_RESULT @@ -163,7 +163,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3 setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_81A5238 - compare_var_to_value VAR_RESULT, 9999 + compare VAR_RESULT, 9999 goto_eq FallarborTown_BattleTentBattleRoom_EventScript_2009B3 addvar VAR_RESULT, 1 setvar VAR_0x8004, 2 diff --git a/data/scripts/maps/FallarborTown_BattleTentLobby.inc b/data/scripts/maps/FallarborTown_BattleTentLobby.inc index 7d79bb753..9fcc21667 100644 --- a/data/scripts/maps/FallarborTown_BattleTentLobby.inc +++ b/data/scripts/maps/FallarborTown_BattleTentLobby.inc @@ -132,7 +132,7 @@ FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001 faceplayer setvar VAR_0x8004, 1 special sub_81B9B80 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, FallarborTown_BattleTentLobby_EventScript_1FFF84 special copy_player_party_to_sav1 msgbox FallarborTown_BattleTentLobby_Text_2C47EB, 4 @@ -153,7 +153,7 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D setvar VAR_RESULT, 2 setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq FallarborTown_BattleTentLobby_EventScript_200176 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -165,7 +165,7 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D setvar VAR_0x8005, 3 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FallarborTown_BattleTentLobby_EventScript_2001C2 msgbox FallarborTown_BattleTentLobby_Text_2C4B35, 5 switch VAR_RESULT @@ -193,7 +193,7 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 delay 2 call FallarborTown_BattleTentLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FallarborTown_BattleTentLobby_EventScript_2001AB FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 390f035b5..47459f8d5 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -7,7 +7,7 @@ FallarborTown_House1_EventScript_200F13:: @ 8200F13 checkflag FLAG_0x0E5 goto_eq FallarborTown_House1_EventScript_200FB2 checkitem ITEM_METEORITE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq FallarborTown_House1_EventScript_200F38 msgbox FallarborTown_House1_Text_200FEE, 4 release @@ -18,11 +18,11 @@ FallarborTown_House1_EventScript_200F38:: @ 8200F38 call_if 0, FallarborTown_House1_EventScript_200F8B checkflag FLAG_0x002 call_if 1, FallarborTown_House1_EventScript_200F9C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FallarborTown_House1_EventScript_200FA5 msgbox FallarborTown_House1_Text_201159, 4 giveitem_std ITEM_TM27 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FallarborTown_House1_EventScript_272054 setvar VAR_0x8004, 280 call FallarborTown_House1_EventScript_2723E4 diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index cd3d6c3ee..b78756e0a 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -14,7 +14,7 @@ FallarborTown_House2_EventScript_201383:: @ 8201383 FallarborTown_House2_EventScript_2013A8:: @ 82013A8 checkitem ITEM_HEART_SCALE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FallarborTown_House2_EventScript_201452 msgbox FallarborTown_House2_Text_201541, 5 switch VAR_RESULT @@ -26,12 +26,12 @@ FallarborTown_House2_EventScript_2013D6:: @ 82013D6 msgbox FallarborTown_House2_Text_2015A5, 4 special sub_81B951C waitstate - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq FallarborTown_House2_EventScript_201452 special sub_81B98DC - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq FallarborTown_House2_EventScript_201444 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 goto_eq FallarborTown_House2_EventScript_201436 goto FallarborTown_House2_EventScript_20140C end @@ -40,7 +40,7 @@ FallarborTown_House2_EventScript_20140C:: @ 820140C msgbox FallarborTown_House2_Text_2015C3, 4 special sub_8160638 waitstate - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_eq FallarborTown_House2_EventScript_2013D6 msgbox FallarborTown_House2_Text_201627, 4 takeitem ITEM_HEART_SCALE, 1 diff --git a/data/scripts/maps/FarawayIsland_Entrance.inc b/data/scripts/maps/FarawayIsland_Entrance.inc index b13659abd..ff8af2e9f 100644 --- a/data/scripts/maps/FarawayIsland_Entrance.inc +++ b/data/scripts/maps/FarawayIsland_Entrance.inc @@ -20,7 +20,7 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 lock faceplayer msgbox FarawayIsland_Entrance_Text_2C6B42, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FarawayIsland_Entrance_EventScript_267CE7 msgbox FarawayIsland_Entrance_Text_2A6A5D, 4 closemessage diff --git a/data/scripts/maps/FarawayIsland_Interior.inc b/data/scripts/maps/FarawayIsland_Interior.inc index f49d938a7..d3132b202 100644 --- a/data/scripts/maps/FarawayIsland_Interior.inc +++ b/data/scripts/maps/FarawayIsland_Interior.inc @@ -12,13 +12,13 @@ FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F FarawayIsland_Interior_EventScript_267D19:: @ 8267D19 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq FarawayIsland_Interior_EventScript_267D4B - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq FarawayIsland_Interior_EventScript_267D4B - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq FarawayIsland_Interior_EventScript_267D4B - compare_var_to_value VAR_RESULT, 10 + compare VAR_RESULT, 10 goto_eq FarawayIsland_Interior_EventScript_267D4B return @@ -34,7 +34,7 @@ FarawayIsland_Interior_MapScript1_267D54: @ 8267D54 FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, FarawayIsland_Interior_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -129,13 +129,13 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 message FarawayIsland_Interior_Text_2C6DFF waitse playmoncry SPECIES_MEW, 2 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, FarawayIsland_Interior_EventScript_267EAF - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, FarawayIsland_Interior_EventScript_267EBA - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, FarawayIsland_Interior_EventScript_267EC5 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, FarawayIsland_Interior_EventScript_267ED0 special sub_81D4BEC delay 40 @@ -145,17 +145,17 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 setvar VAR_0x8006, 0 special DoScriptedWildBattle setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq FarawayIsland_Interior_EventScript_267E96 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq FarawayIsland_Interior_EventScript_267EA4 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq FarawayIsland_Interior_EventScript_267EA4 - compare_var_to_value VAR_RESULT, 10 + compare VAR_RESULT, 10 goto_eq FarawayIsland_Interior_EventScript_267EA4 setflag FLAG_0x1CA release diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index d3b9b41fb..0b4b71c2b 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -57,7 +57,7 @@ FortreeCity_EventScript_1E2614:: @ 81E2614 lock faceplayer checkitem ITEM_DEVON_SCOPE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq FortreeCity_EventScript_1E2630 msgbox FortreeCity_Text_1E29E5, 4 release @@ -65,7 +65,7 @@ FortreeCity_EventScript_1E2614:: @ 81E2614 FortreeCity_EventScript_1E2630:: @ 81E2630 msgbox FortreeCity_Text_1E2A08, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq FortreeCity_EventScript_1E2645 release end diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index e3990cd23..e9b9174a8 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -17,8 +17,8 @@ FortreeCity_Gym_EventScript_2165C4:: @ 82165C4 FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 trainerbattle 1, TRAINER_WINONA_1, 0, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq FortreeCity_Gym_EventScript_21668D checkflag FLAG_0x0AA goto_if 0, FortreeCity_Gym_EventScript_216646 @@ -51,7 +51,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD FortreeCity_Gym_EventScript_216646:: @ 8216646 giveitem_std ITEM_TM40 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FortreeCity_Gym_EventScript_272054 msgbox FortreeCity_Gym_Text_216FEC, 4 setflag FLAG_0x0AA @@ -60,7 +60,7 @@ FortreeCity_Gym_EventScript_216646:: @ 8216646 FortreeCity_Gym_EventScript_21666A:: @ 821666A giveitem_std ITEM_TM40 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FortreeCity_Gym_EventScript_27205E msgbox FortreeCity_Gym_Text_216FEC, 4 setflag FLAG_0x0AA diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 1184763dc..7e45bf87a 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -11,17 +11,17 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT msgbox FortreeCity_House1_Text_21637B, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FortreeCity_House1_EventScript_21633D special sub_81B94B0 waitstate copyvar VAR_0x800A, VAR_0x8004 - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq FortreeCity_House1_EventScript_21633D copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, sub_807E9D4 copyvar VAR_0x800B, VAR_RESULT - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if 5, FortreeCity_House1_EventScript_216347 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc index 2458510bc..8f75b20d9 100644 --- a/data/scripts/maps/FortreeCity_House2.inc +++ b/data/scripts/maps/FortreeCity_House2.inc @@ -22,7 +22,7 @@ FortreeCity_House2_EventScript_2177CB:: @ 82177CB case 0, FortreeCity_House2_EventScript_217878 msgbox FortreeCity_House2_Text_217A28, 4 giveitem_std ITEM_TM10 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FortreeCity_House2_EventScript_272054 setflag FLAG_0x108 msgbox FortreeCity_House2_Text_217A91, 4 diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index 2d260eab3..521e99021 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -35,7 +35,7 @@ FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 waitmovement 0 msgbox FortreeCity_House4_Text_217E05, 4 giveitem_std ITEM_MENTAL_HERB - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq FortreeCity_House4_EventScript_272054 setflag FLAG_0x0DF releaseall diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 318b80c78..c913c53a3 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -10,7 +10,7 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B setflag FLAG_0x0BD msgbox GraniteCave_StevensRoom_Text_22DDBD, 4 giveitem_std ITEM_TM47 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, GraniteCave_StevensRoom_EventScript_22DD3C msgbox GraniteCave_StevensRoom_Text_22DE6B, 4 closemessage @@ -23,13 +23,13 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B setflag FLAG_0x131 msgbox GraniteCave_StevensRoom_Text_22DF8C, 4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, GraniteCave_StevensRoom_EventScript_22DD0D - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, GraniteCave_StevensRoom_EventScript_22DD2A - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, GraniteCave_StevensRoom_EventScript_22DD18 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, GraniteCave_StevensRoom_EventScript_22DD18 playse SE_KAIDAN removeobject 1 diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index eb5eb0522..3c4b241ac 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -17,9 +17,9 @@ InsideOfTruck_EventScript_23BF04:: @ 823BF04 lockall setflag FLAG_SPECIAL_FLAG_0x4000 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq InsideOfTruck_EventScript_23BF20 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq InsideOfTruck_EventScript_23BF46 end diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 69a3ef76a..fb1798804 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -11,7 +11,7 @@ IslandCave_MapScript1_238E3A: @ 8238E3A IslandCave_EventScript_238E44:: @ 8238E44 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, IslandCave_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -104,15 +104,15 @@ IslandCave_EventScript_238F58:: @ 8238F58 waitmoncry setwildbattle SPECIES_REGICE, 40, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0A74 + special StartRegiBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq IslandCave_EventScript_238F9F - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq IslandCave_EventScript_238FA8 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq IslandCave_EventScript_238FA8 setflag FLAG_0x1BC release diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index 1fb3b316e..e5c393221 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -6,13 +6,13 @@ JaggedPass_MapScripts:: @ 8230656 JaggedPass_MapScript1_230666: @ 8230666 setstepcallback 1 - compare_var_to_value VAR_0x40C8, 0 + compare VAR_0x40C8, 0 call_if 1, JaggedPass_EventScript_230674 end JaggedPass_EventScript_230674:: @ 8230674 checkitem ITEM_MAGMA_EMBLEM, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq JaggedPass_EventScript_230685 return @@ -21,7 +21,7 @@ JaggedPass_EventScript_230685:: @ 8230685 return JaggedPass_MapScript1_23068B: @ 823068B - compare_var_to_value VAR_0x40BD, 1 + compare VAR_0x40BD, 1 call_if 1, JaggedPass_EventScript_230697 end @@ -31,7 +31,7 @@ JaggedPass_EventScript_230697:: @ 8230697 return JaggedPass_MapScript1_23069C: @ 823069C - compare_var_to_value VAR_0x40C8, 1 + compare VAR_0x40C8, 1 goto_if 3, JaggedPass_EventScript_2306A8 end @@ -104,8 +104,8 @@ JaggedPass_EventScript_230785:: @ 8230785 JaggedPass_EventScript_23079C:: @ 823079C trainerbattle 2, TRAINER_DIANA_1, 0, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq JaggedPass_EventScript_2307E4 msgbox JaggedPass_Text_2309D8, 4 release @@ -128,8 +128,8 @@ JaggedPass_EventScript_2307E4:: @ 82307E4 JaggedPass_EventScript_2307FB:: @ 82307FB trainerbattle 2, TRAINER_ETHAN_1, 0, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq JaggedPass_EventScript_230843 msgbox JaggedPass_Text_230B93, 4 release diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index ae7ac908c..965036dfb 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -11,9 +11,9 @@ LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE call_if 1, LavaridgeTown_EventScript_1EA53F call LavaridgeTown_EventScript_271ED7 call LavaridgeTown_EventScript_271EFB - compare_var_to_value VAR_0x4053, 1 + compare VAR_0x4053, 1 call_if 1, LavaridgeTown_EventScript_1EA518 - compare_var_to_value VAR_0x4053, 1 + compare VAR_0x4053, 1 call_if 1, LavaridgeTown_EventScript_1EA543 end @@ -23,7 +23,7 @@ LavaridgeTown_EventScript_1EA514:: @ 81EA514 LavaridgeTown_EventScript_1EA518:: @ 81EA518 getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 9 + compare VAR_0x8004, 9 goto_eq LavaridgeTown_EventScript_1EA529 return @@ -49,24 +49,24 @@ LavaridgeTown_MapScript2_1EA547: @ 81EA547 LavaridgeTown_EventScript_1EA551:: @ 81EA551 lockall getplayerxy VAR_0x8008, VAR_0x8009 - compare_var_to_value VAR_0x8008, 9 + compare VAR_0x8008, 9 call_if 1, LavaridgeTown_EventScript_1EA63A - compare_var_to_value VAR_0x8008, 9 + compare VAR_0x8008, 9 call_if 5, LavaridgeTown_EventScript_1EA65C delay 20 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LavaridgeTown_EventScript_1EA630 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LavaridgeTown_EventScript_1EA635 - compare_var_to_value VAR_0x8008, 9 + compare VAR_0x8008, 9 call_if 1, LavaridgeTown_EventScript_1EA6A1 - compare_var_to_value VAR_0x8008, 9 + compare VAR_0x8008, 9 call_if 5, LavaridgeTown_EventScript_1EA6AC checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LavaridgeTown_EventScript_1EA5B5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LavaridgeTown_EventScript_1EA5DA end @@ -91,9 +91,9 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF removeobject 8 addobject 7 delay 30 - compare_var_to_value VAR_0x8008, 9 + compare VAR_0x8008, 9 call_if 1, LavaridgeTown_EventScript_1EA6B7 - compare_var_to_value VAR_0x8008, 9 + compare VAR_0x8008, 9 call_if 5, LavaridgeTown_EventScript_1EA6C9 removeobject 7 setvar VAR_0x4053, 2 @@ -213,7 +213,7 @@ LavaridgeTown_Movement_1EA6F8: @ 81EA6F8 LavaridgeTown_EventScript_1EA6FA:: @ 81EA6FA specialvar VAR_RESULT, player_get_direction_lower_nybble - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LavaridgeTown_EventScript_1EA70B end @@ -251,10 +251,10 @@ LavaridgeTown_EventScript_1EA744:: @ 81EA744 checkflag FLAG_0x10A goto_eq LavaridgeTown_EventScript_1EA787 msgbox LavaridgeTown_Text_1EAB80, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LavaridgeTown_EventScript_1EA79B getpartysize - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq LavaridgeTown_EventScript_1EA791 msgbox LavaridgeTown_Text_1EACC0, 4 setflag FLAG_0x10A diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 55ae851e0..6c927be40 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -60,8 +60,8 @@ LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C trainerbattle 1, TRAINER_FLANNERY_1, 0, LavaridgeTown_Gym_1F_Text_1FF0DC, LavaridgeTown_Gym_1F_Text_1FF233, LavaridgeTown_Gym_1F_EventScript_1FE7C1 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq LavaridgeTown_Gym_1F_EventScript_1FE864 checkflag FLAG_0x0A8 goto_if 0, LavaridgeTown_Gym_1F_EventScript_1FE81D @@ -78,7 +78,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 setflag FLAG_0x4F3 setflag FLAG_BADGE04_GET addvar VAR_0x4085, 1 - compare_var_to_value VAR_0x4085, 6 + compare VAR_0x4085, 6 call_if 1, LavaridgeTown_Gym_1F_EventScript_271E84 setvar VAR_0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_271F43 @@ -98,7 +98,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D giveitem_std ITEM_TM50 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LavaridgeTown_Gym_1F_EventScript_272054 msgbox LavaridgeTown_Gym_1F_Text_1FF45C, 4 setflag FLAG_0x0A8 @@ -107,7 +107,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841 giveitem_std ITEM_TM50 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LavaridgeTown_Gym_1F_EventScript_27205E msgbox LavaridgeTown_Gym_1F_Text_1FF45C, 4 setflag FLAG_0x0A8 @@ -127,9 +127,9 @@ LavaridgeTown_Gym_1F_EventScript_1FE89A:: @ 81FE89A LavaridgeTown_Gym_B1F_EventScript_1FE89A:: @ 81FE89A call LavaridgeTown_Gym_1F_EventScript_1FE705 release - special CheckIfMultipleTrainersWantBattle - compare_var_to_value VAR_RESULT, 1 - goto_eq LavaridgeTown_Gym_1F_EventScript_2742F6 + special ShouldTryGetTrainerScript + compare VAR_RESULT, 1 + goto_eq EventScript_GotoTrainerScript end LavaridgeTown_Gym_1F_EventScript_1FE8AF:: @ 81FE8AF diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc index 2849371ce..6af8132e4 100644 --- a/data/scripts/maps/LavaridgeTown_HerbShop.inc +++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc @@ -32,7 +32,7 @@ LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 goto_eq LavaridgeTown_HerbShop_EventScript_1FE534 msgbox LavaridgeTown_HerbShop_Text_1FE584, 4 giveitem_std ITEM_CHARCOAL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LavaridgeTown_HerbShop_EventScript_272054 setflag FLAG_0x0FE release diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 8a3202a49..b29953d13 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -42,7 +42,7 @@ LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8 random 10 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_EventScript_272054 setflag FLAG_0x92F msgbox LilycoveCity_Text_2A72E3, 4 @@ -240,9 +240,9 @@ LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE lock faceplayer checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_EventScript_1E2DF8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_EventScript_1E2E6B end @@ -252,7 +252,7 @@ LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8 call_if 1, LilycoveCity_EventScript_1E2E48 checkflag FLAG_0x11E call_if 0, LilycoveCity_EventScript_1E2E51 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_EventScript_1E2E5A msgbox LilycoveCity_Text_1E3234, 4 switch VAR_FIRST_POKE @@ -283,7 +283,7 @@ LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B call_if 1, LilycoveCity_EventScript_1E2EBB checkflag FLAG_0x11E call_if 0, LilycoveCity_EventScript_1E2EC4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_EventScript_1E2ECD msgbox LilycoveCity_Text_1E373C, 4 switch VAR_FIRST_POKE @@ -343,9 +343,9 @@ LilycoveCity_EventScript_1E2F3E:: @ 81E2F3E setvar VAR_RESULT, 0 checkflag FLAG_BADGE06_GET call_if 1, LilycoveCity_EventScript_1E2F76 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_EventScript_1E2F86 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LilycoveCity_EventScript_1E2F8F clearflag FLAG_0x2D2 clearflag FLAG_0x351 @@ -380,9 +380,9 @@ LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA setvar VAR_RESULT, 0 checkflag FLAG_BADGE06_GET call_if 1, LilycoveCity_EventScript_1E2F76 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_EventScript_1E2FE2 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LilycoveCity_EventScript_1E2FEB clearflag FLAG_0x2F8 clearflag FLAG_0x32F @@ -423,9 +423,9 @@ LilycoveCity_EventScript_1E302D:: @ 81E302D lock faceplayer msgbox LilycoveCity_Text_1E4774, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LilycoveCity_EventScript_1E304F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_EventScript_1E3058 release end diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index ab98786e2..0364d8127 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -10,7 +10,7 @@ LilycoveCity_ContestLobby_MapScript1_21A21C: @ 821A21C LilycoveCity_ContestLobby_EventScript_21A227:: @ 821A227 getpricereduction 4 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A23C clearflag FLAG_0x369 setflag FLAG_0x340 @@ -45,9 +45,9 @@ LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264 drawcontestwinner 0 lockall msgbox LilycoveCity_ContestLobby_Text_21AE78, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_21A2E4 releaseall end @@ -58,7 +58,7 @@ LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA special sub_80F88DC setvar VAR_0x4099, 0 specialvar VAR_RESULT, sub_80F8C7C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_21A314 applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F waitmovement 0 @@ -70,7 +70,7 @@ LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4 msgbox LilycoveCity_ContestLobby_Text_21B0BC, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA msgbox LilycoveCity_ContestLobby_Text_21B132, 4 closemessage @@ -219,9 +219,9 @@ LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436 fadescreen 1 drawcontestwinner 0 msgbox LilycoveCity_ContestLobby_Text_21AE78, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A47A - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_21A4B4 end @@ -231,7 +231,7 @@ LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A special sub_80F88DC setvar VAR_0x4099, 0 specialvar VAR_RESULT, sub_80F8C7C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_21A4E4 applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C waitmovement 0 @@ -243,7 +243,7 @@ LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4 msgbox LilycoveCity_ContestLobby_Text_21B0BC, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A47A msgbox LilycoveCity_ContestLobby_Text_21B132, 4 closemessage @@ -320,7 +320,7 @@ LilycoveCity_ContestLobby_Movement_21A54B: @ 821A54B LilycoveCity_ContestLobby_EventScript_21A554:: @ 821A554 special sub_80F9154 specialvar VAR_RESULT, sub_80F8D24 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A5CF call LilycoveCity_ContestLobby_EventScript_279CC5 call LilycoveCity_ContestLobby_EventScript_21A670 @@ -642,10 +642,10 @@ LilycoveCity_ContestLobby_EventScript_21A819:: @ 821A819 LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856 msgbox LilycoveCity_ContestLobby_Text_27BD17, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_21A97F call LilycoveCity_ContestLobby_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_21A97F message LilycoveCity_ContestLobby_Text_27C8FD waitmessage @@ -665,7 +665,7 @@ LilycoveCity_ContestLobby_EventScript_21A8BB:: @ 821A8BB LilycoveCity_ContestLobby_EventScript_21A8C6:: @ 821A8C6 setvar VAR_0x400C, 1 - compare_var_to_value VAR_0x400D, 1 + compare VAR_0x400D, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21AAFC goto LilycoveCity_ContestLobby_EventScript_21A8DC end @@ -717,19 +717,19 @@ LilycoveCity_ContestLobby_EventScript_21A97F:: @ 821A97F LilycoveCity_ContestLobby_EventScript_21A98C:: @ 821A98C msgbox LilycoveCity_ContestLobby_Text_27C1C3, 4 setvar VAR_CONTEST_RANK, 0 - choosecontestpkmn - compare_var_to_value VAR_0x8004, 255 + choosecontestmon + compare VAR_0x8004, 255 goto_eq LilycoveCity_ContestLobby_EventScript_21A97F special sub_80F7F30 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_21A9E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21AA0A - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq LilycoveCity_ContestLobby_EventScript_21AA0A - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq LilycoveCity_ContestLobby_EventScript_21A9EE - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq LilycoveCity_ContestLobby_EventScript_21A9FC end @@ -754,28 +754,28 @@ LilycoveCity_ContestLobby_EventScript_21AA0A:: @ 821AA0A end LilycoveCity_ContestLobby_EventScript_21AA15:: @ 821AA15 - compare_var_to_value VAR_0x400D, 1 + compare VAR_0x400D, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21AB4B - compare_var_to_value VAR_0x400D, 2 + compare VAR_0x400D, 2 goto_if 4, LilycoveCity_ContestLobby_EventScript_21A97F message LilycoveCity_ContestLobby_Text_27BF85 waitmessage copyvar VAR_0x8004, VAR_RESULT - compare_var_to_value VAR_0x400C, 0 + compare VAR_0x400C, 0 call_if 1, LilycoveCity_ContestLobby_EventScript_21AABB - compare_var_to_value VAR_0x400C, 1 + compare VAR_0x400C, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_21AAC0 - compare_var_to_value VAR_0x400C, 2 + compare VAR_0x400C, 2 goto_if 4, LilycoveCity_ContestLobby_EventScript_21A97F - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq LilycoveCity_ContestLobby_EventScript_21AAD3 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq LilycoveCity_ContestLobby_EventScript_21AAD3 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq LilycoveCity_ContestLobby_EventScript_21A97F - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq LilycoveCity_ContestLobby_EventScript_21AAEF - compare_var_to_value VAR_RESULT, 10 + compare VAR_RESULT, 10 goto_eq LilycoveCity_ContestLobby_EventScript_21AAE1 message3 LilycoveCity_ContestLobby_Text_27BEEC contestlinktransfer @@ -843,15 +843,15 @@ LilycoveCity_ContestLobby_EventScript_21AB17:: @ 821AB17 end LilycoveCity_ContestLobby_EventScript_21AB4B:: @ 821AB4B - compare_var_to_value VAR_CONTEST_CATEGORY, 0 + compare VAR_CONTEST_CATEGORY, 0 call_if 1, LilycoveCity_ContestLobby_EventScript_21AB88 - compare_var_to_value VAR_CONTEST_CATEGORY, 1 + compare VAR_CONTEST_CATEGORY, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_21AB8E - compare_var_to_value VAR_CONTEST_CATEGORY, 2 + compare VAR_CONTEST_CATEGORY, 2 call_if 1, LilycoveCity_ContestLobby_EventScript_21AB94 - compare_var_to_value VAR_CONTEST_CATEGORY, 3 + compare VAR_CONTEST_CATEGORY, 3 call_if 1, LilycoveCity_ContestLobby_EventScript_21AB9A - compare_var_to_value VAR_CONTEST_CATEGORY, 4 + compare VAR_CONTEST_CATEGORY, 4 call_if 1, LilycoveCity_ContestLobby_EventScript_21ABA0 goto LilycoveCity_ContestLobby_EventScript_21ABA6 end @@ -889,22 +889,22 @@ LilycoveCity_ContestLobby_EventScript_21ABA6:: @ 821ABA6 LilycoveCity_ContestLobby_EventScript_21ABE3:: @ 821ABE3 call LilycoveCity_ContestLobby_EventScript_21AC33 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21AC3D - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq LilycoveCity_ContestLobby_EventScript_21ABA6 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq LilycoveCity_ContestLobby_EventScript_21ABE3 release end LilycoveCity_ContestLobby_EventScript_21AC0B:: @ 821AC0B call LilycoveCity_ContestLobby_EventScript_21AC38 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21AC3D - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq LilycoveCity_ContestLobby_EventScript_21ABA6 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq LilycoveCity_ContestLobby_EventScript_21AC0B release end diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 2ec5d8cab..1e9f9cc28 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -9,7 +9,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3:: @ 82186D3 checkflag FLAG_0x002 call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_21870F specialvar VAR_RESULT, sub_80C08E4 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_CoveLilyMotel_2F_EventScript_218702 release end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 65ed3e6ee..b7ba17125 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -60,7 +60,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2206C5:: @ 82206C5 LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718 setvar VAR_0x8006, 4 setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1 - compare_var_to_value VAR_DEPT_STORE_FLOOR, 4 + compare VAR_DEPT_STORE_FLOOR, 4 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 setvar VAR_DEPT_STORE_FLOOR, 4 @@ -70,7 +70,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220718:: @ 8220718 LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740 setvar VAR_0x8006, 5 setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1 - compare_var_to_value VAR_DEPT_STORE_FLOOR, 5 + compare VAR_DEPT_STORE_FLOOR, 5 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 setvar VAR_DEPT_STORE_FLOOR, 5 @@ -80,7 +80,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220740:: @ 8220740 LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768 setvar VAR_0x8006, 6 setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1 - compare_var_to_value VAR_DEPT_STORE_FLOOR, 6 + compare VAR_DEPT_STORE_FLOOR, 6 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 setvar VAR_DEPT_STORE_FLOOR, 6 @@ -90,7 +90,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220768:: @ 8220768 LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790 setvar VAR_0x8006, 7 setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1 - compare_var_to_value VAR_DEPT_STORE_FLOOR, 7 + compare VAR_DEPT_STORE_FLOOR, 7 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 setvar VAR_DEPT_STORE_FLOOR, 7 @@ -100,7 +100,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_220790:: @ 8220790 LilycoveCity_DepartmentStoreElevator_EventScript_2207B8:: @ 82207B8 setvar VAR_0x8006, 8 setdynamicwarp LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1 - compare_var_to_value VAR_DEPT_STORE_FLOOR, 8 + compare VAR_DEPT_STORE_FLOOR, 8 goto_eq LilycoveCity_DepartmentStoreElevator_EventScript_2207E0 call LilycoveCity_DepartmentStoreElevator_EventScript_2207E5 setvar VAR_DEPT_STORE_FLOOR, 8 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 1c28039a1..e38f3a276 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -4,9 +4,9 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207 LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D: @ 822020D getpricereduction 3 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220227 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22022B end @@ -52,7 +52,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220268:: @ 8220268 lock faceplayer getpricereduction 3 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220282 msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, 4 release @@ -126,22 +126,22 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220328:: @ 8220328 return LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220305 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22030C - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220313 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220442 checkitemspace VAR_0x4000, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_22031A - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220321 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220328 updatemoneybox 0, 0 nop @@ -153,10 +153,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F bufferstdstring 2, 14 msgbox gUnknown_08272A9A, 4 random 64 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_220436 checkitemspace VAR_0x4000, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, 4 @@ -165,10 +165,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F bufferstdstring 2, 14 msgbox gUnknown_08272A9A, 4 random 64 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_220436 checkitemspace VAR_0x4000, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, 4 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index ca3259128..3eb61ed91 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -9,12 +9,12 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C lock faceplayer dodailyevents - compare_var_to_value VAR_POKELOT_PRIZE, 0 + compare VAR_POKELOT_PRIZE, 0 goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_21F7F7 checkflag FLAG_0x92A goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F78D msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F797 setflag FLAG_0x92A message LilycoveCity_DepartmentStore_1F_Text_2A64C8 @@ -33,24 +33,24 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C delay 10 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7A1 incrementgamestat 46 - compare_var_to_value VAR_0x8006, 0 + compare VAR_0x8006, 0 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F77B - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F784 bufferitemname 0, VAR_0x8005 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7B9 - compare_var_to_value VAR_0x8004, 2 + compare VAR_0x8004, 2 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7C2 - compare_var_to_value VAR_0x8004, 3 + compare VAR_0x8004, 3 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7CB - compare_var_to_value VAR_0x8004, 4 + compare VAR_0x8004, 4 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_21F7D4 giveitem_std VAR_0x8005 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7DD special sub_80EE2CC goto LilycoveCity_DepartmentStore_1F_EventScript_21F7AF @@ -114,7 +114,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F7ED:: @ 821F7ED LilycoveCity_DepartmentStore_1F_EventScript_21F7F7:: @ 821F7F7 msgbox LilycoveCity_DepartmentStore_1F_Text_2A67E1, 4 giveitem_std VAR_POKELOT_PRIZE - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7ED copyvar VAR_0x8004, VAR_0x404D copyvar VAR_0x8005, VAR_POKELOT_PRIZE diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc index 9e07bf4fc..d5f5e49ad 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc @@ -125,9 +125,9 @@ LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075 lockall applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x405E, 0 + compare VAR_0x405E, 0 goto_eq LilycoveCity_DepartmentStore_5F_EventScript_22009C - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 goto_if 4, LilycoveCity_DepartmentStore_5F_EventScript_22009C goto LilycoveCity_DepartmentStore_5F_EventScript_2200A7 end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 8f8d5338f..7f0e41d03 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -17,23 +17,23 @@ LilycoveCity_Harbor_EventScript_21E00F:: @ 821E00F call LilycoveCity_Harbor_EventScript_21E22A call LilycoveCity_Harbor_EventScript_21E25C call LilycoveCity_Harbor_EventScript_21E2A6 - compare_var_to_value VAR_0x400C, 2 + compare VAR_0x400C, 2 goto_eq LilycoveCity_Harbor_EventScript_21E350 - compare_var_to_value VAR_0x400B, 1 + compare VAR_0x400B, 1 goto_eq LilycoveCity_Harbor_EventScript_21E2F0 - compare_var_to_value VAR_0x400B, 2 + compare VAR_0x400B, 2 goto_eq LilycoveCity_Harbor_EventScript_21E320 - compare_var_to_value VAR_0x400B, 4 + compare VAR_0x400B, 4 goto_eq LilycoveCity_Harbor_EventScript_21E350 - compare_var_to_value VAR_0x400B, 8 + compare VAR_0x400B, 8 goto_eq LilycoveCity_Harbor_EventScript_21E41D - compare_var_to_value VAR_0x400B, 0 + compare VAR_0x400B, 0 goto_if 5, LilycoveCity_Harbor_EventScript_21E44D goto LilycoveCity_Harbor_EventScript_21E080 end LilycoveCity_Harbor_EventScript_21E080:: @ 821E080 - compare_var_to_value VAR_0x400A, 0 + compare VAR_0x400A, 0 goto_eq LilycoveCity_Harbor_EventScript_21E557 msgbox LilycoveCity_Harbor_Text_21E758, 4 message LilycoveCity_Harbor_Text_21E7ED @@ -87,7 +87,7 @@ LilycoveCity_Harbor_EventScript_21E139:: @ 821E139 LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 msgbox LilycoveCity_Harbor_Text_21E864, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE, 5 call LilycoveCity_Harbor_EventScript_21E5CC @@ -98,7 +98,7 @@ LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 msgbox LilycoveCity_Harbor_Text_21E880, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC warp BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 @@ -111,7 +111,7 @@ LilycoveCity_Harbor_EventScript_21E194:: @ 821E194 checkflag FLAG_SYS_HAS_EON_TICKET goto_if 0, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_EON_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_0x400E, 1 checkflag FLAG_0x1AE @@ -124,7 +124,7 @@ LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6 checkflag FLAG_0x8D5 goto_if 0, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_AURORA_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_0x400D, 1 checkflag FLAG_0x1AF @@ -137,7 +137,7 @@ LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8 checkflag FLAG_0x8D6 goto_if 0, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_OLD_SEA_MAP, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_0x400C, 1 checkflag FLAG_0x1B0 @@ -150,7 +150,7 @@ LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A checkflag FLAG_0x8E0 goto_if 0, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_MYSTIC_TICKET, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_0x4009, 1 checkflag FLAG_0x1DB @@ -160,13 +160,13 @@ LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A LilycoveCity_Harbor_EventScript_21E25C:: @ 821E25C setvar VAR_0x400B, 0 - compare_var_to_value VAR_0x400E, 2 + compare VAR_0x400E, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E28E - compare_var_to_value VAR_0x400D, 2 + compare VAR_0x400D, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E294 - compare_var_to_value VAR_0x400C, 2 + compare VAR_0x400C, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E29A - compare_var_to_value VAR_0x4009, 2 + compare VAR_0x4009, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E2A0 return @@ -188,13 +188,13 @@ LilycoveCity_Harbor_EventScript_21E2A0:: @ 821E2A0 LilycoveCity_Harbor_EventScript_21E2A6:: @ 821E2A6 setvar VAR_0x400A, 0 - compare_var_to_value VAR_0x400E, 1 + compare VAR_0x400E, 1 call_if 1, LilycoveCity_Harbor_EventScript_21E2D8 - compare_var_to_value VAR_0x400D, 1 + compare VAR_0x400D, 1 call_if 1, LilycoveCity_Harbor_EventScript_21E2DE - compare_var_to_value VAR_0x400C, 1 + compare VAR_0x400C, 1 call_if 1, LilycoveCity_Harbor_EventScript_21E2E4 - compare_var_to_value VAR_0x4009, 1 + compare VAR_0x4009, 1 call_if 1, LilycoveCity_Harbor_EventScript_21E2EA return @@ -262,25 +262,25 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 waitmovement 0 applymovement 4, LilycoveCity_Harbor_Movement_27259A waitmovement 0 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E656 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E661 addobject 5 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E675 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E680 msgbox LilycoveCity_Harbor_Text_2C6951, 4 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E68B - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E696 msgbox LilycoveCity_Harbor_Text_2C69AA, 4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E6A1 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E6BA setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_2721E2 @@ -367,9 +367,9 @@ LilycoveCity_Harbor_EventScript_21E514:: @ 821E514 waitmovement 0 delay 30 removeobject 4 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E61B - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E610 delay 30 hideobjectat 255, PETALBURG_CITY @@ -396,7 +396,7 @@ LilycoveCity_Harbor_EventScript_21E56B:: @ 821E56B LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 msgbox LilycoveCity_Harbor_Text_21E864, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE, 5 call LilycoveCity_Harbor_EventScript_21E5CC @@ -407,7 +407,7 @@ LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 LilycoveCity_Harbor_EventScript_21E59D:: @ 821E59D msgbox LilycoveCity_Harbor_Text_21E880, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC warp BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 @@ -428,9 +428,9 @@ LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, LILYCOVE_CITY_HARBOR - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E61B - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E610 delay 30 hideobjectat 255, PETALBURG_CITY diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc index 4b71575b0..486df9be0 100644 --- a/data/scripts/maps/LilycoveCity_House2.inc +++ b/data/scripts/maps/LilycoveCity_House2.inc @@ -8,7 +8,7 @@ LilycoveCity_House2_EventScript_21ED75:: @ 821ED75 goto_eq LilycoveCity_House2_EventScript_21EDAC msgbox LilycoveCity_House2_Text_21EDB6, 4 giveitem_std ITEM_TM44 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_House2_EventScript_272054 setflag FLAG_0x0EA msgbox LilycoveCity_House2_Text_21EDF9, 4 diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc index dee1eaec6..f82befbcf 100644 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ b/data/scripts/maps/LilycoveCity_House3.inc @@ -11,7 +11,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B lock faceplayer msgbox LilycoveCity_House3_Text_21EF99, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_House3_EventScript_21EE75 msgbox LilycoveCity_House3_Text_21F0F8, 4 closemessage diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index a97e277ef..8103a623c 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -11,9 +11,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2 message LilycoveCity_LilycoveMuseum_1F_Text_218EBC waitmessage multichoice 20, 8, 16, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC end @@ -23,9 +23,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC:: @ 8218CEC LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5:: @ 8218CF5 msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F98, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D14 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E end diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index f464d08ea..97dba4704 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -125,7 +125,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, 4 givedecoration_std 44 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219911 setflag FLAG_0x0EC closemessage diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 0f543fe7d..0b677028d 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -16,19 +16,19 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EA3B:: @ 821EA3B msgbox LilycoveCity_MoveDeletersHouse_Text_21EB65, 4 special sub_81B94B0 waitstate - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 special sub_81B98DC - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EADC special sub_81B96D0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EACF msgbox LilycoveCity_MoveDeletersHouse_Text_21EB89, 4 fadescreen 1 special sub_81B968C fadescreen 0 - compare_var_to_value VAR_0x8005, 4 + compare VAR_0x8005, 4 goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EA3B special sub_81B9718 msgbox LilycoveCity_MoveDeletersHouse_Text_21EBDA, 5 @@ -40,7 +40,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EA3B:: @ 821EA3B LilycoveCity_MoveDeletersHouse_EventScript_21EAB0:: @ 821EAB0 special sub_81B9918 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EAF0 special sub_81B9770 playfanfare BGM_ME_WASURE diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index 43e0a61f2..b6ca09906 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -10,9 +10,9 @@ LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD: @ 821C5BD LilycoveCity_PokemonCenter_1F_EventScript_21C5C6:: @ 821C5C6 special sub_818D9C0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonCenter_1F_EventScript_21C5E4 end diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index f1921be57..cdcef8e9a 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -62,9 +62,9 @@ LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807 LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D: @ 821C80D call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA - compare_var_to_value VAR_0x4095, 1 + compare VAR_0x4095, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8 - compare_var_to_value VAR_0x4095, 2 + compare VAR_0x4095, 2 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C829 end @@ -73,41 +73,41 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C829:: @ 821C829 call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5 setvar VAR_0x8004, 8 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8 setvar VAR_0x8004, 9 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0 setvar VAR_0x8004, 10 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8 setvar VAR_0x8004, 11 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0 setvar VAR_0x8004, 12 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8 setvar VAR_0x8004, 13 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0 setvar VAR_0x8004, 14 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8 setvar VAR_0x8004, 15 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0 end LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA:: @ 821C8DA specialvar VAR_RESULT, sub_80EE7C0 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1 clearflag FLAG_0x2DA clearflag FLAG_0x0D2 @@ -121,37 +121,37 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5 setvar VAR_0x8005, 8 setvar VAR_0x8004, 8 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 9 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 10 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 11 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 12 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 13 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 14 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE setvar VAR_0x8004, 15 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE - compare_var_to_value VAR_0x8005, 5 + compare VAR_0x8005, 5 goto_if 4, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B4 return @@ -209,13 +209,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17 faceplayer setvar VAR_0x8004, 13 special sub_813BDB4 - compare_var_to_value VAR_0x4095, 0 + compare VAR_0x4095, 0 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56 specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, 4 release @@ -223,7 +223,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17 LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56:: @ 821CA56 specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, 4 release @@ -249,13 +249,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E faceplayer setvar VAR_0x8004, 8 special sub_813BDB4 - compare_var_to_value VAR_0x4095, 0 + compare VAR_0x4095, 0 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, 4 release @@ -263,7 +263,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD:: @ 821CACD specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, 4 release @@ -289,13 +289,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05 faceplayer setvar VAR_0x8004, 9 special sub_813BDB4 - compare_var_to_value VAR_0x4095, 0 + compare VAR_0x4095, 0 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44 specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, 4 release @@ -303,7 +303,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05 LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44:: @ 821CB44 specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, 4 release @@ -329,13 +329,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C faceplayer setvar VAR_0x8004, 10 special sub_813BDB4 - compare_var_to_value VAR_0x4095, 0 + compare VAR_0x4095, 0 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, 4 release @@ -343,7 +343,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB:: @ 821CBBB specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, 4 release @@ -370,10 +370,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3 setvar VAR_0x8004, 11 special sub_813BDB4 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27 specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, 4 release @@ -381,7 +381,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3 LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27:: @ 821CC27 specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, 4 release @@ -403,10 +403,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55 setvar VAR_0x8004, 12 special sub_813BDB4 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89 specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, 4 release @@ -414,7 +414,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55 LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89:: @ 821CC89 specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, 4 release @@ -436,10 +436,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7 setvar VAR_0x8004, 14 special sub_813BDB4 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, 4 release @@ -447,7 +447,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7 LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB:: @ 821CCEB specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, 4 release @@ -469,10 +469,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19 setvar VAR_0x8004, 15 special sub_813BDB4 specialvar VAR_RESULT, sub_813BD60 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, 4 release @@ -480,7 +480,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19 LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D specialvar VAR_RESULT, sub_813BCA8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67 msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, 4 release @@ -508,7 +508,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B:: @ 821CD7B LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 setvar VAR_0x8005, 11 special InterviewBefore - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF copyvar VAR_0x800A, VAR_0x8006 setvar VAR_0x8004, 8 @@ -519,9 +519,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE end @@ -534,9 +534,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE setvar VAR_0x8004, 8 special sub_813BDB4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15 end @@ -549,9 +549,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15 call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE end @@ -579,9 +579,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F setvar VAR_0x8004, 8 special sub_813BDB4 msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D end diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 3f58bf1e5..c7376e394 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -7,23 +7,23 @@ LittlerootTown_MapScripts:: @ 81E7DCB LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB setflag FLAG_VISITED_LITTLEROOT_TOWN call LittlerootTown_EventScript_271ED7 - compare_var_to_value VAR_0x4092, 2 + compare VAR_0x4092, 2 call_if 1, LittlerootTown_EventScript_1E7E67 checkflag FLAG_0x052 call_if 0, LittlerootTown_EventScript_1E7E6F - compare_var_to_value VAR_0x4050, 3 + compare VAR_0x4050, 3 call_if 1, LittlerootTown_EventScript_1E7E92 - compare_var_to_value VAR_0x4082, 4 + compare VAR_0x4082, 4 call_if 1, LittlerootTown_EventScript_1E7E5C - compare_var_to_value VAR_0x408C, 4 + compare VAR_0x408C, 4 call_if 1, LittlerootTown_EventScript_1E7E5C - compare_var_to_value VAR_0x40C7, 1 + compare VAR_0x40C7, 1 call_if 1, LittlerootTown_EventScript_1E7E53 - compare_var_to_value VAR_0x408D, 3 + compare VAR_0x408D, 3 call_if 1, LittlerootTown_EventScript_1E7E4F - compare_var_to_value VAR_0x40D3, 1 + compare VAR_0x40D3, 1 call_if 1, LittlerootTown_EventScript_1E7E4B - compare_var_to_value VAR_0x40D3, 2 + compare VAR_0x40D3, 2 call_if 1, LittlerootTown_EventScript_1E7E45 end @@ -54,7 +54,7 @@ LittlerootTown_EventScript_1E7E67:: @ 81E7E67 return LittlerootTown_EventScript_1E7E6F:: @ 81E7E6F - compare_var_to_value VAR_0x4050, 0 + compare VAR_0x4050, 0 goto_eq LittlerootTown_EventScript_1E7E86 setobjectxyperm 1, 10, 1 setobjectmovementtype 1, 7 @@ -69,9 +69,9 @@ LittlerootTown_EventScript_1E7E92:: @ 81E7E92 clearflag FLAG_0x2F0 setobjectmovementtype 4, 8 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_EventScript_1E7EB1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_EventScript_1E7EB9 return @@ -209,7 +209,7 @@ LittlerootTown_EventScript_1E7FEC:: @ 81E7FEC addobject 8 addobject 7 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_EventScript_1E8004 goto LittlerootTown_EventScript_1E8013 end @@ -239,7 +239,7 @@ LittlerootTown_EventScript_1E8034:: @ 81E8034 goto_eq LittlerootTown_EventScript_1E8087 checkflag FLAG_0x052 goto_eq LittlerootTown_EventScript_1E807A - compare_var_to_value VAR_0x4050, 0 + compare VAR_0x4050, 0 goto_if 5, LittlerootTown_EventScript_1E805D msgbox LittlerootTown_Text_1E8BB8, 4 release @@ -384,9 +384,9 @@ LittlerootTown_EventScript_1E815A:: @ 81E815A LittlerootTown_EventScript_1E8163:: @ 81E8163 lockall checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_EventScript_1E817D - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_EventScript_1E8186 releaseall end @@ -402,9 +402,9 @@ LittlerootTown_EventScript_1E8186:: @ 81E8186 LittlerootTown_EventScript_1E818F:: @ 81E818F lockall checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_EventScript_1E81A9 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_EventScript_1E81B2 releaseall end @@ -457,27 +457,27 @@ LittlerootTown_EventScript_1E8205:: @ 81E8205 LittlerootTown_EventScript_1E8211:: @ 81E8211 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_EventScript_1E8297 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_EventScript_1E82A2 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_EventScript_1E8281 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_EventScript_1E828C msgbox LittlerootTown_Text_1E87E1, 4 closemessage checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_EventScript_1E82AD - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_EventScript_1E82F0 call LittlerootTown_EventScript_1E8693 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_EventScript_1E8405 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_EventScript_1E8448 goto LittlerootTown_EventScript_1E8686 end @@ -503,32 +503,32 @@ LittlerootTown_EventScript_1E82A2:: @ 81E82A2 return LittlerootTown_EventScript_1E82AD:: @ 81E82AD - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_EventScript_1E8333 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_EventScript_1E8348 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, LittlerootTown_EventScript_1E835D - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, LittlerootTown_EventScript_1E8372 - compare_var_to_value VAR_0x8008, 4 + compare VAR_0x8008, 4 call_if 1, LittlerootTown_EventScript_1E8387 - compare_var_to_value VAR_0x8008, 5 + compare VAR_0x8008, 5 call_if 1, LittlerootTown_EventScript_1E839C return LittlerootTown_EventScript_1E82F0:: @ 81E82F0 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_EventScript_1E8333 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_EventScript_1E8348 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, LittlerootTown_EventScript_1E83B1 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, LittlerootTown_EventScript_1E83C6 - compare_var_to_value VAR_0x8008, 4 + compare VAR_0x8008, 4 call_if 1, LittlerootTown_EventScript_1E83DB - compare_var_to_value VAR_0x8008, 5 + compare VAR_0x8008, 5 call_if 1, LittlerootTown_EventScript_1E83F0 return @@ -603,32 +603,32 @@ LittlerootTown_EventScript_1E83F0:: @ 81E83F0 return LittlerootTown_EventScript_1E8405:: @ 81E8405 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_EventScript_1E848B - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_EventScript_1E8496 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, LittlerootTown_EventScript_1E84A1 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, LittlerootTown_EventScript_1E84C7 - compare_var_to_value VAR_0x8008, 4 + compare VAR_0x8008, 4 call_if 1, LittlerootTown_EventScript_1E84ED - compare_var_to_value VAR_0x8008, 5 + compare VAR_0x8008, 5 call_if 1, LittlerootTown_EventScript_1E8513 return LittlerootTown_EventScript_1E8448:: @ 81E8448 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_EventScript_1E848B - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_EventScript_1E8496 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, LittlerootTown_EventScript_1E8539 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, LittlerootTown_EventScript_1E855F - compare_var_to_value VAR_0x8008, 4 + compare VAR_0x8008, 4 call_if 1, LittlerootTown_EventScript_1E8585 - compare_var_to_value VAR_0x8008, 5 + compare VAR_0x8008, 5 call_if 1, LittlerootTown_EventScript_1E85AB return @@ -892,9 +892,9 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D lock faceplayer checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_EventScript_1E8281 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_EventScript_1E828C call LittlerootTown_EventScript_1E8693 applymovement 4, LittlerootTown_Movement_2725A6 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index aa43cc5f2..45f57262b 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -5,7 +5,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755 .byte 0 LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765 - compare_var_to_value VAR_0x4092, 6 + compare VAR_0x4092, 6 call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_1F777A checkflag FLAG_0x112 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F778D @@ -18,7 +18,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A LittlerootTown_BrendansHouse_1F_EventScript_1F778D:: @ 81F778D checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F779A return @@ -27,11 +27,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A return LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4 - compare_var_to_value VAR_0x4092, 3 + compare VAR_0x4092, 3 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77DE - compare_var_to_value VAR_0x4092, 5 + compare VAR_0x4092, 5 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77C6 - compare_var_to_value VAR_0x4092, 6 + compare VAR_0x4092, 6 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F77D2 end @@ -151,22 +151,22 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 waitmovement 0 applymovement 7, LittlerootTown_BrendansHouse_1F_Movement_27259A waitmovement 0 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 5, LittlerootTown_BrendansHouse_1F_EventScript_1F7981 playbgm BGM_BOY_SUP, 1 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F798C - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F7997 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79A2 msgbox LittlerootTown_BrendansHouse_1F_Text_1F90B4, 4 closemessage - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79C1 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79D3 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79E5 playse SE_KAIDAN removeobject 7 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 895922471..23d30545c 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -4,11 +4,11 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81F83E3 .byte 0 LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE - compare_var_to_value VAR_0x408D, 2 + compare VAR_0x408D, 2 call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8457 - compare_var_to_value VAR_0x408D, 3 + compare VAR_0x408D, 3 call_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F841A - compare_var_to_value VAR_0x4092, 4 + compare VAR_0x4092, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_2926FE call LittlerootTown_BrendansHouse_2F_EventScript_275CE1 setvar VAR_0x4089, 0 @@ -17,15 +17,15 @@ LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A checkflag FLAG_0x124 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8433 - compare_var_to_value VAR_0x4084, 2 + compare VAR_0x4084, 2 goto_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F8456 goto LittlerootTown_BrendansHouse_2F_EventScript_1F8433 LittlerootTown_BrendansHouse_2F_EventScript_1F8433:: @ 81F8433 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8456 - compare_var_to_value VAR_0x40D3, 2 + compare VAR_0x40D3, 2 goto_if 4, LittlerootTown_BrendansHouse_2F_EventScript_1F9309 setobjectxyperm 1, 0, 2 setobjectmovementtype 1, 7 @@ -36,7 +36,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8456:: @ 81F8456 LittlerootTown_BrendansHouse_2F_EventScript_1F8457:: @ 81F8457 checkplayergender - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8464 return @@ -50,13 +50,13 @@ LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_275D0C end LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481 lockall - compare_var_to_value VAR_0x408D, 2 + compare VAR_0x408D, 2 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8497 msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, 4 releaseall @@ -74,13 +74,13 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497 waitmovement 0 delay 10 playbgm BGM_BOY_SUP, 1 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8507 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8536 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8565 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F8594 setvar VAR_0x408D, 3 setflag FLAG_0x331 @@ -248,9 +248,9 @@ LittlerootTown_BrendansHouse_2F_Movement_1F8609: @ 81F8609 gUnknown_081F860D:: @ 81F860D lockall checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8626 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F864C end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index ffeaa9499..92f4a58e0 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -5,7 +5,7 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5 .byte 0 LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5 - compare_var_to_value VAR_0x4092, 6 + compare VAR_0x4092, 6 call_if 0, LittlerootTown_MaysHouse_1F_EventScript_1F88CA checkflag FLAG_0x112 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F88DD @@ -18,7 +18,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F88CA:: @ 81F88CA LittlerootTown_MaysHouse_1F_EventScript_1F88DD:: @ 81F88DD checkplayergender - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_MaysHouse_1F_EventScript_1F88EA return @@ -27,11 +27,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1F88EA:: @ 81F88EA return LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4 - compare_var_to_value VAR_0x4092, 3 + compare VAR_0x4092, 3 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F892E - compare_var_to_value VAR_0x4092, 5 + compare VAR_0x4092, 5 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8916 - compare_var_to_value VAR_0x4092, 6 + compare VAR_0x4092, 6 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8922 end @@ -122,7 +122,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A33 checkflag FLAG_SYS_POKEMON_GET goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A29 - compare_var_to_value VAR_0x408D, 3 + compare VAR_0x408D, 3 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F special sub_8138B48 msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, 4 @@ -190,22 +190,22 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B waitmovement 0 applymovement 7, LittlerootTown_MaysHouse_1F_Movement_27259A waitmovement 0 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 5, LittlerootTown_MaysHouse_1F_EventScript_1F8B2A playbgm BGM_GIRL_SUP, 1 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B35 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B40 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B4B msgbox LittlerootTown_MaysHouse_1F_Text_1F8EC6, 4 closemessage - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B6A - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B7C - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B8E playse SE_KAIDAN removeobject 7 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index efe89144d..963ce9880 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -4,11 +4,11 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296 .byte 0 LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 - compare_var_to_value VAR_0x408D, 2 + compare VAR_0x408D, 2 call_if 0, LittlerootTown_MaysHouse_2F_EventScript_1F930A - compare_var_to_value VAR_0x408D, 3 + compare VAR_0x408D, 3 call_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F92CD - compare_var_to_value VAR_0x4092, 4 + compare VAR_0x4092, 4 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_2926FE call LittlerootTown_MaysHouse_2F_EventScript_275CE1 setvar VAR_0x4089, 0 @@ -17,15 +17,15 @@ LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD checkflag FLAG_0x124 goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F92E6 - compare_var_to_value VAR_0x4084, 2 + compare VAR_0x4084, 2 goto_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F9309 goto LittlerootTown_MaysHouse_2F_EventScript_1F92E6 LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6 checkplayergender - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9309 - compare_var_to_value VAR_0x40D3, 2 + compare VAR_0x40D3, 2 goto_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F9309 setobjectxyperm 1, 8, 2 setobjectmovementtype 1, 7 @@ -37,7 +37,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9309:: @ 81F9309 LittlerootTown_MaysHouse_2F_EventScript_1F930A:: @ 81F930A checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9317 return @@ -51,13 +51,13 @@ LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327 checkplayergender - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_275D0C end LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334 lockall - compare_var_to_value VAR_0x408D, 2 + compare VAR_0x408D, 2 goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, 4 releaseall @@ -75,13 +75,13 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A waitmovement 0 delay 10 playbgm BGM_GIRL_SUP, 1 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93BA - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F93E9 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9418 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1F9440 setvar VAR_0x408D, 3 setflag FLAG_0x332 @@ -253,9 +253,9 @@ LittlerootTown_MaysHouse_2F_EventScript_1F94C1:: @ 81F94C1 checkflag FLAG_0x124 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94F7 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94E3 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94ED end @@ -273,9 +273,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7 applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_27259E waitmovement 0 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F951D - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1F952F setflag FLAG_0x125 releaseall @@ -304,9 +304,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F954A:: @ 81F954A gUnknown_081F9553:: @ 81F9553 lockall checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F956C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9576 end diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index cef69c7b2..9e2ac5197 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -7,17 +7,17 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91 LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1 call LittlerootTown_ProfessorBirchsLab_EventScript_271ED7 call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD - compare_var_to_value VAR_0x40D3, 6 + compare VAR_0x40D3, 6 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7 - compare_var_to_value VAR_0x40D3, 4 + compare VAR_0x40D3, 4 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3 - compare_var_to_value VAR_0x40D3, 3 + compare VAR_0x40D3, 3 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD end LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD:: @ 81F9CCD specialvar VAR_RESULT, sub_80C08E4 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9 setobjectmovementtype 3, 3 setobjectxyperm 3, 5, 10 @@ -99,9 +99,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB playfanfare BGM_FANFA4 waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8B1, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17 end @@ -113,9 +113,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8F6, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 end @@ -128,9 +128,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48:: @ 81F9E48 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA35, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48 end @@ -171,9 +171,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A4 waitmovement 0 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C playse SE_PC_ON waitse @@ -264,7 +264,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C: @ 81F9F7C LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84 lock faceplayer - compare_var_to_value VAR_0x4084, 3 + compare VAR_0x4084, 3 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1 checkflag FLAG_0x058 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7 @@ -285,39 +285,39 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1:: @ 81F9FB1 LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB release - compare_var_to_value VAR_0x40D3, 6 + compare VAR_0x40D3, 6 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 drawmonpic SPECIES_CYNDAQUIL, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C end LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF release - compare_var_to_value VAR_0x40D3, 6 + compare VAR_0x40D3, 6 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 drawmonpic SPECIES_TOTODILE, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D end LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023 release - compare_var_to_value VAR_0x40D3, 6 + compare VAR_0x40D3, 6 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 drawmonpic SPECIES_CHIKORITA, 10, 3 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE end @@ -337,9 +337,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C bufferspeciesname 0, SPECIES_CYNDAQUIL setvar VAR_0x4001, 155 givemon SPECIES_CYNDAQUIL, 5, ITEM_NONE, 0x0, 0x0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC erasemonpic goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 @@ -349,7 +349,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1 call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 4 msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD call LittlerootTown_ProfessorBirchsLab_EventScript_27378B call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD @@ -360,7 +360,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 4 msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 call LittlerootTown_ProfessorBirchsLab_EventScript_273797 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 @@ -382,9 +382,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D bufferspeciesname 0, SPECIES_TOTODILE setvar VAR_0x4001, 158 givemon SPECIES_TOTODILE, 5, ITEM_NONE, 0x0, 0x0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D erasemonpic goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 @@ -394,7 +394,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142 call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 5 msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E call LittlerootTown_ProfessorBirchsLab_EventScript_27378B call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD @@ -405,7 +405,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 5 msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 call LittlerootTown_ProfessorBirchsLab_EventScript_273797 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 @@ -427,9 +427,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE bufferspeciesname 0, SPECIES_CHIKORITA setvar VAR_0x4001, 152 givemon SPECIES_CHIKORITA, 5, ITEM_NONE, 0x0, 0x0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E erasemonpic goto LittlerootTown_ProfessorBirchsLab_EventScript_273811 @@ -439,7 +439,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3 call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 6 msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F call LittlerootTown_ProfessorBirchsLab_EventScript_27378B call LittlerootTown_ProfessorBirchsLab_EventScript_2723DD @@ -450,7 +450,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 6 msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 call LittlerootTown_ProfessorBirchsLab_EventScript_273797 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 @@ -478,11 +478,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F:: @ 81FA24F LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A lock faceplayer - compare_var_to_value VAR_0x40D3, 5 + compare VAR_0x40D3, 5 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A - compare_var_to_value VAR_0x40D3, 2 + compare VAR_0x40D3, 2 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E checkflag FLAG_0x119 goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2 @@ -502,11 +502,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294 LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E checkflag FLAG_0x380 goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_272141 - compare_var_to_value VAR_0x40D3, 3 + compare VAR_0x40D3, 3 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141 - compare_var_to_value VAR_0x40D3, 6 + compare VAR_0x40D3, 6 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_272141 - compare_var_to_value VAR_0x4084, 5 + compare VAR_0x4084, 5 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, 4 release @@ -537,9 +537,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA352 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F setvar VAR_0x4084, 5 setflag FLAG_0x074 @@ -552,7 +552,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 LittlerootTown_ProfessorBirchsLab_EventScript_1FA352:: @ 81FA352 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FADD7, 4 giveitem_std ITEM_POKE_BALL, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAE40, 4 setvar VAR_RESULT, 0 @@ -561,7 +561,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA352:: @ 81FA352 LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F:: @ 81FA37F msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF3F, 4 giveitem_std ITEM_POKE_BALL, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF8E, 4 setvar VAR_RESULT, 1 @@ -602,16 +602,16 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3:: @ 81FA3E3 LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC lock faceplayer - compare_var_to_value VAR_0x40D3, 5 + compare VAR_0x40D3, 5 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A - compare_var_to_value VAR_0x40D3, 6 + compare VAR_0x40D3, 6 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA465 - compare_var_to_value VAR_0x40D3, 2 + compare VAR_0x40D3, 2 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1FA490 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA428 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA431 release end @@ -626,9 +626,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA431:: @ 81FA431 LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A:: @ 81FA43A checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA453 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C release end @@ -643,9 +643,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C:: @ 81FA45C LittlerootTown_ProfessorBirchsLab_EventScript_1FA465:: @ 81FA465 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA487 release end @@ -660,9 +660,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA487:: @ 81FA487 LittlerootTown_ProfessorBirchsLab_EventScript_1FA490:: @ 81FA490 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2 release end diff --git a/data/scripts/maps/MarineCave_End.inc b/data/scripts/maps/MarineCave_End.inc index dc2e2b3a0..7d2588a0a 100644 --- a/data/scripts/maps/MarineCave_End.inc +++ b/data/scripts/maps/MarineCave_End.inc @@ -10,7 +10,7 @@ MarineCave_End_MapScript1_23AFEA: @ 823AFEA MarineCave_End_EventScript_23AFF4:: @ 823AFF4 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, MarineCave_End_EventScript_27374E removeobject 1 return @@ -38,16 +38,16 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B setvar VAR_LAST_TALKED, 1 setwildbattle SPECIES_KYOGRE, 70, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE setvar VAR_0x4001, 0 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MarineCave_End_EventScript_23B084 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq MarineCave_End_EventScript_23B092 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq MarineCave_End_EventScript_23B092 setvar VAR_0x4039, 1 setflag FLAG_0x1BE diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index b470e4432..908b3a3b3 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -107,9 +107,9 @@ MauvilleCity_EventScript_1DF452:: @ 81DF452 end MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, MauvilleCity_EventScript_1DF63A - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_EventScript_1DF683 closemessage switch VAR_FACING @@ -164,18 +164,18 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593 setflag FLAG_0x0BE setvar VAR_0x40F2, 0 setflag FLAG_0x088 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, MauvilleCity_EventScript_1DF5F3 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, MauvilleCity_EventScript_1DF601 applymovement 255, MauvilleCity_Movement_2725AA waitmovement 0 msgbox MauvilleCity_Text_1DFED5, 4 closemessage addvar VAR_0x40D1, 1 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, MauvilleCity_EventScript_1DF616 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, MauvilleCity_EventScript_1DF628 removeobject 11 releaseall @@ -426,7 +426,7 @@ MauvilleCity_EventScript_1DF73A:: @ 81DF73A faceplayer checkflag FLAG_0x0D1 goto_eq MauvilleCity_EventScript_1DF7B0 - compare_var_to_value VAR_0x40BA, 2 + compare VAR_0x40BA, 2 goto_eq MauvilleCity_EventScript_1DF784 checkflag FLAG_0x0D0 goto_eq MauvilleCity_EventScript_1DF77A @@ -445,7 +445,7 @@ MauvilleCity_EventScript_1DF77A:: @ 81DF77A MauvilleCity_EventScript_1DF784:: @ 81DF784 msgbox MauvilleCity_Text_1E020E, 4 giveitem_std ITEM_TM24 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_EventScript_272054 setflag FLAG_0x0D1 msgbox MauvilleCity_Text_1E02AA, 4 diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index 1dc08e304..d4915a478 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -10,17 +10,17 @@ MauvilleCity_BikeShop_EventScript_20EBBC:: @ 820EBBC goto_eq MauvilleCity_BikeShop_EventScript_20EBF7 msgbox MauvilleCity_BikeShop_Text_20EE22, 4 msgbox MauvilleCity_BikeShop_Text_20EE99, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20EC4A - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_BikeShop_EventScript_20EC3D end MauvilleCity_BikeShop_EventScript_20EBF7:: @ 820EBF7 msgbox MauvilleCity_BikeShop_Text_20EE99, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20EC4A - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_BikeShop_EventScript_20EC3D end @@ -64,19 +64,19 @@ MauvilleCity_BikeShop_EventScript_20EC87:: @ 820EC87 MauvilleCity_BikeShop_EventScript_20EC94:: @ 820EC94 msgbox MauvilleCity_BikeShop_Text_20F1FB, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20ECB3 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_BikeShop_EventScript_20ECE5 end MauvilleCity_BikeShop_EventScript_20ECB3:: @ 820ECB3 msgbox MauvilleCity_BikeShop_Text_20F22F, 4 checkitem ITEM_ACRO_BIKE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20ECEF checkitem ITEM_MACH_BIKE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20ED10 msgbox MauvilleCity_BikeShop_Text_20F2F3, 4 release diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index c75fdafec..6d3e0c317 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -6,7 +6,7 @@ MauvilleCity_GameCorner_EventScript_20FBB9:: @ 820FBB9 faceplayer msgbox MauvilleCity_GameCorner_Text_210460, 4 checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_20FCB7 message MauvilleCity_GameCorner_Text_2104DF waitmessage @@ -32,10 +32,10 @@ MauvilleCity_GameCorner_EventScript_20FC0C:: @ 820FC0C MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33 checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9950 + compare VAR_0x4001, 9950 goto_if 4, MauvilleCity_GameCorner_EventScript_20FCE1 checkmoney 0x3e8, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_20FCC1 givecoins 50 takemoney 0x3e8, 0 @@ -53,10 +53,10 @@ MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33 MauvilleCity_GameCorner_EventScript_20FC75:: @ 820FC75 checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 9500 + compare VAR_0x4001, 9500 goto_if 4, MauvilleCity_GameCorner_EventScript_20FCE1 checkmoney 0x2710, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_20FCC1 givecoins 500 takemoney 0x2710, 0 @@ -109,7 +109,7 @@ MauvilleCity_GameCorner_EventScript_20FCF1:: @ 820FCF1 faceplayer msgbox MauvilleCity_GameCorner_Text_2105D7, 4 checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_GameCorner_EventScript_20FD0D release end @@ -153,7 +153,7 @@ MauvilleCity_GameCorner_EventScript_20FD83:: @ 820FD83 MauvilleCity_GameCorner_EventScript_20FD91:: @ 820FD91 msgbox MauvilleCity_GameCorner_Text_210705, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_20FE92 switch VAR_0x4001 case 1, MauvilleCity_GameCorner_EventScript_20FDCB @@ -163,11 +163,11 @@ MauvilleCity_GameCorner_EventScript_20FD91:: @ 820FD91 MauvilleCity_GameCorner_EventScript_20FDCB:: @ 820FDCB checkcoins VAR_0x4002 - compare_var_to_value VAR_0x4002, 1000 + compare VAR_0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_20FE79 bufferdecorationname 1, 88 checkdecorspace 88 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_20FE87 takecoins 1000 givedecoration 88 @@ -179,11 +179,11 @@ MauvilleCity_GameCorner_EventScript_20FDCB:: @ 820FDCB MauvilleCity_GameCorner_EventScript_20FE05:: @ 820FE05 checkcoins VAR_0x4002 - compare_var_to_value VAR_0x4002, 1000 + compare VAR_0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_20FE79 bufferdecorationname 1, 89 checkdecorspace 89 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_20FE87 takecoins 1000 givedecoration 89 @@ -195,11 +195,11 @@ MauvilleCity_GameCorner_EventScript_20FE05:: @ 820FE05 MauvilleCity_GameCorner_EventScript_20FE3F:: @ 820FE3F checkcoins VAR_0x4002 - compare_var_to_value VAR_0x4002, 1000 + compare VAR_0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_20FE79 bufferdecorationname 1, 90 checkdecorspace 90 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_20FE87 takecoins 1000 givedecoration 90 @@ -230,7 +230,7 @@ MauvilleCity_GameCorner_EventScript_20FE9F:: @ 820FE9F faceplayer msgbox MauvilleCity_GameCorner_Text_2105D7, 4 checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_GameCorner_EventScript_20FEBB release end @@ -292,7 +292,7 @@ MauvilleCity_GameCorner_EventScript_20FF77:: @ 820FF77 MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A special sub_81398C0 msgbox MauvilleCity_GameCorner_Text_210629, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210118 switch VAR_0x4001 case 1, MauvilleCity_GameCorner_EventScript_20FFDD @@ -304,10 +304,10 @@ MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A MauvilleCity_GameCorner_EventScript_20FFDD:: @ 820FFDD checkcoins VAR_0x4002 - compare_var_to_value VAR_0x4002, 1500 + compare VAR_0x4002, 1500 goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM32, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_21010D takecoins 1500 giveitem ITEM_TM32, 1 @@ -319,10 +319,10 @@ MauvilleCity_GameCorner_EventScript_20FFDD:: @ 820FFDD MauvilleCity_GameCorner_EventScript_210017:: @ 8210017 checkcoins VAR_0x4002 - compare_var_to_value VAR_0x4002, 3500 + compare VAR_0x4002, 3500 goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM29, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_21010D takecoins 3500 giveitem ITEM_TM29, 1 @@ -334,10 +334,10 @@ MauvilleCity_GameCorner_EventScript_210017:: @ 8210017 MauvilleCity_GameCorner_EventScript_210051:: @ 8210051 checkcoins VAR_0x4002 - compare_var_to_value VAR_0x4002, 4000 + compare VAR_0x4002, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM35, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_21010D takecoins 4000 giveitem ITEM_TM35, 1 @@ -349,10 +349,10 @@ MauvilleCity_GameCorner_EventScript_210051:: @ 8210051 MauvilleCity_GameCorner_EventScript_21008B:: @ 821008B checkcoins VAR_0x4002 - compare_var_to_value VAR_0x4002, 4000 + compare VAR_0x4002, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM24, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_21010D takecoins 4000 giveitem ITEM_TM24, 1 @@ -364,10 +364,10 @@ MauvilleCity_GameCorner_EventScript_21008B:: @ 821008B MauvilleCity_GameCorner_EventScript_2100C5:: @ 82100C5 checkcoins VAR_0x4002 - compare_var_to_value VAR_0x4002, 4000 + compare VAR_0x4002, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_2100FF checkitemspace ITEM_TM13, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_21010D takecoins 4000 giveitem ITEM_TM13, 1 @@ -407,7 +407,7 @@ MauvilleCity_GameCorner_EventScript_210137:: @ 8210137 checkflag FLAG_0x0E2 goto_eq MauvilleCity_GameCorner_EventScript_210213 msgbox MauvilleCity_GameCorner_Text_210750, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210209 switch VAR_FIRST_POKE case 0, MauvilleCity_GameCorner_EventScript_21017C @@ -418,7 +418,7 @@ MauvilleCity_GameCorner_EventScript_210137:: @ 8210137 MauvilleCity_GameCorner_EventScript_21017C:: @ 821017C bufferdecorationname 1, 88 checkdecorspace 88 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_2101FA msgbox MauvilleCity_GameCorner_Text_21079C, 4 givedecoration_std 88 @@ -429,7 +429,7 @@ MauvilleCity_GameCorner_EventScript_21017C:: @ 821017C MauvilleCity_GameCorner_EventScript_2101A6:: @ 82101A6 bufferdecorationname 1, 89 checkdecorspace 89 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_2101FA msgbox MauvilleCity_GameCorner_Text_21079C, 4 givedecoration_std 89 @@ -440,7 +440,7 @@ MauvilleCity_GameCorner_EventScript_2101A6:: @ 82101A6 MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0 bufferdecorationname 1, 90 checkdecorspace 90 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_2101FA msgbox MauvilleCity_GameCorner_Text_21079C, 4 givedecoration_std 90 @@ -468,7 +468,7 @@ MauvilleCity_GameCorner_EventScript_21021D:: @ 821021D lock faceplayer checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_GameCorner_EventScript_21023D msgbox MauvilleCity_GameCorner_Text_210830, 4 goto MauvilleCity_GameCorner_EventScript_2102A9 @@ -478,7 +478,7 @@ MauvilleCity_GameCorner_EventScript_21023D:: @ 821023D checkflag FLAG_0x0E1 goto_eq MauvilleCity_GameCorner_EventScript_21026B checkcoins VAR_0x4001 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 goto_if 4, MauvilleCity_GameCorner_EventScript_21026B setflag FLAG_0x0E1 givecoins 20 @@ -537,7 +537,7 @@ MauvilleCity_GameCorner_EventScript_2102C6:: @ 82102C6 MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 0 specialvar VAR_RESULT, sub_8139248 @@ -548,7 +548,7 @@ MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6 MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 1 specialvar VAR_RESULT, sub_8139248 @@ -559,7 +559,7 @@ MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6 MauvilleCity_GameCorner_EventScript_210316:: @ 8210316 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 2 specialvar VAR_RESULT, sub_8139248 @@ -570,7 +570,7 @@ MauvilleCity_GameCorner_EventScript_210316:: @ 8210316 MauvilleCity_GameCorner_EventScript_210336:: @ 8210336 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 3 specialvar VAR_RESULT, sub_8139248 @@ -581,7 +581,7 @@ MauvilleCity_GameCorner_EventScript_210336:: @ 8210336 MauvilleCity_GameCorner_EventScript_210356:: @ 8210356 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 4 specialvar VAR_RESULT, sub_8139248 @@ -592,7 +592,7 @@ MauvilleCity_GameCorner_EventScript_210356:: @ 8210356 MauvilleCity_GameCorner_EventScript_210376:: @ 8210376 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 5 specialvar VAR_RESULT, sub_8139248 @@ -603,7 +603,7 @@ MauvilleCity_GameCorner_EventScript_210376:: @ 8210376 MauvilleCity_GameCorner_EventScript_210396:: @ 8210396 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 6 specialvar VAR_RESULT, sub_8139248 @@ -614,7 +614,7 @@ MauvilleCity_GameCorner_EventScript_210396:: @ 8210396 MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 7 specialvar VAR_RESULT, sub_8139248 @@ -625,7 +625,7 @@ MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6 MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 8 specialvar VAR_RESULT, sub_8139248 @@ -636,7 +636,7 @@ MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6 MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 9 specialvar VAR_RESULT, sub_8139248 @@ -647,7 +647,7 @@ MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6 MauvilleCity_GameCorner_EventScript_210416:: @ 8210416 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 10 specialvar VAR_RESULT, sub_8139248 @@ -658,7 +658,7 @@ MauvilleCity_GameCorner_EventScript_210416:: @ 8210416 MauvilleCity_GameCorner_EventScript_210436:: @ 8210436 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210456 setvar VAR_0x8004, 11 specialvar VAR_RESULT, sub_8139248 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 899550337..03d5d5525 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -77,12 +77,12 @@ MauvilleCity_Gym_EventScript_20DEE7:: @ 820DEE7 MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB trainerbattle 1, TRAINER_WATTSON_1, 0, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq MauvilleCity_Gym_EventScript_20DFDE checkflag FLAG_0x0A7 goto_if 0, MauvilleCity_Gym_EventScript_20DF8D - compare_var_to_value VAR_0x40BA, 2 + compare VAR_0x40BA, 2 goto_eq MauvilleCity_Gym_EventScript_20DFD4 msgbox MauvilleCity_Gym_Text_20E8E3, 4 release @@ -98,7 +98,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B setflag FLAG_0x4F2 setflag FLAG_BADGE03_GET addvar VAR_0x4085, 1 - compare_var_to_value VAR_0x4085, 6 + compare VAR_0x4085, 6 call_if 1, MauvilleCity_Gym_EventScript_271E84 setvar VAR_0x8008, 3 call MauvilleCity_Gym_EventScript_271F43 @@ -119,7 +119,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D giveitem_std ITEM_TM34 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_Gym_EventScript_272054 msgbox MauvilleCity_Gym_Text_20E844, 4 setflag FLAG_0x0A7 @@ -128,7 +128,7 @@ MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D MauvilleCity_Gym_EventScript_20DFB1:: @ 820DFB1 giveitem_std ITEM_TM34 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_Gym_EventScript_27205E msgbox MauvilleCity_Gym_Text_20E844, 4 setflag FLAG_0x0A7 @@ -148,7 +148,7 @@ MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9 lockall checkflag FLAG_0x4F2 goto_eq MauvilleCity_Gym_EventScript_20E0AD - compare_var_to_value VAR_0x4093, 1 + compare VAR_0x4093, 1 goto_eq MauvilleCity_Gym_EventScript_20E0AD setvar VAR_0x4093, 1 setvar VAR_0x8004, 0 @@ -159,7 +159,7 @@ MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E lockall checkflag FLAG_0x4F2 goto_eq MauvilleCity_Gym_EventScript_20E0AD - compare_var_to_value VAR_0x4093, 2 + compare VAR_0x4093, 2 goto_eq MauvilleCity_Gym_EventScript_20E0AD setvar VAR_0x4093, 2 setvar VAR_0x8004, 1 @@ -170,7 +170,7 @@ MauvilleCity_Gym_EventScript_20E043:: @ 820E043 lockall checkflag FLAG_0x4F2 goto_eq MauvilleCity_Gym_EventScript_20E0AD - compare_var_to_value VAR_0x4093, 3 + compare VAR_0x4093, 3 goto_eq MauvilleCity_Gym_EventScript_20E0AD setvar VAR_0x4093, 3 setvar VAR_0x8004, 2 @@ -181,7 +181,7 @@ MauvilleCity_Gym_EventScript_20E068:: @ 820E068 lockall checkflag FLAG_0x4F2 goto_eq MauvilleCity_Gym_EventScript_20E0AD - compare_var_to_value VAR_0x4093, 4 + compare VAR_0x4093, 4 goto_eq MauvilleCity_Gym_EventScript_20E0AD setvar VAR_0x4093, 4 setvar VAR_0x8004, 3 diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 35fb02a22..7a1a1cad1 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -8,7 +8,7 @@ MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D goto_eq MauvilleCity_House2_EventScript_210CDA msgbox MauvilleCity_House2_Text_210CEE, 4 checkitem ITEM_HARBOR_MAIL, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_House2_EventScript_210C82 release end @@ -20,9 +20,9 @@ MauvilleCity_House2_EventScript_210C82:: @ 8210C82 applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_27259A waitmovement 0 msgbox MauvilleCity_House2_Text_210D76, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_House2_EventScript_210CB8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_House2_EventScript_210CE4 end diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/scripts/maps/MeteorFalls_1F_2R.inc index 8cf171209..76aad489f 100644 --- a/data/scripts/maps/MeteorFalls_1F_2R.inc +++ b/data/scripts/maps/MeteorFalls_1F_2R.inc @@ -3,8 +3,8 @@ MeteorFalls_1F_2R_MapScripts:: @ 822C4DD MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE trainerbattle 2, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C529 msgbox MeteorFalls_1F_2R_Text_22C6A3, 4 release @@ -28,8 +28,8 @@ MeteorFalls_1F_2R_EventScript_22C529:: @ 822C529 MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540 trainerbattle 6, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22C843, MeteorFalls_1F_2R_Text_22C89C, MeteorFalls_1F_2R_Text_22C92B, MeteorFalls_1F_2R_EventScript_22C570 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C589 msgbox MeteorFalls_1F_2R_Text_22C8C1, 4 release @@ -51,8 +51,8 @@ MeteorFalls_1F_2R_EventScript_22C589:: @ 822C589 MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4 trainerbattle 6, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22C9E6, MeteorFalls_1F_2R_Text_22CA44, MeteorFalls_1F_2R_Text_22CACD, MeteorFalls_1F_2R_EventScript_22C5D4 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C5ED msgbox MeteorFalls_1F_2R_Text_22CA70, 4 release diff --git a/data/scripts/maps/MirageTower_4F.inc b/data/scripts/maps/MirageTower_4F.inc index 696d47435..19b8c6c91 100644 --- a/data/scripts/maps/MirageTower_4F.inc +++ b/data/scripts/maps/MirageTower_4F.inc @@ -5,7 +5,7 @@ MirageTower_4F_EventScript_23AD48:: @ 823AD48 lock faceplayer msgbox MirageTower_4F_Text_23ADF9, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MirageTower_4F_EventScript_23AD7F giveitem_std ITEM_ROOT_FOSSIL closemessage @@ -26,7 +26,7 @@ MirageTower_4F_EventScript_23AD89:: @ 823AD89 lock faceplayer msgbox MirageTower_4F_Text_23AE98, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MirageTower_4F_EventScript_23ADC0 giveitem_std ITEM_CLAW_FOSSIL closemessage diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index 1253a2a25..111281931 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -230,11 +230,11 @@ MossdeepCity_EventScript_1E4C26:: @ 81E4C26 checkflag FLAG_0x114 goto_eq MossdeepCity_EventScript_1E4C68 msgbox MossdeepCity_Text_1E4CED, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_EventScript_1E4C72 msgbox MossdeepCity_Text_1E4D5B, 4 giveitem_std ITEM_KINGS_ROCK - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_EventScript_272054 setflag FLAG_0x114 release @@ -259,9 +259,9 @@ MossdeepCity_EventScript_1E4C85:: @ 81E4C85 faceplayer msgbox MossdeepCity_Text_1E5453, 4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, MossdeepCity_EventScript_1E4CB0 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, MossdeepCity_EventScript_1E4CC2 addvar VAR_0x40D1, 1 removeobject 16 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 89c243767..3443d003d 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -50,8 +50,8 @@ MossdeepCity_Gym_EventScript_220885:: @ 8220885 MossdeepCity_Gym_EventScript_220898:: @ 8220898 trainerbattle 8, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221783, MossdeepCity_Gym_Text_2218EC, MossdeepCity_Gym_Text_221BCE, MossdeepCity_Gym_EventScript_2208D1 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq MossdeepCity_Gym_EventScript_22097E checkflag FLAG_0x0AB goto_if 0, MossdeepCity_Gym_EventScript_220937 @@ -93,7 +93,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 MossdeepCity_Gym_EventScript_220937:: @ 8220937 giveitem_std ITEM_TM04 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_Gym_EventScript_272054 msgbox MossdeepCity_Gym_Text_221A40, 4 setflag FLAG_0x0AB @@ -102,7 +102,7 @@ MossdeepCity_Gym_EventScript_220937:: @ 8220937 MossdeepCity_Gym_EventScript_22095B:: @ 822095B giveitem_std ITEM_TM04 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_Gym_EventScript_27205E msgbox MossdeepCity_Gym_Text_221A40, 4 setflag FLAG_0x0AB diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index f6c3eac63..a06979ddf 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -7,7 +7,7 @@ MossdeepCity_House1_EventScript_221FD6:: @ 8221FD6 bufferleadmonspeciesname 0 msgbox MossdeepCity_House1_Text_22200F, 4 specialvar VAR_RESULT, sub_81391D0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_House1_EventScript_221FFC msgbox MossdeepCity_House1_Text_22201D, 4 release diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index 22092b6b3..7707690fb 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -19,9 +19,9 @@ MossdeepCity_House2_EventScript_2220F1:: @ 82220F1 closemessage setflag FLAG_0x0E0 clearflag FLAG_0x3A5 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, MossdeepCity_House2_EventScript_222124 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, MossdeepCity_House2_EventScript_22212F removeobject 3 release diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index 2209a68a0..dfdbfa956 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -7,7 +7,7 @@ MossdeepCity_House3_EventScript_2225C3:: @ 82225C3 checkflag FLAG_0x098 goto_eq MossdeepCity_House3_EventScript_222602 msgbox MossdeepCity_House3_Text_222616, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_House3_EventScript_22260C msgbox MossdeepCity_House3_Text_2226B6, 4 giveitem_std ITEM_SUPER_ROD diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index e95528a20..0cd8ddf84 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -19,7 +19,7 @@ MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7 lock faceplayer special sub_80E8BC8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_House4_EventScript_222E14 special sub_8139200 msgbox MossdeepCity_House4_Text_222ECC, 4 diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index f69a45029..106dc5570 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -4,7 +4,7 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41 .byte 0 MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58 end @@ -18,11 +18,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58 setobjectxyperm 1, 3, 4 setobjectmovementtype 1, 10 setobjectmovementtype 2, 10 - compare_var_to_value VAR_0x409E, 1 + compare VAR_0x409E, 1 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA - compare_var_to_value VAR_0x409E, 2 + compare VAR_0x409E, 2 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FB2 - compare_var_to_value VAR_0x409E, 3 + compare VAR_0x409E, 3 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_222FBA end @@ -39,7 +39,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FBA:: @ 8222FBA end MossdeepCity_SpaceCenter_1F_MapScript1_222FC2: @ 8222FC2 - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_if 3, MossdeepCity_SpaceCenter_1F_EventScript_222FCE end @@ -50,14 +50,14 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FCE:: @ 8222FCE MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 lock faceplayer - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223024 dodailyevents specialvar VAR_RESULT, sub_8138BDC buffernumberstring 0, VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223012 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_22301B closemessage applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 @@ -77,9 +77,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 dodailyevents specialvar VAR_RESULT, sub_8138BDC buffernumberstring 0, VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_223051 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_22305A closemessage applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 @@ -98,7 +98,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22305A:: @ 822305A MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 lock faceplayer - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, 4 release @@ -114,13 +114,13 @@ MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E lock faceplayer - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA checkflag FLAG_0x0C0 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230D0 msgbox MossdeepCity_SpaceCenter_1F_Text_223540, 4 giveitem_std ITEM_SUN_STONE - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 setflag FLAG_0x0C0 msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, 4 @@ -137,7 +137,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223119 msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, 4 giveitem_std ITEM_SUN_STONE - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 setflag FLAG_0x0C0 msgbox MossdeepCity_SpaceCenter_1F_Text_223664, 4 @@ -158,9 +158,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_22312D:: @ 822312D faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223154 - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22315E - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_if 0, MossdeepCity_SpaceCenter_1F_EventScript_223154 goto MossdeepCity_SpaceCenter_1F_EventScript_22315E end @@ -180,9 +180,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168 faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22318F - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2231A4 - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_if 0, MossdeepCity_SpaceCenter_1F_EventScript_22318F goto MossdeepCity_SpaceCenter_1F_EventScript_2231A4 end diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc index 824044152..b23da6481 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc @@ -4,9 +4,9 @@ MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58 .byte 0 MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63 - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_223D7A - compare_var_to_value VAR_0x409F, 2 + compare VAR_0x409F, 2 call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_223D9F end @@ -37,7 +37,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_27259A waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223E09 msgbox MossdeepCity_SpaceCenter_2F_Text_2243FE, 4 closemessage @@ -99,9 +99,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EB4 - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EBE - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223EB4 goto MossdeepCity_SpaceCenter_2F_EventScript_223EBE end @@ -121,9 +121,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223EC8:: @ 8223EC8 faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EEF - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223EF9 - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223EEF goto MossdeepCity_SpaceCenter_2F_EventScript_223EF9 end @@ -143,9 +143,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F03:: @ 8223F03 faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223F2A - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223F34 - compare_var_to_value VAR_0x405D, 2 + compare VAR_0x405D, 2 goto_if 0, MossdeepCity_SpaceCenter_2F_EventScript_223F2A goto MossdeepCity_SpaceCenter_2F_EventScript_223F34 end @@ -238,7 +238,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_27259E waitmovement 0 msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C msgbox MossdeepCity_SpaceCenter_2F_Text_224854, 4 closemessage @@ -254,7 +254,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C fadescreen 1 special sub_80F9438 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, MossdeepCity_SpaceCenter_2F_EventScript_224032 special copy_player_party_from_sav1 goto MossdeepCity_SpaceCenter_2F_EventScript_223FDA @@ -353,9 +353,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_224166:: @ 8224166 MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175 lockall checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_224193 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, MossdeepCity_SpaceCenter_2F_EventScript_22419A closemessage clearflag FLAG_0x075 diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index d0d71eb6b..918b186ec 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -14,7 +14,7 @@ MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E return MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8 - compare_var_to_value VAR_0x40C6, 2 + compare VAR_0x40C6, 2 call_if 1, MossdeepCity_StevensHouse_EventScript_2227B4 end @@ -74,7 +74,7 @@ MossdeepCity_StevensHouse_Movement_22283B: @ 822283B MossdeepCity_StevensHouse_EventScript_222841:: @ 8222841 lockall msgbox MossdeepCity_StevensHouse_Text_222B9E, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_StevensHouse_EventScript_22285B goto MossdeepCity_StevensHouse_EventScript_222865 end @@ -87,9 +87,9 @@ MossdeepCity_StevensHouse_EventScript_22285B:: @ 822285B MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865 setvar VAR_0x4001, 398 givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_StevensHouse_EventScript_222895 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MossdeepCity_StevensHouse_EventScript_2228BD goto MossdeepCity_StevensHouse_EventScript_273811 end @@ -97,7 +97,7 @@ MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865 MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 call MossdeepCity_StevensHouse_EventScript_2228EB msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_StevensHouse_EventScript_222901 call MossdeepCity_StevensHouse_EventScript_27378B call MossdeepCity_StevensHouse_EventScript_2723DD @@ -107,7 +107,7 @@ MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD call MossdeepCity_StevensHouse_EventScript_2228EB msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MossdeepCity_StevensHouse_EventScript_2228E0 call MossdeepCity_StevensHouse_EventScript_273797 goto MossdeepCity_StevensHouse_EventScript_2228E0 diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index d7a2ed83a..107cda58d 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -58,17 +58,17 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B fadescreen 0 setobjectxyperm 1, 10, 12 addobject 1 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, MtChimney_EventScript_22EEC7 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, MtChimney_EventScript_22EED2 applymovement 255, MtChimney_Movement_2725A4 waitmovement 0 msgbox MtChimney_Text_22FC3D, 4 closemessage - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, MtChimney_EventScript_22EEDD - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, MtChimney_EventScript_22EEE8 removeobject 1 setflag FLAG_0x39E @@ -104,17 +104,17 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3 faceplayer showmoneybox 0, 0, 0 msgbox MtChimney_Text_22FE04, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MtChimney_EventScript_22EF69 checkmoney 0xc8, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MtChimney_EventScript_22EF76 msgbox MtChimney_Text_22FE4D, 4 checkitemspace ITEM_LAVA_COOKIE, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, MtChimney_EventScript_22EF5E giveitem_std ITEM_LAVA_COOKIE - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MtChimney_EventScript_22EF51 hidemoneybox nop @@ -459,7 +459,7 @@ MtChimney_EventScript_22F0E4:: @ 822F0E4 checkflag FLAG_0x073 goto_eq MtChimney_EventScript_22F12D msgbox MtChimney_Text_22FF12, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MtChimney_EventScript_22F123 msgbox MtChimney_Text_22FF66, 4 giveitem_std ITEM_METEORITE @@ -488,8 +488,8 @@ MtChimney_EventScript_22F141:: @ 822F141 MtChimney_EventScript_22F14A:: @ 822F14A trainerbattle 2, TRAINER_SHELBY_1, 0, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq MtChimney_EventScript_22F195 msgbox MtChimney_Text_2300A2, 4 release @@ -533,8 +533,8 @@ MtChimney_EventScript_22F1F1:: @ 822F1F1 MtChimney_EventScript_22F208:: @ 822F208 trainerbattle 2, TRAINER_SAWYER_1, 0, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq MtChimney_EventScript_22F253 msgbox MtChimney_Text_230519, 4 release diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 338304ac0..06621451e 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -4,7 +4,7 @@ MtChimney_CableCarStation_MapScripts:: @ 822ABFA .byte 0 MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05 - compare_var_to_value VAR_0x40A3, 1 + compare VAR_0x40A3, 1 call_if 1, MtChimney_CableCarStation_EventScript_22AC11 end @@ -32,9 +32,9 @@ MtChimney_CableCarStation_EventScript_22AC4B:: @ 822AC4B lock faceplayer msgbox MtChimney_CableCarStation_Text_22ACB9, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MtChimney_CableCarStation_EventScript_22AC6C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MtChimney_CableCarStation_EventScript_22AC9B end diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc index 088290bd3..51c8a88fb 100644 --- a/data/scripts/maps/MtPyre_1F.inc +++ b/data/scripts/maps/MtPyre_1F.inc @@ -8,7 +8,7 @@ MtPyre_1F_EventScript_230F3F:: @ 8230F3F goto_eq MtPyre_1F_EventScript_230F6E msgbox MtPyre_1F_Text_230F8A, 4 giveitem_std ITEM_CLEANSE_TAG - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MtPyre_1F_EventScript_272054 setflag FLAG_0x11A release diff --git a/data/scripts/maps/MtPyre_3F.inc b/data/scripts/maps/MtPyre_3F.inc index ad99e6c9a..0d733a433 100644 --- a/data/scripts/maps/MtPyre_3F.inc +++ b/data/scripts/maps/MtPyre_3F.inc @@ -13,8 +13,8 @@ MtPyre_3F_EventScript_23176A:: @ 823176A MtPyre_3F_EventScript_231781:: @ 8231781 trainerbattle 2, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq MtPyre_3F_EventScript_2317CC msgbox MtPyre_3F_Text_23199B, 4 release diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/scripts/maps/MtPyre_6F.inc index 36a727daa..7a98eb2ab 100644 --- a/data/scripts/maps/MtPyre_6F.inc +++ b/data/scripts/maps/MtPyre_6F.inc @@ -3,8 +3,8 @@ MtPyre_6F_MapScripts:: @ 8231D3A MtPyre_6F_EventScript_231D3B:: @ 8231D3B trainerbattle 2, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq MtPyre_6F_EventScript_231D86 msgbox MtPyre_6F_Text_231DFC, 4 release diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc index e67c0e4f8..7142f1f06 100644 --- a/data/scripts/maps/MtPyre_Exterior.inc +++ b/data/scripts/maps/MtPyre_Exterior.inc @@ -8,7 +8,7 @@ MtPyre_Exterior_MapScript1_231FD2: @ 8231FD2 MtPyre_Exterior_EventScript_231FD8:: @ 8231FD8 getplayerxy VAR_0x4000, VAR_0x4001 - compare_var_to_value VAR_0x4001, 12 + compare VAR_0x4001, 12 goto_if 0, MtPyre_Exterior_EventScript_231FE9 return diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index c16a6c7a2..874c4122a 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -3,7 +3,7 @@ MtPyre_Summit_MapScripts:: @ 8231FF7 .byte 0 MtPyre_Summit_MapScript1_231FFD: @ 8231FFD - compare_var_to_value VAR_0x40B9, 2 + compare VAR_0x40B9, 2 call_if 1, MtPyre_Summit_EventScript_232009 end @@ -37,11 +37,11 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C applymovement 2, MtPyre_Summit_Movement_2725AA waitmovement 0 delay 50 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, MtPyre_Summit_EventScript_2320E0 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, MtPyre_Summit_EventScript_2320EB - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_2320EC msgbox MtPyre_Summit_Text_23281A, 4 closemessage @@ -57,11 +57,11 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C fadescreen 0 delay 20 setvar VAR_0x40B9, 1 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, MtPyre_Summit_EventScript_2320F7 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, MtPyre_Summit_EventScript_23210C - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_232117 msgbox MtPyre_Summit_Text_23290E, 4 giveitem_std ITEM_MAGMA_EMBLEM @@ -134,18 +134,18 @@ MtPyre_Summit_EventScript_23213C:: @ 823213C checkflag FLAG_0x09E goto_eq MtPyre_Summit_EventScript_232167 msgbox MtPyre_Summit_Text_232E0C, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, MtPyre_Summit_EventScript_232187 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, MtPyre_Summit_EventScript_232190 release end MtPyre_Summit_EventScript_232167:: @ 8232167 msgbox MtPyre_Summit_Text_2331A6, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, MtPyre_Summit_EventScript_232199 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, MtPyre_Summit_EventScript_232190 release end @@ -167,7 +167,7 @@ MtPyre_Summit_EventScript_2321A2:: @ 82321A2 faceplayer checkflag FLAG_0x103 goto_eq MtPyre_Summit_EventScript_2321E2 - compare_var_to_value VAR_0x40B9, 3 + compare VAR_0x40B9, 3 call_if 4, MtPyre_Summit_EventScript_2321CB checkflag FLAG_0x081 goto_eq MtPyre_Summit_EventScript_2321D8 @@ -213,11 +213,11 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 applymovement 255, MtPyre_Summit_Movement_2725A6 waitmovement 0 delay 60 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, MtPyre_Summit_EventScript_2322C4 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, MtPyre_Summit_EventScript_2322DD - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_2322F6 playse SE_PIN applymovement 8, MtPyre_Summit_Movement_272598 @@ -225,19 +225,19 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 applymovement 8, MtPyre_Summit_Movement_27259A waitmovement 0 delay 30 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, MtPyre_Summit_EventScript_23230F - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, MtPyre_Summit_EventScript_232328 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_232341 msgbox MtPyre_Summit_Text_233183, 4 closemessage - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, MtPyre_Summit_EventScript_23235A - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, MtPyre_Summit_EventScript_232376 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_232392 delay 30 applymovement 2, MtPyre_Summit_Movement_2323B6 diff --git a/data/scripts/maps/NavelRock_Bottom.inc b/data/scripts/maps/NavelRock_Bottom.inc index 055697d23..dc99ec7f7 100644 --- a/data/scripts/maps/NavelRock_Bottom.inc +++ b/data/scripts/maps/NavelRock_Bottom.inc @@ -27,7 +27,7 @@ NavelRock_Bottom_MapScript1_269284: @ 8269284 NavelRock_Bottom_EventScript_26928E:: @ 826928E specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, NavelRock_Bottom_EventScript_27374E removeobject 1 return @@ -61,15 +61,15 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2 setvar VAR_0x8006, 0 special DoScriptedWildBattle setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq NavelRock_Bottom_EventScript_269336 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq NavelRock_Bottom_EventScript_269344 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq NavelRock_Bottom_EventScript_269344 setflag FLAG_0x091 release diff --git a/data/scripts/maps/NavelRock_Harbor.inc b/data/scripts/maps/NavelRock_Harbor.inc index 111a8762a..c7acaf066 100644 --- a/data/scripts/maps/NavelRock_Harbor.inc +++ b/data/scripts/maps/NavelRock_Harbor.inc @@ -5,7 +5,7 @@ NavelRock_Harbor_EventScript_2690BD:: @ 82690BD lock faceplayer msgbox NavelRock_Harbor_Text_2C6CE6, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq NavelRock_Harbor_EventScript_269102 msgbox NavelRock_Harbor_Text_2A6A5D, 4 closemessage diff --git a/data/scripts/maps/NavelRock_Top.inc b/data/scripts/maps/NavelRock_Top.inc index 01c9a1523..af3586554 100644 --- a/data/scripts/maps/NavelRock_Top.inc +++ b/data/scripts/maps/NavelRock_Top.inc @@ -30,7 +30,7 @@ NavelRock_Top_MapScript1_269151: @ 8269151 NavelRock_Top_EventScript_26915B:: @ 826915B specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, NavelRock_Top_EventScript_27374E removeobject 1 return @@ -65,16 +65,16 @@ NavelRock_Top_EventScript_26916F:: @ 826916F setvar VAR_0x8006, 0 special DoScriptedWildBattle setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE setvar VAR_LAST_TALKED, 1 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq NavelRock_Top_EventScript_269217 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq NavelRock_Top_EventScript_269225 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq NavelRock_Top_EventScript_269225 setflag FLAG_0x092 releaseall diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index e752bbecb..9d13b5cf4 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -4,7 +4,7 @@ NewMauville_Entrance_MapScripts:: @ 82372AD .byte 0 NewMauville_Entrance_MapScript1_2372B8: @ 82372B8 - compare_var_to_value VAR_0x40BA, 0 + compare VAR_0x40BA, 0 call_if 1, NewMauville_Entrance_EventScript_2372C4 end @@ -27,10 +27,10 @@ NewMauville_Entrance_EventScript_2372FF:: @ 82372FF waitmovement 0 msgbox NewMauville_Entrance_Text_237382, 4 checkitem ITEM_BASEMENT_KEY, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq NewMauville_Entrance_EventScript_237380 msgbox NewMauville_Entrance_Text_237396, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq NewMauville_Entrance_EventScript_237380 msgbox NewMauville_Entrance_Text_2373AC, 4 setmetatile 3, 0, 707, 0 diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index b1bd0b114..301df7801 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -5,9 +5,9 @@ NewMauville_Inside_MapScripts:: @ 82373D7 .byte 0 NewMauville_Inside_MapScript1_2373E7: @ 82373E7 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, NewMauville_Inside_EventScript_237489 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 call_if 1, NewMauville_Inside_EventScript_2375D7 checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, NewMauville_Inside_EventScript_237407 @@ -15,7 +15,7 @@ NewMauville_Inside_MapScript1_2373E7: @ 82373E7 NewMauville_Inside_EventScript_237407:: @ 8237407 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, NewMauville_Inside_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -44,7 +44,7 @@ NewMauville_Inside_EventScript_237449:: @ 8237449 return NewMauville_Inside_MapScript1_23744D: @ 823744D - compare_var_to_value VAR_0x40BA, 2 + compare VAR_0x40BA, 2 call_if 1, NewMauville_Inside_EventScript_23773A end @@ -171,7 +171,7 @@ NewMauville_Inside_EventScript_23773A:: @ 823773A NewMauville_Inside_EventScript_23778F:: @ 823778F lockall - compare_var_to_value VAR_0x40BA, 2 + compare VAR_0x40BA, 2 goto_eq NewMauville_Inside_EventScript_2377A5 msgbox NewMauville_Inside_Text_237896, 4 releaseall @@ -194,11 +194,11 @@ NewMauville_Inside_EventScript_2377AF:: @ 82377AF dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq NewMauville_Inside_EventScript_2377F3 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq NewMauville_Inside_EventScript_2377F3 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq NewMauville_Inside_EventScript_2377F3 setflag FLAG_0x1C1 release @@ -221,11 +221,11 @@ NewMauville_Inside_EventScript_2377FC:: @ 82377FC dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq NewMauville_Inside_EventScript_237840 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq NewMauville_Inside_EventScript_237840 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq NewMauville_Inside_EventScript_237840 setflag FLAG_0x1C2 release @@ -248,11 +248,11 @@ NewMauville_Inside_EventScript_237849:: @ 8237849 dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq NewMauville_Inside_EventScript_23788D - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq NewMauville_Inside_EventScript_23788D - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq NewMauville_Inside_EventScript_23788D setflag FLAG_0x1C3 release diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index df1aeb595..d627a1632 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -76,7 +76,7 @@ OldaleTown_EventScript_1E8F75:: @ 81E8F75 OldaleTown_EventScript_1E8F8C:: @ 81E8F8C msgbox OldaleTown_Text_1E91FD, 4 giveitem_std ITEM_POTION - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_EventScript_1E8FC3 msgbox OldaleTown_Text_1E92AF, 4 setflag FLAG_0x084 @@ -261,9 +261,9 @@ OldaleTown_EventScript_1E90C6:: @ 81E90C6 OldaleTown_EventScript_1E90E6:: @ 81E90E6 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq OldaleTown_EventScript_1E90FE - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq OldaleTown_EventScript_1E910C end @@ -279,9 +279,9 @@ OldaleTown_EventScript_1E910C:: @ 81E910C OldaleTown_EventScript_1E911A:: @ 81E911A closemessage - compare_var_to_value VAR_0x8009, 0 + compare VAR_0x8009, 0 call_if 1, OldaleTown_EventScript_1E9148 - compare_var_to_value VAR_0x8009, 1 + compare VAR_0x8009, 1 call_if 1, OldaleTown_EventScript_1E915E applymovement 4, OldaleTown_Movement_1E9177 waitmovement 0 @@ -292,7 +292,7 @@ OldaleTown_EventScript_1E911A:: @ 81E911A end OldaleTown_EventScript_1E9148:: @ 81E9148 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 goto_if 5, OldaleTown_EventScript_1E915E applymovement 4, OldaleTown_Movement_1E9177 waitmovement 0 diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index d5c1573ae..bf671d01e 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -14,10 +14,10 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792 call_if 0, PacifidlogTown_House2_EventScript_203801 setflag FLAG_0x12C specialvar VAR_RESULT, sub_8138C04 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_if 4, PacifidlogTown_House2_EventScript_203816 specialvar VAR_RESULT, sub_8138C04 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_if 4, PacifidlogTown_House2_EventScript_203845 goto PacifidlogTown_House2_EventScript_20384F end @@ -26,7 +26,7 @@ PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE checkflag FLAG_0x12B goto_if 0, PacifidlogTown_House2_EventScript_27374E specialvar VAR_RESULT, sub_813970C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, PacifidlogTown_House2_EventScript_203812 return @@ -46,7 +46,7 @@ PacifidlogTown_House2_EventScript_203812:: @ 8203812 PacifidlogTown_House2_EventScript_203816:: @ 8203816 msgbox PacifidlogTown_House2_Text_20396D, 4 giveitem_std ITEM_TM27 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PacifidlogTown_House2_EventScript_272054 setflag FLAG_0x12B special sub_8139754 @@ -62,7 +62,7 @@ PacifidlogTown_House2_EventScript_203845:: @ 8203845 PacifidlogTown_House2_EventScript_20384F:: @ 820384F msgbox PacifidlogTown_House2_Text_203A2F, 4 giveitem_std ITEM_TM21 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PacifidlogTown_House2_EventScript_272054 setflag FLAG_0x12B special sub_8139754 diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index d66a2e3f8..98977b766 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -11,17 +11,17 @@ PacifidlogTown_House3_EventScript_203C11:: @ 8203C11 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT msgbox PacifidlogTown_House3_Text_203CBE, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PacifidlogTown_House3_EventScript_203C93 special sub_81B94B0 waitstate copyvar VAR_0x800A, VAR_0x8004 - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq PacifidlogTown_House3_EventScript_203C93 copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, sub_807E9D4 copyvar VAR_0x800B, VAR_RESULT - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if 5, PacifidlogTown_House3_EventScript_203C9D copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A diff --git a/data/scripts/maps/PacifidlogTown_House4.inc b/data/scripts/maps/PacifidlogTown_House4.inc index 48ed67c9e..a3e9cf0a4 100644 --- a/data/scripts/maps/PacifidlogTown_House4.inc +++ b/data/scripts/maps/PacifidlogTown_House4.inc @@ -13,9 +13,9 @@ PacifidlogTown_House4_EventScript_203F5E:: @ 8203F5E lock faceplayer msgbox PacifidlogTown_House4_Text_204035, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PacifidlogTown_House4_EventScript_203F7F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PacifidlogTown_House4_EventScript_203F89 end diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/scripts/maps/PacifidlogTown_House5.inc index 441b7fecd..aa02cc017 100644 --- a/data/scripts/maps/PacifidlogTown_House5.inc +++ b/data/scripts/maps/PacifidlogTown_House5.inc @@ -5,7 +5,7 @@ PacifidlogTown_House5_EventScript_204111:: @ 8204111 lock faceplayer specialvar VAR_RESULT, sub_813793C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PacifidlogTown_House5_EventScript_20412D msgbox PacifidlogTown_House5_Text_204140, 4 release diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index e223bf414..198c46cf1 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -1,12 +1,12 @@ PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7 setflag FLAG_VISITED_PETALBURG_CITY - compare_var_to_value VAR_0x4057, 0 + compare VAR_0x4057, 0 call_if 1, PetalburgCity_EventScript_1DC307 - compare_var_to_value VAR_0x4057, 2 + compare VAR_0x4057, 2 call_if 1, PetalburgCity_EventScript_1DC30F - compare_var_to_value VAR_0x4057, 4 + compare VAR_0x4057, 4 call_if 1, PetalburgCity_EventScript_1DC30F - compare_var_to_value VAR_0x4085, 8 + compare VAR_0x4085, 8 call_if 1, PetalburgCity_EventScript_1DC316 end @@ -36,11 +36,11 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E applymovement 255, PetalburgCity_Movement_1DC430 waitmovement 0 msgbox PetalburgCity_Text_1EC1F8, 4 - special sub_80B086C + special StartWallyTutorialBattle waitstate msgbox PetalburgCity_Text_1EC271, 4 - applymovementat 2, PetalburgCity_Movement_2725A4, PETALBURG_CITY - waitmovementat 2, PETALBURG_CITY + applymovement 2, PetalburgCity_Movement_2725A4, PETALBURG_CITY + waitmovement 2, PETALBURG_CITY msgbox PetalburgCity_Text_1EC297, 4 closemessage clearflag FLAG_SPECIAL_FLAG_0x4000 @@ -266,23 +266,23 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA waitmovement 0 applymovement 8, PetalburgCity_Movement_27259A waitmovement 0 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, PetalburgCity_EventScript_1DC57F - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_EventScript_1DC594 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_EventScript_1DC59F - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_EventScript_1DC5B4 msgbox PetalburgCity_Text_1DC881, 4 closemessage - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, PetalburgCity_EventScript_1DC5C9 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_EventScript_1DC5DB - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_EventScript_1DC5ED - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_EventScript_1DC5FF msgbox PetalburgCity_Text_1DC91B, 4 applymovement 8, PetalburgCity_Movement_2725A8 @@ -559,13 +559,13 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 delay 30 msgbox PetalburgCity_Text_1DCC09, 4 closemessage - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, PetalburgCity_EventScript_1DC78E - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_EventScript_1DC7A0 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_EventScript_1DC7B2 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_EventScript_1DC7C4 setvar VAR_0x40C9, 1 removeobject 9 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index e6cdd1334..5eb82c2be 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -6,9 +6,9 @@ PetalburgCity_Gym_MapScripts:: @ 8204889 .byte 0 PetalburgCity_Gym_MapScript1_20489E: @ 820489E - compare_var_to_value VAR_0x4085, 6 + compare VAR_0x4085, 6 goto_eq PetalburgCity_Gym_EventScript_2048B5 - compare_var_to_value VAR_0x4085, 7 + compare VAR_0x4085, 7 call_if 4, PetalburgCity_Gym_EventScript_2048FF end @@ -44,9 +44,9 @@ PetalburgCity_Gym_EventScript_2048FF:: @ 82048FF return PetalburgCity_Gym_MapScript1_20492D: @ 820492D - compare_var_to_value VAR_0x4085, 1 + compare VAR_0x4085, 1 call_if 1, PetalburgCity_Gym_EventScript_20494D - compare_var_to_value VAR_0x4085, 6 + compare VAR_0x4085, 6 call_if 0, PetalburgCity_Gym_EventScript_204955 checkflag FLAG_SYS_GAME_CLEAR call_if 1, PetalburgCity_Gym_EventScript_20495D @@ -62,10 +62,10 @@ PetalburgCity_Gym_EventScript_204955:: @ 8204955 PetalburgCity_Gym_EventScript_20495D:: @ 820495D setorcopyvar 0x8015, 269 - specialvar VAR_RESULT, sub_80B22A0 - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, IsTrainerReadyForRematch + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_204985 - compare_var_to_value VAR_0x4085, 8 + compare VAR_0x4085, 8 goto_eq PetalburgCity_Gym_EventScript_204985 setobjectxyperm 1, 4, 107 return @@ -155,65 +155,65 @@ PetalburgCity_Gym_EventScript_204AA1:: @ 8204AA1 PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC addobject 10 playse SE_DOOR - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204C31 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_204C43 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_204C5F - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204C5F msgbox PetalburgCity_Gym_Text_2058B1, 4 msgbox PetalburgCity_Gym_Text_2058DB, 4 msgbox PetalburgCity_Gym_Text_205910, 4 msgbox PetalburgCity_Gym_Text_2059D8, 4 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204CC7 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_204CD2 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_204CE4 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204CF6 msgbox PetalburgCity_Gym_Text_2059E8, 4 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204D08 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_204D13 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_204D1E - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204D29 msgbox PetalburgCity_Gym_Text_205A46, 4 msgbox PetalburgCity_Gym_Text_205A89, 4 msgbox PetalburgCity_Gym_Text_205AF4, 4 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204D72 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_204D73 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_204D7E - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204D7F - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204D34 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_204D3F - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_204D34 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204D34 msgbox PetalburgCity_Gym_Text_205B0F, 4 closemessage setflag FLAG_SPECIAL_FLAG_0x4001 playbgm BGM_TSURETEK, 0 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204C78 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_204C91 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_204CA3 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204CB5 removeobject 10 setflag FLAG_0x2D8 @@ -363,7 +363,7 @@ PetalburgCity_Gym_EventScript_204D7F:: @ 8204D7F PetalburgCity_Gym_EventScript_204D80:: @ 8204D80 call PetalburgCity_Gym_EventScript_204DCE - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_204E1D checkflag FLAG_0x0A9 goto_if 0, PetalburgCity_Gym_EventScript_204DAC @@ -385,15 +385,15 @@ PetalburgCity_Gym_EventScript_204DB3:: @ 8204DB3 PetalburgCity_Gym_EventScript_204DCE:: @ 8204DCE specialvar VAR_RESULT, IsEnigmaBerryValid - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_204E17 checkitem ITEM_ENIGMA_BERRY, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_204E17 checkpcitem ITEM_ENIGMA_BERRY, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_204E17 - compare_var_to_value VAR_0x402D, 0 + compare VAR_0x402D, 0 goto_eq PetalburgCity_Gym_EventScript_204E17 msgbox PetalburgCity_Gym_Text_2A6D3D, 4 setvar VAR_RESULT, 1 @@ -405,7 +405,7 @@ PetalburgCity_Gym_EventScript_204E17:: @ 8204E17 PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D giveitem_std ITEM_ENIGMA_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_272054 setvar VAR_0x402D, 0 release @@ -446,7 +446,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2 giveitem_std ITEM_TM42 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_27205E setflag FLAG_0x0A9 msgbox PetalburgCity_Gym_Text_206254, 4 @@ -473,30 +473,30 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 applymovement 11, PetalburgCity_Gym_Movement_27259A waitmovement 0 delay 10 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_204FED - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_205009 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_205025 msgbox PetalburgCity_Gym_Text_206377, 4 closemessage delay 20 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_204FCC - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_204FD7 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204FE2 msgbox PetalburgCity_Gym_Text_2063CA, 4 closemessage setflag FLAG_SPECIAL_FLAG_0x4001 playbgm BGM_TSURETEK, 0 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_205041 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_20505A - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_20506C removeobject 11 setvar VAR_0x4057, 4 @@ -786,14 +786,14 @@ PetalburgCity_Gym_EventScript_20512D:: @ 820512D PetalburgCity_Gym_EventScript_205137:: @ 8205137 lockall - compare_var_to_value VAR_0x4085, 6 + compare VAR_0x4085, 6 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 85 msgbox PetalburgCity_Gym_Text_20721E, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -816,14 +816,14 @@ PetalburgCity_Gym_EventScript_20517D:: @ 820517D PetalburgCity_Gym_EventScript_205187:: @ 8205187 lockall - compare_var_to_value VAR_0x4085, 6 + compare VAR_0x4085, 6 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 98 msgbox PetalburgCity_Gym_Text_207280, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -834,9 +834,9 @@ PetalburgCity_Gym_EventScript_2051BC:: @ 82051BC setvar VAR_0x8008, 7 setvar VAR_0x8009, 46 msgbox PetalburgCity_Gym_Text_2072BB, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -847,9 +847,9 @@ PetalburgCity_Gym_EventScript_2051EF:: @ 82051EF setvar VAR_0x8008, 1 setvar VAR_0x8009, 59 msgbox PetalburgCity_Gym_Text_2072F7, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -860,9 +860,9 @@ PetalburgCity_Gym_EventScript_205222:: @ 8205222 setvar VAR_0x8008, 7 setvar VAR_0x8009, 59 msgbox PetalburgCity_Gym_Text_2072F7, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -873,9 +873,9 @@ PetalburgCity_Gym_EventScript_205255:: @ 8205255 setvar VAR_0x8008, 1 setvar VAR_0x8009, 72 msgbox PetalburgCity_Gym_Text_207331, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -886,9 +886,9 @@ PetalburgCity_Gym_EventScript_205288:: @ 8205288 setvar VAR_0x8008, 1 setvar VAR_0x8009, 20 msgbox PetalburgCity_Gym_Text_20736C, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -899,9 +899,9 @@ PetalburgCity_Gym_EventScript_2052BB:: @ 82052BB setvar VAR_0x8008, 7 setvar VAR_0x8009, 20 msgbox PetalburgCity_Gym_Text_20736C, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -912,9 +912,9 @@ PetalburgCity_Gym_EventScript_2052EE:: @ 82052EE setvar VAR_0x8008, 1 setvar VAR_0x8009, 33 msgbox PetalburgCity_Gym_Text_2073A7, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -925,9 +925,9 @@ PetalburgCity_Gym_EventScript_205321:: @ 8205321 setvar VAR_0x8008, 7 setvar VAR_0x8009, 33 msgbox PetalburgCity_Gym_Text_2073A7, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -938,9 +938,9 @@ PetalburgCity_Gym_EventScript_205354:: @ 8205354 setvar VAR_0x8008, 1 setvar VAR_0x8009, 7 msgbox PetalburgCity_Gym_Text_2073E4, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -951,9 +951,9 @@ PetalburgCity_Gym_EventScript_205387:: @ 8205387 setvar VAR_0x8008, 7 setvar VAR_0x8009, 7 msgbox PetalburgCity_Gym_Text_2073E4, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_20517B end @@ -1085,72 +1085,72 @@ PetalburgCity_Gym_EventScript_205555:: @ 8205555 PetalburgCity_Gym_EventScript_20555E:: @ 820555E setvar VAR_0x8004, 1 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_205746 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_205666 return PetalburgCity_Gym_EventScript_20557F:: @ 820557F setvar VAR_0x8004, 2 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_205746 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_20568B return PetalburgCity_Gym_EventScript_2055A0:: @ 82055A0 setvar VAR_0x8004, 3 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_205746 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_2056B0 return PetalburgCity_Gym_EventScript_2055C1:: @ 82055C1 setvar VAR_0x8004, 4 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_205746 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_2056D5 return PetalburgCity_Gym_EventScript_2055E2:: @ 82055E2 setvar VAR_0x8004, 5 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_205746 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_2056E8 return PetalburgCity_Gym_EventScript_205603:: @ 8205603 setvar VAR_0x8004, 6 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_205746 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_20570D return PetalburgCity_Gym_EventScript_205624:: @ 8205624 setvar VAR_0x8004, 7 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_205746 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_205720 return PetalburgCity_Gym_EventScript_205645:: @ 8205645 setvar VAR_0x8004, 8 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_205746 - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_20574B call PetalburgCity_Gym_EventScript_205733 return diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 91ea469de..8d5d79d73 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -29,17 +29,17 @@ PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C faceplayer msgbox PetalburgCity_PokemonCenter_1F_Text_207B09, 4 specialvar VAR_RESULT, sub_81394D8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_PokemonCenter_1F_EventScript_207A38 release end PetalburgCity_PokemonCenter_1F_EventScript_207A38:: @ 8207A38 - compare_var_to_value VAR_FIRST_POKE, 0 + compare VAR_FIRST_POKE, 0 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A5B - compare_var_to_value VAR_FIRST_POKE, 1 + compare VAR_FIRST_POKE, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A64 - compare_var_to_value VAR_FIRST_POKE, 2 + compare VAR_FIRST_POKE, 2 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A6D release end diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index a6b018134..c70b3fc1c 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -89,7 +89,7 @@ PetalburgWoods_EventScript_22E138:: @ 822E138 waitmovement 0 msgbox PetalburgWoods_Text_22E63D, 4 giveitem_std ITEM_GREAT_BALL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgWoods_EventScript_22E17D goto PetalburgWoods_EventScript_22E18B end @@ -253,7 +253,7 @@ PetalburgWoods_EventScript_22E222:: @ 822E222 goto_eq PetalburgWoods_EventScript_22E251 msgbox PetalburgWoods_Text_22EAFE, 4 giveitem_std ITEM_MIRACLE_SEED - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgWoods_EventScript_272054 setflag FLAG_0x129 release @@ -279,12 +279,12 @@ PetalburgWoods_EventScript_22E26D:: @ 822E26D PetalburgWoods_EventScript_22E284:: @ 822E284 trainerbattle 2, TRAINER_JAMES_1, 0, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq PetalburgWoods_EventScript_22E31B setvar VAR_0x8004, 621 specialvar VAR_RESULT, sub_813B4E0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgWoods_EventScript_22E2EF msgbox PetalburgWoods_Text_22E889, 4 release @@ -293,7 +293,7 @@ PetalburgWoods_EventScript_22E284:: @ 822E284 PetalburgWoods_EventScript_22E2C5:: @ 822E2C5 special sub_80B4808 waitmovement 0 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq PetalburgWoods_EventScript_22E2D6 release end @@ -308,7 +308,7 @@ PetalburgWoods_EventScript_22E2D6:: @ 822E2D6 end PetalburgWoods_EventScript_22E2EF:: @ 822E2EF - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq PetalburgWoods_EventScript_22E302 msgbox PetalburgWoods_Text_22E889, 4 release diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 27c83f3d0..8ff9d5b55 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -225,12 +225,12 @@ Route101_EventScript_1EBE16:: @ 81EBE16 setobjectxy 255, 6, 13 applymovement 255, Route101_Movement_2725A4 waitmovement 0 - special sub_80B1138 + special ChooseStarter waitstate applymovement 2, Route101_Movement_1EBE8D waitmovement 0 msgbox Route101_Text_1EBF12, 4 - special sp000_heal_pokemon + special HealPlayerParty setflag FLAG_0x2D0 clearflag FLAG_0x2D1 setflag FLAG_0x2BC @@ -238,9 +238,9 @@ Route101_EventScript_1EBE16:: @ 81EBE16 setvar VAR_0x4060, 3 clearflag FLAG_SPECIAL_FLAG_0x4000 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route101_EventScript_1EBE85 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route101_EventScript_1EBE89 warp LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc index 00c8c309f..ae82ea0b4 100644 --- a/data/scripts/maps/Route102.inc +++ b/data/scripts/maps/Route102.inc @@ -19,12 +19,12 @@ Route102_EventScript_1EC0FC:: @ 81EC0FC Route102_EventScript_1EC105:: @ 81EC105 trainerbattle 2, TRAINER_CALVIN_1, 0, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route102_EventScript_1EC19C setvar VAR_0x8004, 318 specialvar VAR_RESULT, sub_813B4E0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route102_EventScript_1EC170 msgbox Route102_Text_2945AC, 4 release @@ -33,7 +33,7 @@ Route102_EventScript_1EC105:: @ 81EC105 Route102_EventScript_1EC146:: @ 81EC146 special sub_80B4808 waitmovement 0 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route102_EventScript_1EC157 release end @@ -48,7 +48,7 @@ Route102_EventScript_1EC157:: @ 81EC157 end Route102_EventScript_1EC170:: @ 81EC170 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route102_EventScript_1EC183 msgbox Route102_Text_2945AC, 4 release diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 4dd68204a..8493897b1 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -21,9 +21,9 @@ Route103_EventScript_1EC3AE:: @ 81EC3AE Route103_EventScript_1EC3C1:: @ 81EC3C1 lockall checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route103_EventScript_1EC3DA - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route103_EventScript_1EC434 end @@ -209,8 +209,8 @@ Route103_EventScript_1EC5F4:: @ 81EC5F4 Route103_EventScript_1EC60B:: @ 81EC60B trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route103_EventScript_1EC653 msgbox Route103_Text_294A52, 6 end @@ -231,8 +231,8 @@ Route103_EventScript_1EC653:: @ 81EC653 Route103_EventScript_1EC66E:: @ 81EC66E trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route103_EventScript_1EC6B6 msgbox Route103_Text_294B40, 6 end @@ -258,8 +258,8 @@ Route103_EventScript_1EC6D1:: @ 81EC6D1 Route103_EventScript_1EC6E8:: @ 81EC6E8 trainerbattle 2, TRAINER_MIGUEL_1, 0, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route103_EventScript_1EC733 msgbox Route103_Text_294F42, 4 release diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 8c4138f11..1fc3b89cc 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -31,7 +31,7 @@ Route104_EventScript_1ECC74:: @ 81ECC74 return Route104_EventScript_1ECC78:: @ 81ECC78 - compare_var_to_value VAR_0x408E, 1 + compare VAR_0x408E, 1 goto_if 4, Route104_EventScript_1ECC9D checkflag FLAG_0x120 goto_eq Route104_EventScript_1ECC9D @@ -76,9 +76,9 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 Route104_EventScript_1ECD11:: @ 81ECD11 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_EventScript_1ECD29 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECD2E return @@ -92,9 +92,9 @@ Route104_EventScript_1ECD2E:: @ 81ECD2E Route104_EventScript_1ECD33:: @ 81ECD33 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_EventScript_1ECD4B - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECE6F end @@ -122,7 +122,7 @@ Route104_EventScript_1ECD4B:: @ 81ECD4B waitmovement 0 moveobjectoffscreen 34 msgbox Route104_Text_1EDCED, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECDED msgbox Route104_Text_1EDD2A, 4 call Route104_EventScript_1ECE31 @@ -145,7 +145,7 @@ Route104_Movement_1ECDCD: @ 81ECDCD Route104_EventScript_1ECDD0:: @ 81ECDD0 msgbox Route104_Text_1EDD9F, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECDED msgbox Route104_Text_1EDD2A, 4 releaseall @@ -161,7 +161,7 @@ Route104_EventScript_1ECDED:: @ 81ECDED Route104_EventScript_1ECE1C:: @ 81ECE1C msgbox Route104_Text_1EDE3E, 4 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, Route104_EventScript_1ECE31 releaseall end @@ -213,7 +213,7 @@ Route104_EventScript_1ECE6F:: @ 81ECE6F waitmovement 0 moveobjectoffscreen 34 msgbox Route104_Text_1EE009, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECF09 msgbox Route104_Text_1EE04D, 4 call Route104_EventScript_1ECE31 @@ -222,7 +222,7 @@ Route104_EventScript_1ECE6F:: @ 81ECE6F Route104_EventScript_1ECEEC:: @ 81ECEEC msgbox Route104_Text_1EE094, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECF09 msgbox Route104_Text_1EE04D, 4 releaseall @@ -238,7 +238,7 @@ Route104_EventScript_1ECF09:: @ 81ECF09 Route104_EventScript_1ECF38:: @ 81ECF38 msgbox Route104_Text_1EE120, 4 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, Route104_EventScript_1ECE31 releaseall end @@ -278,7 +278,7 @@ Route104_EventScript_1ECF8C:: @ 81ECF8C goto_eq Route104_EventScript_1ECFC3 msgbox Route104_Text_2A6D86, 4 giveitem_std ITEM_CHESTO_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_EventScript_272054 setflag FLAG_0x0F6 msgbox Route104_Text_2A6E32, 4 @@ -297,7 +297,7 @@ Route104_EventScript_1ECFCD:: @ 81ECFCD goto_eq Route104_EventScript_1ECFFC msgbox Route104_Text_1ED96A, 4 giveitem_std ITEM_WHITE_HERB - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_EventScript_272054 setflag FLAG_0x117 release @@ -351,7 +351,7 @@ Route104_EventScript_1ED057:: @ 81ED057 goto_eq Route104_EventScript_1ED086 msgbox Route104_Text_1ED838, 4 giveitem_std ITEM_TM09 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_EventScript_272054 setflag FLAG_0x106 release @@ -402,8 +402,8 @@ Route104_EventScript_1ED0EF:: @ 81ED0EF delay 30 setflag FLAG_0x132 applymovement 255, Route104_Movement_1ED22A - applymovementat 7, Route104_Movement_1ED22A, ROUTE_104 - waitmovementat 7, ROUTE_104 + applymovement 7, Route104_Movement_1ED22A, ROUTE_104 + waitmovement 7, ROUTE_104 waitmovement 0 goto Route104_EventScript_1ED139 @@ -882,12 +882,12 @@ Route104_EventScript_1ED376:: @ 81ED376 Route104_EventScript_1ED38D:: @ 81ED38D trainerbattle 2, TRAINER_HALEY_1, 0, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ED424 setvar VAR_0x8004, 604 specialvar VAR_RESULT, sub_813B4E0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_EventScript_1ED3F8 msgbox Route104_Text_295689, 4 release @@ -896,7 +896,7 @@ Route104_EventScript_1ED38D:: @ 81ED38D Route104_EventScript_1ED3CE:: @ 81ED3CE special sub_80B4808 waitmovement 0 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED3DF release end @@ -911,7 +911,7 @@ Route104_EventScript_1ED3DF:: @ 81ED3DF end Route104_EventScript_1ED3F8:: @ 81ED3F8 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED40B msgbox Route104_Text_295689, 4 release @@ -933,12 +933,12 @@ Route104_EventScript_1ED424:: @ 81ED424 Route104_EventScript_1ED43B:: @ 81ED43B trainerbattle 2, TRAINER_WINSTON_1, 0, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ED4D2 setvar VAR_0x8004, 136 specialvar VAR_RESULT, sub_813B4E0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_EventScript_1ED4A6 msgbox Route104_Text_2958C1, 4 release @@ -947,7 +947,7 @@ Route104_EventScript_1ED43B:: @ 81ED43B Route104_EventScript_1ED47C:: @ 81ED47C special sub_80B4808 waitmovement 0 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED48D release end @@ -962,7 +962,7 @@ Route104_EventScript_1ED48D:: @ 81ED48D end Route104_EventScript_1ED4A6:: @ 81ED4A6 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED4B9 msgbox Route104_Text_2958C1, 4 release @@ -984,12 +984,12 @@ Route104_EventScript_1ED4D2:: @ 81ED4D2 Route104_EventScript_1ED4E9:: @ 81ED4E9 trainerbattle 2, TRAINER_CINDY_1, 0, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ED580 setvar VAR_0x8004, 114 specialvar VAR_RESULT, sub_813B4E0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_EventScript_1ED554 msgbox Route104_Text_295AC3, 4 release @@ -998,7 +998,7 @@ Route104_EventScript_1ED4E9:: @ 81ED4E9 Route104_EventScript_1ED52A:: @ 81ED52A special sub_80B4808 waitmovement 0 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED53B release end @@ -1013,7 +1013,7 @@ Route104_EventScript_1ED53B:: @ 81ED53B end Route104_EventScript_1ED554:: @ 81ED554 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED567 msgbox Route104_Text_295AC3, 4 release diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index f870ba0c8..2e901b5f4 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -4,7 +4,7 @@ Route104_MrBrineysHouse_MapScripts:: @ 8229D2E Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34 setflag FLAG_0x89D - compare_var_to_value VAR_0x4090, 1 + compare VAR_0x4090, 1 call_if 1, Route104_MrBrineysHouse_EventScript_229D50 checkflag FLAG_0x0BC call_if 1, Route104_MrBrineysHouse_EventScript_229D4C @@ -37,7 +37,7 @@ Route104_MrBrineysHouse_EventScript_229D8A:: @ 8229D8A setflag FLAG_0x093 msgbox Route104_MrBrineysHouse_Text_229E70, 4 msgbox Route104_MrBrineysHouse_Text_229E9B, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_MrBrineysHouse_EventScript_229E13 goto Route104_MrBrineysHouse_EventScript_229E27 end @@ -54,14 +54,14 @@ Route104_MrBrineysHouse_EventScript_229DAE:: @ 8229DAE Route104_MrBrineysHouse_EventScript_229DE1:: @ 8229DE1 msgbox Route104_MrBrineysHouse_Text_22A0AD, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_MrBrineysHouse_EventScript_229E13 goto Route104_MrBrineysHouse_EventScript_229E27 end Route104_MrBrineysHouse_EventScript_229DFA:: @ 8229DFA msgbox Route104_MrBrineysHouse_Text_22A18F, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_MrBrineysHouse_EventScript_229E13 goto Route104_MrBrineysHouse_EventScript_229E27 end diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 755612b6c..3b7dcf601 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -25,18 +25,18 @@ Route104_PrettyPetalFlowerShop_EventScript_22A373:: @ 822A373 goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A3B2 setflag FLAG_0x07F msgbox Route104_PrettyPetalFlowerShop_Text_2A7706, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3D2 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3DB release end Route104_PrettyPetalFlowerShop_EventScript_22A3B2:: @ 822A3B2 msgbox Route104_PrettyPetalFlowerShop_Text_2A76D9, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3D2 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3DB release end @@ -96,7 +96,7 @@ Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442 random 8 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route104_PrettyPetalFlowerShop_EventScript_272054 setflag FLAG_0x930 msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, 4 diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc index 72b35e7b0..32c6826af 100644 --- a/data/scripts/maps/Route105.inc +++ b/data/scripts/maps/Route105.inc @@ -7,9 +7,9 @@ Route105_MapScripts:: @ 81EE1DB Route105_MapScript1_1EE1EB: @ 81EE1EB checkflag FLAG_0x0E4 call_if 0, Route105_EventScript_1EE20B - compare_var_to_value VAR_0x4037, 9 + compare VAR_0x4037, 9 call_if 1, Route105_EventScript_2739AB - compare_var_to_value VAR_0x4037, 10 + compare VAR_0x4037, 10 call_if 1, Route105_EventScript_273A18 end @@ -19,11 +19,11 @@ Route105_EventScript_1EE20B:: @ 81EE20B return Route105_MapScript1_1EE21E: @ 81EE21E - compare_var_to_value VAR_0x4039, 1 + compare VAR_0x4039, 1 call_if 1, Route105_EventScript_273D13 - compare_var_to_value VAR_0x4037, 9 + compare VAR_0x4037, 9 call_if 1, Route105_EventScript_273D17 - compare_var_to_value VAR_0x4037, 10 + compare VAR_0x4037, 10 call_if 1, Route105_EventScript_273D17 end @@ -63,8 +63,8 @@ Route105_EventScript_1EE2BD:: @ 81EE2BD Route105_EventScript_1EE2D4:: @ 81EE2D4 trainerbattle 2, TRAINER_ANDRES_1, 0, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route105_EventScript_1EE31F msgbox Route105_Text_2960FA, 4 release diff --git a/data/scripts/maps/Route106.inc b/data/scripts/maps/Route106.inc index 3bb5e27e7..132621cb8 100644 --- a/data/scripts/maps/Route106.inc +++ b/data/scripts/maps/Route106.inc @@ -17,8 +17,8 @@ Route106_EventScript_1EE4AA:: @ 81EE4AA Route106_EventScript_1EE4C1:: @ 81EE4C1 trainerbattle 2, TRAINER_ELLIOT_1, 0, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route106_EventScript_1EE50C msgbox Route106_Text_29638C, 4 release diff --git a/data/scripts/maps/Route107.inc b/data/scripts/maps/Route107.inc index 736eaa8ee..b7d144ef2 100644 --- a/data/scripts/maps/Route107.inc +++ b/data/scripts/maps/Route107.inc @@ -8,8 +8,8 @@ Route107_EventScript_1EE595:: @ 81EE595 Route107_EventScript_1EE5AC:: @ 81EE5AC trainerbattle 2, TRAINER_TONY_1, 0, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route107_EventScript_1EE5F7 msgbox Route107_Text_2967FF, 4 release diff --git a/data/scripts/maps/Route108.inc b/data/scripts/maps/Route108.inc index d88f63ca1..e77006508 100644 --- a/data/scripts/maps/Route108.inc +++ b/data/scripts/maps/Route108.inc @@ -28,8 +28,8 @@ Route108_EventScript_1EE6E6:: @ 81EE6E6 Route108_EventScript_1EE6FD:: @ 81EE6FD trainerbattle 2, TRAINER_CORY_1, 0, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route108_EventScript_1EE748 msgbox Route108_Text_296FB0, 4 release diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 4cdd835ff..b8503593d 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -280,7 +280,7 @@ Route109_EventScript_1EE910:: @ 81EE910 Route109_EventScript_1EE921:: @ 81EE921 message Route109_Text_1EEC96 msgbox Route109_Text_1EEC96, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route109_EventScript_1EE981 goto Route109_EventScript_1EE972 end @@ -333,7 +333,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 goto_eq Route109_EventScript_1EE9F2 msgbox Route109_Text_1EEFDE, 4 giveitem_std ITEM_SOFT_SAND - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route109_EventScript_272054 closemessage applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 @@ -397,8 +397,8 @@ Route109_EventScript_1EEA82:: @ 81EEA82 Route109_EventScript_1EEA99:: @ 81EEA99 trainerbattle 2, TRAINER_RICKY_1, 0, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route109_EventScript_1EEAE4 msgbox Route109_Text_297380, 4 release @@ -422,8 +422,8 @@ Route109_EventScript_1EEAE4:: @ 81EEAE4 Route109_EventScript_1EEAFB:: @ 81EEAFB trainerbattle 2, TRAINER_LOLA_1, 0, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route109_EventScript_1EEB46 msgbox Route109_Text_2974D6, 4 release diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 6a1c487fe..90113bd5b 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -28,7 +28,7 @@ Route109_SeashoreHouse_EventScript_269428:: @ 8269428 Route109_SeashoreHouse_EventScript_269432:: @ 8269432 msgbox Route109_SeashoreHouse_Text_269685, 4 giveitem_std ITEM_SODA_POP, 6 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route109_SeashoreHouse_EventScript_269456 setflag FLAG_0x08C release @@ -42,7 +42,7 @@ Route109_SeashoreHouse_EventScript_269456:: @ 8269456 Route109_SeashoreHouse_EventScript_269460:: @ 8269460 showmoneybox 0, 0, 0 msgbox Route109_SeashoreHouse_Text_26977E, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route109_SeashoreHouse_EventScript_269484 msgbox Route109_SeashoreHouse_Text_2697EF, 4 hidemoneybox @@ -53,10 +53,10 @@ Route109_SeashoreHouse_EventScript_269460:: @ 8269460 Route109_SeashoreHouse_EventScript_269484:: @ 8269484 checkmoney 0x12c, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route109_SeashoreHouse_EventScript_2694C8 checkitemspace ITEM_SODA_POP, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route109_SeashoreHouse_EventScript_2694D5 msgbox Route109_SeashoreHouse_Text_2697C8, 4 takemoney 0x12c, 0 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 0fa78b385..39a4c57d4 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -11,7 +11,7 @@ Route110_MapScript1_1EF279: @ 81EF279 Route110_MapScript1_1EF27D: @ 81EF27D call Route110_EventScript_271ED7 call Route110_EventScript_271EFB - compare_var_to_value VAR_0x40A9, 1 + compare VAR_0x40A9, 1 call_if 1, Route110_EventScript_1EF293 end @@ -131,7 +131,7 @@ Route110_EventScript_1EF389:: @ 81EF389 Route110_EventScript_1EF392:: @ 81EF392 lockall specialvar VAR_RESULT, sub_8137EFC - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route110_EventScript_1EF3AD msgbox Route110_Text_1F0A1E, 4 releaseall @@ -146,9 +146,9 @@ Route110_EventScript_1EF3B7:: @ 81EF3B7 lock faceplayer specialvar VAR_RESULT, sp0E3_walkrun_bitfield_interpretation - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF3E8 - compare_var_to_value VAR_0x40A9, 0 + compare VAR_0x40A9, 0 goto_eq Route110_EventScript_1EF3DE msgbox Route110_Text_1F06FB, 4 release @@ -176,8 +176,8 @@ Route110_EventScript_1EF409:: @ 81EF409 Route110_EventScript_1EF420:: @ 81EF420 trainerbattle 2, TRAINER_EDWIN_1, 0, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF46B msgbox Route110_Text_2981B3, 4 release @@ -216,8 +216,8 @@ Route110_EventScript_1EF4B0:: @ 81EF4B0 Route110_EventScript_1EF4C7:: @ 81EF4C7 trainerbattle 2, TRAINER_BENJAMIN_1, 0, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF512 msgbox Route110_Text_297CB4, 4 release @@ -246,8 +246,8 @@ Route110_EventScript_1EF529:: @ 81EF529 Route110_EventScript_1EF540:: @ 81EF540 trainerbattle 2, TRAINER_ABIGAIL_1, 0, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF58B msgbox Route110_Text_297E88, 4 release @@ -271,8 +271,8 @@ Route110_EventScript_1EF58B:: @ 81EF58B Route110_EventScript_1EF5A2:: @ 81EF5A2 trainerbattle 2, TRAINER_ISABEL_1, 0, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF5ED msgbox Route110_Text_2983A2, 4 release @@ -391,9 +391,9 @@ Route110_EventScript_1EF763:: @ 81EF763 Route110_EventScript_1EF76E:: @ 81EF76E lockall checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_EventScript_1EF7E1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route110_EventScript_1EF7E6 applymovement 28, Route110_Movement_2725AA waitmovement 0 @@ -402,16 +402,16 @@ Route110_EventScript_1EF76E:: @ 81EF76E applymovement 28, Route110_Movement_27259A waitmovement 0 delay 30 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, Route110_EventScript_1EF94E - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, Route110_EventScript_1EF959 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, Route110_EventScript_1EF964 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route110_EventScript_1EF7EB - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF865 releaseall end @@ -490,22 +490,22 @@ Route110_EventScript_1EF8DF:: @ 81EF8DF Route110_EventScript_1EF8EC:: @ 81EF8EC closemessage - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, Route110_EventScript_1EF990 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, Route110_EventScript_1EF998 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, Route110_EventScript_1EF9A0 setobjectmovementtype 28, 10 setobjectmovementtype 29, 10 removeobject 28 addobject 29 delay 45 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, Route110_EventScript_1EF96F - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, Route110_EventScript_1EF97A - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, Route110_EventScript_1EF985 removeobject 29 setvar VAR_0x4069, 1 @@ -632,13 +632,13 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 waitmovement 0 applymovement 36, Route110_Movement_27259A waitmovement 0 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, Route110_EventScript_1EFAD8 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, Route110_EventScript_1EFAE3 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, Route110_EventScript_1EFAEE - compare_var_to_value VAR_0x8008, 4 + compare VAR_0x8008, 4 call_if 1, Route110_EventScript_1EFAF9 msgbox Route110_Text_1F0AB5, 4 closemessage @@ -663,13 +663,13 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 setflag FLAG_0x119 msgbox Route110_Text_1F0C33, 4 closemessage - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, Route110_EventScript_1EFB04 - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, Route110_EventScript_1EFB0F - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, Route110_EventScript_1EFB1A - compare_var_to_value VAR_0x8008, 4 + compare VAR_0x8008, 4 call_if 1, Route110_EventScript_1EFB25 removeobject 36 setvar VAR_0x40DA, 2 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc index 2ea2092d5..8772f96b8 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc @@ -11,7 +11,7 @@ Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78:: @ 826EA78 Route110_SeasideCyclingRoadEntrance1_EventScript_26EA84:: @ 826EA84 lockall specialvar VAR_RESULT, sp0E3_walkrun_bitfield_interpretation - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route110_SeasideCyclingRoadEntrance1_EventScript_26EA9F setflag FLAG_SYS_CYCLING_ROAD setvar VAR_0x4001, 1 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc index 92ef38d9a..ca7f558a8 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc @@ -3,9 +3,9 @@ Route110_SeasideCyclingRoadEntrance2_MapScripts:: @ 826EBA1 .byte 0 Route110_SeasideCyclingRoadEntrance2_MapScript1_26EBA7: @ 826EBA7 - compare_var_to_value VAR_0x40A9, 3 + compare VAR_0x40A9, 3 call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBBE - compare_var_to_value VAR_0x40A9, 2 + compare VAR_0x40A9, 2 call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBBE end @@ -23,9 +23,9 @@ Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4:: @ 826EBC4 Route110_SeasideCyclingRoadEntrance2_EventScript_26EBD0:: @ 826EBD0 lockall specialvar VAR_RESULT, sp0E3_walkrun_bitfield_interpretation - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBF6 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route110_SeasideCyclingRoadEntrance2_EventScript_26EBFC setflag FLAG_SYS_CYCLING_ROAD setvar VAR_0x4001, 1 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 17fe81ad5..cafa9c827 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -6,7 +6,7 @@ Route110_TrickHouseEnd_MapScripts:: @ 826ACAF .byte 0 Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, Route110_TrickHouseEnd_EventScript_26AD0D end @@ -61,7 +61,7 @@ Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84 msgbox Route110_TrickHouseEnd_Text_26B73D, 4 setvar VAR_0x40C1, 0 giveitem_std ITEM_RARE_CANDY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 closemessage @@ -74,7 +74,7 @@ Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0 msgbox Route110_TrickHouseEnd_Text_26B73D, 4 setvar VAR_0x40C1, 0 giveitem_std ITEM_TIMER_BALL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 closemessage @@ -87,7 +87,7 @@ Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC msgbox Route110_TrickHouseEnd_Text_26B73D, 4 setvar VAR_0x40C1, 0 giveitem_std ITEM_HARD_STONE - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 closemessage @@ -100,7 +100,7 @@ Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38 msgbox Route110_TrickHouseEnd_Text_26B73D, 4 setvar VAR_0x40C1, 0 giveitem_std ITEM_SMOKE_BALL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 closemessage @@ -113,7 +113,7 @@ Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74 msgbox Route110_TrickHouseEnd_Text_26B73D, 4 setvar VAR_0x40C1, 0 giveitem_std ITEM_TM12 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 closemessage @@ -126,7 +126,7 @@ Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0 msgbox Route110_TrickHouseEnd_Text_26B73D, 4 setvar VAR_0x40C1, 0 giveitem_std ITEM_MAGNET - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 closemessage @@ -139,7 +139,7 @@ Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC msgbox Route110_TrickHouseEnd_Text_26B73D, 4 setvar VAR_0x40C1, 0 giveitem_std ITEM_PP_MAX - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 closemessage @@ -150,13 +150,13 @@ Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 msgbox Route110_TrickHouseEnd_Text_26B3AB, 4 closemessage - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, Route110_TrickHouseEnd_EventScript_26B015 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, Route110_TrickHouseEnd_EventScript_26B020 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, Route110_TrickHouseEnd_EventScript_26B02B - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, Route110_TrickHouseEnd_EventScript_26B036 delay 30 msgbox Route110_TrickHouseEnd_Text_26B3FA, 4 @@ -167,7 +167,7 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 msgbox Route110_TrickHouseEnd_Text_26B485, 4 setvar VAR_0x40C1, 0 call Route110_TrickHouseEnd_EventScript_26AFA5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26B002 msgbox Route110_TrickHouseEnd_Text_26B69A, 4 call Route110_TrickHouseEnd_EventScript_26AFCF diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index b7b9453e3..f71a6a097 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -6,17 +6,17 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8269A50 Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 setflag FLAG_0x8A2 - compare_var_to_value VAR_0x40B5, 1 + compare VAR_0x40B5, 1 goto_eq Route110_TrickHouseEntrance_EventScript_269AF3 - compare_var_to_value VAR_0x40C1, 1 + compare VAR_0x40C1, 1 goto_eq Route110_TrickHouseEntrance_EventScript_269AD7 - compare_var_to_value VAR_0x40A6, 1 + compare VAR_0x40A6, 1 goto_eq Route110_TrickHouseEntrance_EventScript_269BB3 - compare_var_to_value VAR_0x40A7, 5 + compare VAR_0x40A7, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 - compare_var_to_value VAR_0x40A7, 3 + compare VAR_0x40A7, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 - compare_var_to_value VAR_0x40A7, 0 + compare VAR_0x40A7, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_269B03 switch VAR_0x40A7 case 0, Route110_TrickHouseEntrance_EventScript_269BBB @@ -27,7 +27,7 @@ Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60 Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7 setvar VAR_0x40A5, 1 - compare_var_to_value VAR_0x4044, 8 + compare VAR_0x4044, 8 goto_eq Route110_TrickHouseEntrance_EventScript_269AED setvar VAR_0x40A7, 2 end @@ -44,21 +44,21 @@ Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3 Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03 setvar VAR_0x40A7, 0 - compare_var_to_value VAR_0x4044, 1 + compare VAR_0x4044, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_269B61 - compare_var_to_value VAR_0x4044, 2 + compare VAR_0x4044, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_269B6B - compare_var_to_value VAR_0x4044, 3 + compare VAR_0x4044, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_269B75 - compare_var_to_value VAR_0x4044, 4 + compare VAR_0x4044, 4 call_if 1, Route110_TrickHouseEntrance_EventScript_269B7F - compare_var_to_value VAR_0x4044, 5 + compare VAR_0x4044, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_269B89 - compare_var_to_value VAR_0x4044, 6 + compare VAR_0x4044, 6 call_if 1, Route110_TrickHouseEntrance_EventScript_269B93 - compare_var_to_value VAR_0x4044, 7 + compare VAR_0x4044, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_269B9D - compare_var_to_value VAR_0x4044, 8 + compare VAR_0x4044, 8 call_if 1, Route110_TrickHouseEntrance_EventScript_269BA7 return @@ -212,7 +212,7 @@ Route110_TrickHouseEntrance_MapScript2_269CEE: @ 8269CEE Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8 lockall delay 20 - compare_var_to_value VAR_0x4044, 0 + compare VAR_0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_269E48 msgbox Route110_TrickHouseEntrance_Text_26A78C, 4 closemessage @@ -247,21 +247,21 @@ Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E waitmovement 0 applymovement 255, Route110_TrickHouseEntrance_Movement_27259A waitmovement 0 - compare_var_to_value VAR_0x4044, 0 + compare VAR_0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_269DEE - compare_var_to_value VAR_0x4044, 1 + compare VAR_0x4044, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_269DF7 - compare_var_to_value VAR_0x4044, 2 + compare VAR_0x4044, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_269E00 - compare_var_to_value VAR_0x4044, 3 + compare VAR_0x4044, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_269E09 - compare_var_to_value VAR_0x4044, 4 + compare VAR_0x4044, 4 call_if 1, Route110_TrickHouseEntrance_EventScript_269E12 - compare_var_to_value VAR_0x4044, 5 + compare VAR_0x4044, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_269E1B - compare_var_to_value VAR_0x4044, 6 + compare VAR_0x4044, 6 call_if 1, Route110_TrickHouseEntrance_EventScript_269E24 - compare_var_to_value VAR_0x4044, 7 + compare VAR_0x4044, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_269E2D closemessage setvar VAR_0x40A6, 1 @@ -350,27 +350,27 @@ Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F applymovement 1, Route110_TrickHouseEntrance_Movement_27259E waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26AA82, 4 - compare_var_to_value VAR_0x4044, 1 + compare VAR_0x4044, 1 goto_eq Route110_TrickHouseEntrance_EventScript_269EEF - compare_var_to_value VAR_0x4044, 2 + compare VAR_0x4044, 2 goto_eq Route110_TrickHouseEntrance_EventScript_269F1B - compare_var_to_value VAR_0x4044, 3 + compare VAR_0x4044, 3 goto_eq Route110_TrickHouseEntrance_EventScript_269F47 - compare_var_to_value VAR_0x4044, 4 + compare VAR_0x4044, 4 goto_eq Route110_TrickHouseEntrance_EventScript_269F73 - compare_var_to_value VAR_0x4044, 5 + compare VAR_0x4044, 5 goto_eq Route110_TrickHouseEntrance_EventScript_269F9F - compare_var_to_value VAR_0x4044, 6 + compare VAR_0x4044, 6 goto_eq Route110_TrickHouseEntrance_EventScript_269FCB - compare_var_to_value VAR_0x4044, 7 + compare VAR_0x4044, 7 goto_eq Route110_TrickHouseEntrance_EventScript_269FF7 end Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF giveitem_std ITEM_RARE_CANDY - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 releaseall @@ -378,9 +378,9 @@ Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B giveitem_std ITEM_TIMER_BALL - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 releaseall @@ -388,9 +388,9 @@ Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47 giveitem_std ITEM_HARD_STONE - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 releaseall @@ -398,9 +398,9 @@ Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47 Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73 giveitem_std ITEM_SMOKE_BALL - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 releaseall @@ -408,9 +408,9 @@ Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73 Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F giveitem_std ITEM_TM12 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 releaseall @@ -418,9 +418,9 @@ Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB giveitem_std ITEM_MAGNET - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 releaseall @@ -428,9 +428,9 @@ Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 giveitem_std ITEM_PP_MAX - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 releaseall @@ -449,9 +449,9 @@ Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_26AB2C, 4 call Route110_TrickHouseEntrance_EventScript_26A070 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A09A - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_272071 msgbox Route110_TrickHouseEntrance_Text_26ABBD, 4 releaseall @@ -504,7 +504,7 @@ Route110_TrickHouseEntrance_EventScript_26A106:: @ 826A106 Route110_TrickHouseEntrance_EventScript_26A110:: @ 826A110 msgbox Route110_TrickHouseEntrance_Text_26A887, 5 closemessage - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A126 releaseall end @@ -586,7 +586,7 @@ Route110_TrickHouseEntrance_EventScript_26A201:: @ 826A201 end Route110_TrickHouseEntrance_EventScript_26A20B:: @ 826A20B - compare_var_to_value VAR_0x4044, 8 + compare VAR_0x4044, 8 goto_eq Route110_TrickHouseEntrance_EventScript_26A220 msgbox Route110_TrickHouseEntrance_Text_26A878, 4 releaseall @@ -611,7 +611,7 @@ Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A end Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 - compare_var_to_value VAR_0x40AB, 0 + compare VAR_0x40AB, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle1_Text_26B98D, 4 playse SE_PIN @@ -622,7 +622,7 @@ Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 end Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 - compare_var_to_value VAR_0x40AC, 0 + compare VAR_0x40AC, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle2_Text_26BCBA, 4 playse SE_PIN @@ -633,7 +633,7 @@ Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 end Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB - compare_var_to_value VAR_0x40AD, 0 + compare VAR_0x40AD, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle3_Text_26C609, 4 playse SE_PIN @@ -644,7 +644,7 @@ Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB end Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 - compare_var_to_value VAR_0x40AE, 0 + compare VAR_0x40AE, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle4_Text_26C8C3, 4 playse SE_PIN @@ -655,7 +655,7 @@ Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 end Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D - compare_var_to_value VAR_0x40AF, 0 + compare VAR_0x40AF, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle5_Text_26D660, 4 playse SE_PIN @@ -666,7 +666,7 @@ Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D end Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 - compare_var_to_value VAR_0x40B0, 0 + compare VAR_0x40B0, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle6_Text_26DE26, 4 playse SE_PIN @@ -677,7 +677,7 @@ Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 end Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F - compare_var_to_value VAR_0x40B1, 0 + compare VAR_0x40B1, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle7_EventScript_26E413, 4 playse SE_PIN @@ -688,7 +688,7 @@ Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F end Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8 - compare_var_to_value VAR_0x40B2, 0 + compare VAR_0x40B2, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 msgbox Route110_TrickHousePuzzle8_EventScript_26E864, 4 playse SE_PIN @@ -734,11 +734,11 @@ Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8 lockall msgbox Route110_TrickHouseEntrance_Text_26A474, 4 releaseall - compare_var_to_value VAR_0x4044, 0 + compare VAR_0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_26A429 - compare_var_to_value VAR_0x4044, 1 + compare VAR_0x4044, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_26A439 - compare_var_to_value VAR_0x4044, 2 + compare VAR_0x4044, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_26A449 setvar VAR_0x40A5, 1 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/scripts/maps/Route110_TrickHousePuzzle1.inc index 97db16860..340a7e03c 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle1.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 826B90F .byte 0 Route110_TrickHousePuzzle1_MapScript1_26B915: @ 826B915 - compare_var_to_value VAR_0x40AB, 2 + compare VAR_0x40AB, 2 goto_eq Route110_TrickHousePuzzle1_EventScript_26B921 end @@ -13,7 +13,7 @@ Route110_TrickHousePuzzle1_EventScript_26B921:: @ 826B921 Route110_TrickHousePuzzle1_EventScript_26B92B:: @ 826B92B lockall - compare_var_to_value VAR_0x40AB, 0 + compare VAR_0x40AB, 0 goto_eq Route110_TrickHousePuzzle1_EventScript_26B93D goto Route110_TrickHousePuzzle1_EventScript_26A3DB end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index d7981a534..fd8c42f84 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -4,13 +4,13 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 826BB73 .byte 0 Route110_TrickHousePuzzle2_MapScript1_26BB7E: @ 826BB7E - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC29 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC3C - compare_var_to_value VAR_0x4003, 1 + compare VAR_0x4003, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC4F - compare_var_to_value VAR_0x4004, 1 + compare VAR_0x4004, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_26BC62 end @@ -23,7 +23,7 @@ Route110_TrickHousePuzzle2_MapScript1_26BBAB: @ 826BBAB Route110_TrickHousePuzzle2_EventScript_26BBC0:: @ 826BBC0 lockall - compare_var_to_value VAR_0x40AC, 0 + compare VAR_0x40AC, 0 goto_eq Route110_TrickHousePuzzle2_EventScript_26BBD2 goto Route110_TrickHousePuzzle2_EventScript_26A3DB end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index a8c62db41..b5302e551 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -5,9 +5,9 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 826BED8 Route110_TrickHousePuzzle3_MapScript1_26BEE3: @ 826BEE3 call Route110_TrickHousePuzzle3_EventScript_26BF1E - compare_var_to_value VAR_0x4009, 0 + compare VAR_0x4009, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF97 - compare_var_to_value VAR_0x4009, 1 + compare VAR_0x4009, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_26C232 end @@ -25,13 +25,13 @@ Route110_TrickHousePuzzle3_EventScript_26BF1E:: @ 826BF1E setmetatile 3, 11, 600, 0 setmetatile 12, 5, 600, 0 setmetatile 8, 2, 600, 0 - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF6F - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF79 - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF83 - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF8D return @@ -241,13 +241,13 @@ Route110_TrickHousePuzzle3_EventScript_26C510:: @ 826C510 setvar VAR_0x4002, 0 setvar VAR_0x4003, 0 setvar VAR_0x4004, 0 - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_26C551 - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_26C557 - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_26C55D - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_26C563 return @@ -268,14 +268,14 @@ Route110_TrickHousePuzzle3_EventScript_26C563:: @ 826C563 return Route110_TrickHousePuzzle3_EventScript_26C569:: @ 826C569 - compare_var_to_value VAR_0x4009, 1 + compare VAR_0x4009, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_26BF97 - compare_var_to_value VAR_0x4009, 0 + compare VAR_0x4009, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_26C232 special DrawWholeMapView - compare_var_to_value VAR_0x4009, 1 + compare VAR_0x4009, 1 goto_eq Route110_TrickHousePuzzle3_EventScript_26C599 - compare_var_to_value VAR_0x4009, 0 + compare VAR_0x4009, 0 goto_eq Route110_TrickHousePuzzle3_EventScript_26C5A0 end @@ -291,7 +291,7 @@ Route110_TrickHousePuzzle3_EventScript_26C5A0:: @ 826C5A0 Route110_TrickHousePuzzle3_EventScript_26C5A7:: @ 826C5A7 lockall - compare_var_to_value VAR_0x40AD, 0 + compare VAR_0x40AD, 0 goto_eq Route110_TrickHousePuzzle3_EventScript_26C5B9 goto Route110_TrickHousePuzzle3_EventScript_26A3DB end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/scripts/maps/Route110_TrickHousePuzzle4.inc index 9b2e2e57f..56b4b02fb 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle4.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle4.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 826C860 Route110_TrickHousePuzzle4_EventScript_26C861:: @ 826C861 lockall - compare_var_to_value VAR_0x40AE, 0 + compare VAR_0x40AE, 0 goto_eq Route110_TrickHousePuzzle4_EventScript_26C873 goto Route110_TrickHousePuzzle4_EventScript_26A3DB end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 5f90e7f1d..5e14d3add 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -13,7 +13,7 @@ Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6 Route110_TrickHousePuzzle5_EventScript_26CB15:: @ 826CB15 lockall - compare_var_to_value VAR_0x40AF, 0 + compare VAR_0x40AF, 0 goto_eq Route110_TrickHousePuzzle5_EventScript_26CB27 goto Route110_TrickHousePuzzle5_EventScript_26A3DB end @@ -27,7 +27,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32 lockall applymovement 1, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA setvar VAR_0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_26CCEB @@ -37,7 +37,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53 lockall applymovement 2, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x4002, 1 + compare VAR_0x4002, 1 goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA setvar VAR_0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_26CD6A @@ -47,7 +47,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74 lockall applymovement 3, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x4003, 1 + compare VAR_0x4003, 1 goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA setvar VAR_0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_26CDF4 @@ -57,7 +57,7 @@ Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95 lockall applymovement 4, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x4004, 1 + compare VAR_0x4004, 1 goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA setvar VAR_0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_26CE73 @@ -67,7 +67,7 @@ Route110_TrickHousePuzzle5_EventScript_26CBB6:: @ 826CBB6 lockall applymovement 5, Route110_TrickHousePuzzle5_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x4005, 1 + compare VAR_0x4005, 1 goto_eq Route110_TrickHousePuzzle5_EventScript_26D1AA setvar VAR_0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_26CEF2 @@ -219,13 +219,13 @@ Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB waitmovement 0 applymovement 1, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 - compare_var_to_value VAR_0x4009, 1 + compare VAR_0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4 - compare_var_to_value VAR_0x4009, 2 + compare VAR_0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC - compare_var_to_value VAR_0x4009, 3 + compare VAR_0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 - compare_var_to_value VAR_0x4009, 4 + compare VAR_0x4009, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C msgbox Route110_TrickHousePuzzle5_Text_26D6CE, 4 random 3 @@ -243,15 +243,15 @@ Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A waitmovement 0 applymovement 2, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 - compare_var_to_value VAR_0x4009, 1 + compare VAR_0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D2CC - compare_var_to_value VAR_0x4009, 2 + compare VAR_0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D304 - compare_var_to_value VAR_0x4009, 3 + compare VAR_0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D33C - compare_var_to_value VAR_0x4009, 4 + compare VAR_0x4009, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D374 - compare_var_to_value VAR_0x4009, 5 + compare VAR_0x4009, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3AC msgbox Route110_TrickHousePuzzle5_Text_26D8EA, 4 random 3 @@ -269,13 +269,13 @@ Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4 waitmovement 0 applymovement 3, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 - compare_var_to_value VAR_0x4009, 1 + compare VAR_0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4 - compare_var_to_value VAR_0x4009, 2 + compare VAR_0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC - compare_var_to_value VAR_0x4009, 3 + compare VAR_0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 - compare_var_to_value VAR_0x4009, 4 + compare VAR_0x4009, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C msgbox Route110_TrickHousePuzzle5_Text_26DA1E, 4 random 3 @@ -293,13 +293,13 @@ Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73 waitmovement 0 applymovement 4, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 - compare_var_to_value VAR_0x4009, 1 + compare VAR_0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1B4 - compare_var_to_value VAR_0x4009, 2 + compare VAR_0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D1EC - compare_var_to_value VAR_0x4009, 3 + compare VAR_0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 - compare_var_to_value VAR_0x4009, 4 + compare VAR_0x4009, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C msgbox Route110_TrickHousePuzzle5_Text_26DB4C, 4 random 3 @@ -475,132 +475,132 @@ Route110_TrickHousePuzzle5_EventScript_26D1AA:: @ 826D1AA end Route110_TrickHousePuzzle5_EventScript_26D1B4:: @ 826D1B4 - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3E4 - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3EF - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3FA - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D405 - compare_var_to_value VAR_0x4008, 5 + compare VAR_0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D410 return Route110_TrickHousePuzzle5_EventScript_26D1EC:: @ 826D1EC - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D41B - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D426 - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D431 - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D43C - compare_var_to_value VAR_0x4008, 5 + compare VAR_0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D447 return Route110_TrickHousePuzzle5_EventScript_26D224:: @ 826D224 - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D452 - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D45D - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D468 - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D473 - compare_var_to_value VAR_0x4008, 5 + compare VAR_0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D47E return Route110_TrickHousePuzzle5_EventScript_26D25C:: @ 826D25C - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D489 - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D494 - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D49F - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4AA - compare_var_to_value VAR_0x4008, 5 + compare VAR_0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4B5 return Route110_TrickHousePuzzle5_EventScript_26D294:: @ 826D294 - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4C0 - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4CB - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4D6 - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4E1 - compare_var_to_value VAR_0x4008, 5 + compare VAR_0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4EC return Route110_TrickHousePuzzle5_EventScript_26D2CC:: @ 826D2CC - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D4F7 - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D502 - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D50D - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D518 - compare_var_to_value VAR_0x4008, 5 + compare VAR_0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D523 return Route110_TrickHousePuzzle5_EventScript_26D304:: @ 826D304 - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D52E - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D539 - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D544 - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D54F - compare_var_to_value VAR_0x4008, 5 + compare VAR_0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D55A return Route110_TrickHousePuzzle5_EventScript_26D33C:: @ 826D33C - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D565 - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D570 - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D57B - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D586 - compare_var_to_value VAR_0x4008, 5 + compare VAR_0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D591 return Route110_TrickHousePuzzle5_EventScript_26D374:: @ 826D374 - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D59C - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5A7 - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5B2 - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5BD - compare_var_to_value VAR_0x4008, 5 + compare VAR_0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5C8 return Route110_TrickHousePuzzle5_EventScript_26D3AC:: @ 826D3AC - compare_var_to_value VAR_0x4008, 1 + compare VAR_0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5D3 - compare_var_to_value VAR_0x4008, 2 + compare VAR_0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5DE - compare_var_to_value VAR_0x4008, 3 + compare VAR_0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5E9 - compare_var_to_value VAR_0x4008, 4 + compare VAR_0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5F4 - compare_var_to_value VAR_0x4008, 5 + compare VAR_0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D5FF return diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index 075acc6c9..a043b2ec4 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -17,7 +17,7 @@ Route110_TrickHousePuzzle6_EventScript_26DDC0:: @ 826DDC0 Route110_TrickHousePuzzle6_EventScript_26DDC4:: @ 826DDC4 lockall - compare_var_to_value VAR_0x40B0, 0 + compare VAR_0x40B0, 0 goto_eq Route110_TrickHousePuzzle6_EventScript_26DDD6 goto Route110_TrickHousePuzzle6_EventScript_26A3DB end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index e7044748b..35e5e1522 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -73,7 +73,7 @@ Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185 return Route110_TrickHousePuzzle7_MapScript1_26E198: @ 826E198 - compare_var_to_value VAR_0x40B6, 1 + compare VAR_0x40B6, 1 goto_eq Route110_TrickHousePuzzle7_EventScript_26E1B3 clearflag FLAG_0x0C2 clearflag FLAG_0x0C3 @@ -86,7 +86,7 @@ Route110_TrickHousePuzzle7_EventScript_26E1B3:: @ 826E1B3 end Route110_TrickHousePuzzle7_MapScript1_26E1B4: @ 826E1B4 - compare_var_to_value VAR_0x40B6, 1 + compare VAR_0x40B6, 1 call_if 1, Route110_TrickHousePuzzle7_EventScript_26E0AC end @@ -100,7 +100,7 @@ Route110_TrickHousePuzzle7_EventScript_26E1CA:: @ 826E1CA Route110_TrickHousePuzzle7_EventScript_26E1D0:: @ 826E1D0 lockall - compare_var_to_value VAR_0x40B1, 0 + compare VAR_0x40B1, 0 goto_eq Route110_TrickHousePuzzle7_EventScript_26E1E2 goto Route110_TrickHousePuzzle7_EventScript_26A3DB end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/scripts/maps/Route110_TrickHousePuzzle8.inc index bf0c4b978..369bc59a7 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle8.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle8.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 826E801 Route110_TrickHousePuzzle8_EventScript_26E802:: @ 826E802 lockall - compare_var_to_value VAR_0x40B2, 0 + compare VAR_0x40B2, 0 goto_eq Route110_TrickHousePuzzle8_EventScript_26E814 goto Route110_TrickHousePuzzle8_EventScript_26A3DB end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index c51b07b6c..bd416f463 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -8,7 +8,7 @@ Route111_MapScripts:: @ 81F0CA7 Route111_MapScript1_1F0CBC: @ 81F0CBC checkflag FLAG_0x0E4 call_if 0, Route111_EventScript_1F0CD1 - compare_var_to_value VAR_0x40CB, 1 + compare VAR_0x40CB, 1 call_if 1, Route111_EventScript_1F0CE4 end @@ -43,9 +43,9 @@ Route111_MapScript1_1F0D87: @ 81F0D87 special sub_81BE79C checkflag FLAG_0x14E call_if 0, Route111_EventScript_1F0E3C - compare_var_to_value VAR_0x40CB, 1 + compare VAR_0x40CB, 1 call_if 1, Route111_EventScript_1F0DC2 - compare_var_to_value VAR_0x40CB, 2 + compare VAR_0x40CB, 2 call_if 1, Route111_EventScript_1F0E40 call Route111_EventScript_1F0DE6 call Route111_EventScript_28CCC7 @@ -55,9 +55,9 @@ Route111_MapScript1_1F0D87: @ 81F0D87 Route111_EventScript_1F0DC2:: @ 81F0DC2 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_EventScript_1F0DDA - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F0DE0 return @@ -71,15 +71,15 @@ Route111_EventScript_1F0DE0:: @ 81F0DE0 Route111_EventScript_1F0DE6:: @ 81F0DE6 getplayerxy VAR_0x4000, VAR_0x4001 - compare_var_to_value VAR_0x4001, 34 + compare VAR_0x4001, 34 goto_if 0, Route111_EventScript_1F0E25 - compare_var_to_value VAR_0x4001, 107 + compare VAR_0x4001, 107 goto_if 2, Route111_EventScript_1F0E25 - compare_var_to_value VAR_0x4001, 72 + compare VAR_0x4001, 72 goto_if 2, Route111_EventScript_1F0E22 - compare_var_to_value VAR_0x4000, 2000 + compare VAR_0x4000, 2000 goto_if 2, Route111_EventScript_1F0E25 - compare_var_to_value VAR_0x4000, 8 + compare VAR_0x4000, 8 goto_if 0, Route111_EventScript_1F0E25 Route111_EventScript_1F0E22:: @ 81F0E22 @@ -167,7 +167,7 @@ Route111_EventScript_1F0EB9:: @ 81F0EB9 goto_eq Route111_EventScript_1F0EF4 msgbox Route111_Text_2A6EBD, 4 giveitem_std ITEM_RAZZ_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_EventScript_272054 setflag FLAG_0x92C special sub_8138B10 @@ -206,7 +206,7 @@ Route111_EventScript_1F0F22:: @ 81F0F22 Route111_EventScript_1F0F2E:: @ 81F0F2E checkitem ITEM_GO_GOGGLES, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_EventScript_1F0F45 setvar VAR_0x4003, 1 releaseall @@ -215,13 +215,13 @@ Route111_EventScript_1F0F2E:: @ 81F0F2E Route111_EventScript_1F0F45:: @ 81F0F45 msgbox gUnknown_08272C5F, 4 closemessage - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 call_if 1, Route111_EventScript_1F0F7C - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 call_if 1, Route111_EventScript_1F0F87 - compare_var_to_value VAR_0x8004, 2 + compare VAR_0x8004, 2 call_if 1, Route111_EventScript_1F0F92 - compare_var_to_value VAR_0x8004, 3 + compare VAR_0x8004, 3 call_if 1, Route111_EventScript_1F0F9D releaseall end @@ -280,7 +280,7 @@ Route111_EventScript_1F0FC5:: @ 81F0FC5 faceplayer setflag FLAG_0x8A3 msgbox Route111_Text_1F1475, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F0FE7 msgbox Route111_Text_1F14F5, 4 release @@ -415,9 +415,9 @@ Route111_EventScript_1F1192:: @ 81F1192 Route111_EventScript_1F119B:: @ 81F119B lock faceplayer - compare_var_to_value VAR_0x40CB, 3 + compare VAR_0x40CB, 3 goto_eq Route111_EventScript_1F11C6 - compare_var_to_value VAR_0x40CB, 2 + compare VAR_0x40CB, 2 goto_eq Route111_EventScript_1F11D0 checkflag FLAG_0x14E goto_eq Route111_EventScript_1F11DA @@ -473,8 +473,8 @@ Route111_EventScript_1F1249:: @ 81F1249 Route111_EventScript_1F1260:: @ 81F1260 trainerbattle 2, TRAINER_DUSTY_1, 0, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F12AB msgbox Route111_Text_298B9A, 4 release @@ -513,8 +513,8 @@ Route111_EventScript_1F12F0:: @ 81F12F0 Route111_EventScript_1F1307:: @ 81F1307 trainerbattle 2, TRAINER_WILTON_1, 0, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F1352 msgbox Route111_Text_298FD4, 4 release @@ -538,8 +538,8 @@ Route111_EventScript_1F1352:: @ 81F1352 Route111_EventScript_1F1369:: @ 81F1369 trainerbattle 2, TRAINER_BROOKE_1, 0, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F13B4 msgbox Route111_Text_2991C2, 4 release diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc index 474d2a3f2..fbf150dff 100644 --- a/data/scripts/maps/Route111_OldLadysRestStop.inc +++ b/data/scripts/maps/Route111_OldLadysRestStop.inc @@ -10,9 +10,9 @@ Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920 lock faceplayer msgbox Route111_OldLadysRestStop_Text_22A978, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route111_OldLadysRestStop_EventScript_22A941 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_OldLadysRestStop_EventScript_22A96E end @@ -21,9 +21,9 @@ Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941 closemessage call Route111_OldLadysRestStop_EventScript_272083 msgbox Route111_OldLadysRestStop_Text_22AA16, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route111_OldLadysRestStop_EventScript_22A941 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_OldLadysRestStop_EventScript_22A96E end diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index af556d0e0..847119d2e 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -17,7 +17,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2 goto_eq Route111_WinstrateFamilysHouse_EventScript_22A4DA msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, 4 giveitem_std ITEM_MACHO_BRACE - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_WinstrateFamilysHouse_EventScript_272054 setflag FLAG_0x115 goto Route111_WinstrateFamilysHouse_EventScript_22A52C diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc index 066a7a347..88262fadb 100644 --- a/data/scripts/maps/Route112.inc +++ b/data/scripts/maps/Route112.inc @@ -67,8 +67,8 @@ Route112_EventScript_1F1E6A:: @ 81F1E6A Route112_EventScript_1F1E81:: @ 81F1E81 trainerbattle 2, TRAINER_TRENT_1, 0, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route112_EventScript_1F1ECC msgbox Route112_Text_299896, 4 release diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index eac7dbc0a..4835dffa6 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -5,7 +5,7 @@ Route112_CableCarStation_MapScripts:: @ 822AABE Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9 setescapewarp ROUTE_112, 255, 28, 28 - compare_var_to_value VAR_0x40A3, 2 + compare VAR_0x40A3, 2 call_if 1, Route112_CableCarStation_EventScript_22AADD end @@ -33,9 +33,9 @@ Route112_CableCarStation_EventScript_22AB17:: @ 822AB17 lock faceplayer msgbox Route112_CableCarStation_Text_22AB85, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route112_CableCarStation_EventScript_22AB38 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route112_CableCarStation_EventScript_22AB67 end diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 7ee63e492..c1ce29b72 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -14,9 +14,9 @@ Route113_MapScript1_1F2161: @ 81F2161 Route113_EventScript_1F216A:: @ 81F216A getplayerxy VAR_0x4000, VAR_0x4001 - compare_var_to_value VAR_0x4000, 19 + compare VAR_0x4000, 19 goto_if 0, Route113_EventScript_1F2189 - compare_var_to_value VAR_0x4000, 84 + compare VAR_0x4000, 84 goto_if 2, Route113_EventScript_1F2189 setweather 7 return @@ -60,8 +60,8 @@ Route113_EventScript_1F21D7:: @ 81F21D7 Route113_EventScript_1F21EE:: @ 81F21EE trainerbattle 2, TRAINER_MADELINE_1, 0, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F2239 msgbox Route113_Text_299F15, 4 release @@ -85,8 +85,8 @@ Route113_EventScript_1F2239:: @ 81F2239 Route113_EventScript_1F2250:: @ 81F2250 trainerbattle 2, TRAINER_LAO_1, 0, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F229B msgbox Route113_Text_29A067, 4 release diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index aff641fa8..985a43805 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -4,7 +4,7 @@ Route113_GlassWorkshop_MapScripts:: @ 826ED03 Route113_GlassWorkshop_MapScript1_26ED09: @ 826ED09 setflag FLAG_0x8A4 - compare_var_to_value VAR_0x40BE, 1 + compare VAR_0x40BE, 1 call_if 1, Route113_GlassWorkshop_EventScript_26ED18 end @@ -15,11 +15,11 @@ Route113_GlassWorkshop_EventScript_26ED18:: @ 826ED18 Route113_GlassWorkshop_EventScript_26ED1E:: @ 826ED1E lock faceplayer - compare_var_to_value VAR_0x40BE, 10 + compare VAR_0x40BE, 10 goto_if 4, Route113_GlassWorkshop_EventScript_26F090 - compare_var_to_value VAR_0x40BE, 2 + compare VAR_0x40BE, 2 goto_eq Route113_GlassWorkshop_EventScript_26ED6E - compare_var_to_value VAR_0x40BE, 1 + compare VAR_0x40BE, 1 goto_eq Route113_GlassWorkshop_EventScript_26ED64 msgbox Route113_GlassWorkshop_Text_26F19D, 4 giveitem_std ITEM_SOOT_SACK @@ -35,10 +35,10 @@ Route113_GlassWorkshop_EventScript_26ED64:: @ 826ED64 Route113_GlassWorkshop_EventScript_26ED6E:: @ 826ED6E checkitem ITEM_SOOT_SACK, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26ED9D msgbox Route113_GlassWorkshop_Text_26F312, 4 - compare_var_to_value VAR_ASH_GATHER_COUNT, 250 + compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_26EFD6 message Route113_GlassWorkshop_Text_26F40A waitmessage @@ -71,10 +71,10 @@ Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E setvar VAR_0x8008, 39 bufferitemname 0, VAR_0x8008 setvar VAR_0x800A, 250 - compare_var_to_value VAR_ASH_GATHER_COUNT, 250 + compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 10 subvar VAR_ASH_GATHER_COUNT, 250 @@ -85,10 +85,10 @@ Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A setvar VAR_0x8008, 40 bufferitemname 0, VAR_0x8008 setvar VAR_0x800A, 500 - compare_var_to_value VAR_ASH_GATHER_COUNT, 500 + compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 11 subvar VAR_ASH_GATHER_COUNT, 500 @@ -99,10 +99,10 @@ Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96 setvar VAR_0x8008, 41 bufferitemname 0, VAR_0x8008 setvar VAR_0x800A, 500 - compare_var_to_value VAR_ASH_GATHER_COUNT, 500 + compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 12 subvar VAR_ASH_GATHER_COUNT, 500 @@ -113,10 +113,10 @@ Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2 setvar VAR_0x8008, 43 bufferitemname 0, VAR_0x8008 setvar VAR_0x800A, 1000 - compare_var_to_value VAR_ASH_GATHER_COUNT, 1000 + compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 13 subvar VAR_ASH_GATHER_COUNT, 1000 @@ -127,10 +127,10 @@ Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E setvar VAR_0x8008, 42 bufferitemname 0, VAR_0x8008 setvar VAR_0x800A, 1000 - compare_var_to_value VAR_ASH_GATHER_COUNT, 1000 + compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 14 subvar VAR_ASH_GATHER_COUNT, 1000 @@ -142,10 +142,10 @@ Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A setvar VAR_0x8008, 13 bufferdecorationname 0, VAR_0x8008 setvar VAR_0x800A, 6000 - compare_var_to_value VAR_ASH_GATHER_COUNT, 6000 + compare VAR_ASH_GATHER_COUNT, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 15 subvar VAR_ASH_GATHER_COUNT, 6000 @@ -157,10 +157,10 @@ Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B setvar VAR_0x8008, 6 bufferdecorationname 0, VAR_0x8008 setvar VAR_0x800A, 8000 - compare_var_to_value VAR_ASH_GATHER_COUNT, 8000 + compare VAR_ASH_GATHER_COUNT, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE msgbox Route113_GlassWorkshop_Text_26F480, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 16 subvar VAR_ASH_GATHER_COUNT, 8000 @@ -202,9 +202,9 @@ Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F delay 30 fadescreen 0 msgbox Route113_GlassWorkshop_Text_26F688, 4 - compare_var_to_value VAR_0x8009, 0 + compare VAR_0x8009, 0 call_if 1, Route113_GlassWorkshop_EventScript_26F047 - compare_var_to_value VAR_0x8009, 1 + compare VAR_0x8009, 1 call_if 1, Route113_GlassWorkshop_EventScript_26F05F setvar VAR_0x40BE, 2 release @@ -212,13 +212,13 @@ Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F Route113_GlassWorkshop_EventScript_26F047:: @ 826F047 giveitem_std VAR_0x8008 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F072 return Route113_GlassWorkshop_EventScript_26F05F:: @ 826F05F givedecoration_std VAR_0x8008 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F081 return @@ -296,9 +296,9 @@ Route113_GlassWorkshop_EventScript_26F15B:: @ 826F15B Route113_GlassWorkshop_EventScript_26F16F:: @ 826F16F msgbox Route113_GlassWorkshop_Text_26F688, 4 - compare_var_to_value VAR_0x8009, 0 + compare VAR_0x8009, 0 call_if 1, Route113_GlassWorkshop_EventScript_26F047 - compare_var_to_value VAR_0x8009, 1 + compare VAR_0x8009, 1 call_if 1, Route113_GlassWorkshop_EventScript_26F05F setvar VAR_0x40BE, 2 release diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index cca7be5af..6be6bea91 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -5,18 +5,18 @@ Route114_MapScripts:: @ 81F252F .byte 0 Route114_MapScript1_1F253F: @ 81F253F - compare_var_to_value VAR_0x4039, 1 + compare VAR_0x4039, 1 call_if 1, Route114_EventScript_273D13 - compare_var_to_value VAR_0x4037, 1 + compare VAR_0x4037, 1 call_if 1, Route114_EventScript_273D1B - compare_var_to_value VAR_0x4037, 2 + compare VAR_0x4037, 2 call_if 1, Route114_EventScript_273D1B end Route114_MapScript1_1F2561: @ 81F2561 - compare_var_to_value VAR_0x4037, 1 + compare VAR_0x4037, 1 call_if 1, Route114_EventScript_273913 - compare_var_to_value VAR_0x4037, 2 + compare VAR_0x4037, 2 call_if 1, Route114_EventScript_273926 end @@ -35,7 +35,7 @@ Route114_EventScript_1F2582:: @ 81F2582 addvar VAR_RESULT, 15 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route114_EventScript_272054 setflag FLAG_0x92B msgbox Route114_Text_2A7034, 4 @@ -54,7 +54,7 @@ Route114_EventScript_1F25D1:: @ 81F25D1 goto_eq Route114_EventScript_1F2608 msgbox Route114_Text_1F2809, 4 giveitem_std ITEM_TM05 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route114_EventScript_272054 setflag FLAG_0x0E7 msgbox Route114_Text_1F2872, 4 @@ -110,8 +110,8 @@ Route114_EventScript_1F2685:: @ 81F2685 Route114_EventScript_1F269C:: @ 81F269C trainerbattle 2, TRAINER_STEVE_1, 0, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route114_EventScript_1F26E7 msgbox Route114_Text_29A981, 4 release @@ -135,8 +135,8 @@ Route114_EventScript_1F26E7:: @ 81F26E7 Route114_EventScript_1F26FE:: @ 81F26FE trainerbattle 2, TRAINER_BERNIE_1, 0, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route114_EventScript_1F2749 msgbox Route114_Text_29AB36, 4 release diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index 74aed6cbf..44d4b9d9b 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -13,7 +13,7 @@ Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A goto_eq Route114_FossilManiacsHouse_EventScript_22AD69 msgbox Route114_FossilManiacsHouse_Text_22AD85, 4 giveitem_std ITEM_TM28 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route114_FossilManiacsHouse_EventScript_272054 setflag FLAG_0x105 release diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/scripts/maps/Route114_FossilManiacsTunnel.inc index 81ada5e55..bc5a6d977 100644 --- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc +++ b/data/scripts/maps/Route114_FossilManiacsTunnel.inc @@ -39,10 +39,10 @@ Route114_FossilManiacsTunnel_EventScript_22AF87:: @ 822AF87 checkflag FLAG_0x10B goto_eq Route114_FossilManiacsTunnel_EventScript_22AFC6 checkitem ITEM_ROOT_FOSSIL, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route114_FossilManiacsTunnel_EventScript_22AFBC checkitem ITEM_CLAW_FOSSIL, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route114_FossilManiacsTunnel_EventScript_22AFBC msgbox Route114_FossilManiacsTunnel_Text_22AFD0, 4 release diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index b75f2091c..961535930 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -14,7 +14,7 @@ Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2 setflag FLAG_SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_22B34E, 4 givedecoration_std 99 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route114_LanettesHouse_EventScript_272067 setflag FLAG_0x083 release @@ -28,7 +28,7 @@ Route114_LanettesHouse_EventScript_22B2FF:: @ 822B2FF Route114_LanettesHouse_EventScript_22B309:: @ 822B309 lockall msgbox Route114_LanettesHouse_Text_22B485, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route114_LanettesHouse_EventScript_22B327 msgbox Route114_LanettesHouse_Text_22B6E4, 4 releaseall @@ -36,7 +36,7 @@ Route114_LanettesHouse_EventScript_22B309:: @ 822B309 Route114_LanettesHouse_EventScript_22B327:: @ 822B327 msgbox Route114_LanettesHouse_Text_22B53C, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route114_LanettesHouse_EventScript_22B33C releaseall end diff --git a/data/scripts/maps/Route115.inc b/data/scripts/maps/Route115.inc index 8ea531f9d..69edd5830 100644 --- a/data/scripts/maps/Route115.inc +++ b/data/scripts/maps/Route115.inc @@ -5,18 +5,18 @@ Route115_MapScripts:: @ 81F2920 .byte 0 Route115_MapScript1_1F2930: @ 81F2930 - compare_var_to_value VAR_0x4037, 3 + compare VAR_0x4037, 3 call_if 1, Route115_EventScript_273939 - compare_var_to_value VAR_0x4037, 4 + compare VAR_0x4037, 4 call_if 1, Route115_EventScript_27394C end Route115_MapScript1_1F2947: @ 81F2947 - compare_var_to_value VAR_0x4039, 1 + compare VAR_0x4039, 1 call_if 1, Route115_EventScript_273D13 - compare_var_to_value VAR_0x4037, 3 + compare VAR_0x4037, 3 call_if 1, Route115_EventScript_273D1B - compare_var_to_value VAR_0x4037, 4 + compare VAR_0x4037, 4 call_if 1, Route115_EventScript_273D1B end @@ -38,8 +38,8 @@ Route115_EventScript_1F2985:: @ 81F2985 Route115_EventScript_1F298E:: @ 81F298E trainerbattle 2, TRAINER_TIMOTHY_1, 0, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F29D9 msgbox Route115_Text_29B258, 4 release @@ -68,8 +68,8 @@ Route115_EventScript_1F29F0:: @ 81F29F0 Route115_EventScript_1F2A07:: @ 81F2A07 trainerbattle 2, TRAINER_NOB_1, 0, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F2A52 msgbox Route115_Text_29B49D, 4 release @@ -93,8 +93,8 @@ Route115_EventScript_1F2A52:: @ 81F2A52 Route115_EventScript_1F2A69:: @ 81F2A69 trainerbattle 2, TRAINER_CYNDY_1, 0, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F2AB4 msgbox Route115_Text_29B647, 4 release diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 359f21375..00bc1ff6c 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -7,11 +7,11 @@ Route116_MapScripts:: @ 81F2C0C Route116_MapScript1_1F2C1C: @ 81F2C1C checkflag FLAG_0x08F call_if 1, Route116_EventScript_1F2C47 - compare_var_to_value VAR_0x4039, 1 + compare VAR_0x4039, 1 call_if 1, Route116_EventScript_273D13 - compare_var_to_value VAR_0x4037, 5 + compare VAR_0x4037, 5 call_if 1, Route116_EventScript_273D1B - compare_var_to_value VAR_0x4037, 6 + compare VAR_0x4037, 6 call_if 1, Route116_EventScript_273D1B end @@ -20,9 +20,9 @@ Route116_EventScript_1F2C47:: @ 81F2C47 return Route116_MapScript1_1F2C4F: @ 81F2C4F - compare_var_to_value VAR_0x4037, 5 + compare VAR_0x4037, 5 call_if 1, Route116_EventScript_27395F - compare_var_to_value VAR_0x4037, 6 + compare VAR_0x4037, 6 call_if 1, Route116_EventScript_273972 end @@ -63,17 +63,17 @@ Route116_EventScript_1F2CA2:: @ 81F2CA2 Route116_EventScript_1F2CBB:: @ 81F2CBB setflag FLAG_0x11F giveitem_std ITEM_REPEAT_BALL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route116_EventScript_1F2D39 msgbox Route116_Text_1F3521, 4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, Route116_EventScript_1F2D15 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, Route116_EventScript_1F2D15 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, Route116_EventScript_1F2D15 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, Route116_EventScript_1F2D20 removeobject VAR_LAST_TALKED clearflag FLAG_0x3B5 @@ -167,10 +167,10 @@ Route116_EventScript_1F2DB6:: @ 81F2DB6 lock faceplayer checkitem ITEM_BLACK_GLASSES, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F2DF1 specialvar VAR_RESULT, sub_8139634 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F2DE2 msgbox Route116_Text_1F3657, 4 release @@ -186,7 +186,7 @@ Route116_EventScript_1F2DF1:: @ 81F2DF1 msgbox Route116_Text_1F3657, 4 msgbox Route116_Text_1F3688, 4 specialvar VAR_RESULT, sub_8139634 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F2E1B msgbox Route116_Text_1F375E, 4 release @@ -200,13 +200,13 @@ Route116_EventScript_1F2E1B:: @ 81F2E1B Route116_EventScript_1F2E2A:: @ 81F2E2A delay 20 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, Route116_EventScript_1F2E5E - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, Route116_EventScript_1F2E5E - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, Route116_EventScript_1F2E5E - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, Route116_EventScript_1F2E69 removeobject VAR_LAST_TALKED release @@ -259,19 +259,19 @@ Route116_EventScript_1F2EA0:: @ 81F2EA0 Route116_EventScript_1F2EB7:: @ 81F2EB7 trainerbattle 2, TRAINER_JERRY_1, 0, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F2F4E setvar VAR_0x8004, 273 specialvar VAR_RESULT, sub_813B4E0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route116_EventScript_1F2F22 msgbox Route116_Text_29BD92, 4 release end Route116_EventScript_1F2EF8:: @ 81F2EF8 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route116_EventScript_1F2F03 release end @@ -288,7 +288,7 @@ Route116_EventScript_1F2F03:: @ 81F2F03 end Route116_EventScript_1F2F22:: @ 81F2F22 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route116_EventScript_1F2F35 msgbox Route116_Text_29BD92, 4 release @@ -320,19 +320,19 @@ Route116_EventScript_1F2F7C:: @ 81F2F7C Route116_EventScript_1F2F93:: @ 81F2F93 trainerbattle 2, TRAINER_KAREN_1, 0, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F302A setvar VAR_0x8004, 280 specialvar VAR_RESULT, sub_813B4E0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route116_EventScript_1F2FFE msgbox Route116_Text_29C010, 4 release end Route116_EventScript_1F2FD4:: @ 81F2FD4 - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route116_EventScript_1F2FDF release end @@ -349,7 +349,7 @@ Route116_EventScript_1F2FDF:: @ 81F2FDF end Route116_EventScript_1F2FFE:: @ 81F2FFE - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq Route116_EventScript_1F3011 msgbox Route116_Text_29C010, 4 release diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 01463516b..20240dc82 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -40,8 +40,8 @@ Route117_EventScript_1F39C7:: @ 81F39C7 Route117_EventScript_1F39D0:: @ 81F39D0 trainerbattle 2, TRAINER_ISAAC_1, 0, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3A1B msgbox Route117_Text_29C498, 4 release @@ -65,8 +65,8 @@ Route117_EventScript_1F3A1B:: @ 81F3A1B Route117_EventScript_1F3A32:: @ 81F3A32 trainerbattle 2, TRAINER_LYDIA_1, 0, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3A7D msgbox Route117_Text_29C679, 4 release @@ -90,8 +90,8 @@ Route117_EventScript_1F3A7D:: @ 81F3A7D Route117_EventScript_1F3A94:: @ 81F3A94 trainerbattle 2, TRAINER_DYLAN_1, 0, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3ADF msgbox Route117_Text_29C800, 4 release @@ -115,8 +115,8 @@ Route117_EventScript_1F3ADF:: @ 81F3ADF Route117_EventScript_1F3AF6:: @ 81F3AF6 trainerbattle 2, TRAINER_MARIA_1, 0, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3B41 msgbox Route117_Text_29C9D0, 4 release @@ -145,8 +145,8 @@ Route117_EventScript_1F3B58:: @ 81F3B58 Route117_EventScript_1F3B6F:: @ 81F3B6F trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3BB8 msgbox Route117_Text_29CCCB, 4 release @@ -168,8 +168,8 @@ Route117_EventScript_1F3BB8:: @ 81F3BB8 Route117_EventScript_1F3BD3:: @ 81F3BD3 trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3C1C msgbox Route117_Text_29CE17, 4 release diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 42c3d6d57..4894e8187 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -6,18 +6,18 @@ Route118_MapScripts:: @ 81F3DBC Route118_MapScript1_1F3DCC: @ 81F3DCC call Route118_EventScript_28CCC7 - compare_var_to_value VAR_0x4039, 1 + compare VAR_0x4039, 1 call_if 1, Route118_EventScript_273D13 - compare_var_to_value VAR_0x4037, 7 + compare VAR_0x4037, 7 call_if 1, Route118_EventScript_273D1B - compare_var_to_value VAR_0x4037, 8 + compare VAR_0x4037, 8 call_if 1, Route118_EventScript_273D1B end Route118_MapScript1_1F3DF3: @ 81F3DF3 - compare_var_to_value VAR_0x4037, 7 + compare VAR_0x4037, 7 call_if 1, Route118_EventScript_273985 - compare_var_to_value VAR_0x4037, 8 + compare VAR_0x4037, 8 call_if 1, Route118_EventScript_273998 end @@ -31,9 +31,9 @@ Route118_EventScript_1F3E14:: @ 81F3E14 checkflag FLAG_0x0E3 goto_eq Route118_EventScript_1F3E69 msgbox Route118_Text_1F427B, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F3E3E - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route118_EventScript_1F3E5F end @@ -102,11 +102,11 @@ Route118_EventScript_1F3EE4:: @ 81F3EE4 delay 30 msgbox Route118_Text_1F40BE, 4 closemessage - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, Route118_EventScript_1F3F28 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, Route118_EventScript_1F3F3A - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, Route118_EventScript_1F3F4C setvar VAR_0x4071, 1 removeobject 19 @@ -188,8 +188,8 @@ Route118_Movement_1F3F7E: @ 81F3F7E Route118_EventScript_1F3F87:: @ 81F3F87 trainerbattle 2, TRAINER_ROSE_1, 0, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F3FD2 msgbox Route118_Text_29D2FA, 4 release @@ -223,8 +223,8 @@ Route118_EventScript_1F4000:: @ 81F4000 Route118_EventScript_1F4017:: @ 81F4017 trainerbattle 2, TRAINER_DALTON_1, 0, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F4062 msgbox Route118_Text_29D6D8, 4 release diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 4436005ba..41c74d4a7 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -10,7 +10,7 @@ Route119_MapScript1_1F442F: @ 81F442F Route119_EventScript_1F4439:: @ 81F4439 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, Route119_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -18,7 +18,7 @@ Route119_EventScript_1F4439:: @ 81F4439 Route119_MapScript1_1F444D: @ 81F444D call Route119_EventScript_271ED7 call Route119_EventScript_271EFB - compare_var_to_value VAR_0x40B3, 1 + compare VAR_0x40B3, 1 call_if 1, Route119_EventScript_1F4466 special sub_8139648 end @@ -43,29 +43,29 @@ Route119_EventScript_1F4488:: @ 81F4488 lockall addobject 25 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route119_EventScript_1F4501 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route119_EventScript_1F4506 delay 65 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, Route119_EventScript_1F46C6 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, Route119_EventScript_1F46D1 applymovement 255, Route119_Movement_2725AA waitmovement 0 delay 30 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, Route119_EventScript_1F4700 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, Route119_EventScript_1F470F removeobject 25 addobject 16 delay 30 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route119_EventScript_1F450B - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route119_EventScript_1F4585 releaseall end @@ -145,25 +145,25 @@ Route119_EventScript_1F45FF:: @ 81F45FF Route119_EventScript_1F460F:: @ 81F460F closemessage - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, Route119_EventScript_1F4700 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, Route119_EventScript_1F470F removeobject 16 addobject 25 delay 30 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, Route119_EventScript_1F46DC - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, Route119_EventScript_1F46EE removeobject 25 setvar VAR_0x4072, 1 savebgm SE_STOP fadedefaultbgm delay 60 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, Route119_EventScript_1F46A0 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, Route119_EventScript_1F46A8 addobject 43 applymovement 43, Route119_Movement_1F4752 @@ -171,9 +171,9 @@ Route119_EventScript_1F460F:: @ 81F460F addvar VAR_0x40D1, 1 msgbox Route119_Text_1F4E60, 4 closemessage - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, Route119_EventScript_1F46B0 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, Route119_EventScript_1F46BB removeobject 43 releaseall @@ -368,8 +368,8 @@ Route119_EventScript_1F47F9:: @ 81F47F9 Route119_EventScript_1F4810:: @ 81F4810 trainerbattle 2, TRAINER_JACKSON_1, 0, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route119_EventScript_1F485B msgbox Route119_Text_29DCC6, 4 release @@ -393,8 +393,8 @@ Route119_EventScript_1F485B:: @ 81F485B Route119_EventScript_1F4872:: @ 81F4872 trainerbattle 2, TRAINER_CATHERINE_1, 0, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route119_EventScript_1F48BD msgbox Route119_Text_29DE88, 4 release diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index 390783a79..eb7032672 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -3,7 +3,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 826FA86 .byte 0 Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C - compare_var_to_value VAR_0x40B3, 0 + compare VAR_0x40B3, 0 call_if 1, Route119_WeatherInstitute_1F_EventScript_26FA98 end @@ -16,7 +16,7 @@ Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 lock faceplayer special sub_8138B10 - compare_var_to_value VAR_0x40B3, 0 + compare VAR_0x40B3, 0 goto_eq Route119_WeatherInstitute_1F_EventScript_26FABE msgbox Route119_WeatherInstitute_1F_Text_26FCE5, 4 release @@ -37,7 +37,7 @@ Route119_WeatherInstitute_1F_EventScript_26FAC8:: @ 826FAC8 call_if 1, Route119_WeatherInstitute_1F_EventScript_26FAFF checkflag FLAG_0x1BF call_if 1, Route119_WeatherInstitute_1F_EventScript_26FAFF - compare_var_to_value VAR_0x8004, 2 + compare VAR_0x8004, 2 goto_eq Route119_WeatherInstitute_1F_EventScript_26FB05 msgbox Route119_WeatherInstitute_1F_Text_26FDE8, 4 release diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 29d106dfe..7d7281e4d 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -3,9 +3,9 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E .byte 0 Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24 - compare_var_to_value VAR_0x40B3, 0 + compare VAR_0x40B3, 0 call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF44 - compare_var_to_value VAR_0x40B3, 1 + compare VAR_0x40B3, 1 call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF50 checkflag FLAG_SYS_GAME_CLEAR call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF5C @@ -86,9 +86,9 @@ Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D msgbox Route119_WeatherInstitute_2F_Text_270650, 4 setvar VAR_0x4001, 385 givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route119_WeatherInstitute_2F_EventScript_270085 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route119_WeatherInstitute_2F_EventScript_2700AD goto Route119_WeatherInstitute_2F_EventScript_273811 end @@ -96,7 +96,7 @@ Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 call Route119_WeatherInstitute_2F_EventScript_2700DB msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route119_WeatherInstitute_2F_EventScript_2700EA call Route119_WeatherInstitute_2F_EventScript_27378B call Route119_WeatherInstitute_2F_EventScript_2723DD @@ -106,7 +106,7 @@ Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD call Route119_WeatherInstitute_2F_EventScript_2700DB msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route119_WeatherInstitute_2F_EventScript_2700D0 call Route119_WeatherInstitute_2F_EventScript_273797 goto Route119_WeatherInstitute_2F_EventScript_2700D0 @@ -144,12 +144,12 @@ Route119_WeatherInstitute_2F_EventScript_27010A:: @ 827010A call_if 1, Route119_WeatherInstitute_2F_EventScript_270160 checkflag FLAG_0x1BF call_if 1, Route119_WeatherInstitute_2F_EventScript_270160 - compare_var_to_value VAR_0x8004, 2 + compare VAR_0x8004, 2 goto_eq Route119_WeatherInstitute_2F_EventScript_270166 checkflag FLAG_0x002 call_if 0, Route119_WeatherInstitute_2F_EventScript_270159 specialvar VAR_RESULT, sub_813B374 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route119_WeatherInstitute_2F_EventScript_27014F msgbox Route119_WeatherInstitute_2F_Text_2707F1, 4 release diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index aaffe0f12..c1cc0c230 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -10,23 +10,23 @@ Route120_MapScript1_1F53FC: @ 81F53FC end Route120_EventScript_1F5406:: @ 81F5406 - compare_var_to_value VAR_0x8009, 0 + compare VAR_0x8009, 0 call_if 1, Route120_EventScript_1F5449 - compare_var_to_value VAR_0x8009, 1 + compare VAR_0x8009, 1 call_if 1, Route120_EventScript_1F5460 - compare_var_to_value VAR_0x8009, 2 + compare VAR_0x8009, 2 call_if 1, Route120_EventScript_1F5460 - compare_var_to_value VAR_0x8009, 3 + compare VAR_0x8009, 3 call_if 1, Route120_EventScript_1F5460 - compare_var_to_value VAR_0x8009, 4 + compare VAR_0x8009, 4 call_if 1, Route120_EventScript_1F5460 - compare_var_to_value VAR_0x8009, 5 + compare VAR_0x8009, 5 call_if 1, Route120_EventScript_1F5460 return Route120_EventScript_1F5449:: @ 81F5449 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, Route120_EventScript_27374E removeobject 30 removeobject 36 @@ -34,7 +34,7 @@ Route120_EventScript_1F5449:: @ 81F5449 Route120_EventScript_1F5460:: @ 81F5460 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, Route120_EventScript_27374E removeobject VAR_LAST_TALKED return @@ -71,11 +71,11 @@ Route120_MapScript1_1F54CD: @ 81F54CD Route120_EventScript_1F54D8:: @ 81F54D8 getplayerxy VAR_0x4000, VAR_0x4001 - compare_var_to_value VAR_0x4001, 14 + compare VAR_0x4001, 14 goto_if 3, Route120_EventScript_1F5503 - compare_var_to_value VAR_0x4001, 60 + compare VAR_0x4001, 60 goto_if 3, Route120_EventScript_1F5507 - compare_var_to_value VAR_0x4001, 61 + compare VAR_0x4001, 61 goto_if 4, Route120_EventScript_1F54FF return @@ -88,9 +88,9 @@ Route120_EventScript_1F5503:: @ 81F5503 return Route120_EventScript_1F5507:: @ 81F5507 - compare_var_to_value VAR_0x4000, 7 + compare VAR_0x4000, 7 goto_if 3, Route120_EventScript_1F5523 - compare_var_to_value VAR_0x4000, 19 + compare VAR_0x4000, 19 goto_if 3, Route120_EventScript_1F5503 goto Route120_EventScript_1F5523 end @@ -106,9 +106,9 @@ Route120_EventScript_1F5527:: @ 81F5527 checkflag FLAG_0x92E goto_eq Route120_EventScript_1F5625 msgbox Route120_Text_2A70C7, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route120_EventScript_1F562F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, Route120_EventScript_1F5638 specialvar VAR_RESULT, sub_8138AF0 switch VAR_RESULT @@ -151,7 +151,7 @@ Route120_EventScript_1F55F6:: @ 81F55F6 Route120_EventScript_1F5601:: @ 81F5601 giveitem_std VAR_0x8004 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route120_EventScript_272054 setflag FLAG_0x92E msgbox Route120_Text_2A71D5, 4 @@ -177,7 +177,7 @@ Route120_EventScript_1F5641:: @ 81F5641 checkflag FLAG_0x122 goto_eq Route120_EventScript_1F5672 msgbox Route120_Text_1F5998, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route120_EventScript_1F5665 goto Route120_EventScript_1F568B end @@ -190,7 +190,7 @@ Route120_EventScript_1F5665:: @ 81F5665 Route120_EventScript_1F5672:: @ 81F5672 msgbox Route120_Text_1F5ADE, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route120_EventScript_1F5665 goto Route120_EventScript_1F568B end @@ -198,9 +198,9 @@ Route120_EventScript_1F5672:: @ 81F5672 Route120_EventScript_1F568B:: @ 81F568B msgbox Route120_Text_1F5B0F, 4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, Route120_EventScript_1F57A3 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, Route120_EventScript_1F57AE applymovement 31, Route120_Movement_2725A4 waitmovement 0 @@ -221,11 +221,11 @@ Route120_EventScript_1F568B:: @ 81F568B dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route120_EventScript_1F571C - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq Route120_EventScript_1F571C - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq Route120_EventScript_1F571C goto Route120_EventScript_1F572C end @@ -297,8 +297,8 @@ Route120_EventScript_1F57D7:: @ 81F57D7 Route120_EventScript_1F57EE:: @ 81F57EE trainerbattle 2, TRAINER_ROBERT_1, 0, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route120_EventScript_1F5839 msgbox Route120_Text_29E726, 4 release @@ -332,8 +332,8 @@ Route120_EventScript_1F5867:: @ 81F5867 Route120_EventScript_1F587E:: @ 81F587E trainerbattle 2, TRAINER_JEFFREY_1, 0, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route120_EventScript_1F58C9 msgbox Route120_Text_29EA08, 4 release diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index 0d1f8863e..74746e16f 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -72,8 +72,8 @@ Route121_EventScript_1F5E74:: @ 81F5E74 Route121_EventScript_1F5E8B:: @ 81F5E8B trainerbattle 2, TRAINER_WALTER_1, 0, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5ED6 msgbox Route121_Text_29F21E, 4 release @@ -112,8 +112,8 @@ Route121_EventScript_1F5F1F:: @ 81F5F1F Route121_EventScript_1F5F3A:: @ 81F5F3A trainerbattle 2, TRAINER_JESSICA_1, 0, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5F85 msgbox Route121_Text_29F66F, 4 release @@ -157,8 +157,8 @@ Route121_EventScript_1F5FE1:: @ 81F5FE1 Route121_EventScript_1F5FF8:: @ 81F5FF8 trainerbattle 2, TRAINER_CRISTIN_1, 0, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F6043 msgbox Route121_Text_29F7D4, 4 release diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 3d2ac359d..bfacaaee8 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -33,7 +33,7 @@ Route121_SafariZoneEntrance_EventScript_22BBEF:: @ 822BBEF lock faceplayer msgbox Route121_SafariZoneEntrance_Text_2A4E46, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route121_SafariZoneEntrance_EventScript_22BC0E msgbox Route121_SafariZoneEntrance_Text_2A4E7E, 4 release @@ -50,7 +50,7 @@ Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 waitmovement 0 showmoneybox 0, 0, 0 msgbox Route121_SafariZoneEntrance_Text_2A4F74, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route121_SafariZoneEntrance_EventScript_22BC48 msgbox Route121_SafariZoneEntrance_Text_2A4FD7, 4 goto Route121_SafariZoneEntrance_EventScript_22BD06 @@ -58,11 +58,11 @@ Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route121_SafariZoneEntrance_EventScript_22BCEA call Route121_SafariZoneEntrance_EventScript_22BCBF checkmoney 0x1f4, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route121_SafariZoneEntrance_EventScript_22BCF8 playse SE_REGI msgbox Route121_SafariZoneEntrance_Text_2A501B, 4 @@ -89,10 +89,10 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 Route121_SafariZoneEntrance_EventScript_22BCBF:: @ 822BCBF getpartysize - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_if 5, Route121_SafariZoneEntrance_EventScript_22BCE9 specialvar VAR_RESULT, sub_8139530 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route121_SafariZoneEntrance_EventScript_22BCE9 msgbox Route121_SafariZoneEntrance_Text_2A50E5, 4 goto Route121_SafariZoneEntrance_EventScript_22BD06 diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index 8eb397fd4..feec8adeb 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -13,11 +13,11 @@ Route123_EventScript_1F6151:: @ 81F6151 goto_eq Route123_EventScript_1F61A0 msgbox Route123_Text_1F641E, 4 special sub_81390E0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_EventScript_1F619E msgbox Route123_Text_1F645D, 4 giveitem_std ITEM_TM19 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_EventScript_272054 setflag FLAG_0x0E8 msgbox Route123_Text_1F64CF, 4 @@ -62,8 +62,8 @@ Route123_EventScript_1F61F3:: @ 81F61F3 Route123_EventScript_1F620A:: @ 81F620A trainerbattle 2, TRAINER_CAMERON_1, 0, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F6255 msgbox Route123_Text_29FE2A, 4 release @@ -87,8 +87,8 @@ Route123_EventScript_1F6255:: @ 81F6255 Route123_EventScript_1F626C:: @ 81F626C trainerbattle 2, TRAINER_JACKI_1, 0, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F62B7 msgbox Route123_Text_29FFE5, 4 release @@ -162,8 +162,8 @@ Route123_EventScript_1F63A5:: @ 81F63A5 Route123_EventScript_1F63BC:: @ 81F63BC trainerbattle 2, TRAINER_FERNANDO_1, 0, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F6407 msgbox Route123_Text_2A0389, 4 release diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index eb5f9a10c..245b828a9 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -17,7 +17,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x92D msgbox Route123_BerryMastersHouse_Text_2A7428, 4 @@ -25,7 +25,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 msgbox Route123_BerryMastersHouse_Text_2A7445, 4 release @@ -47,9 +47,9 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0 call Route123_BerryMastersHouse_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route123_BerryMastersHouse_EventScript_26F909 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_26F8F7 end @@ -60,17 +60,17 @@ Route123_BerryMastersHouse_EventScript_26F8F7:: @ 826F8F7 end Route123_BerryMastersHouse_EventScript_26F909:: @ 826F909 - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_eq Route123_BerryMastersHouse_EventScript_26F94C - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq Route123_BerryMastersHouse_EventScript_26F97A - compare_var_to_value VAR_0x8004, 2 + compare VAR_0x8004, 2 goto_eq Route123_BerryMastersHouse_EventScript_26F9AB - compare_var_to_value VAR_0x8004, 3 + compare VAR_0x8004, 3 goto_eq Route123_BerryMastersHouse_EventScript_26F9DC - compare_var_to_value VAR_0x8004, 4 + compare VAR_0x8004, 4 goto_eq Route123_BerryMastersHouse_EventScript_26FA0D - compare_var_to_value VAR_0x8004, 5 + compare VAR_0x8004, 5 goto_eq Route123_BerryMastersHouse_EventScript_26FA3E end @@ -79,7 +79,7 @@ Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C random 10 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 goto Route123_BerryMastersHouse_EventScript_26FA79 release @@ -90,7 +90,7 @@ Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A goto_eq Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, 4 giveitem_std ITEM_SPELON_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x0F8 goto Route123_BerryMastersHouse_EventScript_26FA79 @@ -101,7 +101,7 @@ Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB goto_eq Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, 4 giveitem_std ITEM_PAMTRE_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x0F9 goto Route123_BerryMastersHouse_EventScript_26FA79 @@ -112,7 +112,7 @@ Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC goto_eq Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, 4 giveitem_std ITEM_WATMEL_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x0FA goto Route123_BerryMastersHouse_EventScript_26FA79 @@ -123,7 +123,7 @@ Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D goto_eq Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, 4 giveitem_std ITEM_DURIN_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x0FB goto Route123_BerryMastersHouse_EventScript_26FA79 @@ -134,7 +134,7 @@ Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E goto_eq Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, 4 giveitem_std ITEM_BELUE_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x0FC goto Route123_BerryMastersHouse_EventScript_26FA79 diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index 2a0298650..2079c338d 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -23,8 +23,8 @@ Route124_EventScript_1F659C:: @ 81F659C Route124_EventScript_1F65B3:: @ 81F65B3 trainerbattle 2, TRAINER_JENNY_1, 0, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F65FE msgbox Route124_Text_2A0B9A, 4 release @@ -58,8 +58,8 @@ Route124_EventScript_1F662C:: @ 81F662C Route124_EventScript_1F6643:: @ 81F6643 trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F668C msgbox Route124_Text_2A0F3A, 4 release @@ -81,8 +81,8 @@ Route124_EventScript_1F668C:: @ 81F668C Route124_EventScript_1F66A7:: @ 81F66A7 trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F66F0 msgbox Route124_Text_2A103E, 4 release diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index f94892ee4..3480ad465 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -23,7 +23,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270A4E:: @ 8270A4E Route124_DivingTreasureHuntersHouse_EventScript_270A5C:: @ 8270A5C call Route124_DivingTreasureHuntersHouse_EventScript_270A72 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F57 goto Route124_DivingTreasureHuntersHouse_EventScript_270AD0 end @@ -31,16 +31,16 @@ Route124_DivingTreasureHuntersHouse_EventScript_270A5C:: @ 8270A5C Route124_DivingTreasureHuntersHouse_EventScript_270A72:: @ 8270A72 setvar VAR_0x4001, 0 checkitem ITEM_RED_SHARD, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270AB8 checkitem ITEM_YELLOW_SHARD, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270ABE checkitem ITEM_BLUE_SHARD, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270AC4 checkitem ITEM_GREEN_SHARD, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_270ACA return @@ -247,13 +247,13 @@ Route124_DivingTreasureHuntersHouse_EventScript_270EC0:: @ 8270EC0 bufferitemname 0, VAR_0x8008 bufferitemname 1, VAR_0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_271132, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F4D checkitemspace VAR_0x8009, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01 checkitem VAR_0x8008, 2 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F01 goto Route124_DivingTreasureHuntersHouse_EventScript_270F43 end @@ -263,10 +263,10 @@ Route124_DivingTreasureHuntersHouse_EventScript_270F01:: @ 8270F01 giveitem_std VAR_0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_271158, 4 call Route124_DivingTreasureHuntersHouse_EventScript_270A72 - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F61 msgbox Route124_DivingTreasureHuntersHouse_Text_27117B, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270ADE goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D end diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 953bf52b2..de3ae07b5 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -7,18 +7,18 @@ Route125_MapScripts:: @ 81F6748 Route125_MapScript1_1F6758: @ 81F6758 checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route125_EventScript_27207A - compare_var_to_value VAR_0x4039, 1 + compare VAR_0x4039, 1 call_if 1, Route125_EventScript_273D13 - compare_var_to_value VAR_0x4037, 11 + compare VAR_0x4037, 11 call_if 1, Route125_EventScript_273D17 - compare_var_to_value VAR_0x4037, 12 + compare VAR_0x4037, 12 call_if 1, Route125_EventScript_273D17 end Route125_MapScript1_1F6783: @ 81F6783 - compare_var_to_value VAR_0x4037, 11 + compare VAR_0x4037, 11 call_if 1, Route125_EventScript_273A85 - compare_var_to_value VAR_0x4037, 12 + compare VAR_0x4037, 12 call_if 1, Route125_EventScript_273AF2 end @@ -48,8 +48,8 @@ Route125_EventScript_1F67E9:: @ 81F67E9 Route125_EventScript_1F6800:: @ 81F6800 trainerbattle 2, TRAINER_ERNEST_1, 0, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route125_EventScript_1F684B msgbox Route125_Text_2A1755, 4 release diff --git a/data/scripts/maps/Route126.inc b/data/scripts/maps/Route126.inc index 4678fe39d..d03e08103 100644 --- a/data/scripts/maps/Route126.inc +++ b/data/scripts/maps/Route126.inc @@ -44,8 +44,8 @@ Route126_EventScript_1F6960:: @ 81F6960 Route126_EventScript_1F6977:: @ 81F6977 trainerbattle 2, TRAINER_PABLO_1, 0, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route126_EventScript_1F69C2 msgbox Route126_Text_2A1F10, 4 release diff --git a/data/scripts/maps/Route127.inc b/data/scripts/maps/Route127.inc index 9851df043..cbc7d7da1 100644 --- a/data/scripts/maps/Route127.inc +++ b/data/scripts/maps/Route127.inc @@ -7,18 +7,18 @@ Route127_MapScripts:: @ 81F69D9 Route127_MapScript1_1F69E9: @ 81F69E9 checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route127_EventScript_27207A - compare_var_to_value VAR_0x4039, 1 + compare VAR_0x4039, 1 call_if 1, Route127_EventScript_273D13 - compare_var_to_value VAR_0x4037, 13 + compare VAR_0x4037, 13 call_if 1, Route127_EventScript_273D17 - compare_var_to_value VAR_0x4037, 14 + compare VAR_0x4037, 14 call_if 1, Route127_EventScript_273D17 end Route127_MapScript1_1F6A14: @ 81F6A14 - compare_var_to_value VAR_0x4037, 13 + compare VAR_0x4037, 13 call_if 1, Route127_EventScript_273B5F - compare_var_to_value VAR_0x4037, 14 + compare VAR_0x4037, 14 call_if 1, Route127_EventScript_273BCC end @@ -63,8 +63,8 @@ Route127_EventScript_1F6ABF:: @ 81F6ABF Route127_EventScript_1F6AD6:: @ 81F6AD6 trainerbattle 2, TRAINER_KOJI_1, 0, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route127_EventScript_1F6B21 msgbox Route127_Text_2A26AC, 4 release diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 1ba1b3448..6d336e464 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -177,8 +177,8 @@ Route128_Movement_1F6CBB: @ 81F6CBB Route128_EventScript_1F6CBE:: @ 81F6CBE trainerbattle 2, TRAINER_ISAIAH_1, 0, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D09 msgbox Route128_Text_2A28D7, 4 release @@ -202,8 +202,8 @@ Route128_EventScript_1F6D09:: @ 81F6D09 Route128_EventScript_1F6D20:: @ 81F6D20 trainerbattle 2, TRAINER_KATELYN_1, 0, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D6B msgbox Route128_Text_2A2AB7, 4 release diff --git a/data/scripts/maps/Route129.inc b/data/scripts/maps/Route129.inc index 822c6018d..170d87e56 100644 --- a/data/scripts/maps/Route129.inc +++ b/data/scripts/maps/Route129.inc @@ -5,20 +5,20 @@ Route129_MapScripts:: @ 81F7284 .byte 0 Route129_MapScript1_1F7294: @ 81F7294 - compare_var_to_value VAR_0x4037, 15 + compare VAR_0x4037, 15 call_if 1, Route129_EventScript_273C39 - compare_var_to_value VAR_0x4037, 16 + compare VAR_0x4037, 16 call_if 1, Route129_EventScript_273CA6 end Route129_MapScript1_1F72AB: @ 81F72AB - compare_var_to_value VAR_0x4039, 1 + compare VAR_0x4039, 1 call_if 1, Route129_EventScript_273D13 - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 call_if 4, Route129_EventScript_1F72D8 - compare_var_to_value VAR_0x4037, 15 + compare VAR_0x4037, 15 call_if 1, Route129_EventScript_273D17 - compare_var_to_value VAR_0x4037, 16 + compare VAR_0x4037, 16 call_if 1, Route129_EventScript_273D17 end diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index b76d77759..0b9d85e30 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -3,10 +3,10 @@ Route130_MapScripts:: @ 81F735F .byte 0 Route130_MapScript1_1F7365: @ 81F7365 - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 call_if 4, Route130_EventScript_1F73B5 specialvar VAR_RESULT, sub_813793C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route130_EventScript_1F73B1 setflag FLAG_0x011 setflag FLAG_0x012 diff --git a/data/scripts/maps/Route131.inc b/data/scripts/maps/Route131.inc index 5ac962d66..566cbef66 100644 --- a/data/scripts/maps/Route131.inc +++ b/data/scripts/maps/Route131.inc @@ -3,7 +3,7 @@ Route131_MapScripts:: @ 81F7404 .byte 0 Route131_MapScript1_1F740A: @ 81F740A - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 call_if 4, Route131_EventScript_1F741F call Route131_EventScript_1F741B end diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 31182439b..5b6d0fe7d 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -6,15 +6,15 @@ RustboroCity_MapScripts:: @ 81E06BD RustboroCity_MapScript1_1E06C8: @ 81E06C8 setflag FLAG_VISITED_RUSTBORO_CITY call RustboroCity_EventScript_271ED7 - compare_var_to_value VAR_0x405A, 6 + compare VAR_0x405A, 6 call_if 1, RustboroCity_EventScript_1E0707 getplayerxy VAR_0x4000, VAR_0x4001 - compare_var_to_value VAR_0x405A, 6 + compare VAR_0x405A, 6 goto_eq RustboroCity_EventScript_1E06EC end RustboroCity_EventScript_1E06EC:: @ 81E06EC - compare_var_to_value VAR_0x4000, 11 + compare VAR_0x4000, 11 goto_eq RustboroCity_EventScript_1E06FF setobjectxyperm 15, 12, 15 end @@ -52,7 +52,7 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 waitmovement 0 msgbox RustboroCity_Text_1E22A5, 4 closemessage - setflag FLAG_0x12F + setflag FLAG_HAS_MATCH_CALL applymovement 15, RustboroCity_Movement_2725A4 waitmovement 0 playse SE_TK_KASYA @@ -488,13 +488,13 @@ RustboroCity_EventScript_1E0B22:: @ 81E0B22 end RustboroCity_EventScript_1E0B2E:: @ 81E0B2E - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if 1, RustboroCity_EventScript_1E0B6F - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, RustboroCity_EventScript_1E0B9B - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, RustboroCity_EventScript_1E0BC7 - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if 1, RustboroCity_EventScript_1E0BF3 setflag FLAG_0x09F setvar VAR_0x405A, 3 @@ -582,19 +582,19 @@ RustboroCity_EventScript_1E0C4F:: @ 81E0C4F end RustboroCity_EventScript_1E0C5B:: @ 81E0C5B - compare_var_to_value VAR_0x4001, 0 + compare VAR_0x4001, 0 call_if 1, RustboroCity_EventScript_1E0CDC - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, RustboroCity_EventScript_1E0D08 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, RustboroCity_EventScript_1E0D34 - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if 1, RustboroCity_EventScript_1E0D60 - compare_var_to_value VAR_0x4001, 4 + compare VAR_0x4001, 4 call_if 1, RustboroCity_EventScript_1E0D96 msgbox RustboroCity_Text_1E194D, 4 giveitem_std ITEM_GREAT_BALL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, RustboroCity_EventScript_1E0CD3 msgbox RustboroCity_Text_1E1A21, 4 closemessage @@ -682,9 +682,9 @@ RustboroCity_EventScript_1E0DB8:: @ 81E0DB8 Route104_EventScript_1E0DD1:: @ 81E0DD1 RustboroCity_EventScript_1E0DD1:: @ 81E0DD1 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_EventScript_1E0DE9 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E0DEE return @@ -826,9 +826,9 @@ RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 RustboroCity_EventScript_1E0FF3:: @ 81E0FF3 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_EventScript_1E100B - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1114 end @@ -851,7 +851,7 @@ RustboroCity_EventScript_1E100B:: @ 81E100B setvar VAR_0x4063, 2 setvar VAR_0x8008, 0 msgbox RustboroCity_Text_1E1AFA, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1092 msgbox RustboroCity_Text_1E1BD3, 4 call RustboroCity_EventScript_1E10D6 @@ -861,7 +861,7 @@ RustboroCity_EventScript_1E100B:: @ 81E100B RustboroCity_EventScript_1E1070:: @ 81E1070 setvar VAR_0x8008, 1 msgbox RustboroCity_Text_1E1C48, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1092 msgbox RustboroCity_Text_1E1BD3, 4 releaseall @@ -877,7 +877,7 @@ RustboroCity_EventScript_1E1092:: @ 81E1092 RustboroCity_EventScript_1E10C1:: @ 81E10C1 msgbox RustboroCity_Text_1E1CE7, 4 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, RustboroCity_EventScript_1E10D6 releaseall end @@ -923,7 +923,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114 setvar VAR_0x405A, 8 setvar VAR_0x4063, 2 msgbox RustboroCity_Text_1E1E34, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1191 msgbox RustboroCity_Text_1E1F2F, 4 call RustboroCity_EventScript_1E10D6 @@ -932,7 +932,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114 RustboroCity_EventScript_1E1174:: @ 81E1174 msgbox RustboroCity_Text_1E1F76, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1191 msgbox RustboroCity_Text_1E1F2F, 4 releaseall @@ -948,7 +948,7 @@ RustboroCity_EventScript_1E1191:: @ 81E1191 RustboroCity_EventScript_1E11C0:: @ 81E11C0 msgbox RustboroCity_Text_1E2002, 4 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, RustboroCity_EventScript_1E10D6 releaseall end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 8a4293959..e9765fa56 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -3,7 +3,7 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 8211857 .byte 0 RustboroCity_DevonCorp_2F_MapScript1_21185D: @ 821185D - compare_var_to_value VAR_0x40C4, 1 + compare VAR_0x40C4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 end @@ -14,7 +14,7 @@ RustboroCity_DevonCorp_2F_EventScript_211869:: @ 8211869 RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F lock faceplayer - compare_var_to_value VAR_0x40C4, 1 + compare VAR_0x40C4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 msgbox RustboroCity_DevonCorp_2F_Text_211BFB, 4 release @@ -23,7 +23,7 @@ RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886 lock faceplayer - compare_var_to_value VAR_0x40C4, 1 + compare VAR_0x40C4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 checkflag FLAG_0x11F goto_eq RustboroCity_DevonCorp_2F_EventScript_2118A6 @@ -39,7 +39,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118A6:: @ 82118A6 RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0 lock faceplayer - compare_var_to_value VAR_0x40C4, 1 + compare VAR_0x40C4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 checkflag FLAG_0x0BC goto_eq RustboroCity_DevonCorp_2F_EventScript_2118D0 @@ -55,7 +55,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118D0:: @ 82118D0 RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA lock faceplayer - compare_var_to_value VAR_0x40C4, 1 + compare VAR_0x40C4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 msgbox RustboroCity_DevonCorp_2F_Text_211EE0, 4 release @@ -64,16 +64,16 @@ RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1 lock faceplayer - compare_var_to_value VAR_0x40C4, 2 + compare VAR_0x40C4, 2 goto_eq RustboroCity_DevonCorp_2F_EventScript_211A03 - compare_var_to_value VAR_0x40C4, 1 + compare VAR_0x40C4, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_2119F9 msgbox RustboroCity_DevonCorp_2F_Text_211F48, 4 checkitem ITEM_ROOT_FOSSIL, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_211933 checkitem ITEM_CLAW_FOSSIL, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_211991 release end @@ -86,10 +86,10 @@ RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933 applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_211FA6, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_2119EF checkitem ITEM_CLAW_FOSSIL, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_211B84 goto RustboroCity_DevonCorp_2F_EventScript_211974 end @@ -111,10 +111,10 @@ RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991 applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_211FA6, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_2119EF checkitem ITEM_ROOT_FOSSIL, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_211B84 goto RustboroCity_DevonCorp_2F_EventScript_2119D2 end @@ -139,9 +139,9 @@ RustboroCity_DevonCorp_2F_EventScript_2119F9:: @ 82119F9 end RustboroCity_DevonCorp_2F_EventScript_211A03:: @ 8211A03 - compare_var_to_value VAR_0x40C5, 1 + compare VAR_0x40C5, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_211A1A - compare_var_to_value VAR_0x40C5, 2 + compare VAR_0x40C5, 2 goto_eq RustboroCity_DevonCorp_2F_EventScript_211A2C end @@ -160,9 +160,9 @@ RustboroCity_DevonCorp_2F_EventScript_211A2C:: @ 8211A2C RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E setvar VAR_0x4001, 388 givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211A6E - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_211A96 goto RustboroCity_DevonCorp_2F_EventScript_273811 end @@ -170,7 +170,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E call RustboroCity_DevonCorp_2F_EventScript_211AC4 msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211AD7 call RustboroCity_DevonCorp_2F_EventScript_27378B call RustboroCity_DevonCorp_2F_EventScript_2723DD @@ -180,7 +180,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96 call RustboroCity_DevonCorp_2F_EventScript_211AC4 msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211AB9 call RustboroCity_DevonCorp_2F_EventScript_273797 goto RustboroCity_DevonCorp_2F_EventScript_211AB9 @@ -209,9 +209,9 @@ RustboroCity_DevonCorp_2F_EventScript_211AD7:: @ 8211AD7 RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1 setvar VAR_0x4001, 390 givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211B11 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_211B39 goto RustboroCity_DevonCorp_2F_EventScript_273811 end @@ -219,7 +219,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1 RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 call RustboroCity_DevonCorp_2F_EventScript_211B67 msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211B7A call RustboroCity_DevonCorp_2F_EventScript_27378B call RustboroCity_DevonCorp_2F_EventScript_2723DD @@ -229,7 +229,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39 call RustboroCity_DevonCorp_2F_EventScript_211B67 msgbox gUnknown_08273374, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211B5C call RustboroCity_DevonCorp_2F_EventScript_273797 goto RustboroCity_DevonCorp_2F_EventScript_211B5C @@ -281,9 +281,9 @@ RustboroCity_DevonCorp_2F_EventScript_211BCD:: @ 8211BCD RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF lock faceplayer - compare_var_to_value VAR_0x40C4, 1 + compare VAR_0x40C4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 - compare_var_to_value VAR_0x405A, 6 + compare VAR_0x405A, 6 goto_if 4, RustboroCity_DevonCorp_2F_EventScript_211BF1 msgbox RustboroCity_DevonCorp_2F_Text_212338, 4 release diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index d887c5669..373f4e566 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 821242D .byte 0 RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D - compare_var_to_value VAR_0x408F, 0 + compare VAR_0x408F, 0 call_if 1, RustboroCity_DevonCorp_3F_EventScript_212449 end @@ -164,7 +164,7 @@ RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 msgbox RustboroCity_DevonCorp_3F_Text_212A29, 4 giveitem_std ITEM_EXP_SHARE - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_3F_EventScript_272054 setflag FLAG_0x110 msgbox RustboroCity_DevonCorp_3F_Text_212A9E, 4 diff --git a/data/scripts/maps/RustboroCity_Flat1_2F.inc b/data/scripts/maps/RustboroCity_Flat1_2F.inc index c31739fb2..425d61f52 100644 --- a/data/scripts/maps/RustboroCity_Flat1_2F.inc +++ b/data/scripts/maps/RustboroCity_Flat1_2F.inc @@ -5,35 +5,35 @@ RustboroCity_Flat1_2F_EventScript_21513A:: @ 821513A lock faceplayer specialvar VAR_RESULT, TryBufferWaldaPhrase - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_Flat1_2F_EventScript_21518D - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_Flat1_2F_EventScript_2151AD RustboroCity_Flat1_2F_EventScript_215157:: @ 8215157 special DoWaldaNamingScreen waitstate - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq RustboroCity_Flat1_2F_EventScript_2151D7 - compare_var_to_value VAR_0x8004, 2 + compare VAR_0x8004, 2 goto_eq RustboroCity_Flat1_2F_EventScript_2151E1 specialvar VAR_RESULT, TryGetWallpaperWithWaldaPhrase - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq RustboroCity_Flat1_2F_EventScript_2151F8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_Flat1_2F_EventScript_215221 end RustboroCity_Flat1_2F_EventScript_21518D:: @ 821518D msgbox RustboroCity_Flat1_2F_Text_2152FA, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_Flat1_2F_EventScript_2151CD msgbox RustboroCity_Flat1_2F_Text_2154AD, 4 goto RustboroCity_Flat1_2F_EventScript_215157 RustboroCity_Flat1_2F_EventScript_2151AD:: @ 82151AD msgbox RustboroCity_Flat1_2F_Text_215448, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_Flat1_2F_EventScript_2151CD msgbox RustboroCity_Flat1_2F_Text_2154AD, 4 goto RustboroCity_Flat1_2F_EventScript_215157 diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc index f8a9bcac9..e623aa485 100644 --- a/data/scripts/maps/RustboroCity_Flat2_2F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc @@ -12,7 +12,7 @@ RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 goto_eq RustboroCity_Flat2_2F_EventScript_216010 msgbox RustboroCity_Flat2_2F_Text_21605A, 4 giveitem_std ITEM_PREMIER_BALL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_Flat2_2F_EventScript_272054 setflag FLAG_0x0D5 release diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index dec6a8e73..0cdfaf4b9 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -3,8 +3,8 @@ RustboroCity_Gym_MapScripts:: @ 8212F30 RustboroCity_Gym_EventScript_212F31:: @ 8212F31 trainerbattle 1, TRAINER_ROXANNE_1, 0, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq RustboroCity_Gym_EventScript_212FC8 checkflag FLAG_0x0A5 goto_if 0, RustboroCity_Gym_EventScript_212FA4 @@ -23,14 +23,14 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66 addvar VAR_0x4085, 1 setvar VAR_0x8008, 1 call RustboroCity_Gym_EventScript_271F43 - compare_var_to_value VAR_0x4085, 6 + compare VAR_0x4085, 6 call_if 1, RustboroCity_Gym_EventScript_271E84 goto RustboroCity_Gym_EventScript_212FA4 end RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4 giveitem_std ITEM_TM39 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_Gym_EventScript_272054 setflag FLAG_0x0A5 msgbox RustboroCity_Gym_Text_2138B1, 4 diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index bbbacff17..d63536c55 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -11,17 +11,17 @@ RustboroCity_House1_EventScript_21593F:: @ 821593F specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT msgbox RustboroCity_House1_Text_2159E8, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_House1_EventScript_2159BD special sub_81B94B0 waitstate copyvar VAR_0x800A, VAR_0x8004 - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq RustboroCity_House1_EventScript_2159BD copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, sub_807E9D4 copyvar VAR_0x800B, VAR_RESULT - compare_var_to_var VAR_RESULT, VAR_0x8009 + compare VAR_RESULT, VAR_0x8009 goto_if 5, RustboroCity_House1_EventScript_2159C7 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 1caf78524..46887b9c6 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -79,13 +79,13 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 faceplayer checkflag FLAG_0x113 goto_eq RustboroCity_PokemonSchool_EventScript_213FFB - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, RustboroCity_PokemonSchool_EventScript_213FE5 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, RustboroCity_PokemonSchool_EventScript_213FF0 msgbox RustboroCity_PokemonSchool_Text_214433, 4 giveitem_std ITEM_QUICK_CLAW - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq RustboroCity_PokemonSchool_EventScript_272054 closemessage applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 25913300c..cefb978fe 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -9,7 +9,7 @@ RusturfTunnel_MapScript2_22CE32: @ 822CE32 .2byte 0 RusturfTunnel_MapScript1_22CE44: @ 822CE44 - compare_var_to_value VAR_0x409A, 2 + compare VAR_0x409A, 2 call_if 1, RusturfTunnel_EventScript_22CE50 end @@ -51,35 +51,35 @@ RusturfTunnel_EventScript_22CE99:: @ 822CE99 RusturfTunnel_EventScript_22CEAE:: @ 822CEAE lockall - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, RusturfTunnel_EventScript_22CFA7 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, RusturfTunnel_EventScript_22CFBC - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if 1, RusturfTunnel_EventScript_22CFC7 call RusturfTunnel_EventScript_22CFFF msgbox RusturfTunnel_Text_22D65C, 4 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, RusturfTunnel_EventScript_22CFC8 - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if 1, RusturfTunnel_EventScript_22CFC8 giveitem_std ITEM_HM04 setflag FLAG_0x06A msgbox RusturfTunnel_Text_22D6D2, 4 closemessage - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, RusturfTunnel_EventScript_22CF5D - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, RusturfTunnel_EventScript_22CF6F - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if 1, RusturfTunnel_EventScript_22CF8B msgbox RusturfTunnel_Text_22D745, 4 closemessage - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 call_if 1, RusturfTunnel_EventScript_22CFD4 - compare_var_to_value VAR_0x4001, 2 + compare VAR_0x4001, 2 call_if 1, RusturfTunnel_EventScript_22CFE6 - compare_var_to_value VAR_0x4001, 3 + compare VAR_0x4001, 3 call_if 1, RusturfTunnel_EventScript_22CFE6 call RusturfTunnel_EventScript_272216 releaseall diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 2faadc2fb..a3bf1ac36 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -42,9 +42,9 @@ SSTidalRooms_EventScript_23C03C:: @ 823C03C return SSTidalCorridor_EventScript_23C050:: @ 823C050 - compare_var_to_value VAR_PORTHOLE, 2 + compare VAR_PORTHOLE, 2 goto_eq SSTidalCorridor_EventScript_23C067 - compare_var_to_value VAR_PORTHOLE, 7 + compare VAR_PORTHOLE, 7 goto_eq SSTidalCorridor_EventScript_23C07D end @@ -114,9 +114,9 @@ SSTidalCorridor_EventScript_23C110:: @ 823C110 SSTidalCorridor_EventScript_23C119:: @ 823C119 lock faceplayer - compare_var_to_value VAR_PORTHOLE, 4 + compare VAR_PORTHOLE, 4 goto_eq SSTidalCorridor_EventScript_23C13B - compare_var_to_value VAR_PORTHOLE, 8 + compare VAR_PORTHOLE, 8 goto_eq SSTidalCorridor_EventScript_23C15A msgbox SSTidalCorridor_Text_23C596, 4 release @@ -148,9 +148,9 @@ SSTidalCorridor_EventScript_23C179:: @ 823C179 SSTidalCorridor_EventScript_23C17D:: @ 823C17D lockall - compare_var_to_value VAR_PORTHOLE, 2 + compare VAR_PORTHOLE, 2 goto_eq SSTidalCorridor_EventScript_23C19E - compare_var_to_value VAR_PORTHOLE, 7 + compare VAR_PORTHOLE, 7 goto_eq SSTidalCorridor_EventScript_23C19E msgbox SSTidalCorridor_Text_23C6C3, 4 releaseall diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index 4863d8ba9..39c453e98 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -8,7 +8,7 @@ SSTidalRooms_EventScript_23C9F2:: @ 823C9F2 goto_eq SSTidalRooms_EventScript_23CA29 msgbox SSTidalRooms_Text_23D098, 4 giveitem_std ITEM_TM49 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SSTidalRooms_EventScript_272054 setflag FLAG_0x104 msgbox SSTidalRooms_Text_23D145, 4 diff --git a/data/scripts/maps/SafariZone_South.inc b/data/scripts/maps/SafariZone_South.inc index b4e687755..4be06d00b 100644 --- a/data/scripts/maps/SafariZone_South.inc +++ b/data/scripts/maps/SafariZone_South.inc @@ -19,7 +19,7 @@ SafariZone_South_EventScript_23D28E:: @ 823D28E end SafariZone_South_MapScript1_23D2B1: @ 823D2B1 - compare_var_to_value VAR_0x40A4, 2 + compare VAR_0x40A4, 2 call_if 1, SafariZone_South_EventScript_23D2BD end @@ -54,7 +54,7 @@ SafariZone_South_EventScript_23D2E5:: @ 823D2E5 checkflag FLAG_0x05D goto_if 0, SafariZone_South_EventScript_23D30D msgbox SafariZone_South_Text_2A51D4, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SafariZone_South_EventScript_23D31A msgbox SafariZone_South_Text_2A521A, 4 release diff --git a/data/scripts/maps/SeafloorCavern_Entrance.inc b/data/scripts/maps/SeafloorCavern_Entrance.inc index ff1afb53b..b5fdc5e42 100644 --- a/data/scripts/maps/SeafloorCavern_Entrance.inc +++ b/data/scripts/maps/SeafloorCavern_Entrance.inc @@ -9,7 +9,7 @@ SeafloorCavern_Entrance_MapScript1_234474: @ 8234474 SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 lockall - compare_var_to_value VAR_0x40D9, 1 + compare VAR_0x40D9, 1 goto_eq SeafloorCavern_Entrance_EventScript_2344ED waitse playse SE_PIN @@ -18,11 +18,11 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 applymovement 1, SeafloorCavern_Entrance_Movement_27259A waitmovement 0 delay 20 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, SeafloorCavern_Entrance_EventScript_23452E - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, SeafloorCavern_Entrance_EventScript_234523 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, SeafloorCavern_Entrance_EventScript_234539 delay 30 setvar VAR_0x40D9, 1 @@ -35,11 +35,11 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 end SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, SeafloorCavern_Entrance_EventScript_23452E - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, SeafloorCavern_Entrance_EventScript_234523 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, SeafloorCavern_Entrance_EventScript_234539 msgbox SeafloorCavern_Entrance_Text_2346C8, 4 closemessage diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index 318e3beee..9cd3727bb 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -9,7 +9,7 @@ SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8 checkflag FLAG_0x0E4 goto_eq SealedChamber_InnerRoom_EventScript_239253 specialvar VAR_RESULT, CheckRelicanthWailord - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SealedChamber_InnerRoom_EventScript_239253 fadeoutbgm 0 playse SE_TRACK_MOVE diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 5d83dadf9..dcf29081a 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -23,24 +23,24 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 checkflag FLAG_SYS_SHOAL_ITEM call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_236ED9 checkitem ITEM_SHOAL_SALT, 4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B checkitem ITEM_SHOAL_SHELL, 4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B msgbox ShoalCave_LowTideEntranceRoom_Text_2A7F37, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236ECF checkitemspace ITEM_SHELL_BELL, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_236E69 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E91 msgbox ShoalCave_LowTideEntranceRoom_Text_2A7FAC, 4 takeitem ITEM_SHOAL_SALT, 4 takeitem ITEM_SHOAL_SHELL, 4 giveitem_std ITEM_SHELL_BELL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_272054 msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, 4 setflag FLAG_0x002 @@ -49,13 +49,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 ShoalCave_LowTideEntranceRoom_EventScript_236E69:: @ 8236E69 checkitem ITEM_SHOAL_SALT, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E7A return ShoalCave_LowTideEntranceRoom_EventScript_236E7A:: @ 8236E7A checkitem ITEM_SHOAL_SHELL, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E8B return @@ -70,10 +70,10 @@ ShoalCave_LowTideEntranceRoom_EventScript_236E91:: @ 8236E91 ShoalCave_LowTideEntranceRoom_EventScript_236E9B:: @ 8236E9B checkitem ITEM_SHOAL_SALT, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 checkitem ITEM_SHOAL_SHELL, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 msgbox ShoalCave_LowTideEntranceRoom_Text_2A7E0E, 4 release diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index f89306140..94505a96d 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -73,7 +73,7 @@ ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA checkflag FLAG_0x3BC goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 41, 20, 859, 0 special DrawWholeMapView @@ -91,7 +91,7 @@ ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6 checkflag FLAG_0x3BD goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 41, 10, 859, 0 special DrawWholeMapView @@ -104,7 +104,7 @@ ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028 checkflag FLAG_0x3BE goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 6, 9, 859, 0 special DrawWholeMapView @@ -117,7 +117,7 @@ ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A checkflag FLAG_0x3BF goto_eq ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 16, 13, 859, 0 special DrawWholeMapView @@ -130,7 +130,7 @@ ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C checkflag FLAG_0x3B8 goto_eq ShoalCave_LowTideInnerRoom_EventScript_2370BE giveitem_std ITEM_SHOAL_SALT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 31, 8, 858, 0 special DrawWholeMapView @@ -148,7 +148,7 @@ ShoalCave_LowTideInnerRoom_EventScript_2370C8:: @ 82370C8 checkflag FLAG_0x3B9 goto_eq ShoalCave_LowTideInnerRoom_EventScript_2370BE giveitem_std ITEM_SHOAL_SALT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 14, 26, 858, 0 special DrawWholeMapView diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc index a528dde99..9883bf3da 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc @@ -20,7 +20,7 @@ ShoalCave_LowTideLowerRoom_EventScript_237176:: @ 8237176 checkflag FLAG_0x3BB goto_eq ShoalCave_LowTideLowerRoom_EventScript_2371A8 giveitem_std ITEM_SHOAL_SALT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideLowerRoom_EventScript_272054 setmetatile 18, 2, 858, 0 special DrawWholeMapView @@ -40,7 +40,7 @@ ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2 goto_eq ShoalCave_LowTideLowerRoom_EventScript_2371E1 msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, 4 giveitem_std ITEM_FOCUS_BAND - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideLowerRoom_EventScript_272054 setflag FLAG_0x11B release diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc index b8c6bb2bb..e8c87bd98 100644 --- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc @@ -20,7 +20,7 @@ ShoalCave_LowTideStairsRoom_EventScript_23711A:: @ 823711A checkflag FLAG_0x3BA goto_eq ShoalCave_LowTideStairsRoom_EventScript_23714C giveitem_std ITEM_SHOAL_SALT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideStairsRoom_EventScript_272054 setmetatile 11, 11, 858, 0 special DrawWholeMapView diff --git a/data/scripts/maps/SkyPillar_1F.inc b/data/scripts/maps/SkyPillar_1F.inc index 25fa53851..6afc5aa64 100644 --- a/data/scripts/maps/SkyPillar_1F.inc +++ b/data/scripts/maps/SkyPillar_1F.inc @@ -3,7 +3,7 @@ SkyPillar_1F_MapScripts:: @ 8239615 .byte 0 SkyPillar_1F_MapScript1_23961B: @ 823961B - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 call_if 0, SkyPillar_1F_EventScript_239627 end diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/scripts/maps/SkyPillar_2F.inc index c711fa0eb..b22afaf54 100644 --- a/data/scripts/maps/SkyPillar_2F.inc +++ b/data/scripts/maps/SkyPillar_2F.inc @@ -5,7 +5,7 @@ SkyPillar_2F_MapScripts:: @ 823962B .byte 0 SkyPillar_2F_MapScript1_23963B: @ 823963B - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 call_if 0, SkyPillar_2F_EventScript_23964C copyvar VAR_ICE_STEP_COUNT, 0x1 end diff --git a/data/scripts/maps/SkyPillar_3F.inc b/data/scripts/maps/SkyPillar_3F.inc index e376c6aae..0ddae05b2 100644 --- a/data/scripts/maps/SkyPillar_3F.inc +++ b/data/scripts/maps/SkyPillar_3F.inc @@ -3,7 +3,7 @@ SkyPillar_3F_MapScripts:: @ 823965B .byte 0 SkyPillar_3F_MapScript1_239661: @ 8239661 - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 call_if 0, SkyPillar_3F_EventScript_23966D end diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/scripts/maps/SkyPillar_4F.inc index 99fc10cdc..15d055f02 100644 --- a/data/scripts/maps/SkyPillar_4F.inc +++ b/data/scripts/maps/SkyPillar_4F.inc @@ -5,7 +5,7 @@ SkyPillar_4F_MapScripts:: @ 8239671 .byte 0 SkyPillar_4F_MapScript1_239681: @ 8239681 - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 call_if 0, SkyPillar_4F_EventScript_239692 copyvar VAR_ICE_STEP_COUNT, 0x1 end diff --git a/data/scripts/maps/SkyPillar_5F.inc b/data/scripts/maps/SkyPillar_5F.inc index b31cec23d..8e08fb2bd 100644 --- a/data/scripts/maps/SkyPillar_5F.inc +++ b/data/scripts/maps/SkyPillar_5F.inc @@ -3,7 +3,7 @@ SkyPillar_5F_MapScripts:: @ 82396A2 .byte 0 SkyPillar_5F_MapScript1_2396A8: @ 82396A8 - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 call_if 0, SkyPillar_5F_EventScript_2396B4 return diff --git a/data/scripts/maps/SkyPillar_Outside.inc b/data/scripts/maps/SkyPillar_Outside.inc index c2f211ab8..aa0b51414 100644 --- a/data/scripts/maps/SkyPillar_Outside.inc +++ b/data/scripts/maps/SkyPillar_Outside.inc @@ -5,9 +5,9 @@ SkyPillar_Outside_MapScripts:: @ 82392A8 .byte 0 SkyPillar_Outside_MapScript1_2392B8: @ 82392B8 - compare_var_to_value VAR_0x405E, 3 + compare VAR_0x405E, 3 call_if 1, SkyPillar_Outside_EventScript_2392CF - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 call_if 4, SkyPillar_Outside_EventScript_2392D3 end diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index d5a4e477c..a652c7897 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -11,15 +11,15 @@ SkyPillar_Top_MapScript1_2396C8: @ 82396C8 SkyPillar_Top_EventScript_2396D2:: @ 82396D2 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, SkyPillar_Top_EventScript_27374E removeobject VAR_LAST_TALKED return SkyPillar_Top_MapScript1_2396E6: @ 82396E6 - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 call_if 0, SkyPillar_Top_EventScript_2396FD - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 call_if 4, SkyPillar_Top_EventScript_239705 end @@ -53,15 +53,15 @@ SkyPillar_Top_EventScript_239722:: @ 8239722 waitmoncry setwildbattle SPECIES_RAYQUAZA, 70, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SkyPillar_Top_EventScript_239768 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq SkyPillar_Top_EventScript_239771 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq SkyPillar_Top_EventScript_239771 setflag FLAG_0x1C0 releaseall diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 10c809947..304e4decc 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -6,9 +6,9 @@ SlateportCity_MapScripts:: @ 81DCC61 SlateportCity_MapScript1_1DCC6C: @ 81DCC6C setvar VAR_0x40AA, 0 call SlateportCity_EventScript_1DCC8D - compare_var_to_value VAR_0x4058, 1 + compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCC99 - compare_var_to_value VAR_0x40D2, 1 + compare VAR_0x40D2, 1 call_if 1, SlateportCity_EventScript_1DCCE7 end @@ -38,7 +38,7 @@ SlateportCity_EventScript_1DCC99:: @ 81DCC99 SlateportCity_EventScript_1DCCE7:: @ 81DCCE7 setflag FLAG_SPECIAL_FLAG_0x4000 getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 30 + compare VAR_0x8004, 30 goto_eq SlateportCity_EventScript_1DCD06 setobjectxyperm 35, 23, 27 setobjectmovementtype 35, 10 @@ -143,10 +143,10 @@ SlateportCity_EventScript_1DCDE4:: @ 81DCDE4 bufferleadmonspeciesname 0 msgbox SlateportCity_Text_1DD68A, 4 specialvar VAR_RESULT, sub_8139348 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, SlateportCity_EventScript_1DCE38 specialvar VAR_RESULT, sub_81393C8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, SlateportCity_EventScript_1DCE2E msgbox SlateportCity_Text_1DD697, 4 playfanfare BGM_FANFA4 @@ -170,7 +170,7 @@ SlateportCity_EventScript_1DCE38:: @ 81DCE38 SlateportCity_EventScript_1DCE42:: @ 81DCE42 lock faceplayer - compare_var_to_value VAR_0x4058, 1 + compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCE59 msgbox SlateportCity_Text_1DD81A, 4 release @@ -184,7 +184,7 @@ SlateportCity_EventScript_1DCE59:: @ 81DCE59 SlateportCity_EventScript_1DCE63:: @ 81DCE63 lock faceplayer - compare_var_to_value VAR_0x4058, 1 + compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCE7A msgbox SlateportCity_Text_1DD8A6, 4 release @@ -198,7 +198,7 @@ SlateportCity_EventScript_1DCE7A:: @ 81DCE7A SlateportCity_EventScript_1DCE84:: @ 81DCE84 lock faceplayer - compare_var_to_value VAR_0x4058, 1 + compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCEA4 checkflag FLAG_0x060 goto_eq SlateportCity_EventScript_1DCEAE @@ -219,7 +219,7 @@ SlateportCity_EventScript_1DCEAE:: @ 81DCEAE SlateportCity_EventScript_1DCEB8:: @ 81DCEB8 lock faceplayer - compare_var_to_value VAR_0x4058, 1 + compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCECF msgbox SlateportCity_Text_1DDA34, 4 release @@ -231,7 +231,7 @@ SlateportCity_EventScript_1DCECF:: @ 81DCECF end SlateportCity_EventScript_1DCED9:: @ 81DCED9 - compare_var_to_value VAR_0x4058, 1 + compare VAR_0x4058, 1 goto_eq SlateportCity_EventScript_1DCEED msgbox SlateportCity_Text_1DDA9A, 2 end @@ -243,7 +243,7 @@ SlateportCity_EventScript_1DCEED:: @ 81DCEED SlateportCity_EventScript_1DCEF6:: @ 81DCEF6 lock faceplayer - compare_var_to_value VAR_0x4058, 1 + compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCF0D msgbox SlateportCity_Text_1DDB21, 4 release @@ -328,7 +328,7 @@ SlateportCity_EventScript_1DCFB2:: @ 81DCFB2 SlateportCity_EventScript_1DCFBB:: @ 81DCFBB lock faceplayer - compare_var_to_value VAR_0x4058, 1 + compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCFD2 msgbox SlateportCity_Text_1DE10E, 4 release @@ -740,7 +740,7 @@ SlateportCity_EventScript_1DD36E:: @ 81DD36E SlateportCity_EventScript_1DD39A:: @ 81DD39A setvar VAR_0x8004, 1 specialvar VAR_RESULT, sub_80246D4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_EventScript_1DD3C0 msgbox SlateportCity_Text_1DEE40, 4 special sub_80248B0 @@ -859,20 +859,20 @@ SlateportCity_EventScript_1DD54A:: @ 81DD54A SlateportCity_EventScript_1DD557:: @ 81DD557 msgbox SlateportCity_Text_1DEE90, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_EventScript_1DD3CA copyvar VAR_0x8004, VAR_0x8009 specialvar VAR_RESULT, sub_80246D4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_EventScript_1DD5CE giveitem_std VAR_0x8008 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_EventScript_1DD5C1 copyvar VAR_0x8004, VAR_0x8009 special sub_802477C special sub_802488C msgbox SlateportCity_Text_1DEEF7, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_EventScript_1DD3CA msgbox SlateportCity_Text_1DEF79, 4 special sub_8024918 diff --git a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc index 6917cac5d..e0c6da76c 100644 --- a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc +++ b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc @@ -10,9 +10,9 @@ SlateportCity_BattleTentBattleRoom_MapScript1_209970: @ 8209970 SlateportCity_BattleTentBattleRoom_EventScript_209976:: @ 8209976 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_BattleTentBattleRoom_EventScript_20998E - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_BattleTentBattleRoom_EventScript_209994 return @@ -54,7 +54,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE msgbox 0x2021fc4, 4 waitmessage closemessage - special sp000_heal_pokemon + special HealPlayerParty setvar VAR_0x8004, 6 setvar VAR_0x8005, 0 special sub_8163AC4 diff --git a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc index 2d14359f0..e1f464368 100644 --- a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc +++ b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc @@ -9,7 +9,7 @@ SlateportCity_BattleTentCorridor_MapScript2_208E31: @ 8208E31 SlateportCity_BattleTentCorridor_EventScript_208E3B:: @ 8208E3B setvar VAR_0x4001, 1 - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 goto_if 5, SlateportCity_BattleTentCorridor_EventScript_208E56 setobjectxy 1, 2, 2 turnobject 1, 1 @@ -23,13 +23,13 @@ SlateportCity_BattleTentCorridor_MapScript2_208E5B: @ 8208E5B .2byte 0 SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65 - compare_var_to_value VAR_0x8006, 1 + compare VAR_0x8006, 1 goto_eq SlateportCity_BattleTentCorridor_EventScript_208EEE setvar VAR_0x4000, 1 applymovement 1, SlateportCity_BattleTentCorridor_Movement_209062 applymovement 255, SlateportCity_BattleTentCorridor_Movement_209059 waitmovement 0 - compare_var_to_value VAR_0x8006, 2 + compare VAR_0x8006, 2 goto_eq SlateportCity_BattleTentCorridor_EventScript_209044 setvar VAR_0x8004, 9 special sub_81B9D08 @@ -65,15 +65,15 @@ SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE msgbox SlateportCity_BattleTentCorridor_Text_25A22D, 4 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, SlateportCity_BattleTentCorridor_EventScript_209014 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, SlateportCity_BattleTentCorridor_EventScript_20901B multichoice 20, 6, 104, 1 switch VAR_RESULT @@ -111,7 +111,7 @@ SlateportCity_BattleTentCorridor_EventScript_208FF1:: @ 8208FF1 setvar VAR_0x8004, 7 special sub_81B9D08 waitstate - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_BattleTentCorridor_EventScript_208EB4 msgbox SlateportCity_BattleTentCorridor_Text_25AB6C, 4 goto SlateportCity_BattleTentCorridor_EventScript_208EB4 diff --git a/data/scripts/maps/SlateportCity_BattleTentLobby.inc b/data/scripts/maps/SlateportCity_BattleTentLobby.inc index 24c685c6e..985251556 100644 --- a/data/scripts/maps/SlateportCity_BattleTentLobby.inc +++ b/data/scripts/maps/SlateportCity_BattleTentLobby.inc @@ -120,7 +120,7 @@ SlateportCity_BattleTentLobby_EventScript_2088AA:: @ 82088AA faceplayer setvar VAR_0x8004, 1 special sub_81B9D08 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, SlateportCity_BattleTentLobby_EventScript_2087E9 special copy_player_party_to_sav1 msgbox SlateportCity_BattleTentLobby_Text_2C5810, 4 @@ -167,7 +167,7 @@ SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950 delay 2 call SlateportCity_BattleTentLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_BattleTentLobby_EventScript_208A14 setvar VAR_0x8006, 0 @@ -249,7 +249,7 @@ SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D goto_eq SlateportCity_BattleTentLobby_EventScript_208A74 msgbox SlateportCity_BattleTentLobby_Text_208B4E, 4 giveitem_std ITEM_TM41 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_BattleTentLobby_EventScript_272054 setflag FLAG_0x109 msgbox SlateportCity_BattleTentLobby_Text_208C5C, 4 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index f6bfe736e..aa8704027 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -5,7 +5,7 @@ SlateportCity_Harbor_MapScripts:: @ 820C97D SlateportCity_Harbor_MapScript1_20C983: @ 820C983 setescapewarp SLATEPORT_CITY, 255, 28, 13 setvar VAR_0x4001, 0 - compare_var_to_value VAR_0x40A0, 1 + compare VAR_0x40A0, 1 call_if 1, SlateportCity_Harbor_EventScript_20C9A9 checkflag FLAG_SYS_GAME_CLEAR call_if 1, SlateportCity_Harbor_EventScript_20C9A5 @@ -66,13 +66,13 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 setvar VAR_0x40A0, 2 setflag FLAG_0x061 setflag FLAG_0x313 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, SlateportCity_Harbor_EventScript_20CA89 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, SlateportCity_Harbor_EventScript_20CA9E - compare_var_to_value VAR_0x8008, 2 + compare VAR_0x8008, 2 call_if 1, SlateportCity_Harbor_EventScript_20CAB3 - compare_var_to_value VAR_0x8008, 3 + compare VAR_0x8008, 3 call_if 1, SlateportCity_Harbor_EventScript_20CAB3 msgbox SlateportCity_Harbor_Text_20D35A, 4 closemessage @@ -201,7 +201,7 @@ SlateportCity_Harbor_EventScript_20CB88:: @ 820CB88 SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 msgbox SlateportCity_Harbor_Text_20CF93, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CBDD setvar VAR_PORTHOLE, 1 call SlateportCity_Harbor_EventScript_20CBE9 @@ -212,7 +212,7 @@ SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 SlateportCity_Harbor_EventScript_20CBBA:: @ 820CBBA msgbox SlateportCity_Harbor_Text_20CFAE, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CBDD call SlateportCity_Harbor_EventScript_20CBE9 warp BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67 @@ -233,9 +233,9 @@ SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 waitmovement 0 delay 30 hideobjectat VAR_LAST_TALKED, SLATEPORT_CITY_HARBOR - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, SlateportCity_Harbor_EventScript_20CC42 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, SlateportCity_Harbor_EventScript_20CC37 delay 30 hideobjectat 255, PETALBURG_CITY @@ -277,7 +277,7 @@ SlateportCity_Harbor_EventScript_20CC52:: @ 820CC52 call_if 1, SlateportCity_Harbor_EventScript_20CC93 checkflag FLAG_0x1BF call_if 1, SlateportCity_Harbor_EventScript_20CC93 - compare_var_to_value VAR_0x8004, 2 + compare VAR_0x8004, 2 goto_eq SlateportCity_Harbor_EventScript_20CC89 msgbox SlateportCity_Harbor_Text_20D08E, 4 release @@ -305,7 +305,7 @@ SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 goto_eq SlateportCity_Harbor_EventScript_20CCF6 checkflag FLAG_0x070 goto_eq SlateportCity_Harbor_EventScript_20CCE9 - compare_var_to_value VAR_0x40A0, 2 + compare VAR_0x40A0, 2 goto_eq SlateportCity_Harbor_EventScript_20CCDF msgbox SlateportCity_Harbor_Text_20D232, 4 closemessage @@ -331,10 +331,10 @@ SlateportCity_Harbor_EventScript_20CCF6:: @ 820CCF6 end SlateportCity_Harbor_EventScript_20CD00:: @ 820CD00 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 goto_eq SlateportCity_Harbor_EventScript_20CE11 checkitem ITEM_SCANNER, 1 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_Harbor_EventScript_20CD38 checkflag FLAG_SYS_GAME_CLEAR goto_eq SlateportCity_Harbor_EventScript_20CD2E @@ -364,10 +364,10 @@ SlateportCity_Harbor_EventScript_20CD44:: @ 820CD44 SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B msgbox SlateportCity_Harbor_Text_20D8BC, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_TOOTH - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_272054 takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_20D94A, 4 @@ -377,10 +377,10 @@ SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB msgbox SlateportCity_Harbor_Text_20D8F1, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_SCALE - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_272054 takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_20D94A, 4 diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index c6fcff184..f8ae54145 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -5,9 +5,9 @@ SlateportCity_House1_EventScript_209AA5:: @ 8209AA5 lock faceplayer msgbox SlateportCity_House1_Text_209B8E, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209AC6 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_House1_EventScript_209AE9 end @@ -15,9 +15,9 @@ SlateportCity_House1_EventScript_209AC6:: @ 8209AC6 msgbox SlateportCity_House1_Text_209BFF, 4 special sub_81B94B0 waitstate - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_if 5, SlateportCity_House1_EventScript_209AF3 - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq SlateportCity_House1_EventScript_209AE9 end @@ -28,20 +28,20 @@ SlateportCity_House1_EventScript_209AE9:: @ 8209AE9 SlateportCity_House1_EventScript_209AF3:: @ 8209AF3 specialvar VAR_RESULT, sub_81396E0 - compare_var_to_value VAR_RESULT, 412 + compare VAR_RESULT, 412 goto_eq SlateportCity_House1_EventScript_209B46 special TV_CopyNicknameToStringVar1AndEnsureTerminated special TV_CheckMonOTIDEqualsPlayerID - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209B50 specialvar VAR_RESULT, sub_8139770 special TV_CopyNicknameToStringVar1AndEnsureTerminated - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209B50 msgbox SlateportCity_House1_Text_209C2B, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209B5A - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_House1_EventScript_209AE9 end @@ -60,7 +60,7 @@ SlateportCity_House1_EventScript_209B5A:: @ 8209B5A call SlateportCity_House1_EventScript_2723DD specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209B84 msgbox SlateportCity_House1_Text_209D5E, 4 release diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 065951712..ba8575c66 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -22,7 +22,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0 SlateportCity_OceanicMuseum_1F_EventScript_20ADC1:: @ 820ADC1 showmoneybox 0, 0, 0 msgbox SlateportCity_OceanicMuseum_1F_Text_20AFD5, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20ADE8 closemessage hidemoneybox @@ -35,7 +35,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADC1:: @ 820ADC1 SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 checkmoney 0x32, 0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AE18 playse SE_REGI takemoney 0x32, 0 @@ -162,18 +162,18 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, 4 giveitem_std ITEM_TM46 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AFB5 setflag FLAG_0x10D msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, 4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF6C - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF83 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 463c7235c..75f967fef 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -16,21 +16,21 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE8 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF5 waitmovement 0 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92 msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, 4 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_20BC9D msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, 4 msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, 4 closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCE2 waitmovement 0 - compare_var_to_value VAR_FACING, 1 + compare VAR_FACING, 1 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCA8 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCB3 trainerbattle 3, TRAINER_GRUNT_14, 0, SlateportCity_OceanicMuseum_2F_Text_20BEE2 msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, 4 @@ -78,10 +78,10 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 fadescreen 1 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty removeobject 1 setflag FLAG_0x384 - compare_var_to_value VAR_0x40DA, 0 + compare VAR_0x40DA, 0 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC8C setflag FLAG_0x095 clearflag FLAG_0x3B3 diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 227853c96..19094db0d 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -33,9 +33,9 @@ SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5 call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 checkflag FLAG_0x0C8 call_if 1, SlateportCity_PokemonFanClub_EventScript_209FD0 - compare_var_to_value VAR_0x4002, 5 + compare VAR_0x4002, 5 call_if 1, SlateportCity_PokemonFanClub_EventScript_209FCA - compare_var_to_value VAR_0x40B7, 2 + compare VAR_0x40B7, 2 goto_eq SlateportCity_PokemonFanClub_EventScript_209F3B msgbox SlateportCity_PokemonFanClub_Text_20A62A, 4 goto SlateportCity_PokemonFanClub_EventScript_209F45 @@ -85,7 +85,7 @@ SlateportCity_PokemonFanClub_EventScript_209FD6:: @ 8209FD6 SlateportCity_PokemonFanClub_EventScript_209FE0:: @ 8209FE0 checkitemspace ITEM_RED_SCARF, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 setflag FLAG_0x0C8 @@ -96,7 +96,7 @@ SlateportCity_PokemonFanClub_EventScript_209FE0:: @ 8209FE0 SlateportCity_PokemonFanClub_EventScript_20A011:: @ 820A011 checkitemspace ITEM_BLUE_SCARF, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 setflag FLAG_0x0C9 @@ -107,7 +107,7 @@ SlateportCity_PokemonFanClub_EventScript_20A011:: @ 820A011 SlateportCity_PokemonFanClub_EventScript_20A042:: @ 820A042 checkitemspace ITEM_PINK_SCARF, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 setflag FLAG_0x0CA @@ -118,7 +118,7 @@ SlateportCity_PokemonFanClub_EventScript_20A042:: @ 820A042 SlateportCity_PokemonFanClub_EventScript_20A073:: @ 820A073 checkitemspace ITEM_GREEN_SCARF, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 setflag FLAG_0x0CB @@ -129,7 +129,7 @@ SlateportCity_PokemonFanClub_EventScript_20A073:: @ 820A073 SlateportCity_PokemonFanClub_EventScript_20A0A4:: @ 820A0A4 checkitemspace ITEM_YELLOW_SCARF, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 setflag FLAG_0x0CC @@ -145,7 +145,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0D5:: @ 820A0D5 SlateportCity_PokemonFanClub_EventScript_20A0DF:: @ 820A0DF specialvar VAR_RESULT, sub_8139004 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A0F0 return @@ -155,7 +155,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0F0:: @ 820A0F0 SlateportCity_PokemonFanClub_EventScript_20A0F6:: @ 820A0F6 specialvar VAR_RESULT, sub_8139030 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A107 return @@ -165,7 +165,7 @@ SlateportCity_PokemonFanClub_EventScript_20A107:: @ 820A107 SlateportCity_PokemonFanClub_EventScript_20A10D:: @ 820A10D specialvar VAR_RESULT, sub_813905C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A11E return @@ -175,7 +175,7 @@ SlateportCity_PokemonFanClub_EventScript_20A11E:: @ 820A11E SlateportCity_PokemonFanClub_EventScript_20A124:: @ 820A124 specialvar VAR_RESULT, sub_8139088 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A135 return @@ -185,7 +185,7 @@ SlateportCity_PokemonFanClub_EventScript_20A135:: @ 820A135 SlateportCity_PokemonFanClub_EventScript_20A13B:: @ 820A13B specialvar VAR_RESULT, sub_81390B4 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_20A14C return @@ -218,7 +218,7 @@ SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E goto_eq SlateportCity_PokemonFanClub_EventScript_20A1DE msgbox SlateportCity_PokemonFanClub_Text_20AA77, 4 specialvar VAR_RESULT, sub_8138C04 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_if 4, SlateportCity_PokemonFanClub_EventScript_20A1A3 release end @@ -231,7 +231,7 @@ SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 waitmovement 0 msgbox SlateportCity_PokemonFanClub_Text_20AB63, 4 giveitem_std ITEM_SOOTHE_BELL - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_272054 setflag FLAG_0x116 release diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index d9eaee6eb..2883c5c2a 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -36,31 +36,31 @@ SootopolisCity_EventScript_1E56E5:: @ 81E56E5 SootopolisCity_MapScript1_1E56EF: @ 81E56EF setflag FLAG_VISITED_SOOTOPOLIS_CITY - compare_var_to_value VAR_0x405E, 1 + compare VAR_0x405E, 1 call_if 1, SootopolisCity_EventScript_1E5781 - compare_var_to_value VAR_0x40CA, 1 + compare VAR_0x40CA, 1 call_if 1, SootopolisCity_EventScript_1E5781 call SootopolisCity_EventScript_1E5805 call SootopolisCity_EventScript_1E57B2 - compare_var_to_value VAR_0x405E, 1 + compare VAR_0x405E, 1 call_if 1, SootopolisCity_EventScript_1E5785 - compare_var_to_value VAR_0x405E, 2 + compare VAR_0x405E, 2 call_if 1, SootopolisCity_EventScript_1E5785 - compare_var_to_value VAR_0x405E, 3 + compare VAR_0x405E, 3 call_if 1, SootopolisCity_EventScript_1E5785 - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 call_if 1, SootopolisCity_EventScript_1E5785 - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 call_if 1, SootopolisCity_EventScript_1E5785 - compare_var_to_value VAR_0x405E, 2 + compare VAR_0x405E, 2 call_if 1, SootopolisCity_EventScript_1E5842 - compare_var_to_value VAR_0x405E, 3 + compare VAR_0x405E, 3 call_if 1, SootopolisCity_EventScript_1E5842 - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 call_if 1, SootopolisCity_EventScript_1E585B - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 call_if 1, SootopolisCity_EventScript_1E5871 - compare_var_to_value VAR_0x405E, 6 + compare VAR_0x405E, 6 call_if 1, SootopolisCity_EventScript_1E58D3 end @@ -80,19 +80,19 @@ SootopolisCity_EventScript_1E5785:: @ 81E5785 return SootopolisCity_EventScript_1E57B2:: @ 81E57B2 - compare_var_to_value VAR_0x405E, 0 + compare VAR_0x405E, 0 goto_eq SootopolisCity_EventScript_1E5800 - compare_var_to_value VAR_0x405E, 6 + compare VAR_0x405E, 6 goto_if 4, SootopolisCity_EventScript_1E5800 - compare_var_to_value VAR_0x405E, 1 + compare VAR_0x405E, 1 goto_eq SootopolisCity_EventScript_1E5801 - compare_var_to_value VAR_0x405E, 2 + compare VAR_0x405E, 2 goto_eq SootopolisCity_EventScript_1E5801 - compare_var_to_value VAR_0x405E, 3 + compare VAR_0x405E, 3 goto_eq SootopolisCity_EventScript_1E5801 - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 goto_eq SootopolisCity_EventScript_1E5801 - compare_var_to_value VAR_0x40CA, 1 + compare VAR_0x40CA, 1 goto_if 3, SootopolisCity_EventScript_1E5801 return @@ -104,15 +104,15 @@ SootopolisCity_EventScript_1E5801:: @ 81E5801 return SootopolisCity_EventScript_1E5805:: @ 81E5805 - compare_var_to_value VAR_0x405E, 0 + compare VAR_0x405E, 0 goto_eq SootopolisCity_EventScript_1E583D - compare_var_to_value VAR_0x405E, 6 + compare VAR_0x405E, 6 goto_if 4, SootopolisCity_EventScript_1E583D - compare_var_to_value VAR_0x405E, 1 + compare VAR_0x405E, 1 goto_eq SootopolisCity_EventScript_1E583E - compare_var_to_value VAR_0x40CA, 1 + compare VAR_0x40CA, 1 goto_eq SootopolisCity_EventScript_1E583E - compare_var_to_value VAR_0x40CA, 1 + compare VAR_0x40CA, 1 goto_if 3, SootopolisCity_EventScript_27207A return @@ -144,11 +144,11 @@ SootopolisCity_EventScript_1E5871:: @ 81E5871 setobjectxyperm 7, 29, 33 setobjectxyperm 16, 33, 35 setobjectxyperm 17, 34, 35 - compare_var_to_value VAR_0x40D8, 0 + compare VAR_0x40D8, 0 call_if 1, SootopolisCity_EventScript_1E58AF - compare_var_to_value VAR_0x40D8, 1 + compare VAR_0x40D8, 1 call_if 1, SootopolisCity_EventScript_1E58BB - compare_var_to_value VAR_0x40D8, 2 + compare VAR_0x40D8, 2 call_if 1, SootopolisCity_EventScript_1E58C7 return @@ -176,9 +176,9 @@ SootopolisCity_MapScript2_1E58DB: @ 81E58DB .2byte 0 SootopolisCity_EventScript_1E58E5:: @ 81E58E5 - compare_var_to_value VAR_0x40CA, 1 + compare VAR_0x40CA, 1 call_if 1, SootopolisCity_EventScript_1E58FC - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 call_if 1, SootopolisCity_EventScript_1E5901 end @@ -203,9 +203,9 @@ SootopolisCity_MapScript2_1E5914: @ 81E5914 SootopolisCity_EventScript_1E5926:: @ 81E5926 lockall special sub_8138AD0 - compare_var_to_value VAR_0x8004, 43 + compare VAR_0x8004, 43 goto_if 5, SootopolisCity_EventScript_1E5A82 - compare_var_to_value VAR_0x8005, 32 + compare VAR_0x8005, 32 goto_if 5, SootopolisCity_EventScript_1E5A82 goto SootopolisCity_EventScript_1E5946 end @@ -493,9 +493,9 @@ SootopolisCity_Movement_1E5BF7: @ 81E5BF7 SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE lockall special sub_8138AD0 - compare_var_to_value VAR_0x8004, 43 + compare VAR_0x8004, 43 goto_if 5, SootopolisCity_EventScript_1E5CCE - compare_var_to_value VAR_0x8005, 32 + compare VAR_0x8005, 32 goto_if 5, SootopolisCity_EventScript_1E5CCE goto SootopolisCity_EventScript_1E5C1E end @@ -698,11 +698,11 @@ SootopolisCity_Movement_1E5E7F: @ 81E5E7F SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D lock faceplayer - compare_var_to_value VAR_0x405E, 6 + compare VAR_0x405E, 6 goto_if 4, SootopolisCity_EventScript_1E5EC4 - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E5ECE - compare_var_to_value VAR_0x405E, 2 + compare VAR_0x405E, 2 goto_if 4, SootopolisCity_EventScript_1E5EBA msgbox SootopolisCity_Text_1E6D77, 4 release @@ -726,11 +726,11 @@ SootopolisCity_EventScript_1E5ECE:: @ 81E5ECE SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8 lock faceplayer - compare_var_to_value VAR_0x405E, 1 + compare VAR_0x405E, 1 goto_if 3, SootopolisCity_EventScript_1E5F1B - compare_var_to_value VAR_0x405E, 6 + compare VAR_0x405E, 6 goto_if 4, SootopolisCity_EventScript_1E5F1B - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E5F10 msgbox SootopolisCity_Text_1E6BFF, 4 closemessage @@ -755,20 +755,20 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_EventScript_272054 setflag FLAG_0x932 msgbox SootopolisCity_Text_2A7C7C, 4 random 2 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_EventScript_1E5F79 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SootopolisCity_EventScript_1E5F9A end SootopolisCity_EventScript_1E5F79:: @ 81E5F79 giveitem_std ITEM_FIGY_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_EventScript_272054 msgbox SootopolisCity_Text_2A7CB7, 4 release @@ -776,7 +776,7 @@ SootopolisCity_EventScript_1E5F79:: @ 81E5F79 SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A giveitem_std ITEM_IAPAPA_BERRY - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_EventScript_272054 msgbox SootopolisCity_Text_2A7CB7, 4 release @@ -784,7 +784,7 @@ SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A SootopolisCity_EventScript_1E5FBB:: @ 81E5FBB msgbox SootopolisCity_Text_2A7CEC, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SootopolisCity_EventScript_1E5FD8 msgbox SootopolisCity_Text_2A7DD2, 4 release @@ -799,7 +799,7 @@ SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2 lockall applymovement 2, SootopolisCity_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E600D msgbox SootopolisCity_Text_1E71A1, 4 closemessage @@ -816,7 +816,7 @@ SootopolisCity_EventScript_1E600D:: @ 81E600D SootopolisCity_EventScript_1E6017:: @ 81E6017 lock faceplayer - compare_var_to_value VAR_0x405E, 6 + compare VAR_0x405E, 6 goto_if 4, SootopolisCity_EventScript_1E602E msgbox SootopolisCity_Text_1E6CCA, 4 release @@ -830,11 +830,11 @@ SootopolisCity_EventScript_1E602E:: @ 81E602E SootopolisCity_EventScript_1E6038:: @ 81E6038 lock faceplayer - compare_var_to_value VAR_0x405E, 6 + compare VAR_0x405E, 6 goto_if 4, SootopolisCity_EventScript_1E607A - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6084 - compare_var_to_value VAR_0x405E, 2 + compare VAR_0x405E, 2 goto_if 4, SootopolisCity_EventScript_1E6065 msgbox SootopolisCity_Text_1E6F90, 4 release @@ -862,11 +862,11 @@ SootopolisCity_EventScript_1E608E:: @ 81E608E lockall applymovement 4, SootopolisCity_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E60D9 - compare_var_to_value VAR_0x405E, 6 + compare VAR_0x405E, 6 goto_if 4, SootopolisCity_EventScript_1E60CF - compare_var_to_value VAR_0x405E, 1 + compare VAR_0x405E, 1 goto_if 3, SootopolisCity_EventScript_1E60CF msgbox SootopolisCity_Text_1E690B, 4 closemessage @@ -889,13 +889,13 @@ SootopolisCity_EventScript_1E60E3:: @ 81E60E3 lockall applymovement 5, SootopolisCity_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E612D checkflag FLAG_SYS_GAME_CLEAR goto_eq SootopolisCity_EventScript_1E6137 - compare_var_to_value VAR_0x405E, 6 + compare VAR_0x405E, 6 goto_if 4, SootopolisCity_EventScript_1E6141 - compare_var_to_value VAR_0x405E, 1 + compare VAR_0x405E, 1 goto_if 3, SootopolisCity_EventScript_1E6141 msgbox SootopolisCity_Text_1E6692, 4 closemessage @@ -937,11 +937,11 @@ SootopolisCity_EventScript_1E6166:: @ 81E6166 waitmovement 0 checkflag FLAG_0x133 call_if 0, SootopolisCity_EventScript_1E61CC - compare_var_to_value VAR_0x405E, 2 + compare VAR_0x405E, 2 goto_eq SootopolisCity_EventScript_1E61AE - compare_var_to_value VAR_0x405E, 3 + compare VAR_0x405E, 3 goto_eq SootopolisCity_EventScript_1E61C2 - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 goto_eq SootopolisCity_EventScript_1E61C2 checkflag FLAG_0x09E goto_eq SootopolisCity_EventScript_1E61B8 @@ -967,9 +967,9 @@ SootopolisCity_EventScript_1E61C2:: @ 81E61C2 SootopolisCity_EventScript_1E61CC:: @ 81E61CC msgbox SootopolisCity_Text_1E75CB, 4 closemessage - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, SootopolisCity_EventScript_1E6243 - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, SootopolisCity_EventScript_1E6255 msgbox SootopolisCity_Text_1E7737, 4 closemessage @@ -1271,7 +1271,7 @@ SootopolisCity_EventScript_1E635D:: @ 81E635D lockall applymovement 15, SootopolisCity_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6388 msgbox SootopolisCity_Text_1E67DC, 4 closemessage @@ -1288,7 +1288,7 @@ SootopolisCity_EventScript_1E6388:: @ 81E6388 SootopolisCity_EventScript_1E6393:: @ 81E6393 lockall - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E63C7 msgbox SootopolisCity_Text_1E6936, 4 closemessage @@ -1312,7 +1312,7 @@ SootopolisCity_EventScript_1E63DB:: @ 81E63DB lockall applymovement 13, SootopolisCity_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6406 msgbox SootopolisCity_Text_1E6C7C, 4 closemessage @@ -1331,7 +1331,7 @@ SootopolisCity_EventScript_1E6411:: @ 81E6411 lockall applymovement 12, SootopolisCity_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E643C msgbox SootopolisCity_Text_1E6A50, 4 closemessage @@ -1348,7 +1348,7 @@ SootopolisCity_EventScript_1E643C:: @ 81E643C SootopolisCity_EventScript_1E6446:: @ 81E6446 lock faceplayer - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 goto_eq SootopolisCity_EventScript_1E64D8 checkflag FLAG_0x138 goto_eq SootopolisCity_EventScript_1E64E2 @@ -1364,11 +1364,11 @@ SootopolisCity_EventScript_1E646F:: @ 81E646F setflag FLAG_0x138 msgbox SootopolisCity_Text_1E7B86, 4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, SootopolisCity_EventScript_1E64B2 - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, SootopolisCity_EventScript_1E64B2 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, SootopolisCity_EventScript_1E64C5 release end @@ -1409,7 +1409,7 @@ SootopolisCity_Movement_1E64EF: @ 81E64EF SootopolisCity_EventScript_1E64F2:: @ 81E64F2 lockall - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6509 msgbox SootopolisCity_Text_1E72DB, 4 closemessage @@ -1426,7 +1426,7 @@ SootopolisCity_EventScript_1E6509:: @ 81E6509 SootopolisCity_EventScript_1E651F:: @ 81E651F lockall - compare_var_to_value VAR_0x405E, 5 + compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6536 msgbox SootopolisCity_Text_1E7460, 4 closemessage diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index e28d8d13f..81bb9b7c2 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -19,11 +19,11 @@ SootopolisCity_Gym_1F_MapScript1_224E6A: @ 8224E6A end SootopolisCity_Gym_1F_EventScript_224E73:: @ 8224E73 - compare_var_to_value VAR_ICE_STEP_COUNT, 8 + compare VAR_ICE_STEP_COUNT, 8 goto_if 0, SootopolisCity_Gym_1F_EventScript_224ECA - compare_var_to_value VAR_ICE_STEP_COUNT, 28 + compare VAR_ICE_STEP_COUNT, 28 goto_if 0, SootopolisCity_Gym_1F_EventScript_224EB8 - compare_var_to_value VAR_ICE_STEP_COUNT, 67 + compare VAR_ICE_STEP_COUNT, 67 goto_if 0, SootopolisCity_Gym_1F_EventScript_224EA6 setmetatile 8, 4, 519, 0 setmetatile 8, 5, 519, 0 @@ -87,8 +87,8 @@ SootopolisCity_Gym_1F_Movement_224F42: @ 8224F42 SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 trainerbattle 1, TRAINER_JUAN_1, 0, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82 - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq SootopolisCity_Gym_1F_EventScript_225025 checkflag FLAG_0x0AC goto_if 0, SootopolisCity_Gym_1F_EventScript_224FF7 @@ -126,7 +126,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 giveitem_std ITEM_TM03 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_Gym_1F_EventScript_27205E msgbox SootopolisCity_Gym_1F_Text_2256C1, 4 setflag FLAG_0x0AC @@ -134,7 +134,7 @@ SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7 giveitem_std ITEM_TM03 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_Gym_1F_EventScript_272054 msgbox SootopolisCity_Gym_1F_Text_2256C1, 4 setflag FLAG_0x0AC diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc index 57ae7551f..7c898a0b2 100644 --- a/data/scripts/maps/SootopolisCity_House1.inc +++ b/data/scripts/maps/SootopolisCity_House1.inc @@ -8,7 +8,7 @@ SootopolisCity_House1_EventScript_22694D:: @ 822694D goto_eq SootopolisCity_House1_EventScript_226984 msgbox SootopolisCity_House1_Text_2269A1, 4 giveitem_std ITEM_TM31 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_House1_EventScript_272054 setflag FLAG_0x079 msgbox SootopolisCity_House1_Text_226A13, 4 diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/scripts/maps/SootopolisCity_House2.inc index 974dd7892..82270ca56 100644 --- a/data/scripts/maps/SootopolisCity_House2.inc +++ b/data/scripts/maps/SootopolisCity_House2.inc @@ -5,9 +5,9 @@ SootopolisCity_House2_EventScript_226A77:: @ 8226A77 lock faceplayer msgbox SootopolisCity_House2_Text_226AAB, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, SootopolisCity_House2_EventScript_226A99 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, SootopolisCity_House2_EventScript_226AA2 release end diff --git a/data/scripts/maps/SootopolisCity_House3.inc b/data/scripts/maps/SootopolisCity_House3.inc index e3d0c7be3..415f90642 100644 --- a/data/scripts/maps/SootopolisCity_House3.inc +++ b/data/scripts/maps/SootopolisCity_House3.inc @@ -5,7 +5,7 @@ SootopolisCity_House3_EventScript_226B72:: @ 8226B72 lock faceplayer msgbox SootopolisCity_House3_Text_226BA4, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SootopolisCity_House3_EventScript_226B91 msgbox SootopolisCity_House3_Text_226C44, 4 release diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index 185ef284a..38c8456a3 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -7,11 +7,11 @@ SootopolisCity_House6_EventScript_226F5C:: @ 8226F5C checkflag FLAG_0x0F5 goto_eq SootopolisCity_House6_EventScript_226FA3 msgbox SootopolisCity_House6_Text_226FC3, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, SootopolisCity_House6_EventScript_226F99 msgbox SootopolisCity_House6_Text_227034, 4 givedecoration_std 117 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_House6_EventScript_226FAD setflag FLAG_0x0F5 release diff --git a/data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc b/data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc index f8b4c6e2c..26a322b89 100644 --- a/data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc +++ b/data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc @@ -9,14 +9,14 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_22722B:: @ 822722B special sub_81B94B0 waitstate copyvar VAR_RESULT, VAR_0x8004 - compare_var_to_value VAR_RESULT, 255 + compare VAR_RESULT, 255 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227272 special CompareSeedotSize - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_22727C - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227286 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227290 release end @@ -39,7 +39,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_227286:: @ 8227286 SootopolisCity_LotadAndSeedotHouse_EventScript_227290:: @ 8227290 msgbox SootopolisCity_LotadAndSeedotHouse_Text_227480, 4 giveitem_std ITEM_ELIXIR - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_2272B2 closemessage release @@ -58,14 +58,14 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC:: @ 82272BC special sub_81B94B0 waitstate copyvar VAR_RESULT, VAR_0x8004 - compare_var_to_value VAR_RESULT, 255 + compare VAR_RESULT, 255 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227303 special CompareLotadSize - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_22730D - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227317 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227321 release end @@ -88,7 +88,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_227317:: @ 8227317 SootopolisCity_LotadAndSeedotHouse_EventScript_227321:: @ 8227321 msgbox SootopolisCity_LotadAndSeedotHouse_Text_22776C, 4 giveitem_std ITEM_ELIXIR - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227343 closemessage release diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/scripts/maps/SootopolisCity_Mart.inc index b59ab9c93..26ab5497c 100644 --- a/data/scripts/maps/SootopolisCity_Mart.inc +++ b/data/scripts/maps/SootopolisCity_Mart.inc @@ -28,7 +28,7 @@ SootopolisCity_Mart_Pokemart_2267AC: @ 82267AC SootopolisCity_Mart_EventScript_2267C2:: @ 82267C2 lock faceplayer - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 goto_if 4, SootopolisCity_Mart_EventScript_2267E2 checkflag FLAG_0x081 goto_if 0, SootopolisCity_Mart_EventScript_2267E2 @@ -44,7 +44,7 @@ SootopolisCity_Mart_EventScript_2267E2:: @ 82267E2 SootopolisCity_Mart_EventScript_2267EC:: @ 82267EC lock faceplayer - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 goto_if 4, SootopolisCity_Mart_EventScript_22680C checkflag FLAG_0x081 goto_if 0, SootopolisCity_Mart_EventScript_22680C diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc index ccd4558fd..019bdce10 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc @@ -6,9 +6,9 @@ SootopolisCity_MysteryEventsHouse_1F_MapScripts:: @ 8227953 SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E setvar VAR_0x8004, 16 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D - compare_var_to_value VAR_0x40C0, 0 + compare VAR_0x40C0, 0 call_if 5, SootopolisCity_MysteryEventsHouse_1F_EventScript_227991 end @@ -39,11 +39,11 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 moveobjectoffscreen 1 applymovement 255, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6 waitmovement 0 - compare_var_to_value VAR_0x40C0, 1 + compare VAR_0x40C0, 1 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04 - compare_var_to_value VAR_0x40C0, 2 + compare VAR_0x40C0, 2 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D - compare_var_to_value VAR_0x40C0, 3 + compare VAR_0x40C0, 3 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16 special copy_player_party_from_sav1 setvar VAR_0x40C0, 0 @@ -76,9 +76,9 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24:: @ 8227A24 faceplayer setvar VAR_0x8004, 16 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58 msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, 4 release @@ -93,27 +93,27 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 special copy_player_party_to_sav1 special sub_8139238 msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 call SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227CEB, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special copy_player_party_from_sav1 call SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special copy_player_party_to_sav1 special sub_80F94E8 msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, 4 closemessage - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22 warp SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1 waitstate diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc index 94733f189..f5b867405 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc @@ -22,14 +22,14 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 setvar VAR_0x8005, 0 special sub_8163AC4 waitstate - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8 closemessage - special sp000_heal_pokemon + special HealPlayerParty applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9 waitmovement 0 special copy_player_party_from_sav1 diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index b1b405335..fcb1b5863 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -18,7 +18,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_226500:: @ 8226500 SootopolisCity_PokemonCenter_1F_EventScript_22650E:: @ 822650E lock faceplayer - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 goto_if 4, SootopolisCity_PokemonCenter_1F_EventScript_22652E checkflag FLAG_0x081 goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_22652E @@ -34,7 +34,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_22652E:: @ 822652E SootopolisCity_PokemonCenter_1F_EventScript_226538:: @ 8226538 lock faceplayer - compare_var_to_value VAR_0x40CA, 2 + compare VAR_0x40CA, 2 goto_if 4, SootopolisCity_PokemonCenter_1F_EventScript_226558 checkflag FLAG_0x081 goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_226558 diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index de56c294b..ba1c6caec 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -10,7 +10,7 @@ SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 lock faceplayer msgbox SouthernIsland_Exterior_Text_2A69F1, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SouthernIsland_Exterior_EventScript_242A17 msgbox SouthernIsland_Exterior_Text_2A6A5D, 4 closemessage diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 1853c08b8..057c4581d 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -10,15 +10,15 @@ SouthernIsland_Interior_MapScript1_242A50: @ 8242A50 SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, SouthernIsland_Interior_EventScript_27374E removeobject 2 return SouthernIsland_Interior_MapScript1_242A6E: @ 8242A6E - compare_var_to_value VAR_0x40D5, 0 + compare VAR_0x40D5, 0 call_if 1, SouthernIsland_Interior_EventScript_242A8A - compare_var_to_value VAR_0x40D5, 0 + compare VAR_0x40D5, 0 call_if 5, SouthernIsland_Interior_EventScript_242A95 call SouthernIsland_Interior_EventScript_242AA0 end @@ -35,9 +35,9 @@ SouthernIsland_Interior_EventScript_242A95:: @ 8242A95 SouthernIsland_Interior_EventScript_242AA0:: @ 8242AA0 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq SouthernIsland_Interior_EventScript_242AB8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SouthernIsland_Interior_EventScript_242ABE end @@ -82,20 +82,20 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 delay 50 special RemoveScriptFieldObject setvar VAR_LAST_TALKED, 2 - compare_var_to_value VAR_0x40D5, 0 + compare VAR_0x40D5, 0 call_if 1, SouthernIsland_Interior_EventScript_242BA4 - compare_var_to_value VAR_0x40D5, 0 + compare VAR_0x40D5, 0 call_if 5, SouthernIsland_Interior_EventScript_242BB7 setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B08EC + special BattleSetup_StartLatiBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq SouthernIsland_Interior_EventScript_242B81 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq SouthernIsland_Interior_EventScript_242B8F - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq SouthernIsland_Interior_EventScript_242B8F setflag FLAG_0x1C9 releaseall diff --git a/data/scripts/maps/TerraCave_End.inc b/data/scripts/maps/TerraCave_End.inc index a39856dda..63fc07f5b 100644 --- a/data/scripts/maps/TerraCave_End.inc +++ b/data/scripts/maps/TerraCave_End.inc @@ -10,7 +10,7 @@ TerraCave_End_MapScript1_23B0BB: @ 823B0BB TerraCave_End_EventScript_23B0C5:: @ 823B0C5 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 7 + compare VAR_RESULT, 7 goto_if 5, TerraCave_End_EventScript_27374E removeobject 1 return @@ -38,16 +38,16 @@ TerraCave_End_EventScript_23B0EC:: @ 823B0EC setvar VAR_LAST_TALKED, 1 setwildbattle SPECIES_GROUDON, 70, ITEM_NONE setflag FLAG_SYS_CTRL_OBJ_DELETE - special sub_80B0934 + special BattleSetup_StartLegendaryBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE setvar VAR_0x4001, 0 specialvar VAR_RESULT, sub_8138B80 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq TerraCave_End_EventScript_23B155 - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 goto_eq TerraCave_End_EventScript_23B163 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq TerraCave_End_EventScript_23B163 setvar VAR_0x4039, 1 setflag FLAG_0x1BF diff --git a/data/scripts/maps/TrainerHill_Elevator.inc b/data/scripts/maps/TrainerHill_Elevator.inc index 5efad0b86..c3644e0de 100644 --- a/data/scripts/maps/TrainerHill_Elevator.inc +++ b/data/scripts/maps/TrainerHill_Elevator.inc @@ -24,7 +24,7 @@ TrainerHill_Elevator_EventScript_269375:: @ 8269375 waitmovement 0 lockall msgbox TrainerHill_Elevator_Text_268F3E, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq TrainerHill_Elevator_EventScript_269360 releaseall applymovement 1, TrainerHill_Elevator_Movement_2693F0 diff --git a/data/scripts/maps/TrainerHill_Entrance.inc b/data/scripts/maps/TrainerHill_Entrance.inc index d4cc8a2ba..38ae5b85f 100644 --- a/data/scripts/maps/TrainerHill_Entrance.inc +++ b/data/scripts/maps/TrainerHill_Entrance.inc @@ -20,7 +20,7 @@ TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0 setvar VAR_0x4000, 0 setvar VAR_0x8004, 9 special sp194_trainer_tower - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq TrainerHill_Entrance_EventScript_2680FF setobjectxy 255, 9, 6 applymovement 255, TrainerHill_Entrance_Movement_26837F @@ -29,7 +29,7 @@ TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0 TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF setvar VAR_0x8004, 16 special sp194_trainer_tower - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq TrainerHill_Entrance_EventScript_26811A applymovement 255, TrainerHill_Entrance_Movement_26837F end @@ -45,7 +45,7 @@ TrainerHill_Entrance_MapScript1_26811B: @ 826811B end TrainerHill_Entrance_MapScript1_268128: @ 8268128 - compare_var_to_value VAR_0x400D, 17 + compare VAR_0x400D, 17 call_if 1, TrainerHill_Entrance_EventScript_268134 end @@ -97,7 +97,7 @@ TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA applymovement 255, TrainerHill_Entrance_Movement_268381 waitmovement 0 setvar VAR_0x40D6, 0 - special sp000_heal_pokemon + special HealPlayerParty releaseall TrainerHill_Entrance_EventScript_2681EE:: @ 82681EE @@ -116,7 +116,7 @@ TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD faceplayer setvar VAR_0x8004, 10 special sp194_trainer_tower - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq TrainerHill_Entrance_EventScript_26821F msgbox TrainerHill_Entrance_Text_2686F4, 4 goto TrainerHill_Entrance_EventScript_268227 @@ -136,11 +136,11 @@ TrainerHill_Entrance_EventScript_268229:: @ 8268229 msgbox TrainerHill_Entrance_Text_2684C6, 4 setvar VAR_0x8004, 13 special sp194_trainer_tower - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, TrainerHill_Entrance_EventScript_26832E setvar VAR_0x8004, 8 special sp194_trainer_tower - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq TrainerHill_Entrance_EventScript_268275 msgbox TrainerHill_Entrance_Text_268564, 4 goto TrainerHill_Entrance_EventScript_26827D @@ -174,7 +174,7 @@ TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8 special sp194_trainer_tower setvar VAR_0x40D6, 1 setvar VAR_0x4005, 0 - special sp000_heal_pokemon + special HealPlayerParty msgbox TrainerHill_Entrance_Text_26862A, 4 setvar VAR_0x8004, 0 special sp194_trainer_tower @@ -196,7 +196,7 @@ TrainerHill_Entrance_EventScript_26832E:: @ 826832E special sp194_trainer_tower setvar VAR_0x4005, 1 call TrainerHill_Entrance_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq TrainerHill_Entrance_EventScript_26835C setvar VAR_0x8004, 14 special sp194_trainer_tower diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index 607a8e04d..f8c7b02af 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -4,9 +4,9 @@ Underwater_SealedChamber_MapScripts:: @ 82390C4 Underwater_SealedChamber_MapScript1_2390CA: @ 82390CA getplayerxy VAR_0x8004, VAR_0x8005 - compare_var_to_value VAR_0x8004, 12 + compare VAR_0x8004, 12 goto_if 5, Underwater_SealedChamber_EventScript_2390EA - compare_var_to_value VAR_0x8005, 44 + compare VAR_0x8005, 44 goto_if 5, Underwater_SealedChamber_EventScript_2390EA goto Underwater_SealedChamber_EventScript_2390F3 diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index ccecbbba6..32094137a 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -19,15 +19,15 @@ LinkContestRoom1_MapScript1_23B79F: @ 823B79F LinkContestRoom1_EventScript_23B7AF:: @ 823B7AF call LinkContestRoom1_EventScript_27A133 special sub_80F8FA0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LinkContestRoom1_EventScript_23B7EF - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LinkContestRoom1_EventScript_23B7F3 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, LinkContestRoom1_EventScript_23B7F7 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 call_if 1, LinkContestRoom1_EventScript_23B7FB - compare_var_to_value VAR_RESULT, 4 + compare VAR_RESULT, 4 call_if 1, LinkContestRoom1_EventScript_23B7FF return @@ -52,7 +52,7 @@ LinkContestRoom1_EventScript_23B7FF:: @ 823B7FF return LinkContestRoom1_MapScript1_23B803: @ 823B803 - compare_var_to_value VAR_0x4009, 1 + compare VAR_0x4009, 1 call_if 1, LinkContestRoom1_EventScript_23B80F end @@ -82,7 +82,7 @@ LinkContestRoom1_EventScript_23B834:: @ 823B834 LinkContestRoom1_EventScript_23B842:: @ 823B842 call LinkContestRoom1_EventScript_23B8F8 call LinkContestRoom1_EventScript_23B858 - compare_var_to_value VAR_0x4000, 8 + compare VAR_0x4000, 8 goto_if 0, LinkContestRoom1_EventScript_23B842 return @@ -301,7 +301,7 @@ LinkContestRoom1_EventScript_23BB25:: @ 823BB25 LinkContestRoom1_EventScript_23BB2B:: @ 823BB2B specialvar VAR_RESULT, sub_80F9160 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LinkContestRoom1_EventScript_23BD86 switch VAR_0x4088 case 1, LinkContestRoom1_EventScript_23BB78 @@ -442,9 +442,9 @@ LinkContestRoom1_EventScript_23BEAC:: @ 823BEAC LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_23BECE - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_23BED4 return diff --git a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc index e2ff39cd7..d9d4211e7 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc @@ -10,9 +10,9 @@ VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A: @ 820230A VerdanturfTown_BattleTentBattleRoom_EventScript_202310:: @ 8202310 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202328 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq VerdanturfTown_BattleTentBattleRoom_EventScript_202333 return @@ -37,7 +37,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202348:: @ 8202348 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F @@ -88,15 +88,15 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 special sub_81A1780 playfanfare BGM_ME_ASA waitfanfare - special sp000_heal_pokemon + special HealPlayerParty VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 special sub_81A1780 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, VerdanturfTown_BattleTentBattleRoom_EventScript_202565 - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 call_if 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20256C multichoice 20, 6, 104, 1 switch VAR_RESULT diff --git a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc index 7ffd5c162..cd23003c7 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc @@ -133,7 +133,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201873:: @ 8201873 faceplayer setvar VAR_0x8004, 1 special sub_81B99B4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, VerdanturfTown_BattleTentLobby_EventScript_2017EE special copy_player_party_to_sav1 msgbox VerdanturfTown_BattleTentLobby_Text_2C50C3, 4 @@ -154,7 +154,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF setvar VAR_RESULT, 2 setvar VAR_0x8004, 15 special sub_81A1780 - compare_var_to_value VAR_0x8004, 1 + compare VAR_0x8004, 1 goto_eq VerdanturfTown_BattleTentLobby_EventScript_2019E8 setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -166,7 +166,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF setvar VAR_0x8005, 3 special sub_80F9490 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A34 msgbox VerdanturfTown_BattleTentLobby_Text_2C5662, 5 switch VAR_RESULT @@ -194,7 +194,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954 delay 2 call VerdanturfTown_BattleTentLobby_EventScript_27134F setvar VAR_0x4000, 255 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A1D VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE @@ -281,7 +281,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AB2 msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, 4 giveitem_std ITEM_TM45 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq VerdanturfTown_BattleTentLobby_EventScript_272054 setflag FLAG_0x0EB msgbox VerdanturfTown_BattleTentLobby_Text_201E43, 4 diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 8bc22aa3d..4dd00035a 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -3,9 +3,9 @@ VictoryRoad_1F_MapScripts:: @ 8235D7A .byte 0 VictoryRoad_1F_MapScript1_235D80: @ 8235D80 - compare_var_to_value VAR_0x40C3, 1 + compare VAR_0x40C3, 1 call_if 1, VictoryRoad_1F_EventScript_235D97 - compare_var_to_value VAR_0x40C3, 2 + compare VAR_0x40C3, 2 call_if 1, VictoryRoad_1F_EventScript_235DA3 end @@ -83,8 +83,8 @@ VictoryRoad_1F_EventScript_235E2C:: @ 8235E2C VictoryRoad_1F_EventScript_235E35:: @ 8235E35 trainerbattle 0, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA - specialvar VAR_RESULT, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq VictoryRoad_1F_EventScript_235E5C msgbox VictoryRoad_1F_Text_2360FE, 6 end diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 8ee62a5d5..1597a66eb 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -12,9 +12,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0A6:: @ 828E0A6 lock faceplayer msgbox MauvilleCity_PokemonCenter_1F_Text_29038E, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0C7 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0EA end @@ -23,7 +23,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0C7:: @ 828E0C7 special sub_8120340 delay 60 special sub_81201F4 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0F4 msgbox MauvilleCity_PokemonCenter_1F_Text_2903E6, 4 release @@ -36,9 +36,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0EA:: @ 828E0EA MauvilleCity_PokemonCenter_1F_EventScript_28E0F4:: @ 828E0F4 msgbox MauvilleCity_PokemonCenter_1F_Text_290421, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D end @@ -47,14 +47,14 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113 call MauvilleCity_PokemonCenter_1F_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D msgbox MauvilleCity_PokemonCenter_1F_Text_2904C1, 4 setvar VAR_0x8004, 1 special sub_8120340 delay 60 msgbox MauvilleCity_PokemonCenter_1F_Text_2904EB, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113 special sub_8120210 msgbox MauvilleCity_PokemonCenter_1F_Text_290514, 4 @@ -72,7 +72,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E167:: @ 828E167 setflag FLAG_SYS_HIPSTER_MEET msgbox MauvilleCity_PokemonCenter_1F_Text_29054C, 4 special sub_8120358 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E18C msgbox MauvilleCity_PokemonCenter_1F_Text_290598, 4 release @@ -80,7 +80,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E167:: @ 828E167 MauvilleCity_PokemonCenter_1F_EventScript_28E18C:: @ 828E18C special sub_812038C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E1A4 msgbox MauvilleCity_PokemonCenter_1F_Text_290602, 4 release @@ -155,10 +155,10 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E4D4:: @ 828E4D4 lock faceplayer msgbox MauvilleCity_PokemonCenter_1F_Text_28E1B1, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E503 special sub_8133CD8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E50D message MauvilleCity_PokemonCenter_1F_Text_28E23F waitmessage @@ -178,15 +178,15 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E50D:: @ 828E50D MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517 special sub_8133EC0 waitstate - compare_var_to_value VAR_0x8004, 0 + compare VAR_0x8004, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E558 - compare_var_to_value VAR_0x8004, 65535 + compare VAR_0x8004, 65535 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E562 msgbox MauvilleCity_PokemonCenter_1F_Text_28E2A9, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E56E special sub_8133CF4 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E57A goto MauvilleCity_PokemonCenter_1F_EventScript_28E584 end @@ -217,15 +217,15 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E584:: @ 828E584 msgbox MauvilleCity_PokemonCenter_1F_Text_28E323, 4 special sub_8133D8C waitstate - compare_var_to_value VAR_0x8006, 0 + compare VAR_0x8006, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5D4 - compare_var_to_value VAR_0x8006, 65535 + compare VAR_0x8006, 65535 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5DE special sub_8133D2C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5EC msgbox MauvilleCity_PokemonCenter_1F_Text_28E3C4, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E584 special sub_8133E38 msgbox MauvilleCity_PokemonCenter_1F_Text_28E424, 4 @@ -702,23 +702,23 @@ MauvilleCity_PokemonCenter_1F_EventScript_29014A:: @ 829014A setvar VAR_0x800A, 0 setvar VAR_0x800B, 0 msgbox MauvilleCity_PokemonCenter_1F_Text_28E5F6, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 specialvar VAR_RESULT, sub_81213B0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901DA message MauvilleCity_PokemonCenter_1F_Text_28E673 waitmessage special sub_8121388 waitstate - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901B7 setvar VAR_0x8008, 1 special sub_812139C waitmessage waitbuttonpress specialvar VAR_RESULT, sub_81213D8 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_2901BD goto MauvilleCity_PokemonCenter_1F_EventScript_29020F @@ -729,7 +729,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_2901B7:: @ 82901B7 MauvilleCity_PokemonCenter_1F_EventScript_2901BD:: @ 82901BD msgbox MauvilleCity_PokemonCenter_1F_Text_28E78A, 4 specialvar VAR_RESULT, sub_8121424 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29022D goto MauvilleCity_PokemonCenter_1F_EventScript_2901E2 @@ -738,10 +738,10 @@ MauvilleCity_PokemonCenter_1F_EventScript_2901DA:: @ 82901DA MauvilleCity_PokemonCenter_1F_EventScript_2901E2:: @ 82901E2 msgbox MauvilleCity_PokemonCenter_1F_Text_28E7EE, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290219 specialvar VAR_RESULT, sub_8121450 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29020F msgbox MauvilleCity_PokemonCenter_1F_Text_28E881, 4 release @@ -787,25 +787,25 @@ MauvilleCity_PokemonCenter_1F_EventScript_2902F6:: @ 82902F6 lock faceplayer msgbox MauvilleCity_PokemonCenter_1F_Text_29022F, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290317 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29037A end MauvilleCity_PokemonCenter_1F_EventScript_290317:: @ 8290317 special sub_81203C4 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290359 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290384 end MauvilleCity_PokemonCenter_1F_EventScript_290331:: @ 8290331 special sub_81203C4 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_29034B - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290384 end @@ -819,9 +819,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_290359:: @ 8290359 special sub_8138AC0 waitmessage yesnobox 20, 8 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290331 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq MauvilleCity_PokemonCenter_1F_EventScript_290331 end diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index f5fbeec34..3fba532bf 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -29,9 +29,9 @@ PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F call PetalburgCity_PokemonCenter_1F_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_PokemonCenter_1F_EventScript_2915CB - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_PokemonCenter_1F_EventScript_2915D5 end @@ -81,9 +81,9 @@ PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650 call PetalburgCity_PokemonCenter_1F_EventScript_271E7C lock faceplayer - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq PetalburgCity_PokemonCenter_1F_EventScript_2915CB - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq PetalburgCity_PokemonCenter_1F_EventScript_2915D5 end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 85952d9f0..abb8fed2e 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -8,9 +8,9 @@ LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, 4 applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_27259E waitmovement 0 - compare_var_to_value VAR_0x8005, 0 + compare VAR_0x8005, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_29274D - compare_var_to_value VAR_0x8005, 1 + compare VAR_0x8005, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292758 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, 4 closemessage @@ -69,9 +69,9 @@ LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799 setflag FLAG_0x2F2 setflag FLAG_0x2F3 checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_2927DF - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_29280F playse SE_KAIDAN removeobject VAR_0x8008 @@ -114,7 +114,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_29283F:: @ 829283F LittlerootTown_BrendansHouse_2F_EventScript_292849:: @ 8292849 fadescreen 1 - special Special_StartWallClock + special StartWallClock waitstate return @@ -314,17 +314,17 @@ LittlerootTown_BrendansHouse_1F_EventScript_2929C5:: @ 82929C5 LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5 lock faceplayer - compare_var_to_value VAR_0x4082, 4 + compare VAR_0x4082, 4 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F - compare_var_to_value VAR_0x408C, 4 + compare VAR_0x408C, 4 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F - checkflag FLAG_0x12F + checkflag FLAG_HAS_MATCH_CALL goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A19 checkflag FLAG_0x052 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A86 - compare_var_to_value VAR_0x4001, 1 + compare VAR_0x4001, 1 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94 - compare_var_to_value VAR_0x4092, 7 + compare VAR_0x4092, 7 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292AB0 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, 4 release @@ -360,7 +360,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A51:: @ 8292A51 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_292A86 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, 4 giveitem_std ITEM_AMULET_COIN - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_272054 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, 4 setflag FLAG_0x085 @@ -444,13 +444,13 @@ LittlerootTown_BrendansHouse_1F_EventScript_292AF2:: @ 8292AF2 LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 lockall checkplayergender - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292C76 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292C86 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D08 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D13 applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_27259E waitmovement 0 @@ -460,32 +460,32 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_27259A waitmovement 0 delay 20 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292C96 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CA1 msgbox LittlerootTown_BrendansHouse_1F_Text_1F800E, 4 giveitem_std ITEM_SS_TICKET msgbox LittlerootTown_BrendansHouse_1F_Text_1F80FE, 4 closemessage delay 20 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CAC - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CC1 msgbox LittlerootTown_BrendansHouse_1F_Text_1F815B, 4 closemessage - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CD6 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292CEF playse SE_DOOR removeobject VAR_0x8009 setflag FLAG_0x123 delay 30 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D48 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D5D delay 20 msgbox LittlerootTown_BrendansHouse_1F_Text_1F81B9, 4 @@ -493,24 +493,24 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 setflag FLAG_SYS_TV_LATI special TurnOnTVScreen delay 60 - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D72 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D7D msgbox LittlerootTown_BrendansHouse_1F_Text_1F824B, 4 closemessage - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D1E - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D33 msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, 4 closemessage clearflag FLAG_SYS_TV_LATI setflag FLAG_0x0FF special TurnOffTVScreen - compare_var_to_value VAR_0x8008, 0 + compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D88 - compare_var_to_value VAR_0x8008, 1 + compare VAR_0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_292D9D msgbox LittlerootTown_BrendansHouse_1F_Text_1F8351, 4 multichoice 22, 8, 108, 1 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index a93c44615..03ee0d510 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -239,7 +239,7 @@ LilycoveCity_ContestLobby_EventScript_293C3E:: @ 8293C3E applymovement 16, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_292DEE, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293CEE goto LilycoveCity_ContestLobby_EventScript_293C70 end @@ -271,7 +271,7 @@ LilycoveCity_ContestLobby_EventScript_293C9C:: @ 8293C9C LilycoveCity_ContestLobby_EventScript_293CB9:: @ 8293CB9 msgbox LilycoveCity_ContestLobby_Text_292E57, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293CD2 goto LilycoveCity_ContestLobby_EventScript_293CE0 end @@ -288,13 +288,13 @@ LilycoveCity_ContestLobby_EventScript_293CE0:: @ 8293CE0 LilycoveCity_ContestLobby_EventScript_293CEE:: @ 8293CEE checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293D43 specialvar VAR_RESULT, GetFirstFreePokeblockSlot - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_eq LilycoveCity_ContestLobby_EventScript_293D39 specialvar VAR_RESULT, PlayerHasBerries - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293C7A msgbox LilycoveCity_ContestLobby_Text_292E28, 4 goto LilycoveCity_ContestLobby_EventScript_293CB9 @@ -325,7 +325,7 @@ LilycoveCity_ContestLobby_EventScript_293D4D:: @ 8293D4D applymovement 3, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_293201, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293DC6 goto LilycoveCity_ContestLobby_EventScript_293D7D end @@ -342,7 +342,7 @@ LilycoveCity_ContestLobby_EventScript_293D87:: @ 8293D87 LilycoveCity_ContestLobby_EventScript_293D91:: @ 8293D91 msgbox LilycoveCity_ContestLobby_Text_29328C, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293DAA goto LilycoveCity_ContestLobby_EventScript_293DB8 end @@ -359,16 +359,16 @@ LilycoveCity_ContestLobby_EventScript_293DB8:: @ 8293DB8 LilycoveCity_ContestLobby_EventScript_293DC6:: @ 8293DC6 specialvar VAR_RESULT, PlayerHasBerries - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293D87 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293E14 msgbox LilycoveCity_ContestLobby_Text_293237, 4 specialvar VAR_RESULT, GetFirstFreePokeblockSlot - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_if 5, LilycoveCity_ContestLobby_EventScript_293D91 - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_eq LilycoveCity_ContestLobby_EventScript_293E0A end @@ -391,7 +391,7 @@ LilycoveCity_ContestLobby_EventScript_293E1E:: @ 8293E1E applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_294053 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_293842, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293EA3 goto LilycoveCity_ContestLobby_EventScript_293E5A end @@ -408,7 +408,7 @@ LilycoveCity_ContestLobby_EventScript_293E64:: @ 8293E64 LilycoveCity_ContestLobby_EventScript_293E6E:: @ 8293E6E msgbox LilycoveCity_ContestLobby_Text_29357E, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293E87 goto LilycoveCity_ContestLobby_EventScript_293E95 end @@ -425,16 +425,16 @@ LilycoveCity_ContestLobby_EventScript_293E95:: @ 8293E95 LilycoveCity_ContestLobby_EventScript_293EA3:: @ 8293EA3 specialvar VAR_RESULT, PlayerHasBerries - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293E64 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293EF1 msgbox LilycoveCity_ContestLobby_Text_29354E, 4 specialvar VAR_RESULT, GetFirstFreePokeblockSlot - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_if 5, LilycoveCity_ContestLobby_EventScript_293E6E - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_eq LilycoveCity_ContestLobby_EventScript_293EE7 end @@ -452,7 +452,7 @@ LilycoveCity_ContestLobby_EventScript_293EFB:: @ 8293EFB lockall setvar VAR_0x8009, 1 msgbox LilycoveCity_ContestLobby_Text_2C42F4, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293F28 msgbox LilycoveCity_ContestLobby_Text_2C4332, 4 releaseall @@ -465,21 +465,21 @@ LilycoveCity_ContestLobby_EventScript_293F1E:: @ 8293F1E LilycoveCity_ContestLobby_EventScript_293F28:: @ 8293F28 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293F8E specialvar VAR_RESULT, PlayerHasBerries - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293F1E specialvar VAR_RESULT, GetFirstFreePokeblockSlot - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_if 5, LilycoveCity_ContestLobby_EventScript_293F64 - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_eq LilycoveCity_ContestLobby_EventScript_293F98 end LilycoveCity_ContestLobby_EventScript_293F64:: @ 8293F64 msgbox LilycoveCity_ContestLobby_Text_2C43FA, 5 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 call_if 1, LilycoveCity_ContestLobby_EventScript_293F85 msgbox LilycoveCity_ContestLobby_Text_2C451B, 4 goto LilycoveCity_ContestLobby_EventScript_293D2C @@ -521,9 +521,9 @@ LilycoveCity_ContestLobby_EventScript_293FC8:: @ 8293FC8 faceplayer msgbox LilycoveCity_ContestLobby_Text_293A6B, 4 specialvar VAR_RESULT, PlayerHasBerries - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_293FEE - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_293FF8 end @@ -534,10 +534,10 @@ LilycoveCity_ContestLobby_EventScript_293FEE:: @ 8293FEE LilycoveCity_ContestLobby_EventScript_293FF8:: @ 8293FF8 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_294028 specialvar VAR_RESULT, GetFirstFreePokeblockSlot - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_eq LilycoveCity_ContestLobby_EventScript_294028 dodailyevents checkflag FLAG_0x921 @@ -565,23 +565,23 @@ LilycoveCity_ContestLobby_Movement_294053: @ 8294053 LilycoveCity_ContestLobby_EventScript_294055:: @ 8294055 lockall specialvar VAR_RESULT, PlayerHasBerries - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_2940B1 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_29416C specialvar VAR_RESULT, GetFirstFreePokeblockSlot - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_if 5, LilycoveCity_ContestLobby_EventScript_294092 - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_eq LilycoveCity_ContestLobby_EventScript_294162 end LilycoveCity_ContestLobby_EventScript_294092:: @ 8294092 msgbox LilycoveCity_ContestLobby_Text_2938CD, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_2940BB - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_294160 end @@ -592,24 +592,24 @@ LilycoveCity_ContestLobby_EventScript_2940B1:: @ 82940B1 LilycoveCity_ContestLobby_EventScript_2940BB:: @ 82940BB call LilycoveCity_ContestLobby_EventScript_27134F - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_294160 specialvar VAR_RESULT, sub_80093CC - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_2941ED message LilycoveCity_ContestLobby_Text_293955 waitmessage special sub_80B2FD8 waitstate - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_2941AA - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq LilycoveCity_ContestLobby_EventScript_294176 - compare_var_to_value VAR_RESULT, 3 + compare VAR_RESULT, 3 goto_eq LilycoveCity_ContestLobby_EventScript_294183 - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq LilycoveCity_ContestLobby_EventScript_294190 - compare_var_to_value VAR_RESULT, 6 + compare VAR_RESULT, 6 goto_eq LilycoveCity_ContestLobby_EventScript_29419D end @@ -713,22 +713,22 @@ LilycoveCity_ContestLobby_EventScript_2941F8:: @ 82941F8 LilycoveCity_ContestLobby_EventScript_294235:: @ 8294235 call LilycoveCity_ContestLobby_EventScript_294285 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_29428F - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq LilycoveCity_ContestLobby_EventScript_2941F8 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq LilycoveCity_ContestLobby_EventScript_294235 release end LilycoveCity_ContestLobby_EventScript_29425D:: @ 829425D call LilycoveCity_ContestLobby_EventScript_29428A - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_29428F - compare_var_to_value VAR_RESULT, 5 + compare VAR_RESULT, 5 goto_eq LilycoveCity_ContestLobby_EventScript_2941F8 - compare_var_to_value VAR_RESULT, 8 + compare VAR_RESULT, 8 goto_eq LilycoveCity_ContestLobby_EventScript_29425D release end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index a052c90cc..c2d217f93 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -14,7 +14,7 @@ EventScript_2A4B5D:: @ 82A4B5D EventScript_2A4B6F:: @ 82A4B6F lockall msgbox Text_2A4BF4, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_2A4B85 releaseall end @@ -43,19 +43,19 @@ EventScript_2A4B9B:: @ 82A4B9B EventScript_2A4BAC:: @ 82A4BAC lockall special GetPokeblockFeederInFront - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_if 5, EventScript_2A4BEB msgbox Text_2A4C90, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_2A4BD0 releaseall end EventScript_2A4BD0:: @ 82A4BD0 fadescreen 1 - special sub_8135908 + special OpenPokeblockCaseOnFeeder waitstate - compare_var_to_value VAR_RESULT, 65535 + compare VAR_RESULT, 65535 goto_if 5, EventScript_2A4BE2 end diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 215f997b8..c75fb9b48 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -37,7 +37,7 @@ Route111_EventScript_2765FF:: @ 82765FF lock faceplayer msgbox Route111_Text_2762C9, 5 - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route111_EventScript_27661E msgbox Route111_Text_27655C, 4 release @@ -45,17 +45,17 @@ Route111_EventScript_2765FF:: @ 82765FF Route111_EventScript_27661E:: @ 827661E giveitem_std ITEM_TM43 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route111_EventScript_276680 msgbox Route111_Text_27636E, 4 closemessage setflag FLAG_0x060 clearflag FLAG_0x3B4 - compare_var_to_value VAR_FACING, 3 + compare VAR_FACING, 3 call_if 1, Route111_EventScript_27666A - compare_var_to_value VAR_FACING, 4 + compare VAR_FACING, 4 call_if 1, Route111_EventScript_27666A - compare_var_to_value VAR_FACING, 2 + compare VAR_FACING, 2 call_if 1, Route111_EventScript_276675 removeobject VAR_LAST_TALKED release diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 7cf485835..8d1ac83eb 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -3,30 +3,30 @@ EventScript_27EE0B:: @ 827EE0B incrementgamestat 44 special ResetTVShowState specialvar VAR_RESULT, CheckForBigMovieOrEmergencyNewsOnTV - compare_var_to_value VAR_RESULT, 2 + compare VAR_RESULT, 2 goto_eq EventScript_27EE9A - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_27EEA4 checkflag FLAG_SYS_TV_START goto_if 0, EventScript_27EE8A checkflag FLAG_SYS_TV_WATCH goto_eq EventScript_27EE8A specialvar VAR_RESULT, IsTVShowInSearchOfTrainersAiring - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq EventScript_27EEFF goto EventScript_27EEE9 end EventScript_27EE54:: @ 827EE54 specialvar VAR_0x8004, special_0x44 - compare_var_to_value VAR_0x8004, 255 + compare VAR_0x8004, 255 goto_eq EventScript_27EED8 specialvar VAR_RESULT, special_0x4a - compare_var_to_value VAR_RESULT, 255 + compare VAR_RESULT, 255 goto_eq EventScript_27EED8 copyvar VAR_0x8004, VAR_RESULT specialvar VAR_RESULT, special_0x45 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_if 5, EventScript_27EEBA end @@ -55,7 +55,7 @@ EventScript_27EEBA:: @ 827EEBA special DoTVShow waitmessage waitbuttonpress - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_if 5, EventScript_27EEBA goto EventScript_27EED0 end @@ -74,7 +74,7 @@ EventScript_27EED8:: @ 827EED8 EventScript_27EEE9:: @ 827EEE9 special DoPokeNews - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_27EE54 waitmessage waitbuttonpress @@ -85,7 +85,7 @@ EventScript_27EEFF:: @ 827EEFF special DoTVShowInSearchOfTrainers waitmessage waitbuttonpress - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq EventScript_27EEFF goto EventScript_27EED0 end diff --git a/data/shop.s b/data/shop.s index 8fd64c0bb..304ea12f7 100644 --- a/data/shop.s +++ b/data/shop.s @@ -6,13 +6,22 @@ .section .rodata gUnknown_08589A08:: @ 8589A08 - .incbin "baserom.gba", 0x589a08, 0x8 + .4byte BuyMenuTryMakePurchase + .4byte BuyMenuReturnToItemList gUnknown_08589A10:: @ 8589A10 - .incbin "baserom.gba", 0x589a10, 0x18 + .4byte gUnknown_085E93C7 + .4byte HandleShopMenuBuy + .4byte gUnknown_085E93CB + .4byte HandleShopMenuSell + .4byte gUnknown_085E93D0 + .4byte HandleShopMenuQuit gUnknown_08589A28:: @ 8589A28 - .incbin "baserom.gba", 0x589a28, 0x10 + .4byte gUnknown_085E93C7 + .4byte HandleShopMenuBuy + .4byte gUnknown_085E93D0 + .4byte HandleShopMenuQuit gUnknown_08589A38:: @ 8589A38 .incbin "baserom.gba", 0x589a38, 0x10 diff --git a/data/sound_data.s b/data/sound_data.s index a25081360..e2d4467de 100644 --- a/data/sound_data.s +++ b/data/sound_data.s @@ -1,7 +1,10 @@ .section .rodata voicegroup_pokemon_cry:: @ 8675D04 - .incbin "baserom.gba", 0x675D04, 0x27FF0 + .incbin "baserom.gba", 0x675D04, 0xAB63 + +gUnknown_08680867:: @ 8680867 + .incbin "baserom.gba", 0x680867, 0x1D48D gCryTable:: @ 869DCF4 .incbin "baserom.gba", 0x69dcf4, 0x1230 @@ -10,10 +13,19 @@ gCryTable2:: @ 869EF24 .incbin "baserom.gba", 0x69ef24, 0x1200 gUnknown_086A0124:: @ 86A0124 - .incbin "baserom.gba", 0x6a0124, 0x1489c + .incbin "baserom.gba", 0x6a0124, 0x745 + +gUnknown_086A0869:: @ 86A0869 + .incbin "baserom.gba", 0x6a0869, 0x14157 gMPlayTable:: @ 86B49C0 .incbin "baserom.gba", 0x6b49c0, 0x30 gSongTable:: @ 86B49F0 - .incbin "baserom.gba", 0x6b49f0, 0x2ee660 + .incbin "baserom.gba", 0x6b49f0, 0xbe7b + +gUnknown_086C086B:: @ 86C086B + .incbin "baserom.gba", 0x6c086b, 0x20002 + +gUnknown_086E086D:: @ 86E086D + .incbin "baserom.gba", 0x6e086d, 0x2c27e3 diff --git a/data/specials.inc b/data/specials.inc index 19adbae4d..93df6aa75 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -7,7 +7,7 @@ .set __special__, 0 .align 2 gSpecials:: @ 81DBA64 - def_special sp000_heal_pokemon + def_special HealPlayerParty def_special sub_809D2BC def_special sub_80AF948 def_special sub_80AF9F8 @@ -61,17 +61,17 @@ gSpecials:: @ 81DBA64 def_special FieldObjectInteractionWaterBerryTree def_special PlayerHasBerries def_special IsEnigmaBerryValid - def_special sub_80B170C - def_special sub_80B1A14 - def_special special_trainer_unable_to_battle - def_special check_trainer_flag - def_special sub_80B45AC + def_special GetTrainerBattleMode + def_special ShowTrainerIntroSpeech + def_special ShowTrainerCantBattleSpeech + def_special GetTrainerFlag + def_special EndTrainerApproach def_special SetUpTrainerEncounterMusic - def_special sub_80B226C - def_special sub_80B22A0 - def_special sub_80B19EC + def_special ShouldTryRematchBattle + def_special IsTrainerReadyForRematch + def_special BattleSetup_StartRematchBattle def_special sub_80C7578 - def_special sub_80F92F8 + def_special HasEnoughMonsForDoubleBattle def_special TurnOffTVScreen def_special DoTVShow def_special DoPokeNews @@ -164,10 +164,10 @@ gSpecials:: @ 81DBA64 def_special sub_8138B8C def_special sub_814FC9C def_special sub_8085784 - def_special Special_StartWallClock + def_special StartWallClock def_special Special_ViewWallClock - def_special sub_80B1138 - def_special sub_80B086C + def_special ChooseStarter + def_special StartWallyTutorialBattle def_special ChangePokemonNickname def_special sub_81B94B0 def_special GetFirstFreePokeblockSlot @@ -218,7 +218,7 @@ gSpecials:: @ 81DBA64 def_special EnterSafariMode def_special ExitSafariMode def_special GetPokeblockFeederInFront - def_special sub_8135908 + def_special OpenPokeblockCaseOnFeeder def_special sub_813793C def_special sub_8137988 def_special sub_8137A0C @@ -320,9 +320,9 @@ gSpecials:: @ 81DBA64 def_special sub_8139540 def_special sub_809E1C8 def_special sub_8139560 - def_special sub_80B0A18 - def_special sub_80B0934 - def_special sub_80B0A74 + def_special StartGroudonKyogreBattle + def_special BattleSetup_StartLegendaryBattle + def_special StartRegiBattle def_special sub_80B16D8 def_special DoSealedChamberShakingEffect2 def_special sub_8139634 @@ -332,7 +332,7 @@ gSpecials:: @ 81DBA64 def_special sub_80F8D28 def_special sub_80F8EB8 def_special sub_8162794 - def_special sub_80B08EC + def_special BattleSetup_StartLatiBattle def_special sub_8139648 def_special sub_8139668 def_special sub_80F8FA0 @@ -415,7 +415,7 @@ gSpecials:: @ 81DBA64 def_special PutLilycoveContestLadyShowOnTheAir def_special sub_813B880 def_special sub_81A085C - def_special CheckIfMultipleTrainersWantBattle + def_special ShouldTryGetTrainerScript def_special AddMapNamePopUpWindowTask def_special AddMapNamePopUpWindowTask def_special sub_81BE994 diff --git a/data/starter_choose.s b/data/starter_choose.s index ae81aae20..a951a8987 100644 --- a/data/starter_choose.s +++ b/data/starter_choose.s @@ -63,5 +63,4 @@ sSpriteTemplate_PokeBall:: @ 85B1F28 .incbin "baserom.gba", 0x5b1f28, 0x18 gUnknown_085B1F40:: @ 85B1F40 - .incbin "baserom.gba", 0x5b1f40, 0x294 - + .incbin "baserom.gba", 0x5b1f40, 0x18 diff --git a/data/strings.s b/data/strings.s index 484c26d6e..c4190e974 100644 --- a/data/strings.s +++ b/data/strings.s @@ -2,7 +2,7 @@ .include "constants/constants.inc" .section .rodata - + gExpandedPlaceholder_Empty:: @ 85E8218 .string "$" @@ -832,46 +832,46 @@ gText_UnkF908Var1Var2:: @ 85E9263 gText_BerryTag:: @ 85E926B .string "BERRY TAG$" -gUnknown_085E9275:: @ 85E9275 +gText_RedPokeblock:: @ 85E9275 .string "RED {POKEBLOCK}$" -gUnknown_085E927F:: @ 85E927F +gText_BluePokeblock:: @ 85E927F .string "BLUE {POKEBLOCK}$" -gUnknown_085E928A:: @ 85E928A +gText_PinkPokeblock:: @ 85E928A .string "PINK {POKEBLOCK}$" -gUnknown_085E9295:: @ 85E9295 +gText_GreenPokeblock:: @ 85E9295 .string "GREEN {POKEBLOCK}$" -gUnknown_085E92A1:: @ 85E92A1 +gText_YellowPokeblock:: @ 85E92A1 .string "YELLOW {POKEBLOCK}$" -gUnknown_085E92AE:: @ 85E92AE +gText_PurplePokeblock:: @ 85E92AE .string "PURPLE {POKEBLOCK}$" -gUnknown_085E92BB:: @ 85E92BB +gText_IndigoPokeblock:: @ 85E92BB .string "INDIGO {POKEBLOCK}$" -gUnknown_085E92C8:: @ 85E92C8 +gText_BrownPokeblock:: @ 85E92C8 .string "BROWN {POKEBLOCK}$" -gUnknown_085E92D4:: @ 85E92D4 +gText_LiteBluePokeblock:: @ 85E92D4 .string "LITEBLUE {POKEBLOCK}$" -gUnknown_085E92E3:: @ 85E92E3 +gText_OlivePokeblock:: @ 85E92E3 .string "OLIVE {POKEBLOCK}$" -gUnknown_085E92EF:: @ 85E92EF +gText_GrayPokeblock:: @ 85E92EF .string "GRAY {POKEBLOCK}$" -gUnknown_085E92FA:: @ 85E92FA +gText_BlackPokeblock:: @ 85E92FA .string "BLACK {POKEBLOCK}$" -gUnknown_085E9306:: @ 85E9306 +gText_WhitePokeblock:: @ 85E9306 .string "WHITE {POKEBLOCK}$" -gUnknown_085E9312:: @ 85E9312 +gText_GoldPokeblock:: @ 85E9312 .string "GOLD {POKEBLOCK}$" gText_Spicy:: @ 85E931D @@ -3158,19 +3158,19 @@ gText_PokemonCenter:: @ 85EC791 gText_GetsAPokeBlockQuestion:: @ 85EC7A0 .string " gets a {POKEBLOCK}?$" -gUnknown_085EC7AF:: @ 85EC7AF +gText_Coolness:: @ 85EC7AF .string "Coolness $" -gUnknown_085EC7B9:: @ 85EC7B9 +gText_Beauty3:: @ 85EC7B9 .string "Beauty $" -gUnknown_085EC7C1:: @ 85EC7C1 +gText_Cuteness:: @ 85EC7C1 .string "Cuteness $" -gUnknown_085EC7CB:: @ 85EC7CB +gText_Smartness:: @ 85EC7CB .string "Smartness $" -gUnknown_085EC7D6:: @ 85EC7D6 +gText_Toughness:: @ 85EC7D6 .string "Toughness $" gText_WasEnhanced:: @ 85EC7E1 diff --git a/data/trainer_rematch.s b/data/trainer_rematch.s index 9d6fc7717..e3a05ba8b 100644 --- a/data/trainer_rematch.s +++ b/data/trainer_rematch.s @@ -4,7 +4,7 @@ .section .rodata gUnknown_0862AD34:: @ 862AD34 - .incbin "baserom.gba", 0x62ad34, 0x10 + .2byte 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048 gUnknown_0862AD44:: @ 862AD44 - .incbin "baserom.gba", 0x62ad44, 0x10 + .2byte 0x0041, 0x0042, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0000 diff --git a/data/trainer_see.s b/data/trainer_see.s deleted file mode 100644 index bff3004a7..000000000 --- a/data/trainer_see.s +++ /dev/null @@ -1,83 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gEmotion_ExclamationMarkGfx:: @ 85505AC - .incbin "graphics/misc/emotion_exclamation.4bpp" - - .align 2 -gEmotion_QuestionMarkGfx:: @ 855062C - .incbin "graphics/misc/emotion_question.4bpp" - - .align 2 -gEmotion_HeartGfx:: @ 85506AC - .incbin "graphics/misc/emotion_heart.4bpp" - - .align 2 -gIsTrainerInRange:: @ 855072C - .4byte IsTrainerInRangeSouth - .4byte IsTrainerInRangeNorth - .4byte IsTrainerInRangeWest - .4byte IsTrainerInRangeEast - - .align 2 -gTrainerSeeFuncList:: @ 855073C - .4byte sub_80B4178 - .4byte sub_80B417C - .4byte sub_80B41C0 - .4byte sub_80B4200 - .4byte sub_80B425C - .4byte sub_80B4318 - .4byte sub_80B435C - .4byte sub_80B4390 - .4byte sub_80B43AC - .4byte sub_80B43E0 - .4byte sub_80B4438 - .4byte sub_80B44AC - - .align 2 -gTrainerSeeFuncList2:: @ 855076C - .4byte sub_80B43AC - .4byte sub_80B43E0 - .4byte sub_80B4438 - .4byte sub_80B44AC - - .align 2 -gOamData_855077C:: @ 855077C - .2byte 0x0000 - .2byte 0x4000 - .2byte 0x0400 - - .align 2 -gSpriteImageTable_8550784:: @ 8550784 - obj_frame_tiles gEmotion_ExclamationMarkGfx, 0x0080 - obj_frame_tiles gEmotion_QuestionMarkGfx, 0x0080 - - .align 2 -gSpriteImageTable_8550794:: @ 8550794 - obj_frame_tiles gEmotion_HeartGfx, 0x0080 - - .align 2 -gSpriteAnim_855079C:: @ 855079C - obj_image_anim_frame 0, 60 - obj_image_anim_end - - .align 2 -gSpriteAnim_85507A4:: @ 85507A4 - obj_image_anim_frame 1, 60 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_85507AC:: @ 85507AC - .4byte gSpriteAnim_855079C - .4byte gSpriteAnim_85507A4 - - .align 2 -gSpriteTemplate_85507B4:: @ 85507B4 - spr_template 0xffff, 0xffff, gOamData_855077C, gSpriteAnimTable_85507AC, gSpriteImageTable_8550784, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably - - .align 2 -gSpriteTemplate_85507CC:: @ 85507CC - spr_template 0xffff, 0x1004, gOamData_855077C, gSpriteAnimTable_85507AC, gSpriteImageTable_8550794, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably diff --git a/data/unk_transition.s b/data/unk_transition.s index 5ed120d85..1b9ce5171 100644 --- a/data/unk_transition.s +++ b/data/unk_transition.s @@ -4,25 +4,57 @@ .section .rodata gUnknown_0862B770:: @ 862B770 - .incbin "baserom.gba", 0x62b770, 0x14 + .4byte sub_81DAACC + .4byte sub_81DAC14 + .4byte sub_81DABBC + .4byte sub_81DAB4C + .4byte sub_81DAC80 gUnknown_0862B784:: @ 862B784 - .incbin "baserom.gba", 0x62b784, 0x14 + .4byte sub_81DAACC + .4byte sub_81DACEC + .4byte sub_81DABBC + .4byte sub_81DAB4C + .4byte sub_81DAD58 gUnknown_0862B798:: @ 862B798 - .incbin "baserom.gba", 0x62b798, 0x14 + .4byte sub_81DAACC + .4byte sub_81DADC4 + .4byte sub_81DABBC + .4byte sub_81DAB4C + .4byte sub_81DAE44 gUnknown_0862B7AC:: @ 862B7AC - .incbin "baserom.gba", 0x62b7ac, 0x14 + .4byte sub_81DAACC + .4byte sub_81DAEB0 + .4byte sub_81DABBC + .4byte sub_81DAB4C + .4byte sub_81DAF34 gUnknown_0862B7C0:: @ 862B7C0 - .incbin "baserom.gba", 0x62b7c0, 0x14 + .4byte sub_81DAACC + .4byte sub_81DAFA0 + .4byte sub_81DABBC + .4byte sub_81DAB4C + .4byte sub_81DB02C gUnknown_0862B7D4:: @ 862B7D4 - .incbin "baserom.gba", 0x62b7d4, 0x14 + .4byte sub_81DAACC + .4byte sub_81DB098 + .4byte sub_81DABBC + .4byte sub_81DAB4C + .4byte sub_81DB124 gUnknown_0862B7E8:: @ 862B7E8 - .incbin "baserom.gba", 0x62b7e8, 0x14 + .4byte sub_81DAACC + .4byte sub_81DB190 + .4byte sub_81DABBC + .4byte sub_81DAB4C + .4byte sub_81DB224 gUnknown_0862B7FC:: @ 862B7FC - .incbin "baserom.gba", 0x62b7fc, 0x14 + .4byte sub_81DAACC + .4byte sub_81DB290 + .4byte sub_81DABBC + .4byte sub_81DAB4C + .4byte sub_81DB328 diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s index 9b557a0dd..a45ea27e1 100644 --- a/data/use_pokeblock.s +++ b/data/use_pokeblock.s @@ -19,22 +19,32 @@ gUnknown_085DFCB0:: @ 85DFCB0 .incbin "baserom.gba", 0x5dfcb0, 0x14 gUnknown_085DFCC4:: @ 85DFCC4 - .incbin "baserom.gba", 0x5dfcc4, 0x5 + .byte 0, 4, 3, 2, 1 gUnknown_085DFCC9:: @ 85DFCC9 - .incbin "baserom.gba", 0x5dfcc9, 0x3 + .byte 0, 8, 1 gUnknown_085DFCCC:: @ 85DFCCC - .incbin "baserom.gba", 0x5dfccc, 0x10 + .4byte 0x1F8 + .4byte 0x31E1 + .4byte 0x4021DF + .4byte 0x1172 gUnknown_085DFCDC:: @ 85DFCDC - .incbin "baserom.gba", 0x5dfcdc, 0x20 - -gUnknown_085DFCFC:: @ 85DFCFC - .incbin "baserom.gba", 0x5dfcfc, 0x8 - -gUnknown_085DFD04:: @ 85DFD04 - .incbin "baserom.gba", 0x5dfd04, 0x14 + window_template 0, 0xD, 1, 0xD, 4, 0xF, 1 + window_template 0, 0, 0xE, 0xB, 2, 0xF, 0x35 + window_template 0, 1, 0x11, 0x1C, 2, 0xF, 0x4B + window_template_terminator + +sUsePokeblockYesNoWinTemplate:: @ 85DFCFC + window_template 0, 0x18, 0xB, 5, 4, 0xF, 0x83 + +sContestStatNames:: @ 85DFD04 + .4byte gText_Coolness + .4byte gText_Toughness + .4byte gText_Smartness + .4byte gText_Cuteness + .4byte gText_Beauty3 gUnknown_085DFD18:: @ 85DFD18 .incbin "baserom.gba", 0x5dfd18, 0x8 diff --git a/graphics/pokeblock/black.pal b/graphics/pokeblock/black.pal new file mode 100644 index 000000000..2cb591a70 --- /dev/null +++ b/graphics/pokeblock/black.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +213 131 74 +41 41 41 +98 98 98 +148 148 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokeblock/blue.pal b/graphics/pokeblock/blue.pal new file mode 100644 index 000000000..8295c79e8 --- /dev/null +++ b/graphics/pokeblock/blue.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +106 106 189 +148 148 255 +180 180 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokeblock/brown.pal b/graphics/pokeblock/brown.pal new file mode 100644 index 000000000..c936322bb --- /dev/null +++ b/graphics/pokeblock/brown.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +106 0 0 +172 65 65 +197 123 123 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokeblock/gold.pal b/graphics/pokeblock/gold.pal new file mode 100644 index 000000000..c975554d1 --- /dev/null +++ b/graphics/pokeblock/gold.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 197 49 +246 230 164 +255 238 197 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokeblock/gray.pal b/graphics/pokeblock/gray.pal new file mode 100644 index 000000000..0bd5c4d7c --- /dev/null +++ b/graphics/pokeblock/gray.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +148 148 148 +189 189 189 +205 205 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokeblock/green.pal b/graphics/pokeblock/green.pal new file mode 100644 index 000000000..984ba41ea --- /dev/null +++ b/graphics/pokeblock/green.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 106 0 +49 164 49 +90 230 90 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokeblock/indigo.pal b/graphics/pokeblock/indigo.pal new file mode 100644 index 000000000..4a57b8bde --- /dev/null +++ b/graphics/pokeblock/indigo.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +139 205 74 +0 0 106 +65 65 172 +123 123 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokeblock/liteblue.pal b/graphics/pokeblock/liteblue.pal new file mode 100644 index 000000000..e3a70c8be --- /dev/null +++ b/graphics/pokeblock/liteblue.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +106 139 189 +148 213 255 +180 238 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokeblock/olive.pal b/graphics/pokeblock/olive.pal new file mode 100644 index 000000000..e7599fc1e --- /dev/null +++ b/graphics/pokeblock/olive.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +115 180 106 +148 246 98 +205 255 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokeblock/pink.pal b/graphics/pokeblock/pink.pal new file mode 100644 index 000000000..7eb09a598 --- /dev/null +++ b/graphics/pokeblock/pink.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +205 90 172 +255 156 197 +255 197 213 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokeblock/pokeblock.png b/graphics/pokeblock/pokeblock.png Binary files differnew file mode 100644 index 000000000..fd24e0621 --- /dev/null +++ b/graphics/pokeblock/pokeblock.png diff --git a/graphics/pokeblock/purple.pal b/graphics/pokeblock/purple.pal new file mode 100644 index 000000000..2b6f8ad43 --- /dev/null +++ b/graphics/pokeblock/purple.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +164 0 164 +197 41 197 +255 131 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokeblock/red.pal b/graphics/pokeblock/red.pal new file mode 100644 index 000000000..a347854a9 --- /dev/null +++ b/graphics/pokeblock/red.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +205 65 24 +255 123 90 +255 180 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokeblock/white.pal b/graphics/pokeblock/white.pal new file mode 100644 index 000000000..c1d00b93a --- /dev/null +++ b/graphics/pokeblock/white.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +222 222 222 +238 238 238 +255 255 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokeblock/yellow.pal b/graphics/pokeblock/yellow.pal new file mode 100644 index 000000000..518042d9f --- /dev/null +++ b/graphics/pokeblock/yellow.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +180 180 49 +246 230 49 +255 255 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/wallclock/graphics_85b1f58.png b/graphics/wallclock/graphics_85b1f58.png Binary files differnew file mode 100644 index 000000000..06a4ecad0 --- /dev/null +++ b/graphics/wallclock/graphics_85b1f58.png diff --git a/graphics/wallclock/palette_85b21d4.pal b/graphics/wallclock/palette_85b21d4.pal new file mode 100644 index 000000000..fda317608 --- /dev/null +++ b/graphics/wallclock/palette_85b21d4.pal @@ -0,0 +1,7 @@ +JASC-PAL +0100 +4 +0 0 0 +74 180 189 +255 255 255 +0 0 0 diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 38806bbd3..565020836 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -2,113 +2,109 @@ monstillfrontdir := graphics/pokemon/front_pics monbackdir := graphics/pokemon/back_pics monfrontdir := graphics/pokemon/anim_front_pics monpaldir := graphics/pokemon/palettes -INTROGFXDIR := graphics/intro -interfacedir := graphics/interface -PKNAVGFXDIR := graphics/pokenav -MISCGFXDIR := graphics/misc +tilesetdir := data/tilesets +fontdir := data/graphics/fonts $(monstillfrontdir)/castform_still_front_pic.4bpp: $(monstillfrontdir)/castform_normal_form_still_front_pic.4bpp \ $(monstillfrontdir)/castform_sunny_form_still_front_pic.4bpp \ $(monstillfrontdir)/castform_rainy_form_still_front_pic.4bpp \ $(monstillfrontdir)/castform_snowy_form_still_front_pic.4bpp - @cat $(monstillfrontdir)/castform_normal_form_still_front_pic.4bpp $(monstillfrontdir)/castform_sunny_form_still_front_pic.4bpp $(monstillfrontdir)/castform_rainy_form_still_front_pic.4bpp $(monstillfrontdir)/castform_snowy_form_still_front_pic.4bpp >$@ + @cat $^ >$@ $(monbackdir)/castform_back_pic.4bpp: $(monbackdir)/castform_normal_form_back_pic.4bpp \ $(monbackdir)/castform_sunny_form_back_pic.4bpp \ $(monbackdir)/castform_rainy_form_back_pic.4bpp \ $(monbackdir)/castform_snowy_form_back_pic.4bpp - @cat $(monbackdir)/castform_normal_form_back_pic.4bpp $(monbackdir)/castform_sunny_form_back_pic.4bpp $(monbackdir)/castform_rainy_form_back_pic.4bpp $(monbackdir)/castform_snowy_form_back_pic.4bpp >$@ + @cat $^ >$@ $(monfrontdir)/castform_front_pic.4bpp: $(monfrontdir)/castform_normal_form_front_pic.4bpp \ $(monfrontdir)/castform_sunny_form_front_pic.4bpp \ $(monfrontdir)/castform_rainy_form_front_pic.4bpp \ $(monfrontdir)/castform_snowy_form_front_pic.4bpp - @cat $(monfrontdir)/castform_normal_form_front_pic.4bpp $(monfrontdir)/castform_sunny_form_front_pic.4bpp $(monfrontdir)/castform_rainy_form_front_pic.4bpp $(monfrontdir)/castform_snowy_form_front_pic.4bpp >$@ + @cat $^ >$@ $(monpaldir)/castform_palette.gbapal: $(monpaldir)/castform_normal_form_palette.gbapal \ $(monpaldir)/castform_sunny_form_palette.gbapal \ $(monpaldir)/castform_rainy_form_palette.gbapal \ $(monpaldir)/castform_snowy_form_palette.gbapal - @cat $(monpaldir)/castform_normal_form_palette.gbapal $(monpaldir)/castform_sunny_form_palette.gbapal $(monpaldir)/castform_rainy_form_palette.gbapal $(monpaldir)/castform_snowy_form_palette.gbapal >$@ + @cat $^ >$@ $(monpaldir)/castform_shiny_palette.gbapal: $(monpaldir)/castform_normal_form_shiny_palette.gbapal \ $(monpaldir)/castform_sunny_form_shiny_palette.gbapal \ $(monpaldir)/castform_rainy_form_shiny_palette.gbapal \ $(monpaldir)/castform_snowy_form_shiny_palette.gbapal - @cat $(monpaldir)/castform_normal_form_shiny_palette.gbapal $(monpaldir)/castform_sunny_form_shiny_palette.gbapal $(monpaldir)/castform_rainy_form_shiny_palette.gbapal $(monpaldir)/castform_snowy_form_shiny_palette.gbapal >$@ - -tilesetdir := data/tilesets + @cat $^ >$@ -$(tilesetdir)/secondary/petalburg/tiles.4bpp: $(tilesetdir)/secondary/petalburg/tiles.png +$(tilesetdir)/secondary/petalburg/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 159 -$(tilesetdir)/secondary/rustboro/tiles.4bpp: $(tilesetdir)/secondary/rustboro/tiles.png +$(tilesetdir)/secondary/rustboro/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 498 -$(tilesetdir)/secondary/dewford/tiles.4bpp: $(tilesetdir)/secondary/dewford/tiles.png +$(tilesetdir)/secondary/dewford/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 503 -$(tilesetdir)/secondary/slateport/tiles.4bpp: $(tilesetdir)/secondary/slateport/tiles.png +$(tilesetdir)/secondary/slateport/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 504 -$(tilesetdir)/secondary/mauville/tiles.4bpp: $(tilesetdir)/secondary/mauville/tiles.png +$(tilesetdir)/secondary/mauville/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 503 -$(tilesetdir)/secondary/lavaridge/tiles.4bpp: $(tilesetdir)/secondary/lavaridge/tiles.png +$(tilesetdir)/secondary/lavaridge/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 450 -$(tilesetdir)/secondary/fortree/tiles.4bpp: $(tilesetdir)/secondary/fortree/tiles.png +$(tilesetdir)/secondary/fortree/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 493 -$(tilesetdir)/secondary/pacifidlog/tiles.4bpp: $(tilesetdir)/secondary/pacifidlog/tiles.png +$(tilesetdir)/secondary/pacifidlog/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 504 -$(tilesetdir)/secondary/sootopolis/tiles.4bpp: $(tilesetdir)/secondary/sootopolis/tiles.png +$(tilesetdir)/secondary/sootopolis/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 328 -$(tilesetdir)/secondary/battle_frontier_outside_west/tiles.4bpp: $(tilesetdir)/secondary/battle_frontier_outside_west/tiles.png +$(tilesetdir)/secondary/battle_frontier_outside_west/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 508 -$(tilesetdir)/secondary/battle_frontier_outside_east/tiles.4bpp: $(tilesetdir)/secondary/battle_frontier_outside_east/tiles.png +$(tilesetdir)/secondary/battle_frontier_outside_east/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 508 -$(tilesetdir)/primary/building/tiles.4bpp: $(tilesetdir)/primary/building/tiles.png +$(tilesetdir)/primary/building/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 502 -$(tilesetdir)/secondary/shop/tiles.4bpp: $(tilesetdir)/secondary/shop/tiles.png +$(tilesetdir)/secondary/shop/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 502 -$(tilesetdir)/secondary/pokemon_center/tiles.4bpp: $(tilesetdir)/secondary/pokemon_center/tiles.png +$(tilesetdir)/secondary/pokemon_center/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 478 -$(tilesetdir)/secondary/cave/tiles.4bpp: $(tilesetdir)/secondary/cave/tiles.png +$(tilesetdir)/secondary/cave/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 425 -$(tilesetdir)/secondary/pokemon_school/tiles.4bpp: $(tilesetdir)/secondary/pokemon_school/tiles.png +$(tilesetdir)/secondary/pokemon_school/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 278 -$(tilesetdir)/secondary/pokemon_fan_club/tiles.4bpp: $(tilesetdir)/secondary/pokemon_fan_club/tiles.png +$(tilesetdir)/secondary/pokemon_fan_club/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 319 -$(tilesetdir)/secondary/unused_1/tiles.4bpp: $(tilesetdir)/secondary/unused_1/tiles.png +$(tilesetdir)/secondary/unused_1/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 17 -$(tilesetdir)/secondary/meteor_falls/tiles.4bpp: $(tilesetdir)/secondary/meteor_falls/tiles.png +$(tilesetdir)/secondary/meteor_falls/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 460 -$(tilesetdir)/secondary/oceanic_museum/tiles.4bpp: $(tilesetdir)/secondary/oceanic_museum/tiles.png +$(tilesetdir)/secondary/oceanic_museum/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 319 -$(tilesetdir)/secondary/cable_club/unknown_tiles.4bpp: $(tilesetdir)/secondary/cable_club/unknown_tiles.png +$(tilesetdir)/secondary/cable_club/unknown_tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 120 -$(tilesetdir)/secondary/seashore_house/tiles.4bpp: $(tilesetdir)/secondary/seashore_house/tiles.png +$(tilesetdir)/secondary/seashore_house/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 312 -$(tilesetdir)/secondary/pretty_petal_flower_shop/tiles.4bpp: $(tilesetdir)/secondary/pretty_petal_flower_shop/tiles.png +$(tilesetdir)/secondary/pretty_petal_flower_shop/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 345 -$(tilesetdir)/secondary/pokemon_day_care/tiles.4bpp: $(tilesetdir)/secondary/pokemon_day_care/tiles.png +$(tilesetdir)/secondary/pokemon_day_care/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 355 $(tilesetdir)/secondary/secret_base/brown_cave/unused_tiles.4bpp: $(tilesetdir)/secondary/secret_base/brown_cave/tiles.png @@ -129,110 +125,108 @@ $(tilesetdir)/secondary/secret_base/yellow_cave/unused_tiles.4bpp: $(tilesetdir) $(tilesetdir)/secondary/secret_base/red_cave/unused_tiles.4bpp: $(tilesetdir)/secondary/secret_base/red_cave/tiles.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/secret_base/brown_cave/tiles.4bpp: $(tilesetdir)/secondary/secret_base/brown_cave/tiles.png +$(tilesetdir)/secondary/secret_base/brown_cave/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/secret_base/tree/tiles.4bpp: $(tilesetdir)/secondary/secret_base/tree/tiles.png +$(tilesetdir)/secondary/secret_base/tree/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/secret_base/shrub/tiles.4bpp: $(tilesetdir)/secondary/secret_base/shrub/tiles.png +$(tilesetdir)/secondary/secret_base/shrub/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/secret_base/blue_cave/tiles.4bpp: $(tilesetdir)/secondary/secret_base/blue_cave/tiles.png +$(tilesetdir)/secondary/secret_base/blue_cave/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/secret_base/yellow_cave/tiles.4bpp: $(tilesetdir)/secondary/secret_base/yellow_cave/tiles.png +$(tilesetdir)/secondary/secret_base/yellow_cave/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/secret_base/red_cave/tiles.4bpp: $(tilesetdir)/secondary/secret_base/red_cave/tiles.png +$(tilesetdir)/secondary/secret_base/red_cave/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/inside_of_truck/tiles.4bpp: $(tilesetdir)/secondary/inside_of_truck/tiles.png +$(tilesetdir)/secondary/inside_of_truck/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 62 -$(tilesetdir)/secondary/contest/tiles.4bpp: $(tilesetdir)/secondary/contest/tiles.png +$(tilesetdir)/secondary/contest/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 430 -$(tilesetdir)/secondary/lilycove_museum/tiles.4bpp: $(tilesetdir)/secondary/lilycove_museum/tiles.png +$(tilesetdir)/secondary/lilycove_museum/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 431 -$(tilesetdir)/secondary/lab/tiles.4bpp: $(tilesetdir)/secondary/lab/tiles.png +$(tilesetdir)/secondary/lab/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 500 -$(tilesetdir)/secondary/underwater/tiles.4bpp: $(tilesetdir)/secondary/underwater/tiles.png +$(tilesetdir)/secondary/underwater/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 500 -$(tilesetdir)/secondary/generic_building/tiles.4bpp: $(tilesetdir)/secondary/generic_building/tiles.png +$(tilesetdir)/secondary/generic_building/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 509 -$(tilesetdir)/secondary/mauville_game_corner/tiles.4bpp: $(tilesetdir)/secondary/mauville_game_corner/tiles.png +$(tilesetdir)/secondary/mauville_game_corner/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 469 -$(tilesetdir)/secondary/unused_2/tiles.4bpp: $(tilesetdir)/secondary/unused_2/tiles.png +$(tilesetdir)/secondary/unused_2/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 150 -$(tilesetdir)/secondary/rustboro_gym/tiles.4bpp: $(tilesetdir)/secondary/rustboro_gym/tiles.png +$(tilesetdir)/secondary/rustboro_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 60 -$(tilesetdir)/secondary/dewford_gym/tiles.4bpp: $(tilesetdir)/secondary/dewford_gym/tiles.png +$(tilesetdir)/secondary/dewford_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 61 -$(tilesetdir)/secondary/lavaridge_gym/tiles.4bpp: $(tilesetdir)/secondary/lavaridge_gym/tiles.png +$(tilesetdir)/secondary/lavaridge_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 54 -$(tilesetdir)/secondary/petalburg_gym/tiles.4bpp: $(tilesetdir)/secondary/petalburg_gym/tiles.png +$(tilesetdir)/secondary/petalburg_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 148 -$(tilesetdir)/secondary/fortree_gym/tiles.4bpp: $(tilesetdir)/secondary/fortree_gym/tiles.png +$(tilesetdir)/secondary/fortree_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 61 -$(tilesetdir)/secondary/mossdeep_gym/tiles.4bpp: $(tilesetdir)/secondary/mossdeep_gym/tiles.png +$(tilesetdir)/secondary/mossdeep_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/sootopolis_gym/tiles.4bpp: $(tilesetdir)/secondary/sootopolis_gym/tiles.png +$(tilesetdir)/secondary/sootopolis_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 484 -$(tilesetdir)/secondary/trick_house_puzzle/tiles.4bpp: $(tilesetdir)/secondary/trick_house_puzzle/tiles.png +$(tilesetdir)/secondary/trick_house_puzzle/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 294 -$(tilesetdir)/secondary/inside_ship/tiles.4bpp: $(tilesetdir)/secondary/inside_ship/tiles.png +$(tilesetdir)/secondary/inside_ship/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 342 -$(tilesetdir)/secondary/elite_four/tiles.4bpp: $(tilesetdir)/secondary/elite_four/tiles.png +$(tilesetdir)/secondary/elite_four/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 505 -$(tilesetdir)/secondary/battle_frontier/tiles.4bpp: $(tilesetdir)/secondary/battle_frontier/tiles.png +$(tilesetdir)/secondary/battle_frontier/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 310 -$(tilesetdir)/secondary/battle_factory/tiles.4bpp: $(tilesetdir)/secondary/battle_factory/tiles.png +$(tilesetdir)/secondary/battle_factory/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 424 -$(tilesetdir)/secondary/battle_pike/tiles.4bpp: $(tilesetdir)/secondary/battle_pike/tiles.png +$(tilesetdir)/secondary/battle_pike/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 382 -$(tilesetdir)/secondary/mirage_tower/tiles.4bpp: $(tilesetdir)/secondary/mirage_tower/tiles.png +$(tilesetdir)/secondary/mirage_tower/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 420 -$(tilesetdir)/secondary/mossdeep_game_corner/tiles.4bpp: $(tilesetdir)/secondary/mossdeep_game_corner/tiles.png +$(tilesetdir)/secondary/mossdeep_game_corner/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 95 -$(tilesetdir)/secondary/island_harbor/tiles.4bpp: $(tilesetdir)/secondary/island_harbor/tiles.png +$(tilesetdir)/secondary/island_harbor/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 503 -$(tilesetdir)/secondary/trainer_hill/tiles.4bpp: $(tilesetdir)/secondary/trainer_hill/tiles.png +$(tilesetdir)/secondary/trainer_hill/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 374 -$(tilesetdir)/secondary/navel_rock/tiles.4bpp: $(tilesetdir)/secondary/navel_rock/tiles.png +$(tilesetdir)/secondary/navel_rock/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 420 -$(tilesetdir)/secondary/battle_frontier_ranking_hall/tiles.4bpp: $(tilesetdir)/secondary/battle_frontier_ranking_hall/tiles.png +$(tilesetdir)/secondary/battle_frontier_ranking_hall/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 136 -$(tilesetdir)/secondary/mystery_events_house/tiles.4bpp: $(tilesetdir)/secondary/mystery_events_house/tiles.png +$(tilesetdir)/secondary/mystery_events_house/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 509 -fontdir := data/graphics/fonts - $(fontdir)/font0.latfont: $(fontdir)/font0_latin.png $(GFX) $< $@ @@ -269,31 +263,32 @@ $(fontdir)/unused_frlg_male.fwjpnfont: $(fontdir)/unused_japanese_frlg_male_font $(fontdir)/unused_frlg_female.fwjpnfont: $(fontdir)/unused_japanese_frlg_female_font.png $(GFX) $< $@ -$(fontdir)/down_arrow.4bpp: $(fontdir)/down_arrow.png +$(fontdir)/down_arrow.4bpp: %.4bpp: %.png $(GFX) $< $@ -$(fontdir)/down_arrow_rs.4bpp: $(fontdir)/down_arrow_rs.png +$(fontdir)/down_arrow_rs.4bpp: %.4bpp: %.png $(GFX) $< $@ -$(fontdir)/unused_frlg_blanked_down_arrow.4bpp: $(fontdir)/unused_frlg_blanked_down_arrow.png +$(fontdir)/unused_frlg_blanked_down_arrow.4bpp: %.4bpp: %.png $(GFX) $< $@ -$(fontdir)/unused_frlg_down_arrow.4bpp: $(fontdir)/unused_frlg_down_arrow.png +$(fontdir)/unused_frlg_down_arrow.4bpp: %.4bpp: %.png $(GFX) $< $@ -$(fontdir)/keypad_icons.4bpp: $(fontdir)/keypad_icons.png +$(fontdir)/keypad_icons.4bpp: %.4bpp: %.png $(GFX) $< $@ -graphics/title_screen/pokemon_logo.gbapal: graphics/title_screen/pokemon_logo.pal +graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal $(GFX) $< $@ -num_colors 224 -$(INTROGFXDIR)/copyright.4bpp: $(INTROGFXDIR)/copyright.png +graphics/intro/copyright.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 39 -$(interfacedir)/pkmnjump_bg.4bpp: $(interfacedir)/pkmnjump_bg.png +graphics/interface/pkmnjump_bg.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 63 -$(PKNAVGFXDIR)/region_map.8bpp: $(PKNAVGFXDIR)/region_map.png +graphics/pokenav/region_map.8bpp: %.8bpp: %.png $(GFX) $< $@ -num_tiles 233 -$(MISCGFXDIR)/japanese_hof.4bpp: $(MISCGFXDIR)/japanese_hof.png + +graphics/misc/japanese_hof.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 29 diff --git a/include/battle.h b/include/battle.h index 7c8c81f52..602d3eb53 100644 --- a/include/battle.h +++ b/include/battle.h @@ -8,6 +8,7 @@ #include "battle_ai_switch_items.h" #include "battle_gfx_sfx_util.h" #include "battle_util2.h" +#include "battle_bg.h" /* Banks are a name given to what could be called a 'battlerId' or 'monControllerId'. @@ -53,7 +54,7 @@ #define BATTLE_TYPE_PALACE 0x20000 #define BATTLE_TYPE_ARENA 0x40000 #define BATTLE_TYPE_FACTORY 0x80000 -#define BATTLE_TYPE_x100000 0x100000 +#define BATTLE_TYPE_PIKE 0x100000 #define BATTLE_TYPE_PYRAMID 0x200000 #define BATTLE_TYPE_INGAME_PARTNER 0x400000 #define BATTLE_TYPE_x800000 0x800000 @@ -62,7 +63,7 @@ #define BATTLE_TYPE_x4000000 0x4000000 #define BATTLE_TYPE_SECRET_BASE 0x8000000 #define BATTLE_TYPE_GROUDON 0x10000000 -#define BATTLE_TYPE_KYORGE 0x20000000 +#define BATTLE_TYPE_KYOGRE 0x20000000 #define BATTLE_TYPE_RAYQUAZA 0x40000000 #define BATTLE_TYPE_x80000000 0x80000000 @@ -72,8 +73,8 @@ #define STEVEN_PARTNER_ID 0xC03 #define SECRET_BASE_OPPONENT 0x400 -#define BATTLE_TYPE_FRONTIER (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000 | BATTLE_TYPE_PYRAMID) -#define BATTLE_TYPE_FRONTIER_NO_PYRAMID (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000) +#define BATTLE_TYPE_FRONTIER (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID) +#define BATTLE_TYPE_FRONTIER_NO_PYRAMID (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE) #define BATTLE_WON 0x1 #define BATTLE_LOST 0x2 @@ -229,9 +230,9 @@ #define BATTLE_TERRAIN_UNDERWATER 3 #define BATTLE_TERRAIN_WATER 4 #define BATTLE_TERRAIN_POND 5 -#define BATTLE_TERRAIN_ROCK 6 +#define BATTLE_TERRAIN_MOUNTAIN 6 #define BATTLE_TERRAIN_CAVE 7 -#define BATTLE_TERRAIN_INSIDE 8 +#define BATTLE_TERRAIN_BUILDING 8 #define BATTLE_TERRAIN_PLAIN 9 // array entries for battle communication @@ -298,7 +299,6 @@ struct TrainerMonNoItemDefaultMoves u16 species; }; -u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg); u8 GetBankSide(u8 bank); struct TrainerMonItemDefaultMoves @@ -328,10 +328,10 @@ struct TrainerMonItemCustomMoves union TrainerMonPtr { - struct TrainerMonNoItemDefaultMoves* NoItemDefaultMoves; - struct TrainerMonNoItemCustomMoves* NoItemCustomMoves; - struct TrainerMonItemDefaultMoves* ItemDefaultMoves; - struct TrainerMonItemCustomMoves* ItemCustomMoves; + struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves; + struct TrainerMonNoItemCustomMoves *NoItemCustomMoves; + struct TrainerMonItemDefaultMoves *ItemDefaultMoves; + struct TrainerMonItemCustomMoves *ItemCustomMoves; }; struct Trainer @@ -348,9 +348,6 @@ struct Trainer /*0x24*/ union TrainerMonPtr party; }; -#define PARTY_FLAG_CUSTOM_MOVES 0x1 -#define PARTY_FLAG_HAS_ITEM 0x2 - extern const struct Trainer gTrainers[]; #define TRAINER_ENCOUNTER_MUSIC(trainer)((gTrainers[trainer].encounterMusic_gender & 0x7F)) @@ -867,16 +864,6 @@ struct BattleScripting extern struct BattleScripting gBattleScripting; -// functions - -// battle_1 -void LoadBattleTextboxAndBackground(void); -void LoadBattleEntryBackground(void); -void ApplyPlayerChosenFrameToBattleMenu(void); -bool8 LoadChosenBattleElement(u8 caseId); -void DrawMainBattleBackground(void); -void task00_0800F6FC(u8 taskId); - enum { BACK_PIC_BRENDAN, diff --git a/include/battle_bg.h b/include/battle_bg.h new file mode 100644 index 000000000..7fc09fbf7 --- /dev/null +++ b/include/battle_bg.h @@ -0,0 +1,13 @@ +#ifndef GUARD_BATTLE_BG_H +#define GUARD_BATTLE_BG_H + +void sub_8035658(void); +void sub_80356D0(void); +void ApplyPlayerChosenFrameToBattleMenu(void); +void DrawMainBattleBackground(void); +void LoadBattleTextboxAndBackground(void); +void sub_8035D74(u8 taskId); +void LoadBattleEntryBackground(void); +bool8 LoadChosenBattleElement(u8 caseId); + +#endif // GUARD_BATTLE_BG_H diff --git a/include/battle_setup.h b/include/battle_setup.h index 0168022cc..e4bae6fdb 100644 --- a/include/battle_setup.h +++ b/include/battle_setup.h @@ -1,18 +1,85 @@ #ifndef GUARD_BATTLE_SETUP_H #define GUARD_BATTLE_SETUP_H -void BattleSetup_StartScriptedWildBattle(void); -u8 BattleSetup_GetTerrainId(void); -u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data); -void BattleSetup_StartBattlePikeWildBattle(void); +enum +{ + TRAINER_BATTLE_NORMAL, + TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, + TRAINER_BATTLE_CONTINUE_SCRIPT, + TRAINER_BATTLE_NORMAL_NO_INTRO_TEXT, + TRAINER_BATTLE_DOUBLE, + TRAINER_BATTLE_REMATCH, + TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE, + TRAINER_BATTLE_REMATCH_DOUBLE, + TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC, + TRAINER_BATTLE_9, + TRAINER_BATTLE_SET_TRAINER_A, + TRAINER_BATTLE_SET_TRAINER_B, + TRAINER_BATTLE_12, +}; + +#define REMATCHES_COUNT 5 +#define REMATCH_TABLE_ENTRIES 78 +#define REMATCH_WALLY_ENTRY 64 +#define REMATCH_ELITE_FOUR_ENTRIES 73 + +struct RematchTrainer +{ + u16 trainerIds[REMATCHES_COUNT]; + u16 mapGroup; + u16 mapNum; +}; + +extern const struct RematchTrainer gRematchTable[REMATCH_TABLE_ENTRIES]; + +extern u16 gTrainerBattleOpponent_A; +extern u16 gTrainerBattleOpponent_B; +extern u16 gPartnerTrainerId; + void BattleSetup_StartWildBattle(void); +void BattleSetup_StartBattlePikeWildBattle(void); void BattleSetup_StartRoamerBattle(void); - -u8 HasTrainerAlreadyBeenFought(u16); -void trainer_flag_set(u16); -void trainer_flag_clear(u16); +void StartWallyTutorialBattle(void); +void BattleSetup_StartScriptedWildBattle(void); +void BattleSetup_StartLatiBattle(void); +void BattleSetup_StartLegendaryBattle(void); +void StartGroudonKyogreBattle(void); +void StartRegiBattle(void); +u8 BattleSetup_GetTerrainId(void); +u8 sub_80B100C(s32 arg0); +void ChooseStarter(void); +void ResetTrainerOpponentIds(void); +void SetMapVarsToTrainer(void); +const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data); +void ConfigureAndSetUpOneTrainerBattle(u8 trainerMapObjId, const u8 *trainerScript); +void ConfigureTwoTrainersBattle(u8 trainerMapObjId, const u8 *trainerScript); +void SetUpTwoTrainersBattle(void); +bool32 GetTrainerFlagFromScriptPointer(const u8 *data); +void sub_80B16D8(void); +u8 GetTrainerBattleMode(void); +bool8 GetTrainerFlag(void); +bool8 HasTrainerBeenFought(u16 trainerId); +void SetTrainerFlag(u16 trainerId); +void ClearTrainerFlag(u16 trainerId); void BattleSetup_StartTrainerBattle(void); -u8 *BattleSetup_GetScriptAddrAfterBattle(void); -u8 *BattleSetup_GetTrainerPostBattleScript(void); +void BattleSetup_StartRematchBattle(void); +void ShowTrainerIntroSpeech(void); +const u8 *BattleSetup_GetScriptAddrAfterBattle(void); +const u8 *BattleSetup_GetTrainerPostBattleScript(void); +void ShowTrainerCantBattleSpeech(void); +void SetUpTrainerEncounterMusic(void); +const u8 *GetTrainerALoseText(void); +const u8 *GetTrainerBLoseText(void); +const u8 *GetTrainerWonSpeech(void); +void UpdateRematchIfDefeated(s32 rematchTableId); +void IncrementRematchStepCounter(void); +void TryUpdateRandomTrainerRematches(u16 mapGroup, u16 mapNum); +bool32 DoesSomeoneWantRematchIn(u16 mapGroup, u16 mapNum); +bool32 IsRematchTrainerIn(u16 mapGroup, u16 mapNum); +u16 GetLastBeatenRematchTrainerId(u16 trainerId); +bool8 ShouldTryRematchBattle(void); +bool8 IsTrainerReadyForRematch(void); +void ShouldTryGetTrainerScript(void); +u16 CountBattledRematchTeams(u16 trainerId); #endif // GUARD_BATTLE_SETUP_H diff --git a/include/battle_transition.h b/include/battle_transition.h index 1603f5c93..84b5e37ec 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -2,5 +2,55 @@ #define GUARD_BATTLE_TRANSITION_H void sub_8149DFC(u8 a1); +void BattleTransition_StartOnField(u8 transitionID); +void BattleTransition_Start(u8 transitionID); +bool8 IsBattleTransitionDone(void); + +// credits for the names go to Dyskinesia and Tetrable +// names are naturally subject to change + +#define B_TRANSITION_BLUR 0 +#define B_TRANSITION_SWIRL 1 +#define B_TRANSITION_SHUFFLE 2 +#define B_TRANSITION_BIG_POKEBALL 3 +#define B_TRANSITION_POKEBALLS_TRAIL 4 +#define B_TRANSITION_CLOCKWISE_BLACKFADE 5 +#define B_TRANSITION_RIPPLE 6 +#define B_TRANSITION_WAVE 7 +#define B_TRANSITION_SLICE 8 +#define B_TRANSITION_WHITEFADE 9 +#define B_TRANSITION_GRID_SQUARES 10 +#define B_TRANSITION_SHARDS 11 +#define B_TRANSITION_SYDNEY 12 +#define B_TRANSITION_PHOEBE 13 +#define B_TRANSITION_GLACIA 14 +#define B_TRANSITION_DRAKE 15 +#define B_TRANSITION_CHAMPION 16 +// added in Emerald +#define B_TRANSITION_AQUA 17 +#define B_TRANSITION_MAGMA 18 +#define B_TRANSITION_REGICE 19 +#define B_TRANSITION_REGISTEEL 20 +#define B_TRANSITION_REGIROCK 21 +#define B_TRANSITION_KYOGRE 22 +#define B_TRANSITION_GROUDON 23 +#define B_TRANSITION_RAYQUAZA 24 +#define B_TRANSITION_25 25 +#define B_TRANSITION_26 26 +#define B_TRANSITION_27 27 +#define B_TRANSITION_28 28 +#define B_TRANSITION_29 29 +#define B_TRANSITION_30 30 +#define B_TRANSITION_31 31 +#define B_TRANSITION_32 32 +#define B_TRANSITION_33 33 +#define B_TRANSITION_34 34 +#define B_TRANSITION_35 35 +#define B_TRANSITION_36 36 +#define B_TRANSITION_37 37 +#define B_TRANSITION_38 38 +#define B_TRANSITION_39 39 +#define B_TRANSITION_40 40 +#define B_TRANSITION_41 41 #endif // GUARD_BATTLE_TRANSITION_H diff --git a/include/constants/flags.h b/include/constants/flags.h index e74ef1ef0..26d015c84 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -303,7 +303,7 @@ #define FLAG_0x12C 0x12C #define FLAG_0x12D 0x12D #define FLAG_0x12E 0x12E -#define FLAG_0x12F 0x12F +#define FLAG_HAS_MATCH_CALL 0x12F #define FLAG_0x130 0x130 #define FLAG_0x131 0x131 #define FLAG_0x132 0x132 @@ -348,7 +348,7 @@ #define FLAG_0x159 0x159 #define FLAG_0x15A 0x15A #define FLAG_0x15B 0x15B -#define FLAG_0x15C 0x15C +#define FLAG_MATCH_CALL_REGISTERED 0x15C #define FLAG_0x15D 0x15D #define FLAG_0x15E 0x15E #define FLAG_0x15F 0x15F diff --git a/include/constants/trainers.h b/include/constants/trainers.h new file mode 100644 index 000000000..48d4f081e --- /dev/null +++ b/include/constants/trainers.h @@ -0,0 +1,1129 @@ +#ifndef GUARD_TRAINERS_H +#define GUARD_TRAINERS_H + +#define TRAINER_NONE 0 +#define TRAINER_SAWYER_1 1 +#define TRAINER_GRUNT_1 2 +#define TRAINER_GRUNT_2 3 +#define TRAINER_GRUNT_3 4 +#define TRAINER_GRUNT_4 5 +#define TRAINER_GRUNT_5 6 +#define TRAINER_GRUNT_6 7 +#define TRAINER_GRUNT_7 8 +#define TRAINER_GABRIELLE_1 9 +#define TRAINER_GRUNT_8 10 +#define TRAINER_MARCEL 11 +#define TRAINER_ALBERTO 12 +#define TRAINER_ED 13 +#define TRAINER_GRUNT_9 14 +#define TRAINER_DECLAN 15 +#define TRAINER_GRUNT_10 16 +#define TRAINER_GRUNT_11 17 +#define TRAINER_GRUNT_12 18 +#define TRAINER_GRUNT_13 19 +#define TRAINER_GRUNT_14 20 +#define TRAINER_GRUNT_15 21 +#define TRAINER_GRUNT_16 22 +#define TRAINER_GRUNT_17 23 +#define TRAINER_GRUNT_18 24 +#define TRAINER_GRUNT_19 25 +#define TRAINER_GRUNT_20 26 +#define TRAINER_GRUNT_21 27 +#define TRAINER_GRUNT_22 28 +#define TRAINER_FREDRICK 29 +#define TRAINER_MATT 30 +#define TRAINER_ZANDER 31 +#define TRAINER_SHELLY_1 32 +#define TRAINER_SHELLY_2 33 +#define TRAINER_ARCHIE 34 +#define TRAINER_LEAH 35 +#define TRAINER_DAISY 36 +#define TRAINER_ROSE_1 37 +#define TRAINER_FELIX 38 +#define TRAINER_VIOLET 39 +#define TRAINER_ROSE_2 40 +#define TRAINER_ROSE_3 41 +#define TRAINER_ROSE_4 42 +#define TRAINER_ROSE_5 43 +#define TRAINER_DUSTY_1 44 +#define TRAINER_CHIP 45 +#define TRAINER_FOSTER 46 +#define TRAINER_DUSTY_2 47 +#define TRAINER_DUSTY_3 48 +#define TRAINER_DUSTY_4 49 +#define TRAINER_DUSTY_5 50 +#define TRAINER_GABBY_AND_TY_1 51 +#define TRAINER_GABBY_AND_TY_2 52 +#define TRAINER_GABBY_AND_TY_3 53 +#define TRAINER_GABBY_AND_TY_4 54 +#define TRAINER_GABBY_AND_TY_5 55 +#define TRAINER_GABBY_AND_TY_6 56 +#define TRAINER_LOLA_1 57 +#define TRAINER_AUSTINA 58 +#define TRAINER_GWEN 59 +#define TRAINER_LOLA_2 60 +#define TRAINER_LOLA_3 61 +#define TRAINER_LOLA_4 62 +#define TRAINER_LOLA_5 63 +#define TRAINER_RICKY_1 64 +#define TRAINER_SIMON 65 +#define TRAINER_CHARLIE 66 +#define TRAINER_RICKY_2 67 +#define TRAINER_RICKY_3 68 +#define TRAINER_RICKY_4 69 +#define TRAINER_RICKY_5 70 +#define TRAINER_RANDALL 71 +#define TRAINER_PARKER 72 +#define TRAINER_GEORGE 73 +#define TRAINER_BERKE 74 +#define TRAINER_BRAXTON 75 +#define TRAINER_VINCENT 76 +#define TRAINER_LEROY 77 +#define TRAINER_WILTON_1 78 +#define TRAINER_EDGAR 79 +#define TRAINER_ALBERT 80 +#define TRAINER_SAMUEL 81 +#define TRAINER_VITO 82 +#define TRAINER_OWEN 83 +#define TRAINER_WILTON_2 84 +#define TRAINER_WILTON_3 85 +#define TRAINER_WILTON_4 86 +#define TRAINER_WILTON_5 87 +#define TRAINER_WARREN 88 +#define TRAINER_MARY 89 +#define TRAINER_ALEXIA 90 +#define TRAINER_JODY 91 +#define TRAINER_WENDY 92 +#define TRAINER_KEIRA 93 +#define TRAINER_BROOKE_1 94 +#define TRAINER_JENNIFER 95 +#define TRAINER_HOPE 96 +#define TRAINER_SHANNON 97 +#define TRAINER_MICHELLE 98 +#define TRAINER_CAROLINE 99 +#define TRAINER_JULIE 100 +#define TRAINER_BROOKE_2 101 +#define TRAINER_BROOKE_3 102 +#define TRAINER_BROOKE_4 103 +#define TRAINER_BROOKE_5 104 +#define TRAINER_PATRICIA 105 +#define TRAINER_KINDRA 106 +#define TRAINER_TAMMY 107 +#define TRAINER_VALERIE_1 108 +#define TRAINER_TASHA 109 +#define TRAINER_VALERIE_2 110 +#define TRAINER_VALERIE_3 111 +#define TRAINER_VALERIE_4 112 +#define TRAINER_VALERIE_5 113 +#define TRAINER_CINDY_1 114 +#define TRAINER_DAPHNE 115 +#define TRAINER_GRUNT_23 116 +#define TRAINER_CINDY_2 117 +#define TRAINER_BRIANNA 118 +#define TRAINER_NAOMI 119 +#define TRAINER_CINDY_3 120 +#define TRAINER_CINDY_4 121 +#define TRAINER_CINDY_5 122 +#define TRAINER_CINDY_6 123 +#define TRAINER_MELISSA 124 +#define TRAINER_SHEILA 125 +#define TRAINER_SHIRLEY 126 +#define TRAINER_JESSICA_1 127 +#define TRAINER_CONNIE 128 +#define TRAINER_BRIDGET 129 +#define TRAINER_OLIVIA 130 +#define TRAINER_TIFFANY 131 +#define TRAINER_JESSICA_2 132 +#define TRAINER_JESSICA_3 133 +#define TRAINER_JESSICA_4 134 +#define TRAINER_JESSICA_5 135 +#define TRAINER_WINSTON_1 136 +#define TRAINER_MOLLIE 137 +#define TRAINER_GARRET 138 +#define TRAINER_WINSTON_2 139 +#define TRAINER_WINSTON_3 140 +#define TRAINER_WINSTON_4 141 +#define TRAINER_WINSTON_5 142 +#define TRAINER_STEVE_1 143 +#define TRAINER_THALIA_1 144 +#define TRAINER_MARK 145 +#define TRAINER_GRUNT_24 146 +#define TRAINER_STEVE_2 147 +#define TRAINER_STEVE_3 148 +#define TRAINER_STEVE_4 149 +#define TRAINER_STEVE_5 150 +#define TRAINER_LUIS 151 +#define TRAINER_DOMINIK 152 +#define TRAINER_DOUGLAS 153 +#define TRAINER_DARRIN 154 +#define TRAINER_TONY_1 155 +#define TRAINER_JEROME 156 +#define TRAINER_MATTHEW 157 +#define TRAINER_DAVID 158 +#define TRAINER_SPENCER 159 +#define TRAINER_ROLAND 160 +#define TRAINER_NOLEN 161 +#define TRAINER_STAN 162 +#define TRAINER_BARRY 163 +#define TRAINER_DEAN 164 +#define TRAINER_RODNEY 165 +#define TRAINER_RICHARD 166 +#define TRAINER_HERMAN 167 +#define TRAINER_SANTIAGO 168 +#define TRAINER_GILBERT 169 +#define TRAINER_FRANKLIN 170 +#define TRAINER_KEVIN 171 +#define TRAINER_JACK 172 +#define TRAINER_DUDLEY 173 +#define TRAINER_CHAD 174 +#define TRAINER_TONY_2 175 +#define TRAINER_TONY_3 176 +#define TRAINER_TONY_4 177 +#define TRAINER_TONY_5 178 +#define TRAINER_TAKAO 179 +#define TRAINER_HITOSHI 180 +#define TRAINER_KIYO 181 +#define TRAINER_KOICHI 182 +#define TRAINER_NOB_1 183 +#define TRAINER_NOB_2 184 +#define TRAINER_NOB_3 185 +#define TRAINER_NOB_4 186 +#define TRAINER_NOB_5 187 +#define TRAINER_YUJI 188 +#define TRAINER_DAISUKE 189 +#define TRAINER_ATSUSHI 190 +#define TRAINER_KIRK 191 +#define TRAINER_GRUNT_25 192 +#define TRAINER_GRUNT_26 193 +#define TRAINER_SHAWN 194 +#define TRAINER_FERNANDO_1 195 +#define TRAINER_DALTON_1 196 +#define TRAINER_DALTON_2 197 +#define TRAINER_DALTON_3 198 +#define TRAINER_DALTON_4 199 +#define TRAINER_DALTON_5 200 +#define TRAINER_COLE 201 +#define TRAINER_JEFF 202 +#define TRAINER_AXLE 203 +#define TRAINER_JACE 204 +#define TRAINER_KEEGAN 205 +#define TRAINER_BERNIE_1 206 +#define TRAINER_BERNIE_2 207 +#define TRAINER_BERNIE_3 208 +#define TRAINER_BERNIE_4 209 +#define TRAINER_BERNIE_5 210 +#define TRAINER_DREW 211 +#define TRAINER_BEAU 212 +#define TRAINER_LARRY 213 +#define TRAINER_SHANE 214 +#define TRAINER_JUSTIN 215 +#define TRAINER_ETHAN_1 216 +#define TRAINER_AUTUMN 217 +#define TRAINER_TRAVIS 218 +#define TRAINER_ETHAN_2 219 +#define TRAINER_ETHAN_3 220 +#define TRAINER_ETHAN_4 221 +#define TRAINER_ETHAN_5 222 +#define TRAINER_BRENT 223 +#define TRAINER_DONALD 224 +#define TRAINER_TAYLOR 225 +#define TRAINER_JEFFREY_1 226 +#define TRAINER_DEREK 227 +#define TRAINER_JEFFREY_2 228 +#define TRAINER_JEFFREY_3 229 +#define TRAINER_JEFFREY_4 230 +#define TRAINER_JEFFREY_5 231 +#define TRAINER_EDWARD 232 +#define TRAINER_PRESTON 233 +#define TRAINER_VIRGIL 234 +#define TRAINER_BLAKE 235 +#define TRAINER_WILLIAM 236 +#define TRAINER_JOSHUA 237 +#define TRAINER_CAMERON_1 238 +#define TRAINER_CAMERON_2 239 +#define TRAINER_CAMERON_3 240 +#define TRAINER_CAMERON_4 241 +#define TRAINER_CAMERON_5 242 +#define TRAINER_JACLYN 243 +#define TRAINER_HANNAH 244 +#define TRAINER_SAMANTHA 245 +#define TRAINER_MAURA 246 +#define TRAINER_KAYLA 247 +#define TRAINER_ALEXIS 248 +#define TRAINER_JACKI_1 249 +#define TRAINER_JACKI_2 250 +#define TRAINER_JACKI_3 251 +#define TRAINER_JACKI_4 252 +#define TRAINER_JACKI_5 253 +#define TRAINER_WALTER_1 254 +#define TRAINER_MICAH 255 +#define TRAINER_THOMAS 256 +#define TRAINER_WALTER_2 257 +#define TRAINER_WALTER_3 258 +#define TRAINER_WALTER_4 259 +#define TRAINER_WALTER_5 260 +#define TRAINER_SIDNEY 261 +#define TRAINER_PHOEBE 262 +#define TRAINER_GLACIA 263 +#define TRAINER_DRAKE 264 +#define TRAINER_ROXANNE_1 265 +#define TRAINER_BRAWLY_1 266 +#define TRAINER_WATTSON_1 267 +#define TRAINER_FLANNERY_1 268 +#define TRAINER_NORMAN_1 269 +#define TRAINER_WINONA_1 270 +#define TRAINER_TATE_AND_LIZA_1 271 +#define TRAINER_JUAN_1 272 +#define TRAINER_JERRY_1 273 +#define TRAINER_TED 274 +#define TRAINER_PAUL 275 +#define TRAINER_JERRY_2 276 +#define TRAINER_JERRY_3 277 +#define TRAINER_JERRY_4 278 +#define TRAINER_JERRY_5 279 +#define TRAINER_KAREN_1 280 +#define TRAINER_GEORGIA 281 +#define TRAINER_KAREN_2 282 +#define TRAINER_KAREN_3 283 +#define TRAINER_KAREN_4 284 +#define TRAINER_KAREN_5 285 +#define TRAINER_KATE_AND_JOY 286 +#define TRAINER_ANNA_AND_MEG_1 287 +#define TRAINER_ANNA_AND_MEG_2 288 +#define TRAINER_ANNA_AND_MEG_3 289 +#define TRAINER_ANNA_AND_MEG_4 290 +#define TRAINER_ANNA_AND_MEG_5 291 +#define TRAINER_VICTOR 292 +#define TRAINER_MIGUEL_1 293 +#define TRAINER_COLTON 294 +#define TRAINER_MIGUEL_2 295 +#define TRAINER_MIGUEL_3 296 +#define TRAINER_MIGUEL_4 297 +#define TRAINER_MIGUEL_5 298 +#define TRAINER_VICTORIA 299 +#define TRAINER_VANESSA 300 +#define TRAINER_BETHANY 301 +#define TRAINER_ISABEL_1 302 +#define TRAINER_ISABEL_2 303 +#define TRAINER_ISABEL_3 304 +#define TRAINER_ISABEL_4 305 +#define TRAINER_ISABEL_5 306 +#define TRAINER_TIMOTHY_1 307 +#define TRAINER_TIMOTHY_2 308 +#define TRAINER_TIMOTHY_3 309 +#define TRAINER_TIMOTHY_4 310 +#define TRAINER_TIMOTHY_5 311 +#define TRAINER_VICKY 312 +#define TRAINER_SHELBY_1 313 +#define TRAINER_SHELBY_2 314 +#define TRAINER_SHELBY_3 315 +#define TRAINER_SHELBY_4 316 +#define TRAINER_SHELBY_5 317 +#define TRAINER_CALVIN_1 318 +#define TRAINER_BILLY 319 +#define TRAINER_JOSH 320 +#define TRAINER_TOMMY 321 +#define TRAINER_JOEY 322 +#define TRAINER_BEN 323 +#define TRAINER_QUINCY 324 +#define TRAINER_KATELYNN 325 +#define TRAINER_JAYLEN 326 +#define TRAINER_DILLON 327 +#define TRAINER_CALVIN_2 328 +#define TRAINER_CALVIN_3 329 +#define TRAINER_CALVIN_4 330 +#define TRAINER_CALVIN_5 331 +#define TRAINER_EDDIE 332 +#define TRAINER_ALLEN 333 +#define TRAINER_TIMMY 334 +#define TRAINER_WALLACE 335 +#define TRAINER_ANDREW 336 +#define TRAINER_IVAN 337 +#define TRAINER_CLAUDE 338 +#define TRAINER_ELLIOT_1 339 +#define TRAINER_NED 340 +#define TRAINER_DALE 341 +#define TRAINER_NOLAN 342 +#define TRAINER_BARNY 343 +#define TRAINER_WADE 344 +#define TRAINER_CARTER 345 +#define TRAINER_ELLIOT_2 346 +#define TRAINER_ELLIOT_3 347 +#define TRAINER_ELLIOT_4 348 +#define TRAINER_ELLIOT_5 349 +#define TRAINER_RONALD 350 +#define TRAINER_JACOB 351 +#define TRAINER_ANTHONY 352 +#define TRAINER_BENJAMIN_1 353 +#define TRAINER_BENJAMIN_2 354 +#define TRAINER_BENJAMIN_3 355 +#define TRAINER_BENJAMIN_4 356 +#define TRAINER_BENJAMIN_5 357 +#define TRAINER_ABIGAIL_1 358 +#define TRAINER_JASMINE 359 +#define TRAINER_ABIGAIL_2 360 +#define TRAINER_ABIGAIL_3 361 +#define TRAINER_ABIGAIL_4 362 +#define TRAINER_ABIGAIL_5 363 +#define TRAINER_DYLAN_1 364 +#define TRAINER_DYLAN_2 365 +#define TRAINER_DYLAN_3 366 +#define TRAINER_DYLAN_4 367 +#define TRAINER_DYLAN_5 368 +#define TRAINER_MARIA_1 369 +#define TRAINER_MARIA_2 370 +#define TRAINER_MARIA_3 371 +#define TRAINER_MARIA_4 372 +#define TRAINER_MARIA_5 373 +#define TRAINER_CAMDEN 374 +#define TRAINER_DEMETRIUS 375 +#define TRAINER_ISAIAH_1 376 +#define TRAINER_PABLO_1 377 +#define TRAINER_CHASE 378 +#define TRAINER_ISAIAH_2 379 +#define TRAINER_ISAIAH_3 380 +#define TRAINER_ISAIAH_4 381 +#define TRAINER_ISAIAH_5 382 +#define TRAINER_ISOBEL 383 +#define TRAINER_DONNY 384 +#define TRAINER_TALIA 385 +#define TRAINER_KATELYN_1 386 +#define TRAINER_ALLISON 387 +#define TRAINER_KATELYN_2 388 +#define TRAINER_KATELYN_3 389 +#define TRAINER_KATELYN_4 390 +#define TRAINER_KATELYN_5 391 +#define TRAINER_NICOLAS_1 392 +#define TRAINER_NICOLAS_2 393 +#define TRAINER_NICOLAS_3 394 +#define TRAINER_NICOLAS_4 395 +#define TRAINER_NICOLAS_5 396 +#define TRAINER_AARON 397 +#define TRAINER_PERRY 398 +#define TRAINER_HUGH 399 +#define TRAINER_PHIL 400 +#define TRAINER_JARED 401 +#define TRAINER_HUMBERTO 402 +#define TRAINER_PRESLEY 403 +#define TRAINER_EDWARDO 404 +#define TRAINER_COLIN 405 +#define TRAINER_ROBERT_1 406 +#define TRAINER_BENNY 407 +#define TRAINER_CHESTER 408 +#define TRAINER_ROBERT_2 409 +#define TRAINER_ROBERT_3 410 +#define TRAINER_ROBERT_4 411 +#define TRAINER_ROBERT_5 412 +#define TRAINER_ALEX 413 +#define TRAINER_BECK 414 +#define TRAINER_YASU 415 +#define TRAINER_TAKASHI 416 +#define TRAINER_DIANNE 417 +#define TRAINER_JANI 418 +#define TRAINER_LAO_1 419 +#define TRAINER_LUNG 420 +#define TRAINER_LAO_2 421 +#define TRAINER_LAO_3 422 +#define TRAINER_LAO_4 423 +#define TRAINER_LAO_5 424 +#define TRAINER_JOCELYN 425 +#define TRAINER_LAURA 426 +#define TRAINER_CYNDY_1 427 +#define TRAINER_CORA 428 +#define TRAINER_PAULA 429 +#define TRAINER_CYNDY_2 430 +#define TRAINER_CYNDY_3 431 +#define TRAINER_CYNDY_4 432 +#define TRAINER_CYNDY_5 433 +#define TRAINER_MADELINE_1 434 +#define TRAINER_CLARISSA 435 +#define TRAINER_ANGELICA 436 +#define TRAINER_MADELINE_2 437 +#define TRAINER_MADELINE_3 438 +#define TRAINER_MADELINE_4 439 +#define TRAINER_MADELINE_5 440 +#define TRAINER_BEVERLY 441 +#define TRAINER_IMANI 442 +#define TRAINER_KYLA 443 +#define TRAINER_DENISE 444 +#define TRAINER_BETH 445 +#define TRAINER_TARA 446 +#define TRAINER_MISSY 447 +#define TRAINER_ALICE 448 +#define TRAINER_JENNY_1 449 +#define TRAINER_GRACE 450 +#define TRAINER_TANYA 451 +#define TRAINER_SHARON 452 +#define TRAINER_NIKKI 453 +#define TRAINER_BRENDA 454 +#define TRAINER_KATIE 455 +#define TRAINER_SUSIE 456 +#define TRAINER_KARA 457 +#define TRAINER_DANA 458 +#define TRAINER_SIENNA 459 +#define TRAINER_DEBRA 460 +#define TRAINER_LINDA 461 +#define TRAINER_KAYLEE 462 +#define TRAINER_LAUREL 463 +#define TRAINER_CARLEE 464 +#define TRAINER_JENNY_2 465 +#define TRAINER_JENNY_3 466 +#define TRAINER_JENNY_4 467 +#define TRAINER_JENNY_5 468 +#define TRAINER_HEIDI 469 +#define TRAINER_BECKY 470 +#define TRAINER_CAROL 471 +#define TRAINER_NANCY 472 +#define TRAINER_MARTHA 473 +#define TRAINER_DIANA_1 474 +#define TRAINER_CEDRIC 475 +#define TRAINER_IRENE 476 +#define TRAINER_DIANA_2 477 +#define TRAINER_DIANA_3 478 +#define TRAINER_DIANA_4 479 +#define TRAINER_DIANA_5 480 +#define TRAINER_AMY_AND_LIV_1 481 +#define TRAINER_AMY_AND_LIV_2 482 +#define TRAINER_GINA_AND_MIA_1 483 +#define TRAINER_MIU_AND_YUKI 484 +#define TRAINER_AMY_AND_LIV_3 485 +#define TRAINER_GINA_AND_MIA_2 486 +#define TRAINER_AMY_AND_LIV_4 487 +#define TRAINER_AMY_AND_LIV_5 488 +#define TRAINER_AMY_AND_LIV_6 489 +#define TRAINER_HUEY 490 +#define TRAINER_EDMOND 491 +#define TRAINER_ERNEST_1 492 +#define TRAINER_DWAYNE 493 +#define TRAINER_PHILLIP 494 +#define TRAINER_LEONARD 495 +#define TRAINER_DUNCAN 496 +#define TRAINER_ERNEST_2 497 +#define TRAINER_ERNEST_3 498 +#define TRAINER_ERNEST_4 499 +#define TRAINER_ERNEST_5 500 +#define TRAINER_ELI 501 +#define TRAINER_ANNIKA 502 +#define TRAINER_JAZMYN 503 +#define TRAINER_JONAS 504 +#define TRAINER_KAYLEY 505 +#define TRAINER_AURON 506 +#define TRAINER_KELVIN 507 +#define TRAINER_MARLEY 508 +#define TRAINER_REYNA 509 +#define TRAINER_HUDSON 510 +#define TRAINER_CONOR 511 +#define TRAINER_EDWIN_1 512 +#define TRAINER_HECTOR 513 +#define TRAINER_TABITHA_1 514 +#define TRAINER_EDWIN_2 515 +#define TRAINER_EDWIN_3 516 +#define TRAINER_EDWIN_4 517 +#define TRAINER_EDWIN_5 518 +#define TRAINER_WALLY_1 519 +#define TRAINER_BRENDAN_1 520 +#define TRAINER_BRENDAN_2 521 +#define TRAINER_BRENDAN_3 522 +#define TRAINER_BRENDAN_4 523 +#define TRAINER_BRENDAN_5 524 +#define TRAINER_BRENDAN_6 525 +#define TRAINER_BRENDAN_7 526 +#define TRAINER_BRENDAN_8 527 +#define TRAINER_BRENDAN_9 528 +#define TRAINER_MAY_1 529 +#define TRAINER_MAY_2 530 +#define TRAINER_MAY_3 531 +#define TRAINER_MAY_4 532 +#define TRAINER_MAY_5 533 +#define TRAINER_MAY_6 534 +#define TRAINER_MAY_7 535 +#define TRAINER_MAY_8 536 +#define TRAINER_MAY_9 537 +#define TRAINER_ISAAC_1 538 +#define TRAINER_DAVIS 539 +#define TRAINER_MITCHELL 540 +#define TRAINER_ISAAC_2 541 +#define TRAINER_ISAAC_3 542 +#define TRAINER_ISAAC_4 543 +#define TRAINER_ISAAC_5 544 +#define TRAINER_LYDIA_1 545 +#define TRAINER_HALLE 546 +#define TRAINER_GARRISON 547 +#define TRAINER_LYDIA_2 548 +#define TRAINER_LYDIA_3 549 +#define TRAINER_LYDIA_4 550 +#define TRAINER_LYDIA_5 551 +#define TRAINER_JACKSON_1 552 +#define TRAINER_LORENZO 553 +#define TRAINER_SEBASTIAN 554 +#define TRAINER_JACKSON_2 555 +#define TRAINER_JACKSON_3 556 +#define TRAINER_JACKSON_4 557 +#define TRAINER_JACKSON_5 558 +#define TRAINER_CATHERINE_1 559 +#define TRAINER_JENNA 560 +#define TRAINER_SOPHIA 561 +#define TRAINER_CATHERINE_2 562 +#define TRAINER_CATHERINE_3 563 +#define TRAINER_CATHERINE_4 564 +#define TRAINER_CATHERINE_5 565 +#define TRAINER_JULIO 566 +#define TRAINER_GRUNT_27 567 +#define TRAINER_GRUNT_28 568 +#define TRAINER_GRUNT_29 569 +#define TRAINER_GRUNT_30 570 +#define TRAINER_MARC 571 +#define TRAINER_BRENDEN 572 +#define TRAINER_LILITH 573 +#define TRAINER_CRISTIAN 574 +#define TRAINER_SYLVIA 575 +#define TRAINER_LEONARDO 576 +#define TRAINER_ATHENA 577 +#define TRAINER_HARRISON 578 +#define TRAINER_GRUNT_31 579 +#define TRAINER_CLARENCE 580 +#define TRAINER_TERRY 581 +#define TRAINER_NATE 582 +#define TRAINER_KATHLEEN 583 +#define TRAINER_CLIFFORD 584 +#define TRAINER_NICHOLAS 585 +#define TRAINER_GRUNT_32 586 +#define TRAINER_GRUNT_33 587 +#define TRAINER_GRUNT_34 588 +#define TRAINER_GRUNT_35 589 +#define TRAINER_GRUNT_36 590 +#define TRAINER_MACEY 591 +#define TRAINER_BRENDAN_10 592 +#define TRAINER_BRENDAN_11 593 +#define TRAINER_PAXTON 594 +#define TRAINER_ISABELLA 595 +#define TRAINER_GRUNT_37 596 +#define TRAINER_TABITHA_2 597 +#define TRAINER_JONATHAN 598 +#define TRAINER_BRENDAN_12 599 +#define TRAINER_MAY_10 600 +#define TRAINER_MAXIE_1 601 +#define TRAINER_MAXIE_2 602 +#define TRAINER_TIANA 603 +#define TRAINER_HALEY_1 604 +#define TRAINER_JANICE 605 +#define TRAINER_VIVI 606 +#define TRAINER_HALEY_2 607 +#define TRAINER_HALEY_3 608 +#define TRAINER_HALEY_4 609 +#define TRAINER_HALEY_5 610 +#define TRAINER_SALLY 611 +#define TRAINER_ROBIN 612 +#define TRAINER_ANDREA 613 +#define TRAINER_CRISSY 614 +#define TRAINER_RICK 615 +#define TRAINER_LYLE 616 +#define TRAINER_JOSE 617 +#define TRAINER_DOUG 618 +#define TRAINER_GREG 619 +#define TRAINER_KENT 620 +#define TRAINER_JAMES_1 621 +#define TRAINER_JAMES_2 622 +#define TRAINER_JAMES_3 623 +#define TRAINER_JAMES_4 624 +#define TRAINER_JAMES_5 625 +#define TRAINER_BRICE 626 +#define TRAINER_TRENT_1 627 +#define TRAINER_LENNY 628 +#define TRAINER_LUCAS_1 629 +#define TRAINER_ALAN 630 +#define TRAINER_CLARK 631 +#define TRAINER_ERIC 632 +#define TRAINER_LUCAS_2 633 +#define TRAINER_MIKE_1 634 +#define TRAINER_MIKE_2 635 +#define TRAINER_TRENT_2 636 +#define TRAINER_TRENT_3 637 +#define TRAINER_TRENT_4 638 +#define TRAINER_TRENT_5 639 +#define TRAINER_DEZ_AND_LUKE 640 +#define TRAINER_LEA_AND_JED 641 +#define TRAINER_KIRA_AND_DAN_1 642 +#define TRAINER_KIRA_AND_DAN_2 643 +#define TRAINER_KIRA_AND_DAN_3 644 +#define TRAINER_KIRA_AND_DAN_4 645 +#define TRAINER_KIRA_AND_DAN_5 646 +#define TRAINER_JOHANNA 647 +#define TRAINER_GERALD 648 +#define TRAINER_VIVIAN 649 +#define TRAINER_DANIELLE 650 +#define TRAINER_HIDEO 651 +#define TRAINER_KEIGO 652 +#define TRAINER_RILEY 653 +#define TRAINER_FLINT 654 +#define TRAINER_ASHLEY 655 +#define TRAINER_WALLY_2 656 +#define TRAINER_WALLY_3 657 +#define TRAINER_WALLY_4 658 +#define TRAINER_WALLY_5 659 +#define TRAINER_WALLY_6 660 +#define TRAINER_BRENDAN_13 661 +#define TRAINER_BRENDAN_14 662 +#define TRAINER_BRENDAN_15 663 +#define TRAINER_MAY_11 664 +#define TRAINER_MAY_12 665 +#define TRAINER_MAY_13 666 +#define TRAINER_JONAH 667 +#define TRAINER_HENRY 668 +#define TRAINER_ROGER 669 +#define TRAINER_ALEXA 670 +#define TRAINER_RUBEN 671 +#define TRAINER_KOJI_1 672 +#define TRAINER_WAYNE 673 +#define TRAINER_AIDAN 674 +#define TRAINER_REED 675 +#define TRAINER_TISHA 676 +#define TRAINER_TORI_AND_TIA 677 +#define TRAINER_KIM_AND_IRIS 678 +#define TRAINER_TYRA_AND_IVY 679 +#define TRAINER_MEL_AND_PAUL 680 +#define TRAINER_JOHN_AND_JAY_1 681 +#define TRAINER_JOHN_AND_JAY_2 682 +#define TRAINER_JOHN_AND_JAY_3 683 +#define TRAINER_JOHN_AND_JAY_4 684 +#define TRAINER_JOHN_AND_JAY_5 685 +#define TRAINER_RELI_AND_IAN 686 +#define TRAINER_LILA_AND_ROY_1 687 +#define TRAINER_LILA_AND_ROY_2 688 +#define TRAINER_LILA_AND_ROY_3 689 +#define TRAINER_LILA_AND_ROY_4 690 +#define TRAINER_LILA_AND_ROY_5 691 +#define TRAINER_LISA_AND_RAY 692 +#define TRAINER_CHRIS 693 +#define TRAINER_DAWSON 694 +#define TRAINER_SARAH 695 +#define TRAINER_DARIAN 696 +#define TRAINER_HAILEY 697 +#define TRAINER_CHANDLER 698 +#define TRAINER_KALEB 699 +#define TRAINER_JOSEPH 700 +#define TRAINER_ALYSSA 701 +#define TRAINER_MARCOS 702 +#define TRAINER_RHETT 703 +#define TRAINER_TYRON 704 +#define TRAINER_CELINA 705 +#define TRAINER_BIANCA 706 +#define TRAINER_HAYDEN 707 +#define TRAINER_SOPHIE 708 +#define TRAINER_COBY 709 +#define TRAINER_LAWRENCE 710 +#define TRAINER_WYATT 711 +#define TRAINER_ANGELINA 712 +#define TRAINER_KAI 713 +#define TRAINER_CHARLOTTE 714 +#define TRAINER_DEANDRE 715 +#define TRAINER_GRUNT_38 716 +#define TRAINER_GRUNT_39 717 +#define TRAINER_GRUNT_40 718 +#define TRAINER_GRUNT_41 719 +#define TRAINER_GRUNT_42 720 +#define TRAINER_GRUNT_43 721 +#define TRAINER_GRUNT_44 722 +#define TRAINER_GRUNT_45 723 +#define TRAINER_GRUNT_46 724 +#define TRAINER_GRUNT_47 725 +#define TRAINER_GRUNT_48 726 +#define TRAINER_GRUNT_49 727 +#define TRAINER_GRUNT_50 728 +#define TRAINER_GRUNT_51 729 +#define TRAINER_GRUNT_52 730 +#define TRAINER_GRUNT_53 731 +#define TRAINER_TABITHA_3 732 +#define TRAINER_DARCY 733 +#define TRAINER_MAXIE_3 734 +#define TRAINER_PETE 735 +#define TRAINER_ISABELLE 736 +#define TRAINER_ANDRES_1 737 +#define TRAINER_JOSUE 738 +#define TRAINER_CAMRON 739 +#define TRAINER_CORY_1 740 +#define TRAINER_CAROLINA 741 +#define TRAINER_ELIJAH 742 +#define TRAINER_CELIA 743 +#define TRAINER_BRYAN 744 +#define TRAINER_BRANDEN 745 +#define TRAINER_BRYANT 746 +#define TRAINER_SHAYLA 747 +#define TRAINER_KYRA 748 +#define TRAINER_JAIDEN 749 +#define TRAINER_ALIX 750 +#define TRAINER_HELENE 751 +#define TRAINER_MARLENE 752 +#define TRAINER_DEVAN 753 +#define TRAINER_JOHNSON 754 +#define TRAINER_MELINA 755 +#define TRAINER_BRANDI 756 +#define TRAINER_AISHA 757 +#define TRAINER_MAKAYLA 758 +#define TRAINER_FABIAN 759 +#define TRAINER_DAYTON 760 +#define TRAINER_RACHEL 761 +#define TRAINER_LEONEL 762 +#define TRAINER_CALLIE 763 +#define TRAINER_CALE 764 +#define TRAINER_MYLES 765 +#define TRAINER_PAT 766 +#define TRAINER_CRISTIN_1 767 +#define TRAINER_MAY_14 768 +#define TRAINER_MAY_15 769 +#define TRAINER_ROXANNE_2 770 +#define TRAINER_ROXANNE_3 771 +#define TRAINER_ROXANNE_4 772 +#define TRAINER_ROXANNE_5 773 +#define TRAINER_BRAWLY_2 774 +#define TRAINER_BRAWLY_3 775 +#define TRAINER_BRAWLY_4 776 +#define TRAINER_BRAWLY_5 777 +#define TRAINER_WATTSON_2 778 +#define TRAINER_WATTSON_3 779 +#define TRAINER_WATTSON_4 780 +#define TRAINER_WATTSON_5 781 +#define TRAINER_FLANNERY_2 782 +#define TRAINER_FLANNERY_3 783 +#define TRAINER_FLANNERY_4 784 +#define TRAINER_FLANNERY_5 785 +#define TRAINER_NORMAN_2 786 +#define TRAINER_NORMAN_3 787 +#define TRAINER_NORMAN_4 788 +#define TRAINER_NORMAN_5 789 +#define TRAINER_WINONA_2 790 +#define TRAINER_WINONA_3 791 +#define TRAINER_WINONA_4 792 +#define TRAINER_WINONA_5 793 +#define TRAINER_TATE_AND_LIZA_2 794 +#define TRAINER_TATE_AND_LIZA_3 795 +#define TRAINER_TATE_AND_LIZA_4 796 +#define TRAINER_TATE_AND_LIZA_5 797 +#define TRAINER_JUAN_2 798 +#define TRAINER_JUAN_3 799 +#define TRAINER_JUAN_4 800 +#define TRAINER_JUAN_5 801 +#define TRAINER_ANGELO 802 +#define TRAINER_DARIUS 803 +#define TRAINER_STEVEN 804 +#define TRAINER_ANABEL 805 +#define TRAINER_TUCKER 806 +#define TRAINER_SPENSER 807 +#define TRAINER_GRETA 808 +#define TRAINER_NOLAND 809 +#define TRAINER_LUCY 810 +#define TRAINER_BRANDON 811 +#define TRAINER_ANDRES_2 812 +#define TRAINER_ANDRES_3 813 +#define TRAINER_ANDRES_4 814 +#define TRAINER_ANDRES_5 815 +#define TRAINER_CORY_2 816 +#define TRAINER_CORY_3 817 +#define TRAINER_CORY_4 818 +#define TRAINER_CORY_5 819 +#define TRAINER_PABLO_2 820 +#define TRAINER_PABLO_3 821 +#define TRAINER_PABLO_4 822 +#define TRAINER_PABLO_5 823 +#define TRAINER_KOJI_2 824 +#define TRAINER_KOJI_3 825 +#define TRAINER_KOJI_4 826 +#define TRAINER_KOJI_5 827 +#define TRAINER_CRISTIN_2 828 +#define TRAINER_CRISTIN_3 829 +#define TRAINER_CRISTIN_4 830 +#define TRAINER_CRISTIN_5 831 +#define TRAINER_FERNANDO_2 832 +#define TRAINER_FERNANDO_3 833 +#define TRAINER_FERNANDO_4 834 +#define TRAINER_FERNANDO_5 835 +#define TRAINER_SAWYER_2 836 +#define TRAINER_SAWYER_3 837 +#define TRAINER_SAWYER_4 838 +#define TRAINER_SAWYER_5 839 +#define TRAINER_GABRIELLE_2 840 +#define TRAINER_GABRIELLE_3 841 +#define TRAINER_GABRIELLE_4 842 +#define TRAINER_GABRIELLE_5 843 +#define TRAINER_THALIA_2 844 +#define TRAINER_THALIA_3 845 +#define TRAINER_THALIA_4 846 +#define TRAINER_THALIA_5 847 +#define TRAINER_MARIELA 848 +#define TRAINER_ALVARO 849 +#define TRAINER_EVERETT 850 +#define TRAINER_RED 851 +#define TRAINER_LEAF 852 +#define TRAINER_BRENDAN_16 853 +#define TRAINER_MAY_16 854 + +#define NO_OF_TRAINERS 854 + +#define TRAINER_PIC_HIKER 0 +#define TRAINER_PIC_AQUA_GRUNT_M 1 +#define TRAINER_PIC_POKEMON_BREEDER_F 2 +#define TRAINER_PIC_COOL_TRAINER_M 3 +#define TRAINER_PIC_BIRD_KEEPER 4 +#define TRAINER_PIC_COLLECTOR 5 +#define TRAINER_PIC_AQUA_GRUNT_F 6 +#define TRAINER_PIC_SWIMMER_M 7 +#define TRAINER_PIC_MAGMA_GRUNT_M 8 +#define TRAINER_PIC_EXPERT_M 9 +#define TRAINER_PIC_AQUA_ADMIN_M 10 +#define TRAINER_PIC_BLACK_BELT 11 +#define TRAINER_PIC_AQUA_ADMIN_F 12 +#define TRAINER_PIC_AQUA_LEADER_ARCHIE 13 +#define TRAINER_PIC_HEX_MANIAC 14 +#define TRAINER_PIC_AROMA_LADY 15 +#define TRAINER_PIC_RUIN_MANIAC 16 +#define TRAINER_PIC_INTERVIEWER 17 +#define TRAINER_PIC_TUBER_F 18 +#define TRAINER_PIC_TUBER_M 19 +#define TRAINER_PIC_COOL_TRAINER_F 20 +#define TRAINER_PIC_LADY 21 +#define TRAINER_PIC_BEAUTY 22 +#define TRAINER_PIC_RICH_BOY 23 +#define TRAINER_PIC_EXPERT_F 24 +#define TRAINER_PIC_POKEMANIAC 25 +#define TRAINER_PIC_MAGMA_GRUNT_F 26 +#define TRAINER_PIC_GUITARIST 27 +#define TRAINER_PIC_KINDLER 28 +#define TRAINER_PIC_CAMPER 29 +#define TRAINER_PIC_PICNICKER 30 +#define TRAINER_PIC_BUG_MANIAC 31 +#define TRAINER_PIC_POKEMON_BREEDER_M 32 +#define TRAINER_PIC_PSYCHIC_M 33 +#define TRAINER_PIC_PSYCHIC_F 34 +#define TRAINER_PIC_GENTLEMAN 35 +#define TRAINER_PIC_ELITE_FOUR_SIDNEY 36 +#define TRAINER_PIC_ELITE_FOUR_PHOEBE 37 +#define TRAINER_PIC_ELITE_FOUR_GLACIA 38 +#define TRAINER_PIC_ELITE_FOUR_DRAKE 39 +#define TRAINER_PIC_LEADER_ROXANNE 40 +#define TRAINER_PIC_LEADER_BRAWLY 41 +#define TRAINER_PIC_LEADER_WATTSON 42 +#define TRAINER_PIC_LEADER_FLANNERY 43 +#define TRAINER_PIC_LEADER_NORMAN 44 +#define TRAINER_PIC_LEADER_WINONA 45 +#define TRAINER_PIC_LEADER_TATE_AND_LIZA 46 +#define TRAINER_PIC_LEADER_JUAN 47 +#define TRAINER_PIC_SCHOOL_KID_M 48 +#define TRAINER_PIC_SCHOOL_KID_F 49 +#define TRAINER_PIC_SR_AND_JR 50 +#define TRAINER_PIC_WINSTRATE_M 51 +#define TRAINER_PIC_WINSTRATE_F 52 +#define TRAINER_PIC_YOUNGSTER 53 +#define TRAINER_PIC_CHAMPION_WALLACE 54 +#define TRAINER_PIC_FISHERMAN 55 +#define TRAINER_PIC_CYCLING_TRIATHLETE_M 56 +#define TRAINER_PIC_CYCLING_TRIATHLETE_F 57 +#define TRAINER_PIC_RUNNING_TRIATHLETE_M 58 +#define TRAINER_PIC_RUNNING_TRIATHLETE_F 59 +#define TRAINER_PIC_SWIMMING_TRIATHLETE_M 60 +#define TRAINER_PIC_SWIMMING_TRIATHLETE_F 61 +#define TRAINER_PIC_DRAGON_TAMER 62 +#define TRAINER_PIC_NINJA_BOY 63 +#define TRAINER_PIC_BATTLE_GIRL 64 +#define TRAINER_PIC_PARASOL_LADY 65 +#define TRAINER_PIC_SWIMMER_F 66 +#define TRAINER_PIC_TWINS 67 +#define TRAINER_PIC_SAILOR 68 +#define TRAINER_PIC_MAGMA_ADMIN 69 +#define TRAINER_PIC_WALLY 70 +#define TRAINER_PIC_BRENDAN 71 +#define TRAINER_PIC_MAY 72 +#define TRAINER_PIC_BUG_CATCHER 73 +#define TRAINER_PIC_POKEMON_RANGER_M 74 +#define TRAINER_PIC_POKEMON_RANGER_F 75 +#define TRAINER_PIC_MAGMA_LEADER_MAXIE 76 +#define TRAINER_PIC_LASS 77 +#define TRAINER_PIC_YOUNG_COUPLE 78 +#define TRAINER_PIC_OLD_COUPLE 79 +#define TRAINER_PIC_SIS_AND_BRO 80 +#define TRAINER_PIC_STEVEN 81 +#define TRAINER_PIC_SALON_MAIDEN_ANABEL 82 +#define TRAINER_PIC_DOME_ACE_TUCKER 83 +#define TRAINER_PIC_PALACE_MAVEN_SPENSER 84 +#define TRAINER_PIC_ARENA_TYCOON_GRETA 85 +#define TRAINER_PIC_FACTORY_HEAD_NOLAND 86 +#define TRAINER_PIC_PIKE_QUEEN_LUCY 87 +#define TRAINER_PIC_PYRAMID_KING_BRANDON 88 +#define TRAINER_PIC_RED 89 +#define TRAINER_PIC_LEAF 90 +#define TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN 91 +#define TRAINER_PIC_RUBY_SAPPHIRE_MAY 92 + +#define FACILITY_CLASS_HIKER 0x0 +#define FACILITY_CLASS_TEAM_AQUA_1 0x1 +#define FACILITY_CLASS_PKMN_BREEDER_1 0x2 +#define FACILITY_CLASS_COOLTRAINER_1 0x3 +#define FACILITY_CLASS_BIRD_KEEPER 0x4 +#define FACILITY_CLASS_COLLECTOR 0x5 +#define FACILITY_CLASS_TEAM_AQUA_2 0x6 +#define FACILITY_CLASS_SWIMMER_M 0x7 +#define FACILITY_CLASS_TEAM_MAGMA_1 0x8 +#define FACILITY_CLASS_EXPERT_1 0x9 +#define FACILITY_CLASS_BLACK_BELT 0xa +#define FACILITY_CLASS_AQUA_LEADER 0xb +#define FACILITY_CLASS_HEX_MANIAC 0xc +#define FACILITY_CLASS_AROMA_LADY 0xd +#define FACILITY_CLASS_RUIN_MANIAC 0xe +#define FACILITY_CLASS_INTERVIEWER 0xf +#define FACILITY_CLASS_TUBER_1 0x10 +#define FACILITY_CLASS_TUBER_2 0x11 +#define FACILITY_CLASS_COOLTRAINER_2 0x12 +#define FACILITY_CLASS_LADY 0x13 +#define FACILITY_CLASS_BEAUTY 0x14 +#define FACILITY_CLASS_RICH_BOY 0x15 +#define FACILITY_CLASS_EXPERT_2 0x16 +#define FACILITY_CLASS_POKEMANIAC 0x17 +#define FACILITY_CLASS_TEAM_MAGMA_2 0x18 +#define FACILITY_CLASS_GUITARIST 0x19 +#define FACILITY_CLASS_KINDLER 0x1a +#define FACILITY_CLASS_CAMPER 0x1b +#define FACILITY_CLASS_PICNICKER 0x1c +#define FACILITY_CLASS_BUG_MANIAC 0x1d +#define FACILITY_CLASS_PSYCHIC_1 0x1e +#define FACILITY_CLASS_PSYCHIC_2 0x1f +#define FACILITY_CLASS_GENTLEMAN 0x20 +#define FACILITY_CLASS_ELITE_FOUR_1 0x21 +#define FACILITY_CLASS_ELITE_FOUR_2 0x22 +#define FACILITY_CLASS_LEADER_1 0x23 +#define FACILITY_CLASS_LEADER_2 0x24 +#define FACILITY_CLASS_LEADER_3 0x25 +#define FACILITY_CLASS_SCHOOL_KID_1 0x26 +#define FACILITY_CLASS_SCHOOL_KID_2 0x27 +#define FACILITY_CLASS_SR_AND_JR 0x28 +#define FACILITY_CLASS_POKEFAN_1 0x29 +#define FACILITY_CLASS_POKEFAN_2 0x2a +#define FACILITY_CLASS_YOUNGSTER 0x2b +#define FACILITY_CLASS_CHAMPION 0x2c +#define FACILITY_CLASS_FISHERMAN 0x2d +#define FACILITY_CLASS_TRIATHLETE_1 0x2e +#define FACILITY_CLASS_TRIATHLETE_2 0x2f +#define FACILITY_CLASS_TRIATHLETE_3 0x30 +#define FACILITY_CLASS_TRIATHLETE_4 0x31 +#define FACILITY_CLASS_TRIATHLETE_5 0x32 +#define FACILITY_CLASS_TRIATHLETE_6 0x33 +#define FACILITY_CLASS_DRAGON_TAMER 0x34 +#define FACILITY_CLASS_NINJA_BOY 0x35 +#define FACILITY_CLASS_BATTLE_GIRL 0x36 +#define FACILITY_CLASS_PARASOL_LADY 0x37 +#define FACILITY_CLASS_SWIMMER_F 0x38 +#define FACILITY_CLASS_TWINS 0x39 +#define FACILITY_CLASS_SAILOR 0x3a +#define FACILITY_CLASS_PKMN_TRAINER_1 0x3b +#define FACILITY_CLASS_PKMN_TRAINER_2 0x3c +#define FACILITY_CLASS_PKMN_TRAINER_3 0x3d +#define FACILITY_CLASS_PKMN_TRAINER_4 0x3e +#define FACILITY_CLASS_PKMN_TRAINER_5 0x3f +#define FACILITY_CLASS_PKMN_TRAINER_6 0x40 +#define FACILITY_CLASS_PKMN_TRAINER_7 0x41 +#define FACILITY_CLASS_PKMN_BREEDER_2 0x42 +#define FACILITY_CLASS_BUG_CATCHER 0x43 +#define FACILITY_CLASS_PKMN_RANGER_1 0x44 +#define FACILITY_CLASS_PKMN_RANGER_2 0x45 +#define FACILITY_CLASS_MAGMA_LEADER 0x46 +#define FACILITY_CLASS_LASS 0x47 +#define FACILITY_CLASS_YOUNG_COUPLE 0x48 +#define FACILITY_CLASS_OLD_COUPLE 0x49 +#define FACILITY_CLASS_SIS_AND_BRO 0x4a +#define FACILITY_CLASS_PKMN_TRAINER_8 0x4b +#define FACILITY_CLASS_SALON_MAIDEN 0x4c +#define FACILITY_CLASS_DOME_ACE 0x4d +#define FACILITY_CLASS_PKMN_TRAINER_9 0x4e +#define FACILITY_CLASS_PKMN_TRAINER_10 0x4f +#define FACILITY_CLASS_PKMN_TRAINER_11 0x50 +#define FACILITY_CLASS_PKMN_TRAINER_12 0x51 + +#define TRAINER_CLASS_PKMN_TRAINER_1 0x0 +#define TRAINER_CLASS_PKMN_TRAINER_2 0x1 +#define TRAINER_CLASS_HIKER 0x2 +#define TRAINER_CLASS_TEAM_AQUA 0x3 +#define TRAINER_CLASS_PKMN_BREEDER 0x4 +#define TRAINER_CLASS_COOLTRAINER_1 0x5 +#define TRAINER_CLASS_BIRD_KEEPER 0x6 +#define TRAINER_CLASS_COLLECTOR 0x7 +#define TRAINER_CLASS_SWIMMER_M 0x8 +#define TRAINER_CLASS_TEAM_MAGMA 0x9 +#define TRAINER_CLASS_EXPERT 0xa +#define TRAINER_CLASS_AQUA_ADMIN 0xb +#define TRAINER_CLASS_BLACK_BELT 0xc +#define TRAINER_CLASS_AQUA_LEADER 0xd +#define TRAINER_CLASS_HEX_MANIAC 0xe +#define TRAINER_CLASS_AROMA_LADY 0xf +#define TRAINER_CLASS_RUIN_MANIAC 0x10 +#define TRAINER_CLASS_INTERVIEWER 0x11 +#define TRAINER_CLASS_TUBER_1 0x12 +#define TRAINER_CLASS_TUBER_2 0x13 +#define TRAINER_CLASS_LADY 0x14 +#define TRAINER_CLASS_BEAUTY 0x15 +#define TRAINER_CLASS_RICH_BOY 0x16 +#define TRAINER_CLASS_POKEMANIAC 0x17 +#define TRAINER_CLASS_GUITARIST 0x18 +#define TRAINER_CLASS_KINDLER 0x19 +#define TRAINER_CLASS_CAMPER 0x1a +#define TRAINER_CLASS_PICNICKER 0x1b +#define TRAINER_CLASS_BUG_MANIAC 0x1c +#define TRAINER_CLASS_PSYCHIC 0x1d +#define TRAINER_CLASS_GENTLEMAN 0x1e +#define TRAINER_CLASS_ELITE_FOUR 0x1f +#define TRAINER_CLASS_LEADER 0x20 +#define TRAINER_CLASS_SCHOOL_KID 0x21 +#define TRAINER_CLASS_SR_AND_JR 0x22 +#define TRAINER_CLASS_WINSTRATE 0x23 +#define TRAINER_CLASS_POKEFAN 0x24 +#define TRAINER_CLASS_YOUNGSTER 0x25 +#define TRAINER_CLASS_CHAMPION 0x26 +#define TRAINER_CLASS_FISHERMAN 0x27 +#define TRAINER_CLASS_TRIATHLETE 0x28 +#define TRAINER_CLASS_DRAGON_TAMER 0x29 +#define TRAINER_CLASS_NINJA_BOY 0x2a +#define TRAINER_CLASS_BATTLE_GIRL 0x2b +#define TRAINER_CLASS_PARASOL_LADY 0x2c +#define TRAINER_CLASS_SWIMMER_F 0x2d +#define TRAINER_CLASS_TWINS 0x2e +#define TRAINER_CLASS_SAILOR 0x2f +#define TRAINER_CLASS_COOLTRAINER_2 0x30 +#define TRAINER_CLASS_MAGMA_ADMIN 0x31 +#define TRAINER_CLASS_PKMN_TRAINER_3 0x32 +#define TRAINER_CLASS_BUG_CATCHER 0x33 +#define TRAINER_CLASS_PKMN_RANGER 0x34 +#define TRAINER_CLASS_MAGMA_LEADER 0x35 +#define TRAINER_CLASS_LASS 0x36 +#define TRAINER_CLASS_YOUNG_COUPLE 0x37 +#define TRAINER_CLASS_OLD_COUPLE 0x38 +#define TRAINER_CLASS_SIS_AND_BRO 0x39 +#define TRAINER_CLASS_SALON_MAIDEN 0x3a +#define TRAINER_CLASS_DOME_ACE 0x3b +#define TRAINER_CLASS_PALACE_MAVEN 0x3c +#define TRAINER_CLASS_ARENA_TYCOON 0x3d +#define TRAINER_CLASS_FACTORY_HEAD 0x3e +#define TRAINER_CLASS_PIKE_QUEEN 0x3f +#define TRAINER_CLASS_PYRAMID_KING 0x40 +#define TRAINER_CLASS_PKMN_TRAINER_4 0x41 + +#define TRAINER_ENCOUNTER_MUSIC_MALE 0 // standard male encounter music +#define TRAINER_ENCOUNTER_MUSIC_FEMALE 1 // standard female encounter music +#define TRAINER_ENCOUNTER_MUSIC_GIRL 2 // used for male Tubers and Young Couples too +#define TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS 3 +#define TRAINER_ENCOUNTER_MUSIC_INTENSE 4 +#define TRAINER_ENCOUNTER_MUSIC_COOL 5 +#define TRAINER_ENCOUNTER_MUSIC_AQUA 6 +#define TRAINER_ENCOUNTER_MUSIC_MAGMA 7 +#define TRAINER_ENCOUNTER_MUSIC_SWIMMER 8 +#define TRAINER_ENCOUNTER_MUSIC_TWINS 9 // used for other trainer classes too +#define TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR 10 +#define TRAINER_ENCOUNTER_MUSIC_HIKER 11 // used for other trainer classes too +#define TRAINER_ENCOUNTER_MUSIC_INTERVIEWER 12 +#define TRAINER_ENCOUNTER_MUSIC_RICH 13 // Rich Boys and Gentlemen + +#define F_TRAINER_FEMALE (1 << 7) + +// All trainer parties specify the IV, level, and species for each Pokémon in the +// party. Some trainer parties also specify held items and custom moves for each +// Pokémon. +#define F_TRAINER_PARTY_CUSTOM_MOVESET (1 << 0) +#define F_TRAINER_PARTY_HELD_ITEM (1 << 1) + +#endif // GUARD_TRAINERS_H diff --git a/include/constants/vars.h b/include/constants/vars.h index 6828614bf..6dc8d0ccd 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -50,11 +50,14 @@ #define VAR_RESET_RTC_ENABLE 0x402C #define VAR_0x402D 0x402D #define VAR_0x402E 0x402E -#define VAR_0x402F 0x402F -#define VAR_0x4030 0x4030 -#define VAR_0x4031 0x4031 -#define VAR_0x4032 0x4032 -#define VAR_0x4033 0x4033 + +#define VAR_FRONTIER_MANIAC_FACILITY 0x402F + +#define VAR_FRONTIER_GAMBLER_FACILITY 0x4030 +#define VAR_FRONTIER_GAMBLER_SET_FACILITY_F 0x4031 +#define VAR_FRONTIER_GAMBLER_AMOUNT_BET 0x4032 +#define VAR_FRONTIER_GAMBLER_PLACED_BET_F 0x4033 + #define VAR_0x4034 0x4034 #define VAR_0x4035 0x4035 #define VAR_STORAGE_UNKNOWN 0x4036 diff --git a/include/data/region_map/region_map_entries.h b/include/data/region_map/region_map_entries.h index 73599c704..9c7e3f2fc 100644 --- a/include/data/region_map/region_map_entries.h +++ b/include/data/region_map/region_map_entries.h @@ -1,421 +1,421 @@ #ifndef GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H #define GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H -static const u8 gMapName_LittlerootTown[] = _("LITTLEROOT TOWN"); -static const u8 gMapName_OldaleTown[] = _("OLDALE TOWN"); -static const u8 gMapName_DewfordTown[] = _("DEWFORD TOWN"); -static const u8 gMapName_LavaridgeTown[] = _("LAVARIDGE TOWN"); -static const u8 gMapName_FallarborTown[] = _("FALLARBOR TOWN"); -static const u8 gMapName_VerdanturfTown[] = _("VERDANTURF TOWN"); -static const u8 gMapName_PacifidlogTown[] = _("PACIFIDLOG TOWN"); -static const u8 gMapName_PetalburgCity[] = _("PETALBURG CITY"); -static const u8 gMapName_SlateportCity[] = _("SLATEPORT CITY"); -static const u8 gMapName_MauvilleCity[] = _("MAUVILLE CITY"); -static const u8 gMapName_RustboroCity[] = _("RUSTBORO CITY"); -static const u8 gMapName_FortreeCity[] = _("FORTREE CITY"); -static const u8 gMapName_LilycoveCity[] = _("LILYCOVE CITY"); -static const u8 gMapName_MossdeepCity[] = _("MOSSDEEP CITY"); -static const u8 gMapName_SootopolisCity[] = _("SOOTOPOLIS CITY"); -static const u8 gMapName_EverGrandeCity[] = _("EVER GRANDE CITY"); -static const u8 gMapName_Route101[] = _("ROUTE 101"); -static const u8 gMapName_Route102[] = _("ROUTE 102"); -static const u8 gMapName_Route103[] = _("ROUTE 103"); -static const u8 gMapName_Route104[] = _("ROUTE 104"); -static const u8 gMapName_Route105[] = _("ROUTE 105"); -static const u8 gMapName_Route106[] = _("ROUTE 106"); -static const u8 gMapName_Route107[] = _("ROUTE 107"); -static const u8 gMapName_Route108[] = _("ROUTE 108"); -static const u8 gMapName_Route109[] = _("ROUTE 109"); -static const u8 gMapName_Route110[] = _("ROUTE 110"); -static const u8 gMapName_Route111[] = _("ROUTE 111"); -static const u8 gMapName_Route112[] = _("ROUTE 112"); -static const u8 gMapName_Route113[] = _("ROUTE 113"); -static const u8 gMapName_Route114[] = _("ROUTE 114"); -static const u8 gMapName_Route115[] = _("ROUTE 115"); -static const u8 gMapName_Route116[] = _("ROUTE 116"); -static const u8 gMapName_Route117[] = _("ROUTE 117"); -static const u8 gMapName_Route118[] = _("ROUTE 118"); -static const u8 gMapName_Route119[] = _("ROUTE 119"); -static const u8 gMapName_Route120[] = _("ROUTE 120"); -static const u8 gMapName_Route121[] = _("ROUTE 121"); -static const u8 gMapName_Route122[] = _("ROUTE 122"); -static const u8 gMapName_Route123[] = _("ROUTE 123"); -static const u8 gMapName_Route124[] = _("ROUTE 124"); -static const u8 gMapName_Route125[] = _("ROUTE 125"); -static const u8 gMapName_Route126[] = _("ROUTE 126"); -static const u8 gMapName_Route127[] = _("ROUTE 127"); -static const u8 gMapName_Route128[] = _("ROUTE 128"); -static const u8 gMapName_Route129[] = _("ROUTE 129"); -static const u8 gMapName_Route130[] = _("ROUTE 130"); -static const u8 gMapName_Route131[] = _("ROUTE 131"); -static const u8 gMapName_Route132[] = _("ROUTE 132"); -static const u8 gMapName_Route133[] = _("ROUTE 133"); -static const u8 gMapName_Route134[] = _("ROUTE 134"); -static const u8 gMapName_Underwater[] = _("UNDERWATER"); -static const u8 gMapName_GraniteCave[] = _("GRANITE CAVE"); -static const u8 gMapName_MtChimney[] = _("MT. CHIMNEY"); -static const u8 gMapName_SafariZone[] = _("SAFARI ZONE"); -static const u8 gMapName_BattleFrontier[] = _("BATTLE FRONTIER"); -static const u8 gMapName_PetalburgWoods[] = _("PETALBURG WOODS"); -static const u8 gMapName_RusturfTunnel[] = _("RUSTURF TUNNEL"); -static const u8 gMapName_AbandonedShip[] = _("ABANDONED SHIP"); -static const u8 gMapName_NewMauville[] = _("NEW MAUVILLE"); -static const u8 gMapName_MeteorFalls[] = _("METEOR FALLS"); -static const u8 gMapName_MtPyre[] = _("MT. PYRE"); +static const u8 sMapName_LittlerootTown[] = _("LITTLEROOT TOWN"); +static const u8 sMapName_OldaleTown[] = _("OLDALE TOWN"); +static const u8 sMapName_DewfordTown[] = _("DEWFORD TOWN"); +static const u8 sMapName_LavaridgeTown[] = _("LAVARIDGE TOWN"); +static const u8 sMapName_FallarborTown[] = _("FALLARBOR TOWN"); +static const u8 sMapName_VerdanturfTown[] = _("VERDANTURF TOWN"); +static const u8 sMapName_PacifidlogTown[] = _("PACIFIDLOG TOWN"); +static const u8 sMapName_PetalburgCity[] = _("PETALBURG CITY"); +static const u8 sMapName_SlateportCity[] = _("SLATEPORT CITY"); +static const u8 sMapName_MauvilleCity[] = _("MAUVILLE CITY"); +static const u8 sMapName_RustboroCity[] = _("RUSTBORO CITY"); +static const u8 sMapName_FortreeCity[] = _("FORTREE CITY"); +static const u8 sMapName_LilycoveCity[] = _("LILYCOVE CITY"); +static const u8 sMapName_MossdeepCity[] = _("MOSSDEEP CITY"); +static const u8 sMapName_SootopolisCity[] = _("SOOTOPOLIS CITY"); +static const u8 sMapName_EverGrandeCity[] = _("EVER GRANDE CITY"); +static const u8 sMapName_Route101[] = _("ROUTE 101"); +static const u8 sMapName_Route102[] = _("ROUTE 102"); +static const u8 sMapName_Route103[] = _("ROUTE 103"); +static const u8 sMapName_Route104[] = _("ROUTE 104"); +static const u8 sMapName_Route105[] = _("ROUTE 105"); +static const u8 sMapName_Route106[] = _("ROUTE 106"); +static const u8 sMapName_Route107[] = _("ROUTE 107"); +static const u8 sMapName_Route108[] = _("ROUTE 108"); +static const u8 sMapName_Route109[] = _("ROUTE 109"); +static const u8 sMapName_Route110[] = _("ROUTE 110"); +static const u8 sMapName_Route111[] = _("ROUTE 111"); +static const u8 sMapName_Route112[] = _("ROUTE 112"); +static const u8 sMapName_Route113[] = _("ROUTE 113"); +static const u8 sMapName_Route114[] = _("ROUTE 114"); +static const u8 sMapName_Route115[] = _("ROUTE 115"); +static const u8 sMapName_Route116[] = _("ROUTE 116"); +static const u8 sMapName_Route117[] = _("ROUTE 117"); +static const u8 sMapName_Route118[] = _("ROUTE 118"); +static const u8 sMapName_Route119[] = _("ROUTE 119"); +static const u8 sMapName_Route120[] = _("ROUTE 120"); +static const u8 sMapName_Route121[] = _("ROUTE 121"); +static const u8 sMapName_Route122[] = _("ROUTE 122"); +static const u8 sMapName_Route123[] = _("ROUTE 123"); +static const u8 sMapName_Route124[] = _("ROUTE 124"); +static const u8 sMapName_Route125[] = _("ROUTE 125"); +static const u8 sMapName_Route126[] = _("ROUTE 126"); +static const u8 sMapName_Route127[] = _("ROUTE 127"); +static const u8 sMapName_Route128[] = _("ROUTE 128"); +static const u8 sMapName_Route129[] = _("ROUTE 129"); +static const u8 sMapName_Route130[] = _("ROUTE 130"); +static const u8 sMapName_Route131[] = _("ROUTE 131"); +static const u8 sMapName_Route132[] = _("ROUTE 132"); +static const u8 sMapName_Route133[] = _("ROUTE 133"); +static const u8 sMapName_Route134[] = _("ROUTE 134"); +static const u8 sMapName_Underwater[] = _("UNDERWATER"); +static const u8 sMapName_GraniteCave[] = _("GRANITE CAVE"); +static const u8 sMapName_MtChimney[] = _("MT. CHIMNEY"); +static const u8 sMapName_SafariZone[] = _("SAFARI ZONE"); +static const u8 sMapName_BattleFrontier[] = _("BATTLE FRONTIER"); +static const u8 sMapName_PetalburgWoods[] = _("PETALBURG WOODS"); +static const u8 sMapName_RusturfTunnel[] = _("RUSTURF TUNNEL"); +static const u8 sMapName_AbandonedShip[] = _("ABANDONED SHIP"); +static const u8 sMapName_NewMauville[] = _("NEW MAUVILLE"); +static const u8 sMapName_MeteorFalls[] = _("METEOR FALLS"); +static const u8 sMapName_MtPyre[] = _("MT. PYRE"); // This was the Aqua or Magma hideout in Ruby/Sapphire, but each team has a // hideout in Emerald with their own new region map entries, and this name // doesn't seem to be used anymore. -static const u8 gMapName_AquaHideoutOld[] = _("{AQUA} HIDEOUT"); -static const u8 gMapName_ShoalCave[] = _("SHOAL CAVE"); -static const u8 gMapName_SeafloorCavern[] = _("SEAFLOOR CAVERN"); -static const u8 gMapName_VictoryRoad[] = _("VICTORY ROAD"); -static const u8 gMapName_MirageIsland[] = _("MIRAGE ISLAND"); -static const u8 gMapName_CaveOfOrigin[] = _("CAVE OF ORIGIN"); -static const u8 gMapName_SouthernIsland[] = _("SOUTHERN ISLAND"); -static const u8 gMapName_FieryPath[] = _("FIERY PATH"); -static const u8 gMapName_JaggedPass[] = _("JAGGED PASS"); -static const u8 gMapName_SealedChamber[] = _("SEALED CHAMBER"); -static const u8 gMapName_ScorchedSlab[] = _("SCORCHED SLAB"); -static const u8 gMapName_IslandCave[] = _("ISLAND CAVE"); -static const u8 gMapName_DesertRuins[] = _("DESERT RUINS"); -static const u8 gMapName_AncientTomb[] = _("ANCIENT TOMB"); -static const u8 gMapName_InsideOfTruck[] = _("INSIDE OF TRUCK"); -static const u8 gMapName_SkyPillar[] = _("SKY PILLAR"); -static const u8 gMapName_SecretBase[] = _("SECRET BASE"); -static const u8 gMapName_None[] = _(""); -static const u8 gMapName_PalletTown[] = _("PALLET TOWN"); -static const u8 gMapName_ViridianCity[] = _("VIRIDIAN CITY"); -static const u8 gMapName_PewterCity[] = _("PEWTER CITY"); -static const u8 gMapName_CeruleanCity[] = _("CERULEAN CITY"); -static const u8 gMapName_LavenderTown[] = _("LAVENDER TOWN"); -static const u8 gMapName_VermilionCity[] = _("VERMILION CITY"); -static const u8 gMapName_CeladonCity[] = _("CELADON CITY"); -static const u8 gMapName_FuchsiaCity[] = _("FUCHSIA CITY"); -static const u8 gMapName_CinnabarIsland[] = _("CINNABAR ISLAND"); -static const u8 gMapName_IndigoPlateau[] = _("INDIGO PLATEAU"); -static const u8 gMapName_SaffronCity[] = _("SAFFRON CITY"); -static const u8 gMapName_Route4[] = _("ROUTE 4"); -static const u8 gMapName_Route10[] = _("ROUTE 10"); -static const u8 gMapName_Route1[] = _("ROUTE 1"); -static const u8 gMapName_Route2[] = _("ROUTE 2"); -static const u8 gMapName_Route3[] = _("ROUTE 3"); -static const u8 gMapName_Route4_2[] = _("ROUTE 4"); -static const u8 gMapName_Route5[] = _("ROUTE 5"); -static const u8 gMapName_Route6[] = _("ROUTE 6"); -static const u8 gMapName_Route7[] = _("ROUTE 7"); -static const u8 gMapName_Route8[] = _("ROUTE 8"); -static const u8 gMapName_Route9[] = _("ROUTE 9"); -static const u8 gMapName_Route10_2[] = _("ROUTE 10"); -static const u8 gMapName_Route11[] = _("ROUTE 11"); -static const u8 gMapName_Route12[] = _("ROUTE 12"); -static const u8 gMapName_Route13[] = _("ROUTE 13"); -static const u8 gMapName_Route14[] = _("ROUTE 14"); -static const u8 gMapName_Route15[] = _("ROUTE 15"); -static const u8 gMapName_Route16[] = _("ROUTE 16"); -static const u8 gMapName_Route17[] = _("ROUTE 17"); -static const u8 gMapName_Route18[] = _("ROUTE 18"); -static const u8 gMapName_Route19[] = _("ROUTE 19"); -static const u8 gMapName_Route20[] = _("ROUTE 20"); -static const u8 gMapName_Route21[] = _("ROUTE 21"); -static const u8 gMapName_Route22[] = _("ROUTE 22"); -static const u8 gMapName_Route23[] = _("ROUTE 23"); -static const u8 gMapName_Route24[] = _("ROUTE 24"); -static const u8 gMapName_Route25[] = _("ROUTE 25"); -static const u8 gMapName_ViridianForest[] = _("VIRIDIAN FOREST"); -static const u8 gMapName_MtMoon[] = _("MT. MOON"); -static const u8 gMapName_SSAnne[] = _("S.S. ANNE"); -static const u8 gMapName_UndergroundPath[] = _("UNDERGROUND PATH"); -static const u8 gMapName_UndergroundPath2[] = _("UNDERGROUND PATH"); -static const u8 gMapName_DiglettsCave[] = _("DIGLETT’S CAVE"); -static const u8 gMapName_KantoVictoryRoad[] = _("VICTORY ROAD"); -static const u8 gMapName_RocketHideout[] = _("ROCKET HIDEOUT"); -static const u8 gMapName_SilphCo[] = _("SILPH CO."); -static const u8 gMapName_PokemonMansion[] = _("POKéMON MANSION"); -static const u8 gMapName_KantoSafariZone[] = _("SAFARI ZONE"); -static const u8 gMapName_PokemonLeague[] = _("POKéMON LEAGUE"); -static const u8 gMapName_RockTunnel[] = _("ROCK TUNNEL"); -static const u8 gMapName_SeafoamIslands[] = _("SEAFOAM ISLANDS"); -static const u8 gMapName_PokemonTower[] = _("POKéMON TOWER"); -static const u8 gMapName_CeruleanCave[] = _("CERULEAN CAVE"); -static const u8 gMapName_PowerPlant[] = _("POWER PLANT"); -static const u8 gMapName_OneIsland[] = _("ONE ISLAND"); -static const u8 gMapName_TwoIsland[] = _("TWO ISLAND"); -static const u8 gMapName_ThreeIsland[] = _("THREE ISLAND"); -static const u8 gMapName_FourIsland[] = _("FOUR ISLAND"); -static const u8 gMapName_FiveIsland[] = _("FIVE ISLAND"); -static const u8 gMapName_SevenIsland[] = _("SEVEN ISLAND"); -static const u8 gMapName_SixIsland[] = _("SIX ISLAND"); -static const u8 gMapName_KindleRoad[] = _("KINDLE ROAD"); -static const u8 gMapName_TreasureBeach[] = _("TREASURE BEACH"); -static const u8 gMapName_CapeBrink[] = _("CAPE BRINK"); -static const u8 gMapName_BondBridge[] = _("BOND BRIDGE"); -static const u8 gMapName_ThreeIslePort[] = _("THREE ISLE PORT"); -static const u8 gMapName_SeviiIsle6[] = _("SEVII ISLE 6"); -static const u8 gMapName_SeviiIsle7[] = _("SEVII ISLE 7"); -static const u8 gMapName_SeviiIsle8[] = _("SEVII ISLE 8"); -static const u8 gMapName_SeviiIsle9[] = _("SEVII ISLE 9"); -static const u8 gMapName_ResortGorgeous[] = _("RESORT GORGEOUS"); -static const u8 gMapName_WaterLabyrinth[] = _("WATER LABYRINTH"); -static const u8 gMapName_FiveIsleMeadow[] = _("FIVE ISLE MEADOW"); -static const u8 gMapName_MemorialPillar[] = _("MEMORIAL PILLAR"); -static const u8 gMapName_OutcastIsland[] = _("OUTCAST ISLAND"); -static const u8 gMapName_GreenPath[] = _("GREEN PATH"); -static const u8 gMapName_WaterPath[] = _("WATER PATH"); -static const u8 gMapName_RuinValley[] = _("RUIN VALLEY"); -static const u8 gMapName_TrainerTower[] = _("TRAINER TOWER"); -static const u8 gMapName_CanyonEntrance[] = _("CANYON ENTRANCE"); -static const u8 gMapName_SevaultCanyon[] = _("SEVAULT CANYON"); -static const u8 gMapName_TanobyRuins[] = _("TANOBY RUINS"); -static const u8 gMapName_SeviiIsle22[] = _("SEVII ISLE 22"); -static const u8 gMapName_SeviiIsle23[] = _("SEVII ISLE 23"); -static const u8 gMapName_SeviiIsle24[] = _("SEVII ISLE 24"); -static const u8 gMapName_NavelRock[] = _("NAVEL ROCK"); -static const u8 gMapName_MtEmber[] = _("MT. EMBER"); -static const u8 gMapName_BerryForest[] = _("BERRY FOREST"); -static const u8 gMapName_IcefallCave[] = _("ICEFALL CAVE"); -static const u8 gMapName_RocketWarehouse[] = _("ROCKET WAREHOUSE"); -static const u8 gMapName_TrainerTower2[] = _("TRAINER TOWER"); -static const u8 gMapName_DottedHole[] = _("DOTTED HOLE"); -static const u8 gMapName_LostCave[] = _("LOST CAVE"); -static const u8 gMapName_PatternBush[] = _("PATTERN BUSH"); -static const u8 gMapName_AlteringCave[] = _("ALTERING CAVE"); -static const u8 gMapName_TanobyChambers[] = _("TANOBY CHAMBERS"); -static const u8 gMapName_ThreeIslePath[] = _("THREE ISLE PATH"); -static const u8 gMapName_TanobyKey[] = _("TANOBY KEY"); -static const u8 gMapName_BirthIsland[] = _("BIRTH ISLAND"); -static const u8 gMapName_MoneanChamber[] = _("MONEAN CHAMBER"); -static const u8 gMapName_LiptooChamber[] = _("LIPTOO CHAMBER"); -static const u8 gMapName_WeepthChamber[] = _("WEEPTH CHAMBER"); -static const u8 gMapName_DilfordChamber[] = _("DILFORD CHAMBER"); -static const u8 gMapName_ScufibChamber[] = _("SCUFIB CHAMBER"); -static const u8 gMapName_RixyChamber[] = _("RIXY CHAMBER"); -static const u8 gMapName_ViapoisChamber[] = _("VIAPOIS CHAMBER"); -static const u8 gMapName_EmberSpa[] = _("EMBER SPA"); -static const u8 gMapName_SpecialArea[] = _("SPECIAL AREA"); -static const u8 gMapName_AquaHideout[] = _("AQUA HIDEOUT"); -static const u8 gMapName_MagmaHideout[] = _("MAGMA HIDEOUT"); -static const u8 gMapName_MirageTower[] = _("MIRAGE TOWER"); -static const u8 gMapName_FarawayIsland[] = _("FARAWAY ISLAND"); -static const u8 gMapName_ArtisanCave[] = _("ARTISAN CAVE"); -static const u8 gMapName_MarineCave[] = _("MARINE CAVE"); -static const u8 gMapName_TerraCave[] = _("TERRA CAVE"); -static const u8 gMapName_DesertUnderpass[] = _("DESERT UNDERPASS"); -static const u8 gMapName_TrainerHill[] = _("TRAINER HILL"); +static const u8 sMapName_AquaHideoutOld[] = _("{AQUA} HIDEOUT"); +static const u8 sMapName_ShoalCave[] = _("SHOAL CAVE"); +static const u8 sMapName_SeafloorCavern[] = _("SEAFLOOR CAVERN"); +static const u8 sMapName_VictoryRoad[] = _("VICTORY ROAD"); +static const u8 sMapName_MirageIsland[] = _("MIRAGE ISLAND"); +static const u8 sMapName_CaveOfOrigin[] = _("CAVE OF ORIGIN"); +static const u8 sMapName_SouthernIsland[] = _("SOUTHERN ISLAND"); +static const u8 sMapName_FieryPath[] = _("FIERY PATH"); +static const u8 sMapName_JaggedPass[] = _("JAGGED PASS"); +static const u8 sMapName_SealedChamber[] = _("SEALED CHAMBER"); +static const u8 sMapName_ScorchedSlab[] = _("SCORCHED SLAB"); +static const u8 sMapName_IslandCave[] = _("ISLAND CAVE"); +static const u8 sMapName_DesertRuins[] = _("DESERT RUINS"); +static const u8 sMapName_AncientTomb[] = _("ANCIENT TOMB"); +static const u8 sMapName_InsideOfTruck[] = _("INSIDE OF TRUCK"); +static const u8 sMapName_SkyPillar[] = _("SKY PILLAR"); +static const u8 sMapName_SecretBase[] = _("SECRET BASE"); +static const u8 sMapName_None[] = _(""); +static const u8 sMapName_PalletTown[] = _("PALLET TOWN"); +static const u8 sMapName_ViridianCity[] = _("VIRIDIAN CITY"); +static const u8 sMapName_PewterCity[] = _("PEWTER CITY"); +static const u8 sMapName_CeruleanCity[] = _("CERULEAN CITY"); +static const u8 sMapName_LavenderTown[] = _("LAVENDER TOWN"); +static const u8 sMapName_VermilionCity[] = _("VERMILION CITY"); +static const u8 sMapName_CeladonCity[] = _("CELADON CITY"); +static const u8 sMapName_FuchsiaCity[] = _("FUCHSIA CITY"); +static const u8 sMapName_CinnabarIsland[] = _("CINNABAR ISLAND"); +static const u8 sMapName_IndigoPlateau[] = _("INDIGO PLATEAU"); +static const u8 sMapName_SaffronCity[] = _("SAFFRON CITY"); +static const u8 sMapName_Route4[] = _("ROUTE 4"); +static const u8 sMapName_Route10[] = _("ROUTE 10"); +static const u8 sMapName_Route1[] = _("ROUTE 1"); +static const u8 sMapName_Route2[] = _("ROUTE 2"); +static const u8 sMapName_Route3[] = _("ROUTE 3"); +static const u8 sMapName_Route4_2[] = _("ROUTE 4"); +static const u8 sMapName_Route5[] = _("ROUTE 5"); +static const u8 sMapName_Route6[] = _("ROUTE 6"); +static const u8 sMapName_Route7[] = _("ROUTE 7"); +static const u8 sMapName_Route8[] = _("ROUTE 8"); +static const u8 sMapName_Route9[] = _("ROUTE 9"); +static const u8 sMapName_Route10_2[] = _("ROUTE 10"); +static const u8 sMapName_Route11[] = _("ROUTE 11"); +static const u8 sMapName_Route12[] = _("ROUTE 12"); +static const u8 sMapName_Route13[] = _("ROUTE 13"); +static const u8 sMapName_Route14[] = _("ROUTE 14"); +static const u8 sMapName_Route15[] = _("ROUTE 15"); +static const u8 sMapName_Route16[] = _("ROUTE 16"); +static const u8 sMapName_Route17[] = _("ROUTE 17"); +static const u8 sMapName_Route18[] = _("ROUTE 18"); +static const u8 sMapName_Route19[] = _("ROUTE 19"); +static const u8 sMapName_Route20[] = _("ROUTE 20"); +static const u8 sMapName_Route21[] = _("ROUTE 21"); +static const u8 sMapName_Route22[] = _("ROUTE 22"); +static const u8 sMapName_Route23[] = _("ROUTE 23"); +static const u8 sMapName_Route24[] = _("ROUTE 24"); +static const u8 sMapName_Route25[] = _("ROUTE 25"); +static const u8 sMapName_ViridianForest[] = _("VIRIDIAN FOREST"); +static const u8 sMapName_MtMoon[] = _("MT. MOON"); +static const u8 sMapName_SSAnne[] = _("S.S. ANNE"); +static const u8 sMapName_UndergroundPath[] = _("UNDERGROUND PATH"); +static const u8 sMapName_UndergroundPath2[] = _("UNDERGROUND PATH"); +static const u8 sMapName_DiglettsCave[] = _("DIGLETT’S CAVE"); +static const u8 sMapName_KantoVictoryRoad[] = _("VICTORY ROAD"); +static const u8 sMapName_RocketHideout[] = _("ROCKET HIDEOUT"); +static const u8 sMapName_SilphCo[] = _("SILPH CO."); +static const u8 sMapName_PokemonMansion[] = _("POKéMON MANSION"); +static const u8 sMapName_KantoSafariZone[] = _("SAFARI ZONE"); +static const u8 sMapName_PokemonLeague[] = _("POKéMON LEAGUE"); +static const u8 sMapName_RockTunnel[] = _("ROCK TUNNEL"); +static const u8 sMapName_SeafoamIslands[] = _("SEAFOAM ISLANDS"); +static const u8 sMapName_PokemonTower[] = _("POKéMON TOWER"); +static const u8 sMapName_CeruleanCave[] = _("CERULEAN CAVE"); +static const u8 sMapName_PowerPlant[] = _("POWER PLANT"); +static const u8 sMapName_OneIsland[] = _("ONE ISLAND"); +static const u8 sMapName_TwoIsland[] = _("TWO ISLAND"); +static const u8 sMapName_ThreeIsland[] = _("THREE ISLAND"); +static const u8 sMapName_FourIsland[] = _("FOUR ISLAND"); +static const u8 sMapName_FiveIsland[] = _("FIVE ISLAND"); +static const u8 sMapName_SevenIsland[] = _("SEVEN ISLAND"); +static const u8 sMapName_SixIsland[] = _("SIX ISLAND"); +static const u8 sMapName_KindleRoad[] = _("KINDLE ROAD"); +static const u8 sMapName_TreasureBeach[] = _("TREASURE BEACH"); +static const u8 sMapName_CapeBrink[] = _("CAPE BRINK"); +static const u8 sMapName_BondBridge[] = _("BOND BRIDGE"); +static const u8 sMapName_ThreeIslePort[] = _("THREE ISLE PORT"); +static const u8 sMapName_SeviiIsle6[] = _("SEVII ISLE 6"); +static const u8 sMapName_SeviiIsle7[] = _("SEVII ISLE 7"); +static const u8 sMapName_SeviiIsle8[] = _("SEVII ISLE 8"); +static const u8 sMapName_SeviiIsle9[] = _("SEVII ISLE 9"); +static const u8 sMapName_ResortGorgeous[] = _("RESORT GORGEOUS"); +static const u8 sMapName_WaterLabyrinth[] = _("WATER LABYRINTH"); +static const u8 sMapName_FiveIsleMeadow[] = _("FIVE ISLE MEADOW"); +static const u8 sMapName_MemorialPillar[] = _("MEMORIAL PILLAR"); +static const u8 sMapName_OutcastIsland[] = _("OUTCAST ISLAND"); +static const u8 sMapName_GreenPath[] = _("GREEN PATH"); +static const u8 sMapName_WaterPath[] = _("WATER PATH"); +static const u8 sMapName_RuinValley[] = _("RUIN VALLEY"); +static const u8 sMapName_TrainerTower[] = _("TRAINER TOWER"); +static const u8 sMapName_CanyonEntrance[] = _("CANYON ENTRANCE"); +static const u8 sMapName_SevaultCanyon[] = _("SEVAULT CANYON"); +static const u8 sMapName_TanobyRuins[] = _("TANOBY RUINS"); +static const u8 sMapName_SeviiIsle22[] = _("SEVII ISLE 22"); +static const u8 sMapName_SeviiIsle23[] = _("SEVII ISLE 23"); +static const u8 sMapName_SeviiIsle24[] = _("SEVII ISLE 24"); +static const u8 sMapName_NavelRock[] = _("NAVEL ROCK"); +static const u8 sMapName_MtEmber[] = _("MT. EMBER"); +static const u8 sMapName_BerryForest[] = _("BERRY FOREST"); +static const u8 sMapName_IcefallCave[] = _("ICEFALL CAVE"); +static const u8 sMapName_RocketWarehouse[] = _("ROCKET WAREHOUSE"); +static const u8 sMapName_TrainerTower2[] = _("TRAINER TOWER"); +static const u8 sMapName_DottedHole[] = _("DOTTED HOLE"); +static const u8 sMapName_LostCave[] = _("LOST CAVE"); +static const u8 sMapName_PatternBush[] = _("PATTERN BUSH"); +static const u8 sMapName_AlteringCave[] = _("ALTERING CAVE"); +static const u8 sMapName_TanobyChambers[] = _("TANOBY CHAMBERS"); +static const u8 sMapName_ThreeIslePath[] = _("THREE ISLE PATH"); +static const u8 sMapName_TanobyKey[] = _("TANOBY KEY"); +static const u8 sMapName_BirthIsland[] = _("BIRTH ISLAND"); +static const u8 sMapName_MoneanChamber[] = _("MONEAN CHAMBER"); +static const u8 sMapName_LiptooChamber[] = _("LIPTOO CHAMBER"); +static const u8 sMapName_WeepthChamber[] = _("WEEPTH CHAMBER"); +static const u8 sMapName_DilfordChamber[] = _("DILFORD CHAMBER"); +static const u8 sMapName_ScufibChamber[] = _("SCUFIB CHAMBER"); +static const u8 sMapName_RixyChamber[] = _("RIXY CHAMBER"); +static const u8 sMapName_ViapoisChamber[] = _("VIAPOIS CHAMBER"); +static const u8 sMapName_EmberSpa[] = _("EMBER SPA"); +static const u8 sMapName_SpecialArea[] = _("SPECIAL AREA"); +static const u8 sMapName_AquaHideout[] = _("AQUA HIDEOUT"); +static const u8 sMapName_MagmaHideout[] = _("MAGMA HIDEOUT"); +static const u8 sMapName_MirageTower[] = _("MIRAGE TOWER"); +static const u8 sMapName_FarawayIsland[] = _("FARAWAY ISLAND"); +static const u8 sMapName_ArtisanCave[] = _("ARTISAN CAVE"); +static const u8 sMapName_MarineCave[] = _("MARINE CAVE"); +static const u8 sMapName_TerraCave[] = _("TERRA CAVE"); +static const u8 sMapName_DesertUnderpass[] = _("DESERT UNDERPASS"); +static const u8 sMapName_TrainerHill[] = _("TRAINER HILL"); const struct RegionMapLocation gRegionMapEntries[] = { - { 4, 11, 1, 1, gMapName_LittlerootTown}, - { 4, 9, 1, 1, gMapName_OldaleTown}, - { 2, 14, 1, 1, gMapName_DewfordTown}, - { 5, 3, 1, 1, gMapName_LavaridgeTown}, - { 3, 0, 1, 1, gMapName_FallarborTown}, - { 4, 6, 1, 1, gMapName_VerdanturfTown}, - {17, 10, 1, 1, gMapName_PacifidlogTown}, - { 1, 9, 1, 1, gMapName_PetalburgCity}, - { 8, 10, 1, 2, gMapName_SlateportCity}, - { 8, 6, 2, 1, gMapName_MauvilleCity}, - { 0, 5, 1, 2, gMapName_RustboroCity}, - {12, 0, 1, 1, gMapName_FortreeCity}, - {18, 3, 2, 1, gMapName_LilycoveCity}, - {24, 5, 2, 1, gMapName_MossdeepCity}, - {21, 7, 1, 1, gMapName_SootopolisCity}, - {27, 8, 1, 2, gMapName_EverGrandeCity}, - { 4, 10, 1, 1, gMapName_Route101}, - { 2, 9, 2, 1, gMapName_Route102}, - { 4, 8, 4, 1, gMapName_Route103}, - { 0, 7, 1, 3, gMapName_Route104}, - { 0, 10, 1, 3, gMapName_Route105}, - { 0, 13, 2, 1, gMapName_Route106}, - { 3, 14, 3, 1, gMapName_Route107}, - { 6, 14, 2, 1, gMapName_Route108}, - { 8, 12, 1, 3, gMapName_Route109}, - { 8, 7, 1, 3, gMapName_Route110}, - { 8, 0, 1, 6, gMapName_Route111}, - { 6, 3, 2, 1, gMapName_Route112}, - { 4, 0, 4, 1, gMapName_Route113}, - { 1, 0, 2, 3, gMapName_Route114}, - { 0, 2, 1, 3, gMapName_Route115}, - { 1, 5, 4, 1, gMapName_Route116}, - { 5, 6, 3, 1, gMapName_Route117}, - {10, 6, 2, 1, gMapName_Route118}, - {11, 0, 1, 6, gMapName_Route119}, - {13, 0, 1, 4, gMapName_Route120}, - {14, 3, 4, 1, gMapName_Route121}, - {16, 4, 1, 2, gMapName_Route122}, - {12, 6, 5, 1, gMapName_Route123}, - {20, 3, 4, 3, gMapName_Route124}, - {24, 3, 2, 2, gMapName_Route125}, - {20, 6, 3, 3, gMapName_Route126}, - {23, 6, 3, 3, gMapName_Route127}, - {23, 9, 4, 1, gMapName_Route128}, - {24, 10, 2, 1, gMapName_Route129}, - {21, 10, 3, 1, gMapName_Route130}, - {18, 10, 3, 1, gMapName_Route131}, - {15, 10, 2, 1, gMapName_Route132}, - {12, 10, 3, 1, gMapName_Route133}, - { 9, 10, 3, 1, gMapName_Route134}, - {20, 3, 4, 3, gMapName_Underwater}, - {20, 6, 3, 3, gMapName_Underwater}, - {23, 6, 3, 3, gMapName_Underwater}, - {23, 9, 4, 1, gMapName_Underwater}, - {21, 7, 1, 1, gMapName_Underwater}, - { 1, 13, 1, 1, gMapName_GraniteCave}, - { 6, 2, 1, 1, gMapName_MtChimney}, - {16, 2, 1, 1, gMapName_SafariZone}, - {22, 12, 1, 1, gMapName_BattleFrontier}, - { 0, 8, 1, 1, gMapName_PetalburgWoods}, - { 2, 5, 1, 1, gMapName_RusturfTunnel}, - { 6, 14, 1, 1, gMapName_AbandonedShip}, - { 8, 7, 1, 1, gMapName_NewMauville}, - { 0, 3, 1, 1, gMapName_MeteorFalls}, - { 1, 2, 1, 1, gMapName_MeteorFalls}, - {16, 4, 1, 1, gMapName_MtPyre}, - {19, 3, 1, 1, gMapName_AquaHideoutOld}, - {24, 4, 1, 1, gMapName_ShoalCave}, - {24, 9, 1, 1, gMapName_SeafloorCavern}, - {24, 9, 1, 1, gMapName_Underwater}, - {27, 9, 1, 1, gMapName_VictoryRoad}, - {17, 10, 1, 1, gMapName_MirageIsland}, - {21, 7, 1, 1, gMapName_CaveOfOrigin}, - {12, 14, 1, 1, gMapName_SouthernIsland}, - { 6, 3, 1, 1, gMapName_FieryPath}, - { 7, 3, 1, 1, gMapName_FieryPath}, - { 6, 3, 1, 1, gMapName_JaggedPass}, - { 7, 2, 1, 1, gMapName_JaggedPass}, - {11, 10, 1, 1, gMapName_SealedChamber}, - {11, 10, 1, 1, gMapName_Underwater}, - {13, 0, 1, 1, gMapName_ScorchedSlab}, - { 0, 10, 1, 1, gMapName_IslandCave}, - { 8, 3, 1, 1, gMapName_DesertRuins}, - {13, 2, 1, 1, gMapName_AncientTomb}, - { 0, 0, 1, 1, gMapName_InsideOfTruck}, - {19, 10, 1, 1, gMapName_SkyPillar}, - { 0, 0, 1, 1, gMapName_SecretBase}, - { 0, 0, 1, 1, gMapName_None}, - { 0, 0, 1, 1, gMapName_PalletTown}, - { 0, 0, 1, 1, gMapName_ViridianCity}, - { 0, 0, 1, 1, gMapName_PewterCity}, - { 0, 0, 1, 1, gMapName_CeruleanCity}, - { 0, 0, 1, 1, gMapName_LavenderTown}, - { 0, 0, 1, 1, gMapName_VermilionCity}, - { 0, 0, 1, 1, gMapName_CeladonCity}, - { 0, 0, 1, 1, gMapName_FuchsiaCity}, - { 0, 0, 1, 1, gMapName_CinnabarIsland}, - { 0, 0, 1, 1, gMapName_IndigoPlateau}, - { 0, 0, 1, 1, gMapName_SaffronCity}, - { 0, 0, 1, 1, gMapName_Route4}, - { 0, 0, 1, 1, gMapName_Route10}, - { 0, 0, 1, 1, gMapName_Route1}, - { 0, 0, 1, 1, gMapName_Route2}, - { 0, 0, 1, 1, gMapName_Route3}, - { 0, 0, 1, 1, gMapName_Route4_2}, - { 0, 0, 1, 1, gMapName_Route5}, - { 0, 0, 1, 1, gMapName_Route6}, - { 0, 0, 1, 1, gMapName_Route7}, - { 0, 0, 1, 1, gMapName_Route8}, - { 0, 0, 1, 1, gMapName_Route9}, - { 0, 0, 1, 1, gMapName_Route10_2}, - { 0, 0, 1, 1, gMapName_Route11}, - { 0, 0, 1, 1, gMapName_Route12}, - { 0, 0, 1, 1, gMapName_Route13}, - { 0, 0, 1, 1, gMapName_Route14}, - { 0, 0, 1, 1, gMapName_Route15}, - { 0, 0, 1, 1, gMapName_Route16}, - { 0, 0, 1, 1, gMapName_Route17}, - { 0, 0, 1, 1, gMapName_Route18}, - { 0, 0, 1, 1, gMapName_Route19}, - { 0, 0, 1, 1, gMapName_Route20}, - { 0, 0, 1, 1, gMapName_Route21}, - { 0, 0, 1, 1, gMapName_Route22}, - { 0, 0, 1, 1, gMapName_Route23}, - { 0, 0, 1, 1, gMapName_Route24}, - { 0, 0, 1, 1, gMapName_Route25}, - { 0, 0, 1, 1, gMapName_ViridianForest}, - { 0, 0, 1, 1, gMapName_MtMoon}, - { 0, 0, 1, 1, gMapName_SSAnne}, - { 0, 0, 1, 1, gMapName_UndergroundPath}, - { 0, 0, 1, 1, gMapName_UndergroundPath2}, - { 0, 0, 1, 1, gMapName_DiglettsCave}, - { 0, 0, 1, 1, gMapName_KantoVictoryRoad}, - { 0, 0, 1, 1, gMapName_RocketHideout}, - { 0, 0, 1, 1, gMapName_SilphCo}, - { 0, 0, 1, 1, gMapName_PokemonMansion}, - { 0, 0, 1, 1, gMapName_KantoSafariZone}, - { 0, 0, 1, 1, gMapName_PokemonLeague}, - { 0, 0, 1, 1, gMapName_RockTunnel}, - { 0, 0, 1, 1, gMapName_SeafoamIslands}, - { 0, 0, 1, 1, gMapName_PokemonTower}, - { 0, 0, 1, 1, gMapName_CeruleanCave}, - { 0, 0, 1, 1, gMapName_PowerPlant}, - { 0, 0, 1, 1, gMapName_OneIsland}, - { 0, 0, 1, 1, gMapName_TwoIsland}, - { 0, 0, 1, 1, gMapName_ThreeIsland}, - { 0, 0, 1, 1, gMapName_FourIsland}, - { 0, 0, 1, 1, gMapName_FiveIsland}, - { 0, 0, 1, 1, gMapName_SevenIsland}, - { 0, 0, 1, 1, gMapName_SixIsland}, - { 0, 0, 1, 1, gMapName_KindleRoad}, - { 0, 0, 1, 1, gMapName_TreasureBeach}, - { 0, 0, 1, 1, gMapName_CapeBrink}, - { 0, 0, 1, 1, gMapName_BondBridge}, - { 0, 0, 1, 1, gMapName_ThreeIslePort}, - { 0, 0, 1, 1, gMapName_SeviiIsle6}, - { 0, 0, 1, 1, gMapName_SeviiIsle7}, - { 0, 0, 1, 1, gMapName_SeviiIsle8}, - { 0, 0, 1, 1, gMapName_SeviiIsle9}, - { 0, 0, 1, 1, gMapName_ResortGorgeous}, - { 0, 0, 1, 1, gMapName_WaterLabyrinth}, - { 0, 0, 1, 1, gMapName_FiveIsleMeadow}, - { 0, 0, 1, 1, gMapName_MemorialPillar}, - { 0, 0, 1, 1, gMapName_OutcastIsland}, - { 0, 0, 1, 1, gMapName_GreenPath}, - { 0, 0, 1, 1, gMapName_WaterPath}, - { 0, 0, 1, 1, gMapName_RuinValley}, - { 0, 0, 1, 1, gMapName_TrainerTower}, - { 0, 0, 1, 1, gMapName_CanyonEntrance}, - { 0, 0, 1, 1, gMapName_SevaultCanyon}, - { 0, 0, 1, 1, gMapName_TanobyRuins}, - { 0, 0, 1, 1, gMapName_SeviiIsle22}, - { 0, 0, 1, 1, gMapName_SeviiIsle23}, - { 0, 0, 1, 1, gMapName_SeviiIsle24}, - { 0, 0, 1, 1, gMapName_NavelRock}, - { 0, 0, 1, 1, gMapName_MtEmber}, - { 0, 0, 1, 1, gMapName_BerryForest}, - { 0, 0, 1, 1, gMapName_IcefallCave}, - { 0, 0, 1, 1, gMapName_RocketWarehouse}, - { 0, 0, 1, 1, gMapName_TrainerTower2}, - { 0, 0, 1, 1, gMapName_DottedHole}, - { 0, 0, 1, 1, gMapName_LostCave}, - { 0, 0, 1, 1, gMapName_PatternBush}, - { 0, 0, 1, 1, gMapName_AlteringCave}, - { 0, 0, 1, 1, gMapName_TanobyChambers}, - { 0, 0, 1, 1, gMapName_ThreeIslePath}, - { 0, 0, 1, 1, gMapName_TanobyKey}, - { 0, 0, 1, 1, gMapName_BirthIsland}, - { 0, 0, 1, 1, gMapName_MoneanChamber}, - { 0, 0, 1, 1, gMapName_LiptooChamber}, - { 0, 0, 1, 1, gMapName_WeepthChamber}, - { 0, 0, 1, 1, gMapName_DilfordChamber}, - { 0, 0, 1, 1, gMapName_ScufibChamber}, - { 0, 0, 1, 1, gMapName_RixyChamber}, - { 0, 0, 1, 1, gMapName_ViapoisChamber}, - { 0, 0, 1, 1, gMapName_EmberSpa}, - { 0, 0, 1, 1, gMapName_SpecialArea}, - {19, 3, 1, 1, gMapName_AquaHideout}, - { 6, 3, 1, 1, gMapName_MagmaHideout}, - { 8, 2, 1, 1, gMapName_MirageTower}, - { 0, 0, 1, 1, gMapName_BirthIsland}, - { 0, 0, 1, 1, gMapName_FarawayIsland}, - {22, 12, 1, 1, gMapName_ArtisanCave}, - { 0, 0, 1, 1, gMapName_MarineCave}, - { 0, 0, 1, 1, gMapName_Underwater}, - { 0, 0, 1, 1, gMapName_TerraCave}, - { 0, 10, 1, 3, gMapName_Underwater}, - {24, 3, 2, 2, gMapName_Underwater}, - {24, 10, 2, 1, gMapName_Underwater}, - { 2, 0, 1, 1, gMapName_DesertUnderpass}, - { 6, 8, 1, 1, gMapName_AlteringCave}, - { 0, 0, 1, 1, gMapName_NavelRock}, - { 8, 4, 1, 1, gMapName_TrainerHill} + { 4, 11, 1, 1, sMapName_LittlerootTown}, + { 4, 9, 1, 1, sMapName_OldaleTown}, + { 2, 14, 1, 1, sMapName_DewfordTown}, + { 5, 3, 1, 1, sMapName_LavaridgeTown}, + { 3, 0, 1, 1, sMapName_FallarborTown}, + { 4, 6, 1, 1, sMapName_VerdanturfTown}, + {17, 10, 1, 1, sMapName_PacifidlogTown}, + { 1, 9, 1, 1, sMapName_PetalburgCity}, + { 8, 10, 1, 2, sMapName_SlateportCity}, + { 8, 6, 2, 1, sMapName_MauvilleCity}, + { 0, 5, 1, 2, sMapName_RustboroCity}, + {12, 0, 1, 1, sMapName_FortreeCity}, + {18, 3, 2, 1, sMapName_LilycoveCity}, + {24, 5, 2, 1, sMapName_MossdeepCity}, + {21, 7, 1, 1, sMapName_SootopolisCity}, + {27, 8, 1, 2, sMapName_EverGrandeCity}, + { 4, 10, 1, 1, sMapName_Route101}, + { 2, 9, 2, 1, sMapName_Route102}, + { 4, 8, 4, 1, sMapName_Route103}, + { 0, 7, 1, 3, sMapName_Route104}, + { 0, 10, 1, 3, sMapName_Route105}, + { 0, 13, 2, 1, sMapName_Route106}, + { 3, 14, 3, 1, sMapName_Route107}, + { 6, 14, 2, 1, sMapName_Route108}, + { 8, 12, 1, 3, sMapName_Route109}, + { 8, 7, 1, 3, sMapName_Route110}, + { 8, 0, 1, 6, sMapName_Route111}, + { 6, 3, 2, 1, sMapName_Route112}, + { 4, 0, 4, 1, sMapName_Route113}, + { 1, 0, 2, 3, sMapName_Route114}, + { 0, 2, 1, 3, sMapName_Route115}, + { 1, 5, 4, 1, sMapName_Route116}, + { 5, 6, 3, 1, sMapName_Route117}, + {10, 6, 2, 1, sMapName_Route118}, + {11, 0, 1, 6, sMapName_Route119}, + {13, 0, 1, 4, sMapName_Route120}, + {14, 3, 4, 1, sMapName_Route121}, + {16, 4, 1, 2, sMapName_Route122}, + {12, 6, 5, 1, sMapName_Route123}, + {20, 3, 4, 3, sMapName_Route124}, + {24, 3, 2, 2, sMapName_Route125}, + {20, 6, 3, 3, sMapName_Route126}, + {23, 6, 3, 3, sMapName_Route127}, + {23, 9, 4, 1, sMapName_Route128}, + {24, 10, 2, 1, sMapName_Route129}, + {21, 10, 3, 1, sMapName_Route130}, + {18, 10, 3, 1, sMapName_Route131}, + {15, 10, 2, 1, sMapName_Route132}, + {12, 10, 3, 1, sMapName_Route133}, + { 9, 10, 3, 1, sMapName_Route134}, + {20, 3, 4, 3, sMapName_Underwater}, + {20, 6, 3, 3, sMapName_Underwater}, + {23, 6, 3, 3, sMapName_Underwater}, + {23, 9, 4, 1, sMapName_Underwater}, + {21, 7, 1, 1, sMapName_Underwater}, + { 1, 13, 1, 1, sMapName_GraniteCave}, + { 6, 2, 1, 1, sMapName_MtChimney}, + {16, 2, 1, 1, sMapName_SafariZone}, + {22, 12, 1, 1, sMapName_BattleFrontier}, + { 0, 8, 1, 1, sMapName_PetalburgWoods}, + { 2, 5, 1, 1, sMapName_RusturfTunnel}, + { 6, 14, 1, 1, sMapName_AbandonedShip}, + { 8, 7, 1, 1, sMapName_NewMauville}, + { 0, 3, 1, 1, sMapName_MeteorFalls}, + { 1, 2, 1, 1, sMapName_MeteorFalls}, + {16, 4, 1, 1, sMapName_MtPyre}, + {19, 3, 1, 1, sMapName_AquaHideoutOld}, + {24, 4, 1, 1, sMapName_ShoalCave}, + {24, 9, 1, 1, sMapName_SeafloorCavern}, + {24, 9, 1, 1, sMapName_Underwater}, + {27, 9, 1, 1, sMapName_VictoryRoad}, + {17, 10, 1, 1, sMapName_MirageIsland}, + {21, 7, 1, 1, sMapName_CaveOfOrigin}, + {12, 14, 1, 1, sMapName_SouthernIsland}, + { 6, 3, 1, 1, sMapName_FieryPath}, + { 7, 3, 1, 1, sMapName_FieryPath}, + { 6, 3, 1, 1, sMapName_JaggedPass}, + { 7, 2, 1, 1, sMapName_JaggedPass}, + {11, 10, 1, 1, sMapName_SealedChamber}, + {11, 10, 1, 1, sMapName_Underwater}, + {13, 0, 1, 1, sMapName_ScorchedSlab}, + { 0, 10, 1, 1, sMapName_IslandCave}, + { 8, 3, 1, 1, sMapName_DesertRuins}, + {13, 2, 1, 1, sMapName_AncientTomb}, + { 0, 0, 1, 1, sMapName_InsideOfTruck}, + {19, 10, 1, 1, sMapName_SkyPillar}, + { 0, 0, 1, 1, sMapName_SecretBase}, + { 0, 0, 1, 1, sMapName_None}, + { 0, 0, 1, 1, sMapName_PalletTown}, + { 0, 0, 1, 1, sMapName_ViridianCity}, + { 0, 0, 1, 1, sMapName_PewterCity}, + { 0, 0, 1, 1, sMapName_CeruleanCity}, + { 0, 0, 1, 1, sMapName_LavenderTown}, + { 0, 0, 1, 1, sMapName_VermilionCity}, + { 0, 0, 1, 1, sMapName_CeladonCity}, + { 0, 0, 1, 1, sMapName_FuchsiaCity}, + { 0, 0, 1, 1, sMapName_CinnabarIsland}, + { 0, 0, 1, 1, sMapName_IndigoPlateau}, + { 0, 0, 1, 1, sMapName_SaffronCity}, + { 0, 0, 1, 1, sMapName_Route4}, + { 0, 0, 1, 1, sMapName_Route10}, + { 0, 0, 1, 1, sMapName_Route1}, + { 0, 0, 1, 1, sMapName_Route2}, + { 0, 0, 1, 1, sMapName_Route3}, + { 0, 0, 1, 1, sMapName_Route4_2}, + { 0, 0, 1, 1, sMapName_Route5}, + { 0, 0, 1, 1, sMapName_Route6}, + { 0, 0, 1, 1, sMapName_Route7}, + { 0, 0, 1, 1, sMapName_Route8}, + { 0, 0, 1, 1, sMapName_Route9}, + { 0, 0, 1, 1, sMapName_Route10_2}, + { 0, 0, 1, 1, sMapName_Route11}, + { 0, 0, 1, 1, sMapName_Route12}, + { 0, 0, 1, 1, sMapName_Route13}, + { 0, 0, 1, 1, sMapName_Route14}, + { 0, 0, 1, 1, sMapName_Route15}, + { 0, 0, 1, 1, sMapName_Route16}, + { 0, 0, 1, 1, sMapName_Route17}, + { 0, 0, 1, 1, sMapName_Route18}, + { 0, 0, 1, 1, sMapName_Route19}, + { 0, 0, 1, 1, sMapName_Route20}, + { 0, 0, 1, 1, sMapName_Route21}, + { 0, 0, 1, 1, sMapName_Route22}, + { 0, 0, 1, 1, sMapName_Route23}, + { 0, 0, 1, 1, sMapName_Route24}, + { 0, 0, 1, 1, sMapName_Route25}, + { 0, 0, 1, 1, sMapName_ViridianForest}, + { 0, 0, 1, 1, sMapName_MtMoon}, + { 0, 0, 1, 1, sMapName_SSAnne}, + { 0, 0, 1, 1, sMapName_UndergroundPath}, + { 0, 0, 1, 1, sMapName_UndergroundPath2}, + { 0, 0, 1, 1, sMapName_DiglettsCave}, + { 0, 0, 1, 1, sMapName_KantoVictoryRoad}, + { 0, 0, 1, 1, sMapName_RocketHideout}, + { 0, 0, 1, 1, sMapName_SilphCo}, + { 0, 0, 1, 1, sMapName_PokemonMansion}, + { 0, 0, 1, 1, sMapName_KantoSafariZone}, + { 0, 0, 1, 1, sMapName_PokemonLeague}, + { 0, 0, 1, 1, sMapName_RockTunnel}, + { 0, 0, 1, 1, sMapName_SeafoamIslands}, + { 0, 0, 1, 1, sMapName_PokemonTower}, + { 0, 0, 1, 1, sMapName_CeruleanCave}, + { 0, 0, 1, 1, sMapName_PowerPlant}, + { 0, 0, 1, 1, sMapName_OneIsland}, + { 0, 0, 1, 1, sMapName_TwoIsland}, + { 0, 0, 1, 1, sMapName_ThreeIsland}, + { 0, 0, 1, 1, sMapName_FourIsland}, + { 0, 0, 1, 1, sMapName_FiveIsland}, + { 0, 0, 1, 1, sMapName_SevenIsland}, + { 0, 0, 1, 1, sMapName_SixIsland}, + { 0, 0, 1, 1, sMapName_KindleRoad}, + { 0, 0, 1, 1, sMapName_TreasureBeach}, + { 0, 0, 1, 1, sMapName_CapeBrink}, + { 0, 0, 1, 1, sMapName_BondBridge}, + { 0, 0, 1, 1, sMapName_ThreeIslePort}, + { 0, 0, 1, 1, sMapName_SeviiIsle6}, + { 0, 0, 1, 1, sMapName_SeviiIsle7}, + { 0, 0, 1, 1, sMapName_SeviiIsle8}, + { 0, 0, 1, 1, sMapName_SeviiIsle9}, + { 0, 0, 1, 1, sMapName_ResortGorgeous}, + { 0, 0, 1, 1, sMapName_WaterLabyrinth}, + { 0, 0, 1, 1, sMapName_FiveIsleMeadow}, + { 0, 0, 1, 1, sMapName_MemorialPillar}, + { 0, 0, 1, 1, sMapName_OutcastIsland}, + { 0, 0, 1, 1, sMapName_GreenPath}, + { 0, 0, 1, 1, sMapName_WaterPath}, + { 0, 0, 1, 1, sMapName_RuinValley}, + { 0, 0, 1, 1, sMapName_TrainerTower}, + { 0, 0, 1, 1, sMapName_CanyonEntrance}, + { 0, 0, 1, 1, sMapName_SevaultCanyon}, + { 0, 0, 1, 1, sMapName_TanobyRuins}, + { 0, 0, 1, 1, sMapName_SeviiIsle22}, + { 0, 0, 1, 1, sMapName_SeviiIsle23}, + { 0, 0, 1, 1, sMapName_SeviiIsle24}, + { 0, 0, 1, 1, sMapName_NavelRock}, + { 0, 0, 1, 1, sMapName_MtEmber}, + { 0, 0, 1, 1, sMapName_BerryForest}, + { 0, 0, 1, 1, sMapName_IcefallCave}, + { 0, 0, 1, 1, sMapName_RocketWarehouse}, + { 0, 0, 1, 1, sMapName_TrainerTower2}, + { 0, 0, 1, 1, sMapName_DottedHole}, + { 0, 0, 1, 1, sMapName_LostCave}, + { 0, 0, 1, 1, sMapName_PatternBush}, + { 0, 0, 1, 1, sMapName_AlteringCave}, + { 0, 0, 1, 1, sMapName_TanobyChambers}, + { 0, 0, 1, 1, sMapName_ThreeIslePath}, + { 0, 0, 1, 1, sMapName_TanobyKey}, + { 0, 0, 1, 1, sMapName_BirthIsland}, + { 0, 0, 1, 1, sMapName_MoneanChamber}, + { 0, 0, 1, 1, sMapName_LiptooChamber}, + { 0, 0, 1, 1, sMapName_WeepthChamber}, + { 0, 0, 1, 1, sMapName_DilfordChamber}, + { 0, 0, 1, 1, sMapName_ScufibChamber}, + { 0, 0, 1, 1, sMapName_RixyChamber}, + { 0, 0, 1, 1, sMapName_ViapoisChamber}, + { 0, 0, 1, 1, sMapName_EmberSpa}, + { 0, 0, 1, 1, sMapName_SpecialArea}, + {19, 3, 1, 1, sMapName_AquaHideout}, + { 6, 3, 1, 1, sMapName_MagmaHideout}, + { 8, 2, 1, 1, sMapName_MirageTower}, + { 0, 0, 1, 1, sMapName_BirthIsland}, + { 0, 0, 1, 1, sMapName_FarawayIsland}, + {22, 12, 1, 1, sMapName_ArtisanCave}, + { 0, 0, 1, 1, sMapName_MarineCave}, + { 0, 0, 1, 1, sMapName_Underwater}, + { 0, 0, 1, 1, sMapName_TerraCave}, + { 0, 10, 1, 3, sMapName_Underwater}, + {24, 3, 2, 2, sMapName_Underwater}, + {24, 10, 2, 1, sMapName_Underwater}, + { 2, 0, 1, 1, sMapName_DesertUnderpass}, + { 6, 8, 1, 1, sMapName_AlteringCave}, + { 0, 0, 1, 1, sMapName_NavelRock}, + { 8, 4, 1, 1, sMapName_TrainerHill} }; #endif //GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H diff --git a/include/dewford_trend.h b/include/dewford_trend.h index 01e5d9762..dac5ea6c9 100644 --- a/include/dewford_trend.h +++ b/include/dewford_trend.h @@ -3,5 +3,6 @@ void InitDewfordTrend(void); void UpdateDewfordTrendPerDay(u16); +void UpdateDewfordTrendPerDay(u16 days); #endif // GUARD_DEWFORDTREND_H diff --git a/include/event_scripts.h b/include/event_scripts.h index 844f1052a..a54e0e463 100755 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -7,10 +7,18 @@ extern const u8 gUnknown_0823B4E8[]; extern const u8 gUnknown_0823B5E9[]; +extern const u8 EventScript_TestSignpostMsg[]; +extern const u8 EventScript_TryGetTrainerScript[]; extern const u8 EventScript_275BB7[]; extern const u8 EventScript_275D0C[]; extern const u8 EventScript_275D1F[]; extern const u8 EventScript_275D2E[]; +extern const u8 EventScript_271354[]; +extern const u8 EventScript_2713C2[]; +extern const u8 EventScript_TryDoDoubleTrainerBattle[]; +extern const u8 EventScript_271362[]; +extern const u8 EventScript_TryDoDoubleRematchBattle[]; +extern const u8 EventScript_2713D1[]; extern const u8 EventScript_2766A2[]; extern const u8 EventScript_2766A6[]; diff --git a/include/field_effect.h b/include/field_effect.h index 629ae07c7..772b20d37 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -71,8 +71,9 @@ enum FieldEffectScriptIdx extern u32 gFieldEffectArguments[8]; -u8 FieldEffectStart(u8); +u32 FieldEffectStart(u8); bool8 FieldEffectActiveListContains(u8 id); void sub_80B69DC(void); +void FieldEffectStop(struct Sprite *sprite, u8 id); #endif //GUARD_FIELD_EFFECTS_H diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index e80daf3bd..15928eba3 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -12,5 +12,6 @@ // Exported ROM declarations u8 sub_8154228(void); bool8 sub_8155DA0(struct MapObject *); +void sub_8155D78(struct MapObject *); #endif //GUARD_FIELD_EFFECT_HELPERS_H diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 0107fa10f..198dd9759 100755 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -60,7 +60,7 @@ void sub_808E82C(u8, u8, u8, s16, s16); void sub_808E7E4(u8, u8, u8); void sub_808E78C(u8, u8, u8, u8); void sub_808E75C(s16, s16); -void FieldObjectGetLocalIdAndMap(struct MapObject *, u8 *, u8 *, u8 *); +void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, void *localId, void *mapNum, void *mapGroup); void npc_coords_shift(struct MapObject *, s16, s16); void sub_808EB08(struct MapObject *, s16, s16); void sub_808F254(u8, u8, u8); @@ -76,6 +76,18 @@ void MoveCoords(u8, s16 *, s16 *); bool8 FieldObjectIsSpecialAnimActive(struct MapObject *); u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *); u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z); +void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 animPattern); +u8 npc_running_behaviour_by_direction(u8 direction); +const u8 *GetFieldObjectScriptPointerByFieldObjectId(u8 mapObjectId); +u8 sub_8092C8C(struct MapObject *mapObject, s16 x, s16 y, u8 direction); +u8 GetFaceDirectionAnimId(u32); +u8 GetGoSpeed0AnimId(u32); +u8 sub_80934BC(u32); +bool8 FieldObjectSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId); +bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *mapObject); +u8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *mapObject); +void sub_808F23C(const struct MapObject *mapObject, u8 movementType); +void sub_808F208(const struct MapObject *mapObject); // Exported data declarations diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 25b7f2d71..a3c40bc42 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -9,6 +9,7 @@ void PlayerGetDestCoords(s16 *, s16 *); u8 player_get_direction_lower_nybble(void); u8 player_get_direction_upper_nybble(void); u8 player_get_x22(void); +void sub_808BCE8(void); void sub_808D074(u8); void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr); diff --git a/include/field_screen.h b/include/field_screen.h index 089e79cc4..cfc0d081f 100644 --- a/include/field_screen.h +++ b/include/field_screen.h @@ -9,5 +9,6 @@ void pal_fill_black(void); bool8 sub_80ABDFC(void); void sub_80AF168(void); +void UpdateWeatherPerDay(u16 days); #endif //GUARD_FIELD_SCREEN_H diff --git a/include/gba/macro.h b/include/gba/macro.h index 7b6b98c06..ad4820bcf 100644 --- a/include/gba/macro.h +++ b/include/gba/macro.h @@ -78,6 +78,81 @@ #define DmaCopy16(dmaNum, src, dest, size) DMA_COPY(dmaNum, src, dest, size, 16) #define DmaCopy32(dmaNum, src, dest, size) DMA_COPY(dmaNum, src, dest, size, 32) +#define DmaCopyLarge(dmaNum, src, dest, size, block, bit) \ +{ \ + const void *_src = src; \ + void *_dest = dest; \ + u32 _size = size; \ + while (1) \ + { \ + DmaCopy##bit(dmaNum, _src, _dest, (block)); \ + _src += (block); \ + _dest += (block); \ + _size -= (block); \ + if (_size <= (block)) \ + { \ + DmaCopy##bit(dmaNum, _src, _dest, _size); \ + break; \ + } \ + } \ +} + +#define DmaCopyLarge16(dmaNum, src, dest, size, block) DmaCopyLarge(dmaNum, src, dest, size, block, 16) + +#define DmaCopyLarge32(dmaNum, src, dest, size, block) DmaCopyLarge(dmaNum, src, dest, size, block, 32) + +#define DmaFillLarge(dmaNum, value, dest, size, block, bit) \ +{ \ + void *_dest = dest; \ + u32 _size = size; \ + while (1) \ + { \ + DmaFill##bit(dmaNum, value, _dest, (block)); \ + _dest += (block); \ + _size -= (block); \ + if (_size <= (block)) \ + { \ + DmaFill##bit(dmaNum, value, _dest, _size); \ + break; \ + } \ + } \ +} + +#define DmaFillLarge16(dmaNum, value, dest, size, block) DmaFillLarge(dmaNum, value, dest, size, block, 16) + +#define DmaFillLarge32(dmaNum, value, dest, size, block) DmaFillLarge(dmaNum, value, dest, size, block, 32) + +#define DmaCopyDefvars(dmaNum, src, dest, size, bit) \ +{ \ + const void *_src = src; \ + void *_dest = dest; \ + u32 _size = size; \ + DmaCopy##bit(dmaNum, _src, _dest, _size); \ +} + +#define DmaCopy16Defvars(dmaNum, src, dest, size) DmaCopyDefvars(dmaNum, src, dest, size, 16) +#define DmaCopy32Defvars(dmaNum, src, dest, size) DmaCopyDefvars(dmaNum, src, dest, size, 32) + +#define DmaFillDefvars(dmaNum, value, dest, size, bit) \ +{ \ + void *_dest = dest; \ + u32 _size = size; \ + DmaFill##bit(dmaNum, value, _dest, _size); \ +} + +#define DmaFill16Defvars(dmaNum, value, dest, size) DmaFillDefvars(dmaNum, value, dest, size, 16) +#define DmaFill32Defvars(dmaNum, value, dest, size) DmaFillDefvars(dmaNum, value, dest, size, 32) + +#define DmaClearDefvars(dmaNum, dest, size, bit) \ +{ \ + void *_dest = dest; \ + u32 _size = size; \ + DmaClear##bit(dmaNum, _dest, _size); \ +} + +#define DmaClear16Defvars(dmaNum, dest, size) DmaClearDefvars(dmaNum, dest, size, 16) +#define DmaClear32Defvars(dmaNum, dest, size) DmaClearDefvars(dmaNum, dest, size, 32) + #define DmaStop(dmaNum) \ { \ vu16 *dmaRegs = (vu16 *)REG_ADDR_DMA##dmaNum; \ diff --git a/include/gba/types.h b/include/gba/types.h index e9a380023..9f63489aa 100644 --- a/include/gba/types.h +++ b/include/gba/types.h @@ -49,7 +49,7 @@ struct OamData u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode u32 size:2; - /*0x04*/ u16 tileNum:10; // 0x33F + /*0x04*/ u16 tileNum:10; // 0x3FF u16 priority:2; // 0x400, 0x800 -> 0xC00 u16 paletteNum:4; /*0x06*/ u16 affineParam; diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index ed5054b7d..3e9f13523 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -39,7 +39,7 @@ enum MAP_BATTLE_SCENE_PHOEBE, // 5 MAP_BATTLE_SCENE_GLACIA, // 6 MAP_BATTLE_SCENE_DRAKE, // 7 - MAP_BATTLE_SCENE_BATTLE_TOWER, // 8 + MAP_BATTLE_SCENE_FRONTIER, // 8 }; typedef void (*TilesetCB)(void); @@ -224,7 +224,7 @@ struct MapObject /*0x0C*/ struct Coords16 coords1; /*0x10*/ struct Coords16 coords2; /*0x14*/ struct Coords16 coords3; - /*0x18*/ u8 mapobj_unk_18:4; //current direction? + /*0x18*/ u8 mapobj_unk_18:4; // current direction? /*0x18*/ u8 placeholder18:4; /*0x19*/ union __attribute__((packed)) { u8 as_byte; diff --git a/include/global.h b/include/global.h index 0f486c235..b6a496dd1 100644 --- a/include/global.h +++ b/include/global.h @@ -36,6 +36,24 @@ extern u8 gStringVar2[]; extern u8 gStringVar3[]; extern u8 gStringVar4[]; +// There are many quirks in the source code which have overarching behavioral differences from +// a number of other files. For example, diploma.c seems to declare rodata before each use while +// other files declare out of order and must be at the beginning. There are also a number of +// macros which differ from one file to the next due to the method of obtaining the result, such +// as these below. Because of this, there is a theory (Two Team Theory) that states that these +// programming projects had more than 1 "programming team" which utilized different macros for +// each of the files that were worked on. +#define T1_READ_8(ptr) ((ptr)[0]) +#define T1_READ_16(ptr) ((ptr)[0] | ((ptr)[1] << 8)) +#define T1_READ_32(ptr) ((ptr)[0] | ((ptr)[1] << 8) | ((ptr)[2] << 16) | ((ptr)[3] << 24)) +#define T1_READ_PTR(ptr) (u8*) T1_READ_32(ptr) + +// T2_READ_8 is a duplicate to remain consistent with each group. +#define T2_READ_8(ptr) ((ptr)[0]) +#define T2_READ_16(ptr) ((ptr)[0] + ((ptr)[1] << 8)) +#define T2_READ_32(ptr) ((ptr)[0] + ((ptr)[1] << 8) + ((ptr)[2] << 16) + ((ptr)[3] << 24)) +#define T2_READ_PTR(ptr) (void*) T2_READ_32(ptr) + enum { VERSION_SAPPHIRE = 1, @@ -45,7 +63,8 @@ enum VERSION_LEAF_GREEN = 5, }; -enum LanguageId { +enum LanguageId +{ LANGUAGE_JAPANESE = 1, LANGUAGE_ENGLISH = 2, LANGUAGE_FRENCH = 3, @@ -222,7 +241,7 @@ struct SaveBlock2 /*0x1EC*/ struct BerryCrush berryCrush; /*0x1FC*/ struct PokemonJumpResults pokeJump; /*0x20C*/ struct BerryPickingResults berryPick; - /*0x214*/ u8 field_214[1032]; + /*0x21C*/ u8 field_21C[1032]; /*0x624*/ u16 contestLinkResults[20]; // 4 positions for 5 categories, possibly a struct or a 2d array // All below could be a one giant struct @@ -244,7 +263,7 @@ struct SaveBlock2 /*0xCA9*/ u8 field_CA9_f : 1; // 0x80 /*0xCAA*/ u16 field_CAA[4]; /*0xCB2*/ u16 battlePyramidWildHeaderId; - /*0xCB4*/ u8 field_CB4[82]; + /*0xCB4*/ u16 field_CB4[41]; /*0xD06*/ u8 field_D06; /*0xD07*/ u8 field_D07; /*0xD08*/ u8 filler_D08[0x112]; @@ -360,10 +379,12 @@ struct EasyChatPair u16 words[2]; }; /*size = 0x8*/ +#define MAIL_WORDS_COUNT 9 + struct MailStruct { - /*0x00*/ u16 words[9]; - /*0x12*/ u8 playerName[8]; + /*0x00*/ u16 words[MAIL_WORDS_COUNT]; + /*0x12*/ u8 playerName[PLAYER_NAME_LENGTH]; /*0x1A*/ u8 trainerId[4]; /*0x1E*/ u16 species; /*0x20*/ u16 itemId; @@ -493,11 +514,12 @@ struct RecordMixingDayCareMail bool16 holdsItem[DAYCARE_MON_COUNT]; }; -#define MAP_OBJECTS_COUNT 16 -#define BERRY_TREES_COUNT 128 -#define FLAGS_COUNT 300 -#define VARS_COUNT 256 -#define MAIL_COUNT 16 +#define POKEBLOCKS_COUNT 40 +#define MAP_OBJECTS_COUNT 16 +#define BERRY_TREES_COUNT 128 +#define FLAGS_COUNT 300 +#define VARS_COUNT 256 +#define MAIL_COUNT 16 enum { @@ -590,7 +612,7 @@ struct SaveBlock1 /*0x650*/ struct ItemSlot bagPocket_PokeBalls[16]; /*0x690*/ struct ItemSlot bagPocket_TMHM[64]; /*0x790*/ struct ItemSlot bagPocket_Berries[46]; - /*0x848*/ struct Pokeblock pokeblocks[40]; + /*0x848*/ struct Pokeblock pokeblocks[POKEBLOCKS_COUNT]; /*0x988*/ u8 seen1[52]; /*0x9BC*/ u16 berryBlenderRecords[3]; /*0x9C2*/ u8 field_9C2[6]; diff --git a/include/graphics.h b/include/graphics.h index 4a522a429..0a38c9b82 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -1,10 +1,7 @@ -// -// Created by scott on 10/21/2017. -// - #ifndef GUARD_GRAPHICS_H #define GUARD_GRAPHICS_H +// interface pokeballs extern const u8 gInterfaceGfx_PokeBall[]; extern const u8 gInterfacePal_PokeBall[]; extern const u8 gInterfaceGfx_GreatBall[]; @@ -31,6 +28,28 @@ extern const u8 gInterfaceGfx_PremierBall[]; extern const u8 gInterfacePal_PremierBall[]; extern const u8 gOpenPokeballGfx[]; +// pokeblock +extern const u8 gMenuPokeblock_Gfx[]; +extern const u8 gMenuPokeblock_Pal[]; +extern const u8 gMenuPokeblock_Tilemap[]; +extern const u8 gMenuPokeblockDevice_Gfx[]; +extern const u8 gMenuPokeblockDevice_Pal[]; +extern const u8 gPokeblockRed_Pal[]; +extern const u8 gPokeblockBlue_Pal[]; +extern const u8 gPokeblockPink_Pal[]; +extern const u8 gPokeblockGreen_Pal[]; +extern const u8 gPokeblockYellow_Pal[]; +extern const u8 gPokeblockPurple_Pal[]; +extern const u8 gPokeblockIndigo_Pal[]; +extern const u8 gPokeblockBrown_Pal[]; +extern const u8 gPokeblockLiteBlue_Pal[]; +extern const u8 gPokeblockOlive_Pal[]; +extern const u8 gPokeblockGray_Pal[]; +extern const u8 gPokeblockBlack_Pal[]; +extern const u8 gPokeblockWhite_Pal[]; +extern const u8 gPokeblockGold_Pal[]; +extern const u8 gPokeblock_Gfx[]; + extern const u8 gItemIcon_QuestionMark[]; extern const u8 gItemIconPalette_QuestionMark[]; extern const u8 gUnknown_08DB7AA0[]; @@ -117,6 +136,11 @@ extern const u8 gUnknown_08DB9F08[]; extern const u8 gUnknown_08DB9FFC[]; extern const u8 gUnknown_08DBA020[]; extern const u8 gUnknown_08DBA12C[]; +extern const u8 gUnknown_08DCC05C[]; +extern const u16 gUnknown_08DCC01C[]; +extern const u16 gUnknown_08DCC03C[]; +extern const u8 gUnknown_08DCC648[]; +extern const u8 gUnknown_08DCC908[]; extern const u8 gUnknown_08DD87C0[]; extern const u8 gUnknown_08DD8EE0[]; extern const u16 gUnknown_08DD8780[]; @@ -136,4 +160,82 @@ extern const u8 gUnknown_08DDB020[]; extern const u8 gUnknown_08DDB2C4[]; extern const u16 gUnknown_08DDAFE0[]; +extern const u8 gBattleTextboxTiles[]; +extern const u8 gBattleTextboxTilemap[]; +extern const u8 gBattleTextboxPalette[]; +extern const u8 gUnknown_08D778F0[]; +extern const u8 gUnknown_08D77B0C[]; +extern const u8 gUnknown_08D77AE4[]; +extern const u8 gUnknown_08D779D8[]; +extern const u8 gUnknown_08D857A8[]; +extern const u8 gUnknown_08D85A1C[]; +extern const u8 gUnknown_08D85600[]; + +// battle terrains +extern const u8 gBattleTerrainTiles_TallGrass[]; +extern const u8 gBattleTerrainTilemap_TallGrass[]; +extern const u8 gBattleTerrainAnimTiles_TallGrass[]; +extern const u8 gBattleTerrainAnimTilemap_TallGrass[]; +extern const u8 gBattleTerrainPalette_TallGrass[]; +extern const u8 gBattleTerrainTiles_LongGrass[]; +extern const u8 gBattleTerrainTilemap_LongGrass[]; +extern const u8 gBattleTerrainAnimTiles_LongGrass[]; +extern const u8 gBattleTerrainAnimTilemap_LongGrass[]; +extern const u8 gBattleTerrainPalette_LongGrass[]; +extern const u8 gBattleTerrainTiles_Sand[]; +extern const u8 gBattleTerrainTilemap_Sand[]; +extern const u8 gBattleTerrainAnimTiles_Sand[]; +extern const u8 gBattleTerrainAnimTilemap_Sand[]; +extern const u8 gBattleTerrainPalette_Sand[]; +extern const u8 gBattleTerrainTiles_Underwater[]; +extern const u8 gBattleTerrainTilemap_Underwater[]; +extern const u8 gBattleTerrainAnimTiles_Underwater[]; +extern const u8 gBattleTerrainAnimTilemap_Underwater[]; +extern const u8 gBattleTerrainPalette_Underwater[]; +extern const u8 gBattleTerrainTiles_Water[]; +extern const u8 gBattleTerrainTilemap_Water[]; +extern const u8 gBattleTerrainAnimTiles_Water[]; +extern const u8 gBattleTerrainAnimTilemap_Water[]; +extern const u8 gBattleTerrainPalette_Water[]; +extern const u8 gBattleTerrainTiles_PondWater[]; +extern const u8 gBattleTerrainTilemap_PondWater[]; +extern const u8 gBattleTerrainAnimTiles_PondWater[]; +extern const u8 gBattleTerrainAnimTilemap_PondWater[]; +extern const u8 gBattleTerrainPalette_PondWater[]; +extern const u8 gBattleTerrainTiles_Rock[]; +extern const u8 gBattleTerrainTilemap_Rock[]; +extern const u8 gBattleTerrainAnimTiles_Rock[]; +extern const u8 gBattleTerrainAnimTilemap_Rock[]; +extern const u8 gBattleTerrainPalette_Rock[]; +extern const u8 gBattleTerrainTiles_Cave[]; +extern const u8 gBattleTerrainTilemap_Cave[]; +extern const u8 gBattleTerrainAnimTiles_Cave[]; +extern const u8 gBattleTerrainAnimTilemap_Cave[]; +extern const u8 gBattleTerrainPalette_Cave[]; +extern const u8 gBattleTerrainTiles_Building[]; +extern const u8 gBattleTerrainTilemap_Building[]; +extern const u8 gBattleTerrainAnimTiles_Building[]; +extern const u8 gBattleTerrainAnimTilemap_Building[]; +extern const u8 gBattleTerrainPalette_Building[]; +extern const u8 gBattleTerrainPalette_Plain[]; +extern const u8 gBattleTerrainPalette_Frontier[]; +extern const u8 gBattleTerrainTiles_Stadium[]; +extern const u8 gBattleTerrainTilemap_Stadium[]; +extern const u8 gBattleTerrainTiles_Rayquaza[]; +extern const u8 gBattleTerrainTilemap_Rayquaza[]; +extern const u8 gBattleTerrainAnimTiles_Rayquaza[]; +extern const u8 gBattleTerrainAnimTilemap_Rayquaza[]; +extern const u8 gBattleTerrainPalette_Rayquaza[]; +extern const u8 gBattleTerrainPalette_Kyogre[]; +extern const u8 gBattleTerrainPalette_Groudon[]; +extern const u8 gBattleTerrainPalette_BuildingGym[]; +extern const u8 gBattleTerrainPalette_BuildingLeader[]; +extern const u8 gBattleTerrainPalette_StadiumAqua[]; +extern const u8 gBattleTerrainPalette_StadiumMagma[]; +extern const u8 gBattleTerrainPalette_StadiumSidney[]; +extern const u8 gBattleTerrainPalette_StadiumPhoebe[]; +extern const u8 gBattleTerrainPalette_StadiumGlacia[]; +extern const u8 gBattleTerrainPalette_StadiumDrake[]; +extern const u8 gBattleTerrainPalette_StadiumWallace[]; + #endif //GUARD_GRAPHICS_H diff --git a/include/international_string_util.h b/include/international_string_util.h index e7876162e..f4ba827e3 100644 --- a/include/international_string_util.h +++ b/include/international_string_util.h @@ -14,7 +14,7 @@ s32 sub_81DB3D8(const struct MenuAction *str, u8* arg1, s32 arg2); // sub_81DB41C // CopyMonCategoryText // sub_81DB494 -// sub_81DB4DC +void PadNameString(u8 *dst, u8 padWith); // sub_81DB554 // sub_81DB5AC u32 sub_81DB604(const u8 *); diff --git a/include/lilycove_lady.h b/include/lilycove_lady.h index c7776131b..084e5722e 100644 --- a/include/lilycove_lady.h +++ b/include/lilycove_lady.h @@ -7,7 +7,7 @@ void sub_818DA78(void); void sub_818DEF4(void); void sub_818E564(void); void sub_818E570(const struct LilycoveLadyQuiz *quiz); -bool8 sub_818E704(struct Pokeblock *pokeblock); +bool8 GivePokeblockToContestLady(struct Pokeblock *pokeblock); void sub_818E7E0(u8 *dest1, u8 *dest2); void sub_818E81C(u8 *dest); void sub_818E848(u8 *dest); diff --git a/include/list_menu.h b/include/list_menu.h index 0249b06af..8b793c0e4 100644 --- a/include/list_menu.h +++ b/include/list_menu.h @@ -1,14 +1,17 @@ #ifndef GUARD_LIST_MENU_H #define GUARD_LIST_MENU_H +#define LIST_NOTHING_CHOSEN -1 +#define LIST_B_PRESSED -2 + // Exported type declarations // Exported RAM declarations struct ListMenuItem { - const u8 *unk_00; - s32 unk_04; + const u8 *name; + s32 id; }; struct ListMenu; @@ -16,7 +19,7 @@ struct ListMenu; struct ListMenuTemplate { const struct ListMenuItem *items; - void (* unk_04)(u32, bool8, struct ListMenu *); + void (* moveCursorFunc)(u32, bool8, struct ListMenu *); void (* unk_08)(u8, s32, u8); u16 totalItems; u16 maxShowed; @@ -32,9 +35,11 @@ struct ListMenuTemplate u32 spaceBetweenItems:6; // x20000, x40000, x80000, x100000, x200000, x400000 = x7E0000 u32 unk_16_7:1; // x800000 u32 unk_17_0:6; // x1000000, x2000000, x4000000, x8000000, x10000000, x20000000 = x3F000000 + u32 cursorKind:2; // x40000000, x80000000 }; -struct ListMenu { +struct ListMenu +{ struct ListMenuTemplate _template; u16 scrollOffset; u16 selectedRow; @@ -44,13 +49,13 @@ struct ListMenu { u8 unk_1F; }; -extern struct ListMenuTemplate gUnknown_03006310; +extern struct ListMenuTemplate gMultiuseListMenuTemplate; // Exported ROM declarations -u8 ListMenuInit(struct ListMenuTemplate *template, u16 a1, u16 a2); -s32 ListMenuHandleInput(u8 id); -void get_coro_args_x18_x1A(u8 a0, u16 *a1, u16 *a2); -void sub_81AE6C8(u8 a0, u16 *a1, u16 *a2); +u8 ListMenuInit(struct ListMenuTemplate *template, u16 cursorPage, u16 cursorPosition); +s32 ListMenuHandleInputGetItemId(u8 listTaskId); +void sub_81AE860(u8 listTaskId, u16 *a1, u16 *a2); +void sub_81AE6C8(u8 listTaskId, u16 *a1, u16 *a2); #endif //GUARD_LIST_MENU_H diff --git a/include/mail.h b/include/mail.h index 0a70237bf..042586653 100644 --- a/include/mail.h +++ b/include/mail.h @@ -14,10 +14,20 @@ || itemId == ITEM_FAB_MAIL \ || itemId == ITEM_RETRO_MAIL)) +// mail.h +void ReadMail(struct MailStruct *mail, void (*callback)(void), bool8 flag); +// mail_data.h +void ClearMailData(void); +void ClearMailStruct(struct MailStruct *mail); bool8 MonHasMail(struct Pokemon *mon); -void TakeMailFromMon(struct Pokemon *mon); +u8 GiveMailToMon(struct Pokemon *mon, u16 itemId); +u16 SpeciesToMailSpecies(u16 species, u32 personality); +u16 MailSpeciesToSpecies(u16 mailSpecies, u16 *buffer); u8 GiveMailToMon2(struct Pokemon *mon, struct MailStruct *mail); -void ClearMailStruct(struct MailStruct *mail); +void TakeMailFromMon(struct Pokemon *mon); +void ClearMailItemId(u8 mailId); +u8 TakeMailFromMon2(struct Pokemon *mon); +bool8 ItemIsMail(u16 itemId); #endif // GUARD_MAIL_H diff --git a/include/mail_data.h b/include/mail_data.h deleted file mode 100644 index bf6540bad..000000000 --- a/include/mail_data.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef GUARD_MAIL_DATA_H -#define GUARD_MAIL_DATA_H - -// Exported type declarations - -// Exported RAM declarations - -// Exported ROM declarations - -u16 sub_80D45E8(u16, u16 *); - -#endif //GUARD_MAIL_DATA_H diff --git a/include/map_obj_8097404.h b/include/map_obj_8097404.h index 27ffd18cb..0800b15b0 100644 --- a/include/map_obj_8097404.h +++ b/include/map_obj_8097404.h @@ -28,5 +28,7 @@ void sub_8097750(struct Sprite *); bool8 sub_8097758(struct Sprite *); void sub_8097FA4(struct MapObject *); void sub_8098044(u8); +void UnfreezeMapObjects(void); +void sub_80974D0(u8 mapObjectId); #endif //GUARD_MAP_OBJ_8097404_H diff --git a/include/menu.h b/include/menu.h index 2052a8dad..124303570 100644 --- a/include/menu.h +++ b/include/menu.h @@ -4,6 +4,9 @@ #include "text.h" #include "window.h" +#define MENU_NOTHING_CHOSEN -2 +#define MENU_B_PRESSED -1 + struct MenuAction { const u8 *text; @@ -29,10 +32,12 @@ int decompress_and_copy_tile_data_to_vram(u8 bg_id, const void *src, int size, u bool8 free_temp_tile_data_buffers_if_possible(void); u64 sub_8198A50(struct WindowTemplate*, u8, u8, u8, u8, u8, u8, u16); // returns something but it isn't used, fix when menu.s is decomp'd void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos); -s8 sub_8198C58(void); +s8 ProcessMenuInputNoWrap_(void); void do_scheduled_bg_tilemap_copies_to_vram(void); void clear_scheduled_bg_copies_to_vram(void); -void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, const u8 *str); +void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str); void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3); +void sub_81995E4(u8 windowId, u8 optionsNo, const struct MenuAction *actions, const u8 *actionIds); +void sub_8197DF8(u8 windowId, bool8 copyToVram); #endif // GUARD_MENU_H diff --git a/include/menu_helpers.h b/include/menu_helpers.h index f083a10e2..14b6d32ca 100644 --- a/include/menu_helpers.h +++ b/include/menu_helpers.h @@ -3,7 +3,8 @@ // Exported type declarations -struct YesNoFuncTable { +struct YesNoFuncTable +{ TaskFunc yesFunc; TaskFunc noFunc; }; @@ -16,5 +17,15 @@ void sub_812225C(u16 *, u16 *, u8, u8); void sub_8122298(u16 *, u16 *, u8, u8, u8); void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data); bool8 sub_81221AC(void); +void ResetVramOamAndBgCntRegs(void); +void SetVBlankHBlankCallbacksToNull(void); +void ResetAllBgsCoordinates(void); +bool16 RunTextPrintersRetIsActive(u8 textPrinterId); +void sub_8122344(void *arg0, u8 arg1); +void LoadListMenuArrowsGfx(void); +void sub_81223FC(u8 *a0, u8 count, u8 a2); +void sub_8122448(u8 *a0, u8 count, u16 x, u16 y); +void DisplayMessageAndContinueTask(u8 taskId, u8 arg1, u16 arg2, u8 arg3, u8 arg4, u8 textSpeed, const u8 *string, void *taskFunc); +void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 arg2, u8 arg3, u8 arg4, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo); #endif //GUARD_MENU_HELPERS_H diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index c52184972..dad819c51 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -14,5 +14,6 @@ void sub_8197434(u8 a0, u8 a1); void SetStandardWindowBorderStyle(u8 a0, u8 a1); void sub_8197930(void); u8 GetPlayerTextSpeed(void); +void sub_81978B0(u16 arg0); #endif // GUARD_NEW_MENU_HELPERS_H diff --git a/include/party_menu.h b/include/party_menu.h index c787bafb1..3756ef569 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -1,7 +1,8 @@ #ifndef GUARD_PARTY_MENU_H #define GUARD_PARTY_MENU_H -enum { +enum +{ AILMENT_NONE, AILMENT_PSN, AILMENT_PRZ, @@ -14,5 +15,6 @@ bool8 pokemon_has_move(struct Pokemon *, u16); void sub_81B58A8(void); void DoWallyTutorialBagMenu(void); u8 pokemon_ailments_get_primary(u32 status); +u8 *GetMonNickname(struct Pokemon *mon, u8 *dst); #endif // GUARD_PARTY_MENU_H diff --git a/include/pokeblock.h b/include/pokeblock.h index a145cbada..6dd07b689 100644 --- a/include/pokeblock.h +++ b/include/pokeblock.h @@ -1,6 +1,9 @@ #ifndef GUARD_POKEBLOCK_H #define GUARD_POKEBLOCK_H +#define GFX_TAG_POKEBLOCK 14818 +#define GFX_TAG_POKEBLOCK_CASE 14800 + enum { PBLOCK_CLR_BLACK, @@ -22,12 +25,44 @@ enum PBLOCK_FEEL, }; +enum +{ + PBLOCK_CASE_FIELD, + PBLOCK_CASE_BATTLE, + PBLOCK_CASE_FEEDER, + PBLOCK_CASE_GIVE +}; + +// use pokeblock +extern u8 gPokeblockMonId; +extern s16 gPokeblockGain; + +void ChooseMonToGivePokeblock(struct Pokeblock *pokeblock, void (*callback)(void)); + +// pokeblock feed +void CB2_PreparePokeblockFeedScene(void); + +// pokeblock +extern const s8 gPokeblockFlavorCompatibilityTable[]; +extern const u8 *const gPokeblockNames[]; +extern const struct CompressedSpriteSheet gPokeblockCase_SpriteSheet; +extern const struct CompressedSpritePalette gPokeblockCase_SpritePal; + +void OpenPokeblockCase(u8 caseId, void (*callback)(void)); +void OpenPokeblockCaseInBattle(void); +void OpenPokeblockCaseOnFeeder(void); +void ResetPokeblockScrollPositions(void); +u8 CreatePokeblockCaseSprite(s16 x, s16 y, u8 subpriority); void ClearPokeblocks(void); -s8 GetFirstFreePokeblockSlot(void); -bool32 AddPokeblock(struct Pokeblock *pokeblock); u8 GetHighestPokeblocksFlavorLevel(const struct Pokeblock *pokeblock); u8 GetPokeblocksFeel(const struct Pokeblock *pokeblock); +s8 GetFirstFreePokeblockSlot(void); +bool32 AddPokeblock(const struct Pokeblock *pokeblock); +bool32 TryClearPokeblock(u8 pkblId); +s16 GetPokeblockData(const struct Pokeblock *pokeblock, u8 field); +s16 PokeblockGetGain(u8 nature, const struct Pokeblock *pokeblock); +void PokeblockCopyName(const struct Pokeblock *pokeblock, u8 *dest); +bool8 CopyMonFavoritePokeblockName(u8 nature, u8 *dest); u8 GetPokeblocksFlavor(const struct Pokeblock *pokeblock); -s16 PokeblockGetGain(u8, const struct Pokeblock *); #endif // GUARD_POKEBLOCK_H diff --git a/include/pokemon.h b/include/pokemon.h index 480c8d9b9..cdab96687 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -653,6 +653,7 @@ u8 GetSecretBaseTrainerPicIndex(void); bool8 TryIncrementMonLevel(struct Pokemon *mon); void BoxMonToMon(struct BoxPokemon *srcMon, struct Pokemon *dstMon); u8 GetLevelUpMovesBySpecies(u16 species, u16 *moves); +u8 GetMonsStateToDoubles_2(void); #include "sprite.h" diff --git a/include/pokemon_3.h b/include/pokemon_3.h index 5c9862d57..82dfacf48 100644 --- a/include/pokemon_3.h +++ b/include/pokemon_3.h @@ -3,5 +3,7 @@ const u8* GetTrainerClassNameFromId(u16 trainerId); const u8* GetTrainerNameFromId(u16 trainerId); +void PlayMapChosenOrBattleBGM(u16 song); +u8 GetTrainerEncounterMusicId(u16 trainerOpponentId); #endif // GUARD_POKEMON_3_H diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index b6d21823e..e0a9aa0c5 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -3,6 +3,7 @@ const u8 *GetMonIconPtr(u16 speciesId, u32 personality, u32 frameNo); const u16 *GetValidMonIconPalettePtr(u16 speciesId); +u16 GetUnownLetterByPersonality(u32 personality); u16 sub_80D2E84(u16 speciesId); void sub_80D2F68(u16 iconId); u8 sub_80D2D78(u16 iconId, void callback(struct Sprite *), u16 x, u16 y, u16 a4, u8 a5); diff --git a/include/pokenav.h b/include/pokenav.h index 06676610a..ebe3b325c 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -2,5 +2,16 @@ #define GUARD_POKENAV_H bool8 sub_81D5C18(void); +bool8 sub_81D20BC(void *arg0); +bool8 sub_81D312C(void *arg0); +void sub_81D1ED4(void *arg0); +void sub_81D2108(void *arg0); +void sub_81D20AC(void *arg0); +void sub_81D2230(void *arg0); +void sub_81D3464(void *arg0); +void sub_81D3480(void *arg0, u8 arg1); +void sub_81D2754(void *arg0, void *arg1); +void sub_81D1F84(void *arg0, void *arg1, void *arg2); +const u8 *sub_81D62AC(void); #endif //GUARD_POKENAV_H diff --git a/include/rom6.h b/include/rom6.h index b4a972794..fc33b7d1f 100644 --- a/include/rom6.h +++ b/include/rom6.h @@ -1,9 +1,15 @@ #ifndef GUARD_ROM6_H #define GUARD_ROM6_H -void sub_81357FC(u8, void(void)); +void OpenPokeblockCase(u8, void(void)); u8 GetLeadMonIndex(void); u8 GetSSTidalLocation(u8 *grp, u8 *num, s16 *x, s16 *y); void sub_813BADC(bool8); +bool8 sub_813B9C0(void); +void UpdateMirageRnd(u16 days); +void UpdateBirchState(u16 days); +void UpdateFrontierManiac(u16 days); +void UpdateFrontierGambler(u16 days); +void SetShoalItemFlag(u16 days); #endif //GUARD_ROM6_H diff --git a/include/safari_zone.h b/include/safari_zone.h index 9a81894b8..39ee3ccb3 100644 --- a/include/safari_zone.h +++ b/include/safari_zone.h @@ -13,6 +13,8 @@ void ExitSafariMode(void); bool8 SafariZoneTakeStep(void); void SafariZoneRetirePrompt(void); +void CB2_EndSafariBattle(void); + struct Pokeblock *SafariZoneGetActivePokeblock(void); void SafariZoneActivatePokeblockFeeder(u8 pokeblock_index); diff --git a/include/secret_base.h b/include/secret_base.h index 630a36773..b2502889c 100644 --- a/include/secret_base.h +++ b/include/secret_base.h @@ -9,5 +9,6 @@ void sub_80E9578(void); void sub_80E980C(void); u8 *GetSecretBaseMapName(u8 *dest); +const u8 *GetSecretBaseTrainerLoseText(void); #endif //GUARD_SECRET_BASE_H diff --git a/include/songs.h b/include/songs.h index 5a1fff00c..efa4dc3b8 100644 --- a/include/songs.h +++ b/include/songs.h @@ -372,20 +372,20 @@ enum BGM_BATTLE_DOME_TOURNAMENT, BGM_BATTLE_PIKE, BGM_BATTLE_FACTORY, - BGM_BATTLE_LEGENDARY, - BGM_BATTLE_FRONTIER_BRAIN, - BGM_BATTLE_MEW, - BGM_BATTLE_DOME, // end of the human-readable names + /*0x1D6*/ BGM_BATTLE_LEGENDARY, + /*0x1D7*/ BGM_BATTLE_FRONTIER_BRAIN, + /*0x1D8*/ BGM_BATTLE_MEW, + /*0x1D9*/ BGM_BATTLE_DOME, // end of the human-readable names /*0x1DA*/ BGM_BATTLE27, // wild - BGM_BATTLE31, // aqua/magma grunt - BGM_BATTLE20, // trainer - BGM_BATTLE32, // gym leader - BGM_BATTLE33, // champion - BGM_BATTLE36, // regi - BGM_BATTLE34, // weather trio - BGM_BATTLE35, // rival - BGM_BATTLE38, // elite four - BGM_BATTLE30, // aqua/magma leader + /*0x1DB*/ BGM_BATTLE31, // aqua/magma grunt + /*0x1DC*/ BGM_BATTLE20, // trainer + /*0x1DD*/ BGM_BATTLE32, // gym leader + /*0x1DE*/ BGM_BATTLE33, // champion + /*0x1DF*/ BGM_BATTLE36, // regi + /*0x1E0*/ BGM_BATTLE34, // weather trio + /*0x1E1*/ BGM_BATTLE35, // rival + /*0x1E2*/ BGM_BATTLE38, // elite four + /*0x1E3*/ BGM_BATTLE30, // aqua/magma leader /*0x1E4*/ BGM_FRLG_FOLLOW_ME, // FR/LG names not known, human-readable again! BGM_FRLG_GAMECORNER, BGM_FRLG_ROCKET_HIDEOUT, @@ -453,14 +453,65 @@ enum BGM_FRLG_ISLAND_FOUR, BGM_FRLG_ISLAND_SIX, BGM_FRLG_FLUTE, - BGM_FRLG_BATTLE_DEOXYS, - BGM_FRLG_BATTLE_MEWTWO, - BGM_FRLG_BATTLE_LEGENDARY, - BGM_FRLG_LEADER_EYE, - BGM_FRLG_DEOXYS_EYE, - BGM_FRLG_TRAINER_TOWER, - BGM_FRLG_HALL_OF_FAME_PALLET_TOWN, - /*0x22E*/BGM_FRLG_TEACHY_TV, + /*0x227*/ BGM_FRLG_BATTLE_DEOXYS, + /*0x228*/ BGM_FRLG_BATTLE_MEWTWO, + /*0x229*/ BGM_FRLG_BATTLE_LEGENDARY, + /*0x22A*/ BGM_FRLG_LEADER_EYE, + /*0x22B*/ BGM_FRLG_DEOXYS_EYE, + /*0x22C*/ BGM_FRLG_TRAINER_TOWER, + /*0x22D*/ BGM_FRLG_HALL_OF_FAME_PALLET_TOWN, + /*0x22E*/ BGM_FRLG_TEACHY_TV, + PH_TRAP_BLEND, + PH_TRAP_HELD, + PH_TRAP_SOLO, + PH_FACE_BLEND, + PH_FACE_HELD, + PH_FACE_SOLO, + PH_CLOTH_BLEND, + PH_CLOTH_HELD, + PH_CLOTH_SOLO, + PH_DRESS_BLEND, + PH_DRESS_HELD, + PH_DRESS_SOLO, + PH_FLEECE_BLEND, + PH_FLEECE_HELD, + PH_FLEECE_SOLO, + PH_KIT_BLEND, + PH_KIT_HELD, + PH_KIT_SOLO, + PH_PRICE_BLEND, + PH_PRICE_HELD, + PH_PRICE_SOLO, + PH_LOT_BLEND, + PH_LOT_HELD, + PH_LOT_SOLO, + PH_GOAT_BLEND, + PH_GOAT_HELD, + PH_GOAT_SOLO, + PH_THOUGHT_BLEND, + PH_THOUGHT_HELD, + PH_THOUGHT_SOLO, + PH_CHOICE_BLEND, + PH_CHOICE_HELD, + PH_CHOICE_SOLO, + PH_MOUTH_BLEND, + PH_MOUTH_HELD, + PH_MOUTH_SOLO, + PH_FOOT_BLEND, + PH_FOOT_HELD, + PH_FOOT_SOLO, + PH_GOOSE_BLEND, + PH_GOOSE_HELD, + PH_GOOSE_SOLO, + PH_STRUT_BLEND, + PH_STRUT_HELD, + PH_STRUT_SOLO, + PH_CURE_BLEND, + PH_CURE_HELD, + PH_CURE_SOLO, + PH_NURSE_BLEND, + PH_NURSE_HELD, + PH_NURSE_SOLO, }; #endif // GUARD_SONGS_H diff --git a/include/strings.h b/include/strings.h index a2745d382..5521d828b 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1,45 +1,62 @@ #ifndef GUARD_STRINGS_H #define GUARD_STRINGS_H -// Exported type declarations - -// Exported RAM declarations - -// Exported ROM declarations - extern const u8 gText_FromSpace[]; + extern const u8 gText_Lv50[]; extern const u8 gText_OpenLevel[]; + extern const u8 gText_Mom[]; extern const u8 gText_Dad[]; + extern const u8 gText_Cool[]; extern const u8 gText_Beauty[]; extern const u8 gText_Cute[]; extern const u8 gText_Smart[]; extern const u8 gText_Tough[]; + extern const u8 gText_Single[]; extern const u8 gText_Double[]; + +extern const u8 gText_Spicy[]; +extern const u8 gText_Dry[]; +extern const u8 gText_Sweet[]; +extern const u8 gText_Bitter[]; +extern const u8 gText_Sour[]; + +extern const u8 gText_StowCase[]; +extern const u8 gText_LvVar1[]; + extern const u8 gText_Spicy2[]; extern const u8 gText_Dry2[]; extern const u8 gText_Sweet2[]; extern const u8 gText_Bitter2[]; extern const u8 gText_Sour2[]; + extern const u8 gText_Excellent[]; extern const u8 gText_VeryGood[]; extern const u8 gText_Good[]; extern const u8 gText_SoSo[]; extern const u8 gText_Bad[]; extern const u8 gText_TheWorst[]; + extern const u8 gText_Slots[]; extern const u8 gText_Roulette[]; extern const u8 gText_Jackpot[]; + extern const u8 gText_First[]; extern const u8 gText_Second[]; extern const u8 gText_Third[]; + extern const u8 gText_NoDecorations[]; extern const u8 gText_NoDecorationsInUse[]; + extern const u8 gText_Exit[]; extern const u8 gText_Cancel[]; + +extern const u8 gText_ThrowAwayVar1[]; +extern const u8 gText_Var1ThrownAway[]; + extern const u8 gText_Color161Shadow161[]; extern const u8 gText_GoBackPrevMenu[]; extern const u8 gText_CantPlaceInRoom[]; @@ -56,12 +73,14 @@ extern const u8 gText_NoDecorationHere[]; extern const u8 gText_DecorationWillBeDiscarded[]; extern const u8 gText_CantThrowAwayInUse[]; extern const u8 gText_DecorationThrownAway[]; + extern const u8 gText_Desk[]; extern const u8 gText_Chair[]; extern const u8 gText_Plant[]; extern const u8 gText_Ornament[]; extern const u8 gText_Mat[]; extern const u8 gText_Poster[]; + extern const u8 gText_PutOutSelectedDecorItem[]; extern const u8 gText_StoreChosenDecorInPC[]; extern const u8 gText_ThrowAwayUnwantedDecors[]; @@ -82,7 +101,40 @@ extern const u8 gText_NoRegistry[]; extern const u8 gText_OkayToDeleteFromRegistry[]; extern const u8 gText_RegisteredDataDeleted[]; extern const u8 gUnknown_085EA79D[]; +extern const u8 gText_EmptyString2[]; +extern const u8 gText_Confirm3[]; +extern const u8 gText_Cancel4[]; +extern const u8 gText_IsThisTheCorrectTime[]; extern const u8 gText_PkmnFainted3[]; extern const u8 gText_Coins[]; +extern const u8 gText_Draw[]; +extern const u8 gText_Loss[]; +extern const u8 gText_Win[]; + +extern const u8 gText_Var1AteTheVar2[]; +extern const u8 gText_Var1HappilyAteVar2[]; +extern const u8 gText_Var1DisdainfullyAteVar2[]; + +extern const u8 gText_RedPokeblock[]; +extern const u8 gText_BluePokeblock[]; +extern const u8 gText_PinkPokeblock[]; +extern const u8 gText_GreenPokeblock[]; +extern const u8 gText_YellowPokeblock[]; +extern const u8 gText_PurplePokeblock[]; +extern const u8 gText_IndigoPokeblock[]; +extern const u8 gText_BrownPokeblock[]; +extern const u8 gText_LiteBluePokeblock[]; +extern const u8 gText_OlivePokeblock[]; +extern const u8 gText_GrayPokeblock[]; +extern const u8 gText_BlackPokeblock[]; +extern const u8 gText_WhitePokeblock[]; +extern const u8 gText_GoldPokeblock[]; + +extern const u8 gMenuText_Use[]; +extern const u8 gMenuText_Toss[]; +extern const u8 gMenuText_Give[]; +extern const u8 gMenuText_Give2[]; + +extern const u8 gText_Cancel2[]; #endif //GUARD_STRINGS_H diff --git a/include/text_window.h b/include/text_window.h index da3fb301e..0af007397 100644 --- a/include/text_window.h +++ b/include/text_window.h @@ -3,8 +3,8 @@ struct TilesPal { - u32* tiles; - u16* pal; + u32 *tiles; + u16 *pal; }; const struct TilesPal* sub_8098758(u8 id); diff --git a/include/trainer_classes.h b/include/trainer_classes.h deleted file mode 100644 index e5e26b359..000000000 --- a/include/trainer_classes.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef GUARD_TRAINER_CLASSES_H -#define GUARD_TRAINER_CLASSES_H - -enum -{ - CLASS_PKMN_TRAINER0, // 0 - CLASS_PKMN_TRAINER1, // 1 - CLASS_HIKER, // 2 - CLASS_TEAM_AQUA, // 3 - CLASS_PKMN_BREEDER, // 4 - CLASS_COOLTRAINER, // 5 - CLASS_BIRDKEEPER, // 6 - CLASS_COLLECTOR, // 7 - CLASS_SWIMMER_MALE, // 8 - CLASS_TEAM_MAGMA, // 9 - CLASS_EXPERT, // 0xA - CLASS_AQUA_ADMIN, // 0xB - CLASS_BLACK_BELT, // 0xC - CLASS_AQUA_LEADER, // 0xD - CLASS_HEX_MANIAC, // 0xE - CLASS_AROMA_LADY, // 0xF - CLASS_RUIN_MANIAC, // 0x10 - CLASS_INTERVIEWER, // 0x11 - CLASS_TUBER_FEMALE, // 0x12 - CLASS_TUBER_MALE, // 0x13 - CLASS_LADY, // 0x14 - CLASS_BEAUTY, // 0x15 - CLASS_RICH_BOY, // 0x16 - CLASS_POKEMANIAC, // 0x17 - CLASS_GUITARIST, // 0x18 - CLASS_KINDLER, // 0x19 - CLASS_CAMPER, // 0x1A - CLASS_PICKNICKER, // 0x1B - CLASS_BUG_MANIAC, // 0x1C - CLASS_PSYCHIC, // 0x1D - CLASS_GENTLEMAN, // 0x1E - CLASS_ELITE_FOUR, // 0x1F - CLASS_LEADER, // 0x20 - CLASS_SCHOOL_KID, // 0x21 - CLASS_SCHOOL_SR_JR, // 0x22 - CLASS_WINSTRATE, // 0x23 - CLASS_POKE_FAN, // 0x24 - CLASS_YOUNGSTER, // 0x25 - CLASS_CHAMPION, // 0x26 - CLASS_FISHERMAN, // 0x27 - CLASS_TRIATHLETE, // 0x28 - CLASS_DRAGON_TAMER, // 0x29 - CLASS_NINJA_BOY, // 0x2A - CLASS_BATTLE_GIRL, // 0x2B - CLASS_PARASOL_LADY, // 0x2C - CLASS_SWIMMER_FEMALE, // 0x2D - CLASS_TWINS, // 0x2E - CLASS_SAILOR, // 0x2F - CLASS_COOLTRAINER_2, // 0x30 - CLASS_MAGMA_ADMIN, // 0x31 - CLASS_PKMN_TRAINER_RIVAL, // 0x32 - CLASS_BUG_CATCHER, // 0x33 - CLASS_PKMN_RANGER, // 0x34 - CLASS_MAGMA_LEADER, // 0x35 - CLASS_LASS, // 0x36 - CLASS_YOUNG_COUPLE, // 0x37 - CLASS_OLD_COUPLE, // 0x38 - CLASS_SIS_AND_BRO, // 0x39 - CLASS_SALON_MAIDEN, // 0x3A - CLASS_DOME_ACE, // 0x3B - CLASS_PALACE_MAVEN, // 0x3C - CLASS_ARENA_TYCOON, // 0x3D - CLASS_FACTORY_HEAD, // 0x3E - CLASS_PIKE_QUEEN, // 0x3F - CLASS_PYRAMID_KING, // 0x40 - CLASS_PKMN_TRAINER2, // 0x41 -}; - -#endif // GUARD_TRAINER_CLASSES_H diff --git a/include/trainer_front_sprites.h b/include/trainer_front_sprites.h deleted file mode 100644 index 3259bec88..000000000 --- a/include/trainer_front_sprites.h +++ /dev/null @@ -1,101 +0,0 @@ -#ifndef GUARD_TRAINER_FRONT_SPRITES_H -#define GUARD_TRAINER_FRONT_SPRITES_H - -enum -{ - TRAINER_FRONT_PIC_HIKER, - TRAINER_FRONT_PIC_AQUA_GRUNT_M, - TRAINER_FRONT_PIC_PKMN_BREEDER_F, - TRAINER_FRONT_PIC_COOLTRAINER_M, - TRAINER_FRONT_PIC_BIRD_KEEPER, - TRAINER_FRONT_PIC_COLLECTOR, - TRAINER_FRONT_PIC_AQUA_GRUNT_F, - TRAINER_FRONT_PIC_SWIMMER_M, - TRAINER_FRONT_PIC_MAGMA_GRUNT_M, - TRAINER_FRONT_PIC_EXPERT_M, - TRAINER_FRONT_PIC_AQUA_ADMIN_M, - TRAINER_FRONT_PIC_BLACK_BELT, - TRAINER_FRONT_PIC_AQUA_ADMIN_F, - TRAINER_FRONT_PIC_AQUA_LEADER, - TRAINER_FRONT_PIC_HEX_MANIAC, - TRAINER_FRONT_PIC_AROMA_LADY, - TRAINER_FRONT_PIC_RUIN_MANIAC, - TRAINER_FRONT_PIC_INTERVIEWER, - TRAINER_FRONT_PIC_TUBER_F, - TRAINER_FRONT_PIC_TUBER_M, - TRAINER_FRONT_PIC_COOLTRAINER_F, - TRAINER_FRONT_PIC_LADY, - TRAINER_FRONT_PIC_BEAUTY, - TRAINER_FRONT_PIC_RICH_BOY, - TRAINER_FRONT_PIC_EXPERT_F, - TRAINER_FRONT_PIC_POKE_MANIAC, - TRAINER_FRONT_PIC_MAGMA_GRUNT_F, - TRAINER_FRONT_PIC_GUITARIST, - TRAINER_FRONT_PIC_KINDLER, - TRAINER_FRONT_PIC_CAMPER, - TRAINER_FRONT_PIC_PICNICKER, - TRAINER_FRONT_PIC_BUG_MANIAC, - TRAINER_FRONT_PIC_PKMN_BREEDER_M, - TRAINER_FRONT_PIC_PSYCHIC_M, - TRAINER_FRONT_PIC_PSYCHIC_F, - TRAINER_FRONT_PIC_GENTLEMAN, - TRAINER_FRONT_PIC_SIDNEY, - TRAINER_FRONT_PIC_PHOEBE, - TRAINER_FRONT_PIC_GLACIA, - TRAINER_FRONT_PIC_DRAKE, - TRAINER_FRONT_PIC_ROXANNE, - TRAINER_FRONT_PIC_BRAWLY, - TRAINER_FRONT_PIC_WATTSON, - TRAINER_FRONT_PIC_FLANNERY, - TRAINER_FRONT_PIC_NORMAN, - TRAINER_FRONT_PIC_WINONA, - TRAINER_FRONT_PIC_TATE_LIZA, - TRAINER_FRONT_PIC_JUAN, - TRAINER_FRONT_PIC_SCHOOL_KID_M, - TRAINER_FRONT_PIC_SCHOOL_KID_F, - TRAINER_FRONT_PIC_SR_JR, - TRAINER_FRONT_PIC_POKFAN_M, - TRAINER_FRONT_PIC_POKFAN_F, - TRAINER_FRONT_PIC_YOUNGSTER, - TRAINER_FRONT_PIC_WALLACE, - TRAINER_FRONT_PIC_FISHERMAN, - TRAINER_FRONT_PIC_TRIATHLETE_BIKER_M, - TRAINER_FRONT_PIC_TRIATHLETE_BIKER_F, - TRAINER_FRONT_PIC_TRIATHLETE_JOGGER_M, - TRAINER_FRONT_PIC_TRIATHLETE_JOGGER_F, - TRAINER_FRONT_PIC_TRIATHLETE_SWIMMER_M, - TRAINER_FRONT_PIC_TRIATHLETE_SWIMMER_F, - TRAINER_FRONT_PIC_DRAGON_TAMER, - TRAINER_FRONT_PIC_NINJA_BOY, - TRAINER_FRONT_PIC_BATTLE_GIRL, - TRAINER_FRONT_PIC_PARASOL_LADY, - TRAINER_FRONT_PIC_SWIMMER_F, - TRAINER_FRONT_PIC_TWINS, - TRAINER_FRONT_PIC_SAILOR, - TRAINER_FRONT_PIC_MAGMA_ADMIN_M, - TRAINER_FRONT_PIC_WALLY, - TRAINER_FRONT_PIC_BRENDAN_E, - TRAINER_FRONT_PIC_MAY_E, - TRAINER_FRONT_PIC_BUG_CATCHER, - TRAINER_FRONT_PIC_PKMN_RANGER_M, - TRAINER_FRONT_PIC_PKMN_RANGER_F, - TRAINER_FRONT_PIC_MAGMA_LEADER, - TRAINER_FRONT_PIC_LASS, - TRAINER_FRONT_PIC_YOUNG_COUPLE, - TRAINER_FRONT_PIC_OLD_COUPLE, - TRAINER_FRONT_PIC_SIS_AND_BRO, - TRAINER_FRONT_PIC_STEVEN, - TRAINER_FRONT_PIC_ANABEL, - TRAINER_FRONT_PIC_TUCKER, - TRAINER_FRONT_PIC_SPENSER, - TRAINER_FRONT_PIC_GRETA, - TRAINER_FRONT_PIC_NOLAND, - TRAINER_FRONT_PIC_LUCY, - TRAINER_FRONT_PIC_BRANDON, - TRAINER_FRONT_PIC_RED, - TRAINER_FRONT_PIC_LEAF, - TRAINER_FRONT_PIC_BRENDAN_RS, - TRAINER_FRONT_PIC_MAY_RS -}; - -#endif // GUARD_TRAINER_FRONT_SPRITES_H diff --git a/include/trainer_ids.h b/include/trainer_ids.h deleted file mode 100644 index 65c80187f..000000000 --- a/include/trainer_ids.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef GUARD_TRAINER_IDS_H -#define GUARD_TRAINER_IDS_H - -#define NO_OF_TRAINERS 854 -#define TRAINER_ID_STEVEN 804 - -#endif // GUARD_TRAINER_IDS_H diff --git a/include/trainer_see.h b/include/trainer_see.h index ab035d9f8..847380782 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -1,8 +1,30 @@ #ifndef GUARD_TRAINER_SEE_H #define GUARD_TRAINER_SEE_H -void sub_80B4578(struct MapObject *); -u8 sub_80B47BC(void); -void sub_8155D78(struct MapObject *); +struct ApproachingTrainer +{ + u8 mapObjectId; + u8 radius; // plus 1 + const u8 *trainerScriptPtr; + u8 taskId; +}; -#endif //GUARD_TRAINER_SEE_H +extern u16 gUnknown_03006080; +extern u8 gUnknown_03006084[4]; +extern struct ApproachingTrainer gApproachingTrainers[2]; +extern u8 gNoOfApproachingTrainers; +extern u8 gUnknown_030060AC; +extern u8 gApproachingTrainerId; + +bool8 CheckForTrainersWantingBattle(void); +void sub_80B4578(struct MapObject *var); +void EndTrainerApproach(void); +void sub_80B45D0(void); +u8 FldEff_ExclamationMarkIcon1(void); +u8 FldEff_ExclamationMarkIcon2(void); +u8 FldEff_HeartIcon(void); +u8 GetCurrentApproachingTrainerMapObjectId(void); +u8 GetChosenApproachingTrainerMapObjectId(u8 arrayId); +void sub_80B4808(void); + +#endif // GUARD_TRAINER_SEE_H diff --git a/include/tv.h b/include/tv.h index 75338704f..eca11385e 100644 --- a/include/tv.h +++ b/include/tv.h @@ -15,5 +15,6 @@ void sub_80F14F8(TVShow *shows); size_t sub_80EF370(int value); bool8 Put3CheersForPokeblocksOnTheAir(const u8 *partnersName, u8 flavor, u8 unused, u8 sheen, u8 language); void SetPokemonAnglerSpecies(u16 species); +void UpdateTVShowsPerDay(u16 days); #endif //GUARD_TV_H diff --git a/include/wallclock.h b/include/wallclock.h new file mode 100644 index 000000000..48697c19f --- /dev/null +++ b/include/wallclock.h @@ -0,0 +1,6 @@ +#ifndef GUARD_WALLCLOCK_H +#define GUARD_WALLCLOCK_H + +void Cb2_StartWallClock(void); + +#endif //GUARD_WALLCLOCK_H diff --git a/ld_script.txt b/ld_script.txt index b1cafb74b..19a5f46fe 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -56,7 +56,8 @@ SECTIONS { asm/main_menu.o(.text); src/battle_controllers.o(.text); src/decompress.o(.text); - asm/battle_1.o(.text); + asm/rom_8034C54.o(.text); + src/battle_bg.o(.text); src/battle_2.o(.text); src/battle_util.o(.text); src/battle_script_commands.o(.text); @@ -105,7 +106,7 @@ SECTIONS { src/event_data.o(.text); asm/coord_event_weather.o(.text); asm/field_tasks.o(.text); - asm/clock.o(.text); + src/clock.o(.text); asm/reset_rtc_screen.o(.text); src/start_menu.o(.text); asm/start_menu.o(.text); @@ -119,9 +120,9 @@ SECTIONS { asm/battle_anim_80A9C70.o(.text); asm/title_screen.o(.text); asm/field_screen.o(.text); - asm/battle_setup.o(.text); + src/battle_setup.o(.text); asm/cable_club.o(.text); - asm/trainer_see.o(.text); + src/trainer_see.o(.text); src/wild_encounter.o(.text); asm/field_effect.o(.text); asm/unknown_task.o(.text); @@ -133,7 +134,7 @@ SECTIONS { asm/pokemon_icon.o(.text); asm/script_movement.o(.text); asm/fldeff_cut.o(.text); - asm/mail_data.o(.text); + src/mail_data.o(.text); asm/map_name_popup.o(.text); asm/item_menu_icons.o(.text); asm/battle_anim_80D51AC.o(.text); @@ -176,8 +177,10 @@ SECTIONS { src/battle_ai_script_commands.o(.text); asm/trader.o(.text); src/starter_choose.o(.text); - asm/wallclock.o(.text); + src/wallclock.o(.text); asm/rom6.o(.text); + src/pokeblock.o(.text); + asm/rom_81370FC.o(.text); asm/battle_records.o(.text); asm/pokedex_area_screen.o(.text); src/evolution_scene.o(.text); @@ -206,6 +209,7 @@ SECTIONS { src/decoration_inventory.o(.text); src/roamer.o(.text); asm/battle_tower.o(.text); + src/use_pokeblock.o(.text); asm/use_pokeblock.o(.text); src/battle_controller_wally.o(.text); asm/player_pc.o(.text); @@ -221,7 +225,7 @@ SECTIONS { asm/mystery_event_menu.o(.text); src/save_failed_screen.o(.text); src/braille_puzzles.o(.text); - asm/pokeblock_feed.o(.text); + src/pokeblock_feed.o(.text); src/clear_save_data_screen.o(.text); asm/intro_credits_graphics.o(.text); src/evolution_graphics.o(.text); @@ -376,9 +380,9 @@ SECTIONS { data/battle_anim_80A9C70.o(.rodata); data/title_screen.o(.rodata); data/field_screen.o(.rodata); - data/battle_setup.o(.rodata); + src/battle_setup.o(.rodata); data/cable_club.o(.rodata); - data/trainer_see.o(.rodata); + src/trainer_see.o(.rodata); data/wild_encounter.o(.rodata); data/field_effect.o(.rodata); data/option_menu.o(.rodata); @@ -422,7 +426,9 @@ SECTIONS { src/battle_ai_script_commands.o(.rodata); data/data4.o(.rodata); data/starter_choose.o(.rodata); - data/data4c.o(.rodata); + src/wallclock.o(.rodata); + src/pokeblock.o(.rodata); + data/data4d.o(.rodata); src/battle_controller_link_partner.o(.rodata); src/battle_message.o(.rodata); data/cable_car.o(.rodata); @@ -434,6 +440,7 @@ SECTIONS { data/learn_move.o(.rodata); src/roamer.o(.rodata); data/battle_tower.o(.rodata); + src/use_pokeblock.o(.rodata); data/use_pokeblock.o(.rodata); src/battle_controller_wally.o(.rodata); data/player_pc.o(.rodata); @@ -449,7 +456,7 @@ SECTIONS { data/mystery_event_menu.o(.rodata); src/save_failed_screen.o(.rodata); data/braille_puzzles.o(.rodata); - data/pokeblock_feed.o(.rodata); + src/pokeblock_feed.o(.rodata); src/clear_save_data_screen.o(.rodata); data/intro_credits_graphics.o(.rodata); src/evolution_graphics.o(.rodata); diff --git a/src/battle_2.c b/src/battle_2.c index 52530f6b3..f8b4113f0 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -17,6 +17,7 @@ #include "item.h" #include "constants/items.h" #include "constants/hold_effects.h" +#include "constants/trainers.h" #include "link.h" #include "bg.h" #include "dma3.h" @@ -38,7 +39,6 @@ #include "pokedex.h" #include "constants/abilities.h" #include "constants/moves.h" -#include "trainer_classes.h" #include "evolution_scene.h" #include "roamer.h" #include "tv.h" @@ -152,7 +152,7 @@ extern u8 gUnknown_020241E9; extern u16 gChosenMove; extern const struct BattleMove gBattleMoves[]; -extern const u16 gUnknown_08C004E0[]; // battle textbox palette +extern const u16 gBattleTextboxPalette[]; // battle textbox palette extern const struct BgTemplate gUnknown_0831AA08[]; extern const struct WindowTemplate * const gUnknown_0831ABA0[]; extern const u8 gUnknown_0831ACE0[]; @@ -185,7 +185,7 @@ extern void sub_80356D0(void); extern void GetFrontierTrainerName(u8* dst, u16 trainerId); // battle tower extern void sub_8166188(void); // battle tower, sets link battle mons level but why? extern void sub_8165B88(u8* dst, u16 trainerId); // battle tower, gets language -extern void sub_81DB4DC(u8* dst, u8 arg2); // +extern void PadNameString(u8* dst, u8 arg2); // extern void sub_81B9150(void); extern void sub_800AC34(void); extern void sub_80B3AF8(u8 taskId); // cable club @@ -415,7 +415,7 @@ static void CB2_InitBattleInternal(void) gBattleTerrain = BattleSetup_GetTerrainId(); if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) - gBattleTerrain = BATTLE_TERRAIN_INSIDE; + gBattleTerrain = BATTLE_TERRAIN_BUILDING; sub_80356D0(); LoadBattleTextboxAndBackground(); @@ -754,7 +754,7 @@ static void CB2_HandleStartBattle(void) ResetBlockReceivedFlags(); sub_8036EB8(2, playerMultiplayerId); SetAllPlayersBerryData(); - taskId = CreateTask(task00_0800F6FC, 0); + taskId = CreateTask(sub_8035D74, 0); gTasks[taskId].data[1] = 0x10E; gTasks[taskId].data[2] = 0x5A; gTasks[taskId].data[5] = 0; @@ -956,7 +956,7 @@ static void CB2_HandleStartMultiPartnerBattle(void) ResetBlockReceivedFlags(); sub_8036EB8(2, playerMultiplayerId); SetAllPlayersBerryData(); - taskId = CreateTask(task00_0800F6FC, 0); + taskId = CreateTask(sub_8035D74, 0); gTasks[taskId].data[1] = 0x10E; gTasks[taskId].data[2] = 0x5A; gTasks[taskId].data[5] = 0; @@ -1140,7 +1140,7 @@ static void sub_80379F8(u8 arrayIdPlus) gUnknown_02022FF8[i].gender = GetMonGender(&gPlayerParty[arrayIdPlus + i]); StripExtCtrlCodes(gUnknown_02022FF8[i].nickname); if (GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_LANGUAGE) != LANGUAGE_JAPANESE) - sub_81DB4DC(gUnknown_02022FF8[i].nickname, 0); + PadNameString(gUnknown_02022FF8[i].nickname, CHAR_SPACE); } memcpy(gUnknown_02023058, gUnknown_02022FF8, sizeof(gUnknown_02022FF8)); } @@ -1342,7 +1342,7 @@ static void CB2_HandleStartMultiBattle(void) sub_8036EB8(4, playerMultiplayerId); SetAllPlayersBerryData(); sub_8068AA4(); - var = CreateTask(task00_0800F6FC, 0); + var = CreateTask(sub_8035D74, 0); gTasks[var].data[1] = 0x10E; gTasks[var].data[2] = 0x5A; gTasks[var].data[5] = 0; @@ -1718,7 +1718,7 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir { const struct TrainerMonNoItemDefaultMoves *partyData = gTrainers[trainerNum].party.NoItemDefaultMoves; - for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++) + for (j = 0; gSpeciesNames[partyData[i].species][j] != EOS; j++) nameHash += gSpeciesNames[partyData[i].species][j]; personalityValue += nameHash << 8; @@ -1726,11 +1726,11 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir CreateMon(&party[i], partyData[i].species, partyData[i].lvl, fixedIV, TRUE, personalityValue, OT_ID_RANDOM_NO_SHINY, 0); break; } - case PARTY_FLAG_CUSTOM_MOVES: + case F_TRAINER_PARTY_CUSTOM_MOVESET: { const struct TrainerMonNoItemCustomMoves *partyData = gTrainers[trainerNum].party.NoItemCustomMoves; - for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++) + for (j = 0; gSpeciesNames[partyData[i].species][j] != EOS; j++) nameHash += gSpeciesNames[partyData[i].species][j]; personalityValue += nameHash << 8; @@ -1744,11 +1744,11 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir } break; } - case PARTY_FLAG_HAS_ITEM: + case F_TRAINER_PARTY_HELD_ITEM: { const struct TrainerMonItemDefaultMoves *partyData = gTrainers[trainerNum].party.ItemDefaultMoves; - for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++) + for (j = 0; gSpeciesNames[partyData[i].species][j] != EOS; j++) nameHash += gSpeciesNames[partyData[i].species][j]; personalityValue += nameHash << 8; @@ -1758,11 +1758,11 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir SetMonData(&party[i], MON_DATA_HELD_ITEM, &partyData[i].heldItem); break; } - case PARTY_FLAG_CUSTOM_MOVES | PARTY_FLAG_HAS_ITEM: + case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM: { const struct TrainerMonItemCustomMoves *partyData = gTrainers[trainerNum].party.ItemCustomMoves; - for (j = 0; gSpeciesNames[partyData[i].species][j] != 0xFF; j++) + for (j = 0; gSpeciesNames[partyData[i].species][j] != EOS; j++) nameHash += gSpeciesNames[partyData[i].species][j]; personalityValue += nameHash << 8; @@ -1978,7 +1978,7 @@ void sub_8038D64(void) gBattle_BG3_Y = 0; sub_80356D0(); - LoadCompressedPalette(gUnknown_08C004E0, 0, 64); + LoadCompressedPalette(gBattleTextboxPalette, 0, 64); ApplyPlayerChosenFrameToBattleMenu(); ResetSpriteData(); ResetTasks(); @@ -1988,7 +1988,7 @@ void sub_8038D64(void) gReservedSpritePaletteCount = 4; SetVBlankCallback(VBlankCB_Battle); - taskId = CreateTask(task00_0800F6FC, 0); + taskId = CreateTask(sub_8035D74, 0); gTasks[taskId].data[1] = 0x10E; gTasks[taskId].data[2] = 0x5A; gTasks[taskId].data[5] = 1; @@ -4749,19 +4749,19 @@ static void HandleEndTurn_BattleWon(void) switch (gTrainers[gTrainerBattleOpponent_A].trainerClass) { - case CLASS_ELITE_FOUR: - case CLASS_CHAMPION: + case TRAINER_CLASS_ELITE_FOUR: + case TRAINER_CLASS_CHAMPION: PlayBGM(BGM_KACHI5); break; - case CLASS_TEAM_AQUA: - case CLASS_TEAM_MAGMA: - case CLASS_AQUA_ADMIN: - case CLASS_AQUA_LEADER: - case CLASS_MAGMA_ADMIN: - case CLASS_MAGMA_LEADER: + case TRAINER_CLASS_TEAM_AQUA: + case TRAINER_CLASS_TEAM_MAGMA: + case TRAINER_CLASS_AQUA_ADMIN: + case TRAINER_CLASS_AQUA_LEADER: + case TRAINER_CLASS_MAGMA_ADMIN: + case TRAINER_CLASS_MAGMA_LEADER: PlayBGM(BGM_KACHI4); break; - case CLASS_LEADER: + case TRAINER_CLASS_LEADER: PlayBGM(BGM_KACHI3); break; default: diff --git a/src/battle_bg.c b/src/battle_bg.c new file mode 100644 index 000000000..82355273b --- /dev/null +++ b/src/battle_bg.c @@ -0,0 +1,754 @@ +#include "global.h" +#include "battle.h" +#include "sprite.h" +#include "constants/trainers.h" +#include "graphics.h" +#include "decompress.h" +#include "bg.h" +#include "palette.h" +#include "main.h" +#include "gpu_regs.h" +#include "link.h" +#include "battle_message.h" +#include "task.h" +#include "trig.h" +#include "sound.h" +#include "songs.h" +#include "strings.h" +#include "window.h" +#include "text_window.h" +#include "new_menu_helpers.h" + +struct BattleBackground +{ + const void *tileset; + const void *tilemap; + const void *entryTileset; + const void *entryTilemap; + const void *palette; +}; + +extern const struct SpriteTemplate gUnknown_0831A9D0; +extern const struct SpriteTemplate gUnknown_0831A9E8; +extern const struct CompressedSpriteSheet gUnknown_0831AA00; +extern const struct BgTemplate gUnknown_0831AA08[4]; +extern const struct WindowTemplate *gUnknown_0831ABA0[]; +extern const struct BattleBackground gBattleTerrainTable[]; + +extern u8 gBattleTerrain; +extern u16 gTrainerBattleOpponent_A; +extern u16 gBattle_BG1_X; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG2_X; +extern u16 gBattle_BG2_Y; +extern u16 gPartnerTrainerId; + +extern u8 GetCurrentMapBattleScene(void); + +void sub_8035658(void) +{ + ResetBgsAndClearDma3BusyFlags(0); + InitBgsFromTemplates(0, gUnknown_0831AA08, ARRAY_COUNT(gUnknown_0831AA08)); + + if (gBattleTypeFlags & BATTLE_TYPE_ARENA) + { + gBattleScripting.field_24 = 1; + SetBgTilemapBuffer(1, gUnknown_02023060); + SetBgTilemapBuffer(2, gUnknown_02023060); + } + else + { + gBattleScripting.field_24 = 0; + } + + InitWindows(gUnknown_0831ABA0[gBattleScripting.field_24]); + DeactivateAllTextPrinters(); +} + +void sub_80356D0(void) +{ + DisableInterrupts(INTR_FLAG_HBLANK); + EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_VCOUNT | INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL); + sub_8035658(); + SetGpuReg(REG_OFFSET_BLDCNT, 0); + SetGpuReg(REG_OFFSET_BLDALPHA, 0); + SetGpuReg(REG_OFFSET_BLDY, 0); + SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJWIN_ON | DISPCNT_WIN0_ON | DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); +} + +void ApplyPlayerChosenFrameToBattleMenu(void) +{ + sub_809882C(2, 0x12, 0x10); + sub_809882C(2, 0x22, 0x10); + LoadCompressedPalette(gUnknown_08D85600, 0x50, 0x20); + + if (gBattleTypeFlags & BATTLE_TYPE_ARENA) + { + sub_81978B0(0x70); + copy_textbox_border_tile_patterns_to_vram(0, 0x30, 0x70); + gPlttBufferUnfaded[0x76] = 0; + CpuCopy16(&gPlttBufferUnfaded[0x76], &gPlttBufferFaded[0x76], 2); + } +} + +void DrawMainBattleBackground(void) +{ + if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_x2000000)) + { + LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000)); + LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60); + } + else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON) + { + LZDecompressVram(gBattleTerrainTiles_Cave, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTilemap_Cave, (void*)(VRAM + 0xD000)); + LoadCompressedPalette(gBattleTerrainPalette_Groudon, 0x20, 0x60); + } + else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE) + { + LZDecompressVram(gBattleTerrainTiles_Water, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTilemap_Water, (void*)(VRAM + 0xD000)); + LoadCompressedPalette(gBattleTerrainPalette_Kyogre, 0x20, 0x60); + } + else if (gBattleTypeFlags & BATTLE_TYPE_RAYQUAZA) + { + LZDecompressVram(gBattleTerrainTiles_Rayquaza, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTilemap_Rayquaza, (void*)(VRAM + 0xD000)); + LoadCompressedPalette(gBattleTerrainPalette_Rayquaza, 0x20, 0x60); + } + else + { + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) + { + u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass; + if (trainerClass == TRAINER_CLASS_LEADER) + { + LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000)); + LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, 0x20, 0x60); + return; + } + else if (trainerClass == TRAINER_CLASS_CHAMPION) + { + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, 0x20, 0x60); + return; + } + } + + switch (GetCurrentMapBattleScene()) + { + default: + case MAP_BATTLE_SCENE_NORMAL: + LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tileset, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tilemap, (void*)(VRAM + 0xD000)); + LoadCompressedPalette(gBattleTerrainTable[gBattleTerrain].palette, 0x20, 0x60); + break; + case MAP_BATTLE_SCENE_GYM: + LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000)); + LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, 0x20, 0x60); + break; + case MAP_BATTLE_SCENE_MAGMA: + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, 0x20, 0x60); + break; + case MAP_BATTLE_SCENE_AQUA: + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, 0x20, 0x60); + break; + case MAP_BATTLE_SCENE_SIDNEY: + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, 0x20, 0x60); + break; + case MAP_BATTLE_SCENE_PHOEBE: + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, 0x20, 0x60); + break; + case MAP_BATTLE_SCENE_GLACIA: + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, 0x20, 0x60); + break; + case MAP_BATTLE_SCENE_DRAKE: + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, 0x20, 0x60); + break; + case MAP_BATTLE_SCENE_FRONTIER: + LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000)); + LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000)); + LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60); + break; + } + } +} + +void LoadBattleTextboxAndBackground(void) +{ + LZDecompressVram(gBattleTextboxTiles, (void*)(VRAM)); + CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0); + CopyBgTilemapBufferToVram(0); + LoadCompressedPalette(gBattleTextboxPalette, 0, 0x40); + ApplyPlayerChosenFrameToBattleMenu(); + + DrawMainBattleBackground(); +} + +static void sub_8035AE4(u8 taskId, u8 bank, u8 bgId, u8 destX, u8 destY) +{ + s32 i; + u16 var = 0; + u16 src[6]; + + if (gBattleTypeFlags & BATTLE_TYPE_MULTI) + { + if (gTasks[taskId].data[5] != 0) + { + switch (bank) + { + case 0: + var = 0x3F & gTasks[taskId].data[3]; + break; + case 1: + var = (0xFC0 & gTasks[taskId].data[4]) >> 6; + break; + case 2: + var = (0xFC0 & gTasks[taskId].data[3]) >> 6; + break; + case 3: + var = 0x3F & gTasks[taskId].data[4]; + break; + } + } + else + { + switch (bank) + { + case 0: + var = 0x3F & gTasks[taskId].data[3]; + break; + case 1: + var = 0x3F & gTasks[taskId].data[4]; + break; + case 2: + var = (0xFC0 & gTasks[taskId].data[3]) >> 6; + break; + case 3: + var = (0xFC0 & gTasks[taskId].data[4]) >> 6; + break; + } + } + + for (i = 0; i < 3; i++) + { + src[i] = ((var & (3 << (i * 2))) >> (i * 2)) + 0x6001; + } + + CopyToBgTilemapBufferRect_ChangePalette(bgId, src, destX, destY, 3, 1, 0x11); + CopyBgTilemapBufferToVram(bgId); + } + else + { + if (bank == gBattleScripting.multiplayerId) + var = gTasks[taskId].data[3]; + else + var = gTasks[taskId].data[4]; + + for (i = 0; i < 6; i++) + { + src[i] = ((var & (3 << (i * 2))) >> (i * 2)) + 0x6001; + } + + CopyToBgTilemapBufferRect_ChangePalette(bgId, src, destX, destY, 6, 1, 0x11); + CopyBgTilemapBufferToVram(bgId); + } +} + +static void sub_8035C4C(void) +{ + if (gBattleOutcome == BATTLE_DREW) + { + BattleHandleAddTextPrinter(gText_Draw, 0x15); + } + else if (gBattleTypeFlags & BATTLE_TYPE_MULTI) + { + if (gBattleOutcome == BATTLE_WON) + { + switch (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18) + { + case 0: + BattleHandleAddTextPrinter(gText_Win, 0x16); + BattleHandleAddTextPrinter(gText_Loss, 0x17); + break; + case 1: + BattleHandleAddTextPrinter(gText_Win, 0x17); + BattleHandleAddTextPrinter(gText_Loss, 0x16); + break; + case 2: + BattleHandleAddTextPrinter(gText_Win, 0x16); + BattleHandleAddTextPrinter(gText_Loss, 0x17); + break; + case 3: + BattleHandleAddTextPrinter(gText_Win, 0x17); + BattleHandleAddTextPrinter(gText_Loss, 0x16); + break; + } + } + else + { + switch (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18) + { + case 0: + BattleHandleAddTextPrinter(gText_Win, 0x17); + BattleHandleAddTextPrinter(gText_Loss, 0x16); + break; + case 1: + BattleHandleAddTextPrinter(gText_Win, 0x16); + BattleHandleAddTextPrinter(gText_Loss, 0x17); + break; + case 2: + BattleHandleAddTextPrinter(gText_Win, 0x17); + BattleHandleAddTextPrinter(gText_Loss, 0x16); + break; + case 3: + BattleHandleAddTextPrinter(gText_Win, 0x16); + BattleHandleAddTextPrinter(gText_Loss, 0x17); + break; + } + } + } + else if (gBattleOutcome == BATTLE_WON) + { + if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 != 0) + { + BattleHandleAddTextPrinter(gText_Win, 0x17); + BattleHandleAddTextPrinter(gText_Loss, 0x16); + } + else + { + BattleHandleAddTextPrinter(gText_Win, 0x16); + BattleHandleAddTextPrinter(gText_Loss, 0x17); + } + } + else + { + if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 != 0) + { + BattleHandleAddTextPrinter(gText_Win, 0x16); + BattleHandleAddTextPrinter(gText_Loss, 0x17); + } + else + { + BattleHandleAddTextPrinter(gText_Win, 0x17); + BattleHandleAddTextPrinter(gText_Loss, 0x16); + } + } +} + +void sub_8035D74(u8 taskId) +{ + struct LinkPlayer *linkPlayer; + u8 *name; + s32 i, palId; + + switch (gTasks[taskId].data[0]) + { + case 0: + if (gBattleTypeFlags & BATTLE_TYPE_MULTI) + { + for (i = 0; i < BATTLE_BANKS_COUNT; i++) + { + name = gLinkPlayers[i].name; + linkPlayer = &gLinkPlayers[i]; + + switch (linkPlayer->lp_field_18) + { + case 0: + BattleHandleAddTextPrinter(name, 0x11); + sub_8035AE4(taskId, linkPlayer->lp_field_18, 1, 2, 4); + break; + case 1: + BattleHandleAddTextPrinter(name, 0x12); + sub_8035AE4(taskId, linkPlayer->lp_field_18, 2, 2, 4); + break; + case 2: + BattleHandleAddTextPrinter(name, 0x13); + sub_8035AE4(taskId, linkPlayer->lp_field_18, 1, 2, 8); + break; + case 3: + BattleHandleAddTextPrinter(name, 0x14); + sub_8035AE4(taskId, linkPlayer->lp_field_18, 2, 2, 8); + break; + } + } + } + else + { + u8 playerId = gBattleScripting.multiplayerId; + u8 opponentId = playerId ^ BIT_SIDE; + u8 opponentId_copy = opponentId; + + if (gLinkPlayers[playerId].lp_field_18 != 0) + opponentId = playerId, playerId = opponentId_copy; + + name = gLinkPlayers[playerId].name; + BattleHandleAddTextPrinter(name, 0xF); + + name = gLinkPlayers[opponentId].name; + BattleHandleAddTextPrinter(name, 0x10); + + sub_8035AE4(taskId, playerId, 1, 2, 7); + sub_8035AE4(taskId, opponentId, 2, 2, 7); + } + gTasks[taskId].data[0]++; + break; + case 1: + palId = AllocSpritePalette(0x2710); + gPlttBufferUnfaded[palId * 16 + 0x10F] = gPlttBufferFaded[palId * 16 + 0x10F] = 0x7FFF; + gBattleStruct->field_7D = CreateSprite(&gUnknown_0831A9D0, 111, 80, 0); + gBattleStruct->field_7E = CreateSprite(&gUnknown_0831A9E8, 129, 80, 0); + gSprites[gBattleStruct->field_7D].invisible = 1; + gSprites[gBattleStruct->field_7E].invisible = 1; + gTasks[taskId].data[0]++; + break; + case 2: + if (gTasks[taskId].data[5] != 0) + { + gBattle_BG1_X = -(20) - (Sin2(gTasks[taskId].data[1]) / 32); + gBattle_BG2_X = -(140) - (Sin2(gTasks[taskId].data[2]) / 32); + gBattle_BG1_Y = -36; + gBattle_BG2_Y = -36; + } + else + { + gBattle_BG1_X = -(20) - (Sin2(gTasks[taskId].data[1]) / 32); + gBattle_BG1_Y = (Cos2(gTasks[taskId].data[1]) / 32) - 164; + gBattle_BG2_X = -(140) - (Sin2(gTasks[taskId].data[2]) / 32); + gBattle_BG2_Y = (Cos2(gTasks[taskId].data[2]) / 32) - 164; + } + + if (gTasks[taskId].data[2] != 0) + { + gTasks[taskId].data[2] -= 2; + gTasks[taskId].data[1] += 2; + } + else + { + if (gTasks[taskId].data[5] != 0) + sub_8035C4C(); + + PlaySE(SE_W231); + DestroyTask(taskId); + gSprites[gBattleStruct->field_7D].invisible = 0; + gSprites[gBattleStruct->field_7E].invisible = 0; + gSprites[gBattleStruct->field_7E].oam.tileNum += 0x40; + gSprites[gBattleStruct->field_7D].data[0] = 0; + gSprites[gBattleStruct->field_7E].data[0] = 1; + gSprites[gBattleStruct->field_7D].data[1] = gSprites[gBattleStruct->field_7D].pos1.x; + gSprites[gBattleStruct->field_7E].data[1] = gSprites[gBattleStruct->field_7E].pos1.x; + gSprites[gBattleStruct->field_7D].data[2] = 0; + gSprites[gBattleStruct->field_7E].data[2] = 0; + } + break; + } +} + +void LoadBattleEntryBackground(void) +{ + if (gBattleTypeFlags & BATTLE_TYPE_LINK) + { + LZDecompressVram(gUnknown_08D778F0, (void*)(VRAM + 0x4000)); + LZDecompressVram(gUnknown_08D77B0C, (void*)(VRAM + 0x10000)); + LoadCompressedPalette(gUnknown_08D77AE4, 0x60, 0x20); + SetBgAttribute(1, BG_CTRL_ATTR_MAPBASEINDEX, 1); + SetGpuReg(REG_OFFSET_BG1CNT, 0x5C04); + CopyToBgTilemapBuffer(1, gUnknown_08D779D8, 0, 0); + CopyToBgTilemapBuffer(2, gUnknown_08D779D8, 0, 0); + CopyBgTilemapBufferToVram(1); + CopyBgTilemapBufferToVram(2); + SetGpuReg(REG_OFFSET_WININ, 0x36); + SetGpuReg(REG_OFFSET_WINOUT, 0x36); + gBattle_BG1_Y = 0xFF5C; + gBattle_BG2_Y = 0xFF5C; + LoadCompressedObjectPicUsingHeap(&gUnknown_0831AA00); + } + else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER)) + { + if (!(gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) || gPartnerTrainerId == STEVEN_PARTNER_ID) + { + LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000)); + LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000)); + } + else + { + SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 2); + SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 2); + CopyToBgTilemapBuffer(1, gUnknown_08D857A8, 0, 0); + CopyToBgTilemapBuffer(2, gUnknown_08D85A1C, 0, 0); + CopyBgTilemapBufferToVram(1); + CopyBgTilemapBufferToVram(2); + } + } + else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON) + { + LZDecompressVram(gBattleTerrainAnimTiles_Cave, (void*)(VRAM + 0x4000)); + LZDecompressVram(gBattleTerrainAnimTilemap_Cave, (void*)(VRAM + 0xE000)); + } + else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE) + { + LZDecompressVram(gBattleTerrainAnimTiles_Underwater, (void*)(VRAM + 0x4000)); + LZDecompressVram(gBattleTerrainAnimTilemap_Underwater, (void*)(VRAM + 0xE000)); + } + else if (gBattleTypeFlags & BATTLE_TYPE_RAYQUAZA) + { + LZDecompressVram(gBattleTerrainAnimTiles_Rayquaza, (void*)(VRAM + 0x4000)); + LZDecompressVram(gBattleTerrainAnimTilemap_Rayquaza, (void*)(VRAM + 0xE000)); + } + else + { + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) + { + u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass; + if (trainerClass == TRAINER_CLASS_LEADER) + { + LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000)); + LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000)); + return; + } + else if (trainerClass == TRAINER_CLASS_CHAMPION) + { + LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000)); + LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000)); + return; + } + } + + if (GetCurrentMapBattleScene() == MAP_BATTLE_SCENE_NORMAL) + { + LZDecompressVram(gBattleTerrainTable[gBattleTerrain].entryTileset, (void*)(VRAM + 0x4000)); + LZDecompressVram(gBattleTerrainTable[gBattleTerrain].entryTilemap, (void*)(VRAM + 0xE000)); + } + else + { + LZDecompressVram(gBattleTerrainAnimTiles_Building, (void*)(VRAM + 0x4000)); + LZDecompressVram(gBattleTerrainAnimTilemap_Building, (void*)(VRAM + 0xE000)); + } + } +} + +bool8 LoadChosenBattleElement(u8 caseId) +{ + bool8 ret = FALSE; + + switch (caseId) + { + case 0: + LZDecompressVram(gBattleTextboxTiles, (void*)(VRAM)); + break; + case 1: + CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0); + CopyBgTilemapBufferToVram(0); + break; + case 2: + LoadCompressedPalette(gBattleTextboxPalette, 0, 0x40); + break; + case 3: + if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER)) + { + LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000)); + } + else if (gBattleTypeFlags & BATTLE_TYPE_GROUDON) + { + LZDecompressVram(gBattleTerrainTiles_Cave, (void*)(VRAM + 0x8000)); + } + else + { + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) + { + u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass; + if (trainerClass == TRAINER_CLASS_LEADER) + { + LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000)); + break; + } + else if (trainerClass == TRAINER_CLASS_CHAMPION) + { + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + break; + } + } + + switch (GetCurrentMapBattleScene()) + { + default: + case MAP_BATTLE_SCENE_NORMAL: + LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tileset, (void*)(VRAM + 0x8000)); + break; + case MAP_BATTLE_SCENE_GYM: + LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000)); + break; + case MAP_BATTLE_SCENE_MAGMA: + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + break; + case MAP_BATTLE_SCENE_AQUA: + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + break; + case MAP_BATTLE_SCENE_SIDNEY: + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + break; + case MAP_BATTLE_SCENE_PHOEBE: + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + break; + case MAP_BATTLE_SCENE_GLACIA: + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + break; + case MAP_BATTLE_SCENE_DRAKE: + LZDecompressVram(gBattleTerrainTiles_Stadium, (void*)(VRAM + 0x8000)); + break; + case MAP_BATTLE_SCENE_FRONTIER: + LZDecompressVram(gBattleTerrainTiles_Building, (void*)(VRAM + 0x8000)); + break; + } + } + break; + case 4: + if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER)) + { + LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000)); + } + else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) + { + if (gGameVersion == VERSION_RUBY) + LZDecompressVram(gBattleTerrainTilemap_Cave, (void*)(VRAM + 0xD000)); + else + LZDecompressVram(gBattleTerrainTilemap_Water, (void*)(VRAM + 0xD000)); + } + else + { + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) + { + u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass; + if (trainerClass == TRAINER_CLASS_LEADER) + { + LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000)); + break; + } + else if (trainerClass == TRAINER_CLASS_CHAMPION) + { + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + break; + } + } + + switch (GetCurrentMapBattleScene()) + { + default: + case MAP_BATTLE_SCENE_NORMAL: + LZDecompressVram(gBattleTerrainTable[gBattleTerrain].tilemap, (void*)(VRAM + 0xD000)); + break; + case MAP_BATTLE_SCENE_GYM: + LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000)); + break; + case MAP_BATTLE_SCENE_MAGMA: + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + break; + case MAP_BATTLE_SCENE_AQUA: + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + break; + case MAP_BATTLE_SCENE_SIDNEY: + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + break; + case MAP_BATTLE_SCENE_PHOEBE: + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + break; + case MAP_BATTLE_SCENE_GLACIA: + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + break; + case MAP_BATTLE_SCENE_DRAKE: + LZDecompressVram(gBattleTerrainTilemap_Stadium, (void*)(VRAM + 0xD000)); + break; + case MAP_BATTLE_SCENE_FRONTIER: + LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(VRAM + 0xD000)); + break; + } + } + break; + case 5: + if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER)) + { + LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60); + } + else if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) + { + if (gGameVersion == VERSION_RUBY) + LoadCompressedPalette(gBattleTerrainPalette_Groudon, 0x20, 0x60); + else + LoadCompressedPalette(gBattleTerrainPalette_Kyogre, 0x20, 0x60); + } + else + { + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) + { + u8 trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass; + if (trainerClass == TRAINER_CLASS_LEADER) + { + LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, 0x20, 0x60); + break; + } + else if (trainerClass == TRAINER_CLASS_CHAMPION) + { + LoadCompressedPalette(gBattleTerrainPalette_StadiumWallace, 0x20, 0x60); + break; + } + } + + switch (GetCurrentMapBattleScene()) + { + default: + case MAP_BATTLE_SCENE_NORMAL: + LoadCompressedPalette(gBattleTerrainTable[gBattleTerrain].palette, 0x20, 0x60); + break; + case MAP_BATTLE_SCENE_GYM: + LoadCompressedPalette(gBattleTerrainPalette_BuildingGym, 0x20, 0x60); + break; + case MAP_BATTLE_SCENE_MAGMA: + LoadCompressedPalette(gBattleTerrainPalette_StadiumMagma, 0x20, 0x60); + break; + case MAP_BATTLE_SCENE_AQUA: + LoadCompressedPalette(gBattleTerrainPalette_StadiumAqua, 0x20, 0x60); + break; + case MAP_BATTLE_SCENE_SIDNEY: + LoadCompressedPalette(gBattleTerrainPalette_StadiumSidney, 0x20, 0x60); + break; + case MAP_BATTLE_SCENE_PHOEBE: + LoadCompressedPalette(gBattleTerrainPalette_StadiumPhoebe, 0x20, 0x60); + break; + case MAP_BATTLE_SCENE_GLACIA: + LoadCompressedPalette(gBattleTerrainPalette_StadiumGlacia, 0x20, 0x60); + break; + case MAP_BATTLE_SCENE_DRAKE: + LoadCompressedPalette(gBattleTerrainPalette_StadiumDrake, 0x20, 0x60); + break; + case MAP_BATTLE_SCENE_FRONTIER: + LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60); + break; + } + } + break; + case 6: + ApplyPlayerChosenFrameToBattleMenu(); + break; + default: + ret = TRUE; + break; + } + + return ret; +} diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index e497dbfe2..08c666d11 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -234,7 +234,7 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = static const u8 sTargetIdentities[] = {IDENTITY_PLAYER_MON1, IDENTITY_PLAYER_MON2, IDENTITY_OPPONENT_MON2, IDENTITY_OPPONENT_MON1}; // unknown unused data -static const u8 gUnknown_0831C5FC[] = {0x48, 0x48, 0x20, 0x5a, 0x50, 0x50, 0x50, 0x58}; +static const u8 sUnknown_0831C5FC[] = {0x48, 0x48, 0x20, 0x5a, 0x50, 0x50, 0x50, 0x58}; void nullsub_21(void) { diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index eb57297da..dc4a213cc 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -198,7 +198,7 @@ static void (*const sPlayerPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = }; // unknown unused data -static const u8 gUnknown_08617254[] = +static const u8 sUnknown_08617254[] = { 0x83, 0x4d, 0xf3, 0x5f, 0x6f, 0x4f, 0xeb, 0x3e, 0x67, 0x2e, 0x10, 0x46, 0x8c, 0x3d, 0x28, 0x35, diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index db4670523..64e6a0bc3 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -19,6 +19,7 @@ #include "reshow_battle_screen.h" #include "pokeball.h" #include "data2.h" +#include "pokeblock.h" extern u32 gBattleExecBuffer; extern u8 gActiveBank; @@ -291,13 +292,13 @@ static void CompleteOnSpecialAnimDone(void) SafariBufferExecCompleted(); } -static void OpenPokeblockCase(void) +static void SafariOpenPokeblockCase(void) { if (!gPaletteFade.active) { gBattleBankFunc[gActiveBank] = CompleteWhenChosePokeblock; FreeAllWindowBuffers(); - sub_81358F4(); + OpenPokeblockCaseInBattle(); } } @@ -497,7 +498,7 @@ static void SafariHandleChooseItem(void) s32 i; BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); - gBattleBankFunc[gActiveBank] = OpenPokeblockCase; + gBattleBankFunc[gActiveBank] = SafariOpenPokeblockCase; gBankInMenu = gActiveBank; } diff --git a/src/battle_interface.c b/src/battle_interface.c index 95f1a1111..6a6bf00a2 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -177,7 +177,6 @@ extern const u16 gBattleInterface_BallDisplayPal[]; extern const u8 gHealthboxElementsGfxTable[][32]; // functions -extern void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, const u8 *str); // menu.h extern void LoadBattleBarGfx(u8 arg0); // this file's functions diff --git a/src/battle_message.c b/src/battle_message.c index ec1cfd626..8a985102d 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -12,6 +12,7 @@ #include "window.h" #include "palette.h" #include "battle_controllers.h" +#include "battle_setup.h" extern u16 gLastUsedItem; extern u8 gLastUsedAbility; @@ -54,8 +55,6 @@ extern void sub_81D5554(u8 *txtPtr, u16 trainerId); // pokenav extern void GetEreaderTrainerName(u8 *txtPtr); extern void sub_81A36D0(u8 arg0, u16 trainerId); // battle_frontier_2 extern void sub_81D572C(u8 arg0, u16 trainerId); // pokenav -extern const u8* GetTrainer1LoseText(void); // battle_setup -extern const u8* GetTrainer2LoseText(void); // battle_setup extern void GetFrontierTrainerName(u8 *dst, u16 trainerId); extern s32 GetStringCenterAlignXOffsetWithLetterSpacing(u8 fontId, const u8 *str, s32 totalWidth, s16 letterSpacing); extern u8 GetTextSpeedInRecordedBattle(void); @@ -1367,7 +1366,7 @@ static const u16 sUnknownMoveTable[] = static const u8 sDummyWeirdStatusString[] = {EOS, EOS, EOS, EOS, EOS, EOS, EOS, EOS, 0, 0}; -static const u8 gUnknown_085CD42C[] = +static const u8 sUnknown_085CD42C[] = { 0xFF, 0x1, 0x0, 0x1, 0x0, 0x0, 0x1, 0x1, 0xF, 0x6, 0x0, 0x0, 0xFF, 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0xF, 0x6, 0x0, 0x0, 0xEE, 0x1, 0x0, 0x1, 0x0, @@ -1392,7 +1391,7 @@ static const u8 gUnknown_085CD42C[] = 0x6, 0x0, 0x0, 0x0, 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x6, 0x0, 0x0 }; -static const u8 gUnknown_085CD54C[] = +static const u8 sUnknown_085CD54C[] = { 0xFF, 0x1, 0x0, 0x1, 0x0, 0x0, 0x1, 0x1, 0xF, 0x6, 0x0, 0x0, 0xFF, 0x1, 0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0xF, 0x6, 0x0, 0x0, 0xEE, 0x1, 0x0, 0x1, 0x0, @@ -1419,7 +1418,7 @@ static const u8 gUnknown_085CD54C[] = static const u8 * const gUnknown_085CD660[] = { - gUnknown_085CD42C, gUnknown_085CD54C + sUnknown_085CD42C, sUnknown_085CD54C }; static const u8 sRecordedBattleTextSpeeds[] = {8, 4, 1, 0}; @@ -2068,7 +2067,7 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst) } else { - toCpy = GetTrainer1LoseText(); + toCpy = GetTrainerALoseText(); } break; case B_TXT_TRAINER1_WIN_TEXT: // trainerA win text @@ -2165,7 +2164,7 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst) } else { - toCpy = GetTrainer2LoseText(); + toCpy = GetTrainerBLoseText(); } break; case B_TXT_TRAINER2_WIN_TEXT: diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 88d583c1f..656f9f43a 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -17,6 +17,7 @@ #include "battle_interface.h" #include "constants/species.h" #include "constants/songs.h" +#include "constants/trainers.h" #include "text.h" #include "sound.h" #include "pokedex.h" @@ -6236,19 +6237,19 @@ static u32 GetTrainerMoneyToGive(u16 trainerId) lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl; } break; - case PARTY_FLAG_CUSTOM_MOVES: + case F_TRAINER_PARTY_CUSTOM_MOVESET: { const struct TrainerMonNoItemCustomMoves *party = gTrainers[trainerId].party.NoItemCustomMoves; lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl; } break; - case PARTY_FLAG_HAS_ITEM: + case F_TRAINER_PARTY_HELD_ITEM: { const struct TrainerMonItemDefaultMoves *party = gTrainers[trainerId].party.ItemDefaultMoves; lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl; } break; - case PARTY_FLAG_CUSTOM_MOVES | PARTY_FLAG_HAS_ITEM: + case F_TRAINER_PARTY_CUSTOM_MOVESET | F_TRAINER_PARTY_HELD_ITEM: { const struct TrainerMonItemCustomMoves *party = gTrainers[trainerId].party.ItemCustomMoves; lastMonLevel = party[gTrainers[trainerId].partySize - 1].lvl; @@ -10334,7 +10335,7 @@ static void atkE4_getsecretpowereffect(void) case BATTLE_TERRAIN_POND: gBattleCommunication[MOVE_EFFECT_BYTE] = MOVE_EFFECT_SPD_MINUS_1; break; - case BATTLE_TERRAIN_ROCK: + case BATTLE_TERRAIN_MOUNTAIN: gBattleCommunication[MOVE_EFFECT_BYTE] = MOVE_EFFECT_CONFUSION; break; case BATTLE_TERRAIN_CAVE: diff --git a/src/battle_setup.c b/src/battle_setup.c new file mode 100644 index 000000000..be23a28c9 --- /dev/null +++ b/src/battle_setup.c @@ -0,0 +1,1881 @@ +#include "global.h" +#include "constants/trainers.h" +#include "battle.h" +#include "battle_setup.h" +#include "battle_transition.h" +#include "main.h" +#include "task.h" +#include "pokemon_3.h" +#include "safari_zone.h" +#include "script.h" +#include "constants/game_stat.h" +#include "event_data.h" +#include "constants/species.h" +#include "songs.h" +#include "metatile_behavior.h" +#include "constants/maps.h" +#include "field_player_avatar.h" +#include "fieldmap.h" +#include "random.h" +#include "starter_choose.h" +#include "script_pokemon_80F8.h" +#include "constants/items.h" +#include "palette.h" +#include "window.h" +#include "field_map_obj.h" +#include "event_scripts.h" +#include "trainer_see.h" +#include "field_message_box.h" +#include "sound.h" +#include "strings.h" +#include "secret_base.h" +#include "string_util.h" + +enum +{ + TRAINER_PARAM_LOAD_VAL_8BIT, + TRAINER_PARAM_LOAD_VAL_16BIT, + TRAINER_PARAM_LOAD_VAL_32BIT, + TRAINER_PARAM_CLEAR_VAL_8BIT, + TRAINER_PARAM_CLEAR_VAL_16BIT, + TRAINER_PARAM_CLEAR_VAL_32BIT, + TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR, +}; + +struct TrainerBattleParameter +{ + void *varPtr; + u8 ptrType; +}; + +extern bool8 InBattlePyramid(void); +extern bool8 InBattlePike(void); +extern bool32 InTrainerHill(void); +extern bool32 FieldPoisonEffectIsRunning(void); +extern void overworld_free_bg_tilemaps(void); +extern void prev_quest_postbuffer_cursor_backup_reset(void); +extern void ResetPoisonStepCounter(void); +extern void sub_81BE72C(void); +extern void FreezeMapObjects(void); +extern void sub_808BCF4(void); +extern void sub_80EECC8(void); +extern void c2_exit_to_overworld_1_continue_scripts_restart_music(void); +extern void c2_exit_to_overworld_2_switch(void); +extern void Overworld_ClearSavedMusic(void); +extern void CB2_WhiteOut(void); +extern void sub_80AF6F0(void); +extern void PlayBattleBGM(void); +extern void sub_81DA57C(void); +extern u8 GetSav1Weather(void); +extern u8 Overworld_GetFlashLevel(void); +extern u16 sub_81A9AA8(u8 localId); +extern u16 sub_81D6180(u8 localId); +extern bool8 GetBattlePyramidTrainerFlag(u8 mapObjId); +extern bool8 GetTrainerHillTrainerFlag(u8 mapObjId); +extern bool8 sub_81D5C18(void); +extern void sub_816306C(u8 a0); +extern void sub_8163048(u8 a0); +extern void sub_81A9B04(void); +extern void sub_81D639C(void); +extern void sub_81D6384(void); +extern void sub_81D61E8(void); +extern void sub_80982B8(void); +extern void sub_81A9EDC(u16 a0); +extern void sub_81D572C(u8 a0, u16 arg1); +extern void IncrementGameStat(u8 statId); +extern u32 GetGameStat(u8 statId); + +extern u32 gBattleTypeFlags; +extern u8 gBattleOutcome; +extern void (*gFieldCallback)(void); + +// this file's functions +static void DoBattlePikeWildBattle(void); +static void DoSafariBattle(void); +static void DoStandardWildBattle(void); +static void CB2_EndWildBattle(void); +static void CB2_EndScriptedWildBattle(void); +static u8 GetWildBattleTransition(void); +static u8 GetTrainerBattleTransition(void); +static void sub_80B1218(void); +static void sub_80B1234(void); +static void CB2_GiveStarter(void); +static void CB2_StartFirstBattle(void); +static void CB2_EndFirstBattle(void); +static void CB2_EndTrainerBattle(void); +static bool32 IsPlayerDefeated(u32 battleOutcome); +static u16 GetRematchTrainerId(u16 trainerId); +static void RegisterTrainerInMatchCall(void); +static void HandleRematchVarsOnBattleEnd(void); +static const u8 *GetIntroSpeechOfApproachingTrainer(void); +static const u8 *GetTrainerCantBattleSpeech(void); + +// ewram vars +EWRAM_DATA static u16 sTrainerBattleMode = 0; +EWRAM_DATA u16 gTrainerBattleOpponent_A = 0; +EWRAM_DATA u16 gTrainerBattleOpponent_B = 0; +EWRAM_DATA u16 gPartnerTrainerId = 0; +EWRAM_DATA static u16 sTrainerMapObjectLocalId = 0; +EWRAM_DATA static u8 *sTrainerAIntroSpeech = NULL; +EWRAM_DATA static u8 *sTrainerBIntroSpeech = NULL; +EWRAM_DATA static u8 *sTrainerADefeatSpeech = NULL; +EWRAM_DATA static u8 *sTrainerBDefeatSpeech = NULL; +EWRAM_DATA static u8 *sTrainerVictorySpeech = NULL; +EWRAM_DATA static u8 *sTrainerCannotBattleSpeech = NULL; +EWRAM_DATA static u8 *sTrainerBattleEndScript = NULL; +EWRAM_DATA static u8 *sTrainerABattleScriptRetAddr = NULL; +EWRAM_DATA static u8 *sTrainerBBattleScriptRetAddr = NULL; +EWRAM_DATA static bool8 sShouldCheckTrainerBScript = FALSE; +EWRAM_DATA static u8 sNoOfPossibleTrainerRetScripts = 0; + +// const rom data + +// The first transition is used if the enemy pokemon are lower level than our pokemon. +// Otherwise, the second transition is used. +static const u8 sBattleTransitionTable_Wild[][2] = +{ + {B_TRANSITION_SLICE, B_TRANSITION_WHITEFADE}, // Normal + {B_TRANSITION_CLOCKWISE_BLACKFADE, B_TRANSITION_GRID_SQUARES}, // Cave + {B_TRANSITION_BLUR, B_TRANSITION_GRID_SQUARES}, // Cave with flash used + {B_TRANSITION_WAVE, B_TRANSITION_RIPPLE}, // Water +}; + +static const u8 sBattleTransitionTable_Trainer[][2] = +{ + {B_TRANSITION_POKEBALLS_TRAIL, B_TRANSITION_SHARDS}, // Normal + {B_TRANSITION_SHUFFLE, B_TRANSITION_BIG_POKEBALL}, // Cave + {B_TRANSITION_BLUR, B_TRANSITION_GRID_SQUARES}, // Cave with flash used + {B_TRANSITION_SWIRL, B_TRANSITION_RIPPLE}, // Water +}; + +static const u8 sUnknown_0854FE98[] = +{ + B_TRANSITION_29, B_TRANSITION_30, B_TRANSITION_31, B_TRANSITION_32, + B_TRANSITION_34, B_TRANSITION_35, B_TRANSITION_36, B_TRANSITION_37, + B_TRANSITION_38, B_TRANSITION_39, B_TRANSITION_40, B_TRANSITION_41 +}; + +static const u8 sUnknown_0854FEA4[] = +{ + B_TRANSITION_31, B_TRANSITION_32, B_TRANSITION_33 +}; + +static const u8 sUnknown_0854FEA7[] = +{ + B_TRANSITION_29, B_TRANSITION_31, B_TRANSITION_32, B_TRANSITION_33 +}; + +static const struct TrainerBattleParameter sOrdinaryBattleParams[] = +{ + {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, + {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerMapObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, + {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, + {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, + {&sTrainerCannotBattleSpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, + {&sTrainerABattleScriptRetAddr, TRAINER_PARAM_CLEAR_VAL_32BIT}, + {&sTrainerBattleEndScript, TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR}, +}; + +static const struct TrainerBattleParameter sContinueScriptBattleParams[] = +{ + {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, + {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerMapObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, + {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, + {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, + {&sTrainerCannotBattleSpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, + {&sTrainerABattleScriptRetAddr, TRAINER_PARAM_LOAD_VAL_32BIT}, + {&sTrainerBattleEndScript, TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR}, +}; + +static const struct TrainerBattleParameter sDoubleBattleParams[] = +{ + {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, + {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerMapObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, + {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, + {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, + {&sTrainerCannotBattleSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, + {&sTrainerABattleScriptRetAddr, TRAINER_PARAM_CLEAR_VAL_32BIT}, + {&sTrainerBattleEndScript, TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR}, +}; + +static const struct TrainerBattleParameter sOrdinaryNoIntroBattleParams[] = +{ + {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, + {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerMapObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerAIntroSpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, + {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, + {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, + {&sTrainerCannotBattleSpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, + {&sTrainerABattleScriptRetAddr, TRAINER_PARAM_CLEAR_VAL_32BIT}, + {&sTrainerBattleEndScript, TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR}, +}; + +static const struct TrainerBattleParameter sContinueScriptDoubleBattleParams[] = +{ + {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, + {&gTrainerBattleOpponent_A, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerMapObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerAIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, + {&sTrainerADefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, + {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, + {&sTrainerCannotBattleSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, + {&sTrainerABattleScriptRetAddr, TRAINER_PARAM_LOAD_VAL_32BIT}, + {&sTrainerBattleEndScript, TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR}, +}; + +static const struct TrainerBattleParameter sTrainerBOrdinaryBattleParams[] = +{ + {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, + {&gTrainerBattleOpponent_B, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerMapObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerBIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, + {&sTrainerBDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, + {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, + {&sTrainerCannotBattleSpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, + {&sTrainerBBattleScriptRetAddr, TRAINER_PARAM_CLEAR_VAL_32BIT}, + {&sTrainerBattleEndScript, TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR}, +}; + +static const struct TrainerBattleParameter sTrainerBContinueScriptBattleParams[] = +{ + {&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT}, + {&gTrainerBattleOpponent_B, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerMapObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT}, + {&sTrainerBIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, + {&sTrainerBDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT}, + {&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, + {&sTrainerCannotBattleSpeech, TRAINER_PARAM_CLEAR_VAL_32BIT}, + {&sTrainerBBattleScriptRetAddr, TRAINER_PARAM_LOAD_VAL_32BIT}, + {&sTrainerBattleEndScript, TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR}, +}; + +const struct RematchTrainer gRematchTable[REMATCH_TABLE_ENTRIES] = +{ + {{0x0025, 0x0028, 0x0029, 0x002a, 0x002b}, 0x0000, 0x0021}, + {{0x02e1, 0x032c, 0x032d, 0x032e, 0x032f}, 0x0000, 0x0014}, + {{0x002c, 0x002f, 0x0030, 0x0031, 0x0032}, 0x0000, 0x001a}, + {{0x0039, 0x003c, 0x003d, 0x003e, 0x003f}, 0x0000, 0x0018}, + {{0x0040, 0x0043, 0x0044, 0x0045, 0x0046}, 0x0000, 0x0018}, + {{0x02af, 0x02b0, 0x02b1, 0x02b2, 0x02b3}, 0x0000, 0x0027}, + {{0x02ff, 0x033c, 0x033d, 0x033e, 0x033f}, 0x0000, 0x0024}, + {{0x005e, 0x0065, 0x0066, 0x0067, 0x0068}, 0x0000, 0x001a}, + {{0x004e, 0x0054, 0x0055, 0x0056, 0x0057}, 0x0000, 0x001a}, + {{0x006c, 0x006e, 0x006f, 0x0070, 0x0071}, 0x0018, 0x0014}, + {{0x0072, 0x0078, 0x0079, 0x007a, 0x007b}, 0x0000, 0x0013}, + {{0x0090, 0x034c, 0x034d, 0x034e, 0x034f}, 0x0018, 0x0038}, + {{0x007f, 0x0084, 0x0085, 0x0086, 0x0087}, 0x0000, 0x0024}, + {{0x0088, 0x008b, 0x008c, 0x008d, 0x008e}, 0x0000, 0x0013}, + {{0x008f, 0x0093, 0x0094, 0x0095, 0x0096}, 0x0000, 0x001d}, + {{0x009b, 0x00af, 0x00b0, 0x00b1, 0x00b2}, 0x0000, 0x0016}, + {{0x00b7, 0x00b8, 0x00b9, 0x00ba, 0x00bb}, 0x0000, 0x001e}, + {{0x02a0, 0x0338, 0x0339, 0x033a, 0x033b}, 0x0000, 0x002a}, + {{0x00c3, 0x0340, 0x0341, 0x0342, 0x0343}, 0x0000, 0x0026}, + {{0x00c4, 0x00c5, 0x00c6, 0x00c7, 0x00c8}, 0x0000, 0x0021}, + {{0x00ce, 0x00cf, 0x00d0, 0x00d1, 0x00d2}, 0x0000, 0x001d}, + {{0x00d8, 0x00db, 0x00dc, 0x00dd, 0x00de}, 0x0018, 0x000d}, + {{0x02a9, 0x02aa, 0x02ab, 0x02ac, 0x02ad}, 0x0018, 0x0001}, + {{0x00e2, 0x00e4, 0x00e5, 0x00e6, 0x00e7}, 0x0000, 0x0023}, + {{0x00ee, 0x00ef, 0x00f0, 0x00f1, 0x00f2}, 0x0000, 0x0026}, + {{0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd}, 0x0000, 0x0026}, + {{0x00fe, 0x0101, 0x0102, 0x0103, 0x0104}, 0x0000, 0x0024}, + {{0x0118, 0x011a, 0x011b, 0x011c, 0x011d}, 0x0000, 0x001f}, + {{0x0111, 0x0114, 0x0115, 0x0116, 0x0117}, 0x0000, 0x001f}, + {{0x011f, 0x0120, 0x0121, 0x0122, 0x0123}, 0x0000, 0x0020}, + {{0x012e, 0x012f, 0x0130, 0x0131, 0x0132}, 0x0000, 0x0019}, + {{0x0125, 0x0127, 0x0128, 0x0129, 0x012a}, 0x0000, 0x0012}, + {{0x0133, 0x0134, 0x0135, 0x0136, 0x0137}, 0x0000, 0x001e}, + {{0x0139, 0x013a, 0x013b, 0x013c, 0x013d}, 0x0018, 0x000c}, + {{0x013e, 0x0148, 0x0149, 0x014a, 0x014b}, 0x0000, 0x0011}, + {{0x0153, 0x015a, 0x015b, 0x015c, 0x015d}, 0x0000, 0x0015}, + {{0x0178, 0x017b, 0x017c, 0x017d, 0x017e}, 0x0000, 0x002b}, + {{0x0171, 0x0172, 0x0173, 0x0174, 0x0175}, 0x0000, 0x0020}, + {{0x0166, 0x0168, 0x0169, 0x016a, 0x016b}, 0x0000, 0x0019}, + {{0x016c, 0x016d, 0x016e, 0x016f, 0x0170}, 0x0000, 0x0020}, + {{0x0182, 0x0184, 0x0185, 0x0186, 0x0187}, 0x0000, 0x002b}, + {{0x0161, 0x0162, 0x0163, 0x0164, 0x0165}, 0x0000, 0x0019}, + {{0x0179, 0x0334, 0x0335, 0x0336, 0x0337}, 0x0000, 0x0029}, + {{0x0188, 0x0189, 0x018a, 0x018b, 0x018c}, 0x0018, 0x0001}, + {{0x0196, 0x0199, 0x019a, 0x019b, 0x019c}, 0x0000, 0x0023}, + {{0x01a3, 0x01a5, 0x01a6, 0x01a7, 0x01a8}, 0x0000, 0x001c}, + {{0x01ab, 0x01ae, 0x01af, 0x01b0, 0x01b1}, 0x0000, 0x001e}, + {{0x01b2, 0x01b5, 0x01b6, 0x01b7, 0x01b8}, 0x0000, 0x001c}, + {{0x01c1, 0x01d1, 0x01d2, 0x01d3, 0x01d4}, 0x0000, 0x0027}, + {{0x01da, 0x01dd, 0x01de, 0x01df, 0x01e0}, 0x0018, 0x000d}, + {{0x01e1, 0x01e2, 0x01e7, 0x01e8, 0x01e9}, 0x0000, 0x0012}, + {{0x01ec, 0x01f1, 0x01f2, 0x01f3, 0x01f4}, 0x0000, 0x0028}, + {{0x02e4, 0x0330, 0x0331, 0x0332, 0x0333}, 0x0000, 0x0017}, + {{0x0200, 0x0203, 0x0204, 0x0205, 0x0206}, 0x0000, 0x0019}, + {{0x0221, 0x0224, 0x0225, 0x0226, 0x0227}, 0x0000, 0x0020}, + {{0x021a, 0x021d, 0x021e, 0x021f, 0x0220}, 0x0000, 0x0020}, + {{0x0009, 0x0348, 0x0349, 0x034a, 0x034b}, 0x0018, 0x0011}, + {{0x022f, 0x0232, 0x0233, 0x0234, 0x0235}, 0x0000, 0x0022}, + {{0x0228, 0x022b, 0x022c, 0x022d, 0x022e}, 0x0000, 0x0022}, + {{0x025c, 0x025f, 0x0260, 0x0261, 0x0262}, 0x0000, 0x0013}, + {{0x026d, 0x026e, 0x026f, 0x0270, 0x0271}, 0x0018, 0x000b}, + {{0x0273, 0x027c, 0x027d, 0x027e, 0x027f}, 0x0000, 0x001b}, + {{0x0001, 0x0344, 0x0345, 0x0346, 0x0347}, 0x0018, 0x000c}, + {{0x0282, 0x0283, 0x0284, 0x0285, 0x0286}, 0x0018, 0x003e}, + {{0x0291, 0x0292, 0x0293, 0x0294, 0x0294}, 0x0018, 0x002b}, + {{0x0109, 0x0302, 0x0303, 0x0304, 0x0305}, 0x0000, 0x0003}, + {{0x010a, 0x0306, 0x0307, 0x0308, 0x0309}, 0x0000, 0x000b}, + {{0x010b, 0x030a, 0x030b, 0x030c, 0x030d}, 0x0000, 0x0002}, + {{0x010c, 0x030e, 0x030f, 0x0310, 0x0311}, 0x0000, 0x000c}, + {{0x010d, 0x0312, 0x0313, 0x0314, 0x0315}, 0x0000, 0x0000}, + {{0x010e, 0x0316, 0x0317, 0x0318, 0x0319}, 0x0000, 0x0004}, + {{0x010f, 0x031a, 0x031b, 0x031c, 0x031d}, 0x0000, 0x0006}, + {{0x0110, 0x031e, 0x031f, 0x0320, 0x0321}, 0x0000, 0x0007}, + {{0x0105, 0x0105, 0x0105, 0x0105, 0x0105}, 0x0000, 0x0008}, + {{0x0106, 0x0106, 0x0106, 0x0106, 0x0106}, 0x0000, 0x0008}, + {{0x0107, 0x0107, 0x0107, 0x0107, 0x0107}, 0x0000, 0x0008}, + {{0x0108, 0x0108, 0x0108, 0x0108, 0x0108}, 0x0000, 0x0008}, + {{0x014f, 0x014f, 0x014f, 0x014f, 0x014f}, 0x0000, 0x0008}, +}; + +static const u16 sBadgeFlags[8] = +{ + FLAG_BADGE01_GET, FLAG_BADGE02_GET, FLAG_BADGE03_GET, FLAG_BADGE04_GET, + FLAG_BADGE05_GET, FLAG_BADGE06_GET, FLAG_BADGE07_GET, FLAG_BADGE08_GET, +}; + +#define tState data[0] +#define tTransition data[1] + +static void Task_BattleStart(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + switch (tState) + { + case 0: + if (!FieldPoisonEffectIsRunning()) // is poison not active? + { + BattleTransition_StartOnField(tTransition); + sub_81BE72C(); + tState++; // go to case 1. + } + break; + case 1: + if (IsBattleTransitionDone() == TRUE) + { + overworld_free_bg_tilemaps(); + SetMainCallback2(CB2_InitBattle); + prev_quest_postbuffer_cursor_backup_reset(); + ResetPoisonStepCounter(); + DestroyTask(taskId); + } + break; + } +} + +static void CreateBattleStartTask(u8 transition, u16 song) +{ + u8 taskId = CreateTask(Task_BattleStart, 1); + + gTasks[taskId].tTransition = transition; + PlayMapChosenOrBattleBGM(song); +} + +#undef tState +#undef tTransition + +void BattleSetup_StartWildBattle(void) +{ + if (GetSafariZoneFlag()) + DoSafariBattle(); + else + DoStandardWildBattle(); +} + +void BattleSetup_StartBattlePikeWildBattle(void) +{ + DoBattlePikeWildBattle(); +} + +static void DoStandardWildBattle(void) +{ + ScriptContext2_Enable(); + FreezeMapObjects(); + sub_808BCF4(); + gMain.savedCallback = CB2_EndWildBattle; + gBattleTypeFlags = 0; + if (InBattlePyramid()) + { + VarSet(VAR_0x400E, 0); + gBattleTypeFlags |= BATTLE_TYPE_PYRAMID; + } + CreateBattleStartTask(GetWildBattleTransition(), 0); + IncrementGameStat(GAME_STAT_TOTAL_BATTLES); + IncrementGameStat(GAME_STAT_WILD_BATTLES); + sub_80EECC8(); + sub_80B1218(); +} + +void BattleSetup_StartRoamerBattle(void) +{ + ScriptContext2_Enable(); + FreezeMapObjects(); + sub_808BCF4(); + gMain.savedCallback = CB2_EndWildBattle; + gBattleTypeFlags = BATTLE_TYPE_ROAMER; + CreateBattleStartTask(GetWildBattleTransition(), 0); + IncrementGameStat(GAME_STAT_TOTAL_BATTLES); + IncrementGameStat(GAME_STAT_WILD_BATTLES); + sub_80EECC8(); + sub_80B1218(); +} + +static void DoSafariBattle(void) +{ + ScriptContext2_Enable(); + FreezeMapObjects(); + sub_808BCF4(); + gMain.savedCallback = CB2_EndSafariBattle; + gBattleTypeFlags = BATTLE_TYPE_SAFARI; + CreateBattleStartTask(GetWildBattleTransition(), 0); +} + +static void DoBattlePikeWildBattle(void) +{ + ScriptContext2_Enable(); + FreezeMapObjects(); + sub_808BCF4(); + gMain.savedCallback = CB2_EndWildBattle; + gBattleTypeFlags = BATTLE_TYPE_PIKE; + CreateBattleStartTask(GetWildBattleTransition(), 0); + IncrementGameStat(GAME_STAT_TOTAL_BATTLES); + IncrementGameStat(GAME_STAT_WILD_BATTLES); + sub_80EECC8(); + sub_80B1218(); +} + +static void DoTrainerBattle(void) +{ + CreateBattleStartTask(GetTrainerBattleTransition(), 0); + IncrementGameStat(GAME_STAT_TOTAL_BATTLES); + IncrementGameStat(GAME_STAT_TRAINER_BATTLES); + sub_80B1234(); +} + +static void sub_80B0828(void) +{ + if (InBattlePyramid()) + CreateBattleStartTask(sub_80B100C(10), 0); + else + CreateBattleStartTask(sub_80B100C(11), 0); + + IncrementGameStat(GAME_STAT_TOTAL_BATTLES); + IncrementGameStat(GAME_STAT_TRAINER_BATTLES); + sub_80B1234(); +} + +// Initiates battle where Wally catches Ralts +void StartWallyTutorialBattle(void) +{ + CreateMaleMon(&gEnemyParty[0], SPECIES_RALTS, 5); + ScriptContext2_Enable(); + gMain.savedCallback = c2_exit_to_overworld_1_continue_scripts_restart_music; + gBattleTypeFlags = BATTLE_TYPE_WALLY_TUTORIAL; + CreateBattleStartTask(B_TRANSITION_SLICE, 0); +} + +void BattleSetup_StartScriptedWildBattle(void) +{ + ScriptContext2_Enable(); + gMain.savedCallback = CB2_EndScriptedWildBattle; + gBattleTypeFlags = 0; + CreateBattleStartTask(GetWildBattleTransition(), 0); + IncrementGameStat(GAME_STAT_TOTAL_BATTLES); + IncrementGameStat(GAME_STAT_WILD_BATTLES); + sub_80EECC8(); + sub_80B1218(); +} + +void BattleSetup_StartLatiBattle(void) +{ + ScriptContext2_Enable(); + gMain.savedCallback = CB2_EndScriptedWildBattle; + gBattleTypeFlags = BATTLE_TYPE_LEGENDARY; + CreateBattleStartTask(GetWildBattleTransition(), 0); + IncrementGameStat(GAME_STAT_TOTAL_BATTLES); + IncrementGameStat(GAME_STAT_WILD_BATTLES); + sub_80EECC8(); + sub_80B1218(); +} + +void BattleSetup_StartLegendaryBattle(void) +{ + ScriptContext2_Enable(); + gMain.savedCallback = CB2_EndScriptedWildBattle; + gBattleTypeFlags = BATTLE_TYPE_LEGENDARY; + + switch (GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, NULL)) + { + default: + case SPECIES_GROUDON: + gBattleTypeFlags |= BATTLE_TYPE_GROUDON; + CreateBattleStartTask(B_TRANSITION_GROUDON, BGM_BATTLE34); + break; + case SPECIES_KYOGRE: + gBattleTypeFlags |= BATTLE_TYPE_KYOGRE; + CreateBattleStartTask(B_TRANSITION_KYOGRE, BGM_BATTLE34); + break; + case SPECIES_RAYQUAZA: + gBattleTypeFlags |= BATTLE_TYPE_RAYQUAZA; + CreateBattleStartTask(B_TRANSITION_RAYQUAZA, BGM_BATTLE_LEGENDARY); + break; + case SPECIES_DEOXYS: + CreateBattleStartTask(B_TRANSITION_BLUR, BGM_FRLG_BATTLE_DEOXYS); + break; + case SPECIES_LUGIA: + case SPECIES_HO_OH: + CreateBattleStartTask(B_TRANSITION_BLUR, BGM_FRLG_BATTLE_LEGENDARY); + break; + case SPECIES_MEW: + CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, BGM_BATTLE_MEW); + break; + } + + IncrementGameStat(GAME_STAT_TOTAL_BATTLES); + IncrementGameStat(GAME_STAT_WILD_BATTLES); + sub_80EECC8(); + sub_80B1218(); +} + +void StartGroudonKyogreBattle(void) +{ + ScriptContext2_Enable(); + gMain.savedCallback = CB2_EndScriptedWildBattle; + gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON; + + if (gGameVersion == VERSION_RUBY) + CreateBattleStartTask(B_TRANSITION_SHARDS, BGM_BATTLE34); // GROUDON + else + CreateBattleStartTask(B_TRANSITION_RIPPLE, BGM_BATTLE34); // KYOGRE + + IncrementGameStat(GAME_STAT_TOTAL_BATTLES); + IncrementGameStat(GAME_STAT_WILD_BATTLES); + sub_80EECC8(); + sub_80B1218(); +} + +void StartRegiBattle(void) +{ + u8 transitionId; + u16 species; + + ScriptContext2_Enable(); + gMain.savedCallback = CB2_EndScriptedWildBattle; + gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI; + + species = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES); + switch (species) + { + case SPECIES_REGIROCK: + transitionId = B_TRANSITION_REGIROCK; + break; + case SPECIES_REGICE: + transitionId = B_TRANSITION_REGICE; + break; + case SPECIES_REGISTEEL: + transitionId = B_TRANSITION_REGISTEEL; + break; + default: + transitionId = B_TRANSITION_GRID_SQUARES; + break; + } + CreateBattleStartTask(transitionId, BGM_BATTLE36); + + IncrementGameStat(GAME_STAT_TOTAL_BATTLES); + IncrementGameStat(GAME_STAT_WILD_BATTLES); + sub_80EECC8(); + sub_80B1218(); +} + +static void CB2_EndWildBattle(void) +{ + CpuFill16(0, (void*)(BG_PLTT), BG_PLTT_SIZE); + ResetOamRange(0, 128); + + if (IsPlayerDefeated(gBattleOutcome) == TRUE && !InBattlePyramid() && !InBattlePike()) + { + SetMainCallback2(CB2_WhiteOut); + } + else + { + SetMainCallback2(c2_exit_to_overworld_2_switch); + gFieldCallback = sub_80AF6F0; + } +} + +static void CB2_EndScriptedWildBattle(void) +{ + CpuFill16(0, (void*)(BG_PLTT), BG_PLTT_SIZE); + ResetOamRange(0, 128); + + if (IsPlayerDefeated(gBattleOutcome) == TRUE) + { + if (InBattlePyramid()) + SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + else + SetMainCallback2(CB2_WhiteOut); + } + else + { + SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + } +} + +u8 BattleSetup_GetTerrainId(void) +{ + u16 tileBehavior; + s16 x, y; + + PlayerGetDestCoords(&x, &y); + tileBehavior = MapGridGetMetatileBehaviorAt(x, y); + + if (MetatileBehavior_IsTallGrass(tileBehavior)) + return BATTLE_TERRAIN_GRASS; + if (MetatileBehavior_IsLongGrass(tileBehavior)) + return BATTLE_TERRAIN_LONG_GRASS; + if (MetatileBehavior_IsSandOrDeepSand(tileBehavior)) + return BATTLE_TERRAIN_SAND; + + switch (gMapHeader.mapType) + { + case MAP_TYPE_TOWN: + case MAP_TYPE_CITY: + case MAP_TYPE_ROUTE: + break; + case MAP_TYPE_UNDERGROUND: + if (MetatileBehavior_IsMB_0B(tileBehavior)) + return BATTLE_TERRAIN_BUILDING; + if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior)) + return BATTLE_TERRAIN_POND; + return BATTLE_TERRAIN_CAVE; + case MAP_TYPE_INDOOR: + case MAP_TYPE_SECRET_BASE: + return BATTLE_TERRAIN_BUILDING; + case MAP_TYPE_UNDERWATER: + return BATTLE_TERRAIN_UNDERWATER; + case MAP_TYPE_6: + if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior)) + return BATTLE_TERRAIN_WATER; + return BATTLE_TERRAIN_PLAIN; + } + if (MetatileBehavior_IsDeepOrOceanWater(tileBehavior)) + return BATTLE_TERRAIN_WATER; + if (MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior)) + return BATTLE_TERRAIN_POND; + if (MetatileBehavior_IsMountain(tileBehavior)) + return BATTLE_TERRAIN_MOUNTAIN; + if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING)) + { + if (MetatileBehavior_GetBridgeSth(tileBehavior)) + return BATTLE_TERRAIN_POND; + if (MetatileBehavior_IsBridge(tileBehavior) == TRUE) + return BATTLE_TERRAIN_WATER; + } + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE113) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE113)) + return BATTLE_TERRAIN_SAND; + if (GetSav1Weather() == 8) + return BATTLE_TERRAIN_SAND; + + return BATTLE_TERRAIN_PLAIN; +} + +static u8 GetBattleTransitionTypeByMap(void) +{ + u16 tileBehavior; + s16 x, y; + + PlayerGetDestCoords(&x, &y); + tileBehavior = MapGridGetMetatileBehaviorAt(x, y); + if (Overworld_GetFlashLevel()) + return B_TRANSITION_SHUFFLE; + if (!MetatileBehavior_IsSurfableWaterOrUnderwater(tileBehavior)) + { + switch (gMapHeader.mapType) + { + case MAP_TYPE_UNDERGROUND: + return B_TRANSITION_SWIRL; + case MAP_TYPE_UNDERWATER: + return B_TRANSITION_BIG_POKEBALL; + default: + return B_TRANSITION_BLUR; + } + } + return B_TRANSITION_BIG_POKEBALL; +} + +static u16 GetSumOfPlayerPartyLevel(u8 numMons) +{ + u8 sum = 0; + int i; + + for (i = 0; i < PARTY_SIZE; i++) + { + u32 species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2); + + if (species != SPECIES_EGG && species != SPECIES_NONE && GetMonData(&gPlayerParty[i], MON_DATA_HP) != 0) + { + sum += GetMonData(&gPlayerParty[i], MON_DATA_LEVEL); + if (--numMons == 0) + break; + } + } + return sum; +} + +static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons) +{ + u8 i; + u8 sum; + u32 count = numMons; + + if (gTrainers[opponentId].partySize < count) + count = gTrainers[opponentId].partySize; + + sum = 0; + + switch (gTrainers[opponentId].partyFlags) + { + case 0: + { + const struct TrainerMonNoItemDefaultMoves *party; + party = gTrainers[opponentId].party.NoItemDefaultMoves; + for (i = 0; i < count; i++) + sum += party[i].lvl; + } + break; + case F_TRAINER_PARTY_CUSTOM_MOVESET: + { + const struct TrainerMonNoItemCustomMoves *party; + party = gTrainers[opponentId].party.NoItemCustomMoves; + for (i = 0; i < count; i++) + sum += party[i].lvl; + } + break; + case F_TRAINER_PARTY_HELD_ITEM: + { + const struct TrainerMonItemDefaultMoves *party; + party = gTrainers[opponentId].party.ItemDefaultMoves; + for (i = 0; i < count; i++) + sum += party[i].lvl; + } + break; + 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].lvl; + } + break; + } + + return sum; +} + +static u8 GetWildBattleTransition(void) +{ + u8 transitionType = GetBattleTransitionTypeByMap(); + u8 enemyLevel = GetMonData(&gEnemyParty[0], MON_DATA_LEVEL); + u8 playerLevel = GetSumOfPlayerPartyLevel(1); + + if (enemyLevel < playerLevel) + { + if (InBattlePyramid()) + return B_TRANSITION_BLUR; + else + return sBattleTransitionTable_Wild[transitionType][0]; + } + else + { + if (InBattlePyramid()) + return B_TRANSITION_GRID_SQUARES; + else + return sBattleTransitionTable_Wild[transitionType][1]; + } +} + +static u8 GetTrainerBattleTransition(void) +{ + u8 minPartyCount; + u8 transitionType; + u8 enemyLevel; + u8 playerLevel; + + if (gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT) + return B_TRANSITION_CHAMPION; + + if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_ELITE_FOUR) + { + if (gTrainerBattleOpponent_A == TRAINER_SIDNEY) + return B_TRANSITION_SYDNEY; + if (gTrainerBattleOpponent_A == TRAINER_PHOEBE) + return B_TRANSITION_PHOEBE; + if (gTrainerBattleOpponent_A == TRAINER_GLACIA) + return B_TRANSITION_GLACIA; + if (gTrainerBattleOpponent_A == TRAINER_DRAKE) + return B_TRANSITION_DRAKE; + return B_TRANSITION_CHAMPION; + } + + if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_CHAMPION) + return B_TRANSITION_CHAMPION; + + if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_TEAM_MAGMA + || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_MAGMA_LEADER + || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_MAGMA_ADMIN) + return B_TRANSITION_MAGMA; + + if (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_TEAM_AQUA + || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_AQUA_LEADER + || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_AQUA_ADMIN) + return B_TRANSITION_AQUA; + + if (gTrainers[gTrainerBattleOpponent_A].doubleBattle == TRUE) + minPartyCount = 2; // double battles always at least have 2 pokemon. + else + minPartyCount = 1; + + transitionType = GetBattleTransitionTypeByMap(); + enemyLevel = GetSumOfEnemyPartyLevel(gTrainerBattleOpponent_A, minPartyCount); + playerLevel = GetSumOfPlayerPartyLevel(minPartyCount); + + if (enemyLevel < playerLevel) + return sBattleTransitionTable_Trainer[transitionType][0]; + else + return sBattleTransitionTable_Trainer[transitionType][1]; +} + +u8 sub_80B100C(s32 arg0) +{ + u16 var; + u8 enemyLevel = GetMonData(&gEnemyParty[0], MON_DATA_LEVEL); + u8 playerLevel = GetSumOfPlayerPartyLevel(1); + + if (enemyLevel < playerLevel) + { + switch (arg0) + { + case 11: + case 12: + case 13: + return B_TRANSITION_POKEBALLS_TRAIL; + case 10: + return sUnknown_0854FEA4[Random() % ARRAY_COUNT(sUnknown_0854FEA4)]; + case 3: + return sUnknown_0854FEA7[Random() % ARRAY_COUNT(sUnknown_0854FEA7)]; + } + + if (VarGet(VAR_0x40CE) != 3) + return sUnknown_0854FE98[Random() % ARRAY_COUNT(sUnknown_0854FE98)]; + } + else + { + switch (arg0) + { + case 11: + case 12: + case 13: + return B_TRANSITION_BIG_POKEBALL; + case 10: + return sUnknown_0854FEA4[Random() % ARRAY_COUNT(sUnknown_0854FEA4)]; + case 3: + return sUnknown_0854FEA7[Random() % ARRAY_COUNT(sUnknown_0854FEA7)]; + } + + if (VarGet(VAR_0x40CE) != 3) + return sUnknown_0854FE98[Random() % ARRAY_COUNT(sUnknown_0854FE98)]; + } + + var = gSaveBlock2Ptr->field_CB4[gSaveBlock2Ptr->battlePyramidWildHeaderId * 2 + 0] + + gSaveBlock2Ptr->field_CB4[gSaveBlock2Ptr->battlePyramidWildHeaderId * 2 + 1]; + + return sUnknown_0854FE98[var % ARRAY_COUNT(sUnknown_0854FE98)]; +} + +void ChooseStarter(void) +{ + SetMainCallback2(CB2_ChooseStarter); + gMain.savedCallback = CB2_GiveStarter; +} + +static void CB2_GiveStarter(void) +{ + u16 starterMon; + + *GetVarPointer(VAR_FIRST_POKE) = gSpecialVar_Result; + starterMon = GetStarterPokemon(gSpecialVar_Result); + ScriptGiveMon(starterMon, 5, 0, 0, 0, 0); + ResetTasks(); + PlayBattleBGM(); + SetMainCallback2(CB2_StartFirstBattle); + BattleTransition_Start(B_TRANSITION_BLUR); +} + +static void CB2_StartFirstBattle(void) +{ + UpdatePaletteFade(); + RunTasks(); + + if (IsBattleTransitionDone() == TRUE) + { + gBattleTypeFlags = BATTLE_TYPE_FIRST_BATTLE; + gMain.savedCallback = CB2_EndFirstBattle; + FreeAllWindowBuffers(); + SetMainCallback2(CB2_InitBattle); + prev_quest_postbuffer_cursor_backup_reset(); + ResetPoisonStepCounter(); + IncrementGameStat(GAME_STAT_TOTAL_BATTLES); + IncrementGameStat(GAME_STAT_WILD_BATTLES); + sub_80EECC8(); + sub_80B1218(); + } +} + +static void CB2_EndFirstBattle(void) +{ + Overworld_ClearSavedMusic(); + SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); +} + +static void sub_80B1218(void) +{ + if (GetGameStat(GAME_STAT_WILD_BATTLES) % 60 == 0) + sub_81DA57C(); +} + +static void sub_80B1234(void) +{ + if (GetGameStat(GAME_STAT_TRAINER_BATTLES) % 20 == 0) + sub_81DA57C(); +} + +// why not just use the macros? maybe its because they didnt want to uncast const every time? +static u32 TrainerBattleLoadArg32(const u8 *ptr) +{ + return T1_READ_32(ptr); +} + +static u16 TrainerBattleLoadArg16(const u8 *ptr) +{ + return T1_READ_16(ptr); +} + +static u8 TrainerBattleLoadArg8(const u8 *ptr) +{ + return T1_READ_8(ptr); +} + +static u16 GetTrainerAFlag(void) +{ + return FLAG_TRAINER_FLAG_START + gTrainerBattleOpponent_A; +} + +static u16 GetTrainerBFlag(void) +{ + return FLAG_TRAINER_FLAG_START + gTrainerBattleOpponent_B; +} + +static bool32 IsPlayerDefeated(u32 battleOutcome) +{ + switch (battleOutcome) + { + case BATTLE_LOST: + case BATTLE_DREW: + return TRUE; + case BATTLE_WON: + case BATTLE_RAN: + case BATTLE_PLAYER_TELEPORTED: + case BATTLE_POKE_FLED: + case BATTLE_CAUGHT: + return FALSE; + default: + return FALSE; + } +} + +void ResetTrainerOpponentIds(void) +{ + gTrainerBattleOpponent_A = 0; + gTrainerBattleOpponent_B = 0; +} + +static void InitTrainerBattleVariables(void) +{ + sTrainerBattleMode = 0; + if (gApproachingTrainerId == 0) + { + sTrainerAIntroSpeech = NULL; + sTrainerADefeatSpeech = NULL; + sTrainerABattleScriptRetAddr = NULL; + } + else + { + sTrainerBIntroSpeech = NULL; + sTrainerBDefeatSpeech = NULL; + sTrainerBBattleScriptRetAddr = NULL; + } + sTrainerMapObjectLocalId = 0; + sTrainerVictorySpeech = NULL; + sTrainerCannotBattleSpeech = NULL; + sTrainerBattleEndScript = NULL; +} + +static inline void SetU8(void *ptr, u8 value) +{ + *(u8*)(ptr) = value; +} + +static inline void SetU16(void *ptr, u16 value) +{ + *(u16*)(ptr) = value; +} + +static inline void SetU32(void *ptr, u32 value) +{ + *(u32*)(ptr) = value; +} + +static inline void SetPtr(const void *ptr, const void* value) +{ + *(const void**)(ptr) = value; +} + +static void TrainerBattleLoadArgs(const struct TrainerBattleParameter *specs, const u8 *data) +{ + while (1) + { + switch (specs->ptrType) + { + case TRAINER_PARAM_LOAD_VAL_8BIT: + SetU8(specs->varPtr, TrainerBattleLoadArg8(data)); + data += 1; + break; + case TRAINER_PARAM_LOAD_VAL_16BIT: + SetU16(specs->varPtr, TrainerBattleLoadArg16(data)); + data += 2; + break; + case TRAINER_PARAM_LOAD_VAL_32BIT: + SetU32(specs->varPtr, TrainerBattleLoadArg32(data)); + data += 4; + break; + case TRAINER_PARAM_CLEAR_VAL_8BIT: + SetU8(specs->varPtr, 0); + break; + case TRAINER_PARAM_CLEAR_VAL_16BIT: + SetU16(specs->varPtr, 0); + break; + case TRAINER_PARAM_CLEAR_VAL_32BIT: + SetU32(specs->varPtr, 0); + break; + case TRAINER_PARAM_LOAD_SCRIPT_RET_ADDR: + SetPtr(specs->varPtr, data); + return; + } + specs++; + } +} + +void SetMapVarsToTrainer(void) +{ + if (sTrainerMapObjectLocalId != 0) + { + gSpecialVar_LastTalked = sTrainerMapObjectLocalId; + gSelectedMapObject = GetFieldObjectIdByLocalIdAndMap(sTrainerMapObjectLocalId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); + } +} + +const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) +{ + InitTrainerBattleVariables(); + sTrainerBattleMode = TrainerBattleLoadArg8(data); + + switch (sTrainerBattleMode) + { + case 3: + TrainerBattleLoadArgs(sOrdinaryNoIntroBattleParams, data); + return EventScript_2713C2; + case 4: + TrainerBattleLoadArgs(sDoubleBattleParams, data); + SetMapVarsToTrainer(); + return EventScript_TryDoDoubleTrainerBattle; + case 2: + if (gApproachingTrainerId == 0) + { + TrainerBattleLoadArgs(sContinueScriptBattleParams, data); + SetMapVarsToTrainer(); + } + else + { + TrainerBattleLoadArgs(sTrainerBContinueScriptBattleParams, data); + } + return EventScript_271362; + case 1: + TrainerBattleLoadArgs(sContinueScriptBattleParams, data); + SetMapVarsToTrainer(); + return EventScript_271362; + case 6: + case 8: + TrainerBattleLoadArgs(sContinueScriptDoubleBattleParams, data); + SetMapVarsToTrainer(); + return EventScript_TryDoDoubleTrainerBattle; + case 7: + TrainerBattleLoadArgs(sDoubleBattleParams, data); + SetMapVarsToTrainer(); + gTrainerBattleOpponent_A = GetRematchTrainerId(gTrainerBattleOpponent_A); + return EventScript_TryDoDoubleRematchBattle; + case 5: + TrainerBattleLoadArgs(sOrdinaryBattleParams, data); + SetMapVarsToTrainer(); + gTrainerBattleOpponent_A = GetRematchTrainerId(gTrainerBattleOpponent_A); + return EventScript_2713D1; + case 9: + if (gApproachingTrainerId == 0) + { + TrainerBattleLoadArgs(sOrdinaryBattleParams, data); + SetMapVarsToTrainer(); + gTrainerBattleOpponent_A = sub_81A9AA8(gSpecialVar_LastTalked); + } + else + { + TrainerBattleLoadArgs(sTrainerBOrdinaryBattleParams, data); + gTrainerBattleOpponent_B = sub_81A9AA8(gSpecialVar_LastTalked); + } + return EventScript_271362; + case 10: + TrainerBattleLoadArgs(sOrdinaryBattleParams, data); + return NULL; + case 11: + TrainerBattleLoadArgs(sTrainerBOrdinaryBattleParams, data); + return NULL; + case 12: + if (gApproachingTrainerId == 0) + { + TrainerBattleLoadArgs(sOrdinaryBattleParams, data); + SetMapVarsToTrainer(); + gTrainerBattleOpponent_A = sub_81D6180(gSpecialVar_LastTalked); + } + else + { + TrainerBattleLoadArgs(sTrainerBOrdinaryBattleParams, data); + gTrainerBattleOpponent_B = sub_81D6180(gSpecialVar_LastTalked); + } + return EventScript_271362; + default: + if (gApproachingTrainerId == 0) + { + TrainerBattleLoadArgs(sOrdinaryBattleParams, data); + SetMapVarsToTrainer(); + } + else + { + TrainerBattleLoadArgs(sTrainerBOrdinaryBattleParams, data); + } + return EventScript_271362; + } +} + +void ConfigureAndSetUpOneTrainerBattle(u8 trainerMapObjId, const u8 *trainerScript) +{ + gSelectedMapObject = trainerMapObjId; + gSpecialVar_LastTalked = gMapObjects[trainerMapObjId].localId; + BattleSetup_ConfigureTrainerBattle(trainerScript + 1); + ScriptContext1_SetupScript(EventScript_271354); + ScriptContext2_Enable(); +} + +void ConfigureTwoTrainersBattle(u8 trainerMapObjId, const u8 *trainerScript) +{ + gSelectedMapObject = trainerMapObjId; + gSpecialVar_LastTalked = gMapObjects[trainerMapObjId].localId; + BattleSetup_ConfigureTrainerBattle(trainerScript + 1); +} + +void SetUpTwoTrainersBattle(void) +{ + ScriptContext1_SetupScript(EventScript_271354); + ScriptContext2_Enable(); +} + +bool32 GetTrainerFlagFromScriptPointer(const u8 *data) +{ + u32 flag = TrainerBattleLoadArg16(data + 2); + return FlagGet(FLAG_TRAINER_FLAG_START + flag); +} + +void sub_80B16D8(void) +{ + struct MapObject *mapObject = &gMapObjects[gSelectedMapObject]; + + npc_set_running_behaviour_etc(mapObject, npc_running_behaviour_by_direction(mapObject->mapobj_unk_18)); +} + +u8 GetTrainerBattleMode(void) +{ + return sTrainerBattleMode; +} + +bool8 GetTrainerFlag(void) +{ + if (InBattlePyramid()) + return GetBattlePyramidTrainerFlag(gSelectedMapObject); + else if (InTrainerHill()) + return GetTrainerHillTrainerFlag(gSelectedMapObject); + else + return FlagGet(GetTrainerAFlag()); +} + +static void SetBattledTrainersFlags(void) +{ + if (gTrainerBattleOpponent_B != 0) + FlagSet(GetTrainerBFlag()); + FlagSet(GetTrainerAFlag()); +} + +static void SetBattledTrainerFlag(void) +{ + FlagSet(GetTrainerAFlag()); +} + +bool8 HasTrainerBeenFought(u16 trainerId) +{ + return FlagGet(FLAG_TRAINER_FLAG_START + trainerId); +} + +void SetTrainerFlag(u16 trainerId) +{ + FlagSet(FLAG_TRAINER_FLAG_START + trainerId); +} + +void ClearTrainerFlag(u16 trainerId) +{ + FlagClear(FLAG_TRAINER_FLAG_START + trainerId); +} + +void BattleSetup_StartTrainerBattle(void) +{ + if (gNoOfApproachingTrainers == 2) + gBattleTypeFlags = (BATTLE_TYPE_DOUBLE | BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_TRAINER); + else + gBattleTypeFlags = (BATTLE_TYPE_TRAINER); + + if (InBattlePyramid()) + { + VarSet(VAR_0x400E, 0); + gBattleTypeFlags |= BATTLE_TYPE_PYRAMID; + + if (gNoOfApproachingTrainers == 2) + { + sub_816306C(1); + ZeroMonData(&gEnemyParty[1]); + ZeroMonData(&gEnemyParty[2]); + ZeroMonData(&gEnemyParty[4]); + ZeroMonData(&gEnemyParty[5]); + } + else + { + sub_8163048(1); + ZeroMonData(&gEnemyParty[1]); + ZeroMonData(&gEnemyParty[2]); + } + + sub_81A9B04(); + } + else if (sub_81D5C18()) + { + gBattleTypeFlags |= BATTLE_TYPE_x4000000; + + if (gNoOfApproachingTrainers == 2) + sub_81D639C(); + else + sub_81D6384(); + + sub_81D61E8(); + } + + sNoOfPossibleTrainerRetScripts = gNoOfApproachingTrainers; + gNoOfApproachingTrainers = 0; + sShouldCheckTrainerBScript = FALSE; + gUnknown_03006080 = 0; + gMain.savedCallback = CB2_EndTrainerBattle; + + if (InBattlePyramid() || sub_81D5C18()) + sub_80B0828(); + else + DoTrainerBattle(); + + ScriptContext1_Stop(); +} + +static void CB2_EndTrainerBattle(void) +{ + if (gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT) + { + SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + } + else if (IsPlayerDefeated(gBattleOutcome) == TRUE) + { + if (InBattlePyramid() || sub_81D5C18()) + SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + else + SetMainCallback2(CB2_WhiteOut); + } + else + { + SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + if (!InBattlePyramid() && !sub_81D5C18()) + { + RegisterTrainerInMatchCall(); + SetBattledTrainersFlags(); + } + } +} + +static void CB2_EndRematchBattle(void) +{ + if (gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT) + { + SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + } + else if (IsPlayerDefeated(gBattleOutcome) == TRUE) + { + SetMainCallback2(CB2_WhiteOut); + } + else + { + SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); + RegisterTrainerInMatchCall(); + SetBattledTrainersFlags(); + HandleRematchVarsOnBattleEnd(); + } +} + +void BattleSetup_StartRematchBattle(void) +{ + gBattleTypeFlags = BATTLE_TYPE_TRAINER; + gMain.savedCallback = CB2_EndRematchBattle; + DoTrainerBattle(); + ScriptContext1_Stop(); +} + +void ShowTrainerIntroSpeech(void) +{ + if (InBattlePyramid()) + { + if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1) + sub_81A9EDC(sub_81A9AA8(gSpecialVar_LastTalked)); + else + sub_81A9EDC(sub_81A9AA8(gMapObjects[gApproachingTrainers[gApproachingTrainerId].mapObjectId].localId)); + + sub_80982B8(); + } + else if (sub_81D5C18()) + { + if (gNoOfApproachingTrainers == 0 || gNoOfApproachingTrainers == 1) + sub_81D572C(2, sub_81D6180(gSpecialVar_LastTalked)); + else + sub_81D572C(2, sub_81D6180(gMapObjects[gApproachingTrainers[gApproachingTrainerId].mapObjectId].localId)); + + sub_80982B8(); + } + else + { + ShowFieldMessage(GetIntroSpeechOfApproachingTrainer()); + } +} + +const u8 *BattleSetup_GetScriptAddrAfterBattle(void) +{ + if (sTrainerBattleEndScript != NULL) + return sTrainerBattleEndScript; + else + return EventScript_TestSignpostMsg; +} + +const u8 *BattleSetup_GetTrainerPostBattleScript(void) +{ + if (sShouldCheckTrainerBScript) + { + sShouldCheckTrainerBScript = FALSE; + if (sTrainerBBattleScriptRetAddr != NULL) + { + gUnknown_03006080 = 1; + return sTrainerBBattleScriptRetAddr; + } + } + else + { + if (sTrainerABattleScriptRetAddr != NULL) + { + gUnknown_03006080 = 0; + return sTrainerABattleScriptRetAddr; + } + } + + return EventScript_TryGetTrainerScript; +} + +void ShowTrainerCantBattleSpeech(void) +{ + ShowFieldMessage(GetTrainerCantBattleSpeech()); +} + +void SetUpTrainerEncounterMusic(void) +{ + u16 trainerId; + u16 music; + + if (gApproachingTrainerId == 0) + trainerId = gTrainerBattleOpponent_A; + else + trainerId = gTrainerBattleOpponent_B; + + if (sTrainerBattleMode != TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC + && sTrainerBattleMode != TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC) + { + switch (GetTrainerEncounterMusicId(trainerId)) + { + case TRAINER_ENCOUNTER_MUSIC_MALE: + music = BGM_BOYEYE; + break; + case TRAINER_ENCOUNTER_MUSIC_FEMALE: + music = BGM_GIRLEYE; + break; + case TRAINER_ENCOUNTER_MUSIC_GIRL: + music = BGM_SYOUJOEYE; + break; + case TRAINER_ENCOUNTER_MUSIC_INTENSE: + music = BGM_HAGESHII; + break; + case TRAINER_ENCOUNTER_MUSIC_COOL: + music = BGM_KAKKOII; + break; + case TRAINER_ENCOUNTER_MUSIC_AQUA: + music = BGM_AQA_0; + break; + case TRAINER_ENCOUNTER_MUSIC_MAGMA: + music = BGM_MGM0; + break; + case TRAINER_ENCOUNTER_MUSIC_SWIMMER: + music = BGM_SWIMEYE; + break; + case TRAINER_ENCOUNTER_MUSIC_TWINS: + music = BGM_HUTAGO; + break; + case TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR: + music = BGM_SITENNOU; + break; + case TRAINER_ENCOUNTER_MUSIC_HIKER: + music = BGM_YAMA_EYE; + break; + case TRAINER_ENCOUNTER_MUSIC_INTERVIEWER: + music = BGM_INTER_V; + break; + case TRAINER_ENCOUNTER_MUSIC_RICH: + music = BGM_TEST; + break; + default: + music = BGM_AYASII; + } + PlayNewMapMusic(music); + } +} + +static const u8 *ReturnEmptyStringIfNull(const u8 *string) +{ + if (string == NULL) + return gText_EmptyString2; + else + return string; +} + +static const u8 *GetIntroSpeechOfApproachingTrainer(void) +{ + if (gApproachingTrainerId == 0) + return ReturnEmptyStringIfNull(sTrainerAIntroSpeech); + else + return ReturnEmptyStringIfNull(sTrainerBIntroSpeech); +} + +const u8 *GetTrainerALoseText(void) +{ + const u8 *string; + + if (gTrainerBattleOpponent_A == SECRET_BASE_OPPONENT) + string = GetSecretBaseTrainerLoseText(); + else + string = sTrainerADefeatSpeech; + + StringExpandPlaceholders(gStringVar4, ReturnEmptyStringIfNull(string)); + return gStringVar4; +} + +const u8 *GetTrainerBLoseText(void) +{ + StringExpandPlaceholders(gStringVar4, ReturnEmptyStringIfNull(sTrainerBDefeatSpeech)); + return gStringVar4; +} + +const u8 *GetTrainerWonSpeech(void) +{ + return ReturnEmptyStringIfNull(sTrainerVictorySpeech); +} + +static const u8 *GetTrainerCantBattleSpeech(void) +{ + return ReturnEmptyStringIfNull(sTrainerCannotBattleSpeech); +} + +static s32 FirstBattleTrainerIdToRematchTableId(const struct RematchTrainer *table, u16 trainerId) +{ + s32 i; + + for (i = 0; i < REMATCH_TABLE_ENTRIES; i++) + { + if (table[i].trainerIds[0] == trainerId) + return i; + } + + return -1; +} + +static s32 TrainerIdToRematchTableId(const struct RematchTrainer *table, u16 trainerId) +{ + s32 i, j; + + for (i = 0; i < REMATCH_TABLE_ENTRIES; i++) + { + for (j = 0; j < REMATCHES_COUNT; j++) + { + if (table[i].trainerIds[j] == 0) + break; + if (table[i].trainerIds[j] == trainerId) + return i; + } + } + + return -1; +} + +static bool32 sub_80B1D94(s32 rematchTableId) +{ + if (rematchTableId >= REMATCH_ELITE_FOUR_ENTRIES) + return TRUE; + else if (rematchTableId == REMATCH_WALLY_ENTRY) + return (FlagGet(FLAG_0x07E) == FALSE); + else + return FALSE; +} + +static void SetRematchIdForTrainer(const struct RematchTrainer *table, u32 tableId) +{ + s32 i; + + for (i = 1; i < REMATCHES_COUNT; i++) + { + u16 trainerId = table[tableId].trainerIds[i]; + + if (trainerId == 0) + break; + if (!HasTrainerBeenFought(trainerId)) + break; + } + + gSaveBlock1Ptr->trainerRematches[tableId] = i; +} + +static bool32 UpdateRandomTrainerRematches(const struct RematchTrainer *table, u16 mapGroup, u16 mapNum) +{ + s32 i; + bool32 ret = FALSE; + + for (i = 0; i <= REMATCH_WALLY_ENTRY; i++) + { + if (table[i].mapGroup == mapGroup && table[i].mapNum == mapNum && !sub_80B1D94(i)) + { + if (gSaveBlock1Ptr->trainerRematches[i] != 0) + { + // Trainer already wants a rematch. Don't bother updating it + ret = TRUE; + } + else if (FlagGet(FLAG_MATCH_CALL_REGISTERED + i) + && (Random() % 100) <= 30) // 31% chance of getting a rematch + { + SetRematchIdForTrainer(table, i); + ret = TRUE; + } + } + } + + return ret; +} + +void UpdateRematchIfDefeated(s32 rematchTableId) +{ + if (HasTrainerBeenFought(gRematchTable[rematchTableId].trainerIds[0]) == TRUE) + SetRematchIdForTrainer(gRematchTable, rematchTableId); +} + +static bool32 DoesSomeoneWantRematchIn_(const struct RematchTrainer *table, u16 mapGroup, u16 mapNum) +{ + s32 i; + + for (i = 0; i < REMATCH_TABLE_ENTRIES; i++) + { + if (table[i].mapGroup == mapGroup && table[i].mapNum == mapNum && gSaveBlock1Ptr->trainerRematches[i] != 0) + return TRUE; + } + + return FALSE; +} + +static bool32 IsRematchTrainerIn_(const struct RematchTrainer *table, u16 mapGroup, u16 mapNum) +{ + s32 i; + + for (i = 0; i < REMATCH_TABLE_ENTRIES; i++) + { + if (table[i].mapGroup == mapGroup && table[i].mapNum == mapNum) + return TRUE; + } + + return FALSE; +} + +static bool8 IsFirstTrainerIdReadyForRematch(const struct RematchTrainer *table, u16 firstBattleTrainerId) +{ + s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId); + + if (tableId == -1) + return FALSE; + if (tableId >= 100) + return FALSE; + if (gSaveBlock1Ptr->trainerRematches[tableId] == 0) + return FALSE; + + return TRUE; +} + +static bool8 IsTrainerReadyForRematch_(const struct RematchTrainer *table, u16 trainerId) +{ + s32 tableId = TrainerIdToRematchTableId(table, trainerId); + + if (tableId == -1) + return FALSE; + if (tableId >= 100) + return FALSE; + if (gSaveBlock1Ptr->trainerRematches[tableId] == 0) + return FALSE; + + return TRUE; +} + +static u16 GetRematchTrainerIdFromTable(const struct RematchTrainer *table, u16 firstBattleTrainerId) +{ + const struct RematchTrainer *trainerEntry; + s32 i; + s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId); + + if (tableId == -1) + return FALSE; + + trainerEntry = &table[tableId]; + for (i = 1; i < REMATCHES_COUNT; i++) + { + if (trainerEntry->trainerIds[i] == 0) // previous entry was this trainer's last one + return trainerEntry->trainerIds[i - 1]; + if (!HasTrainerBeenFought(trainerEntry->trainerIds[i])) + return trainerEntry->trainerIds[i]; + } + + return trainerEntry->trainerIds[REMATCHES_COUNT - 1]; // already beaten at max stage +} + +static u16 GetLastBeatenRematchTrainerIdFromTable(const struct RematchTrainer *table, u16 firstBattleTrainerId) +{ + const struct RematchTrainer *trainerEntry; + s32 i; + s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId); + + if (tableId == -1) + return FALSE; + + trainerEntry = &table[tableId]; + for (i = 1; i < REMATCHES_COUNT; i++) + { + if (trainerEntry->trainerIds[i] == 0) // previous entry was this trainer's last one + return trainerEntry->trainerIds[i - 1]; + if (!HasTrainerBeenFought(trainerEntry->trainerIds[i])) + return trainerEntry->trainerIds[i - 1]; + } + + return trainerEntry->trainerIds[REMATCHES_COUNT - 1]; // already beaten at max stage +} + +static void ClearTrainerWantRematchState(const struct RematchTrainer *table, u16 firstBattleTrainerId) +{ + s32 tableId = TrainerIdToRematchTableId(table, firstBattleTrainerId); + + if (tableId != -1) + gSaveBlock1Ptr->trainerRematches[tableId] = 0; +} + +static u32 GetTrainerMatchCallFlag(u32 trainerId) +{ + s32 i; + + for (i = 0; i < REMATCH_TABLE_ENTRIES; i++) + { + if (gRematchTable[i].trainerIds[0] == trainerId) + return FLAG_MATCH_CALL_REGISTERED + i; + } + + return 0xFFFF; +} + +static void RegisterTrainerInMatchCall(void) +{ + if (FlagGet(FLAG_HAS_MATCH_CALL)) + { + u32 matchCallFlagId = GetTrainerMatchCallFlag(gTrainerBattleOpponent_A); + if (matchCallFlagId != 0xFFFF) + FlagSet(matchCallFlagId); + } +} + +static bool8 WasSecondRematchWon(const struct RematchTrainer *table, u16 firstBattleTrainerId) +{ + s32 tableId = FirstBattleTrainerIdToRematchTableId(table, firstBattleTrainerId); + + if (tableId == -1) + return FALSE; + if (!HasTrainerBeenFought(table[tableId].trainerIds[1])) + return FALSE; + + return TRUE; +} + +static bool32 HasAtLeastFiveBadges(void) +{ + s32 i, count; + + for (count = 0, i = 0; i < ARRAY_COUNT(sBadgeFlags); i++) + { + if (FlagGet(sBadgeFlags[i]) == TRUE) + { + if (++count >= 5) + return TRUE; + } + } + + return FALSE; +} + +#define STEP_COUNTER_MAX 255 + +void IncrementRematchStepCounter(void) +{ + if (HasAtLeastFiveBadges()) + { + if (gSaveBlock1Ptr->trainerRematchStepCounter >= STEP_COUNTER_MAX) + gSaveBlock1Ptr->trainerRematchStepCounter = STEP_COUNTER_MAX; + else + gSaveBlock1Ptr->trainerRematchStepCounter++; + } +} + +static bool32 IsRematchStepCounterMaxed(void) +{ + if (HasAtLeastFiveBadges() && gSaveBlock1Ptr->trainerRematchStepCounter >= STEP_COUNTER_MAX) + return TRUE; + else + return FALSE; +} + +void TryUpdateRandomTrainerRematches(u16 mapGroup, u16 mapNum) +{ + if (IsRematchStepCounterMaxed() && UpdateRandomTrainerRematches(gRematchTable, mapGroup, mapNum) == TRUE) + gSaveBlock1Ptr->trainerRematchStepCounter = 0; +} + +bool32 DoesSomeoneWantRematchIn(u16 mapGroup, u16 mapNum) +{ + return DoesSomeoneWantRematchIn_(gRematchTable, mapGroup, mapNum); +} + +bool32 IsRematchTrainerIn(u16 mapGroup, u16 mapNum) +{ + return IsRematchTrainerIn_(gRematchTable, mapGroup, mapNum); +} + +static u16 GetRematchTrainerId(u16 trainerId) +{ + return GetRematchTrainerIdFromTable(gRematchTable, trainerId); +} + +u16 GetLastBeatenRematchTrainerId(u16 trainerId) +{ + return GetLastBeatenRematchTrainerIdFromTable(gRematchTable, trainerId); +} + +bool8 ShouldTryRematchBattle(void) +{ + if (IsFirstTrainerIdReadyForRematch(gRematchTable, gTrainerBattleOpponent_A)) + return TRUE; + + return WasSecondRematchWon(gRematchTable, gTrainerBattleOpponent_A); +} + +bool8 IsTrainerReadyForRematch(void) +{ + return IsTrainerReadyForRematch_(gRematchTable, gTrainerBattleOpponent_A); +} + +static void HandleRematchVarsOnBattleEnd(void) +{ + ClearTrainerWantRematchState(gRematchTable, gTrainerBattleOpponent_A); + SetBattledTrainersFlags(); +} + +void ShouldTryGetTrainerScript(void) +{ + if (sNoOfPossibleTrainerRetScripts > 1) + { + sNoOfPossibleTrainerRetScripts = 0; + sShouldCheckTrainerBScript = TRUE; + gSpecialVar_Result = TRUE; + } + else + { + sShouldCheckTrainerBScript = FALSE; + gSpecialVar_Result = FALSE; + } +} + +u16 CountBattledRematchTeams(u16 trainerId) +{ + s32 i; + + if (HasTrainerBeenFought(gRematchTable[trainerId].trainerIds[0]) != TRUE) + return 0; + + for (i = 1; i < REMATCHES_COUNT; i++) + { + if (gRematchTable[trainerId].trainerIds[i] == 0) + break; + if (!HasTrainerBeenFought(gRematchTable[trainerId].trainerIds[i])) + break; + } + + return i; +} diff --git a/src/berry_blender.c b/src/berry_blender.c index b1d36e2d9..810162746 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -134,8 +134,6 @@ extern u8 gInGameOpponentsNo; extern u8 gUnknown_020322D5; extern u8 gResultsWindowId; -extern const u8 * const gPokeblockNames[]; - // graphics extern const u8 gBerryBlenderArrowTiles[]; extern const u8 gBerryBlenderStartTiles[]; @@ -2444,7 +2442,7 @@ static void CB2_HandleBlenderEndGame(void) sBerryBlenderData->gameEndState++; break; case 10: - switch (sub_8198C58()) + switch (ProcessMenuInputNoWrap_()) { case 1: case -1: diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index bba39c3eb..195490543 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -35,9 +35,9 @@ static void berry_fix_bg_hide(void); // .rodata -static const u8 gUnknown_08617E78[] = _("Berry Program Update"); -static const u8 gUnknown_08617E8D[] = _("Ruby/Sapphire"); -static const u8 gUnknown_08617E9B[] = _("Emerald"); +static const u8 sUnknown_08617E78[] = _("Berry Program Update"); +static const u8 sUnknown_08617E8D[] = _("Ruby/Sapphire"); +static const u8 sUnknown_08617E9B[] = _("Emerald"); static const u8 Unknown_08617EA3[] = _("The Berry Program on your POKéMON\nRuby/Sapphire Game Pak will be updated.\n{COLOR RED}{SHADOW LIGHT_RED}Press the A Button."); static const u8 Unknown_08617F07[] = _("Please ensure the connection of your\nGame Boy Advance system matches this.\n{COLOR RED}{SHADOW LIGHT_RED}YES: Press the A Button.\nNO: Turn off the power and try again."); @@ -62,15 +62,15 @@ static const struct WindowTemplate gUnknown_08618110[] = { {-1} }; -static const u16 gUnknown_08618138[] = { +static const u16 sUnknown_08618138[] = { 0x7fff, 0x7fff, 0x318c, 0x675a, 0x043c, 0x3aff, 0x0664, 0x4bd2, 0x6546, 0x7b14, 0x7fff, 0x318c, 0x675a, 0x0000, 0x0000, 0x0000 }; -static const u8 gUnknown_08618158[] = {10, 11, 12}; -static const u8 gUnknown_0861815B[] = { 0, 10, 13}; +static const u8 sUnknown_08618158[] = {10, 11, 12}; +static const u8 sUnknown_0861815B[] = { 0, 10, 13}; static const u8 *const gUnknown_08618160[] = { Unknown_08617F07, @@ -243,21 +243,21 @@ static void berry_fix_gpu_set(void) InitWindows(gUnknown_08618110); DeactivateAllTextPrinters(); - DmaCopy32(3, gUnknown_08618138, BG_PLTT + 0x1E0, 0x20); + DmaCopy32(3, sUnknown_08618138, BG_PLTT + 0x1E0, 0x20); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP); FillWindowPixelBuffer(2, 0); FillWindowPixelBuffer(3, 0); FillWindowPixelBuffer(0, 0xAA); // This block is a meme among memes - width = (0x78 - GetStringWidth(0, gUnknown_08617E9B, 0)) / 2; - box_print(2, 0, width, 3, gUnknown_0861815B, -1, gUnknown_08617E9B); - width = (s32)(0x78 - GetStringWidth(0, gUnknown_08617E9B, 0)) / 2 + 0x78; - box_print(2, 0, width, 3, gUnknown_0861815B, -1, gUnknown_08617E8D); - width = (0x70 - GetStringWidth(0, gUnknown_08617E8D, 0)) / 2; - box_print(3, 0, width, 0, gUnknown_0861815B, -1, gUnknown_08617E8D); - width = (0xd0 - GetStringWidth(1, gUnknown_08617E78, 0)) / 2; - box_print(0, 1, width, 2, gUnknown_08618158, -1, gUnknown_08617E78); + width = (0x78 - GetStringWidth(0, sUnknown_08617E9B, 0)) / 2; + box_print(2, 0, width, 3, sUnknown_0861815B, -1, sUnknown_08617E9B); + width = (s32)(0x78 - GetStringWidth(0, sUnknown_08617E9B, 0)) / 2 + 0x78; + box_print(2, 0, width, 3, sUnknown_0861815B, -1, sUnknown_08617E8D); + width = (0x70 - GetStringWidth(0, sUnknown_08617E8D, 0)) / 2; + box_print(3, 0, width, 0, sUnknown_0861815B, -1, sUnknown_08617E8D); + width = (0xd0 - GetStringWidth(1, sUnknown_08617E78, 0)) / 2; + box_print(0, 1, width, 2, sUnknown_08618158, -1, sUnknown_08617E78); CopyWindowToVram(2, 2); CopyWindowToVram(3, 2); @@ -346,7 +346,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void) "\tldr r0, =gUnknown_08618110\n" "\tbl InitWindows\n" "\tbl DeactivateAllTextPrinters\n" - "\tldr r0, =gUnknown_08618138\n" + "\tldr r0, =sUnknown_08618138\n" "\tstr r0, [r4]\n" "\tldr r0, =0x050001e0\n" "\tstr r0, [r4, 0x4]\n" @@ -365,7 +365,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void) "\tmovs r0, 0\n" "\tmovs r1, 0xAA\n" "\tbl FillWindowPixelBuffer\n" - "\tldr r5, =gUnknown_08617E9B\n" + "\tldr r5, =sUnknown_08617E9B\n" "\tmovs r0, 0\n" "\tadds r1, r5, 0\n" "\tmovs r2, 0\n" @@ -378,7 +378,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void) "\tasrs r0, 1\n" "\tlsls r2, r0, 24\n" "\tlsrs r2, 24\n" - "\tldr r6, =gUnknown_0861815B\n" + "\tldr r6, =sUnknown_0861815B\n" "\tstr r6, [sp]\n" "\tmovs r0, 0x1\n" "\tnegs r0, r0\n" @@ -389,7 +389,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void) "\tmovs r1, 0\n" "\tmovs r3, 0x3\n" "\tbl box_print\n" - "\tldr r5, =gUnknown_08617E8D\n" + "\tldr r5, =sUnknown_08617E8D\n" "\tmovs r0, 0\n" "\tadds r1, r5, 0\n" "\tmovs r2, 0\n" @@ -431,7 +431,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void) "\tmovs r1, 0\n" "\tmovs r3, 0\n" "\tbl box_print\n" - "\tldr r4, =gUnknown_08617E78\n" + "\tldr r4, =sUnknown_08617E78\n" "\tmovs r0, 0x1\n" "\tadds r1, r4, 0\n" "\tmovs r2, 0\n" @@ -444,7 +444,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void) "\tasrs r0, 1\n" "\tlsls r2, r0, 24\n" "\tlsrs r2, 24\n" - "\tldr r0, =gUnknown_08618158\n" + "\tldr r0, =sUnknown_08618158\n" "\tstr r0, [sp]\n" "\tmov r0, r8\n" "\tstr r0, [sp, 0x4]\n" @@ -496,7 +496,7 @@ static void berry_fix_text_print(int scene) { FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 32, 32); FillWindowPixelBuffer(1, 0xAA); - box_print(1, 1, 0, 0, gUnknown_08618158, -1, gUnknown_08618160[scene]); + box_print(1, 1, 0, 0, sUnknown_08618158, -1, gUnknown_08618160[scene]); PutWindowTilemap(1); CopyWindowToVram(1, 2); switch (scene) diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c index d00944ac1..6d6a1545b 100755 --- a/src/clear_save_data_screen.c +++ b/src/clear_save_data_screen.c @@ -88,7 +88,7 @@ static void Task_DoClearSaveDataScreenYesNo(u8 taskId) static void Task_ClearSaveDataScreenYesNoChoice(u8 taskId) { - switch(sub_8198C58()) + switch(ProcessMenuInputNoWrap_()) { case 0: FillWindowPixelBuffer(0, 17); diff --git a/src/clock.c b/src/clock.c new file mode 100644 index 000000000..7cea30166 --- /dev/null +++ b/src/clock.c @@ -0,0 +1,93 @@ +#include "global.h" +#include "rom6.h" +#include "event_data.h" +#include "rtc.h" +#include "lottery_corner.h" +#include "dewford_trend.h" +#include "tv.h" +#include "field_screen.h" +#include "berry.h" +#include "main.h" +#include "overworld.h" +#include "wallclock.h" + +// static types + +// static declarations + +static void UpdatePerDay(struct Time *localTime); +static void UpdatePerMinute(struct Time *localTime); + +// rodata + +// text + +static void InitTimeBasedEvents(void) +{ + FlagSet(FLAG_SYS_CLOCK_SET); + RtcCalcLocalTime(); + gSaveBlock2Ptr->lastBerryTreeUpdate = gLocalTime; + VarSet(VAR_DAYS, gLocalTime.days); +} + +void DoTimeBasedEvents(void) +{ + if (FlagGet(FLAG_SYS_CLOCK_SET) && !sub_813B9C0()) + { + RtcCalcLocalTime(); + UpdatePerDay(&gLocalTime); + UpdatePerMinute(&gLocalTime); + } +} + +static void UpdatePerDay(struct Time *localTime) +{ + u16 *days = GetVarPointer(VAR_DAYS); + u16 daysSince; + + if (*days != localTime->days && *days <= localTime->days) + { + daysSince = localTime->days - *days; + ClearUpperFlags(); + UpdateDewfordTrendPerDay(daysSince); + UpdateTVShowsPerDay(daysSince); + UpdateWeatherPerDay(daysSince); + UpdatePartyPokerusTime(daysSince); + UpdateMirageRnd(daysSince); + UpdateBirchState(daysSince); + UpdateFrontierManiac(daysSince); + UpdateFrontierGambler(daysSince); + SetShoalItemFlag(daysSince); + SetRandomLotteryNumber(daysSince); + *days = localTime->days; + } +} + +static void UpdatePerMinute(struct Time *localTime) +{ + struct Time difference; + int minutes; + + CalcTimeDifference(&difference, &gSaveBlock2Ptr->lastBerryTreeUpdate, localTime); + minutes = 24 * 60 * difference.days + 60 * difference.hours + difference.minutes; + if (minutes != 0) + { + if (minutes >= 0) + { + BerryTreeTimeUpdate(minutes); + gSaveBlock2Ptr->lastBerryTreeUpdate = *localTime; + } + } +} + +static void ReturnFromStartWallClock(void) +{ + InitTimeBasedEvents(); + SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music); +} + +void StartWallClock(void) +{ + SetMainCallback2(Cb2_StartWallClock); + gMain.savedCallback = ReturnFromStartWallClock; +} diff --git a/src/daycare.c b/src/daycare.c index ce9952531..59ee562bd 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -40,7 +40,7 @@ extern const u8 gDaycareText_PlayOther[]; extern u8 GetCursorSelectionMonId(void); extern u16 ItemIdToBattleMoveId(u16); -extern s32 ListMenuHandleInput(u8); +extern s32 ListMenuHandleInputGetItemId(u8); extern void sub_81AE6C8(u8, u16*, u16*); extern void sub_819746C(u8, bool8); extern void sub_81973FC(u8, bool8); @@ -75,7 +75,7 @@ static const struct ListMenuItem sLevelMenuItems[] = static const struct ListMenuTemplate sDaycareListMenuLevelTemplate = { .items = sLevelMenuItems, - .unk_04 = sub_81AF078, + .moveCursorFunc = sub_81AF078, .unk_08 = DaycarePrintMonInfo, .totalItems = 3, .maxShowed = 3, @@ -90,7 +90,8 @@ static const struct ListMenuTemplate sDaycareListMenuLevelTemplate = .unk_16_0 = TRUE, .spaceBetweenItems = 0, .unk_16_7 = FALSE, - .unk_17_0 = 1 + .unk_17_0 = 1, + .cursorKind = 0 }; static const u8 *const sCompatibilityMessages[] = @@ -1256,7 +1257,7 @@ static void DaycarePrintMonInfo(u8 windowId, s32 daycareSlotId, u8 y) static void Task_HandleDaycareLevelMenuInput(u8 taskId) { - u32 var = ListMenuHandleInput(gTasks[taskId].tMenuListTaskId); + u32 var = ListMenuHandleInputGetItemId(gTasks[taskId].tMenuListTaskId); if (gMain.newKeys & A_BUTTON) { diff --git a/src/decoration.c b/src/decoration.c index 987e628c5..faef779b7 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -792,17 +792,17 @@ void sub_8127330(u8 taskId) for (i = 0; i < sDecorPCBuffer->unk_520 - 1; i ++) { sub_8127454(sDecorPCBuffer->names[i], gCurDecorInventoryItems[i]); - sDecorPCBuffer->items[i].unk_00 = sDecorPCBuffer->names[i]; - sDecorPCBuffer->items[i].unk_04 = i; + sDecorPCBuffer->items[i].name = sDecorPCBuffer->names[i]; + sDecorPCBuffer->items[i].id = i; } StringCopy(sDecorPCBuffer->names[i], gText_Cancel); - sDecorPCBuffer->items[i].unk_00 = sDecorPCBuffer->names[i]; - sDecorPCBuffer->items[i].unk_04 = -2; - gUnknown_03006310 = gUnknown_085A6BD0; - gUnknown_03006310.unk_10 = sDecorMenuWindowIndices[1]; - gUnknown_03006310.totalItems = sDecorPCBuffer->unk_520; - gUnknown_03006310.items = sDecorPCBuffer->items; - gUnknown_03006310.maxShowed = sDecorPCBuffer->unk_521; + sDecorPCBuffer->items[i].name = sDecorPCBuffer->names[i]; + sDecorPCBuffer->items[i].id = -2; + gMultiuseListMenuTemplate = gUnknown_085A6BD0; + gMultiuseListMenuTemplate.unk_10 = sDecorMenuWindowIndices[1]; + gMultiuseListMenuTemplate.totalItems = sDecorPCBuffer->unk_520; + gMultiuseListMenuTemplate.items = sDecorPCBuffer->items; + gMultiuseListMenuTemplate.maxShowed = sDecorPCBuffer->unk_521; } void sub_8127454(u8 *dest, u16 decorId) @@ -871,7 +871,7 @@ void sub_812759C(u8 taskId) sub_81272C8(); sub_81272F8(); sub_8127330(taskId); - data[13] = ListMenuInit(&gUnknown_03006310, sSecretBasePCSelectDecorPageNo, sSecretBasePCSelectDecorLineNo); + data[13] = ListMenuInit(&gMultiuseListMenuTemplate, sSecretBasePCSelectDecorPageNo, sSecretBasePCSelectDecorLineNo); sub_8127500(); } @@ -889,8 +889,8 @@ void sub_812764C(u8 taskId) data = gTasks[taskId].data; if (!gPaletteFade.active) { - input = ListMenuHandleInput(data[13]); - get_coro_args_x18_x1A(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo); + input = ListMenuHandleInputGetItemId(data[13]); + sub_81AE860(data[13], &sSecretBasePCSelectDecorPageNo, &sSecretBasePCSelectDecorLineNo); switch (input) { case -1: diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 032607806..721ba4a4f 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -48,9 +48,9 @@ extern struct SpriteTemplate gUnknown_0202499C; extern void (*gFieldCallback)(void); extern const struct CompressedSpriteSheet gMonFrontPicTable[]; -extern const u8 gUnknown_08C00000[]; -extern const u8 gUnknown_08C00524[]; -extern const u8 gUnknown_08C004E0[]; +extern const u8 gBattleTextboxTiles[]; +extern const u8 gBattleTextboxTilemap[]; +extern const u8 gBattleTextboxPalette[]; extern const u16 gUnknown_08DD7300[]; // palette, gameboy advance extern const u32 gUnknown_08DD7360[]; // tileset gameboy advance extern const u32 gUnknown_08331F60[]; // tilemap gameboy circle @@ -58,7 +58,7 @@ extern const u8 gText_HatchedFromEgg[]; extern const u8 gText_NickHatchPrompt[]; extern u8 sav1_map_get_name(void); -extern s8 sub_8198C58(void); +extern s8 ProcessMenuInputNoWrap_(void); extern void TVShowConvertInternationalString(u8* str1, u8* str2, u8); extern void sub_806A068(u16, u8); extern void fade_screen(u8, u8); @@ -91,7 +91,7 @@ static void CreateRandomEggShardSprite(void); static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8 spriteAnimIndex); // IWRAM bss -static IWRAM_DATA struct EggHatchData* sEggHatchData; +static IWRAM_DATA struct EggHatchData *sEggHatchData; // rom data static const u16 sEggPalette[] = INCBIN_U16("graphics/pokemon/palettes/egg_palette.gbapal"); @@ -522,9 +522,9 @@ static void CB2_EggHatch_0(void) gMain.state++; break; case 2: - copy_decompressed_tile_data_to_vram_autofree(0, gUnknown_08C00000, 0, 0, 0); - CopyToBgTilemapBuffer(0, gUnknown_08C00524, 0, 0); - LoadCompressedPalette(gUnknown_08C004E0, 0, 0x20); + copy_decompressed_tile_data_to_vram_autofree(0, gBattleTextboxTiles, 0, 0, 0); + CopyToBgTilemapBuffer(0, gBattleTextboxTilemap, 0, 0); + LoadCompressedPalette(gBattleTextboxPalette, 0, 0x20); gMain.state++; break; case 3: @@ -669,7 +669,7 @@ static void CB2_EggHatch_1(void) } break; case 10: - switch (sub_8198C58()) + switch (ProcessMenuInputNoWrap_()) { case 0: GetMonNick(&gPlayerParty[sEggHatchData->eggPartyID], gStringVar3); diff --git a/src/evolution_scene.c b/src/evolution_scene.c index c17921b74..2b88fec3a 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -1168,7 +1168,7 @@ static void Task_TradeEvolutionScene(u8 taskID) } break; case 4: - switch (sub_8198C58()) + switch (ProcessMenuInputNoWrap_()) { case 0: sEvoCursorPos = 0; diff --git a/src/field_map_obj.c b/src/field_map_obj.c index 6a99890a4..fc23a6e37 100755 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -1174,11 +1174,11 @@ void npc_by_local_id_and_map_set_field_1_bit_x20(u8 localId, u8 mapNum, u8 mapGr } } -void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, u8 *localId, u8 *mapNum, u8 *mapGroup) +void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, void *localId, void *mapNum, void *mapGroup) { - *localId = mapObject->localId; - *mapNum = mapObject->mapNum; - *mapGroup = mapObject->mapGroup; + *(u8*)(localId) = mapObject->localId; + *(u8*)(mapNum) = mapObject->mapNum; + *(u8*)(mapGroup) = mapObject->mapGroup; } void sub_808E75C(s16 x, s16 y) @@ -3426,7 +3426,7 @@ void FieldObjectCB_TreeDisguise(struct Sprite *sprite) mapObject = &gMapObjects[sprite->data[0]]; if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && !sprite->data[7])) { - FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]); + FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_TREE_DISGUISE); mapObject->mapobj_unk_21 = 1; sprite->data[7] ++; @@ -3447,7 +3447,7 @@ void FieldObjectCB_MountainDisguise(struct Sprite *sprite) mapObject = &gMapObjects[sprite->data[0]]; if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && !sprite->data[7])) { - FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]); + FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE); mapObject->mapobj_unk_21 = 1; sprite->data[7] ++; @@ -4694,7 +4694,7 @@ bool8 sub_80954CC(struct MapObject *mapObject, struct Sprite *sprite) bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]); + FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1); sprite->data[2] = 1; return TRUE; @@ -4702,7 +4702,7 @@ bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *s bool8 do_exclamation_mark_bubble_2(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]); + FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_2); sprite->data[2] = 1; return TRUE; @@ -4710,7 +4710,7 @@ bool8 do_exclamation_mark_bubble_2(struct MapObject *mapObject, struct Sprite *s bool8 do_heart_bubble(struct MapObject *mapObject, struct Sprite *sprite) { - FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]); + FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); FieldEffectStart(FLDEFF_HEART_ICON); sprite->data[2] = 1; return TRUE; diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 52babe346..239c5d690 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -187,9 +187,9 @@ static const struct BgTemplate sHof_BgTemplates[] = static const struct WindowTemplate sHof_WindowTemplate = {0, 2, 2, 0xE, 6, 0xE, 1}; -static const u8 gUnknown_085E5388[] = {0, 1, 2, 0}; +static const u8 sUnknown_085E5388[] = {0, 1, 2, 0}; -static const u8 gUnknown_085E538C[] = {0, 2, 3, 0, 4, 5, 0, 0}; +static const u8 sUnknown_085E538C[] = {0, 2, 3, 0, 4, 5, 0, 0}; static const struct CompressedSpriteSheet sHallOfFame_ConfettiSpriteSheet = { @@ -1137,7 +1137,7 @@ static void HallOfFame_PrintWelcomeText(u8 unusedPossiblyWindowId, u8 unused2) { FillWindowPixelBuffer(0, 0); PutWindowTilemap(0); - box_print(0, 1, GetStringCenterAlignXOffset(1, gText_WelcomeToHOF, 0xD0), 1, gUnknown_085E5388, 0, gText_WelcomeToHOF); + box_print(0, 1, GetStringCenterAlignXOffset(1, gText_WelcomeToHOF, 0xD0), 1, sUnknown_085E5388, 0, gText_WelcomeToHOF); CopyWindowToVram(0, 3); } @@ -1173,7 +1173,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u *(stringPtr)++ = CHAR_QUESTION_MARK; } stringPtr[0] = EOS; - box_print(0, 1, 0x10, 1, gUnknown_085E5388, -1, text); + box_print(0, 1, 0x10, 1, sUnknown_085E5388, -1, text); } // nick, species names, gender and level @@ -1182,13 +1182,13 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u if (currMon->species == SPECIES_EGG) { width = GetStringCenterAlignXOffset(1, text, 0xD0); - box_print(0, 1, width, 1, gUnknown_085E5388, -1, text); + box_print(0, 1, width, 1, sUnknown_085E5388, -1, text); CopyWindowToVram(0, 3); } else { width = GetStringRightAlignXOffset(1, text, 0x80); - box_print(0, 1, width, 1, gUnknown_085E5388, -1, text); + box_print(0, 1, width, 1, sUnknown_085E5388, -1, text); text[0] = CHAR_SLASH; stringPtr = StringCopy(text + 1, gSpeciesNames[currMon->species]); @@ -1209,15 +1209,15 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u } stringPtr[0] = EOS; - box_print(0, 1, 0x80, 1, gUnknown_085E5388, -1, text); + box_print(0, 1, 0x80, 1, sUnknown_085E5388, -1, text); stringPtr = StringCopy(text, gText_Level); ConvertIntToDecimalStringN(stringPtr, currMon->lvl, STR_CONV_MODE_LEFT_ALIGN, 3); - box_print(0, 1, 0x24, 0x11, gUnknown_085E5388, -1, text); + box_print(0, 1, 0x24, 0x11, sUnknown_085E5388, -1, text); stringPtr = StringCopy(text, gText_IDNumber); ConvertIntToDecimalStringN(stringPtr, (u16)(currMon->tid), STR_CONV_MODE_LEADING_ZEROS, 5); - box_print(0, 1, 0x68, 0x11, gUnknown_085E5388, -1, text); + box_print(0, 1, 0x68, 0x11, sUnknown_085E5388, -1, text); CopyWindowToVram(0, 3); } @@ -1232,13 +1232,13 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2) FillWindowPixelBuffer(1, 0x11); PutWindowTilemap(1); SetWindowBorderStyle(1, FALSE, 0x21D, 0xD); - box_print(1, 1, 0, 1, gUnknown_085E538C, -1, gText_Name); + box_print(1, 1, 0, 1, sUnknown_085E538C, -1, gText_Name); width = GetStringRightAlignXOffset(1, gSaveBlock2Ptr->playerName, 0x70); - box_print(1, 1, width, 1, gUnknown_085E538C, -1, gSaveBlock2Ptr->playerName); + box_print(1, 1, width, 1, sUnknown_085E538C, -1, gSaveBlock2Ptr->playerName); trainerId = (gSaveBlock2Ptr->playerTrainerId[0]) | (gSaveBlock2Ptr->playerTrainerId[1] << 8); - box_print(1, 1, 0, 0x11, gUnknown_085E538C, 0, gText_IDNumber); + box_print(1, 1, 0, 0x11, sUnknown_085E538C, 0, gText_IDNumber); text[0] = (trainerId % 100000) / 10000 + CHAR_0; text[1] = (trainerId % 10000) / 1000 + CHAR_0; text[2] = (trainerId % 1000) / 100 + CHAR_0; @@ -1246,9 +1246,9 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2) text[4] = (trainerId % 10) / 1 + CHAR_0; text[5] = EOS; width = GetStringRightAlignXOffset(1, text, 0x70); - box_print(1, 1, width, 0x11, gUnknown_085E538C, -1, text); + box_print(1, 1, width, 0x11, sUnknown_085E538C, -1, text); - box_print(1, 1, 0, 0x21, gUnknown_085E538C, -1, gText_MainMenuTime); + box_print(1, 1, 0, 0x21, sUnknown_085E538C, -1, gText_MainMenuTime); text[0] = (gSaveBlock2Ptr->playTimeHours / 100) + CHAR_0; text[1] = (gSaveBlock2Ptr->playTimeHours % 100) / 10 + CHAR_0; text[2] = (gSaveBlock2Ptr->playTimeHours % 10) + CHAR_0; @@ -1264,7 +1264,7 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2) text[6] = EOS; width = GetStringRightAlignXOffset(1, text, 0x70); - box_print(1, 1, width, 0x21, gUnknown_085E538C, -1, text); + box_print(1, 1, width, 0x21, sUnknown_085E538C, -1, text); CopyWindowToVram(1, 3); } diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 95270974a..927b87c72 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -29,10 +29,10 @@ static u8 sub_818E258(const u8 *); extern const u8 gText_Lady2[]; -static const u16 gUnknown_0860B074[] = { +static const u16 sUnknown_0860B074[] = { 0x62, 0xcb, 0xdc, 0xcc, 0xd1 }; -static const u16 gUnknown_0860B07E[] = { +static const u16 sUnknown_0860B07E[] = { 0x1a, 0x14, 0x0a }; @@ -119,11 +119,11 @@ static const u16 *const gUnknown_0860B1A4[] = { Unknown_0860B192 }; -static const u16 gUnknown_0860B1E4[] = { +static const u16 sUnknown_0860B1E4[] = { 0x0210, 0x0400, 0x0212, 0x1a26, 0x0208, 0x045d, 0x040a, 0x0411, 0x0464, 0x020e, 0x1a25, 0x181b, 0x1a24, 0x0420, 0x0410, 0x0400 }; -static const u16 gUnknown_0860B204[] = { +static const u16 sUnknown_0860B204[] = { 0x007b, 0x007f, 0x0081, 0x0023, 0x0023, 0x0023, 0x00a5, 0x00a7, 0x00a6, 0x000b, 0x012f, 0x006b, 0x006d, 0x0044, 0x0044, 0x000c }; @@ -176,7 +176,7 @@ static const u16 *const gUnknown_0860B2EC[] = { Unknown_0860B2D6 }; -static const u16 gUnknown_0860B304[] = { +static const u16 sUnknown_0860B304[] = { 0x0b, 0x6e, 0x40, 0x6f, 0x44, 0x47 }; @@ -218,7 +218,7 @@ static const u8 *const gUnknown_0860B338[] = { gUnknown_085EADE7 }; -static const u16 gUnknown_0860B34C[] = { +static const u16 sUnknown_0860B34C[] = { 0x0120, 0x013b, 0x011e, 0x013d, 0x0019 }; @@ -237,11 +237,11 @@ void sub_818D9C0(void) { LilycoveLady *lilycoveLady; - VarSet(VAR_0x4010, gUnknown_0860B07E[GetLilycoveLadyId()]); + VarSet(VAR_0x4010, sUnknown_0860B07E[GetLilycoveLadyId()]); if (GetLilycoveLadyId() == LILYCOVE_LADY_CONTEST) { lilycoveLady = &gSaveBlock1Ptr->lilycoveLady; - VarSet(VAR_0x4011, gUnknown_0860B074[lilycoveLady->contest.category]); + VarSet(VAR_0x4011, sUnknown_0860B074[lilycoveLady->contest.category]); gSpecialVar_Result = TRUE; } else @@ -481,7 +481,7 @@ u16 sub_818DEA0(void) u16 itemId; gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour; - itemId = gUnknown_0860B304[gUnknown_0203CD64->unk_00c]; + itemId = sUnknown_0860B304[gUnknown_0203CD64->unk_00c]; sub_818DE88(itemId); gUnknown_0203CD64->phase = 2; return itemId; @@ -508,8 +508,8 @@ static void sub_818DF00(void) { gUnknown_0203CD68->unk_002[i] = gUnknown_0860B1A4[v0][i]; } - gUnknown_0203CD68->unk_014 = gUnknown_0860B1E4[v0]; - gUnknown_0203CD68->itemId = gUnknown_0860B204[v0]; + gUnknown_0203CD68->unk_014 = sUnknown_0860B1E4[v0]; + gUnknown_0203CD68->itemId = sUnknown_0860B204[v0]; gUnknown_0203CD68->unk_02b = v0; gUnknown_0203CD68->playerName[0] = EOS; } @@ -581,13 +581,13 @@ u8 sub_818E06C(void) { i = 0; } - } while (sub_811F8D8(gUnknown_0860B1E4[i]) == 0); + } while (sub_811F8D8(sUnknown_0860B1E4[i]) == 0); for (j = 0; j < 9; j ++) { quiz->unk_002[j] = gUnknown_0860B1A4[i][j]; } - quiz->unk_014 = gUnknown_0860B1E4[i]; - quiz->itemId = gUnknown_0860B204[i]; + quiz->unk_014 = sUnknown_0860B1E4[i]; + quiz->itemId = sUnknown_0860B204[i]; quiz->unk_02b = i; quiz->playerName[0] = EOS; } @@ -943,7 +943,7 @@ static void sub_818E6B0(u8 sheen) } } -bool8 sub_818E704(struct Pokeblock *pokeblock) +bool8 GivePokeblockToContestLady(struct Pokeblock *pokeblock) { u8 sheen; bool8 response; @@ -1079,7 +1079,7 @@ void sub_818E914(void) void sub_818E92C(void) { - sub_81357FC(3, c2_exit_to_overworld_2_switch); + OpenPokeblockCase(3, c2_exit_to_overworld_2_switch); } void sub_818E940(void) @@ -1091,7 +1091,7 @@ void sub_818E940(void) void sub_818E960(void) { gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest; - gSpecialVar_0x8005 = gUnknown_0860B34C[gUnknown_0203CD6C->category]; + gSpecialVar_0x8005 = sUnknown_0860B34C[gUnknown_0203CD6C->category]; } u8 sub_818E990(void) diff --git a/src/load_save.c b/src/load_save.c index 2b40f2e92..e0106c0a8 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "global.h" #include "gba/flash_internal.h" #include "load_save.h" #include "main.h" @@ -28,7 +28,7 @@ struct LoadedSaveData /*0x00F0*/ struct ItemSlot pokeBalls[16]; /*0x0130*/ struct ItemSlot TMsHMs[64]; /*0x0230*/ struct ItemSlot berries[46]; - /*0x02E8*/ struct MailStruct mail[16]; + /*0x02E8*/ struct MailStruct mail[MAIL_COUNT]; }; EWRAM_DATA struct SaveBlock2 gSaveblock2 = {0}; @@ -330,7 +330,7 @@ void LoadSerializedGame(void) void copy_bags_and_unk_data_from_save_blocks(void) { int i; - + // load player items. for (i = 0; i < 30; i++) gLoadedSaveData.items[i] = gSaveBlock1Ptr->bagPocket_Items[i]; diff --git a/src/mail.c b/src/mail.c index 877035fb6..ec7ff2ce2 100644 --- a/src/mail.c +++ b/src/mail.c @@ -1,4 +1,5 @@ #include "global.h" +#include "mail.h" #include "constants/items.h" #include "main.h" #include "overworld.h" @@ -18,8 +19,43 @@ #include "constants/species.h" #include "malloc.h" #include "easy_chat.h" -#include "mail_data.h" -#include "mail.h" + +extern const u16 gUnknown_08DBE818[]; +extern const u16 gUnknown_08DBE838[]; +extern const u16 gUnknown_08DBE858[]; +extern const u16 gUnknown_08DBE878[]; +extern const u16 gUnknown_08DBE898[]; +extern const u16 gUnknown_08DBE8B8[]; +extern const u16 gUnknown_08DBE8D8[]; +extern const u16 gUnknown_08DBE8F8[]; +extern const u16 gUnknown_08DBE918[]; +extern const u16 gUnknown_08DBE938[]; +extern const u16 gUnknown_08DBE958[]; +extern const u16 gUnknown_08DBE978[]; +extern const u8 gUnknown_08DBE998[]; +extern const u8 gUnknown_08DBFBA4[]; +extern const u8 gUnknown_08DBEB38[]; +extern const u8 gUnknown_08DBFC7C[]; +extern const u8 gUnknown_08DBEC74[]; +extern const u8 gUnknown_08DBFD5C[]; +extern const u8 gUnknown_08DBEE84[]; +extern const u8 gUnknown_08DBFE68[]; +extern const u8 gUnknown_08DBEF5C[]; +extern const u8 gUnknown_08DBFF44[]; +extern const u8 gUnknown_08DBF154[]; +extern const u8 gUnknown_08DC0034[]; +extern const u8 gUnknown_08DBF2D4[]; +extern const u8 gUnknown_08DC0114[]; +extern const u8 gUnknown_08DBF37C[]; +extern const u8 gUnknown_08DC01F4[]; +extern const u8 gUnknown_08DBF50C[]; +extern const u8 gUnknown_08DC0300[]; +extern const u8 gUnknown_08DBF64C[]; +extern const u8 gUnknown_08DC03F0[]; +extern const u8 gUnknown_08DBF7B4[]; +extern const u8 gUnknown_08DC04E8[]; +extern const u8 gUnknown_08DBF904[]; +extern const u8 gUnknown_08DC0600[]; // Static type declarations @@ -51,9 +87,7 @@ struct MailGraphics u16 color12; }; -// Static RAM declarations - -static EWRAM_DATA struct +struct MailRead { /*0x0000*/ u8 strbuf[8][64]; /*0x0200*/ u8 playerName[12]; @@ -72,22 +106,26 @@ static EWRAM_DATA struct /*0x0228*/ const struct MailLayout *layout; /*0x022c*/ u8 bg1TilemapBuffer[0x1000]; /*0x122c*/ u8 bg2TilemapBuffer[0x1000]; -} *gUnknown_0203A134 = NULL; +}; + +// Static RAM declarations + +static EWRAM_DATA struct MailRead *sMailRead = NULL; // Static ROM declarations -void sub_81219F0(void); -void sub_8121A1C(void); -void sub_8121B1C(void); -void sub_8121C50(void); -void sub_8121C64(void); -void sub_8121C98(void); -void sub_8121CC0(void); -void sub_8121D00(void); +static void CB2_InitMailRead(void); +static void sub_8121A1C(void); +static void sub_8121B1C(void); +static void VBlankCB_MailRead(void); +static void CB2_MailRead(void); +static void CB2_WaitForPaletteExitOnKeyPress(void); +static void CB2_ExitOnKeyPress(void); +static void CB2_ExitMailReadFreeVars(void); // .rodata -const struct BgTemplate gUnknown_0859F290[] = { +static const struct BgTemplate sUnknown_0859F290[] = { { .bg = 0, .charBaseIndex = 2, @@ -106,7 +144,7 @@ const struct BgTemplate gUnknown_0859F290[] = { } }; -const struct WindowTemplate gUnknown_0859F29C[] = { +static const struct WindowTemplate sUnknown_0859F29C[] = { { .priority = 0, .tilemapLeft = 2, @@ -119,55 +157,18 @@ const struct WindowTemplate gUnknown_0859F29C[] = { DUMMY_WIN_TEMPLATE }; -const u8 gUnknown_0859F2AC[] = { +static const u8 sUnknown_0859F2AC[] = { 0, 10, 11 }; -const u16 gUnknown_0859F2B0[][2] = { +static const u16 sUnknown_0859F2B0[][2] = { { 0x6ACD, 0x51A5 }, { 0x45FC, 0x38D4 } }; -extern const u16 gUnknown_08DBE818[]; -extern const u16 gUnknown_08DBE838[]; -extern const u16 gUnknown_08DBE858[]; -extern const u16 gUnknown_08DBE878[]; -extern const u16 gUnknown_08DBE898[]; -extern const u16 gUnknown_08DBE8B8[]; -extern const u16 gUnknown_08DBE8D8[]; -extern const u16 gUnknown_08DBE8F8[]; -extern const u16 gUnknown_08DBE918[]; -extern const u16 gUnknown_08DBE938[]; -extern const u16 gUnknown_08DBE958[]; -extern const u16 gUnknown_08DBE978[]; -extern const u8 gUnknown_08DBE998[]; -extern const u8 gUnknown_08DBFBA4[]; -extern const u8 gUnknown_08DBEB38[]; -extern const u8 gUnknown_08DBFC7C[]; -extern const u8 gUnknown_08DBEC74[]; -extern const u8 gUnknown_08DBFD5C[]; -extern const u8 gUnknown_08DBEE84[]; -extern const u8 gUnknown_08DBFE68[]; -extern const u8 gUnknown_08DBEF5C[]; -extern const u8 gUnknown_08DBFF44[]; -extern const u8 gUnknown_08DBF154[]; -extern const u8 gUnknown_08DC0034[]; -extern const u8 gUnknown_08DBF2D4[]; -extern const u8 gUnknown_08DC0114[]; -extern const u8 gUnknown_08DBF37C[]; -extern const u8 gUnknown_08DC01F4[]; -extern const u8 gUnknown_08DBF50C[]; -extern const u8 gUnknown_08DC0300[]; -extern const u8 gUnknown_08DBF64C[]; -extern const u8 gUnknown_08DC03F0[]; -extern const u8 gUnknown_08DBF7B4[]; -extern const u8 gUnknown_08DC04E8[]; -extern const u8 gUnknown_08DBF904[]; -extern const u8 gUnknown_08DC0600[]; - -const struct MailGraphics gUnknown_0859F2B8[] = { +static const struct MailGraphics sUnknown_0859F2B8[] = { { gUnknown_08DBE818, gUnknown_08DBE998, gUnknown_08DBFBA4, 0x02c0, 0x0000, 0x294a, 0x6739 }, { @@ -195,13 +196,13 @@ const struct MailGraphics gUnknown_0859F2B8[] = { } }; -const struct UnkMailStruct Unknown_0859F3A8[] = { +static const struct UnkMailStruct Unknown_0859F3A8[] = { { .numEasyChatWords = 3, .lineHeight = 16 }, { .numEasyChatWords = 3, .lineHeight = 16 }, { .numEasyChatWords = 3, .lineHeight = 16 } }; -const struct MailLayout gUnknown_0859F3B4[] = { +static const struct MailLayout sUnknown_0859F3B4[] = { { 0x03, 0x00, 0x00, 0x02, 0x04, Unknown_0859F3A8 }, { 0x03, 0x00, 0x00, 0x02, 0x04, Unknown_0859F3A8 }, { 0x03, 0x00, 0x00, 0x02, 0x04, Unknown_0859F3A8 }, @@ -216,7 +217,7 @@ const struct MailLayout gUnknown_0859F3B4[] = { { 0x03, 0x00, 0x00, 0x02, 0x00, Unknown_0859F3A8 } }; -const struct UnkMailStruct Unknown_0859F444[] = { +static const struct UnkMailStruct Unknown_0859F444[] = { { .numEasyChatWords = 2, .lineHeight = 16 }, { .numEasyChatWords = 2, .lineHeight = 16 }, { .numEasyChatWords = 2, .lineHeight = 16 }, @@ -224,7 +225,7 @@ const struct UnkMailStruct Unknown_0859F444[] = { { .numEasyChatWords = 1, .lineHeight = 16 } }; -const struct MailLayout gUnknown_0859F458[] = { +static const struct MailLayout sUnknown_0859F458[] = { { 0x05, 0x07, 0x58, 0x0b, 0x1e, Unknown_0859F444 }, { 0x05, 0x0a, 0x60, 0x09, 0x1e, Unknown_0859F444 }, { 0x05, 0x0c, 0x68, 0x05, 0x1e, Unknown_0859F444 }, @@ -241,23 +242,23 @@ const struct MailLayout gUnknown_0859F458[] = { // What the heck are these meant to be? Call them u16 for now. -const u16 Unknown_0859F4E8[] = { +static const u16 Unknown_0859F4E8[] = { 0x00, 0x4000, 0x00, 0x00 }; -const u16 Unknown_0859F4F0[] = { +static const u16 Unknown_0859F4F0[] = { 0x00, 0x00, -1, 0x00 }; -const u16 Unknown_0859F4F8[] = { +static const u16 Unknown_0859F4F8[] = { 0x04, 0x00, -1, 0x00 }; -const u16 Unknown_0859F500[] = { +static const u16 Unknown_0859F500[] = { 0x00, 0x40, -1, 0x00 }; -const u16 *const gUnknown_0859F508[] = { +static const u16 *const sUnknown_0859F508[] = { Unknown_0859F4F0, Unknown_0859F4F8, Unknown_0859F500 @@ -265,60 +266,62 @@ const u16 *const gUnknown_0859F508[] = { // .text -void sub_8121478(struct MailStruct *mail, MainCallback callback, bool8 flag) { +void ReadMail(struct MailStruct *mail, void (*callback)(void), bool8 flag) +{ u16 buffer[2]; u16 species; - gUnknown_0203A134 = calloc(1, sizeof(*gUnknown_0203A134)); - gUnknown_0203A134->language = LANGUAGE_ENGLISH; - gUnknown_0203A134->playerIsSender = TRUE; - gUnknown_0203A134->parserSingle = CopyEasyChatWord; - gUnknown_0203A134->parserMultiple = ConvertEasyChatWordsToString; - if (mail->itemId >= ITEM_ORANGE_MAIL && mail->itemId <= ITEM_RETRO_MAIL) { - gUnknown_0203A134->mailType = mail->itemId - ITEM_ORANGE_MAIL; + sMailRead = calloc(1, sizeof(*sMailRead)); + sMailRead->language = LANGUAGE_ENGLISH; + sMailRead->playerIsSender = TRUE; + sMailRead->parserSingle = CopyEasyChatWord; + sMailRead->parserMultiple = ConvertEasyChatWordsToString; + if (IS_ITEM_MAIL(mail->itemId)) + { + sMailRead->mailType = mail->itemId - ITEM_ORANGE_MAIL; } else { - gUnknown_0203A134->mailType = 0; + sMailRead->mailType = 0; flag = FALSE; } - switch (gUnknown_0203A134->playerIsSender) + switch (sMailRead->playerIsSender) { case FALSE: default: - gUnknown_0203A134->layout = &gUnknown_0859F3B4[gUnknown_0203A134->mailType]; + sMailRead->layout = &sUnknown_0859F3B4[sMailRead->mailType]; break; case TRUE: - gUnknown_0203A134->layout = &gUnknown_0859F458[gUnknown_0203A134->mailType]; + sMailRead->layout = &sUnknown_0859F458[sMailRead->mailType]; break; } - species = sub_80D45E8(mail->species, buffer); + species = MailSpeciesToSpecies(mail->species, buffer); if (species >= SPECIES_BULBASAUR && species < NUM_SPECIES) { - switch (gUnknown_0203A134->mailType) + switch (sMailRead->mailType) { default: - gUnknown_0203A134->animsActive = 0; + sMailRead->animsActive = 0; break; case ITEM_BEAD_MAIL - ITEM_ORANGE_MAIL: - gUnknown_0203A134->animsActive = 1; + sMailRead->animsActive = 1; break; case ITEM_DREAM_MAIL - ITEM_ORANGE_MAIL: - gUnknown_0203A134->animsActive = 2; + sMailRead->animsActive = 2; break; } } else { - gUnknown_0203A134->animsActive = 0; + sMailRead->animsActive = 0; } - gUnknown_0203A134->mail = mail; - gUnknown_0203A134->callback = callback; - gUnknown_0203A134->flag = flag; - SetMainCallback2(sub_81219F0); + sMailRead->mail = mail; + sMailRead->callback = callback; + sMailRead->flag = flag; + SetMainCallback2(CB2_InitMailRead); } -bool8 sub_81215EC(void) +static bool8 MailReadBuildGraphics(void) { u16 icon; @@ -352,21 +355,21 @@ bool8 sub_81215EC(void) SetGpuReg(REG_OFFSET_BG2HOFS, 0x0000); SetGpuReg(REG_OFFSET_BG3HOFS, 0x0000); SetGpuReg(REG_OFFSET_BG3VOFS, 0x0000); - SetGpuReg(REG_OFFSET_BLDCNT, 0x0000); + SetGpuReg(REG_OFFSET_BLDCNT, 0x0000); SetGpuReg(REG_OFFSET_BLDALPHA, 0x0000); break; case 6: ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, gUnknown_0859F290, 3); - SetBgTilemapBuffer(1, gUnknown_0203A134->bg1TilemapBuffer); - SetBgTilemapBuffer(2, gUnknown_0203A134->bg2TilemapBuffer); + InitBgsFromTemplates(0, sUnknown_0859F290, 3); + SetBgTilemapBuffer(1, sMailRead->bg1TilemapBuffer); + SetBgTilemapBuffer(2, sMailRead->bg2TilemapBuffer); break; case 7: - InitWindows(gUnknown_0859F29C); + InitWindows(sUnknown_0859F29C); DeactivateAllTextPrinters(); break; case 8: - decompress_and_copy_tile_data_to_vram(1, gUnknown_0859F2B8[gUnknown_0203A134->mailType].tiles, 0, 0, 0); + decompress_and_copy_tile_data_to_vram(1, sUnknown_0859F2B8[sMailRead->mailType].tiles, 0, 0, 0); break; case 9: if (free_temp_tile_data_buffers_if_possible()) @@ -377,7 +380,7 @@ bool8 sub_81215EC(void) case 10: FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20); FillBgTilemapBufferRect_Palette0(2, 1, 0, 0, 30, 20); - CopyToBgTilemapBuffer(1, gUnknown_0859F2B8[gUnknown_0203A134->mailType].tileMap, 0, 0); + CopyToBgTilemapBuffer(1, sUnknown_0859F2B8[sMailRead->mailType].tileMap, 0, 0); break; case 11: CopyBgTilemapBufferToVram(0); @@ -386,24 +389,24 @@ bool8 sub_81215EC(void) break; case 12: LoadPalette(GetOverworldTextboxPalettePtr(), 240, 32); - gPlttBufferUnfaded[250] = gUnknown_0859F2B8[gUnknown_0203A134->mailType].color10; - gPlttBufferFaded[250] = gUnknown_0859F2B8[gUnknown_0203A134->mailType].color10; - gPlttBufferUnfaded[251] = gUnknown_0859F2B8[gUnknown_0203A134->mailType].color12; - gPlttBufferFaded[251] = gUnknown_0859F2B8[gUnknown_0203A134->mailType].color12; - LoadPalette(gUnknown_0859F2B8[gUnknown_0203A134->mailType].palette, 0, 32); - gPlttBufferUnfaded[10] = gUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][0]; - gPlttBufferFaded[10] = gUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][0]; - gPlttBufferUnfaded[11] = gUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][1]; - gPlttBufferFaded[11] = gUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][1]; + gPlttBufferUnfaded[250] = sUnknown_0859F2B8[sMailRead->mailType].color10; + gPlttBufferFaded[250] = sUnknown_0859F2B8[sMailRead->mailType].color10; + gPlttBufferUnfaded[251] = sUnknown_0859F2B8[sMailRead->mailType].color12; + gPlttBufferFaded[251] = sUnknown_0859F2B8[sMailRead->mailType].color12; + LoadPalette(sUnknown_0859F2B8[sMailRead->mailType].palette, 0, 32); + gPlttBufferUnfaded[10] = sUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][0]; + gPlttBufferFaded[10] = sUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][0]; + gPlttBufferUnfaded[11] = sUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][1]; + gPlttBufferFaded[11] = sUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][1]; break; case 13: - if (gUnknown_0203A134->flag) + if (sMailRead->flag) { sub_8121A1C(); } break; case 14: - if (gUnknown_0203A134->flag) + if (sMailRead->flag) { sub_8121B1C(); RunTextPrinters(); @@ -416,20 +419,20 @@ bool8 sub_81215EC(void) } break; case 16: - SetVBlankCallback(sub_8121C50); + SetVBlankCallback(VBlankCB_MailRead); gPaletteFade.bufferTransferDisabled = TRUE; break; case 17: - icon = sub_80D2E84(gUnknown_0203A134->mail->species); - switch (gUnknown_0203A134->animsActive) + icon = sub_80D2E84(sMailRead->mail->species); + switch (sMailRead->animsActive) { case 1: sub_80D2F68(icon); - gUnknown_0203A134->monIconSprite = sub_80D2D78(icon, SpriteCallbackDummy, 0x60, 0x80, 0, 0); + sMailRead->monIconSprite = sub_80D2D78(icon, SpriteCallbackDummy, 0x60, 0x80, 0, 0); break; case 2: sub_80D2F68(icon); - gUnknown_0203A134->monIconSprite = sub_80D2D78(icon, SpriteCallbackDummy, 0x28, 0x80, 0, 0); + sMailRead->monIconSprite = sub_80D2D78(icon, SpriteCallbackDummy, 0x28, 0x80, 0, 0); break; } break; @@ -440,53 +443,53 @@ bool8 sub_81215EC(void) ShowBg(2); BeginNormalPaletteFade(-1, 0, 16, 0, 0); gPaletteFade.bufferTransferDisabled = FALSE; - gUnknown_0203A134->callback2 = sub_8121C98; + sMailRead->callback2 = CB2_WaitForPaletteExitOnKeyPress; return TRUE; default: return FALSE; } - gMain.state ++; + gMain.state++; return FALSE; } -void sub_81219F0(void) +static void CB2_InitMailRead(void) { do { - if (sub_81215EC() == TRUE) + if (MailReadBuildGraphics() == TRUE) { - SetMainCallback2(sub_8121C64); + SetMainCallback2(CB2_MailRead); break; } } while (sub_81221AC() != TRUE); } -void sub_8121A1C(void) +static void sub_8121A1C(void) { u16 i; u8 total; u8 *ptr; total = 0; - for (i = 0; i < gUnknown_0203A134->layout->numSubStructs; i ++) + for (i = 0; i < sMailRead->layout->numSubStructs; i ++) { - ConvertEasyChatWordsToString(gUnknown_0203A134->strbuf[i], &gUnknown_0203A134->mail->words[total], gUnknown_0203A134->layout->var8[i].numEasyChatWords, 1); - total += gUnknown_0203A134->layout->var8[i].numEasyChatWords; + ConvertEasyChatWordsToString(sMailRead->strbuf[i], &sMailRead->mail->words[total], sMailRead->layout->var8[i].numEasyChatWords, 1); + total += sMailRead->layout->var8[i].numEasyChatWords; } - ptr = StringCopy(gUnknown_0203A134->playerName, gUnknown_0203A134->mail->playerName); - if (!gUnknown_0203A134->playerIsSender) + ptr = StringCopy(sMailRead->playerName, sMailRead->mail->playerName); + if (!sMailRead->playerIsSender) { StringCopy(ptr, gText_FromSpace); - gUnknown_0203A134->signatureWidth = gUnknown_0203A134->layout->signatureWidth - (StringLength(gUnknown_0203A134->playerName) * 8 - 0x60); + sMailRead->signatureWidth = sMailRead->layout->signatureWidth - (StringLength(sMailRead->playerName) * 8 - 0x60); } else { - sub_81DB52C(gUnknown_0203A134->playerName); - gUnknown_0203A134->signatureWidth = gUnknown_0203A134->layout->signatureWidth; + sub_81DB52C(sMailRead->playerName); + sMailRead->signatureWidth = sMailRead->layout->signatureWidth; } } -void sub_8121B1C(void) +static void sub_8121B1C(void) { u16 i; u8 strbuf[0x20]; @@ -500,77 +503,76 @@ void sub_8121B1C(void) PutWindowTilemap(1); FillWindowPixelBuffer(0, 0); FillWindowPixelBuffer(1, 0); - for (i = 0; i < gUnknown_0203A134->layout->numSubStructs; i ++) + for (i = 0; i < sMailRead->layout->numSubStructs; i ++) { - if (gUnknown_0203A134->strbuf[i][0] == EOS || gUnknown_0203A134->strbuf[i][0] == CHAR_SPACE) + if (sMailRead->strbuf[i][0] == EOS || sMailRead->strbuf[i][0] == CHAR_SPACE) { continue; } - box_print(0, 1, gUnknown_0203A134->layout->var8[i].xOffset + gUnknown_0203A134->layout->wordsYPos, y + gUnknown_0203A134->layout->wordsXPos, gUnknown_0859F2AC, 0, gUnknown_0203A134->strbuf[i]); - y += gUnknown_0203A134->layout->var8[i].lineHeight; + box_print(0, 1, sMailRead->layout->var8[i].xOffset + sMailRead->layout->wordsYPos, y + sMailRead->layout->wordsXPos, sUnknown_0859F2AC, 0, sMailRead->strbuf[i]); + y += sMailRead->layout->var8[i].lineHeight; } bufptr = StringCopy(strbuf, gText_FromSpace); - StringCopy(bufptr, gUnknown_0203A134->playerName); - box_x = GetStringCenterAlignXOffset(1, strbuf, gUnknown_0203A134->signatureWidth) + 0x68; - box_y = gUnknown_0203A134->layout->signatureYPos + 0x58; - box_print(0, 1, box_x, box_y, gUnknown_0859F2AC, 0, strbuf); + StringCopy(bufptr, sMailRead->playerName); + box_x = GetStringCenterAlignXOffset(1, strbuf, sMailRead->signatureWidth) + 0x68; + box_y = sMailRead->layout->signatureYPos + 0x58; + box_print(0, 1, box_x, box_y, sUnknown_0859F2AC, 0, strbuf); CopyWindowToVram(0, 3); CopyWindowToVram(1, 3); } -void sub_8121C50(void) +static void VBlankCB_MailRead(void) { LoadOam(); ProcessSpriteCopyRequests(); TransferPlttBuffer(); } -void sub_8121C64(void) +static void CB2_MailRead(void) { - if (gUnknown_0203A134->animsActive != 0) + if (sMailRead->animsActive != 0) { AnimateSprites(); BuildOamBuffer(); } - gUnknown_0203A134->callback2(); + sMailRead->callback2(); } -void sub_8121C98(void) +static void CB2_WaitForPaletteExitOnKeyPress(void) { if (!UpdatePaletteFade()) { - gUnknown_0203A134->callback2 = sub_8121CC0; + sMailRead->callback2 = CB2_ExitOnKeyPress; } } -void sub_8121CC0(void) +static void CB2_ExitOnKeyPress(void) { if (gMain.newKeys & (A_BUTTON | B_BUTTON)) { BeginNormalPaletteFade(-1, 0, 0, 16, 0); - gUnknown_0203A134->callback2 = sub_8121D00; + sMailRead->callback2 = CB2_ExitMailReadFreeVars; } } -void sub_8121D00(void) +static void CB2_ExitMailReadFreeVars(void) { if (!UpdatePaletteFade()) { - SetMainCallback2(gUnknown_0203A134->callback); - switch (gUnknown_0203A134->animsActive) + SetMainCallback2(sMailRead->callback); + switch (sMailRead->animsActive) { case 1: case 2: - sub_80D2FF0(sub_80D2E84(gUnknown_0203A134->mail->species)); - sub_80D2EF8(&gSprites[gUnknown_0203A134->monIconSprite]); + sub_80D2FF0(sub_80D2E84(sMailRead->mail->species)); + sub_80D2EF8(&gSprites[sMailRead->monIconSprite]); } - memset(gUnknown_0203A134, 0, sizeof(*gUnknown_0203A134)); + memset(sMailRead, 0, sizeof(*sMailRead)); ResetPaletteFade(); UnsetBgTilemapBuffer(0); UnsetBgTilemapBuffer(1); ResetBgsAndClearDma3BusyFlags(0); FreeAllWindowBuffers(); - free(gUnknown_0203A134); - gUnknown_0203A134 = NULL; + FREE_AND_SET_NULL(sMailRead); } } diff --git a/src/mail_data.c b/src/mail_data.c new file mode 100644 index 000000000..ebb49febf --- /dev/null +++ b/src/mail_data.c @@ -0,0 +1,203 @@ +#include "global.h" +#include "mail.h" +#include "constants/items.h" +#include "pokemon.h" +#include "pokemon_icon.h" +#include "constants/species.h" +#include "text.h" +#include "international_string_util.h" + +void ClearMailData(void) +{ + u8 i; + + for (i = 0; i < MAIL_COUNT; i++) + ClearMailStruct(&gSaveBlock1Ptr->mail[i]); +} + +void ClearMailStruct(struct MailStruct *mail) +{ + s32 i; + + for (i = 0; i < MAIL_WORDS_COUNT; i++) + mail->words[i] = 0xFFFF; + + for (i = 0; i < PLAYER_NAME_LENGTH; i++) + mail->playerName[i] = EOS; + + for (i = 0; i < 4; i++) + mail->trainerId[i] = 0; + + mail->species = SPECIES_BULBASAUR; + mail->itemId = ITEM_NONE; +} + +bool8 MonHasMail(struct Pokemon *mon) +{ + u16 heldItem = GetMonData(mon, MON_DATA_HELD_ITEM); + if (ItemIsMail(heldItem) && GetMonData(mon, MON_DATA_MAIL) != 0xFF) + return TRUE; + else + return FALSE; +} + +u8 GiveMailToMon(struct Pokemon *mon, u16 itemId) +{ + u8 heldItem[2]; + u8 id, i; + u16 species; + u32 personality; + + heldItem[0] = itemId; + heldItem[1] = itemId >> 8; + + for (id = 0; id < PARTY_SIZE; id++) + { + if (gSaveBlock1Ptr->mail[id].itemId == 0) + { + for (i = 0; i < MAIL_WORDS_COUNT; i++) + gSaveBlock1Ptr->mail[id].words[i] = 0xFFFF; + + for (i = 0; i < PLAYER_NAME_LENGTH - 1; i++) + gSaveBlock1Ptr->mail[id].playerName[i] = gSaveBlock2Ptr->playerName[i]; + gSaveBlock1Ptr->mail[id].playerName[i] = EOS; + PadNameString(gSaveBlock1Ptr->mail[id].playerName, CHAR_SPACE); + + for (i = 0; i < 4; i++) + gSaveBlock1Ptr->mail[id].trainerId[i] = gSaveBlock2Ptr->playerTrainerId[i]; + + species = GetBoxMonData(&mon->box, MON_DATA_SPECIES); + personality = GetBoxMonData(&mon->box, MON_DATA_PERSONALITY); + gSaveBlock1Ptr->mail[id].species = SpeciesToMailSpecies(species, personality); + gSaveBlock1Ptr->mail[id].itemId = itemId; + SetMonData(mon, MON_DATA_MAIL, &id); + SetMonData(mon, MON_DATA_HELD_ITEM, heldItem); + return id; + } + } + + return 0xFF; +} + +u16 SpeciesToMailSpecies(u16 species, u32 personality) +{ + if (species == SPECIES_UNOWN) + { + u32 species = GetUnownLetterByPersonality(personality) + 30000; + return species; + } + + return species; +} + +u16 MailSpeciesToSpecies(u16 mailSpecies, u16 *buffer) +{ + u16 result; + + if (mailSpecies >= 30000 && mailSpecies < (30000 + UNOWN_FORM_COUNT)) + { + result = SPECIES_UNOWN; + *buffer = mailSpecies - 30000; + } + else + { + result = mailSpecies; + } + + return result; +} + +u8 GiveMailToMon2(struct Pokemon *mon, struct MailStruct *mail) +{ + u8 heldItem[2]; + u16 itemId = mail->itemId; + u8 mailId = GiveMailToMon(mon, itemId); + + if (mailId == 0xFF) + return 0xFF; + + gSaveBlock1Ptr->mail[mailId] = *mail; + + SetMonData(mon, MON_DATA_MAIL, &mailId); + + heldItem[0] = itemId; + heldItem[1] = itemId >> 8; + + SetMonData(mon, MON_DATA_HELD_ITEM, heldItem); + + return mailId; +} + +static bool32 DummyMailFunc(void) +{ + return FALSE; +} + +void TakeMailFromMon(struct Pokemon *mon) +{ + u8 heldItem[2]; + u8 mailId; + + if (MonHasMail(mon)) + { + mailId = GetMonData(mon, MON_DATA_MAIL); + gSaveBlock1Ptr->mail[mailId].itemId = ITEM_NONE; + mailId = 0xFF; + heldItem[0] = ITEM_NONE; + heldItem[1] = ITEM_NONE << 8; + SetMonData(mon, MON_DATA_MAIL, &mailId); + SetMonData(mon, MON_DATA_HELD_ITEM, heldItem); + } +} + +void ClearMailItemId(u8 mailId) +{ + gSaveBlock1Ptr->mail[mailId].itemId = ITEM_NONE; +} + +u8 TakeMailFromMon2(struct Pokemon *mon) +{ + u8 i; + u8 newHeldItem[2]; + u8 newMailId; + + newHeldItem[0] = ITEM_NONE; + newHeldItem[1] = ITEM_NONE << 8; + newMailId = 0xFF; + + for (i = PARTY_SIZE; i < MAIL_COUNT; i++) + { + if (gSaveBlock1Ptr->mail[i].itemId == ITEM_NONE) + { + memcpy(&gSaveBlock1Ptr->mail[i], &gSaveBlock1Ptr->mail[GetMonData(mon, MON_DATA_MAIL)], sizeof(struct MailStruct)); + gSaveBlock1Ptr->mail[GetMonData(mon, MON_DATA_MAIL)].itemId = ITEM_NONE; + SetMonData(mon, MON_DATA_MAIL, &newMailId); + SetMonData(mon, MON_DATA_HELD_ITEM, newHeldItem); + return i; + } + } + + return 0xFF; +} + +bool8 ItemIsMail(u16 itemId) +{ + switch (itemId) + { + case ITEM_ORANGE_MAIL: + case ITEM_HARBOR_MAIL: + case ITEM_GLITTER_MAIL: + case ITEM_MECH_MAIL: + case ITEM_WOOD_MAIL: + case ITEM_WAVE_MAIL: + case ITEM_BEAD_MAIL: + case ITEM_SHADOW_MAIL: + case ITEM_TROPIC_MAIL: + case ITEM_DREAM_MAIL: + case ITEM_FAB_MAIL: + case ITEM_RETRO_MAIL: + return TRUE; + default: + return FALSE; + } +} diff --git a/src/new_game.c b/src/new_game.c index 12873fec9..89771e92b 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -33,7 +33,6 @@ extern void Overworld_SetWarpDestination(s8 mapBank, s8 mapNo, s8 warpNo, s8 xPo extern void warp_in(void); extern void sub_80BB358(void); extern void ResetBagScrollPositions(void); -extern void sub_813624C(void); // clears something pokeblock related extern void ResetPokedex(void); extern void sub_8084400(void); extern void ClearMailData(void); @@ -148,7 +147,7 @@ void sub_808447C(void) ZeroPlayerPartyMons(); ZeroEnemyPartyMons(); ResetBagScrollPositions(); - sub_813624C(); + ResetPokeblockScrollPositions(); } void NewGameInitData(void) diff --git a/src/palette.c b/src/palette.c index 8528a3fdc..d7b6ad479 100644 --- a/src/palette.c +++ b/src/palette.c @@ -850,13 +850,13 @@ void TintPalette_GrayScale(u16 *palette, u16 count) r = *palette & 0x1F; g = (*palette >> 5) & 0x1F; b = (*palette >> 10) & 0x1F; - + r = r * Q_8_8(0.2969); r += g * Q_8_8(0.5899); r += b * Q_8_8(0.1133); - + gray = r >> 8; - + *palette++ = gray << 10 | gray << 5 | gray; } } @@ -874,18 +874,18 @@ void TintPalette_GrayScale2(u16 *palette, u16 count) r = *palette & 0x1F; g = (*palette >> 5) & 0x1F; b = (*palette >> 10) & 0x1F; - + r = r * Q_8_8(0.2969); r += g * Q_8_8(0.5899); r += b * Q_8_8(0.1133); - + gray = r >> 8; - + if (gray > 0x1F) gray = 0x1F; - + gray = sRoundedDownGrayscaleMap[gray]; - + *palette++ = gray << 10 | gray << 5 | gray; } } @@ -897,32 +897,35 @@ void TintPalette_SepiaTone(u16 *palette, u16 count) int green; int blue; u32 gray; - u8 r2; - u8 g2; - u8 b2; - + u32 sepia; + s8 r2; + s8 g2; + s8 b2; + int i; for (i = 0; i < count; i++) { - red = *palette & 0x1F; - green = (*palette >> 5) & 0x1F; - blue = (*palette >> 10) & 0x1F; - - gray = red * Q_8_8(0.2969); - gray += green * Q_8_8(0.5899); - gray += blue * Q_8_8(0.1133); - - gray = gray / 256; - - r2 = (gray * 0x133) / 256; - + r = *palette & 0x1F; + g = (*palette >> 5) & 0x1F; + b = (*palette >> 10) & 0x1F; + + r *= 0x4C; + r += g * 0x97; + r += b * 0x1D; + + gray = (s32)(r >> 8); + + sepia = (gray * 0x133); + + r2 = (u16)sepia >> 8; + g2 = gray; - - b2 = (gray * 0xF); - + + b2 = (gray * 15); + if (r2 > 0x1F) r2 = 0x1F; - + *palette++ = b2 << 10 | g2 << 5 | r2; } } @@ -1006,28 +1009,28 @@ void TintPalette_CustomTone(u16 *palette, u16 count, u16 a3, u16 a4, u16 a5) r = *palette & 0x1F; g = (*palette >> 5) & 0x1F; b = (*palette >> 10) & 0x1F; - + r *= 0x4C; r += g * 0x97; r += b * 0x1D; - + gray = r >> 8; - + r2 = (u16)(gray * a3) >> 8; - + g2 = (u16)(gray * a4) >> 8; - + b2 = (u16)(gray * a5) >> 8; - + if (r2 > 0x1F) r2 = 0x1F; - + if (g2 > 0x1F) g2 = 0x1F; - + if (b2 > 0x1F) b2 = 0x1F; - + *palette++ = b2 << 10 | g2 << 5 | r2; } return; diff --git a/src/pokeblock.c b/src/pokeblock.c new file mode 100644 index 000000000..8716e827f --- /dev/null +++ b/src/pokeblock.c @@ -0,0 +1,1337 @@ +#include "global.h" +#include "pokeblock.h" +#include "bg.h" +#include "strings.h" +#include "text.h" +#include "menu.h" +#include "task.h" +#include "menu_helpers.h" +#include "new_menu_helpers.h" +#include "pokemon.h" +#include "graphics.h" +#include "malloc.h" +#include "main.h" +#include "battle.h" +#include "battle_controllers.h" +#include "palette.h" +#include "unknown_task.h" +#include "list_menu.h" +#include "gpu_regs.h" +#include "decompress.h" +#include "international_string_util.h" +#include "item.h" +#include "constants/items.h" +#include "string_util.h" +#include "songs.h" +#include "sound.h" +#include "berry.h" +#include "menu_indicators.h" +#include "event_data.h" +#include "battle_message.h" +#include "safari_zone.h" +#include "lilycove_lady.h" + +#define POKEBLOCK_MAX_FEEL 99 +#define FIELD_E75_COUNT 7 + +struct PokeblockMenuStruct +{ + u8 tilemap[0x800]; + void (*callbackOnUse)(void); + const u8 *pokeblockOptionsIds; + u8 optionsNo; + u8 caseId; + u8 itemsNo; + u8 maxShowed; + struct ListMenuItem items[POKEBLOCKS_COUNT + 1]; + u8 menuItemsStrings[POKEBLOCKS_COUNT + 1][0x20]; // + 1 because of STOW CASE item + u8 pokeblockCaseSpriteId; + u8 field_E75[FIELD_E75_COUNT]; + u8 unkTaskId; + bool8 isSwapping; + s16 gfxState; + u8 unused[8]; +}; + +struct PokeblockSavedData +{ + void (*callback)(void); + u16 lastItemPos; + u16 lastItemPage; +}; + +enum +{ + PKBL_USE_ON_FIELD, + PKBL_TOSS, + PKBL_CANCEL, + PKBL_USE_IN_BATTLE, + PKBL_USE_ON_FEEDER, + PKBL_GIVE_TO_LADY +}; + +extern u16 gSpecialVar_ItemId; +extern void (*gFieldCallback)(void); + +extern const u16 gUnknown_0860F074[]; + +extern void c2_exit_to_overworld_2_switch(void); +extern bool8 sub_81221EC(void); +extern void sub_809882C(u8, u16, u8); +extern void copy_textbox_border_tile_patterns_to_vram(u8, u16, u8); +extern void sub_80AF168(void); + +// this file's functions +static void CB2_InitPokeblockMenu(void); +static bool8 InitPokeblockMenu(void); +static bool8 LoadPokeblockMenuGfx(void); +static void HandleInitBackgrounds(void); +static void HandleInitWindows(void); +static void SetMenuItemsCountAndMaxShowed(void); +static void sub_81362E0(void); +static void sub_8136344(void); +static void HandlePokeblockListMenuItems(void); +static void sub_81363BC(void); +static void MovePokeblockMenuCursor(u32 pkblId, bool8 arg1, struct ListMenu *arg2); +static void PutPokeblockInfoText(void); +static void HandlePokeblockMenuCursor(u16 cursorPos, u16 arg1); +static void PutPokeblockListMenuString(u8 *dst, u16 pkblId); +static void Task_HandlePokeblockMenuInput(u8 taskId); +static void PokeblockAction_UseOnField(u8 taskId); +static void PokeblockAction_Toss(u8 taskId); +static void PokeblockAction_Cancel(u8 taskId); +static void PokeblockAction_UseInBattle(u8 taskId); +static void PokeblockAction_UseOnPokeblockFeeder(u8 taskId); +static void PokeblockAction_GiveToContestLady(u8 taskId); +static void TossPokeblockChoice_Yes(u8 taskId); +static void TossPokeblockChoice_No(u8 taskId); +static void Task_FreeDataAndExitPokeblockCase(u8 taskId); +static void Task_HandlePokeblockOptionsInput(u8 taskId); +static void PutPokeblockOptionsWindow(u8 taskId); +static void Task_HandlePokeblocksSwapInput(u8 taskId); +static void sub_8136470(struct Sprite *sprite); +static void sub_8135FCC(s32 pkblId); +static void HandlePokeblocksSwap(u8 taskId, bool8 noSwap); +static void UsePokeblockOnField(void); +static void ReturnToPokeblockCaseOnField(void); +static void CreateTossPokeblockYesNoMenu(u8 taskId); +static void HandleErasePokeblock(u8 taskId); + +// ram variables +EWRAM_DATA static struct PokeblockSavedData sSavedPokeblockData = {0}; +EWRAM_DATA static struct PokeblockMenuStruct *sPokeblockMenu = NULL; + +// const rom data +const s8 gPokeblockFlavorCompatibilityTable[] = +{ + // Cool, Beauty, Cute, Smart, Tough + 0, 0, 0, 0, 0, // Hardy + 1, 0, 0, 0, -1, // Lonely + 1, 0, -1, 0, 0, // Brave + 1, -1, 0, 0, 0, // Adamant + 1, 0, 0, -1, 0, // Naughty + -1, 0, 0, 0, 1, // Bold + 0, 0, 0, 0, 0, // Docile + 0, 0, -1, 0, 1, // Relaxed + 0, -1, 0, 0, 1, // Impish + 0, 0, 0, -1, 1, // Lax + -1, 0, 1, 0, 0, // Timid + 0, 0, 1, 0, -1, // Hasty + 0, 0, 0, 0, 0, // Serious + 0, -1, 1, 0, 0, // Jolly + 0, 0, 1, -1, 0, // Naive + -1, 1, 0, 0, 0, // Modest + 0, 1, 0, 0, -1, // Mild + 0, 1, -1, 0, 0, // Quiet + 0, 0, 0, 0, 0, // Bashful + 0, 1, 0, -1, 0, // Rash + -1, 0, 0, 1, 0, // Calm + 0, 0, 0, 1, -1, // Gentle + 0, 0, -1, 1, 0, // Sassy + 0, -1, 0, 1, 0, // Careful + 0, 0, 0, 0, 0 // Quirky +}; + +static const struct BgTemplate sBgTemplatesForPokeblockMenu[] = +{ + { + .bg = 0, + .charBaseIndex = 0, + .mapBaseIndex = 31, + .screenSize = 0, + .paletteMode = 0, + .priority = 1, + .baseTile = 0 + }, + { + .bg = 1, + .charBaseIndex = 0, + .mapBaseIndex = 30, + .screenSize = 0, + .paletteMode = 0, + .priority = 0, + .baseTile = 0 + }, + { + .bg = 2, + .charBaseIndex = 3, + .mapBaseIndex = 29, + .screenSize = 0, + .paletteMode = 0, + .priority = 2, + .baseTile = 0 + } +}; + +const u8 *const gPokeblockNames[] = +{ + NULL, + gText_RedPokeblock, + gText_BluePokeblock, + gText_PinkPokeblock, + gText_GreenPokeblock, + gText_YellowPokeblock, + gText_PurplePokeblock, + gText_IndigoPokeblock, + gText_BrownPokeblock, + gText_LiteBluePokeblock, + gText_OlivePokeblock, + gText_GrayPokeblock, + gText_BlackPokeblock, + gText_WhitePokeblock, + gText_GoldPokeblock +}; + +static const struct MenuAction sPokeblockMenuActions[] = +{ + {gMenuText_Use, PokeblockAction_UseOnField}, + {gMenuText_Toss, PokeblockAction_Toss}, + {gText_Cancel2, PokeblockAction_Cancel}, + {gMenuText_Use, PokeblockAction_UseInBattle}, + {gMenuText_Use, PokeblockAction_UseOnPokeblockFeeder}, + {gMenuText_Give2, PokeblockAction_GiveToContestLady}, +}; + +static const u8 sActionsOnField[] = {PKBL_USE_ON_FIELD, PKBL_TOSS, PKBL_CANCEL}; +static const u8 sActionsInBattle[] = {PKBL_USE_IN_BATTLE, PKBL_CANCEL}; +static const u8 sActionsOnPokeblockFeeder[] = {PKBL_USE_ON_FEEDER, PKBL_CANCEL}; +static const u8 sActionsWhenGivingToLady[] = {PKBL_GIVE_TO_LADY, PKBL_CANCEL}; + +static const struct YesNoFuncTable sTossYesNoFuncTable = {TossPokeblockChoice_Yes, TossPokeblockChoice_No}; + +static const u8 sContestStatsMonData[] = {MON_DATA_COOL, MON_DATA_BEAUTY, MON_DATA_CUTE, MON_DATA_SMART, MON_DATA_TOUGH}; + +static const struct OamData sOamData_PokeblockCase = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 3, + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0, +}; + +static const union AnimCmd sSpriteAnim_PokeblockCase[] = +{ + ANIMCMD_FRAME(0, 0), + ANIMCMD_END +}; + +static const union AnimCmd *const sSpriteAnimTable_PokeblockCase[] = +{ + sSpriteAnim_PokeblockCase +}; + +static const union AffineAnimCmd sSpriteAffineAnim_85B26C8[] = +{ + AFFINEANIMCMD_FRAME(0, 0, -2, 2), + AFFINEANIMCMD_FRAME(0, 0, 2, 4), + AFFINEANIMCMD_FRAME(0, 0, -2, 4), + AFFINEANIMCMD_FRAME(0, 0, 2, 2), + AFFINEANIMCMD_END +}; + +static const union AffineAnimCmd *const sSpriteAffineAnimTable_85B26F0[] = +{ + sSpriteAffineAnim_85B26C8 +}; + +const struct CompressedSpriteSheet gPokeblockCase_SpriteSheet = +{ + gMenuPokeblockDevice_Gfx, 0x800, GFX_TAG_POKEBLOCK_CASE +}; + +const struct CompressedSpritePalette gPokeblockCase_SpritePal = +{ + gMenuPokeblockDevice_Pal, GFX_TAG_POKEBLOCK_CASE +}; + +static const struct SpriteTemplate sSpriteTemplate_PokeblockCase = +{ + GFX_TAG_POKEBLOCK_CASE, + GFX_TAG_POKEBLOCK_CASE, + &sOamData_PokeblockCase, + sSpriteAnimTable_PokeblockCase, + NULL, + gDummySpriteAffineAnimTable, + SpriteCallbackDummy +}; + +static const struct TextColor sTextColorInPokeblockMenu = {0, 2, 3}; + +static const struct Pokeblock sFavoritePokeblocksTable[] = +{ + { PBLOCK_CLR_RED, 20, 0, 0, 0, 0, 20}, + { PBLOCK_CLR_BLUE, 0, 20, 0, 0, 0, 20}, + { PBLOCK_CLR_PINK, 0, 0, 20, 0, 0, 20}, + { PBLOCK_CLR_GREEN, 0, 0, 0, 20, 0, 20}, + { PBLOCK_CLR_YELLOW, 0, 0, 0, 0, 20, 20} +}; + +static const struct WindowTemplate sWindowTemplatesForPokeblockMenu[] = +{ + {0, 2, 1, 9, 2, 0xF, 0x1E}, + {0, 0xF, 1, 0xE, 0x12, 0xF, 0x30}, + {0, 2, 0xD, 5, 2, 0xF, 0x12C}, + {0, 2, 0xF, 5, 2, 0xF, 0x136}, + {0, 2, 0x11, 5, 2, 0xF, 0x140}, + {0, 8, 0xD, 5, 2, 0xF, 0x14A}, + {0, 8, 0xF, 5, 2, 0xF, 0x154}, + {0, 0xB, 0x11, 2, 2, 0xF, 0x15E}, + {1, 7, 5, 6, 6, 0xF, 0x162}, + {1, 7, 7, 6, 4, 0xF, 0x186}, + {1, 2, 0xF, 0x1B, 4, 0xF, 0x19E}, + DUMMY_WIN_TEMPLATE +}; + +static const struct WindowTemplate sTossPkblockWindowTemplate = {1, 0x15, 9, 5, 4, 0xF, 0x20A}; + +static const struct ListMenuTemplate sPokeblockListMenuTemplate = +{ + .items = NULL, + .moveCursorFunc = MovePokeblockMenuCursor, + .unk_08 = NULL, + .totalItems = 0, + .maxShowed = 0, + .unk_10 = 1, + .unk_11 = 0, + .unk_12 = 1, + .cursor_Y = 0, + .upText_Y = 1, + .cursorColor = 2, + .fillColor = 0, + .cursorShadowColor = 3, + .unk_16_0 = FALSE, + .spaceBetweenItems = 32, + .unk_16_7 = FALSE, + .unk_17_0 = 1, + .cursorKind = 1 +}; + +// code +void OpenPokeblockCase(u8 caseId, void (*callback)(void)) +{ + sPokeblockMenu = Alloc(sizeof(*sPokeblockMenu)); + sPokeblockMenu->caseId = caseId; + sPokeblockMenu->callbackOnUse = NULL; + sPokeblockMenu->unkTaskId = 0xFF; + sPokeblockMenu->isSwapping = FALSE; + sSavedPokeblockData.callback = callback; + + switch (sPokeblockMenu->caseId) + { + case PBLOCK_CASE_BATTLE: + sPokeblockMenu->pokeblockOptionsIds = sActionsInBattle; + sPokeblockMenu->optionsNo = ARRAY_COUNT(sActionsInBattle); + break; + case PBLOCK_CASE_FEEDER: + sPokeblockMenu->pokeblockOptionsIds = sActionsOnPokeblockFeeder; + sPokeblockMenu->optionsNo = ARRAY_COUNT(sActionsOnPokeblockFeeder); + break; + case PBLOCK_CASE_GIVE: + sPokeblockMenu->pokeblockOptionsIds = sActionsWhenGivingToLady; + sPokeblockMenu->optionsNo = ARRAY_COUNT(sActionsWhenGivingToLady); + break; + default: + sPokeblockMenu->pokeblockOptionsIds = sActionsOnField; + sPokeblockMenu->optionsNo = ARRAY_COUNT(sActionsOnField); + break; + } + + SetMainCallback2(CB2_InitPokeblockMenu); +} + +void OpenPokeblockCaseInBattle(void) +{ + OpenPokeblockCase(PBLOCK_CASE_BATTLE, SetCB2ToReshowScreenAfterMenu2); +} + +void OpenPokeblockCaseOnFeeder(void) +{ + OpenPokeblockCase(PBLOCK_CASE_FEEDER, c2_exit_to_overworld_2_switch); +} + +static void CB2_PokeblockMenu(void) +{ + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); + do_scheduled_bg_tilemap_copies_to_vram(); + UpdatePaletteFade(); +} + +static void VBlankCB_PokeblockMenu(void) +{ + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); +} + +static void CB2_InitPokeblockMenu(void) +{ + while (1) + { + if (sub_81221EC() == TRUE) + break; + if (InitPokeblockMenu() == TRUE) + break; + if (sub_81221AC() == TRUE) + break; + } +} + +static bool8 InitPokeblockMenu(void) +{ + u8 taskId; + + switch (gMain.state) + { + case 0: + SetVBlankHBlankCallbacksToNull(); + clear_scheduled_bg_copies_to_vram(); + gMain.state++; + break; + case 1: + remove_some_task(); + gMain.state++; + break; + case 2: + FreeAllSpritePalettes(); + gMain.state++; + break; + case 3: + ResetPaletteFade(); + gPaletteFade.bufferTransferDisabled = 1; + gMain.state++; + break; + case 4: + ResetSpriteData(); + gMain.state++; + break; + case 5: + if (sPokeblockMenu->caseId != PBLOCK_CASE_BATTLE) + ResetTasks(); + gMain.state++; + break; + case 6: + HandleInitBackgrounds(); + sPokeblockMenu->gfxState = 0; + gMain.state++; + break; + case 7: + if (!LoadPokeblockMenuGfx()) + return FALSE; + gMain.state++; + break; + case 8: + SetMenuItemsCountAndMaxShowed(); + sub_81362E0(); + sub_8136344(); + gMain.state++; + break; + case 9: + sPokeblockMenu->pokeblockCaseSpriteId = CreatePokeblockCaseSprite(56, 64, 0); + gMain.state++; + break; + case 10: + sub_8122344(&sPokeblockMenu->field_E75, FIELD_E75_COUNT); + gMain.state++; + break; + case 11: + HandlePokeblockMenuCursor(sSavedPokeblockData.lastItemPos, 0x1005); + gMain.state++; + break; + case 12: + HandleInitWindows(); + gMain.state++; + break; + case 13: + HandlePokeblockListMenuItems(); + gMain.state++; + break; + case 14: + sub_81363BC(); + gMain.state++; + break; + case 15: + taskId = CreateTask(Task_HandlePokeblockMenuInput, 0); + gTasks[taskId].data[0] = ListMenuInit(&gMultiuseListMenuTemplate, sSavedPokeblockData.lastItemPage, sSavedPokeblockData.lastItemPos); + gMain.state++; + break; + case 16: + PutPokeblockInfoText(); + gMain.state++; + break; + case 17: + BlendPalettes(-1, 0x10, 0); + gMain.state++; + break; + case 18: + BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + gPaletteFade.bufferTransferDisabled = 0; + gMain.state++; + break; + default: + SetVBlankCallback(VBlankCB_PokeblockMenu); + SetMainCallback2(CB2_PokeblockMenu); + return TRUE; + } + + return FALSE; +} + +static void HandleInitBackgrounds(void) +{ + ResetVramOamAndBgCntRegs(); + ResetBgsAndClearDma3BusyFlags(0); + InitBgsFromTemplates(0, sBgTemplatesForPokeblockMenu, ARRAY_COUNT(sBgTemplatesForPokeblockMenu)); + SetBgTilemapBuffer(2, sPokeblockMenu->tilemap); + ResetAllBgsCoordinates(); + schedule_bg_copy_tilemap_to_vram(2); + + SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); + + ShowBg(0); + ShowBg(1); + ShowBg(2); + + SetGpuReg(REG_OFFSET_BLDCNT, 0); +} + +static bool8 LoadPokeblockMenuGfx(void) +{ + switch (sPokeblockMenu->gfxState) + { + case 0: + reset_temp_tile_data_buffers(); + decompress_and_copy_tile_data_to_vram(2, gMenuPokeblock_Gfx, 0, 0, 0); + sPokeblockMenu->gfxState++; + break; + case 1: + if (free_temp_tile_data_buffers_if_possible() != TRUE) + { + LZDecompressWram(gMenuPokeblock_Tilemap, sPokeblockMenu->tilemap); + sPokeblockMenu->gfxState++; + } + break; + case 2: + LoadCompressedPalette(gMenuPokeblock_Pal, 0, 0xC0); + sPokeblockMenu->gfxState++; + break; + case 3: + LoadCompressedObjectPic(&gPokeblockCase_SpriteSheet); + sPokeblockMenu->gfxState++; + break; + case 4: + LoadCompressedObjectPalette(&gPokeblockCase_SpritePal); + sPokeblockMenu->gfxState++; + break; + case 5: + LoadListMenuArrowsGfx(); + sPokeblockMenu->gfxState = 0; + return TRUE; + } + + return FALSE; +} + +static void HandleInitWindows(void) +{ + u8 i; + + InitWindows(sWindowTemplatesForPokeblockMenu); + DeactivateAllTextPrinters(); + sub_809882C(0, 1, 0xE0); + copy_textbox_border_tile_patterns_to_vram(0, 0xA, 0xD0); + LoadPalette(gUnknown_0860F074, 0xF0, 0x20); + + for (i = 0; i < ARRAY_COUNT(sWindowTemplatesForPokeblockMenu) - 1; i++) + { + FillWindowPixelBuffer(i, 0); + } + + schedule_bg_copy_tilemap_to_vram(0); + schedule_bg_copy_tilemap_to_vram(1); +} + +static void PrintOnPokeblockWindow(u8 windowId, const u8 *string, s32 x) +{ + AddTextPrinterParametrized2(windowId, 1, x, 1, 0, 0, &sTextColorInPokeblockMenu, 0, string); +} + +static void PutPokeblockInfoText(void) +{ + u8 i; + + const u8 *itemName = ItemId_GetItem(ITEM_POKEBLOCK_CASE)->name; + PrintOnPokeblockWindow(0, itemName, GetStringCenterAlignXOffset(1, itemName, 0x48)); + + PrintOnPokeblockWindow(2, gText_Spicy, 0); + PrintOnPokeblockWindow(3, gText_Dry, 0); + PrintOnPokeblockWindow(4, gText_Sweet, 0); + PrintOnPokeblockWindow(5, gText_Bitter, 0); + PrintOnPokeblockWindow(6, gText_Sour, 0); + + for (i = 0; i < 8; i++) + { + PutWindowTilemap(i); + } +} + +static void HandlePokeblockListMenuItems(void) +{ + u16 i; + + for (i = 0; i < sPokeblockMenu->itemsNo - 1; i++) + { + PutPokeblockListMenuString(sPokeblockMenu->menuItemsStrings[i], i); + sPokeblockMenu->items[i].name = sPokeblockMenu->menuItemsStrings[i]; + sPokeblockMenu->items[i].id = i; + } + + StringCopy(sPokeblockMenu->menuItemsStrings[i], gText_StowCase); + sPokeblockMenu->items[i].name = sPokeblockMenu->menuItemsStrings[i]; + sPokeblockMenu->items[i].id = LIST_B_PRESSED; + + gMultiuseListMenuTemplate = sPokeblockListMenuTemplate; + gMultiuseListMenuTemplate.unk_17_0 = 7; + gMultiuseListMenuTemplate.totalItems = sPokeblockMenu->itemsNo; + gMultiuseListMenuTemplate.items = sPokeblockMenu->items; + gMultiuseListMenuTemplate.maxShowed = sPokeblockMenu->maxShowed; +} + +static void PutPokeblockListMenuString(u8 *dst, u16 pkblId) +{ + struct Pokeblock *pkblock = &gSaveBlock1Ptr->pokeblocks[pkblId]; + u8 *txtPtr = StringCopy(dst, gPokeblockNames[pkblock->color]); + + *(txtPtr++) = EXT_CTRL_CODE_BEGIN; + *(txtPtr++) = 0x12; + *(txtPtr++) = 0x57; + + ConvertIntToDecimalStringN(gStringVar1, GetHighestPokeblocksFlavorLevel(pkblock), STR_CONV_MODE_LEFT_ALIGN, 3); + StringExpandPlaceholders(txtPtr, gText_LvVar1); +} + +static void MovePokeblockMenuCursor(u32 pkblId, bool8 arg1, struct ListMenu *arg2) +{ + if (arg1 != TRUE) + { + PlaySE(SE_SELECT); + gSprites[sPokeblockMenu->pokeblockCaseSpriteId].callback = sub_8136470; + } + + if (!sPokeblockMenu->isSwapping) + sub_8135FCC(pkblId); +} + +static void sub_8135FCC(s32 pkblId) +{ + u8 i; + struct Pokeblock *pokeblock; + u16 rectTilemapSrc[2]; + + FillWindowPixelBuffer(7, 0); + + if (pkblId != LIST_B_PRESSED) + { + pokeblock = &gSaveBlock1Ptr->pokeblocks[pkblId]; + rectTilemapSrc[0] = 0x17; + rectTilemapSrc[1] = 0x18; + for (i = 0; i < FLAVOR_COUNT; i++) + { + if (GetPokeblockData(pokeblock, PBLOCK_SPICY + i) > 0) + { + rectTilemapSrc[0] = (i << 0xC) + 0x17; + rectTilemapSrc[1] = (i << 0xC) + 0x18; + } + else + { + rectTilemapSrc[0] = 0xF; + rectTilemapSrc[1] = 0xF; + } + CopyToBgTilemapBufferRect(2, rectTilemapSrc, (i / 3 * 6) + 1, (i % 3 * 2) + 13, 1, 2); + } + ConvertIntToDecimalStringN(gStringVar1, GetPokeblocksFeel(pokeblock), STR_CONV_MODE_RIGHT_ALIGN, 2); + PrintOnPokeblockWindow(7, gStringVar1, 4); + } + else + { + rectTilemapSrc[0] = 0xF; + rectTilemapSrc[1] = 0xF; + + for (i = 0; i < FLAVOR_COUNT; i++) + { + CopyToBgTilemapBufferRect(2, rectTilemapSrc, (i / 3 * 6) + 1, (i % 3 * 2) + 13, 1, 2); + } + CopyWindowToVram(7, 2); + } + + schedule_bg_copy_tilemap_to_vram(0); + schedule_bg_copy_tilemap_to_vram(2); +} + +static void HandlePokeblockMenuCursor(u16 cursorPos, u16 arg1) +{ + FillBgTilemapBufferRect_Palette0(2, arg1, 0xF, (cursorPos * 2) + 1, 0xE, 2); + schedule_bg_copy_tilemap_to_vram(2); +} + +static void CompactPokeblockSlots(void) +{ + u16 i, j; + + for (i = 0; i < POKEBLOCKS_COUNT - 1; i++) + { + for (j = i + 1; j < POKEBLOCKS_COUNT; j++) + { + if (gSaveBlock1Ptr->pokeblocks[i].color == 0) + { + struct Pokeblock temp = gSaveBlock1Ptr->pokeblocks[i]; + gSaveBlock1Ptr->pokeblocks[i] = gSaveBlock1Ptr->pokeblocks[j]; + gSaveBlock1Ptr->pokeblocks[j] = temp; + } + } + } +} + +static void SwapSortPokeblocksInternalData(u32 id1, u32 id2) +{ + s16 i, count; + struct Pokeblock *pokeblocks = gSaveBlock1Ptr->pokeblocks; + struct Pokeblock *copyPokeblock1; + + if (id1 == id2) + return; + + copyPokeblock1 = Alloc(sizeof(struct Pokeblock)); + *copyPokeblock1 = pokeblocks[id1]; + + if (id2 > id1) + { + id2--; + for (count = id2, i = id1; i < count; i++) + pokeblocks[i] = pokeblocks[i + 1]; + } + else + { + for (count = id2, i = id1; i > count; i--) + pokeblocks[i] = pokeblocks[i - 1]; + } + + pokeblocks[id2] = *copyPokeblock1; + Free(copyPokeblock1); +} + +void ResetPokeblockScrollPositions(void) +{ + sSavedPokeblockData.lastItemPos = 0; + sSavedPokeblockData.lastItemPage = 0; +} + +static void SetMenuItemsCountAndMaxShowed(void) +{ + u16 i; + + CompactPokeblockSlots(); + + for (sPokeblockMenu->itemsNo = 0, i = 0; i < POKEBLOCKS_COUNT; i++) + { + if (gSaveBlock1Ptr->pokeblocks[i].color != 0) + sPokeblockMenu->itemsNo++; + } + + sPokeblockMenu->itemsNo++; // STOW CASE menu item + + if (sPokeblockMenu->itemsNo > 9) + sPokeblockMenu->maxShowed = 9; + else + sPokeblockMenu->maxShowed = sPokeblockMenu->itemsNo; +} + +static void sub_81362E0(void) +{ + if (sSavedPokeblockData.lastItemPage != 0) + { + if (sSavedPokeblockData.lastItemPage + sPokeblockMenu->maxShowed > sPokeblockMenu->itemsNo) + sSavedPokeblockData.lastItemPage = sPokeblockMenu->itemsNo - sPokeblockMenu->maxShowed; + } + + if (sSavedPokeblockData.lastItemPage + sSavedPokeblockData.lastItemPos >= sPokeblockMenu->itemsNo) + { + if (sPokeblockMenu->itemsNo == 0) + sSavedPokeblockData.lastItemPos = 0; + else + sSavedPokeblockData.lastItemPos = sPokeblockMenu->itemsNo - 1; + } +} + +static void sub_8136344(void) +{ + if (sSavedPokeblockData.lastItemPos > 4) + { + u8 i; + + for (i = 0; + (i < sSavedPokeblockData.lastItemPos - 4) && (sSavedPokeblockData.lastItemPage + sPokeblockMenu->maxShowed != sPokeblockMenu->itemsNo); + sSavedPokeblockData.lastItemPos--, sSavedPokeblockData.lastItemPage++, i++); + } +} + +static void sub_81363BC(void) +{ + if (sPokeblockMenu->unkTaskId == 0xFF) + { + sPokeblockMenu->unkTaskId = AddScrollIndicatorArrowPairParametrized(2, 0xB0, 8, 0x98, sPokeblockMenu->itemsNo - sPokeblockMenu->maxShowed, + 0x456, 0x456, &sSavedPokeblockData.lastItemPage); + } +} + +static void sub_8136418(void) +{ + if (sPokeblockMenu->unkTaskId != 0xFF) + { + RemoveScrollIndicatorArrowPair(sPokeblockMenu->unkTaskId); + sPokeblockMenu->unkTaskId = 0xFF; + } +} + +u8 CreatePokeblockCaseSprite(s16 x, s16 y, u8 subpriority) +{ + return CreateSprite(&sSpriteTemplate_PokeblockCase, x, y, subpriority); +} + +static void sub_8136470(struct Sprite *sprite) +{ + if (sprite->data[0] > 1) + sprite->data[0] = 0; + + switch (sprite->data[0]) + { + case 0: + sprite->oam.affineMode = 1; + sprite->affineAnims = sSpriteAffineAnimTable_85B26F0; + InitSpriteAffineAnim(sprite); + sprite->data[0] = 1; + sprite->data[1] = 0; + break; + case 1: + if (++sprite->data[1] > 11) + { + sprite->oam.affineMode = 0; + sprite->data[0] = 0; + sprite->data[1] = 0; + FreeOamMatrix(sprite->oam.matrixNum); + sprite->callback = SpriteCallbackDummy; + } + break; + } +} + +static void FadePaletteAndSetTaskToClosePokeblockCase(u8 taskId) +{ + BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + gTasks[taskId].func = Task_FreeDataAndExitPokeblockCase; +} + +static void Task_FreeDataAndExitPokeblockCase(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + if (!gPaletteFade.active) + { + if (sPokeblockMenu->caseId == PBLOCK_CASE_FEEDER || sPokeblockMenu->caseId == PBLOCK_CASE_GIVE) + gFieldCallback = sub_80AF168; + + sub_81AE6C8(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos); + sub_8136418(); + ResetSpriteData(); + FreeAllSpritePalettes(); + + if (sPokeblockMenu->callbackOnUse != NULL) + SetMainCallback2(sPokeblockMenu->callbackOnUse); + else + SetMainCallback2(sSavedPokeblockData.callback); + + FreeAllWindowBuffers(); + Free(sPokeblockMenu); + DestroyTask(taskId); + } +} + +static void Task_HandlePokeblockMenuInput(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + if (!gPaletteFade.active && sub_81221EC() != TRUE) + { + if (gMain.newKeys & SELECT_BUTTON) + { + sub_81AE860(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos); + if (sSavedPokeblockData.lastItemPage + sSavedPokeblockData.lastItemPos != sPokeblockMenu->itemsNo - 1) + { + PlaySE(SE_SELECT); + HandlePokeblockMenuCursor(sSavedPokeblockData.lastItemPos, 0x2005); + data[2] = sSavedPokeblockData.lastItemPage + sSavedPokeblockData.lastItemPos; + sPokeblockMenu->isSwapping = TRUE; + gTasks[taskId].func = Task_HandlePokeblocksSwapInput; + } + } + else + { + u16 oldPosition = sSavedPokeblockData.lastItemPos; + s32 itemId = ListMenuHandleInputGetItemId(data[0]); + + sub_81AE860(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos); + if (oldPosition != sSavedPokeblockData.lastItemPos) + { + HandlePokeblockMenuCursor(oldPosition, 5); + HandlePokeblockMenuCursor(sSavedPokeblockData.lastItemPos, 0x1005); + } + + switch (itemId) + { + case LIST_NOTHING_CHOSEN: + break; + case LIST_B_PRESSED: + PlaySE(SE_SELECT); + gSpecialVar_Result = 0xFFFF; + gSpecialVar_ItemId = 0; + FadePaletteAndSetTaskToClosePokeblockCase(taskId); + break; + default: + PlaySE(SE_SELECT); + gSpecialVar_ItemId = itemId; + PutPokeblockOptionsWindow(taskId); + break; + } + } + } +} + +static void Task_HandlePokeblocksSwapInput(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + if (sub_81221EC() == TRUE) + return; + + if (gMain.newKeys & SELECT_BUTTON) + { + PlaySE(SE_SELECT); + sub_81AE860(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos); + HandlePokeblocksSwap(taskId, FALSE); + } + else + { + u16 i = sSavedPokeblockData.lastItemPage; + u16 var = sSavedPokeblockData.lastItemPos; + s32 itemId = ListMenuHandleInputGetItemId(data[0]); + + sub_81AE860(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos); + if (i != sSavedPokeblockData.lastItemPage || var != sSavedPokeblockData.lastItemPos) + { + for (i = 0; i < 9; i++) + { + var = i + sSavedPokeblockData.lastItemPage; + if (var == data[2]) + HandlePokeblockMenuCursor(i, 0x2005); + else + HandlePokeblockMenuCursor(i, 5); + } + } + + sub_81223FC(sPokeblockMenu->field_E75, FIELD_E75_COUNT, 0); + sub_8122448(sPokeblockMenu->field_E75, FIELD_E75_COUNT, 0x80, (sSavedPokeblockData.lastItemPos * 16) + 8); + + switch (itemId) + { + case LIST_NOTHING_CHOSEN: + break; + case LIST_B_PRESSED: // same id as STOW CASE field + PlaySE(SE_SELECT); + if (gMain.newKeys & A_BUTTON) + HandlePokeblocksSwap(taskId, FALSE); + else + HandlePokeblocksSwap(taskId, TRUE); + break; + default: + PlaySE(SE_SELECT); + HandlePokeblocksSwap(taskId, FALSE); + break; + } + } +} + +static void HandlePokeblocksSwap(u8 taskId, bool8 noSwap) +{ + u8 i; + s16 *data = gTasks[taskId].data; + u16 swappedFromId = sSavedPokeblockData.lastItemPage + sSavedPokeblockData.lastItemPos; + + sPokeblockMenu->isSwapping = FALSE; + sub_81AE6C8(data[0], &sSavedPokeblockData.lastItemPage, &sSavedPokeblockData.lastItemPos); + + if (!noSwap && data[2] != swappedFromId && data[2] != swappedFromId - 1) + { + SwapSortPokeblocksInternalData(data[2], swappedFromId); + HandlePokeblockListMenuItems(); + } + + if (data[2] < swappedFromId) + sSavedPokeblockData.lastItemPos--; + + data[0] = ListMenuInit(&gMultiuseListMenuTemplate, sSavedPokeblockData.lastItemPage, sSavedPokeblockData.lastItemPos); + schedule_bg_copy_tilemap_to_vram(0); + sub_81223FC(sPokeblockMenu->field_E75, FIELD_E75_COUNT, 1); + + for (i = 0; i < 9; i++) + HandlePokeblockMenuCursor(i, 5); + + HandlePokeblockMenuCursor(sSavedPokeblockData.lastItemPos, 0x1005); + gTasks[taskId].func = Task_HandlePokeblockMenuInput; +} + +static void PutPokeblockOptionsWindow(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + if (sPokeblockMenu->optionsNo == 3) + data[1] = 8; + else + data[1] = 9; + + sub_8136418(); + SetWindowBorderStyle(data[1], 0, 1, 0xE); + sub_81995E4(data[1], sPokeblockMenu->optionsNo, sPokeblockMenuActions, sPokeblockMenu->pokeblockOptionsIds); + InitMenuInUpperLeftCornerPlaySoundWhenAPressed(data[1], sPokeblockMenu->optionsNo, 0); + PutWindowTilemap(data[1]); + schedule_bg_copy_tilemap_to_vram(1); + + gTasks[taskId].func = Task_HandlePokeblockOptionsInput; +} + +static void Task_HandlePokeblockOptionsInput(u8 taskId) +{ + s8 itemId; + + if (sub_81221EC() == TRUE) + return; + + itemId = ProcessMenuInputNoWrapAround(); + if (itemId == MENU_NOTHING_CHOSEN) + { + return; + } + else if (itemId == MENU_B_PRESSED) + { + PlaySE(SE_SELECT); + PokeblockAction_Cancel(taskId); + } + else + { + PlaySE(SE_SELECT); + sPokeblockMenuActions[sPokeblockMenu->pokeblockOptionsIds[itemId]].func.void_u8(taskId); + } +} + +static void PokeblockAction_UseOnField(u8 taskId) +{ + sPokeblockMenu->callbackOnUse = UsePokeblockOnField; + FadePaletteAndSetTaskToClosePokeblockCase(taskId); +} + +static void UsePokeblockOnField(void) +{ + ChooseMonToGivePokeblock(&gSaveBlock1Ptr->pokeblocks[gSpecialVar_ItemId], ReturnToPokeblockCaseOnField); +} + +static void ReturnToPokeblockCaseOnField(void) +{ + OpenPokeblockCase(PBLOCK_CASE_FIELD, sSavedPokeblockData.callback); +} + +static void PokeblockAction_Toss(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + sub_8198070(data[1], FALSE); + StringCopy(gStringVar1, gPokeblockNames[gSaveBlock1Ptr->pokeblocks[gSpecialVar_ItemId].color]); + StringExpandPlaceholders(gStringVar4, gText_ThrowAwayVar1); + DisplayMessageAndContinueTask(taskId, 10, 10, 13, 1, GetPlayerTextSpeed(), gStringVar4, CreateTossPokeblockYesNoMenu); +} + +static void CreateTossPokeblockYesNoMenu(u8 taskId) +{ + CreateYesNoMenuWithCallbacks(taskId, &sTossPkblockWindowTemplate, 1, 0, 2, 1, 0xE, &sTossYesNoFuncTable); +} + +static void TossPokeblockChoice_Yes(u8 taskId) +{ + StringExpandPlaceholders(gStringVar4, gText_Var1ThrownAway); + DisplayMessageAndContinueTask(taskId, 10, 10, 13, 1, GetPlayerTextSpeed(), gStringVar4, HandleErasePokeblock); +} + +static void HandleErasePokeblock(u8 taskId) +{ + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { + s16 *data; + u16 *lastPage, *lastPos; + + TryClearPokeblock(gSpecialVar_ItemId); + PlaySE(SE_SELECT); + + lastPage = &sSavedPokeblockData.lastItemPage; + lastPos = &sSavedPokeblockData.lastItemPos; + data = gTasks[taskId].data; + + sub_81AE6C8(data[0], lastPage, lastPos); + HandlePokeblockMenuCursor(*lastPos, 5); + SetMenuItemsCountAndMaxShowed(); + sub_81362E0(); + HandlePokeblockListMenuItems(); + data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *lastPage, *lastPos); + HandlePokeblockMenuCursor(*lastPos, 0x1005); + schedule_bg_copy_tilemap_to_vram(0); + schedule_bg_copy_tilemap_to_vram(1); + TossPokeblockChoice_No(taskId); + } +} + +static void TossPokeblockChoice_No(u8 taskId) +{ + sub_8197DF8(10, FALSE); + schedule_bg_copy_tilemap_to_vram(1); + sub_81363BC(); + gTasks[taskId].func = Task_HandlePokeblockMenuInput; +} + +static void PokeblockAction_UseInBattle(u8 taskId) +{ + u8 nature = GetNature(&gEnemyParty[0]); + s16 gain = PokeblockGetGain(nature, &gSaveBlock1Ptr->pokeblocks[gSpecialVar_ItemId]); + StringCopy(gBattleTextBuff1, gPokeblockNames[gSaveBlock1Ptr->pokeblocks[gSpecialVar_ItemId].color]); + TryClearPokeblock(gSpecialVar_ItemId); + + gSpecialVar_ItemId = gSaveBlock1Ptr->pokeblocks[gSpecialVar_ItemId].color << 8; + if (gain == 0) + gSpecialVar_ItemId += 1; + else if (gain > 0) + gSpecialVar_ItemId += 2; + else + gSpecialVar_ItemId += 3; + + FadePaletteAndSetTaskToClosePokeblockCase(taskId); +} + +static void PokeblockAction_UseOnPokeblockFeeder(u8 taskId) +{ + SafariZoneActivatePokeblockFeeder(gSpecialVar_ItemId); + StringCopy(gStringVar1, gPokeblockNames[gSaveBlock1Ptr->pokeblocks[gSpecialVar_ItemId].color]); + gSpecialVar_Result = gSpecialVar_ItemId; + TryClearPokeblock(gSpecialVar_ItemId); + gSpecialVar_ItemId = 0; + FadePaletteAndSetTaskToClosePokeblockCase(taskId); +} + +static void PokeblockAction_GiveToContestLady(u8 taskId) +{ + gSpecialVar_0x8004 = GivePokeblockToContestLady(&gSaveBlock1Ptr->pokeblocks[gSpecialVar_ItemId]); + gSpecialVar_Result = gSpecialVar_ItemId; + TryClearPokeblock(gSpecialVar_ItemId); + gSpecialVar_ItemId = 0; + FadePaletteAndSetTaskToClosePokeblockCase(taskId); +} + +static void PokeblockAction_Cancel(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + sub_8198070(data[1], FALSE); + schedule_bg_copy_tilemap_to_vram(1); + sub_81363BC(); + gTasks[taskId].func = Task_HandlePokeblockMenuInput; +} + +static void ClearPokeblock(u8 pkblId) +{ + gSaveBlock1Ptr->pokeblocks[pkblId].color = 0; + gSaveBlock1Ptr->pokeblocks[pkblId].spicy = 0; + gSaveBlock1Ptr->pokeblocks[pkblId].dry = 0; + gSaveBlock1Ptr->pokeblocks[pkblId].sweet = 0; + gSaveBlock1Ptr->pokeblocks[pkblId].bitter = 0; + gSaveBlock1Ptr->pokeblocks[pkblId].sour = 0; + gSaveBlock1Ptr->pokeblocks[pkblId].feel = 0; +} + +void ClearPokeblocks(void) +{ + u8 i; + + for (i = 0; i < POKEBLOCKS_COUNT; i++) + ClearPokeblock(i); +} + +u8 GetHighestPokeblocksFlavorLevel(const struct Pokeblock *pokeblock) +{ + u8 i; + u8 maxFlavor = GetPokeblockData(pokeblock, PBLOCK_SPICY); + + for (i = PBLOCK_SPICY; i < FLAVOR_COUNT; i++) + { + u8 currFlavor = GetPokeblockData(pokeblock, PBLOCK_SPICY + i); + if (maxFlavor < currFlavor) + maxFlavor = currFlavor; + } + + return maxFlavor; +} + +u8 GetPokeblocksFeel(const struct Pokeblock *pokeblock) +{ + u8 feel = GetPokeblockData(pokeblock, PBLOCK_FEEL); + if (feel > POKEBLOCK_MAX_FEEL) + feel = POKEBLOCK_MAX_FEEL; + + return feel; +} + +s8 GetFirstFreePokeblockSlot(void) +{ + u8 i; + + for (i = 0; i < POKEBLOCKS_COUNT; i++) + { + if (gSaveBlock1Ptr->pokeblocks[i].color == 0) + return i; + } + + return -1; +} + +bool32 AddPokeblock(const struct Pokeblock *pokeblock) +{ + s8 slot = GetFirstFreePokeblockSlot(); + + if (slot == -1) + { + return FALSE; + } + else + { + gSaveBlock1Ptr->pokeblocks[slot] = *pokeblock; + return TRUE; + } +} + +bool32 TryClearPokeblock(u8 pkblId) +{ + if (gSaveBlock1Ptr->pokeblocks[pkblId].color == 0) + { + return FALSE; + } + else + { + ClearPokeblock(pkblId); + return TRUE; + } +} + +s16 GetPokeblockData(const struct Pokeblock *pokeblock, u8 field) +{ + if (field == PBLOCK_COLOR) + return pokeblock->color; + if (field == PBLOCK_SPICY) + return pokeblock->spicy; + if (field == PBLOCK_DRY) + return pokeblock->dry; + if (field == PBLOCK_SWEET) + return pokeblock->sweet; + if (field == PBLOCK_BITTER) + return pokeblock->bitter; + if (field == PBLOCK_SOUR) + return pokeblock->sour; + if (field == PBLOCK_FEEL) + return pokeblock->feel; + + return 0; +} + +s16 PokeblockGetGain(u8 nature, const struct Pokeblock *pokeblock) +{ + u8 flavor; + s16 curGain, totalGain = 0; + + for (flavor = 0; flavor < FLAVOR_COUNT; flavor++) + { + curGain = GetPokeblockData(pokeblock, flavor + PBLOCK_SPICY); + if (curGain > 0) + totalGain += curGain * gPokeblockFlavorCompatibilityTable[5 * nature + flavor]; + } + + return totalGain; +} + +void PokeblockCopyName(const struct Pokeblock *pokeblock, u8 *dest) +{ + u8 color = GetPokeblockData(pokeblock, PBLOCK_COLOR); + StringCopy(dest, gPokeblockNames[color]); +} + +bool8 CopyMonFavoritePokeblockName(u8 nature, u8 *dest) +{ + u8 i; + + for (i = 0; i < FLAVOR_COUNT; i++) + { + if (PokeblockGetGain(nature, &sFavoritePokeblocksTable[i]) > 0) + { + StringCopy(dest, gPokeblockNames[i + 1]); + return TRUE; + } + } + + return FALSE; +} + +u8 GetPokeblocksFlavor(const struct Pokeblock *pokeblock) +{ + s16 bestFlavor = 0; + s16 i; + + for (i = 0; i < FLAVOR_COUNT; i++) + { + if (GetPokeblockData(pokeblock, bestFlavor + 1) < GetPokeblockData(pokeblock, i + 1)) + bestFlavor = i; + } + + return bestFlavor; +} diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c new file mode 100644 index 000000000..1bf40bbe5 --- /dev/null +++ b/src/pokeblock_feed.c @@ -0,0 +1,1108 @@ +#include "global.h" +#include "pokeblock.h" +#include "sprite.h" +#include "task.h" +#include "palette.h" +#include "menu.h" +#include "malloc.h" +#include "pokemon.h" +#include "blend_palette.h" +#include "main.h" +#include "menu_helpers.h" +#include "bg.h" +#include "gpu_regs.h" +#include "data2.h" +#include "decompress.h" +#include "event_data.h" +#include "strings.h" +#include "string_util.h" +#include "new_menu_helpers.h" +#include "party_menu.h" +#include "m4a.h" +#include "sound.h" +#include "trig.h" +#include "graphics.h" +#include "battle.h" // to get rid of once gMonSpritesGfxPtr is put elsewhere + +struct PokeblockFeedStruct +{ + struct Sprite *monSpritePtr; + struct Sprite savedMonSprite; + u8 tilemapBuffer[0x808]; + s16 field_850[0x200]; + s16 field_C50[0x200]; + u8 field_1050; + u8 animId; + u8 field_1052; + bool8 noMonFlip; + u16 species; + u16 field_1056; + u16 field_1058; + u8 nature; + u8 monSpriteId_; + u8 field_105C; + u8 monSpriteId; + u8 pokeblockCaseSpriteId; + u8 pokeblockSpriteId; + s16 field_1060[15]; + s16 loadGfxState; + u8 unused; +}; + +extern u16 gSpecialVar_ItemId; +extern struct MusicPlayerInfo gMPlay_BGM; +extern struct SpriteTemplate gUnknown_0202499C; + +extern const u8 gBattleTerrainPalette_Frontier[]; +extern const u8 gBattleTerrainTiles_Building[]; +extern const u8 gUnknown_08D9BA44[]; +extern const struct CompressedSpriteSheet gMonFrontPicTable[]; +extern const u16 gUnknown_0860F074[]; + +extern bool8 sub_81221EC(void); +extern void sub_806A068(u16, u8); +extern void sub_809882C(u8, u16, u8); + +// this file's functions +static void HandleInitBackgrounds(void); +static void HandleInitWindows(void); +static void LaunchPokeblockFeedTask(void); +static void SetPokeblockSpritePal(u8 pokeblockCaseId); +static void sub_817A5CC(void); +static void sub_8148108(u8 spriteId, bool8 a1); +static void DoPokeblockCaseThrowEffect(u8 spriteId, bool8 arg1); +static void PrepareMonToMoveToPokeblock(u8 spriteId); +static void Task_HandleMonAtePokeblock(u8 taskId); +static void Task_PaletteFadeToReturn(u8 taskId); +static void sub_817A634(void); +static void sub_817A468(struct Sprite *sprite); +static void sub_817AB68(void); +static void sub_817AA54(void); +static bool8 sub_817A91C(void); +static bool8 FreeMonSpriteOamMatrix(void); +static bool8 sub_817A9E4(void); +static bool8 LoadMonAndSceneGfx(struct Pokemon *mon); +static u8 CreatePokeblockSprite(void); +static u8 CreatePokeblockCaseSpriteForFeeding(void); +static u8 CreateMonSprite(struct Pokemon *mon); +static void SpriteCB_ThrownPokeblock(struct Sprite* sprite); + +// ram variables +EWRAM_DATA static struct PokeblockFeedStruct *sPokeblockFeed = NULL; +EWRAM_DATA static struct CompressedSpritePalette sPokeblockSpritePal = {0}; + +// const rom data +static const u8 sNatureToMonPokeblockAnim[][2] = +{ + { 0, 0 }, // HARDY + { 3, 0 }, // LONELY + { 4, 1 }, // BRAVE + { 5, 0 }, // ADAMANT + { 10, 0 }, // NAUGHTY + { 13, 0 }, // BOLD + { 15, 0 }, // DOCILE + { 16, 2 }, // RELAXED + { 18, 0 }, // IMPISH + { 19, 0 }, // LAX + { 20, 0 }, // TIMID + { 25, 0 }, // HASTY + { 27, 3 }, // SERIOUS + { 28, 0 }, // JOLLY + { 29, 0 }, // NAIVE + { 33, 4 }, // MODEST + { 36, 0 }, // MILD + { 37, 0 }, // QUIET + { 39, 0 }, // BASHFUL + { 42, 0 }, // RASH + { 45, 0 }, // CALM + { 46, 5 }, // GENTLE + { 47, 6 }, // SASSY + { 48, 0 }, // CAREFUL + { 53, 0 }, // QUIRKY +}; + +static const s16 sMonPokeblockAnims[][10] = +{ + // HARDY + { 0, 4, 0, 8, 24, 0, 0, 0, 12, 0}, + { 0, 4, 0, 16, 24, 0, 0, 0, 12, 0}, + { 0, 4, 0, 32, 32, 0, 0, 0, 16, 1}, + + // LONELY + { 0, 3, 6, 0, 48, 0, 0, 0, 24, 1}, + + // BRAVE + { 64, 16, -24, 0, 32, 0, 0, 0, 0, 1}, + + // ADAMANT + { 0, 4, 8, 0, 16, 0, -8, 0, 0, 0}, + { 0, 0, 0, 0, 16, 0, 0, 0, 0, 0}, + { 0, 4, 8, 0, 16, 0, -8, 0, 0, 0}, + { 0, 0, 0, 0, 16, 0, 0, 0, 0, 0}, + { 0, 4, -16, 0, 4, 0, 16, 0, 0, 1}, + + // NAUGHTY + { 0, 3, 6, 0, 12, 0, 0, 0, 6, 0}, + { 0, 3, -6, 0, 12, 0, 0, 0, 6, 0}, + { 0, 16, 16, 0, 45, 1, 0, 0, 0, 1}, + + // BOLD + { 0, 16, 0, 24, 32, 0, 0, 0, 16, 0}, + { 0, 16, 0, 23, 32, 0, 0, 0, 16, 1}, + + // DOCILE + { 0, 0, 0, 0, 80, 0, 0, 0, 0, 1}, + + // RELAXED + { 0, 2, 8, 0, 32, 0, 0, 0, 0, 0}, + { 0, 2, -8, 0, 32, 0, 0, 0, 0, 1}, + + // IMPISH + { 0, 32, 2, 1, 48, 1, 0, 0, 24, 1}, + + // LAX + { 0, 2, 16, 16, 128, 0, 0, 0, 0, 1}, + + // TIMID + { 0, 2, -8, 0, 48, 0, -24, 0, 0, 0}, + { 0, 0, 0, 0, 8, 0, 0, 0, 0, 0}, + { 64, 32, 2, 0, 36, 0, 0, 0, 0, 0}, + { 0, 0, 0, 0, 8, 0, 0, 0, 0, 0}, + { 0, 2, 8, 0, 48, 0, 24, 0, 0, 1}, + + // HASTY + { 64, 24, 16, 0, 32, 0, 0, 0, 0, 0}, + { 0, 28, 2, 1, 32, 1, 0, 0, 16, 1}, + + // SERIOUS + { 0, 0, 0, 0, 32, 0, 0, 0, 0, 1}, + + // JOLLY + { 64, 16, -16, 2, 48, 0, 0, 0, 32, 1}, + + // NAIVE + { 0, 12, -8, 4, 24, 0, 8, 0, 12, 0}, + { 0, 12, 8, 8, 24, 0, -16, 0, 12, 0}, + { 0, 12, -8, 16, 24, 0, 16, 0, 12, 0}, + { 0, 12, 8, 28, 24, 0, -8, 0, 12, 1}, + + // MODEST + { 0, 0, 0, 0, 8, 0, 0, 0, 0, 0}, + { 64, 16, -4, 0, 32, 0, 0, 0, 0, 0}, + { 0, 0, 0, 0, 8, 0, 0, 0, 0, 1}, + + // MILD + { 128, 4, 0, 8, 64, 0, 0, 0, 0, 1}, + + // QUIET + { 0, 2, 16, 0, 48, 0, 0, 0, 0, 0}, + { 128, 2, 16, 0, 48, 0, 0, 0, 0, 1}, + + // BASHFUL + { 0, 2, -4, 0, 48, 0, -48, 0, 0, 0}, + { 0, 0, 0, 0, 80, 0, 0, 0, 0, 0}, + { 0, 2, 8, 0, 24, 0, 48, 0, 0, 1}, + + // RASH + { 64, 4, 64, 58, 52, 0, -88, 0, 0, 0}, + { 0, 0, 0, 0, 80, 0, 0, 0, 0, 0}, + { 0, 24, 80, 0, 32, 0, 88, 0, 0, 1}, + + // CALM + { 0, 2, 16, 4, 64, 0, 0, 0, 0, 1}, + + // GENTLE + { 0, 0, 0, 0, 32, 0, 0, 0, 0, 1}, + + // SASSY + { 0, 0, 0, 0, 42, 0, 0, 0, 0, 1}, + + // CAREFUL + { 0, 4, 0, 8, 24, 0, 0, 0, 12, 0}, + { 0, 0, 0, 0, 12, 0, 0, 0, 0, 0}, + { 0, 4, 0, 12, 24, 0, 0, 0, 12, 0}, + { 0, 0, 0, 0, 12, 0, 0, 0, 0, 0}, + { 0, 4, 0, 4, 24, 0, 0, 0, 12, 1}, + + // QUIRKY + { 0, 4, 16, 12, 64, 0, 0, 0, 0, 0}, + { 0, -4, 16, 12, 64, 0, 0, 0, 0, 1}, +}; + +static const union AffineAnimCmd sSpriteAffineAnim_8411E90[] = +{ + AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0), + AFFINEANIMCMD_END +}; + +static const union AffineAnimCmd sSpriteAffineAnim_8411EA0[] = +{ + AFFINEANIMCMD_FRAME(0, 0, 12, 1), + AFFINEANIMCMD_FRAME(0, 0, 0, 30), + AFFINEANIMCMD_FRAME(0, 0, -12, 1), + AFFINEANIMCMD_END +}; + +static const union AffineAnimCmd sSpriteAffineAnim_8411EC0[] = +{ + AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0), + AFFINEANIMCMD_FRAME(0, 0, 12, 1), + AFFINEANIMCMD_FRAME(0, 0, 0, 28), + AFFINEANIMCMD_FRAME(0, 0, -4, 3), + AFFINEANIMCMD_END +}; + +static const union AffineAnimCmd sSpriteAffineAnim_8411EE8[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 16), + AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 32), + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 16), + AFFINEANIMCMD_END +}; + +static const union AffineAnimCmd sSpriteAffineAnim_8411F08[] = +{ + AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0), + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 16), + AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 32), + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 16), + AFFINEANIMCMD_END +}; + +static const union AffineAnimCmd sSpriteAffineAnim_8411F30[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 8), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 16), + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 8), + AFFINEANIMCMD_END +}; + +static const union AffineAnimCmd sSpriteAffineAnim_8411F50[] = +{ + AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0), + AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 8), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 16), + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 8), + AFFINEANIMCMD_END +}; + +static const union AffineAnimCmd sSpriteAffineAnim_8411F78[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 8), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 32), + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 8), + AFFINEANIMCMD_END +}; + +static const union AffineAnimCmd sSpriteAffineAnim_8411F98[] = +{ + AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0), + AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 8), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 32), + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 8), + AFFINEANIMCMD_END +}; + +static const union AffineAnimCmd sSpriteAffineAnim_8411FC0[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 4), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 24), + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 4), + AFFINEANIMCMD_END +}; + +static const union AffineAnimCmd sSpriteAffineAnim_8411FE0[] = +{ + AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0), + AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 4), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 24), + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 4), + AFFINEANIMCMD_END +}; + +static const union AffineAnimCmd sSpriteAffineAnim_8412008[] = +{ + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 24), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 16), + AFFINEANIMCMD_FRAME(0x0, 0x0, -12, 2), + AFFINEANIMCMD_END +}; + +static const union AffineAnimCmd sSpriteAffineAnim_8412028[] = +{ + AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0), + AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 24), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 16), + AFFINEANIMCMD_FRAME(0x0, 0x0, -12, 2), + AFFINEANIMCMD_END +}; + +static const union AffineAnimCmd *const sSpriteAffineAnimTable_85F04FC[] = +{ + sSpriteAffineAnim_8411E90, + sSpriteAffineAnim_8411EA0, + sSpriteAffineAnim_8411EE8, + sSpriteAffineAnim_8411F30, + sSpriteAffineAnim_8411F78, + sSpriteAffineAnim_8411FC0, + sSpriteAffineAnim_8412008, + sSpriteAffineAnim_8411E90, + sSpriteAffineAnim_8411E90, + sSpriteAffineAnim_8411E90, + sSpriteAffineAnim_8411E90, + sSpriteAffineAnim_8411EC0, + sSpriteAffineAnim_8411F08, + sSpriteAffineAnim_8411F50, + sSpriteAffineAnim_8411F98, + sSpriteAffineAnim_8411FE0, + sSpriteAffineAnim_8412028, + sSpriteAffineAnim_8411E90, + sSpriteAffineAnim_8411E90, + sSpriteAffineAnim_8411E90, + sSpriteAffineAnim_8411E90, +}; + +static const struct BgTemplate sBackgroundTemplates[] = +{ + { + .bg = 0, + .charBaseIndex = 0, + .mapBaseIndex = 31, + .screenSize = 0, + .paletteMode = 0, + .priority = 0, + .baseTile = 0 + }, + { + .bg = 1, + .charBaseIndex = 2, + .mapBaseIndex = 30, + .screenSize = 0, + .paletteMode = 0, + .priority = 3, + .baseTile = 0 + } +}; + +static const struct WindowTemplate sWindowTemplates[] = +{ + {0, 1, 0xF, 0x1C, 4, 0xF, 0xA}, + DUMMY_WIN_TEMPLATE +}; + +static const u8* const sPokeblocksPals[] = +{ + gPokeblockRed_Pal, + gPokeblockBlue_Pal, + gPokeblockPink_Pal, + gPokeblockGreen_Pal, + gPokeblockYellow_Pal, + gPokeblockPurple_Pal, + gPokeblockIndigo_Pal, + gPokeblockBrown_Pal, + gPokeblockLiteBlue_Pal, + gPokeblockOlive_Pal, + gPokeblockGray_Pal, + gPokeblockBlack_Pal, + gPokeblockWhite_Pal, + gPokeblockGold_Pal +}; + +static const union AffineAnimCmd sSpriteAffineAnim_84120DC[] = +{ + AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0), + AFFINEANIMCMD_END +}; + +static const union AffineAnimCmd *const sSpriteAffineAnimTable_MonNoFlip[] = +{ + sSpriteAffineAnim_84120DC +}; + +static const union AffineAnimCmd sSpriteAffineAnim_84120F0[] = +{ + AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0), + AFFINEANIMCMD_FRAME(0x0, 0x0, -8, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, -8, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, -8, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, -8, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8), + AFFINEANIMCMD_FRAME(0x0, 0x0, 16, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 16, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 16, 1), + AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0), + AFFINEANIMCMD_END +}; + +static const union AffineAnimCmd sSpriteAffineAnim_8412148[] = +{ + AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0), + AFFINEANIMCMD_FRAME(0x0, 0x0, 8, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 8, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 8, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 8, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 8), + AFFINEANIMCMD_FRAME(0x0, 0x0, -16, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, -16, 1), + AFFINEANIMCMD_FRAME(0x0, 0x0, -16, 1), + AFFINEANIMCMD_FRAME(-0x100, 0x100, 0, 0), + AFFINEANIMCMD_END +}; + +static const union AffineAnimCmd *const sSpriteAffineAnimTable_85F0664[] = +{ + sSpriteAffineAnim_84120DC +}; + +static const union AffineAnimCmd *const sSpriteAffineAnimTable_85F0668[] = +{ + sSpriteAffineAnim_84120F0 +}; + +static const union AffineAnimCmd *const sSpriteAffineAnimTable_85F066C[] = +{ + sSpriteAffineAnim_8412148 +}; + +static const struct OamData sThrownPokeblockOamData = +{ + .y = 0, + .affineMode = 3, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 0, + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0, +}; + +static const union AnimCmd sThrownPokeblockSpriteAnim[] = +{ + ANIMCMD_FRAME(0, 0), + ANIMCMD_END +}; + +static const union AnimCmd *const sThrownPokeblockAnimTable[] = +{ + sThrownPokeblockSpriteAnim, +}; + +static const union AffineAnimCmd sSpriteAffineAnim_84121C0[] = +{ + AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), + AFFINEANIMCMD_FRAME(-8, -8, 0, 1), + AFFINEANIMCMD_JUMP(1) +}; + +static const union AffineAnimCmd *const sThrownPokeblockAffineAnimTable[] = +{ + sSpriteAffineAnim_84121C0 +}; + +static const struct CompressedSpriteSheet sPokeblock_SpriteSheet = +{ + gPokeblock_Gfx, 0x20, GFX_TAG_POKEBLOCK +}; + +static const struct SpriteTemplate sThrownPokeblockSpriteTemplate = +{ + .tileTag = GFX_TAG_POKEBLOCK, + .paletteTag = GFX_TAG_POKEBLOCK, + .oam = &sThrownPokeblockOamData, + .anims = sThrownPokeblockAnimTable, + .images = NULL, + .affineAnims = sThrownPokeblockAffineAnimTable, + .callback = SpriteCB_ThrownPokeblock +}; + +// code +static void CB2_PokeblockFeed(void) +{ + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); + do_scheduled_bg_tilemap_copies_to_vram(); + UpdatePaletteFade(); +} + +static void VBlankCB_PokeblockFeed(void) +{ + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); +} + +static bool8 TransitionToPokeblockFeedScene(void) +{ + switch (gMain.state) + { + case 0: + sPokeblockFeed = AllocZeroed(sizeof(*sPokeblockFeed)); + SetVBlankHBlankCallbacksToNull(); + clear_scheduled_bg_copies_to_vram(); + gMain.state++; + break; + case 1: + ResetPaletteFade(); + gPaletteFade.bufferTransferDisabled = 1; + gMain.state++; + break; + case 2: + ResetSpriteData(); + gMain.state++; + break; + case 3: + FreeAllSpritePalettes(); + gMain.state++; + break; + case 4: + AllocateMonSpritesGfx(); + gMain.state++; + break; + case 5: + HandleInitBackgrounds(); + gMain.state++; + break; + case 6: + HandleInitWindows(); + gMain.state++; + break; + case 7: + if (LoadMonAndSceneGfx(&gPlayerParty[gPokeblockMonId])) + { + gMain.state++; + } + break; + case 8: + sPokeblockFeed->pokeblockCaseSpriteId = CreatePokeblockCaseSpriteForFeeding(); + gMain.state++; + break; + case 9: + sPokeblockFeed->monSpriteId = CreateMonSprite(&gPlayerParty[gPokeblockMonId]); + gMain.state++; + break; + case 10: + SetWindowBorderStyle(0, 1, 1, 14); + gMain.state++; + break; + case 11: + LaunchPokeblockFeedTask(); + gMain.state++; + break; + case 12: + BlendPalettes(-1, 0x10, 0); + gMain.state++; + break; + case 13: + BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + gPaletteFade.bufferTransferDisabled = 0; + gMain.state++; + break; + default: + SetVBlankCallback(VBlankCB_PokeblockFeed); + SetMainCallback2(CB2_PokeblockFeed); + return TRUE; + } + return FALSE; +} + +void CB2_PreparePokeblockFeedScene(void) +{ + while (1) + { + if (sub_81221EC() == TRUE) + break; + if (TransitionToPokeblockFeedScene() == TRUE) + break; + if (sub_81221AC() == TRUE) + break; + } +} + +static void HandleInitBackgrounds(void) +{ + ResetVramOamAndBgCntRegs(); + + ResetBgsAndClearDma3BusyFlags(0); + InitBgsFromTemplates(0, sBackgroundTemplates, ARRAY_COUNT(sBackgroundTemplates)); + SetBgTilemapBuffer(1, sPokeblockFeed->tilemapBuffer); + ResetAllBgsCoordinates(); + schedule_bg_copy_tilemap_to_vram(1); + + SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); + + ShowBg(0); + ShowBg(1); + + SetGpuReg(REG_OFFSET_BLDCNT, 0); +} + +static bool8 LoadMonAndSceneGfx(struct Pokemon *mon) +{ + u16 species; + u32 personality, trainerId; + const struct CompressedSpritePalette *palette; + + switch (sPokeblockFeed->loadGfxState) + { + case 0: + species = GetMonData(mon, MON_DATA_SPECIES2); + personality = GetMonData(mon, MON_DATA_PERSONALITY); + HandleLoadSpecialPokePic_2(&gMonFrontPicTable[species], gMonSpritesGfxPtr->sprites[1], species, personality); + sPokeblockFeed->loadGfxState++; + break; + case 1: + species = GetMonData(mon, MON_DATA_SPECIES2); + personality = GetMonData(mon, MON_DATA_PERSONALITY); + trainerId = GetMonData(mon, MON_DATA_OT_ID); + palette = GetMonSpritePalStructFromOtIdPersonality(species, trainerId, personality); + + LoadCompressedObjectPalette(palette); + sub_806A068(palette->tag, 1); + sPokeblockFeed->loadGfxState++; + break; + case 2: + LoadCompressedObjectPic(&gPokeblockCase_SpriteSheet); + sPokeblockFeed->loadGfxState++; + break; + case 3: + LoadCompressedObjectPalette(&gPokeblockCase_SpritePal); + sPokeblockFeed->loadGfxState++; + break; + case 4: + LoadCompressedObjectPic(&sPokeblock_SpriteSheet); + sPokeblockFeed->loadGfxState++; + break; + case 5: + SetPokeblockSpritePal(gSpecialVar_ItemId); + LoadCompressedObjectPalette(&sPokeblockSpritePal); + sPokeblockFeed->loadGfxState++; + break; + case 6: + reset_temp_tile_data_buffers(); + decompress_and_copy_tile_data_to_vram(1, gBattleTerrainTiles_Building, 0, 0, 0); + sPokeblockFeed->loadGfxState++; + break; + case 7: + if (free_temp_tile_data_buffers_if_possible() != TRUE) + { + LZDecompressWram(gUnknown_08D9BA44, sPokeblockFeed->tilemapBuffer); + sPokeblockFeed->loadGfxState++; + } + break; + case 8: + LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60); + sPokeblockFeed->loadGfxState = 0; + return TRUE; + } + + return FALSE; +} + +static void HandleInitWindows(void) +{ + InitWindows(sWindowTemplates); + DeactivateAllTextPrinters(); + sub_809882C(0, 1, 0xE0); + LoadPalette(gUnknown_0860F074, 0xF0, 0x20); + FillWindowPixelBuffer(0, 0); + PutWindowTilemap(0); + schedule_bg_copy_tilemap_to_vram(0); +} + +static void SetPokeblockSpritePal(u8 pokeblockCaseId) +{ + u8 colorId = GetPokeblockData(&gSaveBlock1Ptr->pokeblocks[pokeblockCaseId], PBLOCK_COLOR); + sPokeblockSpritePal.data = sPokeblocksPals[colorId - 1]; + sPokeblockSpritePal.tag = GFX_TAG_POKEBLOCK; +} + +// defines for task data fields + +#define tFrames data[0] +#define tData1 data[1] + +static void Task_HandlePokeblockFeed(u8 taskId) +{ + if (!gPaletteFade.active) + { + switch (gTasks[taskId].tFrames) + { + case 0: + sPokeblockFeed->field_1050 = 0; + sPokeblockFeed->field_1058 = 0; + sub_817A5CC(); + break; + case 255: + DoPokeblockCaseThrowEffect(sPokeblockFeed->pokeblockCaseSpriteId, gTasks[taskId].tData1); + break; + case 269: + sPokeblockFeed->pokeblockSpriteId = CreatePokeblockSprite(); + break; + case 281: + PrepareMonToMoveToPokeblock(sPokeblockFeed->monSpriteId); + break; + case 297: + gTasks[taskId].func = Task_HandleMonAtePokeblock; + return; + } + + if (sPokeblockFeed->field_1058 < sPokeblockFeed->field_1056) + sub_817A634(); + else if (sPokeblockFeed->field_1058 == sPokeblockFeed->field_1056) + gTasks[taskId].tFrames = 254; + + sPokeblockFeed->field_1058++; + gTasks[taskId].tFrames++; + } +} + +static void LaunchPokeblockFeedTask(void) +{ + u8 taskId = CreateTask(Task_HandlePokeblockFeed, 0); + gTasks[taskId].tFrames = 0; + gTasks[taskId].tData1 = 1; +} + +static void Task_WaitForAtePokeblockText(u8 taskId) +{ + if (RunTextPrintersRetIsActive(0) != TRUE) + gTasks[taskId].func = Task_PaletteFadeToReturn; +} + +static void Task_HandleMonAtePokeblock(u8 taskId) +{ + struct Pokemon *mon = &gPlayerParty[gPokeblockMonId]; + struct Pokeblock *pokeblock = &gSaveBlock1Ptr->pokeblocks[gSpecialVar_ItemId]; + + gPokeblockGain = PokeblockGetGain(GetNature(mon), pokeblock); + GetMonNickname(mon, gStringVar1); + PokeblockCopyName(pokeblock, gStringVar2); + + if (gPokeblockGain == 0) + StringExpandPlaceholders(gStringVar4, gText_Var1AteTheVar2); + else if (gPokeblockGain > 0) + StringExpandPlaceholders(gStringVar4, gText_Var1HappilyAteVar2); + else + StringExpandPlaceholders(gStringVar4, gText_Var1DisdainfullyAteVar2); + + gTextFlags.flag_0 = 1; + AddTextPrinterParametrized(0, 1, gStringVar4, GetPlayerTextSpeed(), NULL, 2, 1, 3); + gTasks[taskId].func = Task_WaitForAtePokeblockText; +} + +static void Task_ReturnAfterPaletteFade(u8 taskId) +{ + if (!gPaletteFade.active) + { + ResetSpriteData(); + FreeAllSpritePalettes(); + m4aMPlayVolumeControl(&gMPlay_BGM, -1, 0x100); + SetMainCallback2(gMain.savedCallback); + DestroyTask(taskId); + FreeAllWindowBuffers(); + Free(sPokeblockFeed); + FreeMonSpritesGfx(); + } +} + +static void Task_PaletteFadeToReturn(u8 taskId) +{ + BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + gTasks[taskId].func = Task_ReturnAfterPaletteFade; +} + +#undef tFrames +#undef tData1 + +// defines for mon sprite data fields + +#define tDelta data[0] +#define tDeltaMod data[1] +#define tSpecies data[2] + +static u8 CreateMonSprite(struct Pokemon* mon) +{ + u16 species = GetMonData(mon, MON_DATA_SPECIES2); + u8 spriteId = CreateSprite(&gUnknown_0202499C, 48, 80, 2); + + sPokeblockFeed->species = species; + sPokeblockFeed->monSpriteId_ = spriteId; + sPokeblockFeed->nature = GetNature(mon); + gSprites[spriteId].tSpecies = species; + gSprites[spriteId].callback = SpriteCallbackDummy; + + sPokeblockFeed->noMonFlip = TRUE; + if (!IsPokeSpriteNotFlipped(species)) + { + gSprites[spriteId].affineAnims = sSpriteAffineAnimTable_MonNoFlip; + gSprites[spriteId].oam.affineMode = 3; + CalcCenterToCornerVec(&gSprites[spriteId], gSprites[spriteId].oam.shape, gSprites[spriteId].oam.size, gSprites[spriteId].oam.affineMode); + sPokeblockFeed->noMonFlip = FALSE; + } + + return spriteId; +} + +static void PrepareMonToMoveToPokeblock(u8 spriteId) +{ + gSprites[spriteId].pos1.x = 48; + gSprites[spriteId].pos1.y = 80; + gSprites[spriteId].tDelta = -8; + gSprites[spriteId].tDeltaMod = 1; + gSprites[spriteId].callback = sub_817A468; +} + +static void sub_817A468(struct Sprite* sprite) +{ + sprite->pos1.x += 4; + sprite->pos1.y += sprite->tDelta; + sprite->tDelta += sprite->tDeltaMod; + + if (sprite->tDelta == 0) + PlayCry1(sprite->tSpecies, 0); + if (sprite->tDelta == 9) + sprite->callback = SpriteCallbackDummy; +} + +#undef tDelta +#undef tDeltaMod +#undef tSpecies + +static u8 CreatePokeblockCaseSpriteForFeeding(void) +{ + u8 spriteId = CreatePokeblockCaseSprite(188, 100, 2); + gSprites[spriteId].oam.affineMode = 1; + gSprites[spriteId].affineAnims = sSpriteAffineAnimTable_85F0664; + gSprites[spriteId].callback = SpriteCallbackDummy; + InitSpriteAffineAnim(&gSprites[spriteId]); + return spriteId; +} + +static void DoPokeblockCaseThrowEffect(u8 spriteId, bool8 a1) +{ + FreeOamMatrix(gSprites[spriteId].oam.matrixNum); + gSprites[spriteId].oam.affineMode = 3; + + if (!a1) + gSprites[spriteId].affineAnims = sSpriteAffineAnimTable_85F0668; + else + gSprites[spriteId].affineAnims = sSpriteAffineAnimTable_85F066C; + + InitSpriteAffineAnim(&gSprites[spriteId]); +} + +// defines for the pokeblock sprite data fields +#define tDelta data[0] +#define tDeltaMod data[1] + +static u8 CreatePokeblockSprite(void) +{ + u8 spriteId = CreateSprite(&sThrownPokeblockSpriteTemplate, 174, 84, 1); + gSprites[spriteId].tDelta = -12; + gSprites[spriteId].tDeltaMod = 1; + return spriteId; +} + +static void SpriteCB_ThrownPokeblock(struct Sprite* sprite) +{ + sprite->pos1.x -= 4; + sprite->pos1.y += sprite->tDelta; + sprite->tDelta += sprite->tDeltaMod; + if (sprite->tDelta == 10) + DestroySprite(sprite); +} + +#undef tDelta +#undef tDeltaMod + +static void sub_817A5CC(void) +{ + u8 animId, i; + struct PokeblockFeedStruct *pokeblockFeed; + + pokeblockFeed = sPokeblockFeed; + pokeblockFeed->field_1056 = 1; + animId = sNatureToMonPokeblockAnim[pokeblockFeed->nature][0]; + for (i = 0; i < 8; i++, animId++) + { + pokeblockFeed->field_1056 += sMonPokeblockAnims[animId][4]; + if (sMonPokeblockAnims[animId][9] == 1) + break; + } +} + +static void sub_817A634(void) +{ + struct PokeblockFeedStruct *pokeblockFeed = sPokeblockFeed; + + switch (pokeblockFeed->field_1050) + { + case 0: + pokeblockFeed->animId = sNatureToMonPokeblockAnim[pokeblockFeed->nature][0]; + pokeblockFeed->monSpritePtr = &gSprites[pokeblockFeed->monSpriteId_]; + pokeblockFeed->savedMonSprite = *pokeblockFeed->monSpritePtr; + pokeblockFeed->field_1050 = 10; + break; + case 1 ... 9: + break; + case 10: + sub_817A91C(); + if (sNatureToMonPokeblockAnim[pokeblockFeed->nature][1] != 0) + { + pokeblockFeed->monSpritePtr->oam.affineMode = 3; + pokeblockFeed->monSpritePtr->oam.matrixNum = 0; + pokeblockFeed->monSpritePtr->affineAnims = sSpriteAffineAnimTable_85F04FC; + InitSpriteAffineAnim(pokeblockFeed->monSpritePtr); + } + pokeblockFeed->field_1050 = 50; + case 50: + if (sNatureToMonPokeblockAnim[pokeblockFeed->nature][1] != 0) + { + if (!pokeblockFeed->noMonFlip) // double negation, so mon's sprite is flipped + StartSpriteAffineAnim(pokeblockFeed->monSpritePtr, sNatureToMonPokeblockAnim[pokeblockFeed->nature][1] + 10); + else + StartSpriteAffineAnim(pokeblockFeed->monSpritePtr, sNatureToMonPokeblockAnim[pokeblockFeed->nature][1]); + } + pokeblockFeed->field_1050 = 60; + break; + case 60: + if (sub_817A9E4() == TRUE) + { + if (pokeblockFeed->field_1060[9] == 0) + { + pokeblockFeed->animId++; + sub_817A91C(); + pokeblockFeed->field_1050 = 60; + } + else + { + FreeOamMatrix(pokeblockFeed->monSpritePtr->oam.matrixNum); + pokeblockFeed->field_1050 = 70; + } + } + break; + case 70: + FreeMonSpriteOamMatrix(); + pokeblockFeed->animId = 0; + pokeblockFeed->field_1050 = 0; + break; + case 71 ... 90: + break; + } +} + +static bool8 sub_817A91C(void) +{ + struct PokeblockFeedStruct *pokeblockFeed = sPokeblockFeed; + u8 i; + + for (i = 0; i < 10; i++) + pokeblockFeed->field_1060[i] = sMonPokeblockAnims[pokeblockFeed->animId][i]; + + if (pokeblockFeed->field_1060[4] == 0) + { + return TRUE; + } + else + { + pokeblockFeed->field_1060[10] = Sin(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[2]); + pokeblockFeed->field_1060[11] = Cos(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[3]); + pokeblockFeed->field_1060[12] = pokeblockFeed->field_1060[4]; + pokeblockFeed->field_1060[13] = pokeblockFeed->monSpritePtr->pos2.x; + pokeblockFeed->field_1060[14] = pokeblockFeed->monSpritePtr->pos2.y; + sub_817AB68(); + pokeblockFeed->field_1060[4] = pokeblockFeed->field_1060[12]; + sub_817AA54(); + pokeblockFeed->field_1060[4] = pokeblockFeed->field_1060[12]; + return FALSE; + } +} + +static bool8 sub_817A9E4(void) +{ + u16 var = sPokeblockFeed->field_1060[12] - sPokeblockFeed->field_1060[4]; + + sPokeblockFeed->monSpritePtr->pos2.x = sPokeblockFeed->field_850[var]; + sPokeblockFeed->monSpritePtr->pos2.y = sPokeblockFeed->field_C50[var]; + + if (--sPokeblockFeed->field_1060[4] == 0) + return TRUE; + else + return FALSE; +} + +static bool8 FreeMonSpriteOamMatrix(void) +{ + FreeSpriteOamMatrix(sPokeblockFeed->monSpritePtr); + return FALSE; +} + +static void sub_817AA54(void) +{ + struct PokeblockFeedStruct *pokeblockFeed = sPokeblockFeed; + u16 i; + u16 r8 = pokeblockFeed->field_1060[8]; + u16 r7 = pokeblockFeed->field_1060[12] - r8; + s16 var3 = pokeblockFeed->field_1060[13] + pokeblockFeed->field_1060[6]; + s16 r9 = pokeblockFeed->field_1060[14] + pokeblockFeed->field_1060[7]; + + for (i = 0; i < r7 - 1; i++) + { + s16 r1 = pokeblockFeed->field_850[r8 + i] - (var3); + s16 r4 = pokeblockFeed->field_C50[r8 + i] - r9; + + pokeblockFeed->field_850[r8 + i] -= r1 * (i + 1) / r7; + pokeblockFeed->field_C50[r8 + i] -= r4 * (i + 1) / r7; + } + + pokeblockFeed->field_850[(r8 + r7) - 1] = var3; + pokeblockFeed->field_C50[(r8 + r7) - 1] = r9; +} + +static void sub_817AB68(void) +{ + struct PokeblockFeedStruct *pokeblockFeed = sPokeblockFeed; + bool8 var_24 = FALSE; + s16 r8 = pokeblockFeed->field_1060[13] - pokeblockFeed->field_1060[10]; + s16 r7 = pokeblockFeed->field_1060[14] - pokeblockFeed->field_1060[11]; + + while (1) + { + u16 r5; + u16 r4; + u16 var; + + var = abs(pokeblockFeed->field_1060[5]); + r5 = var + pokeblockFeed->field_1060[3]; + pokeblockFeed->field_1060[3] = r5; + + if (pokeblockFeed->field_1060[2] < 0) + var_24 = TRUE; + + r4 = pokeblockFeed->field_1060[12] - pokeblockFeed->field_1060[4]; + + if (pokeblockFeed->field_1060[4] == 0) + break; + + if (!var_24) + { + pokeblockFeed->field_850[r4] = Sin(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[2] + r5 / 0x100) + r8; + pokeblockFeed->field_C50[r4] = Cos(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[3] + r5 / 0x100) + r7; + } + else + { + pokeblockFeed->field_850[r4] = Sin(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[2] - r5 / 0x100) + r8; + pokeblockFeed->field_C50[r4] = Cos(pokeblockFeed->field_1060[0], pokeblockFeed->field_1060[3] - r5 / 0x100) + r7; + } + + pokeblockFeed->field_1060[0] += pokeblockFeed->field_1060[1]; + pokeblockFeed->field_1060[0] &= 0xFF; + pokeblockFeed->field_1060[4]--; + } +} diff --git a/src/pokemon_2.c b/src/pokemon_2.c index a4d00112b..db176e025 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -1155,7 +1155,7 @@ u8 GetMonsStateToDoubles_2(void) s32 aliveCount = 0; s32 i; - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) { u32 species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2, NULL); if (species != SPECIES_EGG && species != SPECIES_NONE diff --git a/src/pokemon_3.c b/src/pokemon_3.c index a419dd46e..1a44a4410 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -11,8 +11,7 @@ #include "link.h" #include "constants/hold_effects.h" #include "random.h" -#include "trainer_classes.h" -#include "trainer_ids.h" +#include "constants/trainers.h" #include "constants/songs.h" #include "sound.h" #include "m4a.h" @@ -22,6 +21,7 @@ #include "constants/abilities.h" #include "pokemon_animation.h" #include "pokedex.h" +#include "pokeblock.h" extern struct BattlePokemon gBattleMons[4]; extern struct BattleEnigmaBerry gEnigmaBerries[4]; @@ -59,7 +59,6 @@ extern const u8 gText_PkmnsXPreventsSwitching[]; extern const struct CompressedSpritePalette gMonPaletteTable[]; extern const struct CompressedSpritePalette gMonShinyPaletteTable[]; extern const u16 gHMMoves[]; -extern const s8 gPokeblockFlavorCompatibilityTable[]; extern const u8 gMonAnimationDelayTable[]; extern const u8 gMonFrontAnimIdsTable[]; @@ -692,9 +691,9 @@ void AdjustFriendship(struct Pokemon *mon, u8 event) if ((event != 5 || !(Random() & 1)) && (event != 3 || ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) - && (gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_ELITE_FOUR - || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_LEADER - || gTrainers[gTrainerBattleOpponent_A].trainerClass == CLASS_CHAMPION)))) + && (gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_ELITE_FOUR + || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_LEADER + || gTrainers[gTrainerBattleOpponent_A].trainerClass == TRAINER_CLASS_CHAMPION)))) { s8 mod = gUnknown_08329ECE[event][friendshipLevel]; if (mod > 0 && holdEffect == HOLD_EFFECT_HAPPINESS_UP) @@ -1146,55 +1145,57 @@ void ClearBattleMonForms(void) u16 GetBattleBGM(void) { if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON) - return 0x1E0; + return BGM_BATTLE34; if (gBattleTypeFlags & BATTLE_TYPE_REGI) - return 0x1DF; + return BGM_BATTLE36; if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) - return 0x1DC; + return BGM_BATTLE20; if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) { u8 trainerClass; + if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) trainerClass = GetFrontierOpponentClass(gTrainerBattleOpponent_A); else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) - trainerClass = CLASS_EXPERT; + trainerClass = TRAINER_CLASS_EXPERT; else trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass; + switch (trainerClass) { - case CLASS_AQUA_LEADER: - case CLASS_MAGMA_LEADER: - return 0x1E3; - case CLASS_TEAM_AQUA: - case CLASS_TEAM_MAGMA: - case CLASS_AQUA_ADMIN: - case CLASS_MAGMA_ADMIN: - return 0x1DB; - case CLASS_LEADER: - return 0x1DD; - case CLASS_CHAMPION: - return 0x1DE; - case CLASS_PKMN_TRAINER_RIVAL: + case TRAINER_CLASS_AQUA_LEADER: + case TRAINER_CLASS_MAGMA_LEADER: + return BGM_BATTLE30; + case TRAINER_CLASS_TEAM_AQUA: + case TRAINER_CLASS_TEAM_MAGMA: + case TRAINER_CLASS_AQUA_ADMIN: + case TRAINER_CLASS_MAGMA_ADMIN: + return BGM_BATTLE31; + case TRAINER_CLASS_LEADER: + return BGM_BATTLE32; + case TRAINER_CLASS_CHAMPION: + return BGM_BATTLE33; + case TRAINER_CLASS_PKMN_TRAINER_3: if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) - return 0x1E1; + return BGM_BATTLE35; if (!StringCompare(gTrainers[gTrainerBattleOpponent_A].trainerName, gText_BattleWallyName)) - return 0x1DC; - return 0x1E1; - case CLASS_ELITE_FOUR: - return 0x1E2; - case CLASS_SALON_MAIDEN: - case CLASS_DOME_ACE: - case CLASS_PALACE_MAVEN: - case CLASS_ARENA_TYCOON: - case CLASS_FACTORY_HEAD: - case CLASS_PIKE_QUEEN: - case CLASS_PYRAMID_KING: - return 0x1D7; + return BGM_BATTLE20; + return BGM_BATTLE35; + case TRAINER_CLASS_ELITE_FOUR: + return BGM_BATTLE38; + case TRAINER_CLASS_SALON_MAIDEN: + case TRAINER_CLASS_DOME_ACE: + case TRAINER_CLASS_PALACE_MAVEN: + case TRAINER_CLASS_ARENA_TYCOON: + case TRAINER_CLASS_FACTORY_HEAD: + case TRAINER_CLASS_PIKE_QUEEN: + case TRAINER_CLASS_PYRAMID_KING: + return BGM_BATTLE_FRONTIER_BRAIN; default: - return 0x1DC; + return BGM_BATTLE20; } } - return 0x1DA; + return BGM_BATTLE27; } void PlayBattleBGM(void) @@ -1297,21 +1298,21 @@ bool8 IsPokeSpriteNotFlipped(u16 species) return gBaseStats[species].noFlip; } -s8 GetMonFlavorRelation(struct Pokemon *mon, u8 a2) +s8 GetMonFlavorRelation(struct Pokemon *mon, u8 flavor) { u8 nature = GetNature(mon); - return gPokeblockFlavorCompatibilityTable[nature * 5 + a2]; + return gPokeblockFlavorCompatibilityTable[nature * 5 + flavor]; } -s8 GetFlavorRelationByPersonality(u32 personality, u8 a2) +s8 GetFlavorRelationByPersonality(u32 personality, u8 flavor) { u8 nature = GetNatureFromPersonality(personality); - return gPokeblockFlavorCompatibilityTable[nature * 5 + a2]; + return gPokeblockFlavorCompatibilityTable[nature * 5 + flavor]; } bool8 IsTradedMon(struct Pokemon *mon) { - u8 otName[8]; + u8 otName[OT_NAME_LENGTH + 1]; u32 otId; GetMonData(mon, MON_DATA_OT_NAME, otName); otId = GetMonData(mon, MON_DATA_OT_ID, 0); @@ -1396,7 +1397,7 @@ static s32 GetWildMonTableIdInAlteringCave(u16 species) void SetWildMonHeldItem(void) { - if (!(gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_TRAINER | BATTLE_TYPE_PYRAMID | BATTLE_TYPE_x100000))) + if (!(gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_TRAINER | BATTLE_TYPE_PYRAMID | BATTLE_TYPE_PIKE))) { u16 rnd = Random() % 100; u16 species = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, 0); @@ -1462,12 +1463,14 @@ bool8 IsShinyOtIdPersonality(u32 otId, u32 personality) return retVal; } -const u8* GetTrainerPartnerName(void) +const u8 *GetTrainerPartnerName(void) { if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) { if (gPartnerTrainerId == STEVEN_PARTNER_ID) - return gTrainers[TRAINER_ID_STEVEN].trainerName; + { + return gTrainers[TRAINER_STEVEN].trainerName; + } else { GetFrontierTrainerName(gStringVar1, gPartnerTrainerId); @@ -1682,14 +1685,14 @@ void HandleSetPokedexFlag(u16 nationalNum, u8 caseId, u32 personality) } } -const u8* GetTrainerClassNameFromId(u16 trainerId) +const u8 *GetTrainerClassNameFromId(u16 trainerId) { if (trainerId > NO_OF_TRAINERS) trainerId = 0; return gTrainerClassNames[gTrainers[trainerId].trainerClass]; } -const u8* GetTrainerNameFromId(u16 trainerId) +const u8 *GetTrainerNameFromId(u16 trainerId) { if (trainerId > NO_OF_TRAINERS) trainerId = 0; diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index b00979945..ba0c4dde7 100755 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -73,7 +73,7 @@ extern void do_scheduled_bg_tilemap_copies_to_vram(void); extern u8 sub_81221EC(); extern u8 sub_81221AC(); extern void SetVBlankHBlankCallbacksToNull(); -extern void sub_8121DA0(); +extern void ResetVramOamAndBgCntRegs(); extern void clear_scheduled_bg_copies_to_vram(); extern void remove_some_task(); extern void ResetBgsAndClearDma3BusyFlags(u32 leftoverFireRedLeafGreenVariable); @@ -193,7 +193,7 @@ void sub_81C4A88(); void sub_81C4280(); void sub_81C0510(u8 taskId); void sub_81C171C(u8 taskId); -void sub_8121E10(); +void ResetAllBgsCoordinates(); u8 sub_81B205C(struct Pokemon* a); void sub_81C1DA4(u16 a, s16 b); void sub_81C1EFC(u16 a, s16 b, u16 c); @@ -450,7 +450,7 @@ bool8 sub_81BFB10(void) { case 0: SetVBlankHBlankCallbacksToNull(); - sub_8121DA0(); + ResetVramOamAndBgCntRegs(); clear_scheduled_bg_copies_to_vram(); gMain.state++; break; @@ -578,7 +578,7 @@ void sub_81BFE24() SetBgTilemapBuffer(1, &gUnknown_0203CF1C->unkTilemap2); SetBgTilemapBuffer(2, &gUnknown_0203CF1C->unkTilemap1); SetBgTilemapBuffer(3, &gUnknown_0203CF1C->unkTilemap0); - sub_8121E10(); + ResetAllBgsCoordinates(); schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(2); schedule_bg_copy_tilemap_to_vram(3); diff --git a/src/recorded_battle.c b/src/recorded_battle.c index 4f3fe4ab9..c88229c61 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -19,7 +19,7 @@ | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_ROAMER | BATTLE_TYPE_EREADER_TRAINER \ | BATTLE_TYPE_KYOGRE_GROUDON | BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI \ | BATTLE_TYPE_RECORDED | BATTLE_TYPE_x4000000 | BATTLE_TYPE_SECRET_BASE \ - | BATTLE_TYPE_GROUDON | BATTLE_TYPE_KYORGE | BATTLE_TYPE_RAYQUAZA)) + | BATTLE_TYPE_GROUDON | BATTLE_TYPE_KYOGRE | BATTLE_TYPE_RAYQUAZA)) extern u32 gBattleTypeFlags; extern u16 gTrainerBattleOpponent_A; diff --git a/src/region_map.c b/src/region_map.c index b7fc625ca..f28f07d52 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -239,9 +239,9 @@ static const u8 sRegionMapFrameTilemapLZ[] = INCBIN_U8("graphics/pokenav/map_fra static const u16 Unknown_085A1D48[] = INCBIN_U16("graphics/pokenav/fly_target_icons.gbapal"); -static const u8 gUnknown_085A1D68[] = INCBIN_U8("graphics/pokenav/fly_target_icons.4bpp.lz"); +static const u8 sUnknown_085A1D68[] = INCBIN_U8("graphics/pokenav/fly_target_icons.4bpp.lz"); -static const u8 gUnknown_085A1E3C[][3] = { +static const u8 sUnknown_085A1E3C[][3] = { {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), 1}, {MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), 14}, {MAP_GROUP(DEWFORD_TOWN), MAP_NUM(DEWFORD_TOWN), 15}, @@ -326,7 +326,7 @@ static const struct SpritePalette gUnknown_085A1F10 = { Unknown_085A1D48, 2 }; -static const u16 gUnknown_085A1F18[][2] = { +static const u16 sUnknown_085A1F18[][2] = { {FLAG_UNLOCK_BATTLE_FRONTIER, MAPSEC_BATTLE_FRONTIER}, {-1, MAPSEC_NONE} }; @@ -1738,7 +1738,7 @@ static void sub_8124A70(void) { struct SpriteSheet sheet; - LZ77UnCompWram(gUnknown_085A1D68, gUnknown_0203A148->unk_88c); + LZ77UnCompWram(sUnknown_085A1D68, gUnknown_0203A148->unk_88c); sheet.data = gUnknown_0203A148->unk_88c; sheet.size = 0x1c0; sheet.tag = 2; @@ -1806,11 +1806,11 @@ static void sub_8124BE4(void) u16 mapSecId; u8 spriteId; - for (i = 0; gUnknown_085A1F18[i][1] != MAPSEC_NONE; i++) + for (i = 0; sUnknown_085A1F18[i][1] != MAPSEC_NONE; i++) { - if (FlagGet(gUnknown_085A1F18[i][0])) + if (FlagGet(sUnknown_085A1F18[i][0])) { - mapSecId = gUnknown_085A1F18[i][1]; + mapSecId = sUnknown_085A1F18[i][1]; sub_8124630(mapSecId, &x, &y, &width, &height); x = (x + MAPCURSOR_X_MIN) * 8; y = (y + MAPCURSOR_Y_MIN) * 8; @@ -1919,13 +1919,13 @@ static void sub_8124E0C(void) sub_8084CCC(FlagGet(FLAG_SYS_POKEMON_LEAGUE_FLY) && gUnknown_0203A148->regionMap.posWithinMapSec == 0 ? 0x14 : 0x0B); break; default: - if (gUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2] != 0) + if (sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2] != 0) { - sub_8084CCC(gUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2]); + sub_8084CCC(sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2]); } else { - warp1_set_2(gUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][0], gUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][1], -1); + warp1_set_2(sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][0], sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][1], -1); } break; } diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c index a034ca089..3df2ff151 100644 --- a/src/reshow_battle_screen.c +++ b/src/reshow_battle_screen.c @@ -35,7 +35,7 @@ extern struct SpriteTemplate gUnknown_0202499C; extern const union AnimCmd * const * const gMonAnimationsSpriteAnimsPtrTable[]; extern void dp12_8087EA4(void); -extern void trs_config(void); +extern void sub_8035658(void); extern bool8 IsDoubleBattle(void); extern u8 GetSubstituteSpriteDefault_Y(u8 bank); extern u8 GetBankSpriteDefault_Y(u8 bank); @@ -73,7 +73,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void) { case 0: dp12_8087EA4(); - trs_config(); + sub_8035658(); SetBgAttribute(1, BG_CTRL_ATTR_VISIBLE, 0); SetBgAttribute(2, BG_CTRL_ATTR_VISIBLE, 0); ShowBg(0); diff --git a/src/battle_1.c b/src/rom_8034C54.c index 5e4ef5583..4d4492524 100644 --- a/src/battle_1.c +++ b/src/rom_8034C54.c @@ -1,17 +1,5 @@ - -// Includes #include "global.h" -// Static type declarations - -// Static RAM declarations - IWRAM_DATA u32 gUnknown_03000DD4; IWRAM_DATA u32 gUnknown_03000DD8; IWRAM_DATA u32 gUnknown_03000DDC; - -// Static ROM declarations - -// .rodata - -// .text diff --git a/src/safari_zone.c b/src/safari_zone.c index 19a26dad9..ce1eb65bc 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -5,6 +5,7 @@ #include "main.h" #include "battle.h" #include "string_util.h" +#include "pokeblock.h" struct PokeblockFeeder { @@ -24,7 +25,6 @@ extern u8 EventScript_2A4B8A[]; extern u8 EventScript_2A4B6F[]; extern u8 EventScript_2A4B4C[]; extern u8 EventScript_2A4B9B[]; -extern const u8* const gPokeblockNames[]; extern void sub_80EE44C(u8, u8); extern void IncrementGameStat(u8 index); @@ -105,7 +105,7 @@ void SafariZoneRetirePrompt(void) ScriptContext1_SetupScript(EventScript_2A4B6F); } -void sub_80FC190(void) +void CB2_EndSafariBattle(void) { sSafariZoneFleedMons += gBattleResults.field_1F; if (gBattleOutcome == BATTLE_CAUGHT) diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index ef01f0293..218ef68d7 100755 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -154,8 +154,8 @@ static const u8 sClockFrames[8][3] = { 5, 1, 0 }, }; -static const u8 gSaveFailedClockPal[] = INCBIN_U8("graphics/misc/clock_small.gbapal"); -static const u8 gSaveFailedClockGfx[] = INCBIN_U8("graphics/misc/clock_small.4bpp.lz"); +static const u8 sSaveFailedClockPal[] = INCBIN_U8("graphics/misc/clock_small.gbapal"); +static const u8 sSaveFailedClockGfx[] = INCBIN_U8("graphics/misc/clock_small.4bpp.lz"); static void CB2_SaveFailedScreen(void); static void CB2_WipeSave(void); @@ -221,7 +221,7 @@ static void CB2_SaveFailedScreen(void) LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM); LZ77UnCompVram(gBirchBagTilemap, (void *)(VRAM + 0x7000)); LZ77UnCompVram(gBirchGrassTilemap, (void *)(VRAM + 0x7800)); - LZ77UnCompVram(gSaveFailedClockGfx, (void *)(VRAM + 0x10020)); + LZ77UnCompVram(sSaveFailedClockGfx, (void *)(VRAM + 0x10020)); ResetBgsAndClearDma3BusyFlags(0); InitBgsFromTemplates(0, gUnknown_085EFD88, 3); SetBgTilemapBuffer(0, (void *)&gDecompressionBuffer[0x2000]); @@ -238,7 +238,7 @@ static void CB2_SaveFailedScreen(void) ResetTasks(); ResetPaletteFade(); LoadPalette(gBirchBagGrassPal, 0, 0x40); - LoadPalette(gSaveFailedClockPal, 0x100, 0x20); + LoadPalette(sSaveFailedClockPal, 0x100, 0x20); LoadPalette(gUnknown_0850FEFC, 0xE0, 0x20); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); SetWindowBorderStyle(gSaveFailedWindowIds[TEXT_WIN_ID], FALSE, 0x214, 0xE); diff --git a/src/scrcmd.c b/src/scrcmd.c index 504d001ea..0557cd95e 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -656,7 +656,7 @@ bool8 ScrCmd_fadescreenspeed(struct ScriptContext *ctx) bool8 ScrCmd_fadescreenswapbuffers(struct ScriptContext *ctx) { u8 mode = ScriptReadByte(ctx); - + switch (mode) { case 1: @@ -1445,7 +1445,7 @@ bool8 ScrCmd_drawboxtext(struct ScriptContext *ctx) u8 top = ScriptReadByte(ctx); u8 multichoiceId = ScriptReadByte(ctx); u8 ignoreBPress = ScriptReadByte(ctx); - + /*if (Multichoice(left, top, multichoiceId, ignoreBPress) == TRUE) { ScriptContext1_Stop(); @@ -1501,31 +1501,31 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) u8 y; StringExpandPlaceholders(gStringVar4, ptr + 6); - + width = GetStringWidth(6, gStringVar4, -1) / 8; - + if (width > 0x1C) width = 0x1C; - + for (i = 0, height = 4; gStringVar4[i] != 0xFF;) { if (gStringVar4[i++] == 0xFE) height += 3; } - + if (height > 0x12) height = 0x12; - + x = width + 2; temp1 = (0x1E - x) / 2; x = temp1 + 1; temp1 = ((x - temp1 - 1) * 8 + 3); - + y = height + 2; temp2 = (0x14 - y) / 2; y = temp2 + 2; temp2 = ((y - temp2 - 1) * 8); - + sub_8198A50(&template1, 0, x, y, width, height, 0xF, 0x1); template2 = template1; gUnknown_03000F30 = AddWindow(&template2); @@ -1924,7 +1924,7 @@ bool8 ScrCmd_hidemoneybox(struct ScriptContext *ctx) { /*u8 x = ScriptReadByte(ctx); u8 y = ScriptReadByte(ctx);*/ - + HideMoneyBox(); return FALSE; } @@ -1979,13 +1979,13 @@ bool8 ScrCmd_dotrainerbattle(struct ScriptContext *ctx) return TRUE; } -bool8 ScrCmd_ontrainerbattleend(struct ScriptContext *ctx) +bool8 ScrCmd_gotopostbattlescript(struct ScriptContext *ctx) { ctx->scriptPtr = BattleSetup_GetScriptAddrAfterBattle(); return FALSE; } -bool8 ScrCmd_ontrainerbattleendgoto(struct ScriptContext *ctx) +bool8 ScrCmd_gotobeatenscript(struct ScriptContext *ctx) { ctx->scriptPtr = BattleSetup_GetTrainerPostBattleScript(); return FALSE; @@ -1995,7 +1995,7 @@ bool8 ScrCmd_checktrainerflag(struct ScriptContext *ctx) { u16 index = VarGet(ScriptReadHalfword(ctx)); - ctx->comparisonResult = HasTrainerAlreadyBeenFought(index); + ctx->comparisonResult = HasTrainerBeenFought(index); return FALSE; } @@ -2003,7 +2003,7 @@ bool8 ScrCmd_settrainerflag(struct ScriptContext *ctx) { u16 index = VarGet(ScriptReadHalfword(ctx)); - trainer_flag_set(index); + SetTrainerFlag(index); return FALSE; } @@ -2011,7 +2011,7 @@ bool8 ScrCmd_cleartrainerflag(struct ScriptContext *ctx) { u16 index = VarGet(ScriptReadHalfword(ctx)); - trainer_flag_clear(index); + ClearTrainerFlag(index); return FALSE; } @@ -2089,7 +2089,7 @@ bool8 ScrCmd_getpricereduction(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_choosecontestpkmn(struct ScriptContext *ctx) +bool8 ScrCmd_choosecontestmon(struct ScriptContext *ctx) { sub_81B9404(); ScriptContext1_Stop(); @@ -2332,7 +2332,7 @@ bool8 ScrCmd_mossdeepgym4(struct ScriptContext *ctx) bool8 ScrCmd_cmdD8(struct ScriptContext *ctx) { - gSelectedMapObject = sub_80B47BC(); + gSelectedMapObject = GetCurrentApproachingTrainerMapObjectId(); return FALSE; } @@ -2374,7 +2374,7 @@ bool8 ScrCmd_checkmonobedience(struct ScriptContext *ctx) bool8 ScrCmd_cmdCF(struct ScriptContext *ctx) { const u8* v1 = sub_8099244(); - + if (v1) { ((u8*)gUnknown_020375C0) = ctx->scriptPtr; diff --git a/src/secret_base.c b/src/secret_base.c index 6d66e6576..bf6bec1f8 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -1082,13 +1082,13 @@ void game_continue(u8 taskId) if (sub_80E9878(i)) { sub_80E9780(gUnknown_0203A020->names[count], i); - gUnknown_0203A020->items[count].unk_00 = gUnknown_0203A020->names[count]; - gUnknown_0203A020->items[count].unk_04 = i; + gUnknown_0203A020->items[count].name = gUnknown_0203A020->names[count]; + gUnknown_0203A020->items[count].id = i; count ++; } } - gUnknown_0203A020->items[count].unk_00 = gText_Cancel; - gUnknown_0203A020->items[count].unk_04 = -2; + gUnknown_0203A020->items[count].name = gText_Cancel; + gUnknown_0203A020->items[count].id = -2; data[0] = count + 1; if (data[0] < 8) { @@ -1098,11 +1098,11 @@ void game_continue(u8 taskId) { data[3] = 8; } - gUnknown_03006310 = gUnknown_0858D07C; - gUnknown_03006310.unk_10 = data[6]; - gUnknown_03006310.totalItems = data[0]; - gUnknown_03006310.items = gUnknown_0203A020->items; - gUnknown_03006310.maxShowed = data[3]; + gMultiuseListMenuTemplate = gUnknown_0858D07C; + gMultiuseListMenuTemplate.unk_10 = data[6]; + gMultiuseListMenuTemplate.totalItems = data[0]; + gMultiuseListMenuTemplate.items = gUnknown_0203A020->items; + gMultiuseListMenuTemplate.maxShowed = data[3]; } void sub_80E9DEC(u32 a0, bool8 flag, struct ListMenu *menu) @@ -1119,7 +1119,7 @@ void sub_80E9E00(u8 taskId) data = gTasks[taskId].data; SetStandardWindowBorderStyle(data[6], 0); - data[5] = ListMenuInit(&gUnknown_03006310, data[2], data[1]); + data[5] = ListMenuInit(&gMultiuseListMenuTemplate, data[2], data[1]); sub_80E9E44(taskId); schedule_bg_copy_tilemap_to_vram(0); } @@ -1138,8 +1138,8 @@ void sub_80E9E90(u8 taskId) s32 input; data = gTasks[taskId].data; - input = ListMenuHandleInput(data[5]); - get_coro_args_x18_x1A(data[5], &data[2], &data[1]); + input = ListMenuHandleInputGetItemId(data[5]); + sub_81AE860(data[5], &data[2], &data[1]); switch (input) { case -1: @@ -1283,7 +1283,7 @@ u8 sub_80EA20C(u8 secretBaseRecordId) return (gSaveBlock1Ptr->secretBases[secretBaseRecordId].trainerId[0] % 5) + (gSaveBlock1Ptr->secretBases[secretBaseRecordId].gender * 5); } -const u8 *sub_80EA250(void) +const u8 *GetSecretBaseTrainerLoseText(void) { u8 param; diff --git a/src/sprite.c b/src/sprite.c index 9db61d2e9..6d76b9854 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -240,7 +240,7 @@ static const AffineAnimCmdFunc sAffineAnimCmdFuncs[] = AffineAnimCmd_frame, }; -static const s32 gUnknown_082EC6F4[24] = +static const s32 sUnknown_082EC6F4[24] = { 8, 8, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x10, 8, 0x20, 8, @@ -1214,14 +1214,14 @@ void obj_update_pos2(struct Sprite* sprite, s32 a1, s32 a2) u8 matrixNum = sprite->oam.matrixNum; if (a1 != 0x800) { - var0 = gUnknown_082EC6F4[sprite->oam.size * 8 + sprite->oam.shape * 32]; + var0 = sUnknown_082EC6F4[sprite->oam.size * 8 + sprite->oam.shape * 32]; var1 = var0 << 8; var2 = (var0 << 16) / gOamMatrices[matrixNum].a; sprite->pos2.x = sub_8007E28(var1, var2, a1); } if (a2 != 0x800) { - var0 = gUnknown_082EC6F4[4 + (sprite->oam.size * 8 + sprite->oam.shape * 32)]; + var0 = sUnknown_082EC6F4[4 + (sprite->oam.size * 8 + sprite->oam.shape * 32)]; var1 = var0 << 8; var2 = (var0 << 16) / gOamMatrices[matrixNum].d; sprite->pos2.y = sub_8007E28(var1, var2, a2); @@ -1247,7 +1247,7 @@ void obj_update_pos2(struct Sprite* sprite, s32 a1, s32 a2) mov r9, r0\n\ cmp r6, r9\n\ beq _08007EA2\n\ - ldr r2, =gUnknown_082EC6F4\n\ + ldr r2, =sUnknown_082EC6F4\n\ lsrs r1, 6\n\ lsls r1, 3\n\ ldrb r0, [r5, 0x1]\n\ @@ -1272,7 +1272,7 @@ void obj_update_pos2(struct Sprite* sprite, s32 a1, s32 a2) _08007EA2:\n\ cmp r8, r9\n\ beq _08007EDA\n\ - ldr r2, =gUnknown_082EC6F4\n\ + ldr r2, =sUnknown_082EC6F4\n\ ldrb r1, [r5, 0x3]\n\ lsrs r1, 6\n\ lsls r1, 3\n\ diff --git a/src/starter_choose.c b/src/starter_choose.c index 82f8f75f6..2d78af8fb 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -265,7 +265,7 @@ static void Task_StarterChoose5(u8 taskId) { u8 spriteId; - switch (sub_8198C58()) + switch (ProcessMenuInputNoWrap_()) { case 0: // YES // Return the starter choice and exit. diff --git a/src/trainer_see.c b/src/trainer_see.c new file mode 100644 index 000000000..53bc5cbbb --- /dev/null +++ b/src/trainer_see.c @@ -0,0 +1,781 @@ +#include "global.h" +#include "trainer_see.h" +#include "battle_setup.h" +#include "pokemon.h" +#include "sprite.h" +#include "field_effect.h" +#include "field_map_obj.h" +#include "field_player_avatar.h" +#include "map_obj_8097404.h" +#include "pokenav.h" +#include "task.h" +#include "util.h" +#include "script.h" +#include "event_data.h" +#include "script_movement.h" + +extern bool8 InBattlePyramid(void); +extern bool32 InTrainerHill(void); +extern bool8 GetBattlePyramidTrainerFlag(u8 mapObjectId); +extern bool8 GetTrainerHillTrainerFlag(u8 mapObjectId); +extern void sub_809BE48(u16 npcId); + +// this file's functions +static u8 CheckTrainer(u8 mapObjectId); +static u8 GetTrainerApproachDistance(struct MapObject *trainerObj); +static u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 approachDistance, u8 direction); +static void TrainerApproachPlayer(struct MapObject *trainerObj, u8 range); +static void Task_RunTrainerSeeFuncList(u8 taskId); +static void Task_DestroyTrainerApproachTask(u8 taskId); +static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnimNum); + +static u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y); +static u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y); + +static bool8 sub_80B4178(u8 taskId, struct Task *task, struct MapObject *trainerObj); +static bool8 sub_80B417C(u8 taskId, struct Task *task, struct MapObject *trainerObj); +static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct MapObject *trainerObj); +static bool8 sub_80B4200(u8 taskId, struct Task *task, struct MapObject *trainerObj); +static bool8 sub_80B425C(u8 taskId, struct Task *task, struct MapObject *trainerObj); +static bool8 sub_80B4318(u8 taskId, struct Task *task, struct MapObject *trainerObj); +static bool8 sub_80B435C(u8 taskId, struct Task *task, struct MapObject *trainerObj); +static bool8 sub_80B4390(u8 taskId, struct Task *task, struct MapObject *trainerObj); +static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct MapObject *trainerObj); +static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct MapObject *trainerObj); +static bool8 sub_80B4438(u8 taskId, struct Task *task, struct MapObject *trainerObj); +static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct MapObject *trainerObj); + +static void SpriteCB_TrainerIcons(struct Sprite *sprite); + +// IWRAM common +u16 gUnknown_03006080; +u8 gUnknown_03006084[4]; +struct ApproachingTrainer gApproachingTrainers[2]; +u8 gNoOfApproachingTrainers; +u8 gUnknown_030060AC; + +// EWRAM +EWRAM_DATA u8 gApproachingTrainerId = 0; + +// const rom data +static const u8 sEmotion_ExclamationMarkGfx[] = INCBIN_U8("graphics/misc/emotion_exclamation.4bpp"); +static const u8 sEmotion_QuestionMarkGfx[] = INCBIN_U8("graphics/misc/emotion_question.4bpp"); +static const u8 sEmotion_HeartGfx[] = INCBIN_U8("graphics/misc/emotion_heart.4bpp"); + +static u8 (*const sDirectionalApproachDistanceFuncs[])(struct MapObject *trainerObj, s16 range, s16 x, s16 y) = +{ + GetTrainerApproachDistanceSouth, + GetTrainerApproachDistanceNorth, + GetTrainerApproachDistanceWest, + GetTrainerApproachDistanceEast, +}; + +static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct MapObject *trainerObj) = +{ + sub_80B4178, + sub_80B417C, + sub_80B41C0, + sub_80B4200, + sub_80B425C, + sub_80B4318, + sub_80B435C, + sub_80B4390, + sub_80B43AC, + sub_80B43E0, + sub_80B4438, + sub_80B44AC +}; + +static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct MapObject *trainerObj) = +{ + sub_80B43AC, + sub_80B43E0, + sub_80B4438, + sub_80B44AC, +}; + +static const struct OamData sOamData_Icons = +{ + .y = 0, + .affineMode = 0, + .objMode = 0, + .mosaic = 0, + .bpp = 0, + .shape = 0, + .x = 0, + .matrixNum = 0, + .size = 1, + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0, +}; + +static const struct SpriteFrameImage sSpriteImageTable_ExclamationQuestionMark[] = +{ + {sEmotion_ExclamationMarkGfx, 0x80}, + {sEmotion_QuestionMarkGfx, 0x80} +}; + +static const struct SpriteFrameImage sSpriteImageTable_HeartIcon[] = +{ + {sEmotion_HeartGfx, 0x80} +}; + +static const union AnimCmd sSpriteAnim_Icons1[] = +{ + ANIMCMD_FRAME(0, 60), + ANIMCMD_END +}; + +static const union AnimCmd sSpriteAnim_Icons2[] = +{ + ANIMCMD_FRAME(1, 60), + ANIMCMD_END +}; + +static const union AnimCmd *const sSpriteAnimTable_Icons[] = +{ + sSpriteAnim_Icons1, + sSpriteAnim_Icons2 +}; + +static const struct SpriteTemplate sSpriteTemplate_ExclamationQuestionMark = +{ + .tileTag = 0xffff, + .paletteTag = 0xffff, + .oam = &sOamData_Icons, + .anims = sSpriteAnimTable_Icons, + .images = sSpriteImageTable_ExclamationQuestionMark, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCB_TrainerIcons +}; + +static const struct SpriteTemplate sSpriteTemplate_HeartIcon = +{ + .tileTag = 0xffff, + .paletteTag = 0x1004, + .oam = &sOamData_Icons, + .anims = sSpriteAnimTable_Icons, + .images = sSpriteImageTable_HeartIcon, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCB_TrainerIcons +}; + +// code +bool8 CheckForTrainersWantingBattle(void) +{ + u8 i; + + gNoOfApproachingTrainers = 0; + gApproachingTrainerId = 0; + + for (i = 0; i < MAP_OBJECTS_COUNT; i++) + { + u8 retVal; + + if (!gMapObjects[i].active) + continue; + if (gMapObjects[i].trainerType != 1 && gMapObjects[i].trainerType != 3) + continue; + + retVal = CheckTrainer(i); + if (retVal == 2) + break; // two trainers have been found + + if (retVal == 0) // no trainers + continue; + + if (gNoOfApproachingTrainers > 1) + break; + if (GetMonsStateToDoubles_2() != 0) // one trainer found and cant have a double battle + break; + } + + if (gNoOfApproachingTrainers == 1) + { + ResetTrainerOpponentIds(); + ConfigureAndSetUpOneTrainerBattle(gApproachingTrainers[gNoOfApproachingTrainers - 1].mapObjectId, + gApproachingTrainers[gNoOfApproachingTrainers - 1].trainerScriptPtr); + gUnknown_030060AC = 1; + return TRUE; + } + else if (gNoOfApproachingTrainers == 2) + { + ResetTrainerOpponentIds(); + for (i = 0; i < gNoOfApproachingTrainers; i++, gApproachingTrainerId++) + { + ConfigureTwoTrainersBattle(gApproachingTrainers[i].mapObjectId, + gApproachingTrainers[i].trainerScriptPtr); + } + SetUpTwoTrainersBattle(); + gApproachingTrainerId = 0; + gUnknown_030060AC = 1; + return TRUE; + } + else + { + gUnknown_030060AC = 0; + return FALSE; + } +} + +static u8 CheckTrainer(u8 mapObjectId) +{ + const u8 *scriptPtr; + u8 ret = 1; + u8 approachDistance; + + if (InTrainerHill() == TRUE) + scriptPtr = sub_81D62AC(); + else + scriptPtr = GetFieldObjectScriptPointerByFieldObjectId(mapObjectId); + + if (InBattlePyramid()) + { + if (GetBattlePyramidTrainerFlag(mapObjectId)) + return 0; + } + else if (InTrainerHill() == TRUE) + { + if (GetTrainerHillTrainerFlag(mapObjectId)) + return 0; + } + else + { + if (GetTrainerFlagFromScriptPointer(scriptPtr)) + return 0; + } + + approachDistance = GetTrainerApproachDistance(&gMapObjects[mapObjectId]); + + if (approachDistance != 0) + { + if (scriptPtr[1] == TRAINER_BATTLE_DOUBLE + || scriptPtr[1] == TRAINER_BATTLE_REMATCH_DOUBLE + || scriptPtr[1] == TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE) + { + if (GetMonsStateToDoubles_2() != 0) + return 0; + + ret = 2; + } + + gApproachingTrainers[gNoOfApproachingTrainers].mapObjectId = mapObjectId; + gApproachingTrainers[gNoOfApproachingTrainers].trainerScriptPtr = scriptPtr; + gApproachingTrainers[gNoOfApproachingTrainers].radius = approachDistance; + TrainerApproachPlayer(&gMapObjects[mapObjectId], approachDistance - 1); + gNoOfApproachingTrainers++; + + return ret; + } + + return 0; +} + +static u8 GetTrainerApproachDistance(struct MapObject *trainerObj) +{ + s16 x, y; + u8 i; + u8 approachDistance; + + PlayerGetDestCoords(&x, &y); + if (trainerObj->trainerType == 1) // can only see in one direction + { + approachDistance = sDirectionalApproachDistanceFuncs[trainerObj->mapobj_unk_18 - 1](trainerObj, trainerObj->trainerRange_berryTreeId, x, y); + return CheckPathBetweenTrainerAndPlayer(trainerObj, approachDistance, trainerObj->mapobj_unk_18); + } + else // can see in all directions + { + for (i = 0; i < 4; i++) + { + approachDistance = sDirectionalApproachDistanceFuncs[i](trainerObj, trainerObj->trainerRange_berryTreeId, x, y); + if (CheckPathBetweenTrainerAndPlayer(trainerObj, approachDistance, i + 1)) // directions are 1-4 instead of 0-3. south north west east + return approachDistance; + } + } + + return 0; +} + +// Returns how far south the player is from trainer. 0 if out of trainer's sight. +static u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y) +{ + if (trainerObj->coords2.x == x + && y > trainerObj->coords2.y + && y <= trainerObj->coords2.y + range) + return (y - trainerObj->coords2.y); + else + return 0; +} + +// Returns how far north the player is from trainer. 0 if out of trainer's sight. +static u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y) +{ + if (trainerObj->coords2.x == x + && y < trainerObj->coords2.y + && y >= trainerObj->coords2.y - range) + return (trainerObj->coords2.y - y); + else + return 0; +} + +// Returns how far west the player is from trainer. 0 if out of trainer's sight. +static u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y) +{ + if (trainerObj->coords2.y == y + && x < trainerObj->coords2.x + && x >= trainerObj->coords2.x - range) + return (trainerObj->coords2.x - x); + else + return 0; +} + +// Returns how far east the player is from trainer. 0 if out of trainer's sight. +static u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y) +{ + if (trainerObj->coords2.y == y + && x > trainerObj->coords2.x + && x <= trainerObj->coords2.x + range) + return (x - trainerObj->coords2.x); + else + return 0; +} + +#define COLLISION_MASK (~1) + +static u8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 approachDistance, u8 direction) +{ + s16 x, y; + u8 unk19_temp; + u8 unk19b_temp; + u8 i; + u8 collision; + + if (approachDistance == 0) + return 0; + + x = trainerObj->coords2.x; + y = trainerObj->coords2.y; + + MoveCoords(direction, &x, &y); + for (i = 0; i < approachDistance - 1; i++, MoveCoords(direction, &x, &y)) + { + collision = sub_8092C8C(trainerObj, x, y, direction); + if (collision != 0 && (collision & COLLISION_MASK)) + return 0; + } + + // preserve mapobj_unk_19 before clearing. + unk19_temp = trainerObj->range.as_nybbles.x; + unk19b_temp = trainerObj->range.as_nybbles.y; + trainerObj->range.as_nybbles.x = 0; + trainerObj->range.as_nybbles.y = 0; + + collision = npc_block_way(trainerObj, x, y, direction); + + trainerObj->range.as_nybbles.x = unk19_temp; + trainerObj->range.as_nybbles.y = unk19b_temp; + if (collision == 4) + return approachDistance; + + return 0; +} + +#define tFuncId data[0] +#define tTrainerRange data[3] +#define tOutOfAshSpriteId data[4] +#define tTrainerMapObjectId data[7] + +static void TrainerApproachPlayer(struct MapObject *trainerObj, u8 range) +{ + struct Task *task; + + gApproachingTrainers[gNoOfApproachingTrainers].taskId = CreateTask(Task_RunTrainerSeeFuncList, 0x50); + task = &gTasks[gApproachingTrainers[gNoOfApproachingTrainers].taskId]; + task->tTrainerRange = range; + task->tTrainerMapObjectId = gApproachingTrainers[gNoOfApproachingTrainers].mapObjectId; +} + +static void sub_80B40C8(TaskFunc followupFunc) +{ + u8 taskId; + TaskFunc taskFunc; + + if (gApproachingTrainerId == 0) + taskId = gApproachingTrainers[0].taskId; + else + taskId = gApproachingTrainers[1].taskId; + + taskFunc = Task_RunTrainerSeeFuncList; + SetTaskFuncWithFollowupFunc(taskId, taskFunc, followupFunc); + gTasks[taskId].tFuncId = 1; + taskFunc(taskId); +} + +static void Task_RunTrainerSeeFuncList(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + struct MapObject *trainerObj = &gMapObjects[task->tTrainerMapObjectId]; + + if (!trainerObj->active) + { + SwitchTaskToFollowupFunc(taskId); + } + else + { + while (sTrainerSeeFuncList[task->tFuncId](taskId, task, trainerObj)); + } +} + +static bool8 sub_80B4178(u8 taskId, struct Task *task, struct MapObject *trainerObj) +{ + return FALSE; +} + +static bool8 sub_80B417C(u8 taskId, struct Task *task, struct MapObject *trainerObj) +{ + u8 direction; + + FieldObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]); + FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1); + direction = GetFaceDirectionAnimId(trainerObj->mapobj_unk_18); + FieldObjectSetSpecialAnim(trainerObj, direction); + task->tFuncId++; + return TRUE; +} + +static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct MapObject *trainerObj) +{ + if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON_1)) + { + return FALSE; + } + else + { + task->tFuncId++; + if (trainerObj->animPattern == 57 || trainerObj->animPattern == 58) + task->tFuncId = 6; + if (trainerObj->animPattern == 63) + task->tFuncId = 8; + return TRUE; + } +} + +static bool8 sub_80B4200(u8 taskId, struct Task *task, struct MapObject *trainerObj) +{ + if (!(FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)) || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj)) + { + if (task->tTrainerRange) + { + FieldObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->mapobj_unk_18)); + task->tTrainerRange--; + } + else + { + FieldObjectSetSpecialAnim(trainerObj, 0x3E); + task->tFuncId++; + } + } + return FALSE; +} + +static bool8 sub_80B425C(u8 taskId, struct Task *task, struct MapObject *trainerObj) +{ + struct MapObject *playerObj; + + if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(trainerObj)) + return FALSE; + + npc_set_running_behaviour_etc(trainerObj, npc_running_behaviour_by_direction(trainerObj->mapobj_unk_18)); + sub_808F23C(trainerObj, npc_running_behaviour_by_direction(trainerObj->mapobj_unk_18)); + sub_808F208(trainerObj); + + playerObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(playerObj)) + return FALSE; + + sub_808BCE8(); + FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->mapobj_unk_18))); + task->tFuncId++; + return FALSE; +} + +static bool8 sub_80B4318(u8 taskId, struct Task *task, struct MapObject *trainerObj) +{ + struct MapObject *playerObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + + if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj) + || FieldObjectClearAnimIfSpecialAnimFinished(playerObj)) + SwitchTaskToFollowupFunc(taskId); + return FALSE; +} + +static bool8 sub_80B435C(u8 taskId, struct Task *task, struct MapObject *trainerObj) +{ + if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) + || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj)) + { + FieldObjectSetSpecialAnim(trainerObj, 0x59); + task->tFuncId++; + } + return FALSE; +} + +static bool8 sub_80B4390(u8 taskId, struct Task *task, struct MapObject *trainerObj) +{ + if (FieldObjectClearAnimIfSpecialAnimFinished(trainerObj)) + task->tFuncId = 3; + + return FALSE; +} + +static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct MapObject *trainerObj) +{ + if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) + || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj)) + { + FieldObjectSetSpecialAnim(trainerObj, 0x3E); + task->tFuncId++; + } + return FALSE; +} + +static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct MapObject *trainerObj) +{ + if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(trainerObj)) + { + gFieldEffectArguments[0] = trainerObj->coords2.x; + gFieldEffectArguments[1] = trainerObj->coords2.y; + gFieldEffectArguments[2] = gSprites[trainerObj->spriteId].subpriority - 1; + gFieldEffectArguments[3] = 2; + task->tOutOfAshSpriteId = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH); + task->tFuncId++; + } + return FALSE; +} + +static bool8 sub_80B4438(u8 taskId, struct Task *task, struct MapObject *trainerObj) +{ + struct Sprite *sprite; + + if (gSprites[task->tOutOfAshSpriteId].animCmdIndex == 2) + { + trainerObj->mapobj_bit_26 = 0; + trainerObj->mapobj_bit_2 = 1; + + sprite = &gSprites[trainerObj->spriteId]; + sprite->oam.priority = 2; + FieldObjectClearAnimIfSpecialAnimFinished(trainerObj); + FieldObjectSetSpecialAnim(trainerObj, sub_80934BC(trainerObj->mapobj_unk_18)); + task->tFuncId++; + } + + return FALSE; +} + +static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct MapObject *trainerObj) +{ + if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) + task->tFuncId = 3; + + return FALSE; +} + +#undef tFuncId +#undef tTrainerRange +#undef tOutOfAshSpriteId +#undef tTrainerMapObjectId + +static void sub_80B44C8(u8 taskId) +{ + struct Task *task = &gTasks[taskId]; + struct MapObject *mapObj; + + // another mapObj loaded into by loadword? + LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&mapObj); + if (!task->data[7]) + { + FieldObjectClearAnim(mapObj); + task->data[7]++; + } + sTrainerSeeFuncList2[task->data[0]](taskId, task, mapObj); + if (task->data[0] == 3 && !FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) + { + npc_set_running_behaviour_etc(mapObj, npc_running_behaviour_by_direction(mapObj->mapobj_unk_18)); + sub_808F23C(mapObj, npc_running_behaviour_by_direction(mapObj->mapobj_unk_18)); + DestroyTask(taskId); + } + else + { + mapObj->mapobj_bit_7 = 0; + } +} + +void sub_80B4578(struct MapObject *var) +{ + StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80B44C8, 0)].data[1], (u32)var); +} + +void EndTrainerApproach(void) +{ + sub_80B40C8(Task_DestroyTrainerApproachTask); +} + +static void Task_DestroyTrainerApproachTask(u8 taskId) +{ + DestroyTask(taskId); + EnableBothScriptContexts(); +} + +void sub_80B45D0(void) +{ + if (gNoOfApproachingTrainers == 2) + { + if (gApproachingTrainerId == 0) + { + gApproachingTrainerId++; + gSpecialVar_Result = 1; + UnfreezeMapObjects(); + sub_80974D0(gApproachingTrainers[1].mapObjectId); + } + else + { + gApproachingTrainerId = 0; + gSpecialVar_Result = 0; + } + } + else + { + gSpecialVar_Result = 0; + } +} + +#define sLocalId data[0] +#define sMapNum data[1] +#define sMapGroup data[2] +#define sData3 data[3] +#define sData4 data[4] +#define sFldEffId data[7] + +u8 FldEff_ExclamationMarkIcon1(void) +{ + u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_ExclamationQuestionMark, 0, 0, 0x53); + + if (spriteId != MAX_SPRITES) + SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON_1, 0); + + return 0; +} + +u8 FldEff_ExclamationMarkIcon2(void) +{ + u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_ExclamationQuestionMark, 0, 0, 0x52); + + if (spriteId != MAX_SPRITES) + SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON_2, 1); + + return 0; +} + +u8 FldEff_HeartIcon(void) +{ + u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_HeartIcon, 0, 0, 0x52); + + if (spriteId != MAX_SPRITES) + { + struct Sprite *sprite = &gSprites[spriteId]; + + SetIconSpriteData(sprite, FLDEFF_HEART_ICON, 0); + sprite->oam.paletteNum = 2; + } + + return 0; +} + +static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnimNum) +{ + sprite->oam.priority = 1; + sprite->coordOffsetEnabled = 1; + + sprite->sLocalId = gFieldEffectArguments[0]; + sprite->sMapNum = gFieldEffectArguments[1]; + sprite->sMapGroup = gFieldEffectArguments[2]; + sprite->sData3 = -5; + sprite->sFldEffId = fldEffId; + + StartSpriteAnim(sprite, spriteAnimNum); +} + +static void SpriteCB_TrainerIcons(struct Sprite *sprite) +{ + u8 mapObjId; + + if (TryGetFieldObjectIdByLocalIdAndMap(sprite->sLocalId, sprite->sMapNum, sprite->sMapGroup, &mapObjId) + || sprite->animEnded) + { + FieldEffectStop(sprite, sprite->sFldEffId); + } + else + { + struct Sprite *mapObjSprite = &gSprites[gMapObjects[mapObjId].spriteId]; + sprite->sData4 += sprite->sData3; + sprite->pos1.x = mapObjSprite->pos1.x; + sprite->pos1.y = mapObjSprite->pos1.y - 16; + sprite->pos2.x = mapObjSprite->pos2.x; + sprite->pos2.y = mapObjSprite->pos2.y + sprite->sData4; + if (sprite->sData4) + sprite->sData3++; + else + sprite->sData3 = 0; + } +} + +#undef sLocalId +#undef sMapNum +#undef sMapGroup +#undef sData3 +#undef sData4 +#undef sFldEffId + +u8 GetCurrentApproachingTrainerMapObjectId(void) +{ + if (gApproachingTrainerId == 0) + return gApproachingTrainers[0].mapObjectId; + else + return gApproachingTrainers[1].mapObjectId; +} + +u8 GetChosenApproachingTrainerMapObjectId(u8 arrayId) +{ + if (arrayId >= ARRAY_COUNT(gApproachingTrainers)) + return 0; + else if (arrayId == 0) + return gApproachingTrainers[0].mapObjectId; + else + return gApproachingTrainers[1].mapObjectId; +} + +void sub_80B4808(void) +{ + struct MapObject *trainerObj; + + if (gUnknown_030060AC == 1) + { + trainerObj = &gMapObjects[gApproachingTrainers[gUnknown_03006080].mapObjectId]; + gUnknown_03006084[0] = GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->mapobj_unk_18)); + gUnknown_03006084[1] = 0xFE; + ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_03006084); + } + else + { + trainerObj = &gMapObjects[gPlayerAvatar.mapObjectId]; + gUnknown_03006084[0] = GetFaceDirectionAnimId(trainerObj->mapobj_unk_18); + gUnknown_03006084[1] = 0xFE; + ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_03006084); + } + + sub_809BE48(0xFF); +} @@ -1793,7 +1793,7 @@ void EndMassOutbreak(void) gSaveBlock1Ptr->outbreakDaysLeft = 0; } -void sub_80ED888(u16 days) +void UpdateTVShowsPerDay(u16 days) { sub_80ED8B4(days); diff --git a/src/unk_text_util_2.c b/src/unk_text_util_2.c index d88af611f..8eaab32b6 100644 --- a/src/unk_text_util_2.c +++ b/src/unk_text_util_2.c @@ -4,8 +4,8 @@ #include "text.h" #include "sound.h" -static const u8 gUnknown_08616124[] = {1, 2, 4}; -static const u16 gFont6BrailleGlyphs[] = INCBIN_U16("data/graphics/fonts/font6.fwjpnfont"); +static const u8 sUnknown_08616124[] = {1, 2, 4}; +static const u16 sFont6BrailleGlyphs[] = INCBIN_U16("data/graphics/fonts/font6.fwjpnfont"); static void DecompressGlyphFont6(u16); @@ -13,7 +13,7 @@ u16 Font6Func(struct TextPrinter *textPrinter) { u16 char_; struct TextPrinterSubStruct *sub; - + sub = &textPrinter->sub_union.sub; switch (textPrinter->state) { @@ -163,15 +163,15 @@ u16 Font6Func(struct TextPrinter *textPrinter) case 4: if (textPrinter->scrollDistance) { - if (textPrinter->scrollDistance < gUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed]) + if (textPrinter->scrollDistance < sUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed]) { ScrollWindow(textPrinter->subPrinter.windowId, 0, textPrinter->scrollDistance, textPrinter->subPrinter.bgColor | (textPrinter->subPrinter.bgColor << 4)); textPrinter->scrollDistance = 0; } else { - ScrollWindow(textPrinter->subPrinter.windowId, 0, gUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed], textPrinter->subPrinter.bgColor | (textPrinter->subPrinter.bgColor << 4)); - textPrinter->scrollDistance -= gUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed]; + ScrollWindow(textPrinter->subPrinter.windowId, 0, sUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed], textPrinter->subPrinter.bgColor | (textPrinter->subPrinter.bgColor << 4)); + textPrinter->scrollDistance -= sUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed]; } CopyWindowToVram(textPrinter->subPrinter.windowId, 2); } @@ -204,7 +204,7 @@ static void DecompressGlyphFont6(u16 glyph) { const u16 *glyphs; - glyphs = gFont6BrailleGlyphs + 0x100 * (glyph / 8) + 0x10 * (glyph % 8); + glyphs = sFont6BrailleGlyphs + 0x100 * (glyph / 8) + 0x10 * (glyph % 8); DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90); DecompressGlyphTile(glyphs + 0x8, (u16 *)(gUnknown_03002F90 + 0x20)); DecompressGlyphTile(glyphs + 0x80, (u16 *)(gUnknown_03002F90 + 0x40)); diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c new file mode 100644 index 000000000..12f475c93 --- /dev/null +++ b/src/use_pokeblock.c @@ -0,0 +1,230 @@ +#include "global.h" +#include "main.h" +#include "pokeblock.h" +#include "malloc.h" +#include "palette.h" +#include "pokenav.h" +#include "unknown_task.h" +#include "text.h" +#include "bg.h" +#include "window.h" +#include "text_window.h" + +struct UsePokeblockSubStruct +{ + void (*field_0)(void); + void (*callback)(void); + struct Pokeblock *pokeblock; + struct Pokemon *pokemon; + u8 stringBuffer[0x40]; + u8 field_50; + u8 field_51; + u8 field_52; + u8 field_53; + u8 field_54; + u8 field_55; + u8 field_56; + u8 field_57[5]; + u8 field_5c[5]; + u8 field_61[5]; + s16 field_66[5]; +}; + +struct UsePokeblockStruct +{ + u8 field_0[0x7C58]; + u8 field_7C58[0x378]; + struct UsePokeblockSubStruct info; +}; + +extern u16 gKeyRepeatStartDelay; + +// this file's functions +void sub_816636C(void (*func)(void)); +void sub_8166380(void); +void sub_816631C(void); +void sub_81662C0(void); +void sub_8166564(void); +void sub_8166304(void); +void sub_81668F8(void); +void sub_8167420(void); +void sub_8167760(void); +u8 sub_81672E4(u8 arg0); +bool8 sub_8168328(void); +bool8 sub_8167930(void); +void sub_8167608(u8 arg0); +void sub_8167BA0(u16 arg0, u8 copyToVramMode); + +extern const struct BgTemplate gUnknown_085DFCCC[4]; +extern const struct WindowTemplate gUnknown_085DFCDC[]; + +// ram variables +EWRAM_DATA struct UsePokeblockSubStruct *gUnknown_0203BC90 = NULL; +EWRAM_DATA void (*gUnknown_0203BC94)(void) = NULL; +EWRAM_DATA struct Pokeblock *gUnknown_0203BC98 = NULL; +EWRAM_DATA u8 gPokeblockMonId = 0; +EWRAM_DATA s16 gPokeblockGain = 0; +EWRAM_DATA void *gUnknown_0203BCA0 = NULL; +EWRAM_DATA void *gUnknown_0203BCA4 = NULL; +EWRAM_DATA void *gUnknown_0203BCA8 = NULL; +EWRAM_DATA struct UsePokeblockStruct *gUnknown_0203BCAC = NULL; + +// const rom data +// todo: make it static once the file is decompiled + +// code +void ChooseMonToGivePokeblock(struct Pokeblock *pokeblock, void (*callback)(void)) +{ + gUnknown_0203BCAC = AllocZeroed(0x806C); + gUnknown_0203BC90 = &gUnknown_0203BCAC->info; + gUnknown_0203BC90->pokeblock = pokeblock; + gUnknown_0203BC90->callback = callback; + sub_816636C(sub_8166380); + SetMainCallback2(sub_816631C); +} + +void CB2_ReturnAndChooseMonToGivePokeblock(void) +{ + gUnknown_0203BCAC = AllocZeroed(0x806C); + gUnknown_0203BC90 = &gUnknown_0203BCAC->info; + gUnknown_0203BC90->pokeblock = gUnknown_0203BC98; + gUnknown_0203BC90->callback = gUnknown_0203BC94; + gPokeblockMonId = sub_81672E4(gPokeblockMonId); + gUnknown_0203BC90->field_56 = gPokeblockMonId < 4 ? 0 : 1; + sub_816636C(sub_8166380); + SetMainCallback2(sub_81662C0); +} + +void sub_81662C0(void) +{ + gUnknown_0203BC90->field_0(); + AnimateSprites(); + BuildOamBuffer(); + UpdatePaletteFade(); + if (gUnknown_0203BC90->field_0 == sub_8166564) + { + gUnknown_0203BC90->field_50 = 0; + SetMainCallback2(sub_8166304); + } +} + +void sub_8166304(void) +{ + sub_81668F8(); + AnimateSprites(); + BuildOamBuffer(); + UpdatePaletteFade(); +} + +void sub_816631C(void) +{ + gUnknown_0203BC90->field_0(); + AnimateSprites(); + BuildOamBuffer(); + RunTextPrinters(); + UpdatePaletteFade(); +} + +void sub_8166340(void) +{ + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); + sub_81D2108(gUnknown_0203BCAC->field_7C58); + sub_80BA0A8(); +} + +void sub_816636C(void (*func)(void)) +{ + gUnknown_0203BC90->field_0 = func; + gUnknown_0203BC90->field_50 = 0; +} + +void sub_8166380(void) +{ + switch (gUnknown_0203BC90->field_50) + { + case 0: + gUnknown_0203BCAC->field_0[0x7B10] = 0xFF; + sub_81D1ED4(gUnknown_0203BCAC->field_7C58); + gUnknown_0203BC90->field_50++; + break; + case 1: + ResetSpriteData(); + FreeAllSpritePalettes(); + gUnknown_0203BC90->field_50++; + break; + case 2: + SetVBlankCallback(NULL); + CpuFill32(0, (void*)(VRAM), VRAM_SIZE); + gUnknown_0203BC90->field_50++; + break; + case 3: + ResetBgsAndClearDma3BusyFlags(0); + InitBgsFromTemplates(0, gUnknown_085DFCCC, ARRAY_COUNT(gUnknown_085DFCCC)); + InitWindows(gUnknown_085DFCDC); + DeactivateAllTextPrinters(); + sub_809882C(0, 0x97, 0xE0); + gUnknown_0203BC90->field_50++; + break; + case 4: + gUnknown_0203BC90->field_50++; + break; + case 5: + if (!sub_8168328()) + { + gUnknown_0203BC90->field_50++; + } + break; + case 6: + gKeyRepeatStartDelay = 20; + sub_8167420(); + gUnknown_0203BC90->field_50++; + break; + case 7: + if (!sub_8167930()) + { + gUnknown_0203BC90->field_50++; + } + break; + case 8: + sub_8167608(0); + sub_8167760(); + gUnknown_0203BC90->field_50++; + break; + case 9: + if (!sub_81D312C(&gUnknown_0203BCAC->field_0[0x7B0E])) + { + gUnknown_0203BC90->field_50++; + } + break; + case 10: + gUnknown_0203BC90->field_50++; + break; + case 11: + sub_81D2754(gUnknown_0203BCAC->field_7C58, &gUnknown_0203BCAC->field_0[0x7C6C]); + sub_81D20AC(gUnknown_0203BCAC->field_7C58); + gUnknown_0203BC90->field_50++; + break; + case 12: + if (!sub_81D20BC(gUnknown_0203BCAC->field_7C58)) + { + sub_81D1F84(gUnknown_0203BCAC->field_7C58, &gUnknown_0203BCAC->field_7C58[0x14], &gUnknown_0203BCAC->field_7C58[0x14]); + gUnknown_0203BC90->field_50++; + } + break; + case 13: + sub_81D2230(gUnknown_0203BCAC->field_7C58); + gUnknown_0203BC90->field_50++; + break; + case 14: + PutWindowTilemap(0); + PutWindowTilemap(1); + sub_8167BA0(0, 1); + gUnknown_0203BC90->field_50++; + break; + case 15: + sub_816636C(sub_8166564); + break; + } +} diff --git a/src/wallclock.c b/src/wallclock.c new file mode 100644 index 000000000..cd85de230 --- /dev/null +++ b/src/wallclock.c @@ -0,0 +1,1057 @@ +#include "global.h" +#include "main.h" +#include "palette.h" +#include "gpu_regs.h" +#include "bg.h" +#include "rtc.h" +#include "clock.h" +#include "wallclock.h" +#include "event_data.h" +#include "graphics.h" +#include "text.h" +#include "window.h" +#include "text_window.h" +#include "menu.h" +#include "unknown_task.h" +#include "task.h" +#include "strings.h" +#include "sound.h" +#include "songs.h" +#include "trig.h" +#include "decompress.h" + +// static types + +#define tMinuteHandAngle data[0] +#define tHourHandAngle data[1] +#define tHours data[2] +#define tMinutes data[3] +#define tMvmtDir data[4] +#define tPeriod data[5] +#define tMvmtSpeed data[6] + +#define TAG_GFX_WALL_CLOCK_HAND 0x1000 +#define TAG_PAL_WALL_CLOCK_HAND 0x1000 + +// static declarations + +static void WallClockMainCallback(void); +static void Task_SetClock1(u8 taskId); +static void Task_SetClock2(u8 taskId); +static void Task_SetClock3(u8 taskId); +static void Task_SetClock4(u8 taskId); +static void Task_SetClock5(u8 taskId); +static void Task_SetClock6(u8 taskId); +static void Task_ViewClock1(u8 taskId); +static void Task_ViewClock2(u8 taskId); +static void Task_ViewClock3(u8 taskId); +static void Task_ViewClock4(u8 taskId); +static u16 CalcNewMinHandAngle(u16 a0, u8 command, u8 a2); +static bool32 AdvanceClock(u8 taskId, u8 command); +static void UpdateClockPeriod(u8 taskId, u8 command); +static void InitClockWithRtc(u8 taskId); +static void SpriteCB_MinuteHand(struct Sprite *sprite); +static void SpriteCB_HourHand(struct Sprite *sprite); +static void SpriteCB_AMIndicator(struct Sprite *sprite); +static void SpriteCB_PMIndicator(struct Sprite *sprite); + +// rodata + +static const u8 sUnknown_085B1F58[] = INCBIN_U8("graphics/wallclock/graphics_85b1f58.4bpp.lz"); +static const u16 sUnknown_085B21D4[] = INCBIN_U16("graphics/wallclock/palette_85b21d4.gbapal"); +static const struct WindowTemplate gUnknown_085B21DC[] = { + { 0x00, 0x03, 0x11, 0x18, 0x02, 0x0e, 0x200 }, + { 0x02, 0x18, 0x10, 0x06, 0x02, 0x0c, 0x230 }, + DUMMY_WIN_TEMPLATE +}; +static const struct WindowTemplate gUnknown_085B21F4 = { + 0x00, 0x18, 0x09, 0x05, 0x04, 0x0e, 0x23c +}; +static const struct BgTemplate gUnknown_085B21FC[] = { + { + .bg = 0, + .charBaseIndex = 2, + .mapBaseIndex = 31, + .priority = 0 + }, + { + .bg = 2, + .charBaseIndex = 1, + .mapBaseIndex = 8, + .priority = 1 + }, + { + .bg = 3, + .charBaseIndex = 0, + .mapBaseIndex = 7, + .priority = 2 + } +}; +static const struct CompressedSpriteSheet gUnknown_085B2208 = { + sUnknown_085B1F58, 0x2000, TAG_GFX_WALL_CLOCK_HAND +}; +static const u32 filler_85B2210[2] = {}; +static const struct SpritePalette gUnknown_085B2218[] = { + { gUnknown_08DCC01C, TAG_PAL_WALL_CLOCK_HAND }, + { gUnknown_08DCC03C, 0x1001 }, + {} +}; +static const struct OamData Unknown_085B2230 = { + .y = 0xa0, + .size = 3, + .priority = 1 +}; +static const union AnimCmd Unknown_085B2238[] = { + ANIMCMD_FRAME(0, 30), + ANIMCMD_END +}; +static const union AnimCmd Unknown_085B2240[] = { + ANIMCMD_FRAME(64, 30), + ANIMCMD_END +}; +static const union AnimCmd *const gUnknown_085B2248[] = { + Unknown_085B2238 +}; +static const union AnimCmd *const gUnknown_085B224C[] = { + Unknown_085B2240 +}; +static const struct SpriteTemplate gUnknown_085B2250 = { + TAG_GFX_WALL_CLOCK_HAND, + TAG_PAL_WALL_CLOCK_HAND, + &Unknown_085B2230, + gUnknown_085B2248, + NULL, + gDummySpriteAffineAnimTable, + SpriteCB_MinuteHand +}; +static const struct SpriteTemplate gUnknown_085B2268 = { + TAG_GFX_WALL_CLOCK_HAND, + TAG_PAL_WALL_CLOCK_HAND, + &Unknown_085B2230, + gUnknown_085B224C, + NULL, + gDummySpriteAffineAnimTable, + SpriteCB_HourHand +}; +static const struct OamData Unknown_085B2280 = { + .y = 0xa0, + .size = 1, + .priority = 3 +}; +static const union AnimCmd Unknown_085B2288[] = { + ANIMCMD_FRAME(0x84, 30), + ANIMCMD_END +}; +static const union AnimCmd Unknown_085B2290[] = { + ANIMCMD_FRAME(0x80, 30), + ANIMCMD_END +}; +static const union AnimCmd *const gUnknown_085B2298[] = { + Unknown_085B2288 +}; +static const union AnimCmd *const gUnknown_085B229C[] = { + Unknown_085B2290 +}; +static const struct SpriteTemplate gUnknown_085B22A0 = { + TAG_GFX_WALL_CLOCK_HAND, + TAG_PAL_WALL_CLOCK_HAND, + &Unknown_085B2280, + gUnknown_085B2298, + NULL, + gDummySpriteAffineAnimTable, + SpriteCB_AMIndicator +}; +static const struct SpriteTemplate gUnknown_085B22B8 = { + TAG_GFX_WALL_CLOCK_HAND, + TAG_PAL_WALL_CLOCK_HAND, + &Unknown_085B2280, + gUnknown_085B229C, + NULL, + gDummySpriteAffineAnimTable, + SpriteCB_PMIndicator +}; +static const s8 sClockHandCoords[][2] = { + { 0x00, -0x18}, + { 0x01, -0x19}, + { 0x01, -0x19}, + { 0x02, -0x19}, + { 0x02, -0x19}, + { 0x02, -0x19}, + { 0x03, -0x18}, + { 0x03, -0x19}, + { 0x04, -0x19}, + { 0x04, -0x19}, + { 0x04, -0x19}, + { 0x05, -0x19}, + { 0x05, -0x19}, + { 0x06, -0x18}, + { 0x06, -0x18}, + { 0x06, -0x18}, + { 0x07, -0x18}, + { 0x07, -0x18}, + { 0x07, -0x18}, + { 0x08, -0x18}, + { 0x08, -0x18}, + { 0x09, -0x18}, + { 0x09, -0x18}, + { 0x0a, -0x17}, + { 0x0a, -0x17}, + { 0x0b, -0x16}, + { 0x0b, -0x16}, + { 0x0b, -0x16}, + { 0x0c, -0x16}, + { 0x0c, -0x15}, + { 0x0d, -0x15}, + { 0x0d, -0x15}, + { 0x0d, -0x15}, + { 0x0e, -0x15}, + { 0x0e, -0x15}, + { 0x0e, -0x14}, + { 0x0e, -0x14}, + { 0x0f, -0x14}, + { 0x0f, -0x13}, + { 0x10, -0x13}, + { 0x10, -0x13}, + { 0x10, -0x13}, + { 0x10, -0x12}, + { 0x10, -0x12}, + { 0x11, -0x12}, + { 0x11, -0x11}, + { 0x11, -0x11}, + { 0x12, -0x11}, + { 0x12, -0x11}, + { 0x12, -0x10}, + { 0x12, -0x10}, + { 0x13, -0x10}, + { 0x13, -0x0f}, + { 0x13, -0x0f}, + { 0x14, -0x0f}, + { 0x14, -0x0e}, + { 0x14, -0x0e}, + { 0x14, -0x0d}, + { 0x14, -0x0d}, + { 0x15, -0x0d}, + { 0x15, -0x0d}, + { 0x15, -0x0c}, + { 0x16, -0x0c}, + { 0x16, -0x0c}, + { 0x16, -0x0b}, + { 0x16, -0x0b}, + { 0x16, -0x0a}, + { 0x17, -0x0a}, + { 0x17, -0x09}, + { 0x17, -0x09}, + { 0x17, -0x09}, + { 0x17, -0x09}, + { 0x17, -0x08}, + { 0x17, -0x08}, + { 0x17, -0x07}, + { 0x17, -0x07}, + { 0x17, -0x06}, + { 0x18, -0x06}, + { 0x18, -0x06}, + { 0x19, -0x05}, + { 0x19, -0x05}, + { 0x18, -0x04}, + { 0x19, -0x04}, + { 0x18, -0x03}, + { 0x19, -0x03}, + { 0x19, -0x03}, + { 0x19, -0x02}, + { 0x19, -0x02}, + { 0x18, -0x01}, + { 0x19, -0x01}, + { 0x18, 0x00}, + { 0x18, 0x00}, + { 0x18, 0x00}, + { 0x18, 0x01}, + { 0x18, 0x01}, + { 0x19, 0x02}, + { 0x18, 0x02}, + { 0x19, 0x02}, + { 0x18, 0x03}, + { 0x18, 0x03}, + { 0x19, 0x04}, + { 0x18, 0x04}, + { 0x18, 0x05}, + { 0x18, 0x05}, + { 0x18, 0x05}, + { 0x18, 0x06}, + { 0x17, 0x06}, + { 0x17, 0x06}, + { 0x17, 0x07}, + { 0x17, 0x08}, + { 0x17, 0x08}, + { 0x17, 0x08}, + { 0x17, 0x09}, + { 0x17, 0x09}, + { 0x17, 0x0a}, + { 0x16, 0x0a}, + { 0x16, 0x0a}, + { 0x16, 0x0b}, + { 0x16, 0x0b}, + { 0x16, 0x0b}, + { 0x16, 0x0c}, + { 0x15, 0x0c}, + { 0x15, 0x0c}, + { 0x15, 0x0d}, + { 0x14, 0x0d}, + { 0x14, 0x0d}, + { 0x13, 0x0d}, + { 0x13, 0x0d}, + { 0x13, 0x0e}, + { 0x13, 0x0e}, + { 0x13, 0x0f}, + { 0x13, 0x0f}, + { 0x12, 0x0f}, + { 0x12, 0x10}, + { 0x11, 0x10}, + { 0x11, 0x10}, + { 0x11, 0x11}, + { 0x11, 0x11}, + { 0x10, 0x11}, + { 0x10, 0x12}, + { 0x10, 0x12}, + { 0x0f, 0x12}, + { 0x0e, 0x12}, + { 0x0f, 0x13}, + { 0x0e, 0x13}, + { 0x0e, 0x13}, + { 0x0d, 0x13}, + { 0x0d, 0x14}, + { 0x0d, 0x14}, + { 0x0d, 0x14}, + { 0x0c, 0x14}, + { 0x0c, 0x14}, + { 0x0c, 0x15}, + { 0x0b, 0x15}, + { 0x0b, 0x15}, + { 0x0b, 0x15}, + { 0x0a, 0x15}, + { 0x0a, 0x16}, + { 0x0a, 0x16}, + { 0x09, 0x16}, + { 0x09, 0x16}, + { 0x08, 0x16}, + { 0x07, 0x16}, + { 0x07, 0x17}, + { 0x07, 0x17}, + { 0x06, 0x17}, + { 0x06, 0x17}, + { 0x05, 0x17}, + { 0x05, 0x17}, + { 0x05, 0x18}, + { 0x04, 0x18}, + { 0x04, 0x18}, + { 0x04, 0x18}, + { 0x03, 0x18}, + { 0x02, 0x18}, + { 0x02, 0x18}, + { 0x01, 0x18}, + { 0x01, 0x18}, + { 0x00, 0x18}, + { 0x00, 0x18}, + {-0x01, 0x17}, + { 0x00, 0x18}, + { 0x00, 0x18}, + {-0x01, 0x18}, + {-0x01, 0x18}, + {-0x02, 0x18}, + {-0x02, 0x18}, + {-0x03, 0x18}, + {-0x03, 0x18}, + {-0x04, 0x18}, + {-0x04, 0x18}, + {-0x05, 0x18}, + {-0x05, 0x17}, + {-0x05, 0x17}, + {-0x06, 0x17}, + {-0x06, 0x17}, + {-0x07, 0x17}, + {-0x07, 0x17}, + {-0x07, 0x17}, + {-0x08, 0x17}, + {-0x08, 0x16}, + {-0x09, 0x16}, + {-0x09, 0x16}, + {-0x0a, 0x16}, + {-0x0a, 0x16}, + {-0x0a, 0x15}, + {-0x0b, 0x15}, + {-0x0b, 0x15}, + {-0x0b, 0x15}, + {-0x0b, 0x14}, + {-0x0c, 0x14}, + {-0x0c, 0x14}, + {-0x0d, 0x14}, + {-0x0d, 0x14}, + {-0x0d, 0x13}, + {-0x0e, 0x13}, + {-0x0e, 0x13}, + {-0x0e, 0x13}, + {-0x0e, 0x12}, + {-0x0f, 0x12}, + {-0x0f, 0x12}, + {-0x0f, 0x11}, + {-0x10, 0x11}, + {-0x10, 0x11}, + {-0x11, 0x11}, + {-0x11, 0x10}, + {-0x11, 0x10}, + {-0x12, 0x10}, + {-0x11, 0x0f}, + {-0x12, 0x0f}, + {-0x12, 0x0f}, + {-0x13, 0x0f}, + {-0x13, 0x0e}, + {-0x13, 0x0e}, + {-0x13, 0x0d}, + {-0x13, 0x0d}, + {-0x14, 0x0d}, + {-0x14, 0x0c}, + {-0x14, 0x0c}, + {-0x15, 0x0c}, + {-0x15, 0x0c}, + {-0x15, 0x0b}, + {-0x15, 0x0b}, + {-0x15, 0x0a}, + {-0x15, 0x0a}, + {-0x15, 0x09}, + {-0x16, 0x09}, + {-0x16, 0x09}, + {-0x16, 0x08}, + {-0x16, 0x08}, + {-0x16, 0x07}, + {-0x17, 0x07}, + {-0x17, 0x07}, + {-0x17, 0x06}, + {-0x17, 0x06}, + {-0x17, 0x05}, + {-0x18, 0x05}, + {-0x17, 0x04}, + {-0x17, 0x04}, + {-0x18, 0x04}, + {-0x18, 0x04}, + {-0x18, 0x03}, + {-0x18, 0x03}, + {-0x18, 0x02}, + {-0x18, 0x02}, + {-0x18, 0x01}, + {-0x18, 0x01}, + {-0x18, 0x01}, + {-0x18, 0x00}, + {-0x19, 0x00}, + {-0x18, -0x01}, + {-0x19, -0x01}, + {-0x18, -0x01}, + {-0x18, -0x02}, + {-0x18, -0x02}, + {-0x18, -0x03}, + {-0x18, -0x03}, + {-0x18, -0x04}, + {-0x18, -0x04}, + {-0x18, -0x04}, + {-0x18, -0x05}, + {-0x18, -0x05}, + {-0x18, -0x06}, + {-0x18, -0x06}, + {-0x17, -0x06}, + {-0x17, -0x07}, + {-0x17, -0x07}, + {-0x17, -0x08}, + {-0x17, -0x08}, + {-0x17, -0x09}, + {-0x17, -0x09}, + {-0x16, -0x09}, + {-0x16, -0x09}, + {-0x16, -0x0a}, + {-0x16, -0x0a}, + {-0x15, -0x0a}, + {-0x15, -0x0b}, + {-0x16, -0x0b}, + {-0x16, -0x0c}, + {-0x15, -0x0c}, + {-0x15, -0x0d}, + {-0x15, -0x0d}, + {-0x14, -0x0d}, + {-0x15, -0x0e}, + {-0x14, -0x0e}, + {-0x14, -0x0e}, + {-0x13, -0x0e}, + {-0x13, -0x0f}, + {-0x13, -0x0f}, + {-0x12, -0x10}, + {-0x12, -0x10}, + {-0x12, -0x10}, + {-0x12, -0x11}, + {-0x12, -0x11}, + {-0x11, -0x11}, + {-0x11, -0x12}, + {-0x11, -0x12}, + {-0x10, -0x12}, + {-0x10, -0x12}, + {-0x10, -0x13}, + {-0x10, -0x13}, + {-0x0f, -0x13}, + {-0x0f, -0x13}, + {-0x0f, -0x14}, + {-0x0e, -0x14}, + {-0x0e, -0x14}, + {-0x0e, -0x15}, + {-0x0d, -0x15}, + {-0x0d, -0x15}, + {-0x0d, -0x15}, + {-0x0c, -0x15}, + {-0x0c, -0x16}, + {-0x0b, -0x16}, + {-0x0b, -0x16}, + {-0x0b, -0x16}, + {-0x0a, -0x16}, + {-0x0a, -0x16}, + {-0x09, -0x16}, + {-0x09, -0x17}, + {-0x09, -0x17}, + {-0x08, -0x17}, + {-0x08, -0x17}, + {-0x07, -0x17}, + {-0x07, -0x17}, + {-0x07, -0x18}, + {-0x06, -0x18}, + {-0x06, -0x18}, + {-0x05, -0x18}, + {-0x05, -0x18}, + {-0x04, -0x18}, + {-0x04, -0x18}, + {-0x04, -0x18}, + {-0x04, -0x19}, + {-0x03, -0x19}, + {-0x02, -0x19}, + {-0x02, -0x18}, + {-0x02, -0x18}, + {-0x01, -0x19}, + {-0x01, -0x19}, + { 0x00, -0x19} +}; + +// text + +static void WallClockVblankCallback(void) +{ + LoadOam(); + ProcessSpriteCopyRequests(); + TransferPlttBuffer(); +} + +static void LoadWallClockGraphics(void) +{ + SetVBlankCallback(NULL); + SetGpuReg(REG_OFFSET_DISPCNT, 0x0000); + SetGpuReg(REG_OFFSET_BG3CNT, 0x0000); + SetGpuReg(REG_OFFSET_BG2CNT, 0x0000); + SetGpuReg(REG_OFFSET_BG1CNT, 0x0000); + SetGpuReg(REG_OFFSET_BG0CNT, 0x0000); + ChangeBgX(0, 0, 0); + ChangeBgY(0, 0, 0); + ChangeBgX(1, 0, 0); + ChangeBgY(1, 0, 0); + ChangeBgX(2, 0, 0); + ChangeBgY(2, 0, 0); + ChangeBgX(3, 0, 0); + ChangeBgY(3, 0, 0); + DmaFillLarge16(3, 0, (void *)VRAM, VRAM_SIZE, 0x1000); + DmaClear32(3, (void *)OAM, OAM_SIZE); + DmaClear16(3, (void *)PLTT, PLTT_SIZE); + LZ77UnCompVram(gUnknown_08DCC05C, (void *)VRAM); + if (gSpecialVar_0x8004 == 0) + { + LoadPalette(gUnknown_08DCC01C, 0x00, 0x20); + } + else + { + LoadPalette(gUnknown_08DCC03C, 0x00, 0x20); + } + LoadPalette(GetOverworldTextboxPalettePtr(), 0xe0, 0x20); + LoadPalette(sUnknown_085B21D4, 0xc0, 0x08); + ResetBgsAndClearDma3BusyFlags(0); + InitBgsFromTemplates(0, gUnknown_085B21FC, 3); + InitWindows(gUnknown_085B21DC); + DeactivateAllTextPrinters(); + sub_809882C(0, 0x250, 0xd0); + clear_scheduled_bg_copies_to_vram(); + remove_some_task(); + ResetTasks(); + ResetSpriteData(); + ResetPaletteFade(); + FreeAllSpritePalettes(); + LoadCompressedObjectPic(&gUnknown_085B2208); + LoadSpritePalettes(gUnknown_085B2218); +} + +static void WallClockInit(void) +{ + BeginNormalPaletteFade(-1, 0, 16, 0, 0); + EnableInterrupts(INTR_FLAG_VBLANK); + SetVBlankCallback(WallClockVblankCallback); + SetMainCallback2(WallClockMainCallback); + SetGpuReg(REG_OFFSET_BLDCNT, 0x0000); + SetGpuReg(REG_OFFSET_BLDALPHA, 0x0000); + SetGpuReg(REG_OFFSET_BLDY, 0x0000); + SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON); + ShowBg(0); + ShowBg(2); + ShowBg(3); +} + +void Cb2_StartWallClock(void) +{ + u8 taskId; + u8 spriteId; + + LoadWallClockGraphics(); + LZ77UnCompVram(gUnknown_08DCC648, (u16 *)BG_SCREEN_ADDR(7)); + + taskId = CreateTask(Task_SetClock1, 0); + gTasks[taskId].tHours = 10; + gTasks[taskId].tMinutes = 0; + gTasks[taskId].tMvmtDir = 0; + gTasks[taskId].tPeriod = 0; + gTasks[taskId].tMvmtSpeed = 0; + gTasks[taskId].tMinuteHandAngle = 0; + gTasks[taskId].tHourHandAngle = 300; + + spriteId = CreateSprite(&gUnknown_085B2250, 0x78, 0x50, 1); + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL; + gSprites[spriteId].oam.matrixNum = 0; + + spriteId = CreateSprite(&gUnknown_085B2268, 0x78, 0x50, 0); + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL; + gSprites[spriteId].oam.matrixNum = 1; + + spriteId = CreateSprite(&gUnknown_085B22A0, 0x78, 0x50, 2); + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].data[1] = 45; + + spriteId = CreateSprite(&gUnknown_085B22B8, 0x78, 0x50, 2); + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].data[1] = 90; + + WallClockInit(); + + PrintTextOnWindow(1, 1, gText_Confirm3, 0, 1, 0, NULL); + PutWindowTilemap(1); + schedule_bg_copy_tilemap_to_vram(2); +} + +void Cb2_ViewWallClock(void) +{ + u8 taskId; + u8 spriteId; + u8 angle1; + u8 angle2; + + LoadWallClockGraphics(); + LZ77UnCompVram(gUnknown_08DCC908, (u16 *)BG_SCREEN_ADDR(7)); + + taskId = CreateTask(Task_ViewClock1, 0); + InitClockWithRtc(taskId); + if (gTasks[taskId].tPeriod == 0) + { + angle1 = 45; + angle2 = 90; + } + else + { + angle1 = 90; + angle2 = 135; + } + + spriteId = CreateSprite(&gUnknown_085B2250, 0x78, 0x50, 1); + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL; + gSprites[spriteId].oam.matrixNum = 0; + + spriteId = CreateSprite(&gUnknown_085B2268, 0x78, 0x50, 0); + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL; + gSprites[spriteId].oam.matrixNum = 1; + + spriteId = CreateSprite(&gUnknown_085B22A0, 0x78, 0x50, 2); + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].data[1] = angle1; + + spriteId = CreateSprite(&gUnknown_085B22B8, 0x78, 0x50, 2); + gSprites[spriteId].data[0] = taskId; + gSprites[spriteId].data[1] = angle2; + + WallClockInit(); + + PrintTextOnWindow(1, 1, gText_Cancel4, 0, 1, 0, NULL); + PutWindowTilemap(1); + schedule_bg_copy_tilemap_to_vram(2); +} + +static void WallClockMainCallback(void) +{ + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); + do_scheduled_bg_tilemap_copies_to_vram(); + UpdatePaletteFade(); +} + +static void Task_SetClock1(u8 taskId) +{ + if (!gPaletteFade.active) + { + gTasks[taskId].func = Task_SetClock2; + } +} + +static void Task_SetClock2(u8 taskId) +{ + if (gTasks[taskId].tMinuteHandAngle % 6) + { + gTasks[taskId].tMinuteHandAngle = CalcNewMinHandAngle(gTasks[taskId].tMinuteHandAngle, gTasks[taskId].tMvmtDir, gTasks[taskId].tMvmtSpeed); + } + else + { + gTasks[taskId].tMinuteHandAngle = gTasks[taskId].tMinutes * 6; + gTasks[taskId].tHourHandAngle = (gTasks[taskId].tHours % 12) * 30 + (gTasks[taskId].tMinutes / 10) * 5; + if (gMain.newKeys & A_BUTTON) + { + gTasks[taskId].func = Task_SetClock3; + } + else + { + gTasks[taskId].tMvmtDir = 0; + if (gMain.heldKeys & DPAD_LEFT) + { + gTasks[taskId].tMvmtDir = 1; + } + if (gMain.heldKeys & DPAD_RIGHT) + { + gTasks[taskId].tMvmtDir = 2; + } + if (gTasks[taskId].tMvmtDir != 0) + { + if (gTasks[taskId].tMvmtSpeed < 0xFF) + { + gTasks[taskId].tMvmtSpeed++; + } + gTasks[taskId].tMinuteHandAngle = CalcNewMinHandAngle(gTasks[taskId].tMinuteHandAngle, gTasks[taskId].tMvmtDir, gTasks[taskId].tMvmtSpeed); + AdvanceClock(taskId, gTasks[taskId].tMvmtDir); + } + else + { + gTasks[taskId].tMvmtSpeed = 0; + } + } + } +} + +static void Task_SetClock3(u8 taskId) +{ + SetWindowBorderStyle(0, FALSE, 0x250, 0x0d); + PrintTextOnWindow(0, 1, gText_IsThisTheCorrectTime, 0, 1, 0, NULL); + PutWindowTilemap(0); + schedule_bg_copy_tilemap_to_vram(0); + CreateYesNoMenu(&gUnknown_085B21F4, 0x250, 0x0d, 1); + gTasks[taskId].func = Task_SetClock4; +} + +static void Task_SetClock4(u8 taskId) +{ + switch (ProcessMenuInputNoWrap_()) + { + case 0: + PlaySE(SE_SELECT); + gTasks[taskId].func = Task_SetClock5; + break; + case 1: + case -1: + PlaySE(SE_SELECT); + sub_8198070(0, FALSE); + ClearWindowTilemap(0); + gTasks[taskId].func = Task_SetClock2; + break; + } +} + +static void Task_SetClock5(u8 taskId) +{ + RtcInitLocalTimeOffset(gTasks[taskId].tHours, gTasks[taskId].tMinutes); + BeginNormalPaletteFade(-1, 0, 0, 16, 0); + gTasks[taskId].func = Task_SetClock6; +} + +static void Task_SetClock6(u8 taskId) +{ + if (!gPaletteFade.active) + { + FreeAllWindowBuffers(); + SetMainCallback2(gMain.savedCallback); + } +} + +static void Task_ViewClock1(u8 taskId) +{ + if (!gPaletteFade.active) + { + gTasks[taskId].func = Task_ViewClock2; + } +} + +static void Task_ViewClock2(u8 taskId) +{ + InitClockWithRtc(taskId); + if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + { + gTasks[taskId].func = Task_ViewClock3; + } +} + +static void Task_ViewClock3(u8 taskId) +{ + BeginNormalPaletteFade(-1, 0, 0, 16, 0); + gTasks[taskId].func = Task_ViewClock4; +} + +static void Task_ViewClock4(u8 taskId) +{ + if (!gPaletteFade.active) + { + SetMainCallback2(gMain.savedCallback); + } +} + +static u8 CalcMinHandDelta(u16 a0) +{ + if (a0 > 60) + { + return 6; + } + if (a0 > 30) + { + return 3; + } + if (a0 > 10) + { + return 2; + } + return 1; +} + +static u16 CalcNewMinHandAngle(u16 a0, u8 command, u8 a2) +{ + u8 r1 = CalcMinHandDelta(a2); + switch (command) + { + case 1: + if (a0) a0 -= r1; + else a0 = 360 - r1; + break; + case 2: + if (a0 < 360 - r1) a0 += r1; + else a0 = 0; + break; + } + return a0; +} + +static bool32 AdvanceClock(u8 taskId, u8 command) +{ + switch (command) + { + case 1: + if (gTasks[taskId].tMinutes > 0) + { + gTasks[taskId].tMinutes--; + } + else + { + gTasks[taskId].tMinutes = 59; + if (gTasks[taskId].tHours > 0) + { + gTasks[taskId].tHours--; + } + else + { + gTasks[taskId].tHours = 23; + } + UpdateClockPeriod(taskId, command); + } + break; + case 2: + if (gTasks[taskId].tMinutes < 59) + { + gTasks[taskId].tMinutes++; + } + else + { + gTasks[taskId].tMinutes = 0; + if (gTasks[taskId].tHours < 23) + { + gTasks[taskId].tHours++; + } + else + { + gTasks[taskId].tHours = 0; + } + UpdateClockPeriod(taskId, command); + } + break; + } + return FALSE; +} + +static void UpdateClockPeriod(u8 taskId, u8 command) +{ + u8 hours = gTasks[taskId].tHours; + switch (command) + { + case 1: + switch (hours) + { + case 11: + gTasks[taskId].tPeriod = FALSE; + break; + case 23: + gTasks[taskId].tPeriod = TRUE; + break; + } + break; + case 2: + switch (hours) + { + case 0: + gTasks[taskId].tPeriod = FALSE; + break; + case 12: + gTasks[taskId].tPeriod = TRUE; + break; + } + break; + } +} + +static void InitClockWithRtc(u8 taskId) +{ + RtcCalcLocalTime(); + gTasks[taskId].tHours = gLocalTime.hours; + gTasks[taskId].tMinutes = gLocalTime.minutes; + gTasks[taskId].tMinuteHandAngle = gTasks[taskId].tMinutes * 6; + gTasks[taskId].tHourHandAngle = (gTasks[taskId].tHours % 12) * 30 + (gTasks[taskId].tMinutes / 10) * 5; + if (gLocalTime.hours < 12) + { + gTasks[taskId].tPeriod = FALSE; + } + else + { + gTasks[taskId].tPeriod = TRUE; + } +} + +static void SpriteCB_MinuteHand(struct Sprite *sprite) +{ + u16 angle = gTasks[sprite->data[0]].tMinuteHandAngle; + s16 sin = Sin2(angle) / 16; + s16 cos = Cos2(angle) / 16; + u16 xhat; + u16 yhat; + + SetOamMatrix(0, cos, sin, -sin, cos); + xhat = sClockHandCoords[angle][0]; + yhat = sClockHandCoords[angle][1]; + + if (xhat > 0x80) + { + xhat |= 0xff00; + } + if (yhat > 0x80) + { + yhat |= 0xff00; + } + sprite->pos2.x = xhat; + sprite->pos2.y = yhat; +} + +static void SpriteCB_HourHand(struct Sprite *sprite) +{ + u16 angle = gTasks[sprite->data[0]].tHourHandAngle; + s16 sin = Sin2(angle) / 16; + s16 cos = Cos2(angle) / 16; + u16 xhat; + u16 yhat; + + SetOamMatrix(1, cos, sin, -sin, cos); + xhat = sClockHandCoords[angle][0]; + yhat = sClockHandCoords[angle][1]; + if (xhat > 0x80) + { + xhat |= 0xff00; + } + if (yhat > 0x80) + { + yhat |= 0xff00; + } + sprite->pos2.x = xhat; + sprite->pos2.y = yhat; +} + +static void SpriteCB_AMIndicator(struct Sprite *sprite) +{ + if (gTasks[sprite->data[0]].tPeriod) + { + if (sprite->data[1] >= 60 && sprite->data[1] < 90) + { + sprite->data[1] += 5; + } + if (sprite->data[1] < 60) + { + sprite->data[1]++; + } + } + else + { + if (sprite->data[1] >= 46 && sprite->data[1] < 76) + { + sprite->data[1] -= 5; + } + if (sprite->data[1] > 75) + { + sprite->data[1]--; + } + } + sprite->pos2.x = Cos2(sprite->data[1]) * 30 / 0x1000; + sprite->pos2.y = Sin2(sprite->data[1]) * 30 / 0x1000; +} + +static void SpriteCB_PMIndicator(struct Sprite *sprite) +{ + if (gTasks[sprite->data[0]].tPeriod) + { + if (sprite->data[1] >= 105 && sprite->data[1] < 135) + { + sprite->data[1] += 5; + } + if (sprite->data[1] < 105) + { + sprite->data[1]++; + } + } + else + { + if (sprite->data[1] >= 91 && sprite->data[1] < 121) + { + sprite->data[1] -= 5; + } + if (sprite->data[1] > 120) + { + sprite->data[1]--; + } + } + sprite->pos2.x = Cos2(sprite->data[1]) * 30 / 0x1000; + sprite->pos2.y = Sin2(sprite->data[1]) * 30 / 0x1000; +} diff --git a/sym_bss.txt b/sym_bss.txt index a4d3c2d82..de452b2e7 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -8,7 +8,7 @@ .include "src/link.o" .include "src/rtc.o" .include "src/main_menu.o" - .include "src/battle_1.o" + .include "src/rom_8034C54.o" .include "src/egg_hatch.o" .include "src/berry_blender.o" .include "src/play_time.o" diff --git a/sym_common.txt b/sym_common.txt index 93b8431f4..590597459 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -295,21 +295,7 @@ gUnknown_03005DF4: @ 3005DF4 .include "sound.o" .include "task.o" - -gUnknown_03006080: @ 3006080 - .space 0x4 - -gUnknown_03006084: @ 3006084 - .space 0xC - -gUnknown_03006090: @ 3006090 - .space 0x18 - -gUnknown_030060A8: @ 30060A8 - .space 0x4 - -gUnknown_030060AC: @ 30060AC - .space 0x4 + .include "trainer_see.o" gUnknown_030060B0: @ 30060B0 .space 0x4 @@ -419,7 +405,7 @@ gUnknown_030062F4: @ 30062F4 gUnknown_03006300: @ 3006300 .space 0x10 -gUnknown_03006310: @ 3006310 +gMultiuseListMenuTemplate: @ 3006310 .space 0x18 gUnknown_03006328: @ 3006328 diff --git a/sym_ewram.txt b/sym_ewram.txt index c35c21df6..82717b1a1 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -706,57 +706,8 @@ gUnknown_02038BC4: @ 2038BC4 gUnknown_02038BC6: @ 2038BC6 .space 0x2 -gUnknown_02038BC8: @ 2038BC8 - .space 0x2 - -gTrainerBattleOpponent_A: @ 2038BCA - .space 0x2 - -gTrainerBattleOpponent_B: @ 2038BCC - .space 0x2 - -gPartnerTrainerId: @ 2038BCE - .space 0x2 - -gUnknown_02038BD0: @ 2038BD0 - .space 0x4 - -gUnknown_02038BD4: @ 2038BD4 - .space 0x4 - -gUnknown_02038BD8: @ 2038BD8 - .space 0x4 - -gUnknown_02038BDC: @ 2038BDC - .space 0x4 - -gUnknown_02038BE0: @ 2038BE0 - .space 0x4 - -gUnknown_02038BE4: @ 2038BE4 - .space 0x4 - -gUnknown_02038BE8: @ 2038BE8 - .space 0x4 - -gUnknown_02038BEC: @ 2038BEC - .space 0x4 - -gUnknown_02038BF0: @ 2038BF0 - .space 0x4 - -gUnknown_02038BF4: @ 2038BF4 - .space 0x4 - -gUnknown_02038BF8: @ 2038BF8 - .space 0x1 - -gUnknown_02038BF9: @ 2038BF9 - .space 0x3 - -gUnknown_02038BFC: @ 2038BFC - .space 0x4 - + .include "src/battle_setup.o" + .include "src/trainer_see.o" .include "src/wild_encounter.o" gFieldEffectArguments: @ 2038C08 @@ -1164,15 +1115,8 @@ gUnknown_0203AB34: @ 203AB34 .align 2 gUnknown_0203AB40: @ 203AB40 .space 0x8 - -gUnknown_0203AB48: @ 203AB48 - .space 0x6 - -gUnknown_0203AB4E: @ 203AB4E - .space 0x2 - -gUnknown_0203AB50: @ 203AB50 - .space 0x4 + + .include "src/pokeblock.o" gUnknown_0203AB54: @ 203AB54 .space 0x1 @@ -1306,32 +1250,7 @@ gUnknown_0203BC88: @ 203BC88 gUnknown_0203BC8C: @ 203BC8C .space 0x4 -gUnknown_0203BC90: @ 203BC90 - .space 0x4 - -gUnknown_0203BC94: @ 203BC94 - .space 0x4 - -gUnknown_0203BC98: @ 203BC98 - .space 0x4 - -gUnknown_0203BC9C: @ 203BC9C - .space 0x2 - -gUnknown_0203BC9E: @ 203BC9E - .space 0x2 - -gUnknown_0203BCA0: @ 203BCA0 - .space 0x4 - -gUnknown_0203BCA4: @ 203BCA4 - .space 0x4 - -gUnknown_0203BCA8: @ 203BCA8 - .space 0x4 - -gUnknown_0203BCAC: @ 203BCAC - .space 0x4 + .include "src/use_pokeblock.o" gUnknown_0203BCB0: @ 203BCB0 .space 0x4 @@ -1393,11 +1312,7 @@ gUnknown_0203BCF8: @ 203BCF8 gBraillePuzzleCallbackFlag: @ 203BD14 .space 0x4 -gUnknown_0203BD18: @ 203BD18 - .space 0x4 - -gUnknown_0203BD1C: @ 203BD1C - .space 0x8 + .include "src/pokeblock_feed.o" gUnknown_0203BD24: @ 203BD24 .space 0x2 |
