diff options
72 files changed, 2771 insertions, 2751 deletions
diff --git a/asm/code_803D110.s b/asm/code_803D110.s index d2ff740..1bf4f5d 100644 --- a/asm/code_803D110.s +++ b/asm/code_803D110.s @@ -641,7 +641,7 @@ _0803D5A8: str r1, [r7] str r2, [r7, 0x4] adds r0, r6 - bl sub_808E9B8 + bl ExtractSpeciesIndex lsls r0, 16 cmp r0, 0 beq _0803D5E8 @@ -966,7 +966,7 @@ _0803D840: ldr r0, [r5] adds r0, r2 str r2, [sp] - bl sub_808E9B8 + bl ExtractSpeciesIndex lsls r0, 16 ldr r2, [sp] cmp r0, 0 @@ -1033,7 +1033,7 @@ _0803D8B8: adds r1, r4, r0 ldr r0, [r7] adds r0, r1 - bl sub_808E9B8 + bl ExtractSpeciesIndex lsls r0, 16 asrs r0, 16 cmp r0, 0 @@ -1109,7 +1109,7 @@ _0803D954: bgt _0803D968 ldr r0, [r7] adds r0, r4 - bl sub_808E9B8 + bl ExtractSpeciesIndex lsls r0, 16 asrs r0, 16 cmp r0, 0 @@ -1185,7 +1185,7 @@ _0803D9D0: beq _0803DA00 _0803D9E0: adds r0, r2, r4 - bl sub_808E9B8 + bl ExtractSpeciesIndex lsls r0, 16 asrs r0, 16 b _0803DA14 @@ -1233,14 +1233,14 @@ sub_803DA20: _0803DA3A: ldr r0, [r6] adds r0, r4 - bl sub_808E9B8 + bl ExtractSpeciesIndex lsls r0, 16 asrs r0, 16 cmp r0, r7 bne _0803DA60 ldr r0, [r6] adds r0, r4 - bl sub_808E9E4 + bl ExtractLevel b _0803DA72 .align 2, 0 _0803DA54: .4byte gDungeonGlobalData @@ -4516,7 +4516,7 @@ _0803F45A: beq _0803F494 adds r0, r2, 0 adds r1, r4, 0 - bl sub_8083294 + bl InSameRoom_2 lsls r0, 24 lsrs r0, 24 b _0803F49A @@ -4813,7 +4813,7 @@ _0803F6B4: ldrb r2, [r4] mov r8, r2 adds r0, r6, 0 - bl sub_8071884 + bl CanSeeInvisible lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -5469,7 +5469,7 @@ _0803FBBA: lsls r3, 1 adds r0, r3 ldr r0, [r0] - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0 bne _0803FBD2 movs r0, 0x1 diff --git a/asm/code_8040094.s b/asm/code_8040094.s index 4df6052..b4488f1 100644 --- a/asm/code_8040094.s +++ b/asm/code_8040094.s @@ -1375,7 +1375,7 @@ sub_8040BB0: mov r8, r0 ldrh r4, [r7, 0x2] adds r0, r6, 0 - bl sub_807E580 + bl GetWeather adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -1387,7 +1387,7 @@ sub_8040BB0: mov r9, r5 ldrh r4, [r7, 0x2] adds r0, r6, 0 - bl sub_807E580 + bl GetWeather adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -1446,7 +1446,7 @@ sub_8040C4C: adds r4, r1, 0 adds r6, r2, 0 ldrh r5, [r4, 0x2] - bl sub_807E580 + bl GetWeather adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -1466,7 +1466,7 @@ sub_8040C4C: ldrsh r5, [r6, r0] ldrh r4, [r4, 0x2] adds r0, r7, 0 - bl sub_807E580 + bl GetWeather adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -1619,7 +1619,7 @@ sub_8040DA0: mov r1, r8 ldrh r4, [r1, 0x2] adds r0, r7, 0 - bl sub_807E580 + bl GetWeather adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -1764,7 +1764,7 @@ _08040EF0: mov r0, r8 ldrh r4, [r0, 0x2] adds r0, r7, 0 - bl sub_807E580 + bl GetWeather adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -1933,7 +1933,7 @@ sub_8041038: mov r9, r0 ldrh r4, [r2, 0x2] adds r0, r7, 0 - bl sub_807E580 + bl GetWeather adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -1954,7 +1954,7 @@ sub_8041038: mov r0, r8 ldrh r4, [r0, 0x2] adds r0, r7, 0 - bl sub_807E580 + bl GetWeather adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -2031,7 +2031,7 @@ sub_8041108: adds r5, r3, 0 ldrh r4, [r2, 0x2] adds r0, r7, 0 - bl sub_807E580 + bl GetWeather adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -2088,7 +2088,7 @@ sub_8041168: _0804118A: ldrh r4, [r7, 0x2] mov r0, r8 - bl sub_807E580 + bl GetWeather adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -2479,7 +2479,7 @@ _08041476: bne _0804148E _0804147E: adds r0, r4, 0 - bl sub_8070B28 + bl IsSleeping lsls r0, 24 cmp r0, 0 beq _080414A0 @@ -2490,7 +2490,7 @@ _0804148E: cmp r0, 0x97 bne _080414A4 adds r0, r4, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -2524,7 +2524,7 @@ sub_80414C0: bne _080414DC adds r0, r5, 0 bl sub_8045128 - bl sub_804AF20 + bl IsTileWater lsls r0, 24 cmp r0, 0 bne _080414F2 diff --git a/asm/code_8041AD0.s b/asm/code_8041AD0.s index 3d4c664..7d4f30a 100644 --- a/asm/code_8041AD0.s +++ b/asm/code_8041AD0.s @@ -511,7 +511,7 @@ _08042650: .4byte 0x0000ffff _08042654: .4byte gDungeonGlobalData _08042658: .4byte 0x000181f2 _0804265C: .4byte 0x00000165 -_08042660: .4byte gUnknown_80F4448 +_08042660: .4byte gAdjacentTileOffsets _08042664: movs r6, 0x1 negs r6, r6 @@ -753,7 +753,7 @@ sub_8042818: ldr r4, [r0] cmp r4, 0 bne _08042836 - bl sub_8083600 + bl GetLeaderEntity adds r4, r0, 0 _08042836: ldr r1, _0804287C @@ -775,7 +775,7 @@ _0804284A: blt _08042896 cmp r7, 0 beq _08042888 - bl sub_80441BC + bl IsBossBattle lsls r0, 24 cmp r0, 0 bne _08042888 diff --git a/asm/code_80428A0.s b/asm/code_80428A0.s index 54c5963..b776ebc 100644 --- a/asm/code_80428A0.s +++ b/asm/code_80428A0.s @@ -1050,7 +1050,7 @@ _080432CC: .4byte 0x00000226 _080432D0: ldr r4, _080432E4 _080432D2: - bl sub_8083600 + bl GetLeaderEntity adds r2, r0, 0 adds r0, r4, 0 movs r1, 0 @@ -1283,7 +1283,7 @@ _080434A6: b _0804351C .align 2, 0 _080434B8: .4byte gPtrFinalChanceMessage -_080434BC: .4byte gUnknown_203B450 +_080434BC: .4byte gLeaderPokemon _080434C0: .4byte gDungeonGlobalData _080434C4: .4byte 0x000037ec _080434C8: .4byte 0x000037fc @@ -1368,7 +1368,7 @@ _08043594: bl sub_806B6C4 b _080435D4 .align 2, 0 -_080435B4: .4byte gUnknown_80F5668 +_080435B4: .4byte gDungeonMusic _080435B8: .4byte gDungeonGlobalData _080435BC: .4byte 0x00003a10 _080435C0: .4byte gUnknown_202EDC8 @@ -1532,9 +1532,9 @@ _08043728: _08043730: .4byte gDungeonGlobalData _08043734: .4byte 0x0000066c _08043738: .4byte 0x0000066d -_0804373C: .4byte gUnknown_203B450 +_0804373C: .4byte gLeaderPokemon _08043740: - bl sub_8083600 + bl GetLeaderEntity bl sub_803F4A0 bl sub_8040A84 _0804374C: @@ -1547,7 +1547,7 @@ _0804374C: bne _0804377C bl sub_807E5AC movs r0, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 cmp r0, 0 beq _0804377C @@ -1557,7 +1557,7 @@ _0804374C: .align 2, 0 _08043774: .4byte gDungeonGlobalData _08043778: - bl sub_8069E8C + bl TriggerWeatherAbilities _0804377C: cmp r6, 0 beq _08043784 @@ -1565,7 +1565,7 @@ _0804377C: b _080437A2 _08043784: bl sub_80427AC - bl sub_8083600 + bl GetLeaderEntity ldr r2, _08043960 ldr r1, [r2] ldr r3, _08043964 @@ -1603,7 +1603,7 @@ _080437C8: cmp r0, 0 beq _080437C8 _080437DA: - bl sub_8083600 + bl GetLeaderEntity adds r4, r0, 0 bl EntityExists lsls r0, 24 @@ -1645,7 +1645,7 @@ _08043822: bne _08043830 bl sub_806AA70 _08043830: - bl sub_8083600 + bl GetLeaderEntity bl EntityExists lsls r0, 24 cmp r0, 0 @@ -1743,7 +1743,7 @@ _080438AC: ldrb r0, [r1, 0x6] cmp r0, 0 beq _08043926 - bl sub_8083600 + bl GetLeaderEntity adds r4, r0, 0 ldr r0, _0804398C ldr r1, [r0] @@ -1831,7 +1831,7 @@ _080439D4: _080439DC: cmp r0, 0x2 bne _08043A00 - bl sub_8083600 + bl GetLeaderEntity adds r2, r0, 0 ldr r0, _080439F8 movs r1, 0 @@ -1846,7 +1846,7 @@ _080439FC: .4byte 0x0000066e _08043A00: cmp r0, 0x3 bne _08043A24 - bl sub_8083600 + bl GetLeaderEntity adds r2, r0, 0 ldr r0, _08043A1C movs r1, 0 @@ -1879,7 +1879,7 @@ _08043A2A: ldrb r0, [r0] cmp r0, 0x2 bne _08043A74 - bl sub_8083600 + bl GetLeaderEntity adds r2, r0, 0 movs r0, 0x8A lsls r0, 2 @@ -1947,7 +1947,7 @@ _08043ADC: .4byte 0x00000644 _08043AE0: .4byte 0x0000060b _08043AE4: ldr r4, _08043B80 - bl sub_8083600 + bl GetLeaderEntity adds r2, r0, 0 adds r0, r4, 0 movs r1, 0 @@ -2212,7 +2212,7 @@ _08043D08: pop {r1} bx r1 .align 2, 0 -_08043D0C: .4byte gUnknown_810ACC0 +_08043D0C: .4byte gDungeonWaterType thumb_func_end sub_8043CE4 thumb_func_start sub_8043D10 @@ -2239,7 +2239,7 @@ sub_8043D10: .align 2, 0 _08043D38: .4byte gDungeonGlobalData _08043D3C: - bl sub_80441BC + bl IsBossBattle lsls r0, 24 cmp r0, 0 bne _08043D4A @@ -2410,7 +2410,7 @@ _08043E6A: _08043E6E: adds r0, r5, 0 adds r1, r6, 0 - bl sub_8049590 + bl GetMapEntity ldr r4, [r0, 0x14] adds r0, r4, 0 bl EntityExists @@ -2471,7 +2471,7 @@ _08043EEA: ldrb r0, [r0, 0x10] cmp r0, 0x1 bne _08043F40 - bl sub_8083600 + bl GetLeaderEntity adds r4, r0, 0 bl EntityExists lsls r0, 24 @@ -2503,7 +2503,7 @@ _08043F3C: .4byte 0x0000021f _08043F40: cmp r0, 0x2 bne _08043F74 - bl sub_8083600 + bl GetLeaderEntity adds r4, r0, 0 bl EntityExists lsls r0, 24 @@ -2525,7 +2525,7 @@ _08043F70: .4byte gUnknown_80F89D4 _08043F74: cmp r0, 0x3 bne _08043FB6 - bl sub_8083600 + bl GetLeaderEntity adds r4, r0, 0 bl EntityExists lsls r0, 24 @@ -2828,8 +2828,8 @@ _080441B4: .4byte gTeamInventory_203B460 _080441B8: .4byte gRecruitedPokemonRef thumb_func_end sub_8044124 - thumb_func_start sub_80441BC -sub_80441BC: + thumb_func_start IsBossBattle +IsBossBattle: push {lr} ldr r0, _080441D8 ldr r0, [r0] @@ -2851,10 +2851,10 @@ _080441E0: _080441E2: pop {r1} bx r1 - thumb_func_end sub_80441BC + thumb_func_end IsBossBattle - thumb_func_start sub_80441E8 -sub_80441E8: + thumb_func_start IsFixedDungeon +IsFixedDungeon: push {lr} ldr r0, _08044200 ldr r0, [r0] @@ -2874,7 +2874,7 @@ _08044208: _0804420A: pop {r1} bx r1 - thumb_func_end sub_80441E8 + thumb_func_end IsFixedDungeon thumb_func_start sub_8044210 sub_8044210: @@ -2973,13 +2973,13 @@ xxx_dungeon_80442D0: push {r4-r7,lr} lsls r0, 24 lsrs r7, r0, 24 - bl sub_8083600 + bl GetLeaderEntity adds r5, r0, 0 cmp r5, 0 beq _0804431A - bl sub_8069E8C + bl TriggerWeatherAbilities adds r0, r5, 0 - bl sub_8070774 + bl GetMovementSpeed ldr r3, _08044320 ldr r1, _08044324 ldr r1, [r1] @@ -3008,15 +3008,15 @@ _0804431A: movs r0, 0 b _0804444E .align 2, 0 -_08044320: .4byte gUnknown_80F6860 +_08044320: .4byte gSpeedTurns _08044324: .4byte gDungeonGlobalData _08044328: - bl sub_8083600 + bl GetLeaderEntity adds r5, r0, 0 cmp r5, 0 beq _0804431A movs r0, 0 - bl sub_807520C + bl UseAttack lsls r0, 24 cmp r0, 0 bne _0804435C @@ -3062,7 +3062,7 @@ _0804438C: .4byte 0x0000066c _08044390: .4byte 0x00000673 _08044394: adds r0, r5, 0 - bl sub_8074B54 + bl TickStatusHeal _0804439A: bl sub_8044B28 lsls r0, 24 @@ -3188,7 +3188,7 @@ _08044466: cmp r0, 0 bne _080444E2 adds r0, r4, 0 - bl sub_8074B54 + bl TickStatusHeal adds r0, r4, 0 bl EntityExists lsls r0, 24 @@ -3231,7 +3231,7 @@ _080444F0: .4byte 0x00007fff sub_80444F4: push {r4-r6,lr} adds r6, r0, 0 - bl sub_8083600 + bl GetLeaderEntity cmp r6, r0 bne _08044566 ldr r0, _0804456C @@ -3298,7 +3298,7 @@ sub_8044574: mov r5, r8 push {r5-r7} sub sp, 0x44 - bl sub_8083600 + bl GetLeaderEntity mov r10, r0 movs r7, 0 mov r0, sp @@ -3333,13 +3333,13 @@ _08044592: ldr r0, [r1] adds r0, 0xB8 str r5, [r0] - bl sub_8069E8C + bl TriggerWeatherAbilities movs r2, 0xA2 lsls r2, 1 adds r0, r6, r2 strb r4, [r0] adds r0, r5, 0 - bl sub_8070774 + bl GetMovementSpeed mov r3, r9 ldr r1, [r3] movs r2, 0xCC @@ -3386,14 +3386,14 @@ _08044592: .align 2, 0 _08044634: .4byte gDungeonGlobalData _08044638: .4byte 0x0001357c -_0804463C: .4byte gUnknown_80F6860 +_0804463C: .4byte gSpeedTurns _08044640: .4byte 0x0000bfff _08044644: ldr r1, _08044668 add r1, r8 strb r0, [r1] adds r0, r5, 0 - bl sub_8074B54 + bl TickStatusHeal adds r0, r5, 0 bl EntityExists lsls r0, 24 @@ -3631,13 +3631,13 @@ sub_8044820: mov r8, r0 b _080448FC .align 2, 0 -_08044830: .4byte gUnknown_80F6860 +_08044830: .4byte gSpeedTurns _08044834: ldr r4, [r5, 0x70] ldr r0, [r6] adds r0, 0xB8 str r5, [r0] - bl sub_8069E8C + bl TriggerWeatherAbilities ldrh r2, [r4] movs r1, 0x80 lsls r1, 8 @@ -3666,7 +3666,7 @@ _0804486C: adds r0, r4, r2 strb r1, [r0] adds r0, r5, 0 - bl sub_8070774 + bl GetMovementSpeed ldr r1, [r6] movs r2, 0xCC lsls r2, 3 @@ -3698,7 +3698,7 @@ _0804486C: adds r1, r4, r2 strb r0, [r1] adds r0, r5, 0 - bl sub_8074B54 + bl TickStatusHeal adds r0, r5, 0 bl EntityExists lsls r0, 24 @@ -3928,7 +3928,7 @@ _08044A8A: pop {r0} bx r0 .align 2, 0 -_08044A94: .4byte gUnknown_80F6860 +_08044A94: .4byte gSpeedTurns _08044A98: .4byte gDungeonGlobalData _08044A9C: .4byte 0x000037f8 _08044AA0: .4byte 0x000037f9 @@ -3960,7 +3960,7 @@ sub_8044AB4: movs r4, 0 b _08044AE6 .align 2, 0 -_08044ADC: .4byte gUnknown_80F6860 +_08044ADC: .4byte gSpeedTurns _08044AE0: .4byte gDungeonGlobalData _08044AE4: adds r4, 0x1 @@ -3979,7 +3979,7 @@ _08044AE6: cmp r0, 0 beq _08044AE4 movs r0, 0 - bl sub_807520C + bl UseAttack _08044B08: movs r0, 0x1 movs r1, 0 @@ -4004,7 +4004,7 @@ sub_8044B28: ldrb r0, [r0, 0x4] cmp r0, 0 bne _08044B76 - bl sub_8083600 + bl GetLeaderEntity cmp r0, 0 bne _08044B50 ldr r0, [r4] @@ -4705,8 +4705,8 @@ _08045022: bx r0 thumb_func_end sub_8044FF0 - thumb_func_start sub_8045028 -sub_8045028: + thumb_func_start IsNotAttacking +IsNotAttacking: push {r4,lr} adds r2, r0, 0 lsls r1, 24 @@ -4738,7 +4738,7 @@ _0804505C: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8045028 + thumb_func_end IsNotAttacking thumb_func_start sub_8045064 sub_8045064: diff --git a/asm/code_80450F8.s b/asm/code_80450F8.s index e6d0d2f..53a6e20 100644 --- a/asm/code_80450F8.s +++ b/asm/code_80450F8.s @@ -792,7 +792,7 @@ sub_8045708: ldrsh r0, [r1, r2] movs r3, 0x2 ldrsh r1, [r1, r3] - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -800,7 +800,7 @@ sub_8045708: bne _0804579C b _080457C4 .align 2, 0 -_08045744: .4byte gUnknown_810ACC0 +_08045744: .4byte gDungeonWaterType _08045748: .4byte gDungeonGlobalData _0804574C: .4byte 0x00003a0e _08045750: @@ -952,7 +952,7 @@ _0804584C: beq _08045880 adds r1, r4, 0x4 adds r0, r2, 0 - bl sub_8083294 + bl InSameRoom_2 lsls r0, 24 lsrs r0, 24 b _08045882 @@ -1127,7 +1127,7 @@ CanSee: cmp r0, 0x1 bne _080459DE adds r0, r5, 0 - bl sub_8071884 + bl CanSeeInvisible lsls r0, 24 cmp r0, 0 bne _080459D8 @@ -1153,7 +1153,7 @@ _080459E8: _080459EC: adds r0, r5, 0x4 adds r1, r4, 0x4 - bl sub_8083294 + bl InSameRoom_2 lsls r0, 24 lsrs r0, 24 _080459F8: @@ -1162,8 +1162,8 @@ _080459F8: bx r1 thumb_func_end CanSee - thumb_func_start sub_8045A00 -sub_8045A00: + thumb_func_start CanSee_2 +CanSee_2: push {r4,r5,lr} adds r5, r0, 0 adds r4, r1, 0 @@ -1188,7 +1188,7 @@ sub_8045A00: cmp r0, 0x1 bne _08045A4E adds r0, r5, 0 - bl sub_8071884 + bl CanSeeInvisible lsls r0, 24 cmp r0, 0 bne _08045A48 @@ -1214,14 +1214,14 @@ _08045A58: _08045A5C: adds r0, r5, 0x4 adds r1, r4, 0x4 - bl sub_808333C + bl InSameRoom_3 lsls r0, 24 lsrs r0, 24 _08045A68: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_8045A00 + thumb_func_end CanSee_2 thumb_func_start sub_8045A70 sub_8045A70: @@ -1244,7 +1244,7 @@ sub_8045A70: beq _08045AA4 adds r0, r5, 0x4 adds r1, r4, 0x4 - bl sub_8083294 + bl InSameRoom_2 lsls r0, 24 lsrs r0, 24 b _08045AA6 @@ -1260,23 +1260,23 @@ _08045AA6: sub_8045AAC: push {lr} adds r0, 0x4 - bl sub_8083294 + bl InSameRoom_2 lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 thumb_func_end sub_8045AAC - thumb_func_start sub_8045ABC -sub_8045ABC: + thumb_func_start InSameRoom +InSameRoom: push {lr} adds r0, 0x4 - bl sub_808333C + bl InSameRoom_3 lsls r0, 24 lsrs r0, 24 pop {r1} bx r1 - thumb_func_end sub_8045ABC + thumb_func_end InSameRoom thumb_func_start sub_8045ACC sub_8045ACC: @@ -1411,7 +1411,7 @@ _08045BB6: ldr r1, [r4, 0x70] adds r0, r5, 0 adds r2, r6, 0 - bl sub_80708B4 + bl SetMessageArgument_2 b _08045BEC _08045BC2: adds r0, r4, 0 @@ -1690,7 +1690,7 @@ sub_8045DB4: lsls r1, 24 lsrs r1, 24 str r1, [sp, 0xA8] - bl sub_8083600 + bl GetLeaderEntity adds r7, r0, 0 ldr r0, [r7, 0x70] str r0, [sp, 0xAC] @@ -1723,7 +1723,7 @@ _08045DF4: _08045E08: adds r0, r7, 0 movs r1, 0x1 - bl sub_8071518 + bl ShouldAvoidEnemies_2 lsls r0, 24 cmp r0, 0 beq _08045E40 @@ -2115,7 +2115,7 @@ _08046110: ldrsh r0, [r5, r1] movs r2, 0x2 ldrsh r1, [r5, r2] - bl sub_8049590 + bl GetMapEntity str r4, [r0, 0x14] ldrh r1, [r0] movs r0, 0x20 @@ -2201,7 +2201,7 @@ sub_80461C8: ldrsh r0, [r2, r1] movs r3, 0x2 ldrsh r1, [r2, r3] - bl sub_8049590 + bl GetMapEntity adds r6, r0, 0 ldr r5, [r6, 0x14] cmp r5, 0 @@ -3791,7 +3791,7 @@ _08046E1E: bl FillInventoryGaps cmp r6, 0 beq _08046ED4 - bl sub_8083600 + bl GetLeaderEntity adds r4, r0, 0 ldr r0, _08046EE0 bl sub_80855E4 @@ -4404,7 +4404,7 @@ _080472E8: .4byte 0xfffffdc0 _080472EC: .4byte gDungeonGlobalData _080472F0: .4byte 0x00018210 _080472F4: .4byte 0x0001c05e -_080472F8: .4byte gUnknown_80F4448 +_080472F8: .4byte gAdjacentTileOffsets _080472FC: .4byte gUnknown_80F4D64 _08047300: mov r8, r4 @@ -4427,7 +4427,7 @@ _0804731A: ldr r1, [sp, 0x228] ldr r2, [sp, 0x22C] bl sub_804539C - bl sub_804AF74 + bl IsWaterTileset lsls r0, 24 movs r2, 0 cmp r0, 0 @@ -4709,7 +4709,7 @@ _0804752C: b _080475A8 .align 2, 0 _08047564: .4byte gUnknown_80F94F0 -_08047568: .4byte gUnknown_80F4448 +_08047568: .4byte gAdjacentTileOffsets _0804756C: .4byte 0xffff0000 _08047570: .4byte 0x0000ffff _08047574: @@ -4975,7 +4975,7 @@ _08047762: ldr r0, [sp, 0x1C] adds r1, r3, 0 bl sub_8045394 - bl sub_804AF74 + bl IsWaterTileset lsls r0, 24 movs r2, 0 cmp r0, 0 @@ -5383,7 +5383,7 @@ _08047ABC: bl sub_8042390 adds r0, r4, 0 adds r1, r5, 0 - bl sub_806F450 + bl SetShopkeeperAggression _08047AD0: ldrb r1, [r7] movs r0, 0x8 diff --git a/asm/code_8048480.s b/asm/code_8048480.s index 42844ac..42f7632 100644 --- a/asm/code_8048480.s +++ b/asm/code_8048480.s @@ -42,7 +42,7 @@ _08048568: lsls r0, 1 adds r5, r0 ldr r0, [r5] - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0 beq _08048598 mov r0, sp @@ -494,7 +494,7 @@ _080488D8: mov r1, r8 bl sub_80522F4 mov r0, r8 - bl sub_807191C + bl LoadIQSkills adds r0, r5, 0 adds r1, r7, 0 bl sub_806A7E8 @@ -1559,7 +1559,7 @@ _0804929C: lsls r1, 1 adds r0, r3, r1 ldr r0, [r0] - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0 ble _080492AE b _0804948A @@ -1634,7 +1634,7 @@ _0804931C: b _080494E2 _08049320: adds r0, r4, 0 - bl sub_8070A58 + bl HasNegativeStatus lsls r0, 24 movs r6, 0 b _080494BC @@ -1662,7 +1662,7 @@ _08049344: b _080494E0 _0804934A: adds r0, r4, 0 - bl sub_80494EC + bl CanTargetAdjacentPokemon lsls r0, 24 movs r6, 0x64 cmp r0, 0 @@ -1673,14 +1673,14 @@ _0804935A: b _080494E2 _0804935E: adds r0, r4, 0 - bl sub_8071884 + bl CanSeeInvisible lsls r0, 24 cmp r0, 0 beq _0804936C b _080494A2 _0804936C: adds r0, r4, 0 - bl sub_80494EC + bl CanTargetAdjacentPokemon lsls r0, 24 movs r6, 0x5 b _080494BC @@ -1695,7 +1695,7 @@ _08049378: b _080494A2 _08049388: adds r0, r4, 0 - bl sub_80494EC + bl CanTargetAdjacentPokemon lsls r0, 24 movs r6, 0x5 b _080494BC @@ -1708,7 +1708,7 @@ _08049394: b _080494A2 _080493A0: adds r0, r4, 0 - bl sub_80494EC + bl CanTargetAdjacentPokemon lsls r0, 24 movs r6, 0x5 b _080494BC @@ -1726,7 +1726,7 @@ _080493B8: cmp r0, 0x2 beq _080494A2 adds r0, r4, 0 - bl sub_80494EC + bl CanTargetAdjacentPokemon lsls r0, 24 movs r6, 0xF b _080494BC @@ -1747,7 +1747,7 @@ _080493E0: cmp r0, 0x1 beq _080494A2 adds r0, r4, 0 - bl sub_80494EC + bl CanTargetAdjacentPokemon lsls r0, 24 movs r6, 0x5 b _080494BC @@ -1755,7 +1755,7 @@ _080493F6: cmp r2, 0 bne _0804940C adds r0, r4, 0 - bl sub_80494EC + bl CanTargetAdjacentPokemon lsls r0, 24 movs r6, 0x5 cmp r0, 0 @@ -1776,7 +1776,7 @@ _0804940C: bne _08049432 _08049420: adds r0, r4, 0 - bl sub_80494EC + bl CanTargetAdjacentPokemon lsls r0, 24 movs r6, 0x32 cmp r0, 0 @@ -1797,7 +1797,7 @@ _08049436: cmp r0, 0x3 beq _080494A2 adds r0, r4, 0 - bl sub_80494EC + bl CanTargetAdjacentPokemon lsls r0, 24 movs r6, 0x5 b _080494BC @@ -1829,7 +1829,7 @@ _0804947A: lsls r1, 1 adds r0, r3, r1 ldr r0, [r0] - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0 ble _080494E0 _0804948A: @@ -1852,13 +1852,13 @@ _080494A2: b _080494E4 _080494A6: adds r0, r4, 0 - bl sub_80494EC + bl CanTargetAdjacentPokemon lsls r0, 24 movs r6, 0x5 b _080494BC _080494B2: adds r0, r4, 0 - bl sub_80494EC + bl CanTargetAdjacentPokemon lsls r0, 24 movs r6, 0x1E _080494BC: @@ -1870,7 +1870,7 @@ _080494C2: lsls r2, 1 adds r0, r3, r2 ldr r0, [r0] - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0x9 bgt _080494E0 movs r0, 0x64 @@ -1893,8 +1893,8 @@ _080494E4: bx r1 thumb_func_end EvaluateItem - thumb_func_start sub_80494EC -sub_80494EC: + thumb_func_start CanTargetAdjacentPokemon +CanTargetAdjacentPokemon: push {r4-r6,lr} adds r5, r0, 0 movs r6, 0 @@ -1924,7 +1924,7 @@ _080494F2: adds r1, r4, 0 movs r2, 0 movs r3, 0x1 - bl sub_8071598 + bl CanTarget lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1932,7 +1932,7 @@ _080494F2: movs r0, 0x1 b _08049544 .align 2, 0 -_08049538: .4byte gUnknown_80F4448 +_08049538: .4byte gAdjacentTileOffsets _0804953C: adds r6, 0x1 cmp r6, 0x7 @@ -1942,7 +1942,7 @@ _08049544: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_80494EC + thumb_func_end CanTargetAdjacentPokemon thumb_func_start GetMapTileAtPosition GetMapTileAtPosition: @@ -1982,8 +1982,8 @@ _08049588: _0804958C: .4byte gUnknown_203B430 thumb_func_end GetMapTileAtPosition - thumb_func_start sub_8049590 -sub_8049590: + thumb_func_start GetMapEntity +GetMapEntity: push {r4,r5,lr} adds r2, r0, 0 adds r3, r1, 0 @@ -2027,7 +2027,7 @@ _080495D6: .align 2, 0 _080495DC: .4byte gDungeonGlobalData _080495E0: .4byte 0x0000e8c0 - thumb_func_end sub_8049590 + thumb_func_end GetMapEntity thumb_func_start sub_80495E4 sub_80495E4: @@ -2270,7 +2270,7 @@ _080497FC: .4byte gDungeonFileArchive _08049800: .4byte gUnknown_202F18C _08049804: .4byte gUnknown_202EE8C _08049808: .4byte gUnknown_202F314 -_0804980C: .4byte gUnknown_810ACC0 +_0804980C: .4byte gDungeonWaterType _08049810: strb r6, [r2, 0x4] strb r3, [r2, 0x5] @@ -2404,7 +2404,7 @@ _080498D0: bgt _0804991C mov r0, r10 mov r1, r9 - bl sub_8049590 + bl GetMapEntity ldr r2, [r4] mov r3, r9 lsls r1, r3, 1 @@ -2418,7 +2418,7 @@ _08049918: .4byte 0x00003a0e _0804991C: mov r0, r10 mov r1, r9 - bl sub_8049590 + bl GetMapEntity movs r1, 0 b _08049B70 _08049928: @@ -2723,7 +2723,7 @@ _08049B3C: bne _08049B4A movs r4, 0 _08049B4A: - bl sub_80441BC + bl IsBossBattle lsls r0, 24 cmp r0, 0 beq _08049B56 @@ -2731,7 +2731,7 @@ _08049B4A: _08049B56: mov r0, r10 mov r1, r9 - bl sub_8049590 + bl GetMapEntity ldr r1, _08049B84 ldr r2, [r1] lsls r1, r7, 1 @@ -3177,22 +3177,22 @@ _08049E84: _08049E94: mov r0, r10 ldr r1, [sp, 0x40] - bl sub_8049590 + bl GetMapEntity ldr r1, [sp] strb r1, [r0, 0xA] mov r0, r10 ldr r1, [sp, 0x40] - bl sub_8049590 + bl GetMapEntity ldr r1, [sp, 0x4] strb r1, [r0, 0xB] mov r0, r10 ldr r1, [sp, 0x40] - bl sub_8049590 + bl GetMapEntity ldr r1, [sp, 0x8] strb r1, [r0, 0xC] mov r0, r10 ldr r1, [sp, 0x40] - bl sub_8049590 + bl GetMapEntity ldr r1, [sp, 0xC] strb r1, [r0, 0xD] add sp, 0x44 @@ -4312,7 +4312,7 @@ sub_804A728: ldr r6, _0804A814 ldr r0, [r6] mov r8, r0 - bl sub_8083600 + bl GetLeaderEntity str r0, [sp, 0x24] ldr r0, _0804A818 add r0, r8 @@ -4418,7 +4418,7 @@ _0804A7AC: _0804A814: .4byte gDungeonGlobalData _0804A818: .4byte 0x000181f0 _0804A81C: .4byte 0x0001821a -_0804A820: .4byte gUnknown_80F4448 +_0804A820: .4byte gAdjacentTileOffsets _0804A824: .4byte gUnknown_80F6A4A _0804A828: .4byte gUnknown_80F6C06 _0804A82C: .4byte 0x000181f2 @@ -4764,7 +4764,7 @@ _0804AAB2: _0804AAB6: adds r0, r4, 0 adds r1, r5, 0 - bl sub_8049590 + bl GetMapEntity strh r7, [r0, 0x4] adds r4, 0x1 cmp r4, 0x37 @@ -5028,7 +5028,7 @@ _0804ACA8: _0804ACB0: adds r0, r4, 0 adds r1, r5, 0 - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0, 0x4] movs r1, 0x3 orrs r1, r2 @@ -5114,7 +5114,7 @@ sub_804AD34: ldrsh r0, [r6, r1] movs r2, 0x2 ldrsh r1, [r6, r2] - bl sub_8049590 + bl GetMapEntity adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x3 @@ -5219,7 +5219,7 @@ sub_804AE08: ldrsh r0, [r7, r1] movs r2, 0x2 ldrsh r1, [r7, r2] - bl sub_8049590 + bl GetMapEntity adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x3 @@ -5281,7 +5281,7 @@ sub_804AE84: ldrsh r0, [r5, r1] movs r2, 0x2 ldrsh r1, [r5, r2] - bl sub_8049590 + bl GetMapEntity adds r2, r0, 0 ldrh r1, [r2, 0x4] movs r0, 0x10 @@ -5351,12 +5351,12 @@ _0804AF18: .4byte gDungeonGlobalData _0804AF1C: .4byte 0x000135cc thumb_func_end sub_804AE84 - thumb_func_start sub_804AF20 -sub_804AF20: + thumb_func_start IsTileWater +IsTileWater: push {r4,r5,lr} adds r4, r0, 0 movs r5, 0 - bl sub_804AF74 + bl IsWaterTileset lsls r0, 24 cmp r0, 0 beq _0804AF3C @@ -5391,13 +5391,13 @@ _0804AF5E: pop {r1} bx r1 .align 2, 0 -_0804AF68: .4byte gUnknown_810ACC0 +_0804AF68: .4byte gDungeonWaterType _0804AF6C: .4byte gDungeonGlobalData _0804AF70: .4byte 0x00003a0e - thumb_func_end sub_804AF20 + thumb_func_end IsTileWater - thumb_func_start sub_804AF74 -sub_804AF74: + thumb_func_start IsWaterTileset +IsWaterTileset: push {lr} ldr r0, _0804AF9C ldr r0, [r0] @@ -5426,7 +5426,7 @@ _0804AFA4: _0804AFA6: pop {r1} bx r1 - thumb_func_end sub_804AF74 + thumb_func_end IsWaterTileset thumb_func_start sub_804AFAC sub_804AFAC: @@ -5598,7 +5598,7 @@ _0804B0FC: .4byte gUnknown_202F1AA _0804B100: .4byte gUnknown_202F1AB _0804B104: .4byte gUnknown_202F1AC _0804B108: .4byte gUnknown_202F1A8 -_0804B10C: .4byte gUnknown_810ACC0 +_0804B10C: .4byte gDungeonWaterType _0804B110: .4byte 0x00003a0e _0804B114: .4byte gUnknown_202F1B4 _0804B118: .4byte gUnknown_202F1AE @@ -6102,7 +6102,7 @@ _0804B55A: adds r0, r5, 0 adds r1, r4, 0 str r3, [sp, 0xC] - bl sub_8049590 + bl GetMapEntity adds r2, r0, 0 ldrh r0, [r2] ldr r6, _0804B630 @@ -6619,7 +6619,7 @@ _0804B962: ldr r2, _0804B9F0 add r2, sp str r3, [r2] - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] mov r2, r9 ands r1, r2 @@ -6628,7 +6628,7 @@ _0804B962: strh r1, [r0] adds r0, r4, 0 adds r1, r5, 0 - bl sub_8049590 + bl GetMapEntity ldr r1, _0804B9D0 add r1, sp ldrb r1, [r1] @@ -6717,7 +6717,7 @@ _0804B9F4: strh r0, [r7, 0x6] adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] ldr r3, _0804BBF8 adds r2, r3, 0 @@ -6727,7 +6727,7 @@ _0804B9F4: strh r1, [r0] adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity movs r1, 0xFF strb r1, [r0, 0x9] _0804BA72: @@ -7228,7 +7228,7 @@ _0804BE84: ldr r2, _0804BEFC add r2, sp str r3, [r2] - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] mov r2, r8 ands r1, r2 @@ -7237,7 +7237,7 @@ _0804BE84: strh r1, [r0] adds r0, r4, 0 adds r1, r5, 0 - bl sub_8049590 + bl GetMapEntity ldr r1, _0804BEE0 add r1, sp ldrb r1, [r1] @@ -7325,7 +7325,7 @@ _0804BF00: strh r0, [r7, 0x6] adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] ldr r6, _0804C090 adds r2, r6, 0 @@ -7335,7 +7335,7 @@ _0804BF00: strh r1, [r0] adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity movs r1, 0xFF strb r1, [r0, 0x9] _0804BF88: @@ -7986,7 +7986,7 @@ _0804C4C2: _0804C4CE: adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] ands r1, r7 movs r2, 0x1 @@ -8587,7 +8587,7 @@ _0804C95C: _0804C972: adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] mov r2, r8 ands r1, r2 @@ -8596,7 +8596,7 @@ _0804C972: strh r1, [r0] adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity mov r1, r9 strb r1, [r0, 0x9] adds r4, 0x1 @@ -8796,7 +8796,7 @@ _0804CB0C: lsls r2, 5 add r2, sp str r3, [r2] - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] mov r2, r8 ands r1, r2 @@ -8805,7 +8805,7 @@ _0804CB0C: strh r1, [r0] adds r0, r4, 0 adds r1, r5, 0 - bl sub_8049590 + bl GetMapEntity movs r1, 0xE5 lsls r1, 5 add r1, sp @@ -9019,7 +9019,7 @@ _0804CCC0: adds r4, r0, r1 b _0804CCF0 .align 2, 0 -_0804CCE0: .4byte gUnknown_80F4448 +_0804CCE0: .4byte gAdjacentTileOffsets _0804CCE4: movs r1, 0 ldrsh r0, [r4, r1] @@ -9040,7 +9040,7 @@ _0804CCF0: adds r4, r0, r1 b _0804CD18 .align 2, 0 -_0804CD08: .4byte gUnknown_80F4448 +_0804CD08: .4byte gAdjacentTileOffsets _0804CD0C: movs r1, 0 ldrsh r0, [r4, r1] @@ -9150,7 +9150,7 @@ _0804CDC8: str r0, [sp, 0x10] b _0804CFD4 .align 2, 0 -_0804CDD4: .4byte gUnknown_80F4448 +_0804CDD4: .4byte gAdjacentTileOffsets _0804CDD8: adds r0, r7, 0 adds r1, r6, 0 @@ -9294,7 +9294,7 @@ _0804CEFA: beq _0804CF16 adds r0, r7, 0 adds r1, r6, 0 - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] ldr r3, _0804D018 adds r2, r3, 0 @@ -9434,7 +9434,7 @@ _0804D006: bx r0 .align 2, 0 _0804D018: .4byte 0x0000fffc -_0804D01C: .4byte gUnknown_80F4448 +_0804D01C: .4byte gAdjacentTileOffsets _0804D020: .4byte gUnknown_202F1AE thumb_func_end sub_804CBEC @@ -9967,7 +9967,7 @@ _0804D3E0: adds r0, r4, 0 adds r1, r5, 0 str r3, [sp, 0x34] - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] mov r2, r9 ands r1, r2 @@ -9976,7 +9976,7 @@ _0804D3E0: strh r1, [r0] adds r0, r4, 0 adds r1, r5, 0 - bl sub_8049590 + bl GetMapEntity mov r1, sp ldrb r1, [r1, 0x10] strb r1, [r0, 0x9] @@ -10103,7 +10103,7 @@ _0804D4BA: strh r0, [r7, 0x6] adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] ldr r3, _0804D530 adds r2, r3, 0 @@ -10113,7 +10113,7 @@ _0804D4BA: strh r1, [r0] adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity movs r1, 0xFE strb r1, [r0, 0x9] _0804D508: @@ -11238,7 +11238,7 @@ _0804DCF0: adds r0, r5, 0 adds r1, r4, 0 str r3, [sp, 0x54] - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] ldr r3, [sp, 0x54] ands r1, r3 @@ -11368,7 +11368,7 @@ _0804DDE0: adds r0, r5, 0 adds r1, r4, 0 str r3, [sp, 0x54] - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] ldr r3, [sp, 0x54] ands r1, r3 @@ -11499,7 +11499,7 @@ _0804DED0: adds r0, r5, 0 adds r1, r4, 0 str r3, [sp, 0x54] - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] ldr r3, [sp, 0x54] ands r1, r3 @@ -11618,7 +11618,7 @@ _0804DFB6: adds r0, r5, 0 adds r1, r4, 0 str r3, [sp, 0x54] - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] mov r2, r9 ands r1, r2 @@ -11966,7 +11966,7 @@ _0804E222: negs r4, r4 b _0804E22E .align 2, 0 -_0804E228: .4byte gUnknown_80F4448 +_0804E228: .4byte gAdjacentTileOffsets _0804E22C: adds r4, 0x1 _0804E22E: @@ -12040,7 +12040,7 @@ _0804E2AA: bne _0804E2F0 adds r0, r7, 0 mov r1, r8 - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0] ldr r4, _0804E2CC adds r1, r4, 0 @@ -12049,7 +12049,7 @@ _0804E2AA: b _0804E2F0 .align 2, 0 _0804E2C4: .4byte gUnknown_80F6DD5 -_0804E2C8: .4byte gUnknown_80F4448 +_0804E2C8: .4byte gAdjacentTileOffsets _0804E2CC: .4byte 0x0000fffc _0804E2D0: adds r7, r3 @@ -12146,7 +12146,7 @@ _0804E360: beq _0804E390 adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0] ldr r3, _0804E38C adds r1, r3, 0 @@ -12196,7 +12196,7 @@ _0804E3BC: beq _0804E3EC adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0] ldr r3, _0804E3E8 adds r1, r3, 0 @@ -12252,7 +12252,7 @@ _0804E420: beq _0804E450 adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0] ldr r3, _0804E44C adds r1, r3, 0 @@ -12306,7 +12306,7 @@ _0804E482: beq _0804E4B0 adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0] ldr r3, _0804E4AC adds r1, r3, 0 @@ -12353,7 +12353,7 @@ _0804E4D0: beq _0804E508 adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0] ldr r3, _0804E504 adds r1, r3, 0 @@ -12402,7 +12402,7 @@ _0804E52C: beq _0804E564 adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0] ldr r3, _0804E560 adds r1, r3, 0 @@ -12802,7 +12802,7 @@ _0804E848: ldrsh r0, [r6, r1] movs r2, 0x2 ldrsh r1, [r6, r2] - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] ldr r3, _0804E99C adds r2, r3, 0 @@ -12917,7 +12917,7 @@ _0804E908: _0804E926: adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0] ldr r3, _0804E99C adds r1, r3, 0 @@ -13051,7 +13051,7 @@ _0804EA0E: ble _0804EA4E subs r0, r5, 0x1 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity adds r2, r0, 0 ldrb r0, [r2, 0x9] cmp r0, 0xFF @@ -13076,7 +13076,7 @@ _0804EA4E: ble _0804EA82 subs r1, r4, 0x1 adds r0, r5, 0 - bl sub_8049590 + bl GetMapEntity adds r2, r0, 0 ldrb r0, [r2, 0x9] cmp r0, 0xFF @@ -13103,7 +13103,7 @@ _0804EA82: bgt _0804EABA adds r0, r5, 0 adds r1, r6, 0 - bl sub_8049590 + bl GetMapEntity adds r2, r0, 0 ldrb r0, [r2, 0x9] cmp r0, 0xFF @@ -13130,7 +13130,7 @@ _0804EABA: bgt _0804EB0E mov r0, r10 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity adds r2, r0, 0 ldrb r0, [r2, 0x9] cmp r0, 0xFF @@ -13163,7 +13163,7 @@ _0804EAF4: bne _0804EB0E adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity movs r1, 0xFF strb r1, [r0, 0x9] _0804EB0E: @@ -13522,7 +13522,7 @@ _0804ED98: adds r0, r5, 0 adds r1, r4, 0 str r3, [sp, 0x50] - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0] movs r1, 0x20 orrs r1, r2 @@ -13608,7 +13608,7 @@ _0804EE18: _0804EE38: adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0, 0x4] movs r1, 0x10 orrs r1, r2 @@ -13889,7 +13889,7 @@ _0804F046: _0804F05A: adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0] movs r1, 0x40 orrs r1, r2 @@ -14394,7 +14394,7 @@ _0804F40A: beq _0804F438 subs r0, r6, 0x1 adds r1, r5, 0 - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] ands r1, r7 movs r2, 0x2 @@ -14405,7 +14405,7 @@ _0804F434: .4byte 0x0000fffc _0804F438: subs r0, r6, 0x1 adds r1, r5, 0 - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] ands r1, r7 _0804F444: @@ -14480,7 +14480,7 @@ _0804F4BA: movs r7, 0 adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity mov r1, r9 mov r3, r8 lsrs r2, r3, 24 @@ -14563,7 +14563,7 @@ _0804F550: _0804F55A: adds r0, r5, 0x1 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity mov r1, r9 mov r3, r8 lsrs r2, r3, 24 @@ -14573,7 +14573,7 @@ _0804F55A: _0804F570: subs r1, r4, 0x1 adds r0, r5, 0 - bl sub_8049590 + bl GetMapEntity mov r1, r9 mov r3, r8 lsrs r2, r3, 24 @@ -14583,7 +14583,7 @@ _0804F570: _0804F586: subs r0, r5, 0x1 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity mov r1, r9 mov r3, r8 lsrs r2, r3, 24 @@ -14593,7 +14593,7 @@ _0804F586: _0804F59C: adds r1, r4, 0x1 adds r0, r5, 0 - bl sub_8049590 + bl GetMapEntity mov r1, r9 mov r3, r8 lsrs r2, r3, 24 @@ -14643,7 +14643,7 @@ _0804F5E2: _0804F5F0: adds r0, r6, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0, 0x4] movs r1, 0x20 orrs r1, r2 @@ -14823,7 +14823,7 @@ _0804F730: _0804F73C: mov r0, r8 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity movs r1, 0 bl sub_804F5C4 adds r4, 0x1 @@ -14848,7 +14848,7 @@ _0804F75E: _0804F76C: adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0] movs r1, 0x80 orrs r1, r2 @@ -14905,7 +14905,7 @@ _0804F7C8: _0804F7D4: adds r0, r4, 0 mov r1, r8 - bl sub_8049590 + bl GetMapEntity movs r1, 0 bl sub_804F5C4 adds r4, 0x1 @@ -14930,7 +14930,7 @@ _0804F7F6: _0804F804: adds r0, r4, 0 adds r1, r5, 0 - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0] movs r1, 0x80 orrs r1, r2 @@ -14991,7 +14991,7 @@ _0804F864: mov r10, r0 adds r0, r5, 0 mov r1, r10 - bl sub_8049590 + bl GetMapEntity movs r1, 0x4 bl sub_804F5C4 ldr r1, [sp] @@ -14999,12 +14999,12 @@ _0804F864: mov r9, r1 mov r0, r9 mov r1, r10 - bl sub_8049590 + bl GetMapEntity movs r1, 0x4 bl sub_804F5C4 ldr r0, [sp] mov r1, r10 - bl sub_8049590 + bl GetMapEntity movs r1, 0x4 bl sub_804F5C4 ldr r2, [sp] @@ -15012,118 +15012,118 @@ _0804F864: mov r8, r2 mov r0, r8 mov r1, r10 - bl sub_8049590 + bl GetMapEntity movs r1, 0x4 bl sub_804F5C4 ldr r6, [sp, 0x4] subs r6, 0x1 adds r0, r5, 0 adds r1, r6, 0 - bl sub_8049590 + bl GetMapEntity movs r1, 0x4 bl sub_804F5C4 adds r0, r5, 0 ldr r1, [sp, 0x4] - bl sub_8049590 + bl GetMapEntity movs r1, 0x4 bl sub_804F5C4 ldr r4, [sp, 0x4] adds r4, 0x1 adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity movs r1, 0x4 bl sub_804F5C4 adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity movs r1, 0x4 bl sub_804F5C4 mov r0, r9 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity movs r1, 0x4 bl sub_804F5C4 ldr r0, [sp] adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity movs r1, 0x4 bl sub_804F5C4 mov r0, r8 mov r1, r10 - bl sub_8049590 + bl GetMapEntity movs r1, 0x4 bl sub_804F5C4 mov r0, r8 adds r1, r6, 0 - bl sub_8049590 + bl GetMapEntity movs r1, 0x4 bl sub_804F5C4 mov r0, r8 ldr r1, [sp, 0x4] - bl sub_8049590 + bl GetMapEntity movs r1, 0x4 bl sub_804F5C4 mov r0, r8 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity movs r1, 0x4 bl sub_804F5C4 mov r0, r9 adds r1, r6, 0 - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0, 0x4] movs r1, 0x4 orrs r1, r2 strh r1, [r0, 0x4] mov r0, r9 adds r1, r6, 0 - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0, 0x4] movs r2, 0x40 orrs r1, r2 strh r1, [r0, 0x4] ldr r0, [sp] adds r1, r6, 0 - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0, 0x4] movs r4, 0x2 orrs r1, r4 strh r1, [r0, 0x4] mov r0, r9 ldr r1, [sp, 0x4] - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0, 0x4] orrs r1, r4 strh r1, [r0, 0x4] ldr r0, [sp] ldr r1, [sp, 0x4] - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0, 0x4] orrs r1, r4 strh r1, [r0, 0x4] mov r0, r9 adds r1, r6, 0 - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0, 0x4] movs r4, 0x10 orrs r1, r4 strh r1, [r0, 0x4] ldr r0, [sp] adds r1, r6, 0 - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0, 0x4] orrs r1, r4 strh r1, [r0, 0x4] mov r0, r9 ldr r1, [sp, 0x4] - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0, 0x4] orrs r1, r4 strh r1, [r0, 0x4] ldr r0, [sp] ldr r1, [sp, 0x4] - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0, 0x4] orrs r4, r1 strh r4, [r0, 0x4] @@ -15212,7 +15212,7 @@ _0804FA6C: _0804FA76: adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity movs r1, 0 bl sub_804F5C4 adds r4, 0x1 @@ -15284,7 +15284,7 @@ _0804FAD4: movs r4, 0x2 ldrsh r1, [r7, r4] adds r1, r2 - bl sub_8049590 + bl GetMapEntity movs r1, 0 bl sub_804F5C4 _0804FB14: @@ -15340,28 +15340,28 @@ _0804FB54: ble _0804FBAE adds r0, r5, 0x1 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity movs r1, 0 bl sub_804F5C4 adds r1, r4, 0x1 adds r0, r5, 0 - bl sub_8049590 + bl GetMapEntity movs r1, 0 bl sub_804F5C4 subs r0, r5, 0x1 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity movs r1, 0 bl sub_804F5C4 subs r1, r4, 0x1 adds r0, r5, 0 - bl sub_8049590 + bl GetMapEntity movs r1, 0 bl sub_804F5C4 _0804FBAE: adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity movs r1, 0 bl sub_804F5C4 b _0804FBD2 @@ -15402,7 +15402,7 @@ _0804FBF4: _0804FBFA: adds r0, r6, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x3 @@ -15490,7 +15490,7 @@ _0804FC8A: bne _0804FCAE adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] ands r1, r7 mov r2, r8 @@ -15533,7 +15533,7 @@ _0804FCD8: beq _0804FCF8 adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] ands r1, r7 strh r1, [r0] @@ -15583,7 +15583,7 @@ _0804FD3A: _0804FD3E: adds r0, r6, 0 adds r1, r7, 0 - bl sub_8049590 + bl GetMapEntity bl sub_804FD10 subs r3, r7, 0x1 cmp r6, 0 @@ -15721,7 +15721,7 @@ _0804FE20: _0804FE24: adds r0, r6, 0 adds r1, r7, 0 - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0] movs r1, 0x10 orrs r1, r2 @@ -15936,7 +15936,7 @@ _0804FFAA: adds r4, r1, r0 ldrb r0, [r4] ldrb r1, [r4, 0x1] - bl sub_8049590 + bl GetMapEntity adds r5, r0, 0 ldrh r1, [r5, 0x4] movs r0, 0x1 @@ -15967,7 +15967,7 @@ _08050002: _08050004: adds r0, r6, 0 adds r1, r5, 0 - bl sub_8049590 + bl GetMapEntity adds r1, r0, 0 ldrh r2, [r1] movs r0, 0x3 @@ -16075,7 +16075,7 @@ _080500BC: _080500D8: ldrb r0, [r4] ldrb r1, [r4, 0x1] - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0, 0x4] movs r1, 0x2 orrs r1, r2 @@ -16150,7 +16150,7 @@ _08050128: _0805016C: ldrb r0, [r4] ldrb r1, [r4, 0x1] - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0, 0x4] movs r1, 0x2 orrs r1, r2 @@ -16262,7 +16262,7 @@ _0805024C: .4byte 0x00003a0c _08050250: .4byte gUnknown_80F4DA0 _08050254: ldrb r1, [r7, 0x1] - bl sub_8049590 + bl GetMapEntity adds r4, r0, 0 movs r0, 0x2 bl DungeonRandomCapped @@ -16379,7 +16379,7 @@ _08050318: _08050334: ldrb r0, [r4] ldrb r1, [r4, 0x1] - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0, 0x4] movs r1, 0x4 orrs r1, r2 @@ -16644,7 +16644,7 @@ _0805051C: _0805053C: ldrb r0, [r4] ldrb r1, [r4, 0x1] - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0, 0x4] movs r1, 0x8 orrs r1, r2 @@ -16799,7 +16799,7 @@ _0805064E: _0805066A: ldrb r0, [r4] ldrb r1, [r4, 0x1] - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0, 0x4] movs r1, 0x8 orrs r1, r2 @@ -16967,7 +16967,7 @@ _080507A8: bne _080507B8 mov r0, r9 mov r1, r10 - bl sub_8049590 + bl GetMapEntity bl sub_80506BC _080507B8: ldr r2, [sp, 0x68] @@ -17108,7 +17108,7 @@ _080508CC: cmp r1, 0 bne _080508DA adds r1, r5, 0 - bl sub_8049590 + bl GetMapEntity bl sub_80506BC _080508DA: ldr r1, [sp, 0x7C] @@ -17276,7 +17276,7 @@ _08050A0A: bne _08050A1A ldr r0, [sp, 0x90] ldr r1, [sp, 0x94] - bl sub_8049590 + bl GetMapEntity bl sub_80506BC _08050A1A: adds r5, 0x1 @@ -17480,7 +17480,7 @@ _08050B7C: subs r0, r7, 0x5 adds r1, r6, 0 str r2, [sp, 0x9C] - bl sub_8049590 + bl GetMapEntity bl sub_80506BC ldr r2, [sp, 0x9C] _08050B92: @@ -17513,7 +17513,7 @@ _08050BB8: _08050BC0: mov r0, r9 mov r1, r10 - bl sub_8049590 + bl GetMapEntity adds r2, r0, 0 ldrh r3, [r2] movs r0, 0x3 @@ -17607,7 +17607,7 @@ _08050C5C: _08050C68: adds r0, r7, 0 adds r1, r6, 0 - bl sub_8049590 + bl GetMapEntity adds r2, r0, 0 ldrh r0, [r2] movs r3, 0x3 @@ -17965,7 +17965,7 @@ _08050F00: _08050F08: adds r0, r7, 0 adds r1, r6, 0 - bl sub_8049590 + bl GetMapEntity adds r2, r0, 0 ldrb r1, [r4] movs r0, 0x87 @@ -18204,7 +18204,7 @@ _080510D6: adds r0, r5, 0 adds r1, r4, 0 str r3, [sp, 0x38] - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] mov r2, r9 ands r1, r2 @@ -18213,7 +18213,7 @@ _080510D6: strh r1, [r0] adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity mov r1, sp ldrb r1, [r1, 0x10] strb r1, [r0, 0x9] @@ -18299,7 +18299,7 @@ _08051162: strh r0, [r6, 0x6] adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] ldr r3, _080511EC adds r2, r3, 0 @@ -18309,7 +18309,7 @@ _08051162: strh r1, [r0] adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity movs r1, 0xFF strb r1, [r0, 0x9] ldr r4, [sp, 0x14] @@ -18493,7 +18493,7 @@ _080512EE: lsrs r4, 24 adds r0, r5, 0 adds r1, r6, 0 - bl sub_8049590 + bl GetMapEntity movs r1, 0x1 str r1, [sp] adds r1, r4, 0 @@ -18541,7 +18541,7 @@ _08051338: _08051350: adds r0, r5, 0 adds r1, r6, 0 - bl sub_8049590 + bl GetMapEntity adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x10 @@ -18590,7 +18590,7 @@ _080513B8: _080513BC: adds r0, r5, 0 adds r1, r6, 0 - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0] movs r1, 0x10 orrs r1, r2 @@ -18618,7 +18618,7 @@ _080513EC: _080513F0: adds r0, r5, 0 adds r1, r6, 0 - bl sub_8049590 + bl GetMapEntity adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x3 @@ -18753,7 +18753,7 @@ _080514EE: lsrs r5, 24 adds r0, r7, 0 mov r1, r8 - bl sub_8049590 + bl GetMapEntity adds r6, r0, 0 ldr r1, [sp, 0x4] ldr r2, _080515D0 @@ -18877,7 +18877,7 @@ _080515F6: lsrs r4, 24 adds r0, r7, 0 mov r1, r8 - bl sub_8049590 + bl GetMapEntity adds r5, r0, 0 ldrb r6, [r5, 0x9] movs r0, 0x1 @@ -18984,7 +18984,7 @@ _080516CA: ldr r0, [r5] adds r1, r4, 0 str r2, [sp, 0xC] - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] ldr r2, [sp, 0xC] ands r1, r2 @@ -19017,7 +19017,7 @@ _0805170A: ldr r0, [r5, 0x8] adds r1, r4, 0 str r2, [sp, 0xC] - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] ldr r2, [sp, 0xC] ands r1, r2 @@ -19063,7 +19063,7 @@ _08051762: ldr r1, [r5, 0x4] adds r0, r4, 0 str r2, [sp, 0xC] - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] ldr r2, [sp, 0xC] ands r1, r2 @@ -19096,7 +19096,7 @@ _080517A2: ldr r1, [r5, 0xC] adds r0, r4, 0 str r2, [sp, 0xC] - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] ldr r2, [sp, 0xC] ands r1, r2 @@ -19136,7 +19136,7 @@ _080517EC: adds r0, r7, 0 adds r1, r5, 0 str r3, [sp, 0x10] - bl sub_8049590 + bl GetMapEntity adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x20 @@ -19200,7 +19200,7 @@ _08051864: adds r0, r7, 0 adds r1, r5, 0 str r3, [sp, 0x10] - bl sub_8049590 + bl GetMapEntity adds r6, r0, 0 ldrh r1, [r6] movs r0, 0x20 @@ -19276,7 +19276,7 @@ sub_80518F0: _080518F8: adds r0, r5, 0 movs r1, 0x1 - bl sub_8049590 + bl GetMapEntity adds r4, r0, 0 bl sub_804FD10 cmp r5, 0 @@ -19290,7 +19290,7 @@ _0805190E: _08051914: adds r0, r5, 0 movs r1, 0x1E - bl sub_8049590 + bl GetMapEntity adds r4, r0, 0 bl sub_804FD10 cmp r5, 0 @@ -19444,7 +19444,7 @@ sub_8051A24: mov r8, r3 adds r0, r4, 0 adds r1, r5, 0 - bl sub_8049590 + bl GetMapEntity adds r7, r0, 0 lsls r4, 16 lsls r5, 16 @@ -19897,7 +19897,7 @@ _08051E42: _08051E46: adds r0, r4, 0 adds r1, r5, 0 - bl sub_8049590 + bl GetMapEntity adds r2, r0, 0 ldrb r0, [r2, 0xE] cmp r0, 0xF @@ -19937,7 +19937,7 @@ sub_8051E7C: movs r3, 0x6 ldrsh r1, [r2, r3] subs r1, 0x1 - bl sub_8049590 + bl GetMapEntity str r0, [sp, 0x8] ldrh r1, [r0] movs r0, 0x80 @@ -20037,7 +20037,7 @@ _08051F10: bge _08051FCA adds r0, r5, 0 adds r1, r6, 0 - bl sub_8049590 + bl GetMapEntity adds r4, r0, 0 ldrh r0, [r4] movs r3, 0x80 diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s index 7cc0940..c7987d1 100644 --- a/asm/code_80521D0.s +++ b/asm/code_80521D0.s @@ -1272,7 +1272,7 @@ sub_8052DC0: thumb_func_start sub_8052DD0 sub_8052DD0: push {r4-r6,lr} - bl sub_8083600 + bl GetLeaderEntity adds r5, r0, 0 ldr r6, _08052E68 ldr r4, [r6] @@ -2505,7 +2505,7 @@ _080537B0: .4byte gUnknown_80FCD28 _080537B4: adds r0, r7, 0 mov r1, r8 - bl sub_8071A1C + bl GetMoveType_2 lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 @@ -2541,7 +2541,7 @@ _080537F8: adds r1, r7, 0 movs r2, 0x1 movs r3, 0 - bl sub_8071598 + bl CanTarget lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -2590,7 +2590,7 @@ _08053854: _08053864: adds r0, r5, 0 movs r1, 0 - bl sub_8070D04 + bl CannotAttack lsls r0, 24 cmp r0, 0 beq _08053874 @@ -2599,7 +2599,7 @@ _08053874: adds r0, r7, 0 mov r1, r8 movs r2, 0 - bl sub_807CD64 + bl GetTargetingFlags movs r1, 0xF0 ands r1, r0 cmp r1, 0 @@ -2611,7 +2611,7 @@ _08053888: lsls r2, 1 adds r0, r1, r2 ldr r0, [r0] - bl sub_8094450 + bl GetBellyRoundedUp ldr r1, _080538C4 movs r3, 0 ldrsh r1, [r1, r3] @@ -2630,7 +2630,7 @@ _080538AE: adds r0, 0x46 ldrb r4, [r0] mov r10, r4 - bl sub_80441BC + bl IsBossBattle lsls r0, 24 cmp r0, 0 beq _080538CC @@ -2749,7 +2749,7 @@ _0805397C: bl sub_80522F4 b _080539D0 .align 2, 0 -_080539B4: .4byte gUnknown_80F4448 +_080539B4: .4byte gAdjacentTileOffsets _080539B8: .4byte gUnknown_80F5006 _080539BC: .4byte 0x00000163 _080539C0: .4byte gUnknown_80FDDA8 @@ -2897,7 +2897,7 @@ _08053AE8: adds r0, r7, 0 mov r1, r8 movs r2, 0 - bl sub_807CD64 + bl GetTargetingFlags lsls r0, 16 asrs r1, r0, 16 ldr r0, _08053C88 @@ -2958,7 +2958,7 @@ _08053B5C: adds r0, r7, 0 mov r1, r8 movs r2, 0 - bl sub_807CD64 + bl GetTargetingFlags lsls r0, 16 movs r1, 0xF0 lsls r1, 12 @@ -3109,7 +3109,7 @@ _08053CA8: ldr r0, _08053CC8 ldr r1, [r5, 0x70] movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 cmp r7, r5 bne _08053CD0 ldr r0, _08053CCC @@ -3127,7 +3127,7 @@ _08053CD0: adds r1, r5, 0 movs r2, 0x1 movs r3, 0 - bl sub_8071598 + bl CanTarget lsls r0, 24 cmp r0, 0 bne _08053CEC @@ -3274,7 +3274,7 @@ _08053DF2: adds r1, r5, 0 movs r2, 0x1 movs r3, 0 - bl sub_8071598 + bl CanTarget lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -3310,14 +3310,14 @@ _08053E4A: adds r0, r7, 0 mov r1, r8 movs r2, 0 - bl sub_807CD64 + bl GetTargetingFlags movs r1, 0xF ands r1, r0 cmp r1, 0 bne _08053E64 adds r0, r7, 0 adds r1, r5, 0 - bl sub_806F450 + bl SetShopkeeperAggression _08053E64: ldr r2, [sp, 0x24] movs r3, 0xAC @@ -5857,7 +5857,7 @@ sub_8055640: mov r9, r3 ldr r7, [sp, 0x44] adds r1, r5, 0 - bl sub_8071A1C + bl GetMoveType_2 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -6030,7 +6030,7 @@ _080557C0: ldr r0, _08055808 ldr r1, [r4, 0x70] movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 adds r0, r6, 0 bl sub_8045888 lsls r0, 24 @@ -6114,7 +6114,7 @@ sub_8055864: adds r5, r2, 0 adds r6, r3, 0 adds r1, r5, 0 - bl sub_8071A1C + bl GetMoveType_2 adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 @@ -6223,7 +6223,7 @@ _0805591C: b _0805595A .align 2, 0 _08055944: .4byte gUnknown_81069BC -_08055948: .4byte gUnknown_80F522C +_08055948: .4byte gTypeEffectivenessChart _0805594C: ldrb r0, [r2] lsls r0, 1 @@ -6293,7 +6293,7 @@ _080559B6: bl CalculateFacingDir adds r1, r0, 0 adds r0, r4, 0 - bl sub_8071138 + bl CanAttackInFront lsls r0, 24 cmp r0, 0 beq _080559D4 @@ -6485,7 +6485,7 @@ _08055B30: bne _08055B4E _08055B3C: adds r0, r5, 0 - bl sub_8070B28 + bl IsSleeping lsls r0, 24 cmp r0, 0 bne _08055B5E @@ -6496,7 +6496,7 @@ _08055B4E: adds r0, r5, 0 movs r1, 0 _08055B52: - bl sub_8070D04 + bl CannotAttack lsls r0, 24 cmp r0, 0 beq _08055B5E @@ -7112,7 +7112,7 @@ _08056068: adds r0, r5, 0 adds r1, r7, 0 movs r2, 0x1 - bl sub_807CD64 + bl GetTargetingFlags movs r4, 0xF0 adds r1, r4, 0 ands r1, r0 @@ -7124,7 +7124,7 @@ _08056084: adds r0, r5, 0 adds r1, r7, 0 movs r2, 0x1 - bl sub_807CD64 + bl GetTargetingFlags adds r1, r4, 0 ands r1, r0 cmp r1, 0x80 @@ -7135,7 +7135,7 @@ _08056084: cmp r0, 0x97 bne _080560AE adds r0, r5, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -7158,7 +7158,7 @@ _080560CC: ldr r0, _08056118 ldr r1, [r5, 0x70] movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 ldr r0, _0805611C adds r1, r7, 0 movs r2, 0 @@ -7204,7 +7204,7 @@ _08056136: adds r0, r5, 0 adds r1, r7, 0 movs r2, 0x1 - bl sub_80573CC + bl IsMoveUsable_2 _08056142: lsls r0, 24 lsrs r4, r0, 24 @@ -7254,7 +7254,7 @@ _080561A0: ldr r0, _080561D4 ldr r1, [r5, 0x70] movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 mov r1, r10 cmp r1, 0 bne _080561E0 @@ -7366,7 +7366,7 @@ _0805629A: bne _080562BE _080562AC: adds r0, r5, 0 - bl sub_8070B28 + bl IsSleeping lsls r0, 24 cmp r0, 0 bne _080562CE @@ -7377,7 +7377,7 @@ _080562BE: adds r0, r5, 0 movs r1, 0 _080562C2: - bl sub_8070D04 + bl CannotAttack lsls r0, 24 cmp r0, 0 beq _080562CE @@ -7397,7 +7397,7 @@ _080562CE: adds r4, 0x46 strb r0, [r4] adds r0, r5, 0 - bl sub_8069DCC + bl TargetTileInFront movs r2, 0 str r2, [sp, 0x12C] _080562F4: @@ -7632,7 +7632,7 @@ _080564BC: ldr r0, _080564DC ldr r1, [r6, 0x70] movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 ldr r0, [sp, 0x24] cmp r0, 0 bne _080564E4 @@ -7746,7 +7746,7 @@ _0805658C: _080565A4: ldrh r4, [r7, 0x2] adds r0, r6, 0 - bl sub_807E580 + bl GetWeather adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -7801,7 +7801,7 @@ _08056602: beq _080566E4 ldrh r4, [r7, 0x2] adds r0, r6, 0 - bl sub_807E580 + bl GetWeather adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -7819,7 +7819,7 @@ _08056602: ldrsh r5, [r0, r1] ldrh r4, [r7, 0x2] adds r0, r6, 0 - bl sub_807E580 + bl GetWeather adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -7854,7 +7854,7 @@ _08056690: _08056694: ldrh r4, [r7, 0x2] adds r0, r6, 0 - bl sub_807E580 + bl GetWeather adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -8047,7 +8047,7 @@ _080567EC: str r6, [sp, 0x40] b _0805682E .align 2, 0 -_08056814: .4byte gUnknown_80F4448 +_08056814: .4byte gAdjacentTileOffsets _08056818: .4byte 0xffff0000 _0805681C: .4byte 0x0000ffff _08056820: @@ -8093,7 +8093,7 @@ _0805682E: str r0, [sp, 0x38] b _0805687C .align 2, 0 -_08056874: .4byte gUnknown_80F4448 +_08056874: .4byte gAdjacentTileOffsets _08056878: movs r2, 0x20 str r2, [sp, 0x38] @@ -8349,7 +8349,7 @@ _08056A66: mov r0, r10 ldr r1, [sp, 0x1C] movs r2, 0 - bl sub_807CD64 + bl GetTargetingFlags adds r2, r0, 0 lsls r2, 16 asrs r2, 16 @@ -8540,7 +8540,7 @@ _08056BE0: cmp r0, 0x40 bne _08056BFC adds r0, r7, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 @@ -8588,7 +8588,7 @@ _08056C2A: movs r4, 0xA _08056C3C: adds r0, r6, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 @@ -8731,7 +8731,7 @@ _08056D44: adds r0, r5, 0 mov r1, r8 movs r2, 0 - bl sub_807CD64 + bl GetTargetingFlags lsls r0, 16 asrs r7, r0, 16 movs r0, 0xF @@ -8748,7 +8748,7 @@ _08056D44: cmp r0, 0x97 bne _08056D7E adds r0, r5, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -8845,7 +8845,7 @@ _08056E1C: bne _08056DCC b _08056F64 .align 2, 0 -_08056E28: .4byte gUnknown_80F4448 +_08056E28: .4byte gAdjacentTileOffsets _08056E2C: .4byte 0xffff0000 _08056E30: .4byte 0x0000ffff _08056E34: @@ -9066,7 +9066,7 @@ _08056FD0: adds r1, r7, 0 movs r2, 0x1 movs r3, 0 - bl sub_8071598 + bl CanTarget lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -9079,7 +9079,7 @@ _08056FE6: adds r1, r7, 0 movs r2, 0x1 movs r3, 0 - bl sub_8071598 + bl CanTarget lsls r0, 24 cmp r0, 0 bne _0805702E @@ -9099,7 +9099,7 @@ _0805700C: adds r1, r7, 0 movs r2, 0x1 movs r3, 0 - bl sub_8071598 + bl CanTarget lsls r0, 24 cmp r0, 0 bne _0805702E @@ -9228,7 +9228,7 @@ _080570EA: pop {r1} bx r1 .align 2, 0 -_080570F0: .4byte gUnknown_81069F4 +_080570F0: .4byte gChargeMovesToStatuses thumb_func_end sub_80570AC .align 2, 0 diff --git a/asm/code_8057144.s b/asm/code_8057144.s index 09ba149..cf98bf8 100644 --- a/asm/code_8057144.s +++ b/asm/code_8057144.s @@ -285,8 +285,8 @@ _08057340: bx r1 thumb_func_end sub_8057308 - thumb_func_start sub_8057348 -sub_8057348: + thumb_func_start IsMoveUsable +IsMoveUsable: push {r4-r7,lr} mov r7, r8 push {r7} @@ -334,7 +334,7 @@ _08057394: adds r0, r7, 0 adds r1, r4, 0 mov r2, r8 - bl sub_80573CC + bl IsMoveUsable_2 lsls r0, 24 cmp r0, 0 bne _0805738A @@ -357,10 +357,10 @@ _080573C0: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_8057348 + thumb_func_end IsMoveUsable - thumb_func_start sub_80573CC -sub_80573CC: + thumb_func_start IsMoveUsable_2 +IsMoveUsable_2: push {r4-r6,lr} adds r4, r1, 0 lsls r2, 24 @@ -428,7 +428,7 @@ _08057444: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_80573CC + thumb_func_end IsMoveUsable_2 thumb_func_start sub_805744C sub_805744C: @@ -594,7 +594,7 @@ sub_805755C: lsrs r4, r1, 16 cmp r4, 0x97 bne _08057576 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -865,7 +865,7 @@ sub_8057748: adds r5, r0, 0 adds r6, r1, 0 ldr r4, _08057778 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 23 adds r0, r4 @@ -911,7 +911,7 @@ sub_8057788: adds r0, r4, 0 bl sub_8045128 adds r5, r0, 0 - bl sub_804AF20 + bl IsTileWater lsls r0, 24 cmp r0, 0 beq _080577BA diff --git a/asm/code_8057824.s b/asm/code_8057824.s index 2b983be..132fcf2 100644 --- a/asm/code_8057824.s +++ b/asm/code_8057824.s @@ -267,7 +267,7 @@ sub_8057BEC: movs r0, 0 mov r8, r0 adds r0, r4, 0 - bl sub_8070B28 + bl IsSleeping lsls r0, 24 cmp r0, 0 beq _08057C48 @@ -382,7 +382,7 @@ sub_8057CD0: adds r6, r1, 0 mov r8, r2 adds r5, r3, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 ldr r1, _08057D18 @@ -802,7 +802,7 @@ sub_8057FF4: adds r5, r0, 0 adds r4, r1, 0 adds r0, r4, 0 - bl sub_807723C + bl GetFlashFireStatus lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 @@ -2131,7 +2131,7 @@ sub_80589D4: adds r5, r0, 0 adds r6, r1, 0 ldr r4, _08058A04 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 23 adds r0, r4 @@ -3840,7 +3840,7 @@ sub_805968C: mov r8, r1 adds r6, r2, 0 adds r7, r3, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 @@ -4062,7 +4062,7 @@ DiveMoveAction: mov r8, r3 movs r6, 0 bl sub_8045128 - bl sub_804AF20 + bl IsTileWater lsls r0, 24 cmp r0, 0 beq _08059870 @@ -4397,7 +4397,7 @@ sub_8059AC4: adds r5, r0, 0 adds r6, r1, 0 ldr r4, _08059AF4 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 23 adds r0, r4 @@ -4548,7 +4548,7 @@ _08059BE2: beq _08059C08 adds r0, r5, 0 adds r1, r4, 0 - bl sub_8071A1C + bl GetMoveType_2 lsls r0, 24 cmp r0, 0 beq _08059C08 @@ -4573,7 +4573,7 @@ _08059C08: adds r4, r1, r0 ldr r1, [r4] adds r0, r5, 0 - bl sub_8071A1C + bl GetMoveType_2 adds r1, r7, 0 adds r1, 0x5C movs r2, 0 @@ -4912,7 +4912,7 @@ _08059E8A: bne _08059F1A adds r0, r6, 0 adds r1, r7, 0 - bl sub_8071A1C + bl GetMoveType_2 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -4940,7 +4940,7 @@ _08059E8A: ldr r0, _08059F2C ldr r1, [r6, 0x70] movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 ldr r0, _08059F30 ldr r2, [r0] adds r0, r6, 0 @@ -5094,7 +5094,7 @@ _08059FFE: bne _0805A090 adds r0, r6, 0 adds r1, r7, 0 - bl sub_8071A1C + bl GetMoveType_2 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -5122,7 +5122,7 @@ _08059FFE: ldr r0, _0805A0A0 ldr r1, [r6, 0x70] movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 ldr r0, _0805A0A4 ldr r2, [r0] adds r0, r6, 0 @@ -6131,7 +6131,7 @@ _0805A7B4: bx r1 .align 2, 0 _0805A7C4: .4byte gUnknown_80FD170 -_0805A7C8: .4byte gUnknown_80F4448 +_0805A7C8: .4byte gAdjacentTileOffsets _0805A7CC: .4byte 0xffff0000 _0805A7D0: .4byte 0x0000ffff thumb_func_end sub_805A6C8 @@ -6328,7 +6328,7 @@ _0805A94C: add r4, sp, 0x18 movs r2, 0x2 ldrsh r1, [r4, r2] - bl sub_8049590 + bl GetMapEntity ldr r5, [r0, 0x10] cmp r5, 0 beq _0805AA4C @@ -6523,7 +6523,7 @@ sub_805AAE0: lsls r1, 1 adds r5, r0, r1 ldr r0, [r5] - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0x1 ble _0805AB20 ldr r0, _0805AB1C @@ -6882,7 +6882,7 @@ _0805ADA0: adds r1, r4, 0 movs r2, 0 movs r3, 0 - bl sub_8071598 + bl CanTarget lsls r0, 24 cmp r0, 0 bne _0805AE0C @@ -7228,7 +7228,7 @@ TransformMoveAction: adds r5, r0, 0 adds r6, r1, 0 adds r4, r2, 0 - bl sub_80441BC + bl IsBossBattle lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -7352,7 +7352,7 @@ sub_805B0D0: movs r0, 0x1 b _0805B15A .align 2, 0 -_0805B134: .4byte gUnknown_80F561C +_0805B134: .4byte gDungeonCamouflageTypes _0805B138: .4byte gDungeonGlobalData _0805B13C: .4byte 0x00003a0e _0805B140: .4byte gUnknown_202DFE8 @@ -8082,7 +8082,7 @@ sub_805B668: lsrs r0, 24 mov r9, r0 adds r0, r4, 0 - bl sub_8070B28 + bl IsSleeping lsls r0, 24 cmp r0, 0 beq _0805B712 @@ -9266,7 +9266,7 @@ TrapbustOrbAction: adds r0, r1, 0 bl sub_8045128 adds r4, r0, 0 - bl sub_80441BC + bl IsBossBattle lsls r0, 24 cmp r0, 0 beq _0805BF78 @@ -9344,7 +9344,7 @@ _0805BFE0: _0805BFF0: adds r0, r6, 0 adds r1, r5, 0 - bl sub_8049590 + bl GetMapEntity ldr r4, [r0, 0x14] cmp r4, 0 beq _0805C028 @@ -9458,7 +9458,7 @@ _0805C0BE: adds r1, r4, 0 movs r2, 0x1 movs r3, 0 - bl sub_8071598 + bl CanTarget lsls r0, 24 cmp r0, 0 bne _0805C0F2 @@ -9722,7 +9722,7 @@ FillInOrbAction: movs r0, 0 mov r9, r0 ldr r5, [r7, 0x70] - bl sub_80441BC + bl IsBossBattle lsls r0, 24 cmp r0, 0 beq _0805C2DC @@ -9770,7 +9770,7 @@ _0805C2DC: ldrsh r0, [r0, r1] movs r2, 0x2 ldrsh r1, [r4, r2] - bl sub_8049590 + bl GetMapEntity adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x3 @@ -9832,7 +9832,7 @@ _0805C372: bl sub_80522F4 b _0805C3C0 .align 2, 0 -_0805C3A0: .4byte gUnknown_80F4448 +_0805C3A0: .4byte gAdjacentTileOffsets _0805C3A4: .4byte 0xffff0000 _0805C3A8: .4byte 0x0000ffff _0805C3AC: .4byte 0x0000fffc @@ -9973,8 +9973,8 @@ sub_805C48C: bx r1 thumb_func_end sub_805C48C - thumb_func_start sub_805C498 -sub_805C498: + thumb_func_start CanUseWithStatusChecker +CanUseWithStatusChecker: push {r4-r6,lr} adds r5, r0, 0 ldr r2, [r5, 0x70] @@ -10397,7 +10397,7 @@ _0805C4C0: .4byte _0805CDE8 _0805CB00: adds r0, r5, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 b _0805CC5A @@ -10426,7 +10426,7 @@ _0805CB24: lsls r1, 1 adds r0, r2, r1 ldr r0, [r0] - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0 ble _0805CB3E b _0805CEA8 @@ -10552,10 +10552,10 @@ _0805CBF0: adds r0, r1 ldrb r1, [r0] adds r0, r5, 0 - bl sub_8071858 + bl HasType b _0805CDEC .align 2, 0 -_0805CC0C: .4byte gUnknown_80F561C +_0805CC0C: .4byte gDungeonCamouflageTypes _0805CC10: .4byte gDungeonGlobalData _0805CC14: .4byte 0x00003a0e _0805CC18: @@ -10618,19 +10618,19 @@ _0805CC6E: b _0805CB6E _0805CC70: adds r0, r5, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 b _0805CCAE _0805CC7C: adds r0, r5, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 b _0805CDB6 _0805CC88: adds r0, r5, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 b _0805CCA0 @@ -10669,25 +10669,25 @@ _0805CCB6: b _0805CDEE _0805CCC2: adds r0, r5, 0 - bl sub_8070B48 + bl HasQuarterHPOrLess lsls r0, 24 cmp r0, 0 beq _0805CCD0 b _0805CEA8 _0805CCD0: adds r0, r5, 0 - bl sub_8070A58 + bl HasNegativeStatus b _0805CDC2 _0805CCD8: adds r0, r5, 0 bl sub_8045128 - bl sub_804AF20 + bl IsTileWater b _0805CDEC _0805CCE4: adds r0, r5, 0 bl sub_8045128 adds r4, r0, 0 - bl sub_804AF20 + bl IsTileWater lsls r0, 24 cmp r0, 0 bne _0805CCF8 @@ -10808,7 +10808,7 @@ _0805CDB6: b _0805CB6E _0805CDBC: adds r0, r5, 0x4 - bl sub_807FC80 + bl CanLayTrap _0805CDC2: lsls r0, 24 _0805CDC4: @@ -10837,7 +10837,7 @@ _0805CDE0: bne _0805CEA8 b _0805CB6E _0805CDE8: - bl sub_80441BC + bl IsBossBattle _0805CDEC: lsls r0, 24 _0805CDEE: @@ -10947,10 +10947,10 @@ _0805CEAA: .align 2, 0 _0805CEB0: .4byte gDungeonGlobalData _0805CEB4: .4byte 0x0001357c - thumb_func_end sub_805C498 + thumb_func_end CanUseWithStatusChecker - thumb_func_start sub_805CEB8 -sub_805CEB8: + thumb_func_start CanUseWithStatusChecker_2 +CanUseWithStatusChecker_2: push {r4-r7,lr} mov r7, r8 push {r7} @@ -11370,7 +11370,7 @@ _0805CF00: .4byte _0805D7F6 _0805D4F0: adds r0, r6, 0 - bl sub_8070B28 + bl IsSleeping lsls r0, 24 b _0805D7A6 _0805D4FA: @@ -11380,7 +11380,7 @@ _0805D4FA: cmp r0, 0x4 beq _0805D540 adds r0, r6, 0 - bl sub_8070B28 + bl IsSleeping lsls r0, 24 b _0805D7A6 _0805D50E: @@ -11422,7 +11422,7 @@ _0805D544: lsls r3, 1 adds r4, r3 adds r0, r4, 0 - bl sub_805D810 + bl HasDisabledMove lsls r0, 24 cmp r0, 0 bne _0805D540 @@ -11446,7 +11446,7 @@ _0805D570: movs r2, 0x8C lsls r2, 1 adds r0, r4, r2 - bl sub_805D850 + bl LastMoveOutOfPP lsls r0, 24 b _0805D7A6 _0805D57E: @@ -11723,7 +11723,7 @@ _0805D74A: _0805D75C: mov r0, r8 movs r1, 0xE - bl sub_8071858 + bl HasType lsls r0, 24 cmp r0, 0 beq _0805D770 @@ -11773,7 +11773,7 @@ _0805D7AC: lsls r2, 1 adds r0, r4, r2 _0805D7B2: - bl sub_805D888 + bl HasLastUsedMove lsls r0, 24 _0805D7B8: cmp r0, 0 @@ -11829,10 +11829,10 @@ _0805D804: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_805CEB8 + thumb_func_end CanUseWithStatusChecker_2 - thumb_func_start sub_805D810 -sub_805D810: + thumb_func_start HasDisabledMove +HasDisabledMove: push {r4-r6,lr} adds r4, r0, 0 movs r3, 0 @@ -11869,10 +11869,10 @@ _0805D84A: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_805D810 + thumb_func_end HasDisabledMove - thumb_func_start sub_805D850 -sub_805D850: + thumb_func_start LastMoveOutOfPP +LastMoveOutOfPP: push {r4,r5,lr} movs r3, 0 movs r5, 0x1 @@ -11903,10 +11903,10 @@ _0805D880: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_805D850 + thumb_func_end LastMoveOutOfPP - thumb_func_start sub_805D888 -sub_805D888: + thumb_func_start HasLastUsedMove +HasLastUsedMove: push {r4-r6,lr} adds r4, r0, 0 movs r3, 0 @@ -11943,7 +11943,7 @@ _0805D8C2: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_805D888 + thumb_func_end HasLastUsedMove thumb_func_start sub_805D8C8 sub_805D8C8: @@ -11963,10 +11963,10 @@ sub_805D8C8: movs r5, 0 movs r0, 0 strh r0, [r1, 0x12] - bl sub_8083600 + bl GetLeaderEntity movs r1, 0x1 bl sub_806A2BC - bl sub_8083600 + bl GetLeaderEntity bl sub_80701A4 lsls r0, 24 cmp r0, 0 @@ -11999,16 +11999,16 @@ _0805D928: cmp r0, 0 beq _0805D976 strb r5, [r1, 0x1] - bl sub_8083600 + bl GetLeaderEntity movs r1, 0x1 - bl sub_8071518 + bl ShouldAvoidEnemies_2 lsls r0, 24 cmp r0, 0 bne _0805D976 movs r0, 0x1 bl sub_8044C10 bl sub_805E804 - bl sub_8083600 + bl GetLeaderEntity bl sub_80647F0 bl ResetRepeatTimers bl ResetUnusedInputStruct @@ -12023,7 +12023,7 @@ _0805D976: movs r2, 0x1 bl sub_806A914 _0805D980: - bl sub_8083600 + bl GetLeaderEntity mov r10, r0 ldr r5, [r0, 0x70] mov r8, r5 @@ -12282,7 +12282,7 @@ _0805DB7A: lsls r0, 1 add r0, r8 ldr r0, [r0] - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0 beq _0805DBAA b _0805D9EC @@ -12307,7 +12307,7 @@ _0805DBBE: lsls r0, 1 add r0, r8 ldr r0, [r0] - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0 bne _0805DBDA b _0805DD02 @@ -12327,7 +12327,7 @@ _0805DBF4: .4byte 0x00000673 _0805DBF8: mov r0, r10 movs r1, 0x1 - bl sub_8071518 + bl ShouldAvoidEnemies_2 lsls r0, 24 cmp r0, 0 beq _0805DC08 @@ -12949,7 +12949,7 @@ _0805E0C2: mov r0, r10 adds r1, r5, 0 str r3, [sp, 0x20] - bl sub_8070D6C + bl CannotMoveForward lsls r0, 24 ldr r3, [sp, 0x20] cmp r0, 0 @@ -13016,7 +13016,7 @@ _0805E14C: lsls r0, 1 add r0, r8 ldr r0, [r0] - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0 beq _0805E188 mov r1, r10 @@ -13098,7 +13098,7 @@ _0805E1E0: beq _0805E218 mov r0, r10 movs r1, 0 - bl sub_8045028 + bl IsNotAttacking lsls r0, 24 cmp r0, 0 bne _0805E2B0 @@ -13827,7 +13827,7 @@ _0805E7C6: bl sub_806CDD4 b _0805E7F6 .align 2, 0 -_0805E7E8: .4byte gUnknown_80F4448 +_0805E7E8: .4byte gAdjacentTileOffsets _0805E7EC: movs r3, 0x1 add r8, r3 @@ -13911,7 +13911,7 @@ sub_805E874: sub sp, 0x24 ldr r0, _0805E90C ldr r4, [r0] - bl sub_8083600 + bl GetLeaderEntity mov r9, r0 ldr r0, [r0, 0x70] adds r0, 0x46 @@ -13976,7 +13976,7 @@ _0805E906: b _0805EC1A .align 2, 0 _0805E90C: .4byte gDungeonGlobalData -_0805E910: .4byte gUnknown_80F4448 +_0805E910: .4byte gAdjacentTileOffsets _0805E914: .4byte 0x0000066c _0805E918: ldrh r1, [r5] @@ -14140,7 +14140,7 @@ _0805EA42: beq _0805EA94 b _0805E906 .align 2, 0 -_0805EA54: .4byte gUnknown_80F4448 +_0805EA54: .4byte gAdjacentTileOffsets _0805EA58: .4byte gDungeonGlobalData _0805EA5C: .4byte 0x0001820f _0805EA60: @@ -14462,7 +14462,7 @@ _0805ECC2: movs r0, 0x1 b _0805ECCE .align 2, 0 -_0805ECC8: .4byte gUnknown_80F4448 +_0805ECC8: .4byte gAdjacentTileOffsets _0805ECCC: movs r0, 0 _0805ECCE: @@ -14650,7 +14650,7 @@ sub_805EE30: push {r4-r7,lr} mov r7, r8 push {r7} - bl sub_8083600 + bl GetLeaderEntity adds r5, r0, 0 cmp r5, 0 bne _0805EE42 @@ -14878,7 +14878,7 @@ _0805EFF6: bne _0805F008 mov r0, r8 adds r1, r4, 0 - bl sub_8070D6C + bl CannotMoveForward lsls r0, 24 cmp r0, 0 beq _0805F014 @@ -14916,7 +14916,7 @@ sub_805F02C: ldr r0, [r5] adds r0, 0xBC ldr r7, [r0] - bl sub_8083600 + bl GetLeaderEntity mov r9, r0 ldr r0, [r7, 0x70] mov r8, r0 @@ -15048,7 +15048,7 @@ _0805F12A: bl sub_803F508 mov r0, r9 bl sub_8041AD0 - bl sub_8083600 + bl GetLeaderEntity bl sub_8041AE0 ldr r0, _0805F198 adds r1, r7, 0 @@ -15078,7 +15078,7 @@ _0805F184: pop {r0} bx r0 .align 2, 0 -_0805F194: .4byte gUnknown_203B450 +_0805F194: .4byte gLeaderPokemon _0805F198: .4byte gAvailablePokemonNames _0805F19C: .4byte gUnknown_80F9BB0 thumb_func_end sub_805F02C @@ -15146,12 +15146,12 @@ _0805F1F8: _0805F208: .4byte gDungeonGlobalData _0805F20C: .4byte 0x00000137 _0805F210: - bl sub_8083600 + bl GetLeaderEntity movs r1, 0x1 bl sub_806675C b _0805F226 _0805F21C: - bl sub_8083600 + bl GetLeaderEntity movs r1, 0x1 bl sub_806684C _0805F226: @@ -15177,7 +15177,7 @@ _0805F240: str r1, [r0] ldr r0, [sp, 0xC] bl DrawFieldMenu - bl sub_8083600 + bl GetLeaderEntity movs r1, 0 bl sub_806A2BC ldr r4, _0805F38C @@ -15274,7 +15274,7 @@ _0805F304: ldr r1, _0805F3A4 ands r0, r1 str r0, [sp, 0x4] - bl sub_8083600 + bl GetLeaderEntity add r1, sp, 0x4 bl sub_805FD74 lsls r0, 24 @@ -15289,7 +15289,7 @@ _0805F33A: lsls r0, 24 cmp r0, 0 beq _0805F35C - bl sub_8083600 + bl GetLeaderEntity add r1, sp, 0x4 bl sub_805FD74 lsls r0, 24 @@ -15303,7 +15303,7 @@ _0805F35C: lsrs r0, 16 cmp r0, 0xC bne _0805F3B2 - bl sub_8083600 + bl GetLeaderEntity movs r1, 0 movs r2, 0xC bl sub_8044D90 @@ -15331,36 +15331,36 @@ _0805F3A8: _0805F3B2: cmp r0, 0x35 bne _0805F3D0 - bl sub_8083600 + bl GetLeaderEntity movs r1, 0 movs r2, 0xD bl sub_8044D90 adds r4, r0, 0 - bl sub_8083600 + bl GetLeaderEntity adds r1, r4, 0 bl sub_8048A68 b _0805F40A _0805F3D0: cmp r0, 0x10 bne _0805F3EE - bl sub_8083600 + bl GetLeaderEntity movs r1, 0 movs r2, 0xE bl sub_8044D90 adds r4, r0, 0 - bl sub_8083600 + bl GetLeaderEntity adds r1, r4, 0 bl sub_8048950 b _0805F40A _0805F3EE: cmp r0, 0x2C bne _0805F41A - bl sub_8083600 + bl GetLeaderEntity movs r1, 0 movs r2, 0xF bl sub_8044D90 adds r4, r0, 0 - bl sub_8083600 + bl GetLeaderEntity adds r1, r4, 0 bl sub_8048B9C _0805F40A: @@ -15390,7 +15390,7 @@ _0805F428: _0805F430: movs r0, 0x1 bl sub_8044C10 - bl sub_8083600 + bl GetLeaderEntity bl sub_8060E38 lsls r0, 24 cmp r0, 0 @@ -15567,7 +15567,7 @@ _0805F5A0: ble _0805F57A cmp r6, 0 bne _0805F5B0 - bl sub_8083600 + bl GetLeaderEntity adds r6, r0, 0 _0805F5B0: adds r0, r6, 0 @@ -15733,10 +15733,10 @@ _0805F6FA: bl sub_8063CF0 b _0805F56C _0805F712: - bl sub_8083600 + bl GetLeaderEntity movs r1, 0 bl sub_806A2BC - bl sub_8083600 + bl GetLeaderEntity adds r0, 0x4 movs r1, 0 movs r2, 0x1 @@ -15756,7 +15756,7 @@ _0805F73A: beq _0805F742 b _0805F8E0 _0805F742: - bl sub_8083600 + bl GetLeaderEntity movs r1, 0x4 ldrsh r2, [r0, r1] movs r3, 0x6 @@ -15794,7 +15794,7 @@ _0805F768: adds r1, 0x1 orrs r0, r1 str r0, [sp, 0x8] - bl sub_8083600 + bl GetLeaderEntity add r4, sp, 0x8 adds r1, r4, 0 bl sub_805FD74 @@ -15804,7 +15804,7 @@ _0805F768: lsls r0, 24 cmp r0, 0 beq _0805F7C2 - bl sub_8083600 + bl GetLeaderEntity adds r1, r4, 0 bl sub_805FD74 lsls r0, 24 @@ -15819,7 +15819,7 @@ _0805F7C2: adds r1, r0, 0 cmp r0, 0xC bne _0805F800 - bl sub_8083600 + bl GetLeaderEntity movs r1, 0 movs r2, 0x10 bl sub_8044D90 @@ -15838,24 +15838,24 @@ _0805F7FC: .4byte 0x00ffffff _0805F800: cmp r0, 0x35 bne _0805F81E - bl sub_8083600 + bl GetLeaderEntity movs r1, 0 movs r2, 0x11 bl sub_8044D90 adds r4, r0, 0 - bl sub_8083600 + bl GetLeaderEntity adds r1, r4, 0 bl sub_8048A68 b _0805F83A _0805F81E: cmp r0, 0x10 bne _0805F848 - bl sub_8083600 + bl GetLeaderEntity movs r1, 0 movs r2, 0x12 bl sub_8044D90 adds r4, r0, 0 - bl sub_8083600 + bl GetLeaderEntity adds r1, r4, 0 bl sub_8048950 _0805F83A: @@ -15869,12 +15869,12 @@ _0805F840: _0805F848: cmp r1, 0x2C bne _0805F8A8 - bl sub_8083600 + bl GetLeaderEntity movs r1, 0 movs r2, 0x13 bl sub_8044D90 adds r4, r0, 0 - bl sub_8083600 + bl GetLeaderEntity adds r1, r4, 0 bl sub_8048B9C lsls r0, 24 @@ -15890,7 +15890,7 @@ _0805F872: bne _0805F8CE movs r0, 0x1 bl sub_8044C10 - bl sub_8083600 + bl GetLeaderEntity bl sub_80643AC b _0805F8A8 _0805F88C: @@ -15903,7 +15903,7 @@ _0805F88C: beq _0805F8B4 movs r0, 0x1 bl sub_8044C10 - bl sub_8083600 + bl GetLeaderEntity bl sub_80647F0 _0805F8A8: bl sub_805F1AC @@ -15912,7 +15912,7 @@ _0805F8A8: bne _0805F92A b _0805F8CE _0805F8B4: - bl sub_8083600 + bl GetLeaderEntity adds r1, r0, 0 ldr r0, _0805F8D8 movs r2, 0 @@ -15960,7 +15960,7 @@ _0805F904: .align 2, 0 _0805F91C: .4byte gDungeonGlobalData _0805F920: - bl sub_8083600 + bl GetLeaderEntity movs r1, 0 bl sub_806A2BC _0805F92A: @@ -16022,9 +16022,9 @@ _0805F998: _0805F9A0: movs r0, 0 bl sub_80073B8 - bl sub_8083600 + bl GetLeaderEntity movs r1, 0x1 - bl sub_8071518 + bl ShouldAvoidEnemies_2 lsls r0, 24 cmp r0, 0 beq _0805F9CC @@ -16106,7 +16106,7 @@ _0805F9DA: bne _0805FA62 b _0805FB92 _0805FA62: - bl sub_8083600 + bl GetLeaderEntity ldr r7, [r0, 0x70] bl sub_805317C adds r5, r0, 0 @@ -16138,14 +16138,14 @@ _0805FA62: lsls r1, 1 adds r0, r7, r1 ldr r0, [r0] - bl sub_8094450 + bl GetBellyRoundedUp ldr r4, _0805FBC0 str r0, [r4] movs r2, 0xA0 lsls r2, 1 adds r0, r7, r2 ldr r0, [r0] - bl sub_8094450 + bl GetBellyRoundedUp str r0, [r4, 0x4] ldr r0, _0805FBC4 ldr r2, [r0] @@ -16170,7 +16170,7 @@ _0805FA62: bl xxx_format_and_draw ldr r5, _0805FBD0 movs r0, 0 - bl sub_807E580 + bl GetWeather adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -17607,7 +17607,7 @@ _080606B0: ldr r0, _0806070C ldr r1, [sp, 0x74] movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 ldr r0, _08060710 ldr r2, [r0] mov r4, r8 @@ -17667,7 +17667,7 @@ _08060718: adds r7, 0x60 ldr r0, _080607EC movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 ldr r0, _080607F0 ldr r2, [r0] movs r4, 0 @@ -18395,7 +18395,7 @@ _08060D20: .4byte gUnknown_202F238 thumb_func_start sub_8060D24 sub_8060D24: push {r4,lr} - bl sub_8083600 + bl GetLeaderEntity movs r1, 0 movs r2, 0xB bl sub_8044D90 @@ -18874,7 +18874,7 @@ _08061100: .4byte gRealInputs _08061104: .4byte gUnknown_202EE39 _08061108: .4byte gUnknown_202EE10 _0806110C: - bl sub_8083600 + bl GetLeaderEntity movs r1, 0 bl sub_806A2BC _08061116: @@ -18914,7 +18914,7 @@ DrawFieldTeamMenu: movs r1, 0x1 _08061154: mov r10, r1 - bl sub_8083600 + bl GetLeaderEntity adds r1, r0, 0 add r0, sp, 0x4 bl sub_8069D18 @@ -21007,7 +21007,7 @@ _0806220C: movs r1, 0 bl sub_803EAF0 ldr r0, [sp, 0x110] - bl sub_807191C + bl LoadIQSkills add sp, 0x130 pop {r3-r5} mov r8, r3 @@ -22101,7 +22101,7 @@ _08062AF4: movs r0, 0x1B bl sub_803E46C bl sub_804AA60 - bl sub_8083600 + bl GetLeaderEntity movs r1, 0 bl sub_806A2BC movs r0, 0 @@ -22248,7 +22248,7 @@ _08062C24: mov r0, r10 adds r1, r5, 0 movs r2, 0x1 - bl sub_80573CC + bl IsMoveUsable_2 add r1, sp, 0x4 movs r2, 0 lsls r0, 24 @@ -22693,7 +22693,7 @@ sub_8062F90: str r2, [sp, 0xD8] ldr r0, [r0, 0x70] mov r9, r0 - bl sub_8083600 + bl GetLeaderEntity ldr r0, [r0, 0x70] str r0, [sp, 0xE4] add r4, sp, 0x70 @@ -23330,7 +23330,7 @@ _0806343E: ldr r0, _08063518 adds r1, r7, 0 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 movs r3, 0 movs r5, 0x1 _080634DE: @@ -23482,7 +23482,7 @@ _08063606: ldr r0, [sp, 0x14] adds r1, r5, 0 movs r2, 0x1 - bl sub_80573CC + bl IsMoveUsable_2 add r1, sp, 0x4 movs r2, 0 lsls r0, 24 @@ -23659,7 +23659,7 @@ _0806376A: bgt _08063788 mov r0, r8 movs r2, 0x1 - bl sub_8057348 + bl IsMoveUsable lsls r0, 24 lsrs r0, 24 negs r1, r0 @@ -25125,7 +25125,7 @@ _08064262: mov r7, r9 ldr r1, [r7, 0x70] movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 str r4, [sp] str r4, [sp, 0x4] mov r0, r8 @@ -26332,7 +26332,7 @@ _08064C6A: ldrb r0, [r0] cmp r0, 0 beq _08064CA4 - bl sub_80441BC + bl IsBossBattle lsls r0, 24 cmp r0, 0 bne _08064CA4 @@ -26401,7 +26401,7 @@ _08064D06: ldrb r0, [r0] cmp r0, 0 beq _08064D2A - bl sub_80441BC + bl IsBossBattle lsls r0, 24 cmp r0, 0 bne _08064D2A @@ -27034,7 +27034,7 @@ sub_80651FC: movs r1, 0x2E bl SetAction ldr r4, _0806523C - bl sub_8083600 + bl GetLeaderEntity adds r2, r0, 0 adds r0, r4, 0 movs r1, 0 @@ -27219,7 +27219,7 @@ _080652D2: ldrb r0, [r0] cmp r0, 0 beq _0806540E - bl sub_80441BC + bl IsBossBattle lsls r0, 24 cmp r0, 0 bne _080653F4 @@ -29380,7 +29380,7 @@ _08066530: _08066554: adds r0, r2, r6 str r3, [sp, 0x1BC] - bl sub_808E9B8 + bl ExtractSpeciesIndex lsls r0, 16 asrs r0, 16 add r0, sp @@ -30824,7 +30824,7 @@ sub_8067110: ldr r0, _08067194 adds r1, r4, 0 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 adds r0, r5, 0 adds r1, r6, 0 bl sub_8048D50 @@ -30935,7 +30935,7 @@ _0806721C: .4byte gUnknown_80F8BE0 _08067220: adds r0, r6, 0 movs r1, 0x1 - bl sub_8071518 + bl ShouldAvoidEnemies_2 lsls r0, 24 cmp r0, 0 beq _08067248 @@ -31113,7 +31113,7 @@ _08067384: ldr r0, _080673B4 mov r1, r8 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 ldrb r0, [r4, 0x2] bl GetItemType lsls r0, 24 @@ -31322,7 +31322,7 @@ sub_806752C: adds r1, r2 adds r1, r0 ldr r4, [r1] - bl sub_8083600 + bl GetLeaderEntity adds r1, r4, 0 movs r2, 0 bl sub_8067558 @@ -31371,7 +31371,7 @@ _08067594: adds r1, r5, 0 movs r2, 0x1 movs r3, 0 - bl sub_8071598 + bl CanTarget lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -31382,7 +31382,7 @@ _080675AA: adds r1, r6, 0 movs r2, 0x1 movs r3, 0 - bl sub_8071598 + bl CanTarget lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -31394,12 +31394,12 @@ _080675C0: adds r0, r4, 0 adds r1, r7, 0 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 adds r4, 0x50 adds r0, r4, 0 mov r1, r8 movs r2, 0x7 - bl sub_80708B4 + bl SetMessageArgument_2 bl sub_8084778 adds r0, r6, 0 adds r1, r5, 0 @@ -31611,7 +31611,7 @@ sub_8067768: adds r1, r2 adds r1, r0 ldr r4, [r1] - bl sub_8083600 + bl GetLeaderEntity adds r1, r4, 0 movs r2, 0 bl sub_8067794 @@ -31977,7 +31977,7 @@ _08067A56: _08067A68: .4byte 0x00000159 _08067A6C: .4byte gUnknown_202F208 _08067A70: .4byte gUnknown_80FC690 -_08067A74: .4byte gUnknown_80F4448 +_08067A74: .4byte gAdjacentTileOffsets _08067A78: .4byte 0xffff0000 _08067A7C: .4byte 0x0000ffff thumb_func_end sub_8067904 @@ -33488,7 +33488,7 @@ _08068664: _08068690: ldr r0, [r6] adds r0, r5 - bl sub_808E9B8 + bl ExtractSpeciesIndex lsls r0, 16 asrs r0, 16 movs r1, 0x1 @@ -34645,7 +34645,7 @@ _08068F74: thumb_func_start sub_8068F80 sub_8068F80: push {r4,r5,lr} - bl sub_8083600 + bl GetLeaderEntity adds r5, r0, 0 ldr r0, _08068FD4 ldr r4, [r0] @@ -34823,7 +34823,7 @@ _080690A2: _080690E4: .4byte gDungeonGlobalData _080690E8: .4byte 0x000135cc _080690EC: .4byte 0x000037fc -_080690F0: .4byte gUnknown_203B450 +_080690F0: .4byte gLeaderPokemon _080690F4: .4byte 0x0000065c _080690F8: .4byte 0x000005f4 _080690FC: @@ -35110,7 +35110,7 @@ _08069338: movs r2, 0 bl SetMessageArgument _08069352: - bl sub_8083600 + bl GetLeaderEntity cmp r0, 0 beq _080693C6 movs r0, 0x87 @@ -35145,7 +35145,7 @@ _08069384: lsrs r0, 16 cmp r0, 0x2 bhi _080693C6 - bl sub_80441BC + bl IsBossBattle lsls r0, 24 cmp r0, 0 bne _080693C6 @@ -35278,7 +35278,7 @@ _080694AC: .4byte 0x00008df8 _080694B0: .4byte 0x00000644 _080694B4: .4byte 0x0000065c _080694B8: .4byte 0x0000fffd -_080694BC: .4byte gUnknown_203B450 +_080694BC: .4byte gLeaderPokemon thumb_func_end sub_8068FE0 thumb_func_start sub_80694C0 @@ -35296,7 +35296,7 @@ sub_80694C0: mov r9, r3 adds r0, r7, 0 mov r1, r8 - bl sub_8049590 + bl GetMapEntity mov r10, r0 ldr r5, [r4, 0x70] adds r6, r5, 0 @@ -35343,7 +35343,7 @@ _08069522: blt _08069552 adds r1, r0, 0 adds r0, r2, 0 - bl sub_8049590 + bl GetMapEntity adds r1, r0, 0 ldr r0, [r1, 0x10] cmp r0, r4 @@ -35538,7 +35538,7 @@ _0806969E: pop {r1} bx r1 .align 2, 0 -_080696A4: .4byte gUnknown_80F4448 +_080696A4: .4byte gAdjacentTileOffsets thumb_func_end sub_8069660 thumb_func_start sub_80696A8 @@ -35550,7 +35550,7 @@ sub_80696A8: adds r5, 0x46 ldrb r1, [r5] adds r0, r4, 0 - bl sub_8071138 + bl CanAttackInFront lsls r0, 24 cmp r0, 0 beq _080696F4 @@ -35578,7 +35578,7 @@ sub_80696A8: adds r0, r1, 0 b _080696F6 .align 2, 0 -_080696F0: .4byte gUnknown_80F4448 +_080696F0: .4byte gAdjacentTileOffsets _080696F4: movs r0, 0 _080696F6: @@ -35640,7 +35640,7 @@ sub_80696FC: adds r0, r1, 0 b _08069772 .align 2, 0 -_08069764: .4byte gUnknown_80F4448 +_08069764: .4byte gAdjacentTileOffsets _08069768: .4byte 0xffff0000 _0806976C: .4byte 0x0000ffff _08069770: @@ -35738,7 +35738,7 @@ sub_806977C: adds r0, r1, 0 b _0806983A .align 2, 0 -_0806982C: .4byte gUnknown_80F4448 +_0806982C: .4byte gAdjacentTileOffsets _08069830: .4byte 0xffff0000 _08069834: .4byte 0x0000ffff _08069838: @@ -35761,7 +35761,7 @@ sub_8069844: adds r0, r6, 0x2 adds r1, r5, 0 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 ldrh r0, [r5, 0x2] strh r0, [r6] movs r1, 0xE @@ -35982,7 +35982,7 @@ _08069A02: lsls r1, 1 adds r0, r5, r1 ldr r0, [r0] - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0 bne _08069A38 ldrb r0, [r5, 0x7] @@ -36428,7 +36428,7 @@ sub_8069D18: pop {r1} bx r1 .align 2, 0 -_08069D48: .4byte gUnknown_80F4448 +_08069D48: .4byte gAdjacentTileOffsets thumb_func_end sub_8069D18 thumb_func_start sub_8069D4C @@ -36500,8 +36500,8 @@ _08069D6C: bx r0 thumb_func_end sub_8069D4C - thumb_func_start sub_8069DCC -sub_8069DCC: + thumb_func_start TargetTileInFront +TargetTileInFront: push {r4,lr} ldr r1, [r0, 0x70] mov r12, r1 @@ -36532,8 +36532,8 @@ sub_8069DCC: pop {r0} bx r0 .align 2, 0 -_08069E08: .4byte gUnknown_80F4448 - thumb_func_end sub_8069DCC +_08069E08: .4byte gAdjacentTileOffsets + thumb_func_end TargetTileInFront thumb_func_start sub_8069E0C sub_8069E0C: @@ -36546,7 +36546,7 @@ sub_8069E0C: cmp r0, 0 beq _08069E44 adds r0, r4, 0 - bl sub_807E580 + bl GetWeather ldr r1, _08069E40 lsls r0, 24 lsrs r0, 22 @@ -36602,8 +36602,8 @@ _08069E64: _08069E88: .4byte gDungeonGlobalData thumb_func_end sub_8069E0C - thumb_func_start sub_8069E8C -sub_8069E8C: + thumb_func_start TriggerWeatherAbilities +TriggerWeatherAbilities: push {r4-r7,lr} ldr r3, _08069ED8 ldr r2, [r3] @@ -36700,7 +36700,7 @@ _08069F44: .align 2, 0 _08069F4C: .4byte 0x0000e270 _08069F50: .4byte 0x0000e279 - thumb_func_end sub_8069E8C + thumb_func_end TriggerWeatherAbilities thumb_func_start sub_8069F54 sub_8069F54: @@ -36721,7 +36721,7 @@ sub_8069F54: beq _08069F90 ldr r4, _08069F8C adds r0, r5, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 22 adds r0, r4 @@ -36863,7 +36863,7 @@ _0806A068: beq _0806A0FA mov r0, r8 mov r1, r9 - bl sub_8071A1C + bl GetMoveType_2 lsls r0, 24 lsrs r5, r0, 24 mov r1, r9 @@ -36871,7 +36871,7 @@ _0806A068: cmp r0, 0x1F bne _0806A0AA mov r0, r8 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 ldr r1, _0806A114 @@ -36882,7 +36882,7 @@ _0806A0AA: beq _0806A0FA adds r0, r6, 0 adds r1, r5, 0 - bl sub_8071858 + bl HasType lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -36954,7 +36954,7 @@ sub_806A120: bne _0806A19C adds r0, r7, 0 adds r1, r4, 0 - bl sub_8071A1C + bl GetMoveType_2 lsls r0, 24 lsrs r0, 24 bl sub_8092364 @@ -37380,7 +37380,7 @@ _0806A488: movs r2, 0x6 ldrsh r1, [r6, r2] adds r1, r7 - bl sub_8049590 + bl GetMapEntity adds r4, r0, 0 ldr r0, [r4, 0x10] cmp r0, 0 @@ -37612,7 +37612,7 @@ _0806A608: bl sub_8076210 b _0806A6D2 .align 2, 0 -_0806A640: .4byte gUnknown_810ACC0 +_0806A640: .4byte gDungeonWaterType _0806A644: .4byte gDungeonGlobalData _0806A648: .4byte 0x00003a0e _0806A64C: .4byte 0x00000113 @@ -37646,11 +37646,11 @@ _0806A664: movs r1, 0 mov r8, r1 adds r0, r5, 0 - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0x13 ble _0806A6A4 ldr r0, [r4] - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0x13 bgt _0806A6A4 ldr r0, _0806A6E0 @@ -37658,14 +37658,14 @@ _0806A664: mov r8, r0 _0806A6A4: adds r0, r5, 0 - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0x9 ble _0806A6C4 movs r2, 0x9E lsls r2, 1 adds r0, r7, r2 ldr r0, [r0] - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0x9 bgt _0806A6C4 ldr r0, _0806A6E4 @@ -37844,7 +37844,7 @@ sub_806A7E8: ldr r0, _0806A828 adds r1, r5, 0 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 movs r2, 0x1 mov r8, r4 _0806A818: @@ -38411,7 +38411,7 @@ _0806AC34: beq _0806AC72 _0806AC50: adds r0, r4, 0 - bl sub_8070B28 + bl IsSleeping lsls r0, 24 cmp r0, 0 bne _0806AC66 @@ -38557,10 +38557,10 @@ sub_806AD3C: adds r7, r0, 0 _0806AD66: adds r0, r6, 0 - bl sub_808E9B8 + bl ExtractSpeciesIndex strh r0, [r4] adds r0, r6, 0 - bl sub_808E9E4 + bl ExtractLevel strh r0, [r4, 0x2] adds r0, r4, 0x4 movs r2, 0 @@ -38665,7 +38665,7 @@ _0806AE30: adds r6, r3, 0 _0806AE42: adds r0, r5, 0 - bl sub_808E9B8 + bl ExtractSpeciesIndex lsls r0, 16 asrs r4, r0, 16 ldr r1, _0806AECC @@ -38677,7 +38677,7 @@ _0806AE42: cmp r0, 0 bne _0806AE72 adds r0, r5, 0 - bl sub_808E9E4 + bl ExtractLevel adds r1, r0, 0 adds r0, r4, 0 bl CalculateEXPGain @@ -39020,7 +39020,7 @@ _0806B0EE: bge _0806B106 lsls r0, r4, 3 add r0, r8 - bl sub_808E9B8 + bl ExtractSpeciesIndex lsls r0, 16 asrs r0, 16 movs r2, 0xE @@ -39479,7 +39479,7 @@ _0806B460: movs r0, 0 mov r2, r9 str r0, [r2] - bl sub_8083600 + bl GetLeaderEntity adds r5, r0, 0 bl EntityExists lsls r0, 24 @@ -39490,7 +39490,7 @@ _0806B460: ldrh r4, [r5, 0x4] b _0806B4AE .align 2, 0 -_0806B480: .4byte gUnknown_203B450 +_0806B480: .4byte gLeaderPokemon _0806B484: .4byte gRecruitedPokemonRef _0806B488: .4byte 0x000055aa _0806B48C: .4byte 0x00008df8 @@ -40317,7 +40317,7 @@ _0806BA72: ldrb r0, [r0] cmp r0, 0 beq _0806BB24 - bl sub_80441BC + bl IsBossBattle lsls r0, 24 cmp r0, 0 bne _0806BB24 @@ -40354,7 +40354,7 @@ _0806BB24: ldr r0, [sp, 0x1C] bl sub_806A6E8 ldr r0, [sp, 0x1C] - bl sub_807191C + bl LoadIQSkills ldr r3, [sp, 0x4C] cmp r3, 0 beq _0806BB3A @@ -40372,12 +40372,12 @@ _0806BB3C: pop {r1} bx r1 .align 2, 0 -_0806BB4C: .4byte gUnknown_80F4448 +_0806BB4C: .4byte gAdjacentTileOffsets _0806BB50: .4byte gUnknown_202F32C _0806BB54: .4byte 0xffff0000 _0806BB58: .4byte 0x0000ffff _0806BB5C: .4byte gUnknown_202EE0C -_0806BB60: .4byte gUnknown_203B450 +_0806BB60: .4byte gLeaderPokemon _0806BB64: .4byte gDungeonGlobalData _0806BB68: .4byte 0x00000644 thumb_func_end sub_806B8CC @@ -40856,7 +40856,7 @@ _0806BE12: adds r0, r6, r1 strb r7, [r0] mov r0, r8 - bl sub_8070774 + bl GetMovementSpeed movs r2, 0xAB lsls r2, 1 adds r1, r6, r2 @@ -40903,7 +40903,7 @@ _0806BF70: ldrb r3, [r3] bl sub_800F8D0 mov r0, r8 - bl sub_807191C + bl LoadIQSkills mov r0, r8 movs r1, 0 movs r2, 0 @@ -41125,7 +41125,7 @@ _0806C11E: cmp r1, 0 beq _0806C170 movs r0, 0 - bl sub_807E580 + bl GetWeather ldr r1, _0806C16C lsls r0, 24 lsrs r0, 22 @@ -43058,7 +43058,7 @@ sub_806CF98: _0806CFBE: cmp r5, 0x1 bne _0806CFCE - bl sub_804AF74 + bl IsWaterTileset lsls r0, 24 cmp r0, 0 beq _0806CFEE @@ -43092,7 +43092,7 @@ _0806CFF8: pop {r1} bx r1 .align 2, 0 -_0806D000: .4byte gUnknown_810ACC0 +_0806D000: .4byte gDungeonWaterType _0806D004: .4byte gDungeonGlobalData _0806D008: .4byte 0x00003a0e _0806D00C: .4byte gUnknown_8106EEF @@ -43425,7 +43425,7 @@ _0806D26C: beq _0806D2C2 adds r0, r6, 0 movs r1, 0xA - bl sub_8071858 + bl HasType lsls r0, 24 cmp r0, 0 bne _0806D2C2 @@ -43479,7 +43479,7 @@ _0806D2EE: beq _0806D328 adds r0, r6, 0 movs r1, 0x11 - bl sub_8071858 + bl HasType lsls r0, 24 cmp r0, 0 beq _0806D328 @@ -43773,7 +43773,7 @@ _0806D55C: bl sub_807A96C mov r0, r9 adds r1, r7, 0 - bl sub_806F450 + bl SetShopkeeperAggression mov r0, r9 bl GetEntityType cmp r0, 0x1 @@ -44196,7 +44196,7 @@ _0806D8C8: strb r0, [r4] _0806D8E0: adds r0, r7, 0 - bl sub_8069DCC + bl TargetTileInFront _0806D8E6: ldr r0, [r7, 0x70] adds r0, 0x46 @@ -45404,7 +45404,7 @@ _0806E26C: cmp r7, 0x2 bne _0806E2A0 ldr r0, [sp, 0x18] - bl sub_807723C + bl GetFlashFireStatus lsls r0, 24 cmp r0, 0 beq _0806E2A0 @@ -45477,7 +45477,7 @@ _0806E300: ldr r0, [sp, 0x24] movs r1, 0x80 adds r2, r4, 0 - bl sub_8071ACC + bl SetVisualFlags lsls r0, 24 lsrs r5, r0, 24 cmp r4, 0 @@ -45531,7 +45531,7 @@ _0806E36E: ldr r0, [sp, 0x24] movs r1, 0x2 adds r2, r4, 0 - bl sub_8071ACC + bl SetVisualFlags lsls r0, 24 lsrs r5, r0, 24 cmp r4, 0 @@ -45584,7 +45584,7 @@ _0806E3DA: ldr r0, [sp, 0x24] movs r1, 0x10 adds r2, r4, 0 - bl sub_8071ACC + bl SetVisualFlags lsls r0, 24 lsrs r5, r0, 24 cmp r4, 0 @@ -45638,7 +45638,7 @@ _0806E448: ldr r0, [sp, 0x24] movs r1, 0x20 adds r2, r4, 0 - bl sub_8071ACC + bl SetVisualFlags lsls r0, 24 lsrs r5, r0, 24 cmp r4, 0 @@ -45671,7 +45671,7 @@ _0806E486: bne _0806E4B8 mov r0, r8 adds r1, r7, 0 - bl sub_8071858 + bl HasType lsls r0, 24 cmp r0, 0 beq _0806E4B8 @@ -45688,7 +45688,7 @@ _0806E486: bl sub_800A34C _0806E4B8: mov r0, r8 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 @@ -45707,7 +45707,7 @@ _0806E4B8: bl sub_800A34C b _0806E53E .align 2, 0 -_0806E4E4: .4byte gUnknown_80F522C +_0806E4E4: .4byte gTypeEffectivenessChart _0806E4E8: .4byte gDungeonGlobalData _0806E4EC: .4byte gUnknown_8106F54 _0806E4F0: .4byte gUnknown_80F54B4 @@ -45867,8 +45867,8 @@ _0806E64C: .4byte 0x00000177 _0806E650: .4byte gUnknown_8106F0C thumb_func_end sub_806E100 - thumb_func_start sub_806E654 -sub_806E654: + thumb_func_start WeightWeakTypePicker +WeightWeakTypePicker: push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -45904,7 +45904,7 @@ _0806E686: cmp r4, 0x2 bne _0806E6A2 ldr r0, [sp, 0x14] - bl sub_807723C + bl GetFlashFireStatus lsls r0, 24 cmp r0, 0 bne _0806E6C6 @@ -45977,7 +45977,7 @@ _0806E6F0: strb r0, [r1] b _0806E73E .align 2, 0 -_0806E724: .4byte gUnknown_8106F6C +_0806E724: .4byte gTypeEffectivenessMultipliers _0806E728: .4byte gDungeonGlobalData _0806E72C: .4byte 0x00000179 _0806E730: @@ -46114,14 +46114,14 @@ _0806E824: beq _0806E84E mov r0, r9 adds r1, r4, 0 - bl sub_8071858 + bl HasType lsls r0, 24 cmp r0, 0 beq _0806E838 lsls r5, 1 _0806E838: mov r0, r9 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -46134,7 +46134,7 @@ _0806E84E: movs r0, 0x2 b _0806E894 .align 2, 0 -_0806E854: .4byte gUnknown_80F522C +_0806E854: .4byte gTypeEffectivenessChart _0806E858: lsls r5, 1 _0806E85A: @@ -46184,7 +46184,7 @@ _0806E894: _0806E8A4: .4byte gDungeonGlobalData _0806E8A8: .4byte 0x0000e277 _0806E8AC: .4byte 0x0000e278 - thumb_func_end sub_806E654 + thumb_func_end WeightWeakTypePicker thumb_func_start sub_806E8B0 sub_806E8B0: @@ -46223,14 +46223,14 @@ _0806E8E6: beq _0806E92C ldr r5, [r6, 0x70] adds r0, r6, 0 - bl sub_8070A58 + bl HasNegativeStatus adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 adds r0, r5, 0 movs r1, 0x1 adds r2, r4, 0 - bl sub_8071ACC + bl SetVisualFlags lsls r0, 24 lsrs r0, 24 cmp r4, 0 @@ -46274,7 +46274,7 @@ _0806E95A: lsls r1, 1 adds r0, r2, 0 adds r2, r4, 0 - bl sub_8071ACC + bl SetVisualFlags lsls r0, 24 lsrs r1, r0, 24 cmp r4, 0 @@ -46392,14 +46392,14 @@ _0806EA38: bne _0806EA90 mov r0, r9 ldr r5, [r0, 0x70] - bl sub_8070A58 + bl HasNegativeStatus adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 adds r0, r5, 0 movs r1, 0x8 adds r2, r4, 0 - bl sub_8071ACC + bl SetVisualFlags lsls r0, 24 lsrs r1, r0, 24 cmp r4, 0 @@ -46514,7 +46514,7 @@ _0806EB3A: lsls r0, 1 add r0, r10 ldr r0, [r0] - bl sub_8094450 + bl GetBellyRoundedUp adds r1, r0, 0 cmp r1, 0 bne _0806EB72 @@ -47131,7 +47131,7 @@ _0806F036: cmp r2, 0x2 bne _0806F0BC mov r0, r9 - bl sub_807723C + bl GetFlashFireStatus lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 @@ -47582,7 +47582,7 @@ _0806F3FC: movs r0, 0x1 b _0806F414 .align 2, 0 -_0806F408: .4byte gUnknown_80F522C +_0806F408: .4byte gTypeEffectivenessChart _0806F40C: .4byte gUnknown_80F54B4 _0806F410: add r1, sp, 0x10 @@ -47620,8 +47620,8 @@ _0806F440: bx r0 thumb_func_end sub_806F370 - thumb_func_start sub_806F450 -sub_806F450: + thumb_func_start SetShopkeeperAggression +SetShopkeeperAggression: push {r4-r6,lr} adds r5, r0, 0 ldr r4, [r1, 0x70] @@ -47647,7 +47647,7 @@ _0806F47A: pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_806F450 + thumb_func_end SetShopkeeperAggression thumb_func_start sub_806F480 sub_806F480: @@ -47679,7 +47679,7 @@ sub_806F4A4: lsrs r4, r1, 24 ldr r5, [r0, 0x70] movs r1, 0xE - bl sub_8071858 + bl HasType lsls r0, 24 cmp r0, 0 beq _0806F4CE @@ -47723,7 +47723,7 @@ _0806F4F6: pop {r1} bx r1 .align 2, 0 -_0806F4FC: .4byte gUnknown_80F522C +_0806F4FC: .4byte gTypeEffectivenessChart thumb_func_end sub_806F4A4 thumb_func_start sub_806F500 diff --git a/asm/code_807001C.s b/asm/code_807001C.s index 27c2707..96457c9 100644 --- a/asm/code_807001C.s +++ b/asm/code_807001C.s @@ -64,7 +64,7 @@ _0807007A: bl SendMessage b _0807019C .align 2, 0 -_08070088: .4byte gUnknown_80F954C +_08070088: .4byte gFrozenMessage _0807008C: ldr r0, _08070098 ldr r1, [r0] @@ -72,7 +72,7 @@ _0807008C: bl SendMessage b _0807019C .align 2, 0 -_08070098: .4byte gUnknown_80F956C +_08070098: .4byte gWrappedAroundMessage _0807009C: ldr r0, _080700A8 ldr r1, [r0] @@ -80,7 +80,7 @@ _0807009C: bl SendMessage b _0807019C .align 2, 0 -_080700A8: .4byte gUnknown_80F958C +_080700A8: .4byte gWrappedByMessage _080700AC: adds r0, r4, 0 adds r0, 0xBC @@ -100,7 +100,7 @@ _080700AC: bl SendMessage b _0807019C .align 2, 0 -_080700D0: .4byte gUnknown_80F95D8 +_080700D0: .4byte gBideMessage _080700D4: ldr r0, _080700E0 ldr r1, [r0] @@ -108,7 +108,7 @@ _080700D4: bl SendMessage b _0807019C .align 2, 0 -_080700E0: .4byte gUnknown_80F95A4 +_080700E0: .4byte gPausedMessage _080700E4: ldr r0, _080700F0 ldr r1, [r0] @@ -116,7 +116,7 @@ _080700E4: bl SendMessage b _0807019C .align 2, 0 -_080700F0: .4byte gUnknown_80F95BC +_080700F0: .4byte gInfatuatedMessage _080700F4: adds r0, r4, 0 adds r0, 0xC8 @@ -158,7 +158,7 @@ _0807012E: adds r6, 0x46 ldrb r1, [r6] adds r0, r5, 0 - bl sub_8070D6C + bl CannotMoveForward lsls r0, 24 cmp r0, 0 bne _08070166 @@ -261,17 +261,17 @@ _08070202: ldr r0, _08070208 b _08070278 .align 2, 0 -_08070208: .4byte gUnknown_80F954C +_08070208: .4byte gFrozenMessage _0807020C: ldr r0, _08070210 b _08070278 .align 2, 0 -_08070210: .4byte gUnknown_80F956C +_08070210: .4byte gWrappedAroundMessage _08070214: ldr r0, _08070218 b _08070278 .align 2, 0 -_08070218: .4byte gUnknown_80F958C +_08070218: .4byte gWrappedByMessage _0807021C: adds r0, r6, 0 adds r0, 0xBC @@ -303,12 +303,12 @@ _0807025C: ldr r0, _08070260 b _08070278 .align 2, 0 -_08070260: .4byte gUnknown_80F95A4 +_08070260: .4byte gPausedMessage _08070264: ldr r0, _08070268 b _08070278 .align 2, 0 -_08070268: .4byte gUnknown_80F95BC +_08070268: .4byte gInfatuatedMessage _0807026C: adds r0, r6, 0 adds r0, 0xC0 @@ -324,7 +324,7 @@ _08070280: movs r0, 0x1 b _08070322 .align 2, 0 -_08070284: .4byte gUnknown_80F95D8 +_08070284: .4byte gBideMessage _08070288: cmp r0, 0 beq _08070320 @@ -412,8 +412,8 @@ _08070322: bx r1 thumb_func_end sub_80701A4 - thumb_func_start sub_8070328 -sub_8070328: + thumb_func_start GetCrossableTerrain +GetCrossableTerrain: push {lr} lsls r0, 16 asrs r0, 16 @@ -433,7 +433,7 @@ _08070344: bx r1 .align 2, 0 _08070348: .4byte gUnknown_202F314 - thumb_func_end sub_8070328 + thumb_func_end GetCrossableTerrain thumb_func_start sub_807034C sub_807034C: @@ -450,7 +450,7 @@ sub_807034C: cmp r0, 0 bne _08070398 adds r0, r2, 0 - bl sub_8070328 + bl GetCrossableTerrain lsls r0, 24 lsrs r2, r0, 24 ldrh r0, [r4] @@ -519,7 +519,7 @@ sub_80703A0: ands r0, r1 cmp r0, 0 bne _08070456 - bl sub_80441E8 + bl IsFixedDungeon lsls r0, 24 cmp r0, 0 bne _08070400 @@ -537,7 +537,7 @@ sub_80703A0: _08070400: movs r1, 0x2 ldrsh r0, [r7, r1] - bl sub_8070328 + bl GetCrossableTerrain lsls r0, 24 lsrs r4, r0, 24 ldrh r0, [r5] @@ -590,8 +590,8 @@ _08070458: bx r1 thumb_func_end sub_80703A0 - thumb_func_start sub_8070460 -sub_8070460: + thumb_func_start CanCrossWalls +CanCrossWalls: push {r4,lr} adds r1, r0, 0 ldr r0, [r1, 0x70] @@ -608,7 +608,7 @@ sub_8070460: bne _08070492 movs r1, 0x2 ldrsh r0, [r4, r1] - bl sub_8070328 + bl GetCrossableTerrain lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 @@ -621,7 +621,7 @@ _08070494: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8070460 + thumb_func_end CanCrossWalls thumb_func_start sub_807049C sub_807049C: @@ -659,7 +659,7 @@ sub_807049C: cmp r0, 0x1 bne _0807055A _080704E2: - bl sub_80441E8 + bl IsFixedDungeon lsls r0, 24 cmp r0, 0 bne _08070504 @@ -677,7 +677,7 @@ _080704E2: _08070504: movs r1, 0x2 ldrsh r0, [r7, r1] - bl sub_8070328 + bl GetCrossableTerrain lsls r0, 24 lsrs r4, r0, 24 ldrh r0, [r5] @@ -767,7 +767,7 @@ sub_8070564: _080705A8: movs r1, 0x2 ldrsh r0, [r6, r1] - bl sub_8070328 + bl GetCrossableTerrain lsls r0, 24 lsrs r2, r0, 24 adds r3, r2, 0 @@ -843,7 +843,7 @@ sub_80705F0: cmp r0, 0x1 bne _0807069A _08070636: - bl sub_80441E8 + bl IsFixedDungeon lsls r0, 24 cmp r0, 0 bne _08070658 @@ -861,7 +861,7 @@ _08070636: _08070658: movs r1, 0x2 ldrsh r0, [r7, r1] - bl sub_8070328 + bl GetCrossableTerrain lsls r0, 24 lsrs r4, r0, 24 ldrh r0, [r5] @@ -940,7 +940,7 @@ sub_80706A4: cmp r0, r6 bne _0807076A _080706F2: - bl sub_80441E8 + bl IsFixedDungeon lsls r0, 24 cmp r0, 0 bne _08070714 @@ -958,7 +958,7 @@ _080706F2: _08070714: movs r1, 0x2 ldrsh r0, [r6, r1] - bl sub_8070328 + bl GetCrossableTerrain lsls r0, 24 lsrs r4, r0, 24 ldrh r0, [r5] @@ -1011,8 +1011,8 @@ _0807076C: bx r1 thumb_func_end sub_80706A4 - thumb_func_start sub_8070774 -sub_8070774: + thumb_func_start GetMovementSpeed +GetMovementSpeed: push {r4-r6,lr} adds r6, r0, 0 ldr r5, [r6, 0x70] @@ -1049,12 +1049,12 @@ _080707A8: adds r4, r0 adds r0, r6, 0 movs r1, 0x6 - bl sub_8071858 + bl HasType lsls r0, 24 cmp r0, 0 beq _080707D0 adds r0, r6, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 cmp r0, 0x7 @@ -1106,7 +1106,7 @@ _0807080A: _0807081C: .4byte 0x000001a3 _08070820: .4byte gDungeonGlobalData _08070824: .4byte 0x0000066e - thumb_func_end sub_8070774 + thumb_func_end GetMovementSpeed thumb_func_start sub_8070828 sub_8070828: @@ -1129,7 +1129,7 @@ _08070840: cmp r0, 0 beq _0807085E adds r0, r4, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 @@ -1143,7 +1143,7 @@ _0807085E: cmp r0, 0 beq _0807087C adds r0, r4, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1155,7 +1155,7 @@ _0807087C: ldr r0, [r4, 0x70] movs r1, 0x40 adds r2, r5, 0 - bl sub_8071ACC + bl SetVisualFlags lsls r0, 24 cmp r0, 0 beq _080708A0 @@ -1180,8 +1180,8 @@ _080708AE: bx r1 thumb_func_end sub_8070828 - thumb_func_start sub_80708B4 -sub_80708B4: + thumb_func_start SetMessageArgument_2 +SetMessageArgument_2: push {r4,r5,lr} adds r3, r0, 0 adds r4, r2, 0 @@ -1271,7 +1271,7 @@ _0807095A: .align 2, 0 _08070960: .4byte gRecruitedPokemonRef _08070964: .4byte 0x00008df8 - thumb_func_end sub_80708B4 + thumb_func_end SetMessageArgument_2 thumb_func_start sub_8070968 sub_8070968: @@ -1397,8 +1397,8 @@ _08070A50: .4byte gRecruitedPokemonRef _08070A54: .4byte 0x00008df8 thumb_func_end sub_80709C8 - thumb_func_start sub_8070A58 -sub_8070A58: + thumb_func_start HasNegativeStatus +HasNegativeStatus: push {r4,lr} ldr r0, [r0, 0x70] mov r12, r0 @@ -1510,10 +1510,10 @@ _08070B1E: bx r1 .align 2, 0 _08070B24: .4byte 0x0000010d - thumb_func_end sub_8070A58 + thumb_func_end HasNegativeStatus - thumb_func_start sub_8070B28 -sub_8070B28: + thumb_func_start IsSleeping +IsSleeping: push {lr} ldr r0, [r0, 0x70] adds r0, 0xA8 @@ -1531,10 +1531,10 @@ _08070B40: _08070B42: pop {r1} bx r1 - thumb_func_end sub_8070B28 + thumb_func_end IsSleeping - thumb_func_start sub_8070B48 -sub_8070B48: + thumb_func_start HasQuarterHPOrLess +HasQuarterHPOrLess: push {lr} ldr r0, [r0, 0x70] adds r1, r0, 0 @@ -1556,6 +1556,6 @@ _08070B66: _08070B68: pop {r1} bx r1 - thumb_func_end sub_8070B48 + thumb_func_end HasQuarterHPOrLess .align 2, 0 diff --git a/asm/code_8070D04.s b/asm/code_8070D04.s index 43fc95e..cc3c9f2 100644 --- a/asm/code_8070D04.s +++ b/asm/code_8070D04.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_8070D04 -sub_8070D04: + thumb_func_start CannotAttack +CannotAttack: push {lr} adds r3, r0, 0 lsls r1, 24 @@ -60,17 +60,17 @@ _08070D64: _08070D66: pop {r1} bx r1 - thumb_func_end sub_8070D04 + thumb_func_end CannotAttack - thumb_func_start sub_8070D6C -sub_8070D6C: + thumb_func_start CannotMoveForward +CannotMoveForward: push {r4-r6,lr} adds r4, r0, 0 adds r6, r1, 0 ldr r0, [r4, 0x70] movs r1, 0x2 ldrsh r0, [r0, r1] - bl sub_8070328 + bl GetCrossableTerrain lsls r0, 24 lsrs r5, r0, 24 movs r2, 0x4 @@ -96,7 +96,7 @@ sub_8070D6C: ldr r0, [r2, 0x10] cmp r0, 0 bne _08070E34 - bl sub_80441E8 + bl IsFixedDungeon lsls r0, 24 cmp r0, 0 bne _08070E04 @@ -115,7 +115,7 @@ _08070DD2: movs r5, 0x3 b _08070E04 .align 2, 0 -_08070DD8: .4byte gUnknown_80F4448 +_08070DD8: .4byte gAdjacentTileOffsets _08070DDC: adds r0, r4, 0 movs r1, 0xC @@ -158,14 +158,14 @@ _08070E04: movs r0, 0x1 b _08070E36 .align 2, 0 -_08070E30: .4byte gUnknown_8106FAD +_08070E30: .4byte gDirectionBitMasks _08070E34: movs r0, 0 _08070E36: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_8070D6C + thumb_func_end CannotMoveForward thumb_func_start sub_8070E3C sub_8070E3C: @@ -176,7 +176,7 @@ sub_8070E3C: ldr r0, [r4, 0x70] movs r1, 0x2 ldrsh r0, [r0, r1] - bl sub_8070328 + bl GetCrossableTerrain lsls r0, 24 lsrs r5, r0, 24 movs r2, 0 @@ -206,7 +206,7 @@ sub_8070E3C: cmp r0, 0x1 bne _08070F0C _08070E8A: - bl sub_80441E8 + bl IsFixedDungeon lsls r0, 24 cmp r0, 0 bne _08070EDC @@ -225,7 +225,7 @@ _08070EAC: movs r5, 0x3 b _08070EDC .align 2, 0 -_08070EB0: .4byte gUnknown_80F4448 +_08070EB0: .4byte gAdjacentTileOffsets _08070EB4: adds r0, r4, 0 movs r1, 0xC @@ -323,7 +323,7 @@ sub_8070F14: movs r0, 0x1 b _08070F7A .align 2, 0 -_08070F70: .4byte gUnknown_80F4448 +_08070F70: .4byte gAdjacentTileOffsets _08070F74: .4byte gUnknown_8106FBD _08070F78: movs r0, 0 @@ -341,7 +341,7 @@ sub_8070F80: ldr r0, [r4, 0x70] movs r1, 0x2 ldrsh r0, [r0, r1] - bl sub_8070328 + bl GetCrossableTerrain lsls r0, 24 lsrs r5, r0, 24 movs r2, 0x4 @@ -371,7 +371,7 @@ sub_8070F80: cmp r0, 0x1 bne _08071050 _08070FCC: - bl sub_80441E8 + bl IsFixedDungeon lsls r0, 24 cmp r0, 0 bne _08071020 @@ -390,7 +390,7 @@ _08070FEE: movs r5, 0x3 b _08071020 .align 2, 0 -_08070FF4: .4byte gUnknown_80F4448 +_08070FF4: .4byte gAdjacentTileOffsets _08070FF8: adds r0, r4, 0 movs r1, 0xC @@ -450,7 +450,7 @@ sub_8071058: ldr r0, [r5, 0x70] movs r1, 0x2 ldrsh r0, [r0, r1] - bl sub_8070328 + bl GetCrossableTerrain lsls r0, 24 lsrs r6, r0, 24 movs r2, 0x4 @@ -485,7 +485,7 @@ sub_8071058: cmp r0, 0 bne _08071130 _080710AE: - bl sub_80441E8 + bl IsFixedDungeon lsls r0, 24 cmp r0, 0 bne _08071100 @@ -504,7 +504,7 @@ _080710D0: movs r6, 0x3 b _08071100 .align 2, 0 -_080710D4: .4byte gUnknown_80F4448 +_080710D4: .4byte gAdjacentTileOffsets _080710D8: adds r0, r5, 0 movs r1, 0xC @@ -556,15 +556,15 @@ _08071132: bx r1 thumb_func_end sub_8071058 - thumb_func_start sub_8071138 -sub_8071138: + thumb_func_start CanAttackInFront +CanAttackInFront: push {r4-r6,lr} adds r4, r0, 0 adds r6, r1, 0 ldr r0, [r4, 0x70] movs r1, 0x2 ldrsh r0, [r0, r1] - bl sub_8070328 + bl GetCrossableTerrain lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 @@ -598,7 +598,7 @@ _08071152: cmp r0, 0x1 bne _0807120C _0807118A: - bl sub_80441E8 + bl IsFixedDungeon lsls r0, 24 cmp r0, 0 bne _080711DC @@ -617,7 +617,7 @@ _080711AC: movs r5, 0x3 b _080711DC .align 2, 0 -_080711B0: .4byte gUnknown_80F4448 +_080711B0: .4byte gAdjacentTileOffsets _080711B4: adds r0, r4, 0 movs r1, 0xC @@ -660,17 +660,17 @@ _080711DC: movs r0, 0x1 b _0807120E .align 2, 0 -_08071208: .4byte gUnknown_8106FD5 +_08071208: .4byte gDirectionBitMasks_2 _0807120C: movs r0, 0 _0807120E: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_8071138 + thumb_func_end CanAttackInFront - thumb_func_start sub_8071214 -sub_8071214: + thumb_func_start CanMoveForward +CanMoveForward: push {r4-r7,lr} mov r7, r8 push {r7} @@ -680,7 +680,7 @@ sub_8071214: ldr r0, [r4, 0x70] movs r1, 0x2 ldrsh r0, [r0, r1] - bl sub_8070328 + bl GetCrossableTerrain lsls r0, 24 lsrs r6, r0, 24 movs r0, 0 @@ -774,7 +774,7 @@ _080712B8: cmp r0, 0 bne _0807137E _080712E6: - bl sub_80441E8 + bl IsFixedDungeon lsls r0, 24 cmp r0, 0 bne _08071348 @@ -793,10 +793,10 @@ _08071308: movs r6, 0x3 b _08071348 .align 2, 0 -_0807130C: .4byte gUnknown_80F4448 +_0807130C: .4byte gAdjacentTileOffsets _08071310: .4byte gDungeonGlobalData _08071314: .4byte 0x00000671 -_08071318: .4byte gUnknown_810ACC0 +_08071318: .4byte gDungeonWaterType _0807131C: .4byte 0x00003a0e _08071320: adds r0, r4, 0 @@ -841,7 +841,7 @@ _08071348: movs r0, 0x1 b _08071380 .align 2, 0 -_08071374: .4byte gUnknown_8106FDD +_08071374: .4byte gDirectionBitMasks_3 _08071378: movs r0, 0x1 mov r3, r8 @@ -854,19 +854,19 @@ _08071380: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_8071214 + thumb_func_end CanMoveForward - thumb_func_start sub_807138C -sub_807138C: + thumb_func_start IsAtJunction +IsAtJunction: push {r4,r5,lr} adds r4, r0, 0 ldr r0, [r4, 0x70] movs r1, 0x2 ldrsh r0, [r0, r1] - bl sub_8070328 + bl GetCrossableTerrain lsls r0, 24 lsrs r5, r0, 24 - bl sub_80441E8 + bl IsFixedDungeon lsls r0, 24 cmp r0, 0 bne _080713E2 @@ -961,7 +961,7 @@ _08071458: movs r0, 0 b _0807146A .align 2, 0 -_0807145C: .4byte gUnknown_810ACC0 +_0807145C: .4byte gDungeonWaterType _08071460: .4byte gDungeonGlobalData _08071464: .4byte 0x00003a0e _08071468: @@ -970,10 +970,10 @@ _0807146A: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_807138C + thumb_func_end IsAtJunction - thumb_func_start sub_8071470 -sub_8071470: + thumb_func_start ShouldAvoidFirstHit +ShouldAvoidFirstHit: push {r4,lr} lsls r1, 24 lsrs r4, r1, 24 @@ -992,6 +992,6 @@ _0807148C: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8071470 + thumb_func_end ShouldAvoidFirstHit .align 2, 0 diff --git a/asm/code_8071518.s b/asm/code_8071518.s index 5f6be5b..7c80895 100644 --- a/asm/code_8071518.s +++ b/asm/code_8071518.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_8071518 -sub_8071518: + thumb_func_start ShouldAvoidEnemies_2 +ShouldAvoidEnemies_2: push {r4,r5,lr} adds r4, r0, 0 lsls r1, 24 @@ -20,16 +20,16 @@ sub_8071518: _0807152E: adds r0, r4, 0 adds r1, r5, 0 - bl sub_8071540 + bl CheckRunAwayVisualFlag movs r0, 0x1 _08071538: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_8071518 + thumb_func_end ShouldAvoidEnemies_2 - thumb_func_start sub_8071540 -sub_8071540: + thumb_func_start CheckRunAwayVisualFlag +CheckRunAwayVisualFlag: push {r4-r7,lr} adds r5, r0, 0 lsls r1, 24 @@ -59,7 +59,7 @@ sub_8071540: _08071576: adds r0, r6, 0 movs r1, 0x4 - bl sub_8071ACC + bl SetVisualFlags lsls r0, 24 lsrs r0, 24 cmp r7, 0 @@ -67,15 +67,15 @@ _08071576: cmp r0, 0 beq _08071590 adds r0, r5, 0 - bl sub_8042910 + bl ShowVisualFlags _08071590: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_8071540 + thumb_func_end CheckRunAwayVisualFlag - thumb_func_start sub_8071598 -sub_8071598: + thumb_func_start CanTarget +CanTarget: push {r4-r6,lr} adds r6, r0, 0 lsls r2, 24 @@ -128,7 +128,7 @@ _080715EC: cmp r0, 0x1 bne _0807160A adds r0, r6, 0 - bl sub_8071884 + bl CanSeeInvisible lsls r0, 24 cmp r0, 0 bne _0807160A @@ -199,7 +199,7 @@ _08071670: bx r1 .align 2, 0 _08071678: .4byte gUnknown_8106FE5 - thumb_func_end sub_8071598 + thumb_func_end CanTarget thumb_func_start sub_807167C sub_807167C: diff --git a/asm/code_8071858.s b/asm/code_8071858.s index 098dcc8..d0cb318 100644 --- a/asm/code_8071858.s +++ b/asm/code_8071858.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_8071858 -sub_8071858: + thumb_func_start HasType +HasType: push {lr} lsls r1, 24 lsrs r1, 24 @@ -32,6 +32,6 @@ _0807187E: _08071880: pop {r1} bx r1 - thumb_func_end sub_8071858 + thumb_func_end HasType .align 2, 0 diff --git a/asm/code_80718D8.s b/asm/code_80718D8.s index c1062f4..8fb9e78 100644 --- a/asm/code_80718D8.s +++ b/asm/code_80718D8.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_807191C -sub_807191C: + thumb_func_start LoadIQSkills +LoadIQSkills: push {r4-r6,lr} ldr r5, [r0, 0x70] ldrb r1, [r5, 0x6] @@ -48,7 +48,7 @@ _08071968: strb r0, [r1] b _080719BE .align 2, 0 -_08071974: .4byte gUnknown_80F59C4 +_08071974: .4byte gItemMasterMinWildLevel _08071978: adds r0, r5, 0 adds r0, 0x90 @@ -88,10 +88,10 @@ _080719BE: pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_807191C + thumb_func_end LoadIQSkills - thumb_func_start sub_80719C4 -sub_80719C4: + thumb_func_start CanSeeTeammate +CanSeeTeammate: push {r4-r6,lr} adds r5, r0, 0 ldr r0, [r5, 0x70] @@ -138,10 +138,10 @@ _08071A0C: .align 2, 0 _08071A14: .4byte gDungeonGlobalData _08071A18: .4byte 0x0001357c - thumb_func_end sub_80719C4 + thumb_func_end CanSeeTeammate - thumb_func_start sub_8071A1C -sub_8071A1C: + thumb_func_start GetMoveType_2 +GetMoveType_2: push {lr} adds r3, r0, 0 adds r2, r1, 0 @@ -162,7 +162,7 @@ _08071A38: _08071A3E: pop {r1} bx r1 - thumb_func_end sub_8071A1C + thumb_func_end GetMoveType_2 thumb_func_start sub_8071A44 sub_8071A44: @@ -248,8 +248,8 @@ _08071AC4: bx r1 thumb_func_end sub_8071A8C - thumb_func_start sub_8071ACC -sub_8071ACC: + thumb_func_start SetVisualFlags +SetVisualFlags: push {r4,r5,lr} adds r3, r0, 0 lsls r1, 16 @@ -318,7 +318,7 @@ _08071B42: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_8071ACC + thumb_func_end SetVisualFlags thumb_func_start sub_8071B48 sub_8071B48: @@ -746,7 +746,7 @@ _08071E68: ldr r0, _08071EEC adds r1, r6, 0 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 ldr r0, _08071EF0 ldr r2, [r0] ldr r0, [sp, 0xB4] @@ -1128,7 +1128,7 @@ sub_807218C: ldr r0, _080721C8 adds r1, r5, 0 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 adds r0, r4, 0 bl sub_8070BC0 lsls r0, 24 @@ -1295,7 +1295,7 @@ _080722E2: movs r2, 0x1 bl PrintFieldMessage _080722F4: - bl sub_8083600 + bl GetLeaderEntity movs r1, 0 bl sub_806A2BC add sp, 0x190 @@ -1477,7 +1477,7 @@ _08072456: ldr r0, _08072478 adds r1, r5, 0 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 ldr r0, _0807247C ldr r1, [r0] mov r0, r10 @@ -1499,7 +1499,7 @@ _0807248A: ldr r0, _0807258C adds r1, r5, 0 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 ldr r0, _08072590 ldr r1, [r0] mov r0, r10 @@ -1581,7 +1581,7 @@ _08072524: str r3, [r6, 0x4] _0807252E: mov r0, r10 - bl sub_807191C + bl LoadIQSkills mov r0, r10 bl sub_8079764 ldr r0, [r7] @@ -1812,7 +1812,7 @@ _080726DE: str r1, [r6, 0x4] _080726E8: ldr r0, [sp, 0x10] - bl sub_807191C + bl LoadIQSkills ldr r0, [sp, 0x10] bl sub_8079764 ldr r0, [r7] @@ -1834,7 +1834,7 @@ _08072710: ldr r0, _0807273C adds r1, r5, 0 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 ldrb r1, [r5, 0x9] ldr r0, [sp, 0x20] cmp r1, r0 @@ -2038,7 +2038,7 @@ _08072894: ldr r0, _080728C8 mov r1, r8 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 ldr r0, _080728CC add r1, sp, 0x60 bl strcpy @@ -2428,7 +2428,7 @@ sub_8072B78: adds r0, r4, 0 adds r1, r6, 0 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 adds r4, 0x50 adds r0, r4, 0 adds r1, r5, 0 @@ -2473,7 +2473,7 @@ sub_8072B78: .align 2, 0 _08072BFC: .4byte gAvailablePokemonNames _08072C00: .4byte gUnknown_80FE2EC -_08072C04: .4byte gUnknown_80F4448 +_08072C04: .4byte gAdjacentTileOffsets _08072C08: adds r4, 0x4 adds r5, 0x1 @@ -2536,11 +2536,11 @@ _08072C74: bx r0 .align 2, 0 _08072C80: .4byte 0x0000013d -_08072C84: .4byte gUnknown_80F4448 +_08072C84: .4byte gAdjacentTileOffsets thumb_func_end sub_8072B78 - thumb_func_start sub_8072C88 -sub_8072C88: + thumb_func_start TargetLeader +TargetLeader: push {lr} ldr r1, [r0, 0x70] ldrb r0, [r1, 0x6] @@ -2549,7 +2549,7 @@ sub_8072C88: adds r0, r1, 0 adds r0, 0x94 ldrb r0, [r0] - bl sub_808EAFC + bl TacticsTargetLeader lsls r0, 24 lsrs r0, 24 b _08072CA4 @@ -2558,17 +2558,17 @@ _08072CA2: _08072CA4: pop {r1} bx r1 - thumb_func_end sub_8072C88 + thumb_func_end TargetLeader - thumb_func_start sub_8072CA8 -sub_8072CA8: + thumb_func_start GetLeaderEntityIfVisible +GetLeaderEntityIfVisible: push {r4,r5,lr} adds r5, r0, 0 ldr r0, [r5, 0x70] ldrb r0, [r0, 0x6] cmp r0, 0 bne _08072CEC - bl sub_8083600 + bl GetLeaderEntity adds r4, r0, 0 cmp r4, 0 beq _08072CEC @@ -2581,13 +2581,13 @@ sub_8072CA8: adds r1, r4, 0 movs r2, 0 movs r3, 0 - bl sub_8071598 + bl CanTarget lsls r0, 24 cmp r0, 0 bne _08072CEC adds r0, r5, 0 adds r1, r4, 0 - bl sub_8045A00 + bl CanSee_2 lsls r0, 24 cmp r0, 0 beq _08072CEC @@ -2599,7 +2599,7 @@ _08072CEE: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_8072CA8 + thumb_func_end GetLeaderEntityIfVisible thumb_func_start sub_8072CF4 sub_8072CF4: @@ -2657,7 +2657,7 @@ _08072D58: _08072D64: adds r0, r4, 0 movs r1, 0 - bl sub_8070D04 + bl CannotAttack lsls r0, 24 cmp r0, 0 beq _08072D86 @@ -2693,12 +2693,12 @@ _08072DA4: bge _08072D92 adds r0, r4, 0 movs r1, 0 - bl sub_8045028 + bl IsNotAttacking lsls r0, 24 cmp r0, 0 bne _08072E08 adds r0, r4, 0 - bl sub_807520C + bl UseAttack lsls r0, 24 cmp r0, 0 beq _08072DF0 @@ -2895,7 +2895,7 @@ _08072F84: bne _08072FCC adds r0, r4, 0 adds r1, r3, 0 - bl sub_8070D6C + bl CannotMoveForward lsls r0, 24 cmp r0, 0 bne _08072FCC @@ -2914,7 +2914,7 @@ _08072FDA: strb r0, [r1] b _080731B8 .align 2, 0 -_08072FE0: .4byte gUnknown_80F4448 +_08072FE0: .4byte gAdjacentTileOffsets _08072FE4: .4byte 0x00000147 _08072FE8: ldrh r1, [r4, 0x6] @@ -3327,12 +3327,12 @@ _08073332: mov r9, r2 mov r0, r8 movs r1, 0x1 - bl sub_8070D04 + bl CannotAttack lsls r0, 24 cmp r0, 0 bne _0807336E mov r0, r8 - bl sub_8070B28 + bl IsSleeping lsls r0, 24 cmp r0, 0 bne _08073364 @@ -3416,7 +3416,7 @@ _080733DE: mov r0, r8 adds r1, r5, 0 movs r2, 0x1 - bl sub_80573CC + bl IsMoveUsable_2 lsls r0, 24 cmp r0, 0 bne _08073440 @@ -3537,7 +3537,7 @@ _080734CC: mov r8, r1 adds r0, r7, 0 movs r1, 0x1 - bl sub_8070D04 + bl CannotAttack lsls r0, 24 cmp r0, 0 beq _080734F4 @@ -3552,7 +3552,7 @@ _080734EC: .4byte 0x000135cc _080734F0: .4byte 0x00000165 _080734F4: adds r0, r7, 0 - bl sub_8070B28 + bl IsSleeping lsls r0, 24 cmp r0, 0 bne _08073514 @@ -3627,7 +3627,7 @@ _0807357A: adds r1, r5, 0 movs r2, 0x1 str r3, [sp, 0x14] - bl sub_80573CC + bl IsMoveUsable_2 lsls r0, 24 ldr r3, [sp, 0x14] cmp r0, 0 diff --git a/asm/code_80739DC.s b/asm/code_80739DC.s index 86a68d1..18efc16 100644 --- a/asm/code_80739DC.s +++ b/asm/code_80739DC.s @@ -53,7 +53,7 @@ _08073A0A: adds r1, r4, 0 movs r2, 0 movs r3, 0 - bl sub_8071598 + bl CanTarget lsls r0, 24 cmp r0, 0 bne _08073A88 @@ -61,7 +61,7 @@ _08073A0A: b _08073A6A .align 2, 0 _08073A44: .4byte gNumPotentialTargets -_08073A48: .4byte gUnknown_202F350 +_08073A48: .4byte gTargetAhead _08073A4C: .4byte gDungeonGlobalData _08073A50: .4byte 0x000135cc _08073A54: @@ -69,7 +69,7 @@ _08073A54: adds r1, r4, 0 movs r2, 0 movs r3, 0x1 - bl sub_8071598 + bl CanTarget lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -88,7 +88,7 @@ _08073A6A: adds r1, r4, 0 mov r2, r9 adds r3, r6, 0 - bl sub_8073B78 + bl TargetThrownItem _08073A88: adds r7, 0x1 cmp r7, 0x13 @@ -146,7 +146,7 @@ _08073AC0: adds r1, r4, 0 movs r2, 0 movs r3, 0x1 - bl sub_8071598 + bl CanTarget lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -213,8 +213,8 @@ _08073B70: .4byte gDungeonGlobalData _08073B74: .4byte 0x000135cc thumb_func_end FindRockItemTargets - thumb_func_start sub_8073B78 -sub_8073B78: + thumb_func_start TargetThrownItem +TargetThrownItem: push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -367,7 +367,7 @@ _08073C7E: adds r1, r5, 0 adds r2, r6, 0 movs r3, 0xA - bl sub_807C9F8 + bl IsTargetStraightAhead lsls r0, 24 cmp r0, 0 beq _08073CDC @@ -390,7 +390,7 @@ _08073C7E: bl EvaluateItem b _08073CD2 .align 2, 0 -_08073CC0: .4byte gUnknown_202F350 +_08073CC0: .4byte gTargetAhead _08073CC4: .4byte gPotentialTargetDirections _08073CC8: .4byte gNumPotentialTargets _08073CCC: .4byte gPotentialTargetWeights @@ -412,7 +412,7 @@ _08073CDC: bx r0 .align 2, 0 _08073CEC: .4byte gNumPotentialTargets - thumb_func_end sub_8073B78 + thumb_func_end TargetThrownItem thumb_func_start sub_8073CF0 sub_8073CF0: @@ -514,7 +514,7 @@ _08073D80: _08073D98: adds r0, r6, 0 movs r1, 0x1 - bl sub_8071518 + bl ShouldAvoidEnemies_2 lsls r0, 24 cmp r0, 0 beq _08073DC8 @@ -950,7 +950,7 @@ _08074102: adds r0, r5, 0 bl sub_80444F4 movs r0, 0 - bl sub_807520C + bl UseAttack adds r0, r5, 0 bl EntityExists lsls r0, 24 @@ -1094,11 +1094,11 @@ _0807421E: str r0, [r4] movs r6, 0x1 adds r0, r7, 0 - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0x13 ble _0807425C ldr r0, [r4] - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0x13 bgt _0807425C ldr r0, _08074368 @@ -1106,14 +1106,14 @@ _0807421E: mov r9, r0 _0807425C: adds r0, r7, 0 - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0x9 ble _0807427C movs r0, 0x9E lsls r0, 1 add r0, r8 ldr r0, [r0] - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0x9 bgt _0807427C ldr r0, _0807436C @@ -1124,7 +1124,7 @@ _0807427C: lsls r4, 1 add r4, r8 ldr r0, [r4] - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0 bne _08074298 add r0, sp, 0x20 @@ -1134,7 +1134,7 @@ _0807427C: str r0, [r4] _08074298: ldr r0, [r4] - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0 bge _080742AE add r0, sp, 0x24 @@ -1144,14 +1144,14 @@ _08074298: str r0, [r4] _080742AE: ldr r0, [r4] - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0 bne _08074384 bl sub_805E804 adds r0, r5, 0 bl sub_80444F4 movs r0, 0 - bl sub_807520C + bl UseAttack adds r0, r5, 0 bl EntityExists lsls r0, 24 @@ -1212,7 +1212,7 @@ _08074320: movs r0, 0x1 strb r0, [r1] ldr r0, [r4] - bl sub_8094450 + bl GetBellyRoundedUp cmp r0, 0 beq _08074390 b _080743B0 @@ -1275,14 +1275,14 @@ _080743CA: cmp r0, 0 bne _08074480 adds r0, r5, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 bne _0807441C adds r0, r5, 0 movs r1, 0x6 - bl sub_8071858 + bl HasType lsls r0, 24 cmp r0, 0 bne _08074466 @@ -1303,26 +1303,26 @@ _08074414: .4byte 0x0000e266 _08074418: .4byte gUnknown_80F4F8E _0807441C: adds r0, r5, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 bne _08074466 adds r0, r5, 0 movs r1, 0x9 - bl sub_8071858 + bl HasType lsls r0, 24 cmp r0, 0 bne _08074466 adds r0, r5, 0 movs r1, 0xD - bl sub_8071858 + bl HasType lsls r0, 24 cmp r0, 0 bne _08074466 adds r0, r5, 0 movs r1, 0x11 - bl sub_8071858 + bl HasType lsls r0, 24 cmp r0, 0 bne _08074466 @@ -1363,12 +1363,12 @@ _08074480: cmp r4, r0 bge _080744D8 adds r0, r5, 0 - bl sub_8070A58 + bl HasNegativeStatus lsls r0, 24 cmp r0, 0 beq _080744D8 movs r0, 0 - bl sub_807520C + bl UseAttack adds r0, r5, 0 bl EntityExists lsls r0, 24 @@ -1419,7 +1419,7 @@ _0807450C: cmp r0, 0x4 bne _0807453C movs r0, 0 - bl sub_807520C + bl UseAttack adds r0, r5, 0 bl EntityExists lsls r0, 24 @@ -1454,7 +1454,7 @@ _0807453C: bne _0807459C _0807455C: movs r0, 0 - bl sub_807520C + bl UseAttack adds r0, r5, 0 bl EntityExists lsls r0, 24 @@ -1511,7 +1511,7 @@ _080745B6: bne _08074696 _080745D0: movs r0, 0 - bl sub_807520C + bl UseAttack adds r0, r5, 0 bl EntityExists lsls r0, 24 @@ -1574,7 +1574,7 @@ _0807464E: movs r4, 0x1D _0807465A: movs r0, 0 - bl sub_807520C + bl UseAttack adds r0, r5, 0 bl EntityExists lsls r0, 24 @@ -1633,7 +1633,7 @@ _080746B0: bne _08074786 _080746D0: movs r0, 0 - bl sub_807520C + bl UseAttack adds r0, r5, 0 bl EntityExists lsls r0, 24 @@ -1687,7 +1687,7 @@ _08074730: bne _08074786 _08074748: movs r0, 0 - bl sub_807520C + bl UseAttack adds r0, r5, 0 bl EntityExists lsls r0, 24 @@ -1749,7 +1749,7 @@ _080747B0: bne _08074802 _080747C8: movs r0, 0 - bl sub_807520C + bl UseAttack adds r0, r5, 0 bl EntityExists lsls r0, 24 @@ -1808,7 +1808,7 @@ _08074834: ldrh r0, [r0] strb r0, [r2] movs r0, 0 - bl sub_807520C + bl UseAttack adds r0, r5, 0 bl EntityExists lsls r0, 24 @@ -1913,7 +1913,7 @@ _08074906: adds r0, r5, 0 bl sub_80444F4 movs r0, 0 - bl sub_807520C + bl UseAttack adds r0, r5, 0 bl EntityExists lsls r0, 24 @@ -1993,7 +1993,7 @@ _080749AE: cmp r0, 0 bne _08074A46 movs r0, 0 - bl sub_807520C + bl UseAttack adds r0, r5, 0 bl EntityExists lsls r0, 24 @@ -2071,7 +2071,7 @@ _08074A46: bne _08074AD4 adds r0, r5, 0 movs r1, 0 - bl sub_8070D04 + bl CannotAttack lsls r0, 24 cmp r0, 0 bne _08074AD4 @@ -2082,7 +2082,7 @@ _08074A46: cmp r6, 0 bne _08074AD4 movs r0, 0 - bl sub_807520C + bl UseAttack add r4, sp, 0x28 ldr r1, _08074B48 adds r0, r4, 0 @@ -2168,8 +2168,8 @@ _08074B4C: .4byte gAvailablePokemonNames _08074B50: .4byte gUnknown_80FABD8 thumb_func_end sub_8074094 - thumb_func_start sub_8074B54 -sub_8074B54: + thumb_func_start TickStatusHeal +TickStatusHeal: push {r4-r7,lr} mov r7, r8 push {r7} @@ -2245,7 +2245,7 @@ _08074BDA: cmp r0, 0 beq _08074BFE adds r0, r7, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 @@ -2686,7 +2686,7 @@ _08074F5C: adds r0, r2 ldr r4, [r0] adds r0, r7, 0 - bl sub_8070774 + bl GetMovementSpeed adds r5, r0, 0 cmp r4, r5 beq _08074F96 @@ -2711,7 +2711,7 @@ _08074FA0: .4byte gPtrStenchWavedOffMessage _08074FA4: .4byte 0x0000010d _08074FA8: .4byte gAvailablePokemonNames _08074FAC: .4byte gUnknown_80FA124 - thumb_func_end sub_8074B54 + thumb_func_end TickStatusHeal thumb_func_start sub_8074FB0 sub_8074FB0: @@ -3019,8 +3019,8 @@ _080751F8: _08075208: .4byte gUnknown_202F378 thumb_func_end sub_8075050 - thumb_func_start sub_807520C -sub_807520C: + thumb_func_start UseAttack +UseAttack: push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -3566,7 +3566,7 @@ _0807566C: bx r1 .align 2, 0 _0807567C: .4byte gDungeonGlobalData - thumb_func_end sub_807520C + thumb_func_end UseAttack thumb_func_start sub_8075680 sub_8075680: @@ -3922,7 +3922,7 @@ sub_8075900: ands r0, r1 cmp r0, 0 beq _0807597A - bl sub_8083600 + bl GetLeaderEntity ldr r1, _08075988 ldr r1, [r1] bl SendMessage diff --git a/asm/code_8075BA4.s b/asm/code_8075BA4.s index f925cc2..3981d7a 100644 --- a/asm/code_8075BA4.s +++ b/asm/code_8075BA4.s @@ -26,7 +26,7 @@ sub_8075BA4: ands r1, r2 strb r1, [r0] adds r0, r5, 0 - bl sub_8069DCC + bl TargetTileInFront b _08075BEC _08075BD0: adds r0, r4, 0 @@ -40,7 +40,7 @@ _08075BD0: adds r1, 0x46 strb r0, [r1] adds r0, r5, 0 - bl sub_8069DCC + bl TargetTileInFront _08075BEC: pop {r4,r5} pop {r0} @@ -683,7 +683,7 @@ _080760D0: ldr r0, _08076100 adds r1, r5, 0 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 adds r1, r5, 0 adds r1, 0xBC ldrb r0, [r1] @@ -786,7 +786,7 @@ _080761A8: ldr r0, _080761E8 adds r1, r5, 0 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 adds r1, r5, 0 adds r1, 0xBC ldrb r0, [r1] @@ -867,7 +867,7 @@ _0807624A: ldr r0, _08076274 mov r1, r8 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 adds r0, r5, 0 movs r1, 0x42 bl HasAbility @@ -887,7 +887,7 @@ _08076278: .4byte gUnknown_80FCE5C _0807627C: adds r0, r5, 0 movs r1, 0x2 - bl sub_8071858 + bl HasType lsls r0, 24 cmp r0, 0 beq _0807629C @@ -932,7 +932,7 @@ _080762CC: bl sub_80522F4 b _080763DA .align 2, 0 -_080762D8: .4byte gUnknown_810ACC0 +_080762D8: .4byte gDungeonWaterType _080762DC: .4byte gDungeonGlobalData _080762E0: .4byte 0x00003a0e _080762E4: .4byte gUnknown_80FEBBC @@ -1027,7 +1027,7 @@ _08076362: ldr r0, _080763F0 mov r1, r8 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 ldr r0, _080763F4 ldr r2, [r0] adds r0, r7, 0 @@ -1060,7 +1060,7 @@ _080763DA: bx r0 .align 2, 0 _080763E8: .4byte gUnknown_80FB564 -_080763EC: .4byte gUnknown_80F4448 +_080763EC: .4byte gAdjacentTileOffsets _080763F0: .4byte gAvailablePokemonNames _080763F4: .4byte gUnknown_80FF01C thumb_func_end sub_8076210 @@ -1098,7 +1098,7 @@ _0807642C: ldr r0, _08076454 mov r1, r8 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 adds r0, r5, 0 movs r1, 0x14 bl HasItem @@ -1134,13 +1134,13 @@ _08076478: .4byte gUnknown_80FCEB0 _0807647C: adds r0, r5, 0 movs r1, 0x8 - bl sub_8071858 + bl HasType lsls r0, 24 cmp r0, 0 bne _0807649A adds r0, r5, 0 movs r1, 0x11 - bl sub_8071858 + bl HasType lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 @@ -1259,7 +1259,7 @@ _08076544: ldr r0, _080765D8 mov r1, r8 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 ldr r0, _080765DC ldr r2, [r0] adds r0, r7, 0 @@ -1294,7 +1294,7 @@ _080765C0: bx r0 .align 2, 0 _080765D0: .4byte gUnknown_80FB5F8 -_080765D4: .4byte gUnknown_80F4448 +_080765D4: .4byte gAdjacentTileOffsets _080765D8: .4byte gAvailablePokemonNames _080765DC: .4byte gUnknown_80FF01C thumb_func_end sub_80763F8 @@ -1332,7 +1332,7 @@ _08076614: ldr r0, _0807663C mov r1, r8 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 adds r0, r5, 0 movs r1, 0x14 bl HasItem @@ -1368,13 +1368,13 @@ _08076660: .4byte gUnknown_80FCEB0 _08076664: adds r0, r5, 0 movs r1, 0x8 - bl sub_8071858 + bl HasType lsls r0, 24 cmp r0, 0 bne _08076682 adds r0, r5, 0 movs r1, 0x11 - bl sub_8071858 + bl HasType lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 @@ -1482,7 +1482,7 @@ _08076714: ldr r0, _080767A8 mov r1, r8 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 ldr r0, _080767AC ldr r2, [r0] adds r0, r7, 0 @@ -1517,7 +1517,7 @@ _08076790: bx r0 .align 2, 0 _080767A0: .4byte gUnknown_80FB5F8 -_080767A4: .4byte gUnknown_80F4448 +_080767A4: .4byte gAdjacentTileOffsets _080767A8: .4byte gAvailablePokemonNames _080767AC: .4byte gUnknown_80FF01C thumb_func_end sub_80765E0 @@ -1572,7 +1572,7 @@ _08076810: .4byte gUnknown_80FCDE0 _08076814: adds r0, r5, 0 movs r1, 0x6 - bl sub_8071858 + bl HasType lsls r0, 24 cmp r0, 0 beq _08076830 @@ -1611,7 +1611,7 @@ _0807685C: bl sub_80522F4 b _080768C8 .align 2, 0 -_08076868: .4byte gUnknown_810ACC0 +_08076868: .4byte gDungeonWaterType _0807686C: .4byte gDungeonGlobalData _08076870: .4byte 0x00003a0e _08076874: .4byte gUnknown_80FCE34 @@ -2803,8 +2803,8 @@ _0807722E: _08077238: .4byte gUnknown_80FC21C thumb_func_end sub_8077160 - thumb_func_start sub_807723C -sub_807723C: + thumb_func_start GetFlashFireStatus +GetFlashFireStatus: push {r4,lr} adds r4, r0, 0 bl EntityExists @@ -2834,7 +2834,7 @@ _0807726C: pop {r4} pop {r1} bx r1 - thumb_func_end sub_807723C + thumb_func_end GetFlashFireStatus thumb_func_start sub_8077274 sub_8077274: @@ -3549,7 +3549,7 @@ _080777EC: adds r0, r5, 0 bl sub_8041C1C adds r0, r5, 0 - bl sub_8070774 + bl GetMovementSpeed b _0807785C .align 2, 0 _08077844: .4byte gAvailablePokemonNames @@ -3606,7 +3606,7 @@ _08077874: ldr r0, _08077908 mov r1, r8 movs r2, 0 - bl sub_80708B4 + bl SetMessageArgument_2 ldr r0, _0807790C ldr r2, [r0] adds r0, r7, 0 @@ -3641,7 +3641,7 @@ _080778F0: bx r0 .align 2, 0 _08077900: .4byte gUnknown_80FB2CC -_08077904: .4byte gUnknown_80F4448 +_08077904: .4byte gAdjacentTileOffsets _08077908: .4byte gAvailablePokemonNames _0807790C: .4byte gUnknown_80FF01C thumb_func_end sub_8077780 @@ -3677,7 +3677,7 @@ _08077940: movs r2, 0 bl SetMessageArgument adds r0, r5, 0 - bl sub_8070774 + bl GetMovementSpeed adds r7, r0, 0 cmp r7, 0x4 bne _08077970 @@ -3711,7 +3711,7 @@ _08077988: strb r4, [r1] _08077990: adds r0, r5, 0 - bl sub_8070774 + bl GetMovementSpeed adds r4, r0, 0 cmp r7, r4 bne _080779B0 @@ -3789,7 +3789,7 @@ sub_80779F0: movs r2, 0 bl SetMessageArgument adds r0, r5, 0 - bl sub_8070774 + bl GetMovementSpeed str r0, [sp] cmp r0, 0 bne _08077A50 @@ -3835,7 +3835,7 @@ _08077A86: blt _08077A56 _08077A8C: adds r0, r5, 0 - bl sub_8070774 + bl GetMovementSpeed adds r4, r0, 0 ldr r0, [sp] cmp r0, r4 @@ -4473,7 +4473,7 @@ _08077F88: bl SetMessageArgument adds r0, r4, 0 movs r1, 0x4 - bl sub_8071858 + bl HasType lsls r0, 24 lsrs r0, 24 mov r8, r0 @@ -5220,7 +5220,7 @@ sub_8078594: ldr r7, [r6, 0x70] adds r0, r5, 0 movs r1, 0xE - bl sub_8071858 + bl HasType lsls r0, 24 cmp r0, 0 beq _08078640 @@ -5828,10 +5828,10 @@ sub_8078A58: movs r2, 0 bl SetMessageArgument adds r0, r7, 0 - bl sub_8094450 + bl GetBellyRoundedUp adds r4, r0, 0 ldr r0, [r5] - bl sub_8094450 + bl GetBellyRoundedUp cmp r4, r0 beq _08078AD8 adds r0, r6, 0 @@ -5865,10 +5865,10 @@ _08078AE0: movs r2, 0 bl SetMessageArgument adds r0, r7, 0 - bl sub_8094450 + bl GetBellyRoundedUp adds r5, r0, 0 ldr r0, [r4] - bl sub_8094450 + bl GetBellyRoundedUp cmp r5, r0 beq _08078B38 adds r0, r6, 0 @@ -5958,13 +5958,13 @@ _08078BB8: lsls r1, 1 adds r0, r7, r1 ldr r0, [r0] - bl sub_8094450 + bl GetBellyRoundedUp adds r4, r0, 0 movs r1, 0xA0 lsls r1, 1 adds r0, r7, r1 ldr r0, [r0] - bl sub_8094450 + bl GetBellyRoundedUp cmp r4, r0 blt _08078BE0 movs r5, 0x1 @@ -5985,10 +5985,10 @@ _08078BE8: adds r0, r7 mov r10, r0 ldr r0, [r0] - bl sub_8094450 + bl GetBellyRoundedUp adds r4, r0, 0 ldr r0, [r5] - bl sub_8094450 + bl GetBellyRoundedUp movs r1, 0 str r1, [sp, 0x24] cmp r4, r0 @@ -6029,13 +6029,13 @@ _08078C16: bl sub_80522F4 _08078C5E: ldr r0, [sp, 0x20] - bl sub_8094450 + bl GetBellyRoundedUp adds r4, r0, 0 movs r1, 0xA0 lsls r1, 1 adds r0, r7, r1 ldr r0, [r0] - bl sub_8094450 + bl GetBellyRoundedUp cmp r4, r0 bne _08078C9C ldr r0, _08078C94 @@ -6102,10 +6102,10 @@ _08078CFA: movs r2, 0 bl SetMessageArgument adds r0, r4, 0 - bl sub_8094450 + bl GetBellyRoundedUp adds r4, r0, 0 ldr r0, [r5] - bl sub_8094450 + bl GetBellyRoundedUp cmp r4, r0 bne _08078D34 mov r1, r8 @@ -6119,10 +6119,10 @@ _08078D2C: .4byte gAvailablePokemonNames _08078D30: .4byte gUnknown_80FBE14 _08078D34: ldr r0, [r5] - bl sub_8094450 + bl GetBellyRoundedUp adds r4, r0, 0 ldr r0, [r7] - bl sub_8094450 + bl GetBellyRoundedUp cmp r4, r0 blt _08078D60 mov r0, r8 @@ -6274,7 +6274,7 @@ _08078E6E: bl DungeonRandomCapped lsls r0, 3 add r0, sp - bl sub_808E9B8 + bl ExtractSpeciesIndex adds r1, r0, 0 lsls r1, 16 asrs r1, 16 @@ -6519,7 +6519,7 @@ _08079070: _0807907E: adds r0, r4, 0 movs r1, 0xE - bl sub_8071858 + bl HasType lsls r0, 24 cmp r0, 0 bne _080790A0 @@ -8375,7 +8375,7 @@ sub_8079F20: _08079F50: ldr r7, [r4, 0x70] adds r0, r4, 0 - bl sub_8070A58 + bl HasNegativeStatus lsls r0, 24 cmp r0, 0 beq _08079FF2 @@ -8445,7 +8445,7 @@ _08079FD8: bl sub_80522F4 _08079FF2: adds r0, r4, 0 - bl sub_8070774 + bl GetMovementSpeed adds r6, r0, 0 movs r1, 0 movs r3, 0x4 @@ -8458,7 +8458,7 @@ _0807A002: cmp r3, 0 bge _0807A002 adds r0, r4, 0 - bl sub_8070774 + bl GetMovementSpeed cmp r6, r0 beq _0807A032 movs r0, 0x1 @@ -9035,7 +9035,7 @@ _0807A4A8: adds r0, r5, 0 bl sub_80418D4 adds r0, r5, 0 - bl sub_8070774 + bl GetMovementSpeed _0807A4BC: pop {r4-r6} pop {r0} @@ -9940,7 +9940,7 @@ _0807ABC6: adds r0, r4, 0 adds r1, r6, 0 str r2, [sp, 0x1A4] - bl sub_8049590 + bl GetMapEntity adds r1, r0, 0 ldr r0, [r1, 0x10] ldr r2, [sp, 0x1A4] @@ -10030,7 +10030,7 @@ _0807AC72: adds r0, r4, 0 adds r1, r6, 0 str r2, [sp, 0x1A4] - bl sub_8049590 + bl GetMapEntity adds r1, r0, 0 ldr r0, [r1, 0x10] ldr r2, [sp, 0x1A4] @@ -10249,7 +10249,7 @@ _0807AE12: lsls r1, 1 adds r0, r4, r1 ldr r0, [r0] - bl sub_8094450 + bl GetBellyRoundedUp adds r1, r0, 0 cmp r1, 0 bne _0807AE32 @@ -10287,16 +10287,16 @@ _0807AE32: _0807AE6A: adds r0, r5, 0 adds r1, r7, 0 - bl sub_8071518 + bl ShouldAvoidEnemies_2 lsls r0, 24 cmp r0, 0 beq _0807AE80 adds r0, r5, 0 - bl sub_807B5E0 + bl AvoidEnemies b _0807AE9C _0807AE80: adds r0, r5, 0 - bl sub_807AEBC + bl CanTakeItem lsls r0, 24 cmp r0, 0 beq _0807AE96 @@ -10307,7 +10307,7 @@ _0807AE80: b _0807AEB4 _0807AE96: adds r0, r5, 0 - bl sub_807AF58 + bl ChooseTargetPosition _0807AE9C: lsls r0, 24 lsrs r2, r0, 24 @@ -10320,15 +10320,15 @@ _0807AE9C: _0807AEAC: adds r0, r5, 0 adds r1, r7, 0 - bl sub_807B2D8 + bl DecideMovement _0807AEB4: pop {r4-r7} pop {r0} bx r0 thumb_func_end MoveIfPossible - thumb_func_start sub_807AEBC -sub_807AEBC: + thumb_func_start CanTakeItem +CanTakeItem: push {r4-r6,lr} adds r4, r0, 0 ldr r5, [r4, 0x70] @@ -10401,10 +10401,10 @@ _0807AF52: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_807AEBC + thumb_func_end CanTakeItem - thumb_func_start sub_807AF58 -sub_807AF58: + thumb_func_start ChooseTargetPosition +ChooseTargetPosition: push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -10413,7 +10413,7 @@ sub_807AF58: sub sp, 0xC mov r8, r0 ldr r7, [r0, 0x70] - bl sub_8072C88 + bl TargetLeader lsls r0, 24 cmp r0, 0 beq _0807AF74 @@ -10453,7 +10453,7 @@ _0807AFAC: mov r10, r3 _0807AFB4: mov r0, r8 - bl sub_8070460 + bl CanCrossWalls lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x4] @@ -10495,7 +10495,7 @@ _0807AFD6: adds r1, r4, 0 movs r2, 0 movs r3, 0x1 - bl sub_8071598 + bl CanTarget lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -10550,7 +10550,7 @@ _0807B070: _0807B074: mov r0, r8 adds r1, r4, 0 - bl sub_8045A00 + bl CanSee_2 lsls r0, 24 cmp r0, 0 beq _0807B098 @@ -10558,7 +10558,7 @@ _0807B082: adds r1, r4, 0x4 mov r0, r8 adds r0, 0x4 - bl sub_8098434 + bl GetMaxPositionDifference cmp r9, r0 ble _0807B098 mov r9, r0 @@ -10606,7 +10606,7 @@ _0807B09E: b _0807B2C6 _0807B0E4: mov r0, r8 - bl sub_80719C4 + bl CanSeeTeammate lsls r0, 24 cmp r0, 0 beq _0807B0F2 @@ -10659,7 +10659,7 @@ _0807B12C: cmp r5, 0 bne _0807B222 mov r0, r8 - bl sub_8072CA8 + bl GetLeaderEntityIfVisible adds r4, r0, 0 bl EntityExists lsls r0, 24 @@ -10754,7 +10754,7 @@ _0807B1FA: _0807B200: adds r0, r4, 0 adds r1, r5, 0 - bl sub_8049590 + bl GetMapEntity ldr r0, [r0, 0x14] cmp r0, 0 beq _0807B216 @@ -10797,7 +10797,7 @@ _0807B250: lsls r6, r5, 2 mov r0, r8 adds r1, r4, 0 - bl sub_8045ABC + bl InSameRoom lsls r0, 24 cmp r0, 0 bne _0807B294 @@ -10853,7 +10853,7 @@ _0807B2B4: strh r1, [r2] _0807B2C0: mov r0, r8 - bl sub_807B920 + bl Explore _0807B2C6: movs r0, 0x1 add sp, 0xC @@ -10864,10 +10864,10 @@ _0807B2C6: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_807AF58 + thumb_func_end ChooseTargetPosition - thumb_func_start sub_807B2D8 -sub_807B2D8: + thumb_func_start DecideMovement +DecideMovement: push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -10900,7 +10900,7 @@ sub_807B2D8: adds r0, 0x7A ldrb r1, [r0] mov r0, r9 - bl sub_8071470 + bl ShouldAvoidFirstHit lsls r0, 24 cmp r0, 0 beq _0807B366 @@ -10911,13 +10911,13 @@ sub_807B2D8: bne _0807B37C adds r0, r6, 0 adds r1, r4, 0 - bl sub_8083478 + bl IsTargetTwoTilesAway lsls r0, 24 cmp r0, 0 beq _0807B37C adds r0, r6, 0 adds r1, r4, 0 - bl sub_8098434 + bl GetMaxPositionDifference cmp r0, 0x2 bne _0807B354 _0807B348: @@ -10953,7 +10953,7 @@ _0807B37C: mov r0, r9 mov r1, r8 adds r2, r4, 0 - bl sub_8071214 + bl CanMoveForward lsls r0, 24 cmp r0, 0 beq _0807B3A8 @@ -11039,7 +11039,7 @@ _0807B3E8: strb r0, [r1] b _0807B5CE .align 2, 0 -_0807B434: .4byte gUnknown_80F4448 +_0807B434: .4byte gAdjacentTileOffsets _0807B438: .4byte 0x00000147 _0807B43C: adds r1, r5, 0 @@ -11123,7 +11123,7 @@ _0807B4C8: mov r10, r1 mov r0, r9 adds r1, r7, 0 - bl sub_8071518 + bl ShouldAvoidEnemies_2 lsls r0, 24 cmp r0, 0 bne _0807B4E4 @@ -11161,7 +11161,7 @@ _0807B4FC: mov r0, r9 adds r2, r4, 0 str r3, [sp, 0x38] - bl sub_8071214 + bl CanMoveForward strb r0, [r7, 0x1] lsls r0, 24 ldr r3, [sp, 0x38] @@ -11229,7 +11229,7 @@ _0807B56E: strb r1, [r0] b _0807B5CE .align 2, 0 -_0807B598: .4byte gUnknown_80F4D04 +_0807B598: .4byte gFaceDirectionIncrements _0807B59C: .4byte 0x00000147 _0807B5A0: movs r3, 0x2 @@ -11264,10 +11264,10 @@ _0807B5CE: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_807B2D8 + thumb_func_end DecideMovement - thumb_func_start sub_807B5E0 -sub_807B5E0: + thumb_func_start AvoidEnemies +AvoidEnemies: push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -11351,7 +11351,7 @@ _0807B65C: adds r1, r4, 0 movs r2, 0 movs r3, 0x1 - bl sub_8071598 + bl CanTarget lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -11359,7 +11359,7 @@ _0807B65C: _0807B69A: adds r1, r4, 0x4 adds r0, r7, 0x4 - bl sub_8098434 + bl GetMaxPositionDifference ldr r3, [sp, 0x8] cmp r3, r0 ble _0807B6CE @@ -11449,7 +11449,7 @@ _0807B71E: adds r0, r7, 0 adds r1, r4, 0 mov r2, sp - bl sub_8071214 + bl CanMoveForward lsls r0, 24 cmp r0, 0 bne _0807B75E @@ -11487,7 +11487,7 @@ _0807B790: .4byte 0x0001358c _0807B794: .4byte gDungeonGlobalData _0807B798: .4byte 0x000037fc _0807B79C: .4byte 0x000f423f -_0807B7A0: .4byte gUnknown_80F4448 +_0807B7A0: .4byte gAdjacentTileOffsets _0807B7A4: movs r0, 0x5 ldr r3, [sp, 0x24] @@ -11682,7 +11682,7 @@ _0807B8E0: b _0807B910 _0807B906: adds r0, r7, 0 - bl sub_807B920 + bl Explore lsls r0, 24 lsrs r0, 24 _0807B910: @@ -11694,10 +11694,10 @@ _0807B910: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_807B5E0 + thumb_func_end AvoidEnemies - thumb_func_start sub_807B920 -sub_807B920: + thumb_func_start Explore +Explore: push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -11723,7 +11723,7 @@ sub_807B920: ands r1, r0 mov r8, r1 adds r0, r6, 0 - bl sub_807138C + bl IsAtJunction lsls r0, 24 mov r9, r4 cmp r0, 0 @@ -11760,7 +11760,7 @@ _0807B994: adds r1, r4, 0 mov r2, sp str r3, [sp, 0xC] - bl sub_8071214 + bl CanMoveForward lsls r0, 24 ldr r3, [sp, 0xC] cmp r0, 0 @@ -11787,8 +11787,8 @@ _0807B9AA: ldrh r0, [r0, 0x2] b _0807BB5A .align 2, 0 -_0807B9D4: .4byte gUnknown_80F4D04 -_0807B9D8: .4byte gUnknown_80F4448 +_0807B9D4: .4byte gFaceDirectionIncrements +_0807B9D8: .4byte gAdjacentTileOffsets _0807B9DC: ldr r0, _0807BA30 ldr r2, [r0] @@ -11835,7 +11835,7 @@ _0807B9DC: _0807BA30: .4byte gDungeonGlobalData _0807BA34: .4byte 0x00010844 _0807BA38: .4byte 0x00010884 -_0807BA3C: .4byte gUnknown_80F4448 +_0807BA3C: .4byte gAdjacentTileOffsets _0807BA40: adds r0, r7, 0 adds r0, 0x78 @@ -11868,7 +11868,7 @@ _0807BA40: strh r0, [r1] b _0807BB60 .align 2, 0 -_0807BA80: .4byte gUnknown_80F4448 +_0807BA80: .4byte gAdjacentTileOffsets _0807BA84: movs r5, 0 _0807BA86: @@ -11928,7 +11928,7 @@ _0807BAC4: adds r1, r4, 0 mov r2, sp adds r2, 0x1 - bl sub_8071214 + bl CanMoveForward lsls r0, 24 cmp r0, 0 bne _0807BB2E @@ -11941,7 +11941,7 @@ _0807BB04: ble _0807BAC4 b _0807BB60 .align 2, 0 -_0807BB14: .4byte gUnknown_80F4448 +_0807BB14: .4byte gAdjacentTileOffsets _0807BB18: movs r0, 0x4 mov r3, r10 @@ -11993,8 +11993,8 @@ _0807BB60: pop {r1} bx r1 .align 2, 0 -_0807BB74: .4byte gUnknown_80F4448 - thumb_func_end sub_807B920 +_0807BB74: .4byte gAdjacentTileOffsets + thumb_func_end Explore thumb_func_start sub_807BB78 sub_807BB78: @@ -12027,7 +12027,7 @@ DecideAttack: mov r8, r0 mov r0, r10 movs r1, 0 - bl sub_8070D04 + bl CannotAttack lsls r0, 24 cmp r0, 0 beq _0807BBB6 @@ -12035,7 +12035,7 @@ DecideAttack: _0807BBB6: mov r0, r10 movs r1, 0x1 - bl sub_8071518 + bl ShouldAvoidEnemies_2 lsls r0, 24 cmp r0, 0 beq _0807BBC6 @@ -12129,7 +12129,7 @@ _0807BC62: bne _0807BC58 b _0807C006 .align 2, 0 -_0807BC70: .4byte gUnknown_80F4DB2 +_0807BC70: .4byte gConfusedAttackChance _0807BC74: adds r4, 0x8 adds r5, 0x1 @@ -12180,7 +12180,7 @@ _0807BCB0: mov r0, sp mov r1, r10 adds r2, r4, 0 - bl sub_807C04C + bl FindMoveTarget mov r0, sp ldrb r0, [r0] cmp r0, 0 @@ -12337,7 +12337,7 @@ _0807BDD6: mov r0, r10 adds r1, r5, 0 ldr r2, [sp, 0x3C] - bl sub_8057348 + bl IsMoveUsable lsls r0, 24 cmp r0, 0 beq _0807BE64 @@ -12362,7 +12362,7 @@ _0807BDD6: _0807BE24: mov r0, r10 adds r1, r6, 0 - bl sub_8071A1C + bl GetMoveType_2 lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 @@ -12376,7 +12376,7 @@ _0807BE38: ldr r0, [sp, 0x58] mov r1, r10 adds r2, r6, 0 - bl sub_807C04C + bl FindMoveTarget b _0807BE54 _0807BE4A: adds r0, r6, 0 @@ -12521,7 +12521,7 @@ _0807BF32: add r1, sp, 0x34 mov r0, r10 movs r2, 0x1 - bl sub_807C854 + bl TargetRegularAttack lsls r0, 24 lsrs r6, r0, 24 b _0807BF5E @@ -12568,7 +12568,7 @@ _0807BF9C: add r2, r8 adds r0, r4, 0 mov r1, r10 - bl sub_807C04C + bl FindMoveTarget ldrb r0, [r4] cmp r0, 0 beq _0807C01A @@ -12618,7 +12618,7 @@ _0807C006: strb r3, [r6] _0807C008: mov r0, r10 - bl sub_8069DCC + bl TargetTileInFront b _0807C03A _0807C010: adds r4, 0x8 @@ -12640,7 +12640,7 @@ _0807C01A: adds r1, 0x46 strb r0, [r1] mov r0, r10 - bl sub_8069DCC + bl TargetTileInFront _0807C03A: add sp, 0x5C pop {r3-r5} @@ -12652,8 +12652,8 @@ _0807C03A: bx r0 thumb_func_end DecideAttack - thumb_func_start sub_807C04C -sub_807C04C: + thumb_func_start FindMoveTarget +FindMoveTarget: push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -12679,7 +12679,7 @@ _0807C06E: adds r0, r6, 0 mov r1, r10 movs r2, 0x1 - bl sub_807CD64 + bl GetTargetingFlags lsls r0, 16 asrs r0, 16 str r0, [sp, 0xC] @@ -12708,7 +12708,7 @@ _0807C0B0: beq _0807C0CC adds r0, r6, 0 mov r1, r10 - bl sub_805C498 + bl CanUseWithStatusChecker lsls r0, 24 cmp r0, 0 bne _0807C0CC @@ -12716,7 +12716,7 @@ _0807C0C4: movs r0, 0x1 b _0807C48C .align 2, 0 -_0807C0C8: .4byte gUnknown_202F380 +_0807C0C8: .4byte gCanAttackInDirection _0807C0CC: movs r0, 0xF0 ldr r1, [sp, 0xC] @@ -12759,9 +12759,9 @@ _0807C0F8: add r8, r0 b _0807C3F6 .align 2, 0 -_0807C118: .4byte gUnknown_202F380 +_0807C118: .4byte gCanAttackInDirection _0807C11C: .4byte gUnknown_202F388 -_0807C120: .4byte gUnknown_202F390 +_0807C120: .4byte gPotentialTargetWeights_2 _0807C124: .4byte gUnknown_202F3B0 _0807C128: movs r7, 0 @@ -12798,7 +12798,7 @@ _0807C132: beq _0807C178 adds r0, r6, 0 adds r1, r7, 0 - bl sub_8071138 + bl CanAttackInFront lsls r0, 24 cmp r0, 0 beq _0807C18E @@ -12811,7 +12811,7 @@ _0807C178: ldr r1, [sp, 0xC] adds r2, r6, 0 adds r3, r4, 0 - bl sub_807C580 + bl WeightMoveIfUsable mov r8, r0 _0807C18E: adds r7, 0x1 @@ -12819,7 +12819,7 @@ _0807C18E: ble _0807C132 b _0807C3F6 .align 2, 0 -_0807C198: .4byte gUnknown_80F4448 +_0807C198: .4byte gAdjacentTileOffsets _0807C19C: cmp r0, 0x30 bne _0807C1F0 @@ -12851,7 +12851,7 @@ _0807C1A2: ldr r1, [sp, 0xC] adds r2, r6, 0 adds r3, r4, 0 - bl sub_807C580 + bl WeightMoveIfUsable mov r8, r0 _0807C1E0: adds r5, 0x1 @@ -12883,7 +12883,7 @@ _0807C1FA: adds r4, r0, 0 adds r0, r6, 0 adds r1, r7, 0 - bl sub_8071138 + bl CanAttackInFront lsls r0, 24 cmp r0, 0 beq _0807C296 @@ -12903,7 +12903,7 @@ _0807C1FA: ldr r1, [sp, 0xC] adds r2, r6, 0 adds r3, r5, 0 - bl sub_807C580 + bl WeightMoveIfUsable mov r8, r0 cmp r4, r8 bne _0807C296 @@ -12938,7 +12938,7 @@ _0807C250: ldr r1, [sp, 0xC] adds r2, r6, 0 adds r3, r5, 0 - bl sub_807C580 + bl WeightMoveIfUsable mov r8, r0 _0807C296: movs r2, 0x4 @@ -12948,7 +12948,7 @@ _0807C296: ble _0807C1FA b _0807C3F6 .align 2, 0 -_0807C2A4: .4byte gUnknown_80F4448 +_0807C2A4: .4byte gAdjacentTileOffsets _0807C2A8: cmp r0, 0x50 beq _0807C2B0 @@ -12998,7 +12998,7 @@ _0807C2C0: adds r0, r6, 0 adds r1, r4, 0 ldr r2, [sp, 0x18] - bl sub_807C4A0 + bl IsTargetInLineRange lsls r0, 24 cmp r0, 0 beq _0807C370 @@ -13008,7 +13008,7 @@ _0807C2C0: adds r1, r6, 0 adds r2, r4, 0 mov r3, r10 - bl sub_807C648 + bl CanUseStatusMove lsls r0, 24 cmp r0, 0 beq _0807C370 @@ -13016,7 +13016,7 @@ _0807C2C0: adds r1, r4, 0 adds r2, r5, 0 ldr r3, [sp, 0x18] - bl sub_807C9F8 + bl IsTargetStraightAhead lsls r0, 24 cmp r0, 0 beq _0807C370 @@ -13027,14 +13027,14 @@ _0807C2C0: strb r5, [r0] adds r0, r6, 0 mov r1, r10 - bl sub_8071A1C + bl GetMoveType_2 adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 adds r0, r6, 0 ldr r1, [sp, 0xC] adds r2, r4, 0 - bl sub_807C7AC + bl WeightMove ldr r1, _0807C38C mov r3, r8 lsls r2, r3, 2 @@ -13055,9 +13055,9 @@ _0807C370: .align 2, 0 _0807C37C: .4byte gDungeonGlobalData _0807C380: .4byte 0x000135cc -_0807C384: .4byte gUnknown_202F380 +_0807C384: .4byte gCanAttackInDirection _0807C388: .4byte gUnknown_202F388 -_0807C38C: .4byte gUnknown_202F390 +_0807C38C: .4byte gPotentialTargetWeights_2 _0807C390: .4byte gUnknown_202F3B0 _0807C394: cmp r0, 0x60 @@ -13084,7 +13084,7 @@ _0807C39A: ldr r1, [sp, 0xC] adds r2, r6, 0 adds r3, r4, 0 - bl sub_807C580 + bl WeightMoveIfUsable mov r8, r0 _0807C3CA: adds r5, 0x1 @@ -13105,7 +13105,7 @@ _0807C3DC: ldr r1, [sp, 0xC] adds r2, r6, 0 adds r3, r6, 0 - bl sub_807C580 + bl WeightMoveIfUsable mov r8, r0 _0807C3F6: mov r3, r8 @@ -13171,7 +13171,7 @@ _0807C450: ldr r3, _0807C464 b _0807C470 .align 2, 0 -_0807C464: .4byte gUnknown_202F390 +_0807C464: .4byte gPotentialTargetWeights_2 _0807C468: adds r3, 0x4 adds r1, 0x1 @@ -13205,10 +13205,10 @@ _0807C48C: bx r1 .align 2, 0 _0807C49C: .4byte gUnknown_202F388 - thumb_func_end sub_807C04C + thumb_func_end FindMoveTarget - thumb_func_start sub_807C4A0 -sub_807C4A0: + thumb_func_start IsTargetInLineRange +IsTargetInLineRange: push {r4-r7,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -13333,10 +13333,10 @@ _0807C57A: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_807C4A0 + thumb_func_end IsTargetInLineRange - thumb_func_start sub_807C580 -sub_807C580: + thumb_func_start WeightMoveIfUsable +WeightMoveIfUsable: push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -13390,7 +13390,7 @@ _0807C5CE: adds r1, r5, 0 adds r2, r7, 0 ldr r3, [sp, 0x24] - bl sub_807C648 + bl CanUseStatusMove lsls r0, 24 cmp r0, 0 beq _0807C624 @@ -13402,14 +13402,14 @@ _0807C5CE: strb r4, [r0] adds r0, r5, 0 ldr r1, [sp, 0x24] - bl sub_8071A1C + bl GetMoveType_2 adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 adds r0, r5, 0 mov r1, r9 adds r2, r7, 0 - bl sub_807C7AC + bl WeightMove ldr r1, _0807C640 lsls r2, r6, 2 adds r1, r2, r1 @@ -13429,14 +13429,14 @@ _0807C624: pop {r1} bx r1 .align 2, 0 -_0807C638: .4byte gUnknown_202F380 +_0807C638: .4byte gCanAttackInDirection _0807C63C: .4byte gUnknown_202F388 -_0807C640: .4byte gUnknown_202F390 +_0807C640: .4byte gPotentialTargetWeights_2 _0807C644: .4byte gUnknown_202F3B0 - thumb_func_end sub_807C580 + thumb_func_end WeightMoveIfUsable - thumb_func_start sub_807C648 -sub_807C648: + thumb_func_start CanUseStatusMove +CanUseStatusMove: push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -13460,7 +13460,7 @@ sub_807C648: adds r1, r4, 0 movs r2, 0 movs r3, 0x1 - bl sub_8071598 + bl CanTarget lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -13505,7 +13505,7 @@ _0807C6BE: adds r1, r4, 0 movs r2, 0 movs r3, 0x1 - bl sub_8071598 + bl CanTarget lsls r0, 24 cmp r0, 0 bne _0807C6E0 @@ -13528,7 +13528,7 @@ _0807C6E4: adds r0, r5, 0 adds r1, r4, 0 mov r2, r8 - bl sub_805CEB8 + bl CanUseWithStatusChecker_2 lsls r0, 24 cmp r0, 0 beq _0807C6B2 @@ -13548,7 +13548,7 @@ _0807C6E4: cmp r1, r0 bne _0807C720 adds r0, r4, 0 - bl sub_8070A58 + bl HasNegativeStatus b _0807C774 _0807C720: movs r0, 0x80 @@ -13556,7 +13556,7 @@ _0807C720: cmp r1, r0 bne _0807C730 adds r0, r4, 0 - bl sub_8070B28 + bl IsSleeping b _0807C774 _0807C730: movs r0, 0xC0 @@ -13587,13 +13587,13 @@ _0807C75A: cmp r1, r0 bne _0807C79E adds r0, r4, 0 - bl sub_8070A58 + bl HasNegativeStatus lsls r0, 24 cmp r0, 0 bne _0807C79E _0807C76E: adds r0, r4, 0 - bl sub_8070B48 + bl HasQuarterHPOrLess _0807C774: lsls r0, 24 cmp r0, 0 @@ -13625,10 +13625,10 @@ _0807C7A0: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_807C648 + thumb_func_end CanUseStatusMove - thumb_func_start sub_807C7AC -sub_807C7AC: + thumb_func_start WeightMove +WeightMove: push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -13700,7 +13700,7 @@ _0807C828: adds r0, r5, 0 mov r1, r8 mov r2, r9 - bl sub_806E654 + bl WeightWeakTypePicker adds r0, 0x1 lsls r0, 24 lsrs r6, r0, 24 @@ -13713,10 +13713,10 @@ _0807C848: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_807C7AC + thumb_func_end WeightMove - thumb_func_start sub_807C854 -sub_807C854: + thumb_func_start TargetRegularAttack +TargetRegularAttack: push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -13796,7 +13796,7 @@ _0807C8BE: bne _0807C948 adds r0, r7, 0 adds r1, r6, 0 - bl sub_8071138 + bl CanAttackInFront lsls r0, 24 cmp r0, 0 beq _0807C948 @@ -13804,7 +13804,7 @@ _0807C8BE: adds r1, r5, 0 movs r2, 0 ldr r3, [sp, 0x44] - bl sub_8071598 + bl CanTarget lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -13827,7 +13827,7 @@ _0807C922: movs r1, 0 adds r2, r5, 0 movs r3, 0 - bl sub_807C7AC + bl WeightMove add r1, sp, 0x20 adds r1, r4 str r0, [r1] @@ -13849,7 +13849,7 @@ _0807C952: movs r0, 0 b _0807C9E8 .align 2, 0 -_0807C95C: .4byte gUnknown_80F4448 +_0807C95C: .4byte gAdjacentTileOffsets _0807C960: ldr r1, [sp, 0x40] str r6, [r1] @@ -13939,10 +13939,10 @@ _0807C9E8: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_807C854 + thumb_func_end TargetRegularAttack - thumb_func_start sub_807C9F8 -sub_807C9F8: + thumb_func_start IsTargetStraightAhead +IsTargetStraightAhead: push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -14008,7 +14008,7 @@ _0807CA50: movs r7, 0 b _0807CA94 .align 2, 0 -_0807CA70: .4byte gUnknown_80F4448 +_0807CA70: .4byte gAdjacentTileOffsets _0807CA74: adds r0, r5, 0 adds r1, r4, 0 @@ -14048,7 +14048,7 @@ _0807CAAE: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_807C9F8 + thumb_func_end IsTargetStraightAhead thumb_func_start sub_807CABC sub_807CABC: @@ -14153,7 +14153,7 @@ _0807CB80: stm r0!, {r2-r4} ldm r1!, {r2-r4} stm r0!, {r2-r4} - bl sub_80441BC + bl IsBossBattle lsls r0, 24 cmp r0, 0 beq _0807CBAC @@ -14196,7 +14196,7 @@ _0807CBAC: adds r2, r7, r3 adds r0, r4, 0 adds r1, r6, 0 - bl sub_807C04C + bl FindMoveTarget ldrb r0, [r4] cmp r0, 0 beq _0807CC08 @@ -14207,7 +14207,7 @@ _0807CBAC: adds r1, 0x46 strb r0, [r1] adds r0, r6, 0 - bl sub_8069DCC + bl TargetTileInFront _0807CC08: adds r0, r7, 0 adds r0, 0xBC @@ -14372,8 +14372,8 @@ _0807CD54: bx r0 thumb_func_end sub_807CB3C - thumb_func_start sub_807CD64 -sub_807CD64: + thumb_func_start GetTargetingFlags +GetTargetingFlags: push {r4,r5,lr} adds r3, r0, 0 adds r4, r1, 0 @@ -14385,7 +14385,7 @@ sub_807CD64: bne _0807CD88 adds r0, r3, 0 movs r1, 0xE - bl sub_8071858 + bl HasType lsls r0, 24 cmp r0, 0 bne _0807CD88 @@ -14401,7 +14401,7 @@ _0807CD94: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_807CD64 + thumb_func_end GetTargetingFlags thumb_func_start sub_807CD9C sub_807CD9C: @@ -14416,7 +14416,7 @@ sub_807CD9C: adds r4, r2, 0 movs r0, 0xA str r0, [sp, 0x24] - bl sub_80441E8 + bl IsFixedDungeon lsls r0, 24 cmp r0, 0 beq _0807CDC4 @@ -14724,7 +14724,7 @@ _0807D02A: .align 2, 0 _0807D03C: .4byte 0x000001a3 _0807D040: .4byte gUnknown_80F8A0C -_0807D044: .4byte gUnknown_80F4448 +_0807D044: .4byte gAdjacentTileOffsets _0807D048: .4byte 0xffff0000 _0807D04C: .4byte 0x0000ffff _0807D050: .4byte gUnknown_80F4F90 @@ -14881,7 +14881,7 @@ sub_807D148: _0807D180: .4byte gAvailablePokemonNames _0807D184: .4byte gUnknown_80FCAE8 _0807D188: - bl sub_80441E8 + bl IsFixedDungeon lsls r0, 24 cmp r0, 0 beq _0807D1A4 @@ -15973,7 +15973,7 @@ sub_807DA14: _0807DA48: .4byte gAvailablePokemonNames _0807DA4C: .4byte gUnknown_80FCB98 _0807DA50: - bl sub_80441E8 + bl IsFixedDungeon lsls r0, 24 cmp r0, 0 beq _0807DA6C @@ -16056,7 +16056,7 @@ _0807DA8C: bl sub_803E46C b _0807DA8C .align 2, 0 -_0807DAFC: .4byte gUnknown_80F4448 +_0807DAFC: .4byte gAdjacentTileOffsets _0807DB00: adds r0, r6, 0 bl sub_806A5B8 @@ -16120,7 +16120,7 @@ sub_807DB74: adds r7, r0, 0 movs r0, 0 mov r8, r0 - bl sub_80441E8 + bl IsFixedDungeon lsls r0, 24 cmp r0, 0 beq _0807DB94 @@ -16129,7 +16129,7 @@ sub_807DB74: .align 2, 0 _0807DB90: .4byte gUnknown_80FD060 _0807DB94: - bl sub_804AF74 + bl IsWaterTileset lsls r0, 24 cmp r0, 0 beq _0807DBB0 @@ -16150,7 +16150,7 @@ _0807DBB6: _0807DBB8: adds r0, r4, 0 adds r1, r5, 0 - bl sub_8049590 + bl GetMapEntity adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x3 @@ -16264,7 +16264,7 @@ _0807DC94: _0807DCA4: .4byte 0x00003a0b _0807DCA8: .4byte gUnknown_80FD3CC _0807DCAC: - bl sub_80441BC + bl IsBossBattle lsls r0, 24 cmp r0, 0 beq _0807DCC8 @@ -16290,7 +16290,7 @@ _0807DCD8: movs r6, 0 adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity adds r2, r0, 0 ldrh r1, [r2] ldr r3, _0807DD6C @@ -16413,7 +16413,7 @@ _0807DDC8: _0807DDCA: adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity adds r2, r0, 0 ldrh r1, [r2] movs r3, 0x80 @@ -16460,7 +16460,7 @@ _0807DE1A: beq _0807DE30 adds r0, r5, 0 adds r1, r4, 0 - bl sub_8049590 + bl GetMapEntity ldrh r2, [r0] movs r1, 0x40 orrs r1, r2 @@ -16643,7 +16643,7 @@ _0807DFAC: .4byte 0x000135cc _0807DFB0: .4byte gAvailablePokemonNames _0807DFB4: mov r0, r10 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 @@ -16721,7 +16721,7 @@ _0807E014: bgt _0807E112 cmp r1, 0x1F bgt _0807E112 - bl sub_8049590 + bl GetMapEntity mov r8, r0 ldr r0, [sp, 0x18] movs r2, 0 @@ -16920,7 +16920,7 @@ sub_807E1A0: asrs r4, r5, 1 adds r0, r6, 0 movs r1, 0x2 - bl sub_8071858 + bl HasType lsls r0, 24 cmp r0, 0 beq _0807E202 @@ -16938,7 +16938,7 @@ _0807E210: ldr r4, [sp, 0x40] adds r0, r6, 0 movs r1, 0x2 - bl sub_8071858 + bl HasType lsls r0, 24 cmp r0, 0 beq _0807E226 @@ -17105,7 +17105,7 @@ _0807E374: .4byte 0x00003a08 thumb_func_start sub_807E378 sub_807E378: push {r4-r7,lr} - bl sub_8083600 + bl GetLeaderEntity adds r4, r0, 0 bl EntityExists lsls r0, 24 @@ -17155,7 +17155,7 @@ _0807E3D0: movs r1, 0x1 bl sub_806A2BC adds r0, r4, 0 - bl sub_807520C + bl UseAttack bl sub_8044B28 lsls r0, 24 cmp r0, 0 @@ -17205,7 +17205,7 @@ _0807E446: movs r1, 0x1 bl sub_806A2BC adds r0, r4, 0 - bl sub_807520C + bl UseAttack bl sub_8044B28 lsls r0, 24 cmp r0, 0 @@ -17251,7 +17251,7 @@ _0807E4A0: movs r1, 0x1 bl sub_806A2BC adds r0, r4, 0 - bl sub_807520C + bl UseAttack bl sub_8044B28 lsls r0, 24 cmp r0, 0 @@ -17293,7 +17293,7 @@ _0807E508: movs r1, 0x1 bl sub_806A2BC adds r0, r4, 0 - bl sub_807520C + bl UseAttack bl sub_8044B28 lsls r0, 24 cmp r0, 0 @@ -17333,8 +17333,8 @@ _0807E578: .4byte 0x00003a0e _0807E57C: .4byte 0x0000021e thumb_func_end sub_807E378 - thumb_func_start sub_807E580 -sub_807E580: + thumb_func_start GetWeather +GetWeather: push {lr} cmp r0, 0 beq _0807E596 @@ -17357,7 +17357,7 @@ _0807E5A0: .align 2, 0 _0807E5A4: .4byte gDungeonGlobalData _0807E5A8: .4byte 0x0000e264 - thumb_func_end sub_807E580 + thumb_func_end GetWeather thumb_func_start sub_807E5AC sub_807E5AC: @@ -17375,7 +17375,7 @@ sub_807E5AC: lsrs r0, 24 _0807E5C6: bl sub_807E5E4 - bl sub_8069E8C + bl TriggerWeatherAbilities movs r0, 0 movs r1, 0x1 bl sub_807EAA0 @@ -17485,7 +17485,7 @@ sub_807E698: lsrs r0, 24 str r0, [sp] movs r0, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 16 str r0, [sp, 0x4] @@ -17494,7 +17494,7 @@ sub_807E698: ldr r0, [r0, 0x4] mov r10, r0 movs r0, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 ldr r1, [sp] @@ -17674,7 +17674,7 @@ sub_807E7FC: ldr r5, [r0] cmp r5, 0 bne _0807E816 - bl sub_8083600 + bl GetLeaderEntity adds r5, r0, 0 _0807E816: cmp r4, 0 @@ -17687,7 +17687,7 @@ _0807E816: bne _0807E844 ldr r4, _0807E880 movs r0, 0 - bl sub_807E580 + bl GetWeather adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -17734,7 +17734,7 @@ _0807E888: .4byte 0x000135cc sub_807E88C: push {r4-r7,lr} movs r0, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 ldr r1, _0807E8E4 ldr r1, [r1] @@ -17812,7 +17812,7 @@ _0807E90E: ldrb r0, [r7] strb r0, [r1, 0x1] adds r0, r5, 0 - bl sub_8070774 + bl GetMovementSpeed adds r0, r5, 0 movs r1, 0x25 bl HasAbility @@ -17820,7 +17820,7 @@ _0807E90E: cmp r0, 0 beq _0807E958 adds r0, r5, 0 - bl sub_807E580 + bl GetWeather ldr r1, _0807E954 lsls r0, 24 lsrs r0, 22 @@ -17959,7 +17959,7 @@ sub_807EA30: ldr r2, _0807EA64 adds r1, r2 strb r0, [r1] - bl sub_8083600 + bl GetLeaderEntity ldr r1, _0807EA68 ldr r1, [r1] bl SendMessage @@ -17979,7 +17979,7 @@ _0807EA6C: ldr r2, _0807EA98 adds r1, r2 strb r0, [r1] - bl sub_8083600 + bl GetLeaderEntity ldr r1, _0807EA9C ldr r1, [r1] bl SendMessage @@ -18014,7 +18014,7 @@ sub_807EAA0: mov r9, r1 movs r2, 0 str r2, [sp, 0x8] - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 mov r10, r0 @@ -18095,7 +18095,7 @@ _0807EB4E: strb r0, [r1] _0807EB64: movs r0, 0 - bl sub_807E580 + bl GetWeather lsls r0, 24 lsrs r0, 24 cmp r10, r0 @@ -18142,7 +18142,7 @@ _0807EBA6: ldrb r0, [r0] cmp r0, 0 bne _0807EBD4 - bl sub_8083600 + bl GetLeaderEntity ldr r1, _0807EC1C ldr r1, [r1] bl SendMessage @@ -18162,7 +18162,7 @@ _0807EBD4: ldrb r0, [r0] cmp r0, 0 bne _0807EC00 - bl sub_8083600 + bl GetLeaderEntity ldr r1, _0807EC24 ldr r1, [r1] bl SendMessage @@ -18201,7 +18201,7 @@ sub_807EC28: beq _0807EC46 b _0807EF32 _0807EC46: - bl sub_8083600 + bl GetLeaderEntity adds r7, r0, 0 ldr r0, [r7, 0x70] mov r9, r0 @@ -18635,7 +18635,7 @@ sub_807EF84: adds r4, r0, 0 cmp r4, 0 beq _0807EFE2 - bl sub_8083600 + bl GetLeaderEntity bl sub_8045128 ldrh r1, [r0] movs r0, 0x20 @@ -19086,7 +19086,7 @@ sub_807F33C: ldr r2, _0807F424 adds r0, r2 strb r1, [r0] - bl sub_8083600 + bl GetLeaderEntity ldr r1, _0807F428 ldr r1, [r1] bl SendMessage @@ -19156,7 +19156,7 @@ _0807F3BC: movs r0, 0 strb r0, [r4, 0x8] adds r0, r5, 0 - bl sub_8070774 + bl GetMovementSpeed adds r4, 0x60 ldrb r1, [r4] movs r0, 0x1 @@ -19291,7 +19291,7 @@ _0807F4E4: adds r1, r4, 0 movs r2, 0 movs r3, 0x1 - bl sub_8071598 + bl CanTarget lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -19307,7 +19307,7 @@ _0807F50C: adds r1, r4, 0 movs r2, 0 movs r3, 0x1 - bl sub_8071598 + bl CanTarget lsls r0, 24 cmp r0, 0 bne _0807F602 @@ -19368,7 +19368,7 @@ _0807F570: b _0807F602 .align 2, 0 _0807F588: .4byte 0xffff0000 -_0807F58C: .4byte gUnknown_80F4448 +_0807F58C: .4byte gAdjacentTileOffsets _0807F590: .4byte 0x0000ffff _0807F594: movs r5, 0 @@ -19453,7 +19453,7 @@ _0807F61C: adds r6, r5, 0 b _0807F654 .align 2, 0 -_0807F630: .4byte gUnknown_80F4448 +_0807F630: .4byte gAdjacentTileOffsets _0807F634: .4byte 0xffff0000 _0807F638: .4byte 0x0000ffff _0807F63C: @@ -19720,7 +19720,7 @@ _0807F7FC: _0807F860: .4byte gAvailablePokemonNames _0807F864: .4byte gUnknown_80FE690 _0807F868: .4byte 0x000001a3 -_0807F86C: .4byte gUnknown_80F4448 +_0807F86C: .4byte gAdjacentTileOffsets _0807F870: ldr r0, [r7] str r0, [sp, 0xD4] @@ -19772,7 +19772,7 @@ _0807F8BE: bl sub_807D148 b _0807F8FA .align 2, 0 -_0807F8D0: .4byte gUnknown_80F4448 +_0807F8D0: .4byte gAdjacentTileOffsets _0807F8D4: .4byte 0xffff0000 _0807F8D8: .4byte 0x0000ffff _0807F8DC: @@ -19936,7 +19936,7 @@ _0807FA1E: _0807FA22: adds r0, r5, 0 adds r1, r6, 0 - bl sub_8049590 + bl GetMapEntity adds r4, r0, 0 ldrh r1, [r4, 0x4] movs r0, 0x4 @@ -20240,15 +20240,15 @@ _0807FC78: .4byte 0x00013576 _0807FC7C: .4byte 0x00013579 thumb_func_end sub_807FC3C - thumb_func_start sub_807FC80 -sub_807FC80: + thumb_func_start CanLayTrap +CanLayTrap: push {lr} movs r1, 0 ldrsh r2, [r0, r1] movs r3, 0x2 ldrsh r1, [r0, r3] adds r0, r2, 0 - bl sub_8049590 + bl GetMapEntity adds r2, r0, 0 ldrh r1, [r2] movs r0, 0x80 @@ -20285,7 +20285,7 @@ _0807FCCE: _0807FCD0: pop {r1} bx r1 - thumb_func_end sub_807FC80 + thumb_func_end CanLayTrap thumb_func_start sub_807FCD4 sub_807FCD4: @@ -20302,7 +20302,7 @@ sub_807FCD4: ldrsh r0, [r7, r1] movs r2, 0x2 ldrsh r1, [r7, r2] - bl sub_8049590 + bl GetMapEntity adds r6, r0, 0 cmp r5, 0x13 bls _0807FD12 @@ -20456,7 +20456,7 @@ sub_807FE04: ldrsh r0, [r2, r1] movs r3, 0x2 ldrsh r1, [r2, r3] - bl sub_8049590 + bl GetMapEntity adds r4, r0, 0 ldr r0, [r4, 0x14] cmp r0, 0 @@ -20550,7 +20550,7 @@ sub_807FE9C: ldrsh r0, [r1, r2] movs r3, 0x2 ldrsh r1, [r1, r3] - bl sub_8049590 + bl GetMapEntity str r0, [sp, 0x4] ldr r0, [r0, 0x14] mov r10, r0 @@ -21362,7 +21362,7 @@ sub_8080504: bne _0808051A b _0808060E _0808051A: - bl sub_80441BC + bl IsBossBattle lsls r0, 24 cmp r0, 0 beq _08080534 @@ -21498,7 +21498,7 @@ sub_8080620: movs r0, 0x8 bl DungeonRandomCapped adds r5, r0, 0 - bl sub_80441BC + bl IsBossBattle lsls r0, 24 cmp r0, 0 bne _080806CA @@ -21571,7 +21571,7 @@ _080806CA: bl SendMessage b _080806EA .align 2, 0 -_080806D8: .4byte gUnknown_80F4448 +_080806D8: .4byte gAdjacentTileOffsets _080806DC: .4byte gUnknown_80FED04 _080806E0: ldr r0, _080806FC @@ -21828,7 +21828,7 @@ sub_80808A4: ldr r1, _080808D4 adds r0, r1 ldrb r4, [r0] - bl sub_80441BC + bl IsBossBattle lsls r0, 24 cmp r0, 0 beq _080808DC @@ -22108,7 +22108,7 @@ _08080AEC: pop {r0} bx r0 .align 2, 0 -_08080AF4: .4byte gUnknown_80F4448 +_08080AF4: .4byte gAdjacentTileOffsets _08080AF8: .4byte 0xffff0000 _08080AFC: .4byte 0x0000ffff thumb_func_end sub_8080A5C @@ -24698,7 +24698,7 @@ _080820FC: mov r3, sp movs r2, 0x6 ldrsh r1, [r3, r2] - bl sub_8049590 + bl GetMapEntity adds r4, r0, 0 ldrb r0, [r7] mov r3, r9 @@ -25260,7 +25260,7 @@ _080824DC: b _08082678 .align 2, 0 _0808266C: .4byte 0xfffffd60 -_08082670: .4byte gUnknown_203B450 +_08082670: .4byte gLeaderPokemon _08082674: .4byte 0x0000010d _08082678: ldr r1, _08082818 @@ -25447,7 +25447,7 @@ _08082830: .4byte 0x00000155 _08082834: .4byte 0x00000165 _08082838: .4byte 0x00000167 _0808283C: .4byte 0x00000169 -_08082840: .4byte gUnknown_203B450 +_08082840: .4byte gLeaderPokemon _08082844: mov r0, sp movs r1, 0x2 @@ -25472,7 +25472,7 @@ _08082856: add r3, sp movs r2, 0 ldrsh r1, [r3, r2] - bl sub_8049590 + bl GetMapEntity ldr r1, [r4] str r1, [r7, 0x8] ldr r1, [r4] @@ -25503,7 +25503,7 @@ _08082856: strh r1, [r0, 0x2] _080828B0: adds r0, r7, 0 - bl sub_807191C + bl LoadIQSkills adds r0, r7, 0 movs r1, 0 bl sub_804535C @@ -25520,7 +25520,7 @@ _080828BE: bx r0 .align 2, 0 _080828D4: .4byte 0x0000020a -_080828D8: .4byte gUnknown_203B450 +_080828D8: .4byte gLeaderPokemon _080828DC: .4byte gUnknown_203B410 thumb_func_end sub_8082280 @@ -25885,7 +25885,7 @@ _08082B46: ldrsh r0, [r5, r1] movs r2, 0x6 ldrsh r1, [r5, r2] - bl sub_8049590 + bl GetMapEntity ldrb r1, [r0, 0x9] adds r0, r5, 0 adds r0, 0x25 @@ -26888,8 +26888,8 @@ sub_8083288: bx r0 thumb_func_end sub_8083288 - thumb_func_start sub_8083294 -sub_8083294: + thumb_func_start InSameRoom_2 +InSameRoom_2: push {r4-r7,lr} adds r4, r0, 0 adds r6, r1, 0 @@ -26978,10 +26978,10 @@ _08083330: bx r1 .align 2, 0 _08083338: .4byte 0x000104c4 - thumb_func_end sub_8083294 + thumb_func_end InSameRoom_2 - thumb_func_start sub_808333C -sub_808333C: + thumb_func_start InSameRoom_3 +InSameRoom_3: push {r4-r6,lr} adds r4, r0, 0 adds r5, r1, 0 @@ -27061,7 +27061,7 @@ _080833CC: bne _080833DE adds r0, r4, 0 adds r1, r5, 0 - bl sub_8083478 + bl IsTargetTwoTilesAway lsls r0, 24 cmp r0, 0 beq _080833BE @@ -27071,7 +27071,7 @@ _080833E0: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_808333C + thumb_func_end InSameRoom_3 thumb_func_start sub_80833E8 sub_80833E8: @@ -27148,8 +27148,8 @@ _0808346A: _08083474: .4byte 0x000104c4 thumb_func_end sub_80833E8 - thumb_func_start sub_8083478 -sub_8083478: + thumb_func_start IsTargetTwoTilesAway +IsTargetTwoTilesAway: push {r4-r7,lr} sub sp, 0x4 adds r3, r0, 0 @@ -27287,7 +27287,7 @@ _08083560: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_8083478 + thumb_func_end IsTargetTwoTilesAway thumb_func_start sub_8083568 sub_8083568: @@ -27364,8 +27364,8 @@ _080835FA: bx r1 thumb_func_end sub_8083568 - thumb_func_start sub_8083600 -sub_8083600: + thumb_func_start GetLeaderEntity +GetLeaderEntity: push {r4,r5,lr} ldr r0, _08083638 ldr r0, [r0] @@ -27396,7 +27396,7 @@ _0808362E: movs r0, 0 b _0808364A .align 2, 0 -_08083638: .4byte gUnknown_203B450 +_08083638: .4byte gLeaderPokemon _0808363C: .4byte gDungeonGlobalData _08083640: .4byte 0x0001357c _08083644: @@ -27408,13 +27408,13 @@ _0808364A: pop {r1} bx r1 .align 2, 0 -_08083650: .4byte gUnknown_203B450 - thumb_func_end sub_8083600 +_08083650: .4byte gLeaderPokemon + thumb_func_end GetLeaderEntity thumb_func_start sub_8083654 sub_8083654: push {lr} - bl sub_8083600 + bl GetLeaderEntity ldr r0, [r0, 0x70] pop {r1} bx r1 @@ -27433,7 +27433,7 @@ sub_8083660: lsls r1, 5 add r1, sp str r0, [r1] - bl sub_8083600 + bl GetLeaderEntity ldr r2, _080836D8 add r2, sp str r0, [r2] @@ -27814,7 +27814,7 @@ sub_8083904: adds r0, r1 b _08083A6E .align 2, 0 -_08083950: .4byte gUnknown_80F4448 +_08083950: .4byte gAdjacentTileOffsets _08083954: ldr r1, [r4, 0x58] movs r0, 0x1 @@ -27922,7 +27922,7 @@ _08083A00: adds r1, r4, 0 movs r2, 0 movs r3, 0 - bl sub_8071598 + bl CanTarget lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -27968,7 +27968,7 @@ _08083A6E: b _08083A9E .align 2, 0 _08083A78: .4byte 0x0001357c -_08083A7C: .4byte gUnknown_80F4448 +_08083A7C: .4byte gAdjacentTileOffsets _08083A80: mov r3, r9 ldr r2, [sp] @@ -28851,8 +28851,8 @@ sub_80840D8: _080840E4: .4byte gUnknown_203B454 thumb_func_end sub_80840D8 - thumb_func_start sub_80840E8 -sub_80840E8: + thumb_func_start GetRandomNumber +GetRandomNumber: ldr r2, _080840F8 ldr r1, [r2] ldr r0, _080840FC @@ -28864,13 +28864,13 @@ sub_80840E8: .align 2, 0 _080840F8: .4byte gUnknown_203B454 _080840FC: .4byte 0x5d588b65 - thumb_func_end sub_80840E8 + thumb_func_end GetRandomNumber thumb_func_start DungeonRandomCapped DungeonRandomCapped: push {r4,lr} adds r4, r0, 0 - bl sub_80840E8 + bl GetRandomNumber ldr r1, _08084118 ands r0, r1 muls r0, r4 @@ -29312,7 +29312,7 @@ sub_8084448: adds r5, r0, 0 ldr r7, [r5, 0x70] ldr r4, _0808447C - bl sub_8083600 + bl GetLeaderEntity adds r1, r0, 0 adds r0, r4, 0 movs r2, 0 @@ -29506,7 +29506,7 @@ sub_80845E0: movs r1, 0 mov r9, r1 ldr r4, _08084620 - bl sub_8083600 + bl GetLeaderEntity adds r1, r0, 0 adds r0, r4, 0 movs r2, 0 diff --git a/asm/code_80848F0.s b/asm/code_80848F0.s index 6fa181d..3ef188c 100644 --- a/asm/code_80848F0.s +++ b/asm/code_80848F0.s @@ -272,7 +272,7 @@ _0808547C: .4byte gUnknown_80F4598 thumb_func_start sub_8085480 sub_8085480: push {lr} - bl sub_8083600 + bl GetLeaderEntity pop {r1} bx r1 thumb_func_end sub_8085480 @@ -794,7 +794,7 @@ _08085840: bx r0 .align 2, 0 _08085854: .4byte gDungeonGlobalData -_08085858: .4byte gUnknown_80F4448 +_08085858: .4byte gAdjacentTileOffsets _0808585C: .4byte 0x000135cc thumb_func_end sub_80857B8 diff --git a/asm/code_8085B0C.s b/asm/code_8085B0C.s index 2a05dfe..e79e550 100644 --- a/asm/code_8085B0C.s +++ b/asm/code_8085B0C.s @@ -176,7 +176,7 @@ _08085C3E: pop {r1} bx r1 .align 2, 0 -_08085C4C: .4byte gUnknown_80F4448 +_08085C4C: .4byte gAdjacentTileOffsets _08085C50: .4byte gUnknown_202F3D8 thumb_func_end sub_8085B80 diff --git a/asm/code_8094148.s b/asm/code_8094148.s index 66feab4..8a2e077 100644 --- a/asm/code_8094148.s +++ b/asm/code_8094148.s @@ -279,8 +279,8 @@ _08094448: .4byte 0xffff0000 _0809444C: .4byte 0x0000ffff thumb_func_end sub_80943DC - thumb_func_start sub_8094450 -sub_8094450: + thumb_func_start GetBellyRoundedUp +GetBellyRoundedUp: push {lr} adds r1, r0, 0 lsls r0, r1, 16 @@ -306,7 +306,7 @@ _08094474: _08094476: pop {r1} bx r1 - thumb_func_end sub_8094450 + thumb_func_end GetBellyRoundedUp thumb_func_start sub_809447C sub_809447C: diff --git a/asm/jirachi_wish.s b/asm/jirachi_wish.s index 85a8d1c..4d113bb 100644 --- a/asm/jirachi_wish.s +++ b/asm/jirachi_wish.s @@ -157,7 +157,7 @@ _0808B6D2: movs r2, 0 ldrsh r0, [r7, r2] asrs r1, 16 - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -241,7 +241,7 @@ _0808B77E: movs r2, 0 ldrsh r0, [r7, r2] asrs r1, 16 - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -321,7 +321,7 @@ _0808B87C: bl UnlockFriendArea movs r0, 0xD4 bl PlaySoundEffect - bl sub_8083600 + bl GetLeaderEntity adds r1, r0, 0 ldr r0, _0808BA3C movs r2, 0 @@ -391,7 +391,7 @@ _0808B8F4: movs r2, 0 ldrsh r0, [r7, r2] asrs r1, 16 - bl sub_8049590 + bl GetMapEntity ldrh r1, [r0] movs r0, 0x3 ands r0, r1 @@ -442,7 +442,7 @@ _0808B98E: movs r0, 0xA movs r1, 0x46 bl sub_803E708 - bl sub_8083600 + bl GetLeaderEntity adds r1, r0, 0 adds r1, 0x4 adds r0, r6, 0x4 diff --git a/charmap.txt b/charmap.txt index 5866f28..79e61d4 100644 --- a/charmap.txt +++ b/charmap.txt @@ -244,6 +244,25 @@ DPAD = 87 52 '\0' = 00 '\n' = 0A +@ Character codes escaped with a '~'. +APOSTROPHE = 7E 32 37 @ ~27 +COMMA = 7E 32 63 @ ~2c +QUOTE_START = 7E 39 33 @ ~93 +QUOTE_END = 7E 39 34 @ ~94 + +@ Placeholders for message arguments to swap out for names within strings. +ARG_POKEMON_0 = 24 6D 30 @ $m0 +ARG_POKEMON_1 = 24 6D 31 @ $m1 +ARG_POKEMON_2 = 24 6D 32 @ $m2 +ARG_POKEMON_3 = 24 6D 33 @ $m3 +ARG_POKEMON_4 = 24 6D 34 @ $m4 +ARG_POKEMON_5 = 24 6D 35 @ $m5 +ARG_POKEMON_6 = 24 6D 36 @ $m6 +ARG_POKEMON_7 = 24 6D 37 @ $m7 +ARG_POKEMON_8 = 24 6D 38 @ $m8 +ARG_MOVE_ITEM_0 = 24 69 30 @ $i0 +ARG_MOVE_ITEM_1 = 24 69 31 @ $i1 + @ TEXT MACROS @ @ "#" is a text macro for different things @@ -253,7 +272,7 @@ DPAD = 87 52 EXTRA_MSG = 23 50 @ #P WAIT_PRESS = 23 57 @ #W CENTER_ALIGN = 23 2B @ #+ -NEW_LINE = 23 4E @ #N +NEW_LINE = 23 6E @ #n @ COLOR FORMATTING MACROS @@ -272,16 +291,17 @@ RED = 32 @ 2 BLACK = 33 @ 3 GREEN = 34 @ 4 CYAN = 35 @ 5 -CYAN_ALT = 05 +CYAN_2 = 05 YELLOW = 36 @ 6 -YELLOW_ALT = 06 +YELLOW_2 = 06 WHITE_2 = 37 @ 7 DARKER_GRAY = 38 @ 8 DARK_GRAY = 39 @ 9 WHITE_3 = 41 @ A WHITE_4 = 42 @ B -YELLOW_2 = 43 @ C -YELLOW_3 = 44 @ D +YELLOW_3 = 43 @ C +YELLOW_4 = 44 @ D LIGHT_BLUE = 45 @ E WHITE_5 = 46 @ F LIGHT_BLUE_2 = 47 @ G (TODO CHECK THIS) +YELLOW_5 = 4E @ N diff --git a/data/cutscenes_1.s b/data/cutscenes_1.s index 1c01aad..c983f0f 100644 --- a/data/cutscenes_1.s +++ b/data/cutscenes_1.s @@ -62,7 +62,7 @@ .global PleaseWakeUp_822C4C0 PleaseWakeUp_822C4C0: - .string " ...Please~2c wake up.#W\nCome on~2c wake up.\0" + .string " ...Please{COMMA} wake up.#W\nCome on{COMMA} wake up.\0" .align 2,0 .global ExcuseMe_822C4F0 @@ -72,7 +72,7 @@ .global HeyWakeUp_822C500 HeyWakeUp_822C500: - .string " ...Hey~2c wake up.#W\nWake up already.\0" + .string " ...Hey{COMMA} wake up.#W\nWake up already.\0" .align 2,0 .global Hey_822C528 @@ -318,7 +318,7 @@ .global HelpTheKid_822D18C HelpTheKid_822D18C: - .string " We can~27t just do nothing!\nLet~27s go help this kid!\0" + .string " We can{APOSTROPHE}t just do nothing!\nLet{APOSTROPHE}s go help this kid!\0" .align 2,0 .byte 0x20, 0x4f, 0x68, 0x21, 0x20, 0x57, 0x68, 0x61, 0x74, 0x20, 0x61, 0x6d, 0x20, 0x49, 0x20, 0x74, 0x6f, 0x20, 0x64, 0x6f, 0x3f, 0x21, 0x0a, 0x4f @@ -9115,7 +9115,7 @@ .byte 0x72, 0x65, 0x73, 0x63, 0x75, 0x65, 0x20, 0x64, 0x6f, 0x6e, 0x65, 0x2e, 0x00, 0x00, 0x00, 0x00 .string " Look. Over there.\n" - .string "Let~27s get this rescue done.\0" + .string "Let{APOSTROPHE}s get this rescue done.\0" .align 2,0 @ Partner diff --git a/data/data.s b/data/data.s index 3c976be..08a0f1f 100644 --- a/data/data.s +++ b/data/data.s @@ -415,7 +415,7 @@ gUnknown_80B71A0: @ 80B71A0 .global CNLAST_text CNLAST_text: - .string "#CNLAST{END_COLOR_TEXT_1}\0" + .string "{COLOR_1 YELLOW_5}LAST{END_COLOR_TEXT_1}\0" .align 2,0 .global CECONTINUE_text diff --git a/data/data_80B9BB8.s b/data/data_80B9BB8.s index 59831f8..2f94565 100644 --- a/data/data_80B9BB8.s +++ b/data/data_80B9BB8.s @@ -429,7 +429,7 @@ gUnknown_80D406C: @ 80D406C .global gUnknown_80D4074 gUnknown_80D4074: @ 80D4074 - .string "#+$m0\0" + .string "#+{ARG_POKEMON_0}\0" .align 2,0 .global gUnknown_80D407C @@ -509,12 +509,12 @@ gUnknown_80D4104: @ 80D4104 .global gUnknown_80D4120 gUnknown_80D4120: @ 80D4120 - .string "$i0\0" + .string "{ARG_MOVE_ITEM_0}\0" .align 2,0 .global gUnknown_80D4124 gUnknown_80D4124: @ 80D4124 - .string "$i0($v02" + .string "{ARG_MOVE_ITEM_0}($v02" .byte 0x81, 0x5E .asciz "$v12)" .align 2,0 diff --git a/data/data_80D47B8.s b/data/data_80D47B8.s index 7dca611..651e042 100644 --- a/data/data_80D47B8.s +++ b/data/data_80D47B8.s @@ -340,36 +340,36 @@ gFelicityDialogue: @ 80D49E0 (Felicity Bank Dialogue) .global gUnknown_80D4A58 gUnknown_80D4A58: .string " Sssnore...\n" - .string "Ah~2c you wish to know how the bank\n" + .string "Ah{COMMA} you wish to know how the bank\n" .string "operates... Very well...#P" .string " Zzz...\n" - .string "If you~27re defeated in a dungeon~2c\n" - .string "you~27ll lose all your money. Did you know?#P" + .string "If you{APOSTROPHE}re defeated in a dungeon{COMMA}\n" + .string "you{APOSTROPHE}ll lose all your money. Did you know?#P" .string " Purr...\n" - .string "But~2c you~27ve nothing to fear if you leave\n" + .string "But{COMMA} you{APOSTROPHE}ve nothing to fear if you leave\n" .string "your money with Felicity Bank...#P" .string " Meow... Even if you\n" - .string "return defeated from a dungeon~2c your\n" + .string "return defeated from a dungeon{COMMA} your\n" .string "money will be safe with me...#P" .string " Sssnore...\n" - .string "I assure you~2c my bank will keep your\n" + .string "I assure you{COMMA} my bank will keep your\n" .string "money safe...#P" .string " Zzz...\n" - .string "Simple~2c isn~27t it...?\0" + .string "Simple{COMMA} isn{APOSTROPHE}t it...?\0" .align 2, 0 .global gUnknown_80D4C14 gUnknown_80D4C14: .string " {POKE}... Purr...\n" - .string "Very well~2c {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.\n" + .string "Very well{COMMA} {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.\n" .string "Here you are.\0" .align 2, 0 .global gUnknown_80D4C50 gUnknown_80D4C50: .string " Fnarf? Hunh...?#P" - .string " Purr... I so do apologize~2c\n" - .string "but you couldn~27t possibly carry any more\n" + .string " Purr... I so do apologize{COMMA}\n" + .string "but you couldn{APOSTROPHE}t possibly carry any more\n" .string "money with you...\0" .align 2, 0 @@ -377,7 +377,7 @@ gUnknown_80D4C50: gUnknown_80D4CC0: .string " Fnarf? Meow...?#P" .string " Purr...\n" - .string "I so hate to disappoint~2c but you have no\n" + .string "I so hate to disappoint{COMMA} but you have no\n" .string "money saved with me...\0" .align 2, 0 @@ -400,7 +400,7 @@ gUnknown_80D4D8C: .string "Meow! All this money...#W\n" .string "Our safe is about to burst...#P" .string " Purr...\n" - .string "I am so sorry to say~2c but I can~27t accept\n" + .string "I am so sorry to say{COMMA} but I can{APOSTROPHE}t accept\n" .string "any more of your money...\0" .align 2, 0 @@ -408,7 +408,7 @@ gUnknown_80D4D8C: gUnknown_80D4E28: .string " Sssnore... Hmm?#P" .string " Zzz...\n" - .string "I~27m so sorry to say~2c but you appear not\n" + .string "I{APOSTROPHE}m so sorry to say{COMMA} but you appear not\n" .string "to have any money...\0" .align 2, 0 @@ -457,38 +457,38 @@ gUnknown_80D4F94: .global gUnknown_80D4FC8 gUnknown_80D4FC8: - .string " Ah~2c you wish to know how\n" + .string " Ah{COMMA} you wish to know how\n" .string "the bank operates. Very well.#P" .string " If you are defeated\n" - .string "in a dungeon~2c you~27ll lose all your money.\n" + .string "in a dungeon{COMMA} you{APOSTROPHE}ll lose all your money.\n" .string "Did you know that?#P" .string " But you can avoid that!#W\n" - .string "You~27ve nothing to fear if you leave your\n" + .string "You{APOSTROPHE}ve nothing to fear if you leave your\n" .string "money with Felicity Bank.#P" .string " Even if you return\n" - .string "defeated from a dungeon~2c your money will\n" + .string "defeated from a dungeon{COMMA} your money will\n" .string "be safe with me!#P" - .string " I assure you~2c my bank\n" + .string " I assure you{COMMA} my bank\n" .string "will keep your money safe.#P" - .string " Simple~2c isn~27t it?\0" + .string " Simple{COMMA} isn{APOSTROPHE}t it?\0" .align 2, 0 .global gUnknown_80D5158 gUnknown_80D5158: - .string " Very well~2c {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.\n" + .string " Very well{COMMA} {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.\n" .string "Here you are.\0" .align 2, 0 .global gUnknown_80D5184 gUnknown_80D5184: - .string " Oh?#W I do so apologize~2c\n" - .string "but you couldn~27t possibly carry any more\n" + .string " Oh?#W I do so apologize{COMMA}\n" + .string "but you couldn{APOSTROPHE}t possibly carry any more\n" .string "money with you.\0" .align 2, 0 .global gUnknown_80D51DC gUnknown_80D51DC: - .string " Oh?#W I so hate to disappoint~2c\n" + .string " Oh?#W I so hate to disappoint{COMMA}\n" .string "but you have no money saved with me.\0" .align 2, 0 @@ -508,13 +508,13 @@ gUnknown_80D5244: gUnknown_80D527C: .string " Meow! All this money!#W\n" .string "Our safe is about to burst!#P" - .string " I am so sorry to say~2c but\n" - .string "I can~27t accept any more of your money!\0" + .string " I am so sorry to say{COMMA} but\n" + .string "I can{APOSTROPHE}t accept any more of your money!\0" .align 2, 0 .global gUnknown_80D52F8 gUnknown_80D52F8: - .string " Oh?#W I~27m so sorry to say~2c\n" + .string " Oh?#W I{APOSTROPHE}m so sorry to say{COMMA}\n" .string "but you appear not to have any money.\0" .align 2, 0 @@ -601,9 +601,9 @@ gUnknown_80D54A4: .string "I can store items that you\n" .string "found in dungeons...#P" .string " Snarfle...\n" - .string "Things in storage don~27t get lost...#P" + .string "Things in storage don{APOSTROPHE}t get lost...#P" .string " Zzz... Zzz...\n" - .string "That~27s why...\n" + .string "That{APOSTROPHE}s why...\n" .string "Keep important items in storage...\0" .align 2, 0 @@ -616,14 +616,14 @@ gUnknown_80D555C: .global gUnknown_80D5590 gUnknown_80D5590: .string " Zzz... No...\n" - .string "Can~27t store any more of that...\0" + .string "Can{APOSTROPHE}t store any more of that...\0" .align 2, 0 .global gUnknown_80D55C0 gUnknown_80D55C0: .string " Zzz... Zzz...\n" - .string "That {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}...\n" - .string "Can~27t store it...\0" + .string "That {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}...\n" + .string "Can{APOSTROPHE}t store it...\0" .align 2, 0 .global gUnknown_80D55F4 @@ -636,14 +636,14 @@ gUnknown_80D55F4: gUnknown_80D5630: .string " Snarfle? Hunh...?#W\n" .string "Zzz...\n" - .string "You don~27t have enough space...\0" + .string "You don{APOSTROPHE}t have enough space...\0" .align 2, 0 .global gUnknown_80D5670 gUnknown_80D5670: .string " Snarfle? Hunh...?#W\n" .string "Zzz...\n" - .string "You don~27t have anything...?\0" + .string "You don{APOSTROPHE}t have anything...?\0" .align 2, 0 .global gUnknown_80D56AC @@ -662,7 +662,7 @@ gUnknown_80D56CC: .global gUnknown_80D5710 gUnknown_80D5710: .string " Hunh...? Taking...?\n" - .string "Oh... You want your {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}...\n" + .string "Oh... You want your {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}...\n" .string "OK?\0" .align 2, 0 @@ -682,20 +682,20 @@ gUnknown_80D5774: .global gUnknown_80D57C4 gUnknown_80D57C4: .string " Zzz... Zzz...\n" - .string "Yup~2c I did... Stored away...\0" + .string "Yup{COMMA} I did... Stored away...\0" .align 2, 0 .global gUnknown_80D57F4 gUnknown_80D57F4: - .string " Hunh~2c wha--? Storage...?\n" - .string "I~27ll put away the things you chose...\n" + .string " Hunh{COMMA} wha--? Storage...?\n" + .string "I{APOSTROPHE}ll put away the things you chose...\n" .string "That OK?\0" .align 2, 0 .global gUnknown_80D5844 gUnknown_80D5844: .string " Zzz... Store something?\n" - .string "Gonna put {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} in storage...\n" + .string "Gonna put {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} in storage...\n" .string "OK?\0" .align 2, 0 @@ -707,7 +707,7 @@ gUnknown_80D5884: .global gUnknown_80D58B0 gUnknown_80D58B0: - .string " Hunh~2c wha--? Store what...?\n" + .string " Hunh{COMMA} wha--? Store what...?\n" .string "You can choose more than one using\n" .string "{L_BUTTON} or {R_BUTTON}...\0" .align 2, 0 @@ -728,79 +728,79 @@ gUnknown_80D5934: .global gUnknown_80D5954 gUnknown_80D5954: .string " Zzz... Zzz...\n" - .string "Hello~2c there...\n" - .string "$m6 Storage...\0" + .string "Hello{COMMA} there...\n" + .string "{ARG_POKEMON_6} Storage...\0" .align 2, 0 .global gUnknown_80D5984 gUnknown_80D5984: .string " I can store items that you\n" - .string "found in dungeons~2c or that you\n" + .string "found in dungeons{COMMA} or that you\n" .string "bought from shops.#P" .string " If you faint in\n" - .string "a dungeon~2c your items will be lost...#W\n" - .string "But what~27s in storage will be safe.#P" + .string "a dungeon{COMMA} your items will be lost...#W\n" + .string "But what{APOSTROPHE}s in storage will be safe.#P" .string " I keep guard over the\n" - .string "storage space~2c so anything you leave\n" - .string "with me won~27t ever disappear!#P" + .string "storage space{COMMA} so anything you leave\n" + .string "with me won{APOSTROPHE}t ever disappear!#P" .string " If you have any items that\n" - .string "you can~27t bear to lose~2c be sure to leave\n" + .string "you can{APOSTROPHE}t bear to lose{COMMA} be sure to leave\n" .string "them with me!\0" .align 2, 0 .global gUnknown_80D5AF0 gUnknown_80D5AF0: - .string " Sorry~2c dear.\n" - .string "I~27ve run out of storage space.\0" + .string " Sorry{COMMA} dear.\n" + .string "I{APOSTROPHE}ve run out of storage space.\0" .align 2, 0 .global gUnknown_80D5B24 gUnknown_80D5B24: - .string " Sorry~2c dear.\n" - .string "I can~27t take any more of that item.\0" + .string " Sorry{COMMA} dear.\n" + .string "I can{APOSTROPHE}t take any more of that item.\0" .align 2, 0 .global gUnknown_80D5B5C gUnknown_80D5B5C: - .string " Oh~2c dear~2c sorry.#W\n" - .string "That {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} is an item you\n" - .string "can~27t put in storage.\0" + .string " Oh{COMMA} dear{COMMA} sorry.#W\n" + .string "That {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} is an item you\n" + .string "can{APOSTROPHE}t put in storage.\0" .align 2, 0 .global gUnknown_80D5BAC gUnknown_80D5BAC: .string " Oh?\n" - .string "You don~27t have anything stored~2c dear.\0" + .string "You don{APOSTROPHE}t have anything stored{COMMA} dear.\0" .align 2, 0 .global gUnknown_80D5BDC gUnknown_80D5BDC: - .string " Oh? You don~27t have the room\n" - .string "to carry any more items~2c dear.\0" + .string " Oh? You don{APOSTROPHE}t have the room\n" + .string "to carry any more items{COMMA} dear.\0" .align 2, 0 .global gUnknown_80D5C1C gUnknown_80D5C1C: .string " Oh?\n" - .string "You don~27t seem to have anything?\0" + .string "You don{APOSTROPHE}t seem to have anything?\0" .align 2, 0 .global gUnknown_80D5C44 gUnknown_80D5C44: .string " There you go!\n" - .string "Just like you asked~2c sweetie!\0" + .string "Just like you asked{COMMA} sweetie!\0" .align 2, 0 .global gUnknown_80D5C74 gUnknown_80D5C74: - .string " I~27ll take the items you\n" + .string " I{APOSTROPHE}ll take the items you\n" .string "chose out of storage. OK?\0" .align 2, 0 .global gUnknown_80D5CAC gUnknown_80D5CAC: - .string " Fine~2c I~27ll take your\n" - .string "{COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} out of storage. OK?\0" + .string " Fine{COMMA} I{APOSTROPHE}ll take your\n" + .string "{COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} out of storage. OK?\0" .align 2, 0 .global gUnknown_80D5CE4 @@ -818,20 +818,20 @@ gUnknown_80D5D0C: .global gUnknown_80D5D58 gUnknown_80D5D58: - .string " OK~2c stored away!\n" - .string "You can count on me~2c honey.\0" + .string " OK{COMMA} stored away!\n" + .string "You can count on me{COMMA} honey.\0" .align 2, 0 .global gUnknown_80D5D8C gUnknown_80D5D8C: - .string " I~27ll put the items you chose\n" + .string " I{APOSTROPHE}ll put the items you chose\n" .string "in storage. OK?\0" .align 2, 0 .global gUnknown_80D5DBC gUnknown_80D5DBC: - .string " I~27ll put your\n" - .string "{COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} in storage. OK?\0" + .string " I{APOSTROPHE}ll put your\n" + .string "{COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} in storage. OK?\0" .align 2, 0 .global gUnknown_80D5DE8 @@ -849,19 +849,19 @@ gUnknown_80D5E10: .global gUnknown_80D5E60 gUnknown_80D5E60: - .string " Thank you~2c sweetie.\n" + .string " Thank you{COMMA} sweetie.\n" .string "Come again!\0" .align 2, 0 .global gUnknown_80D5E84 gUnknown_80D5E84: - .string " Anything else~2c dear?\0" + .string " Anything else{COMMA} dear?\0" .align 2, 0 .global gUnknown_80D5E9C gUnknown_80D5E9C: - .string " Hello~2c there!\n" - .string "Welcome to $m6 Storage.\0" + .string " Hello{COMMA} there!\n" + .string "Welcome to {ARG_POKEMON_6} Storage.\0" .align 2, 0 .global gKecleonShopDialogue @@ -976,14 +976,14 @@ gUnknown_80D6038: .global gUnknown_80D6128 gUnknown_80D6128: - .string " Zzz... Eep? No~2c no...#W\n" + .string " Zzz... Eep? No{COMMA} no...#W\n" .string "You cannot hold any more money...\0" .align 2, 0 .global gUnknown_80D6168 gUnknown_80D6168: .string " Zzz... Hunh? Wha--? Whoa!#W\n" - .string "I... I can~27t accept anything like that!\0" + .string "I... I can{APOSTROPHE}t accept anything like that!\0" .align 2, 0 .global gUnknown_80D61B0 @@ -1009,7 +1009,7 @@ gUnknown_80D6204: .global gUnknown_80D6250 gUnknown_80D6250: .string " Zzzzzz... Oh?#W\n" - .string "You~27ve got nothing...\0" + .string "You{APOSTROPHE}ve got nothing...\0" .align 2, 0 .global gUnknown_80D627C @@ -1024,7 +1024,7 @@ gUnknown_80D62B0: .string " Eep...? Zzz...\n" .string "You have too much money!#P" .string " Zzz... Eh?\n" - .string "You can~27t hold any more money...\0" + .string "You can{APOSTROPHE}t hold any more money...\0" .align 2, 0 .global gUnknown_80D630C @@ -1049,15 +1049,15 @@ gUnknown_80D6364: .global gUnknown_80D6394 gUnknown_80D6394: - .string " Zzz... Reep~2c what...?\n" - .string "For all that I can buy~2c I will pay\n" + .string " Zzz... Reep{COMMA} what...?\n" + .string "For all that I can buy{COMMA} I will pay\n" .string "{COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}... OK?\0" .align 2, 0 .global gUnknown_80D63E8 gUnknown_80D63E8: .string " Zzzzzz... Zzzzzz...?\n" - .string "{COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}?\n" + .string "{COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}?\n" .string "Is {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE} OK?\0" .align 2, 0 @@ -1082,7 +1082,7 @@ gUnknown_80D6478: .global gUnknown_80D6494 gUnknown_80D6494: .string " Zzzzzz...\n" - .string "{COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} is {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}...\n" + .string "{COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} is {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}...\n" .string "OK?\0" .align 2, 0 @@ -1118,27 +1118,27 @@ gUnknown_80D6544: .global gUnknown_80D6564 gUnknown_80D6564: - .string " Wonder Orbs are very~2c\n" + .string " Wonder Orbs are very{COMMA}\n" .string "very convenient〜♪#P" - .string " However~2c they disappear\n" + .string " However{COMMA} they disappear\n" .string "after one use...#W\n" .string "But they are useful in a pinch!#P" - .string " Use them cleverly~2c and your\n" + .string " Use them cleverly{COMMA} and your\n" .string "adventures will be made much easier〜♪#P" .string " And moves...#W\n" .string "They are the ultimate power!#P" .string " Smash rocks!#W Fly!#W\n" - .string "There are many kinds of moves~2c all of\n" - .string "them dynamic~2c yet elegant!#P" + .string "There are many kinds of moves{COMMA} all of\n" + .string "them dynamic{COMMA} yet elegant!#P" .string " There are even moves of\n" .string "obscure rarity...#W\n" - .string "Simply gorgeous~2c they are!#P" - .string " Now~2c we have these moves!#W\n" + .string "Simply gorgeous{COMMA} they are!#P" + .string " Now{COMMA} we have these moves!#W\n" .string "They can be learned using our Technical\n" - .string "Machines~2c or TMs for short!#P" + .string "Machines{COMMA} or TMs for short!#P" .string " You see?\n" - .string "Isn~27t it exciting? Even dreamy?#P" - .string " Why~2c it gets me so excited~2c\n" + .string "Isn{APOSTROPHE}t it exciting? Even dreamy?#P" + .string " Why{COMMA} it gets me so excited{COMMA}\n" .string "my color has turned a rosy tint!#P" .string " I do hope you will shop\n" .string "with us--me and my brother next to\n" @@ -1147,91 +1147,91 @@ gUnknown_80D6564: .global gUnknown_80D6818 gUnknown_80D6818: - .string " Oh~2c no~2c no!#W\n" - .string "My friend~2c you cannot add to your money!\n" + .string " Oh{COMMA} no{COMMA} no!#W\n" + .string "My friend{COMMA} you cannot add to your money!\n" .string "I cannot do this.\0" .align 2, 0 .global gUnknown_80D6868 gUnknown_80D6868: - .string " Whoa~2c whoa!#W\n" - .string "I... I can~27t accept anything like that!\0" + .string " Whoa{COMMA} whoa!#W\n" + .string "I... I can{APOSTROPHE}t accept anything like that!\0" .align 2, 0 .global gUnknown_80D68A4 gUnknown_80D68A4: - .string " Eep! Oh~2c dear!#W\n" - .string "You~27re short on money~2c my friend!\0" + .string " Eep! Oh{COMMA} dear!#W\n" + .string "You{APOSTROPHE}re short on money{COMMA} my friend!\0" .align 2, 0 .global gUnknown_80D68E0 gUnknown_80D68E0: .string " Oh? Uh-oh!#W\n" .string "My shelves are bare of wares!#P" - .string " I am completely sold out~2c\n" + .string " I am completely sold out{COMMA}\n" .string "my friend!\0" .align 2, 0 .global gUnknown_80D6938 gUnknown_80D6938: - .string " Oh~2c dear me!#W\n" - .string "My friend~2c you~27ve run out of space for\n" + .string " Oh{COMMA} dear me!#W\n" + .string "My friend{COMMA} you{APOSTROPHE}ve run out of space for\n" .string "my wares!\0" .align 2, 0 .global gUnknown_80D6980 gUnknown_80D6980: .string " Oh?#W\n" - .string "My friend~2c you seem to have nothing?\0" + .string "My friend{COMMA} you seem to have nothing?\0" .align 2, 0 .global gUnknown_80D69B0 gUnknown_80D69B0: - .string " Oh~2c oh~2c oh?#W\n" - .string "My friend~2c you seem to not have anything\n" + .string " Oh{COMMA} oh{COMMA} oh?#W\n" + .string "My friend{COMMA} you seem to not have anything\n" .string "that you can sell?\0" .align 2, 0 .global gUnknown_80D6A04 gUnknown_80D6A04: - .string " Oh~2c my~2c my!\n" - .string "My friend~2c you have too much money!#P" - .string " You can~27t carry any more\n" + .string " Oh{COMMA} my{COMMA} my!\n" + .string "My friend{COMMA} you have too much money!#P" + .string " You can{APOSTROPHE}t carry any more\n" .string "money than you have now.\0" .align 2, 0 .global gUnknown_80D6A74 gUnknown_80D6A74: .string " Oh?#W\n" - .string "My friend~2c you seem not to have\n" + .string "My friend{COMMA} you seem not to have\n" .string "enough money?\0" .align 2, 0 .global gUnknown_80D6AAC gUnknown_80D6AAC: .string " ...#WI am all out of wares...\n" - .string "I am so sorry~2c my friend...#P" + .string "I am so sorry{COMMA} my friend...#P" .string " Tomorrow!\n" .string "Tomorrow I shall have more wares!\0" .align 2, 0 .global gUnknown_80D6B18 gUnknown_80D6B18: - .string " Fine~2c fine~2c we have a deal!\n" + .string " Fine{COMMA} fine{COMMA} we have a deal!\n" .string "Thank you so much〜♪ \0" .align 2, 0 .global gUnknown_80D6B50 gUnknown_80D6B50: - .string " For all that I can buy~2c I can\n" + .string " For all that I can buy{COMMA} I can\n" .string "offer you {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.\n" .string "Is that acceptable?\0" .align 2, 0 .global gUnknown_80D6BA0 gUnknown_80D6BA0: - .string " {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}~2c you say?\n" - .string "For that~2c I can offer {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.\n" + .string " {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}{COMMA} you say?\n" + .string "For that{COMMA} I can offer {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.\n" .string "Is that acceptable?\0" .align 2, 0 @@ -1249,7 +1249,7 @@ gUnknown_80D6C1C: .global gUnknown_80D6C48 gUnknown_80D6C48: - .string " {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}~2c you say?\n" + .string " {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}{COMMA} you say?\n" .string "That will be {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.\n" .string "Is that acceptable?\0" .align 2, 0 @@ -1262,7 +1262,7 @@ gUnknown_80D6C90: .global gUnknown_80D6CB8 gUnknown_80D6CB8: - .string " Ah~2c very well!\n" + .string " Ah{COMMA} very well!\n" .string "Do examine my merchandise.\n" .string "I have chosen it with pride〜♪ \0" .align 2, 0 @@ -1298,21 +1298,21 @@ gUnknown_80D6D98: .global gUnknown_80D6E30 gUnknown_80D6E30: - .string " Zzz... Hunh~2c what...?#W\n" - .string "Zzz... You can~27t hold any more money...\0" + .string " Zzz... Hunh{COMMA} what...?#W\n" + .string "Zzz... You can{APOSTROPHE}t hold any more money...\0" .align 2, 0 .global gUnknown_80D6E78 gUnknown_80D6E78: .string " Zzz... Whoa...#W\n" - .string "I... I can~27t take that!\0" + .string "I... I can{APOSTROPHE}t take that!\0" .align 2, 0 .global gUnknown_80D6EA4 gUnknown_80D6EA4: - .string " Zzz... Huh~2c my...!#W\n" + .string " Zzz... Huh{COMMA} my...!#W\n" .string "Meep... Meep...\n" - .string "You don~27t have enough money!\0" + .string "You don{APOSTROPHE}t have enough money!\0" .align 2, 0 .global gUnknown_80D6EEC @@ -1324,14 +1324,14 @@ gUnknown_80D6EEC: .global gUnknown_80D6F18 gUnknown_80D6F18: - .string " Zzz... Oh~2c my!#W\n" + .string " Zzz... Oh{COMMA} my!#W\n" .string "Meep... You have no space...\0" .align 2, 0 .global gUnknown_80D6F4C gUnknown_80D6F4C: .string " Zzz... Eep...?#W\n" - .string "Meep... You don~27t seem to have\n" + .string "Meep... You don{APOSTROPHE}t seem to have\n" .string "anything...?\0" .align 2, 0 @@ -1339,28 +1339,28 @@ gUnknown_80D6F4C: gUnknown_80D6F8C: .string " Zzz... Huh?#W\n" .string "Meep meep...\n" - .string "You don~27t seem to have anything to sell?\0" + .string "You don{APOSTROPHE}t seem to have anything to sell?\0" .align 2, 0 .global gUnknown_80D6FD4 gUnknown_80D6FD4: - .string " Zzz... Oh~2c my!\n" + .string " Zzz... Oh{COMMA} my!\n" .string "You have so much money...!#P" .string " Zzz... Meep...\n" - .string "You can~27t carry any more money...\0" + .string "You can{APOSTROPHE}t carry any more money...\0" .align 2, 0 .global gUnknown_80D7038 gUnknown_80D7038: .string " Hunh?#W\n" .string "Eep...?\n" - .string "You don~27t have money?\0" + .string "You don{APOSTROPHE}t have money?\0" .align 2, 0 .global gUnknown_80D7064 gUnknown_80D7064: .string " ...#W ZZZ!\n" - .string "I~27m sold out... Forgive me...\0" + .string "I{APOSTROPHE}m sold out... Forgive me...\0" .align 2, 0 .global gUnknown_80D7090 @@ -1379,7 +1379,7 @@ gUnknown_80D70B4: .global gUnknown_80D7108 gUnknown_80D7108: .string " Zzzzzz... Zzzzzz...?\n" - .string "Selling that {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}...?\n" + .string "Selling that {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}...?\n" .string "How about {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}?\0" .align 2, 0 @@ -1392,7 +1392,7 @@ gUnknown_80D7154: .global gUnknown_80D7184 gUnknown_80D7184: .string " Zzz... Zzz...?\n" - .string "You~27re selling what...?\0" + .string "You{APOSTROPHE}re selling what...?\0" .align 2, 0 .global gUnknown_80D71B0 @@ -1404,13 +1404,13 @@ gUnknown_80D71B0: .global gUnknown_80D71CC gUnknown_80D71CC: .string " Zzz... Meep meep...\n" - .string "{COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}...?\n" - .string "{COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}~2c OK?\0" + .string "{COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}...?\n" + .string "{COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}{COMMA} OK?\0" .align 2, 0 .global gUnknown_80D7204 gUnknown_80D7204: - .string " Buy? Huh~2c eep?\n" + .string " Buy? Huh{COMMA} eep?\n" .string "Anything else?\0" .align 2, 0 @@ -1440,21 +1440,21 @@ gUnknown_80D72A0: .global gUnknown_80D72B8 gUnknown_80D72B8: - .string " We~2c the $m6\n" - .string "Brothers~2c have a passion for selling\n" + .string " We{COMMA} the {ARG_POKEMON_6}\n" + .string "Brothers{COMMA} have a passion for selling\n" .string "items.#P" .string " Items are useful for your\n" .string "dungeon adventures.#P" .string " Use your imagination and\n" - .string "discover innovative uses~2c please.#P" - .string " Ah~2c yes.\n" + .string "discover innovative uses{COMMA} please.#P" + .string " Ah{COMMA} yes.\n" .string "If my shop sells out...#P" .string " New merchandise will\n" .string "arrive the following day.#P" - .string " Until then~2c please go to\n" + .string " Until then{COMMA} please go to\n" .string "a dungeon and spend some time.\n" .string "Please visit on your return〜♪#P" - .string " Ah~2c yes. The $m6\n" + .string " Ah{COMMA} yes. The {ARG_POKEMON_6}\n" .string "Shop is a nationwide chain.#P" .string " There are shops even in\n" .string "dungeons.\n" @@ -1463,40 +1463,40 @@ gUnknown_80D72B8: .global gUnknown_80D7480 gUnknown_80D7480: - .string " Oh~2c my!#W\n" - .string "You can~27t add any more to your money.\n" - .string "I can~27t complete this deal~2c sorry.\0" + .string " Oh{COMMA} my!#W\n" + .string "You can{APOSTROPHE}t add any more to your money.\n" + .string "I can{APOSTROPHE}t complete this deal{COMMA} sorry.\0" .align 2, 0 .global gUnknown_80D74DC gUnknown_80D74DC: - .string " Oh~2c whoa~2c whoa!#W\n" - .string "I... I couldn~27t possibly take that from you!\0" + .string " Oh{COMMA} whoa{COMMA} whoa!#W\n" + .string "I... I couldn{APOSTROPHE}t possibly take that from you!\0" .align 2, 0 .global gUnknown_80D7524 gUnknown_80D7524: - .string " Oh~2c my!#W\n" - .string "Sorry~2c but you don~27t have enough money!\0" + .string " Oh{COMMA} my!#W\n" + .string "Sorry{COMMA} but you don{APOSTROPHE}t have enough money!\0" .align 2, 0 .global gUnknown_80D7560 gUnknown_80D7560: .string " Uh-oh?!#W\n" - .string "That~27s it! No more merchandise!#P" - .string " I~27m completely sold out!\0" + .string "That{APOSTROPHE}s it! No more merchandise!#P" + .string " I{APOSTROPHE}m completely sold out!\0" .align 2, 0 .global gUnknown_80D75AC gUnknown_80D75AC: - .string " Oh~2c my!#W\n" + .string " Oh{COMMA} my!#W\n" .string "You have no space for any more items!\0" .align 2, 0 .global gUnknown_80D75E0 gUnknown_80D75E0: .string " Oh? Oh?#W\n" - .string "You don~27t seem to have anything?\0" + .string "You don{APOSTROPHE}t seem to have anything?\0" .align 2, 0 .global gUnknown_80D7610 @@ -1507,24 +1507,24 @@ gUnknown_80D7610: .global gUnknown_80D7640 gUnknown_80D7640: - .string " Oh~2c my goodness!\n" - .string "You~27re overflowing with money!#P" - .string " You couldn~27t possibly carry\n" + .string " Oh{COMMA} my goodness!\n" + .string "You{APOSTROPHE}re overflowing with money!#P" + .string " You couldn{APOSTROPHE}t possibly carry\n" .string "any more money! \0" .align 2, 0 .global gUnknown_80D76A8 gUnknown_80D76A8: .string " Huh?#W\n" - .string "You don~27t seem to have the money?\0" + .string "You don{APOSTROPHE}t seem to have the money?\0" .align 2, 0 .global gUnknown_80D76D4 gUnknown_80D76D4: - .string " ...#WI~27m sold out...\n" - .string "Please~2c forgive me.#P" + .string " ...#WI{APOSTROPHE}m sold out...\n" + .string "Please{COMMA} forgive me.#P" .string " I will have new merchandise\n" - .string "for you tomorrow~2c I swear!\0" + .string "for you tomorrow{COMMA} I swear!\0" .align 2, 0 .global gUnknown_80D7740 @@ -1535,14 +1535,14 @@ gUnknown_80D7740: .global gUnknown_80D776C gUnknown_80D776C: - .string " For everything I can buy~2c\n" + .string " For everything I can buy{COMMA}\n" .string "I can offer {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.\n" .string "Is that acceptable to you?\0" .align 2, 0 .global gUnknown_80D77C0 gUnknown_80D77C0: - .string " {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}?\n" + .string " {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}?\n" .string "I can offer you {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.\n" .string "Will you sell it for that price?\0" .align 2, 0 @@ -1555,7 +1555,7 @@ gUnknown_80D780C: .global gUnknown_80D7830 gUnknown_80D7830: - .string " Ah~2c very well!\n" + .string " Ah{COMMA} very well!\n" .string "What do you wish to sell?\0" .align 2, 0 @@ -1567,7 +1567,7 @@ gUnknown_80D785C: .global gUnknown_80D788C gUnknown_80D788C: - .string " {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}?\n" + .string " {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}?\n" .string "That will be {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}.\n" .string "Is that to your liking?\0" .align 2, 0 @@ -1580,7 +1580,7 @@ gUnknown_80D78CC: .global gUnknown_80D78F8 gUnknown_80D78F8: - .string " Ah~2c very well!\n" + .string " Ah{COMMA} very well!\n" .string "Feel free to examine my merchandise〜♪\0" .align 2, 0 @@ -1599,7 +1599,7 @@ gUnknown_80D7958: .global gUnknown_80D797C gUnknown_80D797C: .string " Hello〜♪\n" - .string "Welcome to the $m6 Shop〜♪ \0" + .string "Welcome to the {ARG_POKEMON_6} Shop〜♪ \0" .align 2, 0 .global gWigglytuffDialogue @@ -1652,10 +1652,10 @@ gUnknown_80D7A44: .string " Zzz... Kwoo...\n" .string "You need Friend Areas for friends...#P" .string " Zzz... Zzz...\n" - .string "A Pokémon becomes your pal when it~27s in\n" + .string "A Pokémon becomes your pal when it{APOSTROPHE}s in\n" .string "the right Friend Area...#P" .string " Zzz... Dwee...\n" - .string "That~27s why you should get more Friend\n" + .string "That{APOSTROPHE}s why you should get more Friend\n" .string "Areas...#P" .string " Zzz... Pokémon can only\n" .string "live in the right Friend Area for\n" @@ -1664,12 +1664,12 @@ gUnknown_80D7A44: .string "See what Pokémon can live there by\n" .string "checking {COLOR_1 YELLOW}Info{END_COLOR_TEXT_1}...#P" .string " Zzz...\n" - .string "I don~27t sell some Friend Areas...#P" + .string "I don{APOSTROPHE}t sell some Friend Areas...#P" .string " Kwoo...\n" .string "Some rescue missions reward you with\n" .string "Friend Areas...#P" .string " Zzz... Dwee...\n" - .string "Check the Pelipper Post Office~27s Bulletin\n" + .string "Check the Pelipper Post Office{APOSTROPHE}s Bulletin\n" .string "Board or your Mailbox for missions...\0" .align 2, 0 @@ -1677,7 +1677,7 @@ gUnknown_80D7A44: gUnknown_80D7C94: .string " Sssnore...\n" .string "{COLOR_1 GREEN}$h{END_COLOR_TEXT_1}...?\n" - .string "I can~27t get that Friend Area...#P" + .string "I can{APOSTROPHE}t get that Friend Area...#P" .string " Zzz... Zzz...\n" .string "Sorry...\0" .align 2, 0 @@ -1686,9 +1686,9 @@ gUnknown_80D7C94: gUnknown_80D7CE8: .string " Zzz... Hunh...?\n" .string "{COLOR_1 GREEN}$h{END_COLOR_TEXT_1}...?\n" - .string "I don~27t know... I~27ll check...#P" + .string "I don{APOSTROPHE}t know... I{APOSTROPHE}ll check...#P" .string " Sssnore...\n" - .string "I~27ll have it for sale...\n" + .string "I{APOSTROPHE}ll have it for sale...\n" .string "When I find out...\0" .align 2, 0 @@ -1702,7 +1702,7 @@ gUnknown_80D7D64: .global gUnknown_80D7DA0 gUnknown_80D7DA0: .string " Dwee... Kwoo...\n" - .string "{COLOR_1 CYAN}$m0{END_COLOR_TEXT_1}~27s Friend Area...\n" + .string "{COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}{APOSTROPHE}s Friend Area...\n" .string "Zzz... {COLOR_1 GREEN}$h{END_COLOR_TEXT_1}...\0" .align 2, 0 @@ -1734,7 +1734,7 @@ gUnknown_80D7E58: .global gUnknown_80D7E9C gUnknown_80D7E9C: .string " Hunh...?#W\n" - .string "You don~27t have any money...\n" + .string "You don{APOSTROPHE}t have any money...\n" .string "Zzzzzz...\0" .align 2, 0 @@ -1742,7 +1742,7 @@ gUnknown_80D7E9C: gUnknown_80D7ED0: .string " Zzz... Zzz?#W\n" .string "Hunh...?\n" - .string "You can~27t add to your Friend Areas...\0" + .string "You can{APOSTROPHE}t add to your Friend Areas...\0" .align 2, 0 .global gUnknown_80D7F10 @@ -1757,10 +1757,10 @@ gUnknown_80D7F10: .global gUnknown_80D7F7C gUnknown_80D7F7C: .string " Zzz... Dwee... Gotcha...#W\n" - .string "Zzz... Let~27s do it...#P" + .string "Zzz... Let{APOSTROPHE}s do it...#P" .string " Sssnore♪ Sssnore♪\n" - .string "$m6〜♪ $m6〜♪\n" - .string "Let~27s be friends...#P" + .string "{ARG_POKEMON_6}〜♪ {ARG_POKEMON_6}〜♪\n" + .string "Let{APOSTROPHE}s be friends...#P" .string " Kwoo!\n" .string "Taaaaaaah!\0" .align 2, 0 @@ -1768,7 +1768,7 @@ gUnknown_80D7F7C: .global gUnknown_80D8000 gUnknown_80D8000: .string " Kwoo? {COLOR_1 GREEN}$h{END_COLOR_TEXT_1}?\n" - .string "That~27s {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}...\n" + .string "That{APOSTROPHE}s {COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}...\n" .string "OK?\0" .align 2, 0 @@ -1788,7 +1788,7 @@ gUnknown_80D8054: .global gUnknown_80D8080 gUnknown_80D8080: .string " Thank... Zzz... You...\n" - .string "Friends~2c friend...\0" + .string "Friends{COMMA} friend...\0" .align 2, 0 .global gUnknown_80D80B0 @@ -1800,7 +1800,7 @@ gUnknown_80D80B0: .global gUnknown_80D80D4 gUnknown_80D80D4: .string " Friends... Zzz...\n" - .string "Welcome to the $m6 Club...\0" + .string "Welcome to the {ARG_POKEMON_6} Club...\0" .align 2, 0 .global gUnknown_80D8104 @@ -1808,45 +1808,45 @@ gUnknown_80D8104: .string " Would you like to get more\n" .string "friends...#W\n" .string "...More members for your team?#P" - .string " To add new friends~2c what\n" + .string " To add new friends{COMMA} what\n" .string "you need are Friend Areas.#P" .string " A Pokémon can join your\n" .string "rescue team only after it settles in\n" .string "the right Friend Area.#P" - .string " So~2c if you want to recruit\n" - .string "new members~2c you should add to your\n" + .string " So{COMMA} if you want to recruit\n" + .string "new members{COMMA} you should add to your\n" .string "Friend Areas.#P" - .string " Oh~2c yes~2c Pokémon can\n" + .string " Oh{COMMA} yes{COMMA} Pokémon can\n" .string "only live in the right Friend Area for\n" .string "their species.#P" - .string " If you~27re buying a Friend\n" - .string "Area~2c you should confirm what Pokémon\n" + .string " If you{APOSTROPHE}re buying a Friend\n" + .string "Area{COMMA} you should confirm what Pokémon\n" .string "can live there by checking {COLOR_1 YELLOW}Info{END_COLOR_TEXT_1}.#P" - .string " Also~2c there are some Friend\n" - .string "Areas that I don~27t sell.#P" + .string " Also{COMMA} there are some Friend\n" + .string "Areas that I don{APOSTROPHE}t sell.#P" .string " I think there are some\n" .string "rescue missions that give you access\n" - .string "to Friend Areas~2c too.#P" + .string "to Friend Areas{COMMA} too.#P" .string " You should check the\n" - .string "Pelipper Post Office~27s Bulletin Board or\n" + .string "Pelipper Post Office{APOSTROPHE}s Bulletin Board or\n" .string "your Mailbox for rescue requests.#P" - .string " You know~2c it makes me\n" + .string " You know{COMMA} it makes me\n" .string "delighted when you make new friends!\0" .align 2, 0 .global gUnknown_80D8420 gUnknown_80D8420: .string " {COLOR_1 GREEN}$h{END_COLOR_TEXT_1}?\n" - .string "I can~27t get that Friend Area for you.#W\n" - .string "I~27m really sorry.\0" + .string "I can{APOSTROPHE}t get that Friend Area for you.#W\n" + .string "I{APOSTROPHE}m really sorry.\0" .align 2, 0 .global gUnknown_80D8468 gUnknown_80D8468: .string " {COLOR_1 GREEN}$h{END_COLOR_TEXT_1}?\n" - .string "I don~27t know much about it at all.#W\n" - .string "I~27ll check up on it.#P" - .string " I~27ll add it to the Friend\n" + .string "I don{APOSTROPHE}t know much about it at all.#W\n" + .string "I{APOSTROPHE}ll check up on it.#P" + .string " I{APOSTROPHE}ll add it to the Friend\n" .string "Areas you can buy when I find out more.\0" .align 2, 0 @@ -1858,14 +1858,14 @@ gUnknown_80D84F8: .global gUnknown_80D8528 gUnknown_80D8528: - .string " {COLOR_1 CYAN}$m0{END_COLOR_TEXT_1}~27s Friend Area\n" + .string " {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}{APOSTROPHE}s Friend Area\n" .string "is {COLOR_1 GREEN}$h{END_COLOR_TEXT_1}.\0" .align 2, 0 .global gUnknown_80D8550 gUnknown_80D8550: .string " Is there another Pokémon\n" - .string "you~27d like to check?\0" + .string "you{APOSTROPHE}d like to check?\0" .align 2, 0 .global gUnknown_80D8584 @@ -1877,27 +1877,27 @@ gUnknown_80D8584: .global gUnknown_80D85AC gUnknown_80D85AC: .string " Oops?#W\n" - .string "It doesn~27t look like you have enough\n" + .string "It doesn{APOSTROPHE}t look like you have enough\n" .string "money!\0" .align 2, 0 .global gUnknown_80D85E4 gUnknown_80D85E4: .string " Oops?#W\n" - .string "Oh~2c too bad.#W\n" - .string "I~27m fresh out of Friend Areas.\0" + .string "Oh{COMMA} too bad.#W\n" + .string "I{APOSTROPHE}m fresh out of Friend Areas.\0" .align 2, 0 .global gUnknown_80D8620 gUnknown_80D8620: .string " Um?#W\n" - .string "You don~27t have any money.\0" + .string "You don{APOSTROPHE}t have any money.\0" .align 2, 0 .global gUnknown_80D8644 gUnknown_80D8644: .string " Oops!#W\n" - .string "You can~27t add to your Friend Areas.\0" + .string "You can{APOSTROPHE}t add to your Friend Areas.\0" .align 2, 0 .global gUnknown_80D8674 @@ -1911,9 +1911,9 @@ gUnknown_80D8674: .global gUnknown_80D86E4 gUnknown_80D86E4: - .string " Gotcha! Let~27s do it!#W\n" - .string "$m6〜♪ $m6〜♪#W\n" - .string "Let~27s be friends... Yoomtaaaaaaah!\0" + .string " Gotcha! Let{APOSTROPHE}s do it!#W\n" + .string "{ARG_POKEMON_6}〜♪ {ARG_POKEMON_6}〜♪#W\n" + .string "Let{APOSTROPHE}s be friends... Yoomtaaaaaaah!\0" .align 2, 0 .global gUnknown_80D8738 @@ -1931,7 +1931,7 @@ gUnknown_80D876C: .global gUnknown_80D8798 gUnknown_80D8798: - .string " You~27d like to add to your\n" + .string " You{APOSTROPHE}d like to add to your\n" .string "Friend Areas?\n" .string "Which one would you like?\0" .align 2, 0 @@ -1939,7 +1939,7 @@ gUnknown_80D8798: .global gUnknown_80D87E0 gUnknown_80D87E0: .string " Thank you! Come again!\n" - .string "We~27re all friends~2c friend!\0" + .string "We{APOSTROPHE}re all friends{COMMA} friend!\0" .align 2, 0 .global gUnknown_80D8818 @@ -1951,7 +1951,7 @@ gUnknown_80D8818: .global gUnknown_80D883C gUnknown_80D883C: .string " Friends are my treasures!\n" - .string "Welcome to the $m6 Club--\n" + .string "Welcome to the {ARG_POKEMON_6} Club--\n" .string "a circle of friends! \0" .align 2, 0 @@ -2011,19 +2011,19 @@ gGulpinDialogue: @ 80D8888 (Gulpin Link Shop) .global gUnknown_80D8950 gUnknown_80D8950: .string " Zzz... Snuffle...\n" - .string "I~27d go broke if it weren~27t for those\n" + .string "I{APOSTROPHE}d go broke if it weren{APOSTROPHE}t for those\n" .string "forgetful Pokémon...#P" .string " Zzz... Gwaaah...\n" - .string "Especially that {COLOR_1 CYAN}$m4{END_COLOR_TEXT_1}...\n" + .string "Especially that {COLOR_1 CYAN}{ARG_POKEMON_4}{END_COLOR_TEXT_1}...\n" .string "It seems to be forgetful...#P" .string " Sssnore...\n" .string "I hope it forgets more moves...\n" .string "So it needs to see me...#P" .string " Zzz... Mumble...\n" .string "But we decided to get rid of that\n" - .string "{COLOR_1 CYAN}$m4{END_COLOR_TEXT_1}...#P" + .string "{COLOR_1 CYAN}{ARG_POKEMON_4}{END_COLOR_TEXT_1}...#P" .string " Gwaaaah... Gweh...\n" - .string "{COLOR_1 CYAN}$m4{END_COLOR_TEXT_1} won~27t be coming around\n" + .string "{COLOR_1 CYAN}{ARG_POKEMON_4}{END_COLOR_TEXT_1} won{APOSTROPHE}t be coming around\n" .string "anymore... \0" .align 2, 0 @@ -2053,7 +2053,7 @@ gUnknown_80D8BD4: .string "Press {L_BUTTON} and {A_BUTTON}...#W Use move!#W\n" .string "Convenient...#P" .string " Sssnore...\n" - .string "Switch the set move in a dungeon~2c too...\0" + .string "Switch the set move in a dungeon{COMMA} too...\0" .align 2, 0 .global gUnknown_80D8C98 @@ -2071,8 +2071,8 @@ gUnknown_80D8CC8: .string " Fwaaah hah!\n" .string "There...#P" .string " Zzz... Mutter...\n" - .string "{COLOR_1 CYAN}$m5{END_COLOR_TEXT_1} forgot...\n" - .string "{COLOR_1 GREEN}$m1{END_COLOR_TEXT_1} and moves linked to it...\0" + .string "{COLOR_1 CYAN}{ARG_POKEMON_5}{END_COLOR_TEXT_1} forgot...\n" + .string "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and moves linked to it...\0" .align 2, 0 .global gUnknown_80D8D64 @@ -2084,29 +2084,29 @@ gUnknown_80D8D64: .string " Fwaaah hah!\n" .string "There...#P" .string " Zzz... Mumble...\n" - .string "{COLOR_1 CYAN}$m5{END_COLOR_TEXT_1} forgot...\n" - .string "{COLOR_1 GREEN}$m1{END_COLOR_TEXT_1}...\0" + .string "{COLOR_1 CYAN}{ARG_POKEMON_5}{END_COLOR_TEXT_1} forgot...\n" + .string "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}...\0" .align 2, 0 .global gUnknown_80D8DE8 gUnknown_80D8DE8: .string " Zzz... Fwaah? Forget...?\n" - .string "{COLOR_1 GREEN}$m1{END_COLOR_TEXT_1} and any moves\n" + .string "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and any moves\n" .string "linked to it?\0" .align 2, 0 .global gUnknown_80D8E28 gUnknown_80D8E28: .string " Zzz... Forget...?\n" - .string "{COLOR_1 GREEN}$m1{END_COLOR_TEXT_1}?\0" + .string "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}?\0" .align 2, 0 .global gUnknown_80D8E48 gUnknown_80D8E48: .string " Zzznork...? Hunh?\n" - .string "You~27re a special Pokémon...#P" + .string "You{APOSTROPHE}re a special Pokémon...#P" .string " Mumble...\n" - .string "I can~27t help you...\0" + .string "I can{APOSTROPHE}t help you...\0" .align 2, 0 .global gUnknown_80D8E9C @@ -2124,10 +2124,10 @@ gUnknown_80D8EC4: .string " Fwaaah hah!\n" .string "There...#P" .string " Zzz... Mumble...\n" - .string "#CM$m5{END_COLOR_TEXT_1}~27s OK...#P" + .string "#CM{ARG_POKEMON_5}{END_COLOR_TEXT_1}{APOSTROPHE}s OK...#P" .string " Sssnork... Forgotten...\n" - .string "{COLOR_1 GREEN}$m1{END_COLOR_TEXT_1} and moves linked to it...\n" - .string "Remembered {COLOR_1 CYAN}$m0{END_COLOR_TEXT_1}...\0" + .string "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and moves linked to it...\n" + .string "Remembered {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}...\0" .align 2, 0 .global gUnknown_80D8F98 @@ -2138,36 +2138,36 @@ gUnknown_80D8F98: .string "Gggggggg...#W Pwah! Gulpin!#P" .string " Fwaah hah!\n" .string "There...#P" - .string " Zzz... Zzz... #CM$m5{END_COLOR_TEXT_1}\n" - .string "forgot {COLOR_1 GREEN}$m1{END_COLOR_TEXT_1}...\n" - .string "Remembered {COLOR_1 CYAN}$m0{END_COLOR_TEXT_1}...\0" + .string " Zzz... Zzz... #CM{ARG_POKEMON_5}{END_COLOR_TEXT_1}\n" + .string "forgot {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}...\n" + .string "Remembered {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}...\0" .align 2, 0 .global gUnknown_80D9034 gUnknown_80D9034: .string " Zzz? Fnurf? \n" - .string "Forget {COLOR_1 GREEN}$m1{END_COLOR_TEXT_1}...and moves linked\n" - .string "to it? Remember {COLOR_1 CYAN}$m0{END_COLOR_TEXT_1}?\0" + .string "Forget {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}...and moves linked\n" + .string "to it? Remember {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?\0" .align 2, 0 .global gUnknown_80D9080 gUnknown_80D9080: .string " Zzznort... Grumble...\n" - .string "Forget {COLOR_1 GREEN}$m1{END_COLOR_TEXT_1}?\n" - .string "Remember {COLOR_1 CYAN}$m0{END_COLOR_TEXT_1}?\0" + .string "Forget {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}?\n" + .string "Remember {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?\0" .align 2, 0 .global gUnknown_80D90BC gUnknown_80D90BC: .string " Zzzznort... Move...?\n" - .string "Remember {COLOR_1 CYAN}$m0{END_COLOR_TEXT_1}?#P" + .string "Remember {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?#P" .string " Fwaah...\n" .string "Gggggggggggg...#W Gulpin!#P" .string " Fgwaah...\n" .string "There...#P" .string " Zzz... Zzz...\n" - .string "#CM$m5{END_COLOR_TEXT_1} remembered...\n" - .string "Hunh? That move~2c {COLOR_1 CYAN}$m0{END_COLOR_TEXT_1}...\0" + .string "#CM{ARG_POKEMON_5}{END_COLOR_TEXT_1} remembered...\n" + .string "Hunh? That move{COMMA} {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}...\0" .align 2, 0 .global gUnknown_80D9168 @@ -2179,7 +2179,7 @@ gUnknown_80D9168: .global gUnknown_80D9194 gUnknown_80D9194: .string " Gwaah... Gwaah...\n" - .string "Who~27s gonna link moves?\0" + .string "Who{APOSTROPHE}s gonna link moves?\0" .align 2, 0 .global gUnknown_80D91C4 @@ -2197,7 +2197,7 @@ gUnknown_80D91E4: .global gUnknown_80D9204 gUnknown_80D9204: .string " Zzznort... Zzznnort...\n" - .string "Can~27t forget that...\0" + .string "Can{APOSTROPHE}t forget that...\0" .align 2, 0 .global gUnknown_80D9234 @@ -2234,13 +2234,13 @@ gUnknown_80D92EC: .global gUnknown_80D9328 gUnknown_80D9328: .string " What if you had to forget\n" - .string "a move~2c but you wanted it back?#W\n" + .string "a move{COMMA} but you wanted it back?#W\n" .string "Ever face that situation?#P" .string " I can help!#W\n" - .string "Come to me~2c and I can make you instantly\n" + .string "Come to me{COMMA} and I can make you instantly\n" .string "remember forgotten moves!#P" .string " I...#W\n" - .string "Well~2c when Pokémon remember...#W\n" + .string "Well{COMMA} when Pokémon remember...#W\n" .string "I love seeing that instant!#P" .string " That look of enlightenment!#W\n" .string "That amazed look of pleasure!#P" @@ -2253,22 +2253,22 @@ gUnknown_80D9498: .string " When moves are linked...#W\n" .string "Two or more moves can be used one after\n" .string "another in one turn!#P" - .string " For example~2c if the moves\n" + .string " For example{COMMA} if the moves\n" .string "{COLOR_1 CYAN}Scratch{END_COLOR_TEXT_1} and {COLOR_1 CYAN}Growl{END_COLOR_TEXT_1} are\n" .string "linked...#P" .string " Both {COLOR_1 CYAN}Scratch{END_COLOR_TEXT_1} and {COLOR_1 CYAN}Growl{END_COLOR_TEXT_1} are\n" .string "used in one turn!#W\n" - .string "See? Amazing~2c huh?#P" - .string " Using links~2c heheh...#W\n" - .string "Well~2c depending on the moves you link~2c\n" + .string "See? Amazing{COMMA} huh?#P" + .string " Using links{COMMA} heheh...#W\n" + .string "Well{COMMA} depending on the moves you link{COMMA}\n" .string "you can get incredible results!#P" - .string " Oh~2c yes.\n" - .string "When moves are linked~2c they are used in\n" + .string " Oh{COMMA} yes.\n" + .string "When moves are linked{COMMA} they are used in\n" .string "sequence from the top one first.#P" .string " You can also separate linked\n" .string "moves by selecting the Delink command.#P" .string " The sequence of moves can\n" - .string "be changed by pressing {R_BUTTON}~2c\n" + .string "be changed by pressing {R_BUTTON}{COMMA}\n" .string "then pressing up or down on {DPAD}.#P" .string " Try to innovate with links.#W\n" .string "Try creating links of your very own!\0" @@ -2276,18 +2276,18 @@ gUnknown_80D9498: .global gUnknown_80D972C gUnknown_80D972C: - .string " When you~27re in a dungeon\n" - .string "and you~27re about to use a move...#W\n" - .string "Isn~27t it a pain to open a window each time?#P" + .string " When you{APOSTROPHE}re in a dungeon\n" + .string "and you{APOSTROPHE}re about to use a move...#W\n" + .string "Isn{APOSTROPHE}t it a pain to open a window each time?#P" .string " You can avoid that!#W\n" - .string "You can just conveniently ~93Set~94\n" + .string "You can just conveniently {QUOTE_START}Set{QUOTE_END}\n" .string "a move for instant use!#P" .string " A set move can be instantly\n" .string "used with {L_BUTTON} and {A_BUTTON}!#W\n" - .string "See? Isn~27t it easy?#P" + .string "See? Isn{APOSTROPHE}t it easy?#P" .string " Just set the move...#W\n" .string "Hold {L_BUTTON} and then press {A_BUTTON} to use it!#W\n" - .string "It~27s very convenient!#P" + .string "It{APOSTROPHE}s very convenient!#P" .string " You can also switch the set\n" .string "move in a dungeon.\n" .string "Do try it out!\n" @@ -2302,100 +2302,100 @@ gUnknown_80D98D4: .global gUnknown_80D9904 gUnknown_80D9904: - .string " OK~2c here goes!#P" + .string " OK{COMMA} here goes!#P" .string " Gggggggg...#W Poof!#P" .string " There!\n" .string "Success!#P" - .string " {COLOR_1 CYAN}$m5{END_COLOR_TEXT_1} has forgotten\n" - .string "the move {COLOR_1 GREEN}$m1{END_COLOR_TEXT_1} and any moves\n" + .string " {COLOR_1 CYAN}{ARG_POKEMON_5}{END_COLOR_TEXT_1} has forgotten\n" + .string "the move {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and any moves\n" .string "linked to it!\0" .align 2, 0 .global gUnknown_80D9988 gUnknown_80D9988: - .string " OK~2c here goes!#P" + .string " OK{COMMA} here goes!#P" .string " Gggggggg...#W Poof!#P" .string " There!\n" .string "Success!#P" - .string " {COLOR_1 CYAN}$m5{END_COLOR_TEXT_1} has forgotten\n" - .string "the move {COLOR_1 GREEN}$m1{END_COLOR_TEXT_1}!\0" + .string " {COLOR_1 CYAN}{ARG_POKEMON_5}{END_COLOR_TEXT_1} has forgotten\n" + .string "the move {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}!\0" .align 2, 0 .global gUnknown_80D99F0 gUnknown_80D99F0: - .string " So~2c forget the move\n" - .string "{COLOR_1 GREEN}$m1{END_COLOR_TEXT_1} and any moves linked to it?\0" + .string " So{COMMA} forget the move\n" + .string "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and any moves linked to it?\0" .align 2, 0 .global gUnknown_80D9A2C gUnknown_80D9A2C: - .string " So~2c forget the move\n" - .string "{COLOR_1 GREEN}$m1{END_COLOR_TEXT_1}?\0" + .string " So{COMMA} forget the move\n" + .string "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}?\0" .align 2, 0 .global gUnknown_80D9A50 gUnknown_80D9A50: .string " Uh... Huh?#W\n" .string "You appear to be a special Pokémon.#P" - .string " I can~27t help you remember\n" - .string "any moves~2c I don~27t think.\n" - .string "I~27m sorry.\0" + .string " I can{APOSTROPHE}t help you remember\n" + .string "any moves{COMMA} I don{APOSTROPHE}t think.\n" + .string "I{APOSTROPHE}m sorry.\0" .align 2, 0 .global gUnknown_80D9ACC gUnknown_80D9ACC: .string " Uh... Hello?#W\n" - .string "There don~27t appear to be any moves that\n" + .string "There don{APOSTROPHE}t appear to be any moves that\n" .string "can be remembered.\0" .align 2, 0 .global gUnknown_80D9B1C gUnknown_80D9B1C: - .string " OK~2c here goes!#P" + .string " OK{COMMA} here goes!#P" .string " Gggggggg...#W Pwah! Gulpin!#P" .string " There!\n" .string "Success!#P" - .string " #CM$m5{END_COLOR_TEXT_1} is done!#P" - .string " It~27s forgotten the move\n" - .string "{COLOR_1 GREEN}$m1{END_COLOR_TEXT_1} and any moves linked to it~2c\n" - .string "and {COLOR_1 CYAN}$m0{END_COLOR_TEXT_1} has been remembered!\0" + .string " #CM{ARG_POKEMON_5}{END_COLOR_TEXT_1} is done!#P" + .string " It{APOSTROPHE}s forgotten the move\n" + .string "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and any moves linked to it{COMMA}\n" + .string "and {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1} has been remembered!\0" .align 2, 0 .global gUnknown_80D9BD8 gUnknown_80D9BD8: - .string " OK~2c here goes!#P" + .string " OK{COMMA} here goes!#P" .string " Gggggggg...#W Pwah! Gulpin!#P" .string " There!\n" .string "Success!#P" - .string " #CM$m5{END_COLOR_TEXT_1} has forgotten\n" - .string "the move {COLOR_1 GREEN}$m1{END_COLOR_TEXT_1} and remembered\n" - .string "the move {COLOR_1 CYAN}$m0{END_COLOR_TEXT_1}!\0" + .string " #CM{ARG_POKEMON_5}{END_COLOR_TEXT_1} has forgotten\n" + .string "the move {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and remembered\n" + .string "the move {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}!\0" .align 2, 0 .global gUnknown_80D9C68 gUnknown_80D9C68: - .string " So~2c forget {COLOR_1 GREEN}$m1{END_COLOR_TEXT_1}\n" - .string "and any moves linked to it~2c and remember\n" - .string "the move {COLOR_1 CYAN}$m0{END_COLOR_TEXT_1}?\0" + .string " So{COMMA} forget {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}\n" + .string "and any moves linked to it{COMMA} and remember\n" + .string "the move {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?\0" .align 2, 0 .global gUnknown_80D9CC0 gUnknown_80D9CC0: - .string " So~2c forget the move\n" - .string "{COLOR_1 GREEN}$m1{END_COLOR_TEXT_1} and remember the move\n" - .string "{COLOR_1 CYAN}$m0{END_COLOR_TEXT_1}?\0" + .string " So{COMMA} forget the move\n" + .string "{COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and remember the move\n" + .string "{COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?\0" .align 2, 0 .global gUnknown_80D9D00 gUnknown_80D9D00: - .string " So~2c the move {COLOR_1 CYAN}$m0{END_COLOR_TEXT_1}\n" + .string " So{COMMA} the move {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}\n" .string "is the one to be remembered?#W\n" - .string "OK~2c here goes!#P" + .string "OK{COMMA} here goes!#P" .string " Gggggggggggg...#W Gulpin!#P" .string " There!\n" .string "Success!#P" - .string " #CM$m5{END_COLOR_TEXT_1} has\n" - .string "remembered the move {COLOR_1 CYAN}$m0{END_COLOR_TEXT_1}!\0" + .string " #CM{ARG_POKEMON_5}{END_COLOR_TEXT_1} has\n" + .string "remembered the move {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}!\0" .align 2, 0 .global gUnknown_80D9DA4 @@ -2407,13 +2407,13 @@ gUnknown_80D9DA4: .global gUnknown_80D9DCC gUnknown_80D9DCC: .string " Good!\n" - .string "Now~2c who wants to link moves?\0" + .string "Now{COMMA} who wants to link moves?\0" .align 2, 0 .global gUnknown_80D9DF4 gUnknown_80D9DF4: .string " Whenever you get the urge\n" - .string "to link moves~2c please come see me!\0" + .string "to link moves{COMMA} please come see me!\0" .align 2, 0 .global gUnknown_80D9E34 @@ -2423,14 +2423,14 @@ gUnknown_80D9E34: .global gUnknown_80D9E48 gUnknown_80D9E48: - .string " If you forget that move~2c\n" - .string "you won~27t have any moves at all.\0" + .string " If you forget that move{COMMA}\n" + .string "you won{APOSTROPHE}t have any moves at all.\0" .align 2, 0 .global gUnknown_80D9E88 gUnknown_80D9E88: - .string " That move isn~27t linked~2c\n" - .string "so it can~27t be delinked.\0" + .string " That move isn{APOSTROPHE}t linked{COMMA}\n" + .string "so it can{APOSTROPHE}t be delinked.\0" .align 2, 0 .global gUnknown_80D9EC0 @@ -2442,7 +2442,7 @@ gUnknown_80D9EC0: .global gUnknown_80D9EF4 gUnknown_80D9EF4: .string " Uh... Hello?\n" - .string "You don~27t have enough money?\0" + .string "You don{APOSTROPHE}t have enough money?\0" .align 2, 0 .global gUnknown_80D9F24 @@ -2492,7 +2492,7 @@ gUnknown_80DA018: .string " Zzznarr... Urr!\n" .string "Make stronger rescue team...#P" .string " Urr... Zzznarr!\n" - .string "Don~27t let up!\0" + .string "Don{APOSTROPHE}t let up!\0" .align 2, 0 .global gUnknown_80DA0DC @@ -2532,7 +2532,7 @@ gUnknown_80DA204: .global gUnknown_80DA248 gUnknown_80DA248: .string " Aiyah... Zzznarr...\n" - .string "Didn~27t finish...#P" + .string "Didn{APOSTROPHE}t finish...#P" .string " Zzz... Urr?\n" .string "No giving up...\0" .align 2, 0 @@ -2540,7 +2540,7 @@ gUnknown_80DA248: .global gUnknown_80DA290 gUnknown_80DA290: .string " Zzz... Narr...\n" - .string "$m0? ~27K~2c go...\0" + .string "{ARG_POKEMON_0}? {APOSTROPHE}K{COMMA} go...\0" .align 2, 0 .global gUnknown_80DA2B4 @@ -2575,22 +2575,22 @@ gUnknown_80DA338: .string "level up...#W\n" .string "And toughen up your rescue team.#P" .string " Also...#W\n" - .string "In the {COLOR_1 YELLOW_3}Fire Maze{END_COLOR_TEXT_1} you will find only\n" + .string "In the {COLOR_1 YELLOW_4}Fire Maze{END_COLOR_TEXT_1} you will find only\n" .string "Fire-type Pokémon.#P" - .string " In the {COLOR_1 YELLOW_3}Water Maze{END_COLOR_TEXT_1} there\n" + .string " In the {COLOR_1 YELLOW_4}Water Maze{END_COLOR_TEXT_1} there\n" .string "will only be Water-type Pokémon.#P" - .string " In such ways~2c only one type\n" + .string " In such ways{COMMA} only one type\n" .string "of Pokémon will be in a given room.\n" .string "Study how types match up in battle.#P" - .string " The Pokémon in this dojo~2c\n" - .string "by the way~2c are all volunteers.#P" + .string " The Pokémon in this dojo{COMMA}\n" + .string "by the way{COMMA} are all volunteers.#P" .string " They are participating\n" .string "because they want to see rescue teams\n" .string "succeed.#P" .string " The only thanks they expect\n" .string "is to see you become stronger.\n" - .string "Don~27t let them down!#P" - .string " There~27s more.#W\n" + .string "Don{APOSTROPHE}t let them down!#P" + .string " There{APOSTROPHE}s more.#W\n" .string "For a rescue team that successfully\n" .string "completes all training courses...#P" .string " I have a special reward!#P" @@ -2600,7 +2600,7 @@ gUnknown_80DA338: .global gUnknown_80DA62C gUnknown_80DA62C: - .string " Don~27t let up on your training!\n" + .string " Don{APOSTROPHE}t let up on your training!\n" .string "Keep bettering yourself!#P" .string " May you never lose your\n" .string "drive!\0" @@ -2610,29 +2610,29 @@ gUnknown_80DA62C: gUnknown_80DA688: .string " Ah...\n" .string "You have succeeded in your training!#P" - .string " You~27ve shown your worth!#W\n" - .string "Without a doubt~2c you have grown more\n" + .string " You{APOSTROPHE}ve shown your worth!#W\n" + .string "Without a doubt{COMMA} you have grown more\n" .string "powerful from your training!#W Wait...#W ...#P" .string " Wuh?#W\n" - .string "What~2c what~2c what?!#P" + .string "What{COMMA} what{COMMA} what?!#P" .string " Did you maybe...#W\n" .string "Conquer all the training courses?#P" - .string " That~27s...#W Amazing! You!#W\n" + .string " That{APOSTROPHE}s...#W Amazing! You!#W\n" .string "Congratulations!#P" .string " I promised!#W\n" .string "I promised you a reward for completing\n" .string "the training courses!#P" .string " So... Here it is!#W\n" .string "My #CIBonsly Doll{END_COLOR_TEXT_1}!#P" - .string " Isn~27t it smashing? Hey?!\0" + .string " Isn{APOSTROPHE}t it smashing? Hey?!\0" .align 2, 0 .global gUnknown_80DA844 gUnknown_80DA844: .string " Ah...\n" .string "You have succeeded in your training!#P" - .string " You~27ve shown your worth!#W\n" - .string "Without a doubt~2c you have grown more\n" + .string " You{APOSTROPHE}ve shown your worth!#W\n" + .string "Without a doubt{COMMA} you have grown more\n" .string "powerful from your training!#P" .string " May this success drive\n" .string "you to train even harder!\0" @@ -2650,7 +2650,7 @@ gUnknown_80DA908: .global gUnknown_80DA998 gUnknown_80DA998: - .string " The $m0?#W\n" + .string " The {ARG_POKEMON_0}?#W\n" .string "Your decision stands!#W\n" .string "Let the training begin!\0" .align 2, 0 @@ -2662,7 +2662,7 @@ gUnknown_80DA9D4: .global gUnknown_80DA9F4 gUnknown_80DA9F4: - .string " Fine~2c farewell.\n" + .string " Fine{COMMA} farewell.\n" .string "Return if you seek more training.\0" .align 2, 0 @@ -2674,7 +2674,7 @@ gUnknown_80DAA2C: .global gUnknown_80DAA44 gUnknown_80DAA44: .string " This is the Makuhita Dojo!#W\n" - .string "Through rigorous training~2c one begets\n" + .string "Through rigorous training{COMMA} one begets\n" .string "true power.\0" .align 2, 0 @@ -2693,7 +2693,7 @@ gGameHints: @ 80DAA98 (Help Menu?) .global gUnknown_80DAAC0 gUnknown_80DAAC0: - .string "Before leaving on an adventure~2c go visit\n" + .string "Before leaving on an adventure{COMMA} go visit\n" .string "friends in their Friend Areas and pick\n" .string "your mission members.\n" .string "The team can include members up to\n" @@ -2710,14 +2710,14 @@ gUnknown_80DABD8: .global gUnknown_80DABE8 gUnknown_80DABE8: - .string "If new recruits join you~2c try to return to\n" + .string "If new recruits join you{COMMA} try to return to\n" .string "your base without letting them faint.\n" - .string "If you get them out safely~2c they~27ll wait\n" + .string "If you get them out safely{COMMA} they{APOSTROPHE}ll wait\n" .string "for you in their Friend Areas.\n" - .string "Once you get them out~2c they~27ll always\n" + .string "Once you get them out{COMMA} they{APOSTROPHE}ll always\n" .string "return home if they faint in a dungeon.\n" - .string "If you faint in a dungeon~2c you lose all your\n" - .string "money and some items~2c too.\0" + .string "If you faint in a dungeon{COMMA} you lose all your\n" + .string "money and some items{COMMA} too.\0" .align 2, 0 .global gUnknown_80DAD28 @@ -2741,9 +2741,9 @@ gUnknown_80DADCC: .global gUnknown_80DADD4 gUnknown_80DADD4: .string "Selecting multiple items in storage:\n" - .string " Select an item~2c then press {L_BUTTON} or {R_BUTTON}.\n" + .string " Select an item{COMMA} then press {L_BUTTON} or {R_BUTTON}.\n" .string "Moving to the Friend Area Map:\n" - .string " Move out from the town~27s west side\n" + .string " Move out from the town{APOSTROPHE}s west side\n" .string " while pressing {L_BUTTON} or {R_BUTTON}.\n" .string "Moving diagonally on the Friend Area Map:\n" .string " {DPAD} while keeping {R_BUTTON} pressed.\0" @@ -2761,7 +2761,7 @@ gUnknown_80DAEE0: .string "Window: {B_BUTTON} lightly\n" .string "Message scroll: {A_BUTTON} or {B_BUTTON}\n" .string "Cancel: {B_BUTTON}\n" - .string "Description: Choose item or move~2c {START_BUTTON}\0" + .string "Description: Choose item or move{COMMA} {START_BUTTON}\0" .align 2, 0 .global gUnknown_80DAF54 @@ -2897,17 +2897,17 @@ gUnknown_80DB5C0: @ 80DB5C0 .global gUnknown_80DB5D4 gUnknown_80DB5D4: @ 80DB5D4 - .string "What is this Pokémon~27s nickname?\0" + .string "What is this Pokémon{APOSTROPHE}s nickname?\0" .align 2,0 .global gUnknown_80DB5F8 gUnknown_80DB5F8: @ 80DB5F8 - .string "What is your partner~27s nickname?\0" + .string "What is your partner{APOSTROPHE}s nickname?\0" .align 2,0 .global gUnknown_80DB61C gUnknown_80DB61C: @ 80DB61C - .string "What is your team~27s name?\0" + .string "What is your team{APOSTROPHE}s name?\0" .align 2,0 .global gUnknown_80DB638 @@ -2940,7 +2940,7 @@ gUnknown_80DB664: @ 80DB664 .global gUnknown_80DB688 gUnknown_80DB688: @ 80DB688 - .string "Is the name {COLOR_1 CYAN}$m0{END_COLOR_TEXT_1} OK?\0" + .string "Is the name {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1} OK?\0" .align 2,0 .global gUnknown_80DB6A4 @@ -3228,7 +3228,7 @@ gTeamToolboxB: @ 80DB984 gUnknown_80DB994: @ 80DB994 .string "#C" .byte 0x02 - .string "$i0{END_COLOR_TEXT_1}\0" + .string "{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}\0" .align 2,0 .global gUnknown_80DB9A0 @@ -3251,13 +3251,13 @@ gUnknown_80DB9B0: @ 80DB9B0 .global gUnknown_80DB9BC gUnknown_80DB9BC: @ 80DB9BC .string "#+Who will learn the move\n" - .string "#+{COLOR_1 CYAN}$m7{END_COLOR_TEXT_1}?\0" + .string "#+{COLOR_1 CYAN}{ARG_POKEMON_7}{END_COLOR_TEXT_1}?\0" .align 2,0 .global gUnknown_80DB9E4 gUnknown_80DB9E4: @ 80DB9E4 - .string "#+#CM$m8{END_COLOR_TEXT_1} learned\n" - .string "#+the move {COLOR_1 CYAN}$m7{END_COLOR_TEXT_1}!\0" + .string "#+#CM{ARG_POKEMON_8}{END_COLOR_TEXT_1} learned\n" + .string "#+the move {COLOR_1 CYAN}{ARG_POKEMON_7}{END_COLOR_TEXT_1}!\0" .align 2,0 .global gUnknown_80DBA0C @@ -3270,7 +3270,7 @@ gUnknown_80DBA0C: @ 80DBA0C .global gUnknown_80DBA4C gUnknown_80DBA4C: @ 80DBA4C - .string "$m0\0" + .string "{ARG_POKEMON_0}\0" .string "pksdir0\0" .align 2,0 @@ -3303,33 +3303,33 @@ gUnknown_80DBA88: @ 80DBA88 .global gUnknown_80DBAA0 gUnknown_80DBAA0: @ 80DBAA0 - .string "#+#CN$m0{END_COLOR_TEXT_1} received\n" - .string "#+the promised {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}. \0" + .string "#+{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1} received\n" + .string "#+the promised {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}. \0" .align 2,0 .global gUnknown_80DBAD0 gUnknown_80DBAD0: @ 80DBAD0 - .string "#+#CN$m0{END_COLOR_TEXT_1}~27s team received\n" - .string "#+the promised {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}.\0" + .string "#+{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1}{APOSTROPHE}s team received\n" + .string "#+the promised {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}.\0" .align 2,0 .global gUnknown_80DBB08 gUnknown_80DBB08: @ 80DBB08 .string "#+The team also received\n" - .string "#+the item {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}.\0" + .string "#+the item {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}.\0" .align 2,0 .global gUnknown_80DBB38 gUnknown_80DBB38: @ 80DBB38 - .string "#+Received the {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}!#P#+A very rare statue. It has been placed\n" + .string "#+Received the {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}!#P#+A very rare statue. It has been placed\n" .string "#+outside your rescue team base.\0" .align 2,0 .global gUnknown_80DBB9C gUnknown_80DBB9C: @ 80DBB9C - .string "#+The {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}...\n" - .string "#+You~27ve already acquired it.#P#+Sorry to see that...#P#+In its place~2c #CN$m0{END_COLOR_TEXT_1}~2c\n" - .string "#+you can have {COLOR_1 LIGHT_BLUE_2}1~2c000{END_COLOR_TEXT_1} {POKE}." + .string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}...\n" + .string "#+You{APOSTROPHE}ve already acquired it.#P#+Sorry to see that...#P#+In its place{COMMA} {COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1}{COMMA}\n" + .string "#+you can have {COLOR_1 LIGHT_BLUE_2}1{COMMA}000{END_COLOR_TEXT_1} {POKE}." .align 2,0 .global gUnknown_80DBC28 @@ -3347,25 +3347,25 @@ gUnknown_80DBC60: @ 80DBC60 .global gUnknown_80DBC98 gUnknown_80DBC98: @ 80DBC98 .string "#+Is it OK to throw away\n" - .string "#+this {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}?\0" + .string "#+this {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}?\0" .align 2,0 .global gUnknown_80DBCC4 gUnknown_80DBCC4: @ 80DBCC4 - .string "#+The {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}\n" + .string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}\n" .string "#+was thrown away.\0" .align 2,0 .global gUnknown_80DBCE8 gUnknown_80DBCE8: @ 80DBCE8 - .string "#+The {COLOR_1 GREEN}$i1{END_COLOR_TEXT_1} was put in\n" - .string "#+storage to get the {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}.\0" + .string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was put in\n" + .string "#+storage to get the {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}.\0" .align 2,0 .global gUnknown_80DBD24 gUnknown_80DBD24: @ 80DBD24 - .string "#+The {COLOR_1 GREEN}$i1{END_COLOR_TEXT_1} was discarded\n" - .string "#+to get the {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}.\0" + .string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was discarded\n" + .string "#+to get the {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}.\0" .align 2,0 .global gKangaskhanTrashToolboxItem @@ -3449,19 +3449,19 @@ gUnknown_80DBE18: @ 80DBE18 .global gUnknown_80DBE1C gUnknown_80DBE1C: @ 80DBE1C - .string "$i0$i1\0" + .string "{ARG_MOVE_ITEM_0}{ARG_MOVE_ITEM_1}\0" .align 2,0 .string "pksdir0\0" .align 2,0 .global gUnknown_80DBE2C gUnknown_80DBE2C: @ 80DBE2C - .string "$i0\0" + .string "{ARG_MOVE_ITEM_0}\0" .align 2,0 .global gUnknown_80DBE30 gUnknown_80DBE30: @ 80DBE30 - .string "$m0\0" + .string "{ARG_POKEMON_0}\0" .string "pksdir0\0" .align 2,0 @@ -3768,15 +3768,15 @@ gUnknown_80DC164: @ 80DC164 .global gUnknown_80DC1A0 gUnknown_80DC1A0: @ 80DC1A0 - .string "#+Forget the move {COLOR_1 GREEN}$m1{END_COLOR_TEXT_1} and\n" - .string "#+any moves linked to it~2c and learn the move\n" - .string "#+{COLOR_1 CYAN}$m0{END_COLOR_TEXT_1}?\0" + .string "#+Forget the move {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1} and\n" + .string "#+any moves linked to it{COMMA} and learn the move\n" + .string "#+{COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?\0" .align 2,0 .global gUnknown_80DC1FC gUnknown_80DC1FC: @ 80DC1FC - .string "#+Forget the move {COLOR_1 GREEN}$m1{END_COLOR_TEXT_1}\n" - .string "#+and learn {COLOR_1 CYAN}$m0{END_COLOR_TEXT_1}?\0" + .string "#+Forget the move {COLOR_1 GREEN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}\n" + .string "#+and learn {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}?\0" .align 2,0 .global gUnknown_80DC230 @@ -3825,12 +3825,12 @@ gUnknown_80DC274: @ 80DC274 .global gUnknown_80DC28C gUnknown_80DC28C: @ 80DC28C - .string "Moves: {COLOR_1 YELLOW}$m0{END_COLOR_TEXT_1} \0" + .string "Moves: {COLOR_1 YELLOW}{ARG_POKEMON_0}{END_COLOR_TEXT_1} \0" .align 2,0 .global gUnknown_80DC2A0 gUnknown_80DC2A0: @ 80DC2A0 - .string "$i0\0" + .string "{ARG_MOVE_ITEM_0}\0" .align 2,0 .string "pksdir0\0" .align 2,0 @@ -3877,7 +3877,7 @@ gUnknown_80DC2F8: @ 80DC2F8 .global gUnknown_80DC310 gUnknown_80DC310: @ 80DC310 - .string "$m0\0" + .string "{ARG_POKEMON_0}\0" .align 2,0 .string "pksdir0\0" .align 2,0 @@ -4171,68 +4171,68 @@ gUnknown_80DC5EC: @ 80DC5EC .global gUnknown_80DC5F4 gUnknown_80DC5F4: @ 80DC5F4 - .string "It doesn~27t appear to be hungry.\0" + .string "It doesn{APOSTROPHE}t appear to be hungry.\0" .align 2,0 .global gUnknown_80DC618 gUnknown_80DC618: @ 80DC618 - .string "$m1 took the Gummi and ate it.\n" + .string "{ARG_POKEMON_1} took the Gummi and ate it.\n" .string "This Gummi looks like a big favorite!\n" - .string "$m1~27s IQ went up!\0" + .string "{ARG_POKEMON_1}{APOSTROPHE}s IQ went up!\0" .align 2,0 .global gUnknown_80DC674 gUnknown_80DC674: @ 80DC674 - .string "$m1 took the Gummi and ate it.\n" + .string "{ARG_POKEMON_1} took the Gummi and ate it.\n" .string "This Gummi looks like a favorite!\n" - .string "$m1~27s IQ went up!\0" + .string "{ARG_POKEMON_1}{APOSTROPHE}s IQ went up!\0" .align 2,0 .global gUnknown_80DC6CC gUnknown_80DC6CC: @ 80DC6CC - .string "$m1 took the Gummi and ate it.\n" - .string "It doesn~27t seem to dislike this Gummi.\n" - .string "$m1~27s IQ went up!\0" + .string "{ARG_POKEMON_1} took the Gummi and ate it.\n" + .string "It doesn{APOSTROPHE}t seem to dislike this Gummi.\n" + .string "{ARG_POKEMON_1}{APOSTROPHE}s IQ went up!\0" .align 2,0 .global gUnknown_80DC728 gUnknown_80DC728: @ 80DC728 - .string "$m1 took the Gummi and ate it.\n" + .string "{ARG_POKEMON_1} took the Gummi and ate it.\n" .string "It appears to be just a little satisfied.\n" - .string "$m1~27s IQ went up!\0" + .string "{ARG_POKEMON_1}{APOSTROPHE}s IQ went up!\0" .align 2,0 .global gUnknown_80DC788 gUnknown_80DC788: @ 80DC788 - .string "$m1~27s IQ helped it learn how to\n" - .string "use $i1!\0" + .string "{ARG_POKEMON_1}{APOSTROPHE}s IQ helped it learn how to\n" + .string "use {ARG_MOVE_ITEM_1}!\0" .align 2,0 .global gUnknown_80DC7B4 gUnknown_80DC7B4: @ 80DC7B4 - .string "Yes! $m1 grew explosively!\n" - .string "Attack~2c Defense~2c and so on rose by 1!\0" + .string "Yes! {ARG_POKEMON_1} grew explosively!\n" + .string "Attack{COMMA} Defense{COMMA} and so on rose by 1!\0" .align 2,0 .global gUnknown_80DC7FC gUnknown_80DC7FC: @ 80DC7FC @ replacing .incbin "baserom.gba", 0x000dc7fc, 0x20 .string "Yes!\n" - .string "$m1~27s Attack rose by 1!\0" + .string "{ARG_POKEMON_1}{APOSTROPHE}s Attack rose by 1!\0" .align 2,0 .global gUnknown_80DC81C gUnknown_80DC81C: @ 80DC81C @ replacing .incbin "baserom.gba", 0x000dc81c, 0x28 .string "Yes!\n" - .string "$m1~27s Special Attack rose by 1!\0" + .string "{ARG_POKEMON_1}{APOSTROPHE}s Special Attack rose by 1!\0" .align 2,0 .global gUnknown_80DC844 gUnknown_80DC844: @ 80DC844 @ replacing .incbin "baserom.gba", 0x000dc844, 0x20 .string "Yes!\n" - .string "$m1~27s Defense rose by 1!\0" + .string "{ARG_POKEMON_1}{APOSTROPHE}s Defense rose by 1!\0" .align 2,0 @@ -4240,19 +4240,19 @@ gUnknown_80DC844: @ 80DC844 gUnknown_80DC864: @ 80DC864 @ replacing .incbin "baserom.gba", 0x000dc864, 0x28 .string "Yes!\n" - .string "$m1~27s Special Defense rose by 1!\0" + .string "{ARG_POKEMON_1}{APOSTROPHE}s Special Defense rose by 1!\0" .align 2,0 .global gUnknown_80DC88C gUnknown_80DC88C: @ 80DC88C @ replacing .incbin "baserom.gba", 0x000dc88c, 0x20 - .string "You don~27t have any Gummis.\0" + .string "You don{APOSTROPHE}t have any Gummis.\0" .align 2,0 .global gUnknown_80DC8AC gUnknown_80DC8AC: @ 80DC8AC @ replacing .incbin "baserom.gba", 0x000dc8ac, 0x1c - .string "You don~27t have an item.\0" + .string "You don{APOSTROPHE}t have an item.\0" .align 2,0 .global gUnknown_80DC8C8 @@ -4485,7 +4485,7 @@ gUnknown_80DD764: @ 80DD764 .global gUnknown_80DD7FC gUnknown_80DD7FC: @ 80DD7FC .string "If you say farewell to this\n" - .string "Pokémon~2c it will be gone forever.#P" + .string "Pokémon{COMMA} it will be gone forever.#P" .string "You will never be able to get another one\n" .string "like it to join your team.\n" .string "Will you release it anyway?\0" @@ -4493,13 +4493,13 @@ gUnknown_80DD7FC: @ 80DD7FC .global gUnknown_80DD8A0 gUnknown_80DD8A0: @ 80DD8A0 - .string "#+The {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} was\n" + .string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n" .string "#+returned to the Toolbox.\0" .align 2,0 .global gUnknown_80DD8D0 gUnknown_80DD8D0: @ 80DD8D0 - .string "#+The {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} was\n#+sent to storage.\0" + .string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n#+sent to storage.\0" .align 2,0 .global gFriendActionStandby @@ -4548,7 +4548,7 @@ gFriendActionCheckIQ: @ 80DD94C .global gUnknown_80DD958 gUnknown_80DD958: @ 80DD958 - .string "Item: {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} \0" + .string "Item: {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} \0" .string "pksdir0\0" .global gUnknown_80DD970 @@ -4750,7 +4750,7 @@ gUnknown_80DDB60: @ 80DDB60 .global DontSendPokemon_80DDB80 DontSendPokemon_80DDB80: - .string "Don~27t Send Pokémon\0" + .string "Don{APOSTROPHE}t Send Pokémon\0" .align 2,0 .global SendPokemon_80DDB98 diff --git a/data/data_80DED44.s b/data/data_80DED44.s index d24c420..bf335b5 100644 --- a/data/data_80DED44.s +++ b/data/data_80DED44.s @@ -462,27 +462,27 @@ gUnknown_80E041C: @ 80E041C .global gUnknown_80E0434 gUnknown_80E0434: @ 80E0434 - .string " Here~27s your reward!\n" + .string " Here{APOSTROPHE}s your reward!\n" .string "{COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}!\0" .align 2,0 .global gUnknown_80E045C gUnknown_80E045C: @ 80E045C @ replacing .incbin "baserom.gba", 0x000e045c, 0x28 - .string "#+#CN$m0{END_COLOR_TEXT_1} received\n" + .string "#+{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1} received\n" .string "#+{COLOR_1 CYAN}$d0{END_COLOR_TEXT_1}" .byte 0x20, 0x83 .byte 0xbf, 0x83, 0xc4, 0x2e, 0x00, 0x00, 0x00, 0x00 .global gUnknown_80E0484 gUnknown_80E0484: @ 80E0484 - .string "#+#CN$m0{END_COLOR_TEXT_1}~27s team received\n" + .string "#+{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1}{APOSTROPHE}s team received\n" .string "#+{COLOR_1 CYAN}$d0{END_COLOR_TEXT_1} {POKE}" .byte 0x2E, 0x00, 0x00, 0x00 .global gUnknown_80E04B4 gUnknown_80E04B4: @ 80E04B4 - .string " As your reward~2c you can\n" + .string " As your reward{COMMA} you can\n" .string "now go to the Friend Area\n" .string "{COLOR_1 GREEN}$h{END_COLOR_TEXT_1}!\0" .align 2,0 @@ -493,22 +493,22 @@ gUnknown_80E04F4: @ 80E04F4 .global gUnknown_80E05C0 gUnknown_80E05C0: @ 80E05C0 - .string "#+#CN$m0{END_COLOR_TEXT_1} gained access\n" + .string "#+{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1} gained access\n" .string "#+to the Friend Area\n" .string "#+{COLOR_1 GREEN}$h{END_COLOR_TEXT_1}.\0" .align 2,0 .global gUnknown_80E05FC gUnknown_80E05FC: @ 80E05FC - .string "#+#CN$m0{END_COLOR_TEXT_1}~27s team gained access\n" + .string "#+{COLOR_1 YELLOW_5}{ARG_POKEMON_0}{END_COLOR_TEXT_1}{APOSTROPHE}s team gained access\n" .string "#+to the Friend Area\n" .string "#+{COLOR_1 GREEN}$h{END_COLOR_TEXT_1}.\0" .align 2,0 .global gUnknown_80E0640 gUnknown_80E0640: @ 80E0640 - .string " Here~27s your reward!\n" - .string "The promised {COLOR_1 GREEN}$i1{END_COLOR_TEXT_1}!\0" + .string " Here{APOSTROPHE}s your reward!\n" + .string "The promised {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1}!\0" .align 2,0 .global gUnknown_80E0670 @@ -521,8 +521,8 @@ gUnknown_80E0670: @ 80E0670 gUnknown_80E06A8: @ 80E06A8 .string "#+Congratulations!#P" .string "#+{COLOR_1 LIGHT_BLUE_2}$t{END_COLOR_TEXT_1} went up in rank\n" - .string "#+from the $m2\n" - .string "#+to the $m3!\0" + .string "#+from the {ARG_POKEMON_2}\n" + .string "#+to the {ARG_POKEMON_3}!\0" .align 2,0 .string "pksdir0\0" .align 2,0 @@ -579,7 +579,7 @@ gUnknown_80E0760: @ 80E0760 .global gUnknown_80E0778 gUnknown_80E0778: @ 80E0778 - .string "#+#CN$n0{END_COLOR_TEXT_1} received the #CIBonsly Doll{END_COLOR_TEXT_1}!\n" + .string "#+{COLOR_1 YELLOW_5}$n0{END_COLOR_TEXT_1} received the #CIBonsly Doll{END_COLOR_TEXT_1}!\n" .string "#+It has been placed outside your\n" .string "#+rescue team base.\0" .align 2,0 @@ -657,7 +657,7 @@ gUnknown_80E086C: @ 80E086C .global OkdRescue OkdRescue: - .string "OK~27d Rescues\0" + .string "OK{APOSTROPHE}d Rescues\0" .align 2,0 .global CompletedJobs @@ -798,13 +798,13 @@ gUnknown_80E09C0: @ 80E09C0 .global gUnknown_80E09D8 gUnknown_80E09D8: @ 80E09D8 - .string " ...Uh~2c no?\n" - .string "You don~27t have any {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.\0" + .string " ...Uh{COMMA} no?\n" + .string "You don{APOSTROPHE}t have any {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.\0" .align 2,0 .global gUnknown_80E0A0C gUnknown_80E0A0C: @ 80E0A0C - .string " ...Uh~2c no?\n" - .string "You don~27t have any {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.\0" + .string " ...Uh{COMMA} no?\n" + .string "You don{APOSTROPHE}t have any {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.\0" .align 2,0 .asciz "pksdir0" diff --git a/data/data_80E2068.s b/data/data_80E2068.s index d125995..68cf88b 100644 --- a/data/data_80E2068.s +++ b/data/data_80E2068.s @@ -303,7 +303,7 @@ gUnknown_80E23A8: @ 80E23A8 .global DontSendPokemon_80E23C8 DontSendPokemon_80E23C8: - .string "Don~27t Send Pokémon\0" + .string "Don{APOSTROPHE}t Send Pokémon\0" .align 2,0 .global SendPokemon_80E23E0 @@ -368,7 +368,7 @@ gUnknown_80E2470: @ 80E2470 .byte 0x08, 0x00, 0x00, 0x00 DontSendItem_80E2490: - .string "Don~27t Send Item\0" + .string "Don{APOSTROPHE}t Send Item\0" .align 2,0 SendItem_80E24A4: .string "Send Item\0" @@ -480,7 +480,7 @@ gUnknown_80E2610: @ 80E2610 .global gUnknown_80E2640 gUnknown_80E2640: @ 80E2640 .string "How would you like to receive your\n" - .string "friend~27s {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}?\0" + .string "friend{APOSTROPHE}s {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}?\0" .align 2,0 .global gUnknown_80E2680 @@ -492,7 +492,7 @@ gUnknown_80E2680: @ 80E2680 .global gUnknown_80E26B0 gUnknown_80E26B0: @ 80E26B0 .string "How would you like to receive your\n" - .string "friend~27s {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}?\0" + .string "friend{APOSTROPHE}s {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}?\0" .align 2,0 .global gUnknown_80E26F0 @@ -504,7 +504,7 @@ gUnknown_80E26F0: @ 80E26F0 .global gUnknown_80E2728 gUnknown_80E2728: @ 80E2728 .string "How would you like to receive your\n" - .string "friend~27s {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}?\0" + .string "friend{APOSTROPHE}s {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}?\0" .align 2,0 .global gUnknown_80E276C @@ -515,7 +515,7 @@ gUnknown_80E276C: @ 80E276C .global gUnknown_80E27A4 gUnknown_80E27A4: @ 80E27A4 - .string "If you accept an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}~2c the\n" + .string "If you accept an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}{COMMA} the\n" .string "{COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} you received before\n" .string "will be overwritten. Is that OK?\0" .align 2,0 @@ -549,7 +549,7 @@ gUnknown_80E28D8: @ 80E28D8 .global gUnknown_80E2904 gUnknown_80E2904: @ 80E2904 - .string "Your friend~27s Mailbox is full.\n" + .string "Your friend{APOSTROPHE}s Mailbox is full.\n" .string "This piece of mail cannot be sent.\n" .string "The recipient must delete old mail.\0" .align 2,0 @@ -602,7 +602,7 @@ gUnknown_80E2AA8: @ 80E2AA8 .global gUnknown_80E2AE4 gUnknown_80E2AE4: @ 80E2AE4 .string "Please connect a {COLOR_1 LIGHT_BLUE_2}Link Cable{END_COLOR_TEXT_1}.\n" -.string "When your friend~27s side is ready~2c you may\n" +.string "When your friend{APOSTROPHE}s side is ready{COMMA} you may\n" .string "communicate and exchange data.\0" .align 2,0 @@ -614,7 +614,7 @@ gUnknown_80E2B54: @ 80E2B54 .global gUnknown_80E2B90 gUnknown_80E2B90: @ 80E2B90 -.string "Using a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}~2c\n" +.string "Using a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}{COMMA}\n" .string "you can send a {COLOR_1 LIGHT_BLUE_2}helper Pokémon{END_COLOR_TEXT_1} to\n" .string "a friend.\0" .align 2,0 @@ -663,7 +663,7 @@ gUnknown_80E2D60: @ 80E2D60 .global gUnknown_80E2D7C gUnknown_80E2D7C: @ 80E2D7C .string "Connect the {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}.\n" -.string "When your friend is ready~2c begin\n" +.string "When your friend is ready{COMMA} begin\n" .string "communication.\0" .align 2,0 @@ -671,7 +671,7 @@ gUnknown_80E2D7C: @ 80E2D7C gUnknown_80E2DD0: @ 80E2DD0 .string "#+Communicating...\n" .string "#+Please wait with the power on.\n" -.string "#+To cancel~2c press {B_BUTTON}.\0" +.string "#+To cancel{COMMA} press {B_BUTTON}.\0" .align 2,0 .global gUnknown_80E2E20 @@ -797,14 +797,14 @@ gUnknown_80E3288: @ 80E3288 .global gUnknown_80E32C4 gUnknown_80E32C4: @ 80E32C4 - .string "OK. You~27re good to go.\n" - .string "#CN%s{END_COLOR_TEXT_1}~2c I hope your sense of\n" + .string "OK. You{APOSTROPHE}re good to go.\n" + .string "{COLOR_1 YELLOW_5}%s{END_COLOR_TEXT_1}{COMMA} I hope your sense of\n" .string "gratitude reaches your friend.\0" .align 2,0 .global gUnknown_80E331C gUnknown_80E331C: @ 80E331C - .string "The item chosen here can~27t be exchanged\n" + .string "The item chosen here can{APOSTROPHE}t be exchanged\n" .string "with anything else.\n" .string "Are you sure this item is OK?\0" .align 2,0 @@ -830,7 +830,7 @@ gUnknown_80E33D8: @ 80E33D8 .global gUnknown_80E3430 gUnknown_80E3430: @ 80E3430 .string "This mail already has an attached\n" -.string "{COLOR_1 LIGHT_BLUE_2}reward item{END_COLOR_TEXT_1}.#POnce an item has been chosen~2c it may not\n" +.string "{COLOR_1 LIGHT_BLUE_2}reward item{END_COLOR_TEXT_1}.#POnce an item has been chosen{COMMA} it may not\n" .string "be exchanged with another item.\0" .align 2,0 @@ -853,7 +853,7 @@ gUnknown_80E352C: @ 80E352C .global gUnknown_80E355C gUnknown_80E355C: @ 80E355C - .string "Mail can~27t be sent to a GBA Game Pak\n" + .string "Mail can{APOSTROPHE}t be sent to a GBA Game Pak\n" .string "with the game quicksaved in a dungeon.\0" .align 2,0 @@ -888,12 +888,12 @@ gUnknown_80E367C: @ 80E367C .global gUnknown_80E3690 gUnknown_80E3690: @ 80E3690 .string "If your team is defeated and in need\n" -.string "of rescuing~2c send an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}\n" -.string "to a friend.#POnce you send your mail~2c you must wait\n" +.string "of rescuing{COMMA} send an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}\n" +.string "to a friend.#POnce you send your mail{COMMA} you must wait\n" .string "for your friend to send you\n" -.string "an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.#PIf the {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} arrives~2c your\n" +.string "an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.#PIf the {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} arrives{COMMA} your\n" .string "team can be revived to resume exploring\n" -.string "the dungeon it was in.#PWhen your team is revived~2c don~27t forget\n" +.string "the dungeon it was in.#PWhen your team is revived{COMMA} don{APOSTROPHE}t forget\n" .string "to send a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} to the friend\n" .string "who came to your rescue.\0" .align 2,0 @@ -901,12 +901,12 @@ gUnknown_80E3690: @ 80E3690 .global gUnknown_80E3818 gUnknown_80E3818: @ 80E3818 .string "If your team is defeated in\n" -.string "a dungeon~2c you may send a friend\n" -.string "an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1} for help.#PHowever~2c there are some places\n" +.string "a dungeon{COMMA} you may send a friend\n" +.string "an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1} for help.#PHowever{COMMA} there are some places\n" .string "where it is impossible for you to\n" -.string "call for a rescue.#PAlso~2c if you send an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}~2c\n" +.string "call for a rescue.#PAlso{COMMA} if you send an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}{COMMA}\n" .string "you may not continue with your\n" -.string "adventure while awaiting rescue.#PIf you cannot wait to be rescued~2c\n" +.string "adventure while awaiting rescue.#PIf you cannot wait to be rescued{COMMA}\n" .string "you will have to give up and return\n" .string "to your rescue team base.\0" .align 2,0 @@ -914,19 +914,19 @@ gUnknown_80E3818: @ 80E3818 .global gUnknown_80E3998 gUnknown_80E3998: @ 80E3998 .string "If your friend successfully rescues\n" -.string "your team~2c accept your friend~27s\n" -.string "{COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.#POnce the {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} is received~2c\n" +.string "your team{COMMA} accept your friend{APOSTROPHE}s\n" +.string "{COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.#POnce the {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} is received{COMMA}\n" .string "you may revive your team and resume\n" -.string "exploring the dungeon you were in.#PUsing a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}~2c\n" +.string "exploring the dungeon you were in.#PUsing a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}{COMMA}\n" .string "your friend can also send you\n" -.string "a {COLOR_1 LIGHT_BLUE_2}helper Pokémon{END_COLOR_TEXT_1}.#PHowever~2c the {COLOR_1 LIGHT_BLUE_2}helper Pokémon{END_COLOR_TEXT_1} will not\n" +.string "a {COLOR_1 LIGHT_BLUE_2}helper Pokémon{END_COLOR_TEXT_1}.#PHowever{COMMA} the {COLOR_1 LIGHT_BLUE_2}helper Pokémon{END_COLOR_TEXT_1} will not\n" .string "be able to bring an item with it when\n" .string "joining your team.\0" .align 2,0 .global gUnknown_80E3B1C gUnknown_80E3B1C: @ 80E3B1C -.string "If your team has been rescued~2c be sure\n" +.string "If your team has been rescued{COMMA} be sure\n" .string "to send a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} to the friend\n" .string "that came to your help.#PYou may also attach a {COLOR_1 LIGHT_BLUE_2}reward item{END_COLOR_TEXT_1}\n" .string "from storage to your {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}\n" @@ -935,14 +935,14 @@ gUnknown_80E3B1C: @ 80E3B1C .global gUnknown_80E3BF8 gUnknown_80E3BF8: @ 80E3BF8 -.string "If your friend~27s team needs rescuing~2c\n" +.string "If your friend{APOSTROPHE}s team needs rescuing{COMMA}\n" .string "you must first receive an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}\n" -.string "from your friend.#PWhen you get the mail~2c you may embark\n" +.string "from your friend.#PWhen you get the mail{COMMA} you may embark\n" .string "on your rescue mission from the\n" -.string "{COLOR_1 LIGHT_BLUE_2}Pelipper Post Office{END_COLOR_TEXT_1}.#PIf you rescue your friend~27s defeated\n" -.string "team~2c send an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} to your\n" -.string "friend.#PIf you rescue a friend~2c you will be eligible\n" -.string "to receive a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.#PIf you have quicksaved inside a dungeon~2c\n" +.string "{COLOR_1 LIGHT_BLUE_2}Pelipper Post Office{END_COLOR_TEXT_1}.#PIf you rescue your friend{APOSTROPHE}s defeated\n" +.string "team{COMMA} send an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} to your\n" +.string "friend.#PIf you rescue a friend{COMMA} you will be eligible\n" +.string "to receive a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.#PIf you have quicksaved inside a dungeon{COMMA}\n" .string "you may not choose {COLOR_1 LIGHT_BLUE_2}Go Rescue{END_COLOR_TEXT_1}.\n" .string "Your last save must be out of a dungeon.\0" .align 2,0 @@ -950,35 +950,35 @@ gUnknown_80E3BF8: @ 80E3BF8 .global gUnknown_80E3DE4 gUnknown_80E3DE4: @ 80E3DE4 .string "You may receive an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1} from\n" -.string "a friend~27s team that lies defeated in\n" -.string "a dungeon.#PIf there is no space for new mail~2c delete\n" +.string "a friend{APOSTROPHE}s team that lies defeated in\n" +.string "a dungeon.#PIf there is no space for new mail{COMMA} delete\n" .string "old mail at the {COLOR_1 LIGHT_BLUE_2}Pelipper Post Office{END_COLOR_TEXT_1}.\0" .align 2,0 .global gUnknown_80E3E98 gUnknown_80E3E98: @ 80E3E98 -.string "If you successfully rescue your friend~27s\n" -.string "team~2c send your friend an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.#PUsing a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}~2c you may\n" +.string "If you successfully rescue your friend{APOSTROPHE}s\n" +.string "team{COMMA} send your friend an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.#PUsing a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}{COMMA} you may\n" .string "also send your friend a Pokémon from\n" -.string "your Friend Area as a helper.#PDon~27t worry--sending a Pokémon as\n" +.string "your Friend Area as a helper.#PDon{APOSTROPHE}t worry--sending a Pokémon as\n" .string "a helper will not make it disappear from\n" -.string "its Friend Area.#PIf there is no space for new mail~2c delete\n" +.string "its Friend Area.#PIf there is no space for new mail{COMMA} delete\n" .string "old mail at the {COLOR_1 LIGHT_BLUE_2}Pelipper Post Office{END_COLOR_TEXT_1}.\0" .align 2,0 .global gUnknown_80E4014 gUnknown_80E4014: @ 80E4014 -.string "When you receive an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}~2c\n" +.string "When you receive an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}{COMMA}\n" .string "you may embark on your rescue mission\n" .string "from the {COLOR_1 LIGHT_BLUE_2}Pelipper Post Office{END_COLOR_TEXT_1}.#PBeware--if you do not have access to\n" -.string "the dungeon they are in~2c you may not go\n" +.string "the dungeon they are in{COMMA} you may not go\n" .string "on a rescue mission there.#PAccept challenging rescues only\n" .string "if you are ready and qualified!\0" .align 2,0 .global gUnknown_80E4130 gUnknown_80E4130: @ 80E4130 -.string "If you send an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}~2c you may\n" +.string "If you send an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}{COMMA} you may\n" .string "receive a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} in return\n" .string "from your friend.#PThe {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} may also come\n" .string "with a {COLOR_1 LIGHT_BLUE_2}reward item{END_COLOR_TEXT_1} attached.\0" @@ -986,10 +986,10 @@ gUnknown_80E4130: @ 80E4130 .global gUnknown_80E41DC gUnknown_80E41DC: @ 80E41DC -.string "Using the {COLOR_1 LIGHT_BLUE_2}Dual Slot{END_COLOR_TEXT_1} function~2c\n" +.string "Using the {COLOR_1 LIGHT_BLUE_2}Dual Slot{END_COLOR_TEXT_1} function{COMMA}\n" .string "you may perform rescue operations with\n" .string "friends using the GBA Game Pak version.#PInsert the DS Game Card and the GBA\n" -.string "Game Pak in your Nintendo DS system~2c\n" +.string "Game Pak in your Nintendo DS system{COMMA}\n" .string "then turn on the power.#PFriend Rescue missions using\n" .string "the {COLOR_1 LIGHT_BLUE_2}Dual Slot{END_COLOR_TEXT_1} function will be\n" .string "available on the main menu. \0" @@ -997,12 +997,12 @@ gUnknown_80E41DC: @ 80E41DC .global gUnknown_80E4314 gUnknown_80E4314: @ 80E4314 -.string "Friends can rescue each other~27s defeated\n" -.string "teams using a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}~2c\n" -.string "{COLOR_1 LIGHT_BLUE_2}passwords{END_COLOR_TEXT_1}~2c and so on.#PYou may go on a rescue mission to save\n" -.string "your friend~27s team that has been defeated\n" -.string "in a dungeon.#POr~2c you may call for help from a friend\n" -.string "to save your fallen team in a dungeon.#PUsing {COLOR_1 LIGHT_BLUE_2}passwords{END_COLOR_TEXT_1}~2c you can even\n" +.string "Friends can rescue each other{APOSTROPHE}s defeated\n" +.string "teams using a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}{COMMA}\n" +.string "{COLOR_1 LIGHT_BLUE_2}passwords{END_COLOR_TEXT_1}{COMMA} and so on.#PYou may go on a rescue mission to save\n" +.string "your friend{APOSTROPHE}s team that has been defeated\n" +.string "in a dungeon.#POr{COMMA} you may call for help from a friend\n" +.string "to save your fallen team in a dungeon.#PUsing {COLOR_1 LIGHT_BLUE_2}passwords{END_COLOR_TEXT_1}{COMMA} you can even\n" .string "exchange help with faraway friends.\0" .align 2,0 @@ -1035,7 +1035,7 @@ gUnknown_80E4550: @ 80E4550 .global gUnknown_80E45B4 gUnknown_80E45B4: @ 80E45B4 .string "Your storage space is full.\n" -.string "Please make room~2c then redo the\n" +.string "Please make room{COMMA} then redo the\n" .string "process from the start.\0" .align 2,0 @@ -1086,14 +1086,14 @@ gUnknown_80E4788: @ 80E4788 gUnknown_80E47D8: @ 80E47D8 .string "There is no space for receiving new\n" .string "mail.\n" -.string "Please delete old mail~2c then try again.\0" +.string "Please delete old mail{COMMA} then try again.\0" .align 2,0 .global gUnknown_80E482C gUnknown_80E482C: @ 80E482C .string "There is no response from your friend.\n" .string "Please make sure the sender and receiver\n" -.string "are ready~2c then redo this from the start.\0" +.string "are ready{COMMA} then redo this from the start.\0" .align 2,0 .global gUnknown_80E48A8 diff --git a/data/data_80E59A8.s b/data/data_80E59A8.s index 78b598e..46d4ded 100644 --- a/data/data_80E59A8.s +++ b/data/data_80E59A8.s @@ -185,7 +185,7 @@ gUnknown_80E61C0: @ 80E61C0 .global gUnknown_80E61E4 gUnknown_80E61E4: @ 80E61E4 - .string "{COLOR_1 LIGHT_BLUE_2}$d0{END_COLOR_TEXT_1} #CI$i0(s){END_COLOR_TEXT_1}\n" + .string "{COLOR_1 LIGHT_BLUE_2}$d0{END_COLOR_TEXT_1} #CI{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}\n" .string "will be sent.\n" .string "Is that OK?\0" .align 2,0 @@ -193,14 +193,14 @@ gUnknown_80E61E4: @ 80E61E4 .global gUnknown_80E6214 gUnknown_80E6214: @ 80E6214 .string "Your friend will send you an item.\n" - .string "When you are both ready~2c you\n" + .string "When you are both ready{COMMA} you\n" .string "may communicate.\0" .align 2,0 .global gUnknown_80E6268 gUnknown_80E6268: @ 80E6268 .string "Preparing to send an item to your\n" - .string "friend. When you are both ready~2c\n" + .string "friend. When you are both ready{COMMA}\n" .string "you may communicate.\0" .align 2,0 @@ -208,19 +208,19 @@ gUnknown_80E6268: @ 80E6268 gUnknown_80E62C4: @ 80E62C4 .string "#+In communication...\n" .string "#+Please wait with the power on.\n" - .string "#+To cancel~2c press {B_BUTTON}.\0" + .string "#+To cancel{COMMA} press {B_BUTTON}.\0" .align 2,0 .global gUnknown_80E6314 gUnknown_80E6314: @ 80E6314 .string "You received\n" - .string "{COLOR_1 LIGHT_BLUE_2}$d0{END_COLOR_TEXT_1} #CI$i0(s){END_COLOR_TEXT_1}.\n" + .string "{COLOR_1 LIGHT_BLUE_2}$d0{END_COLOR_TEXT_1} #CI{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}.\n" .string "Your adventure will be saved.\0" .align 2,0 .global gUnknown_80E6358 gUnknown_80E6358: @ 80E6358 - .string "You sent {COLOR_1 LIGHT_BLUE_2}$d0{END_COLOR_TEXT_1} #CI$i0(s){END_COLOR_TEXT_1}.\0" + .string "You sent {COLOR_1 LIGHT_BLUE_2}$d0{END_COLOR_TEXT_1} #CI{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}.\0" .align 2,0 @ Trade Items Link Errors @@ -253,7 +253,7 @@ gUnknown_80E6448: @ 80E6448 gUnknown_80E64AC: @ 80E64AC .string "There is no response from your friend.\n" .string "Please make sure the sender and receiver\n" - .string "are ready~2c then redo this from the start.\0" + .string "are ready{COMMA} then redo this from the start.\0" .align 2,0 .global gTradeItemsHowManyText diff --git a/data/data_80E7D40.s b/data/data_80E7D40.s index e2040ed..888ac48 100644 --- a/data/data_80E7D40.s +++ b/data/data_80E7D40.s @@ -180,7 +180,7 @@ gMankeyMission: @ 80E87DC .global gSmeargleMission gSmeargleMission: @ 80E87F4 - .string "{COLOR_1 YELLOW}Smeargle{END_COLOR_TEXT_1}~27s desperate plea!\0" + .string "{COLOR_1 YELLOW}Smeargle{END_COLOR_TEXT_1}{APOSTROPHE}s desperate plea!\0" .align 2,0 .global gMedichamMission @@ -220,18 +220,18 @@ gUnknown_80E888C: @ 80E888C .global gMankeyMissionDescription gMankeyMissionDescription: @ 80E88A0 - .string "Please punish bad {COLOR_1 YELLOW}Mankey{END_COLOR_TEXT_1}~27s gang.\0" + .string "Please punish bad {COLOR_1 YELLOW}Mankey{END_COLOR_TEXT_1}{APOSTROPHE}s gang.\0" .align 2,0 .global gSmeargleMissionDescription gSmeargleMissionDescription: @ 80E88C8 - .string "I didn~27t want to become a grown-up~2c so I\n" - .string "fled~2c but now I~27ve lost my way! Help!\0" + .string "I didn{APOSTROPHE}t want to become a grown-up{COMMA} so I\n" + .string "fled{COMMA} but now I{APOSTROPHE}ve lost my way! Help!\0" .align 2,0 .global gMedichamMissionDescription gMedichamMissionDescription: @ 80E8920 - .string "This is {COLOR_1 YELLOW}Medicham{END_COLOR_TEXT_1}. Rescue me~2c please!\n" + .string "This is {COLOR_1 YELLOW}Medicham{END_COLOR_TEXT_1}. Rescue me{COMMA} please!\n" .string "The reward is a secret" .byte 0x81, 0x60 .string "♪ " @@ -239,14 +239,14 @@ gMedichamMissionDescription: @ 80E8920 .global gUnknown_80E8968 gUnknown_80E8968: @ 80E8968 - .string "With the item {COLOR_1 GREEN}%s{END_COLOR_TEXT_1}~2c I can\n" - .string "evolve! I~27m yearning to evolve! Help!\0" + .string "With the item {COLOR_1 GREEN}%s{END_COLOR_TEXT_1}{COMMA} I can\n" + .string "evolve! I{APOSTROPHE}m yearning to evolve! Help!\0" .align 2,0 .global gUnknown_80E89B0 gUnknown_80E89B0: @ 80E89B0 .string "The {COLOR_1 GREEN}%s{END_COLOR_TEXT_1}! What I love to eat\n" - .string "and can~27t live without! Please get one!\0" + .string "and can{APOSTROPHE}t live without! Please get one!\0" .align 2,0 .global gUnknown_80E89FC @@ -500,7 +500,7 @@ gUnknown_80EAEB8: @ 80EAEB8 .global CloseFriends_80EAF08 CloseFriends_80EAF08: - .string "I~27m close friends with {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!" + .string "I{APOSTROPHE}m close friends with {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}!" .align 2,0 .global Apologize_80EAF2C @@ -510,7 +510,7 @@ gUnknown_80EAEB8: @ 80EAEB8 .global MustMeet_80EAF4C MustMeet_80EAF4C: - .asciz "I don~27t care how--we must meet!" + .string "I don{APOSTROPHE}t care how--we must meet!\0" .align 2,0 .global HaveToMeet_80EAF70 @@ -525,12 +525,12 @@ gUnknown_80EAEB8: @ 80EAEB8 .global LongTime_80EAFA4 LongTime_80EAFA4: - .asciz "We haven~27t seen each other in a long time." + .string "We haven{APOSTROPHE}t seen each other in a long time.\0" .align 2,0 .global SickWorry_80EAFD4 SickWorry_80EAFD4: - .asciz "I~27m sick with worry..." + .string "I{APOSTROPHE}m sick with worry...\0" .align 2,0 .global FaintedInside_80EAFF0 @@ -540,7 +540,7 @@ gUnknown_80EAEB8: @ 80EAEB8 .global HasntReturned_80EB014 HasntReturned_80EB014: - .string "{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} hasn~27t returned!\0" + .string "{COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} hasn{APOSTROPHE}t returned!\0" .align 2,0 .global WantToHelp_80EB030 @@ -550,7 +550,7 @@ gUnknown_80EAEB8: @ 80EAEB8 .global InTrouble_80EB048 InTrouble_80EB048: - .string "Hurry~2c {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} is in trouble...\0" + .string "Hurry{COMMA} {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1} is in trouble...\0" .align 2,0 .global WaitingForever_80EB06C @@ -565,22 +565,22 @@ gUnknown_80EAEB8: @ 80EAEB8 .global TooWeak_80EB0B4 TooWeak_80EB0B4: - .asciz "I~27m too weak. It~27s not possible." + .string "I{APOSTROPHE}m too weak. It{APOSTROPHE}s not possible.\0" .align 2,0 .global OwnPower_80EB0DC OwnPower_80EB0DC: - .asciz "I can~27t go on my own power..." + .string "I can{APOSTROPHE}t go on my own power...\0" .align 2,0 .global GoMyself_80EB0FC GoMyself_80EB0FC: - .asciz "I can~27t go by myself..." + .string "I can{APOSTROPHE}t go by myself...\0" .align 2,0 .global WorriedAbout_80EB118 WorriedAbout_80EB118: - .string "I~27m worried about {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}...\0" + .string "I{APOSTROPHE}m worried about {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}...\0" .align 2,0 .global WantMeet_80EB138 @@ -608,7 +608,7 @@ gUnknown_80EB198: @ 80EB198 .global SomeonePleaseEscort SomeonePleaseEscort: - .asciz "Someone~2c please escort me!" + .string "Someone{COMMA} please escort me!\0" .align 2,0 .global PleaseEscortMe @@ -638,12 +638,12 @@ gUnknown_80EB220: @ 80EB220 .global Without_80EB238 Without_80EB238: - .string "Without {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}~2c I...\0" + .string "Without {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}{COMMA} I...\0" .align 2,0 .global Worried_80EB250 Worried_80EB250: - .string "I~27m so worried about {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}...\0" + .string "I{APOSTROPHE}m so worried about {COLOR_1 YELLOW}%s{END_COLOR_TEXT_1}...\0" .align 2,0 .global WantMeet_80EB274 @@ -678,12 +678,12 @@ gUnknown_80EB2F0: @ 80EB2F0 .global Lonely_80EB308 Lonely_80EB308: - .asciz "I~27m very lonely! Please take me with you!" + .string "I{APOSTROPHE}m very lonely! Please take me with you!\0" .align 2,0 .global NoGood_80EB334 NoGood_80EB334: - .asciz "It~27s no good if we~27re not together!" + .string "It{APOSTROPHE}s no good if we{APOSTROPHE}re not together!\0" .align 2,0 .global MeansEverything_80EB35C @@ -693,17 +693,17 @@ gUnknown_80EB2F0: @ 80EB2F0 .global WePromised_80EB37C WePromised_80EB37C: - .asciz "We~27ve promised our futures together." + .string "We{APOSTROPHE}ve promised our futures together.\0" .align 2,0 .global WeBelong_80EB3A4 WeBelong_80EB3A4: - .asciz "We belong together! Please escort me!" + .string "We belong together! Please escort me!\0" .align 2,0 .global WeInLove_80EB3CC WeInLove_80EB3CC: - .asciz "We~27re in love! Please~2c take me there!" + .string "We{APOSTROPHE}re in love! Please{COMMA} take me there!\0" .align 2,0 @ Item Delivery Mission Text diff --git a/data/data_80F4278.s b/data/data_80F4278.s index 9c5a12b..1957696 100644 --- a/data/data_80F4278.s +++ b/data/data_80F4278.s @@ -29,8 +29,8 @@ gUnknown_80F4426: @ 80F4426 .byte 0x0c, 0x06, 0x13, 0x08, 0x04, 0x0d, 0x0f, 0x09, 0x10, 0x02, 0x14, 0x12, 0x00, 0x15, 0x0b, 0x05, 0x17, 0x03, 0x11, 0x0a, 0x01, 0x0e, 0x16, 0x07, 0x00, 0x00 .byte 0x70, 0x6b, 0x73, 0x64, 0x69, 0x72, 0x30, 0x00 - .global gUnknown_80F4448 -gUnknown_80F4448: @ 80F4448 + .global gAdjacentTileOffsets +gAdjacentTileOffsets: @ 80F4448 @ replacing .incbin "baserom.gba", 0x000f4448, 0x20 .byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00 @@ -116,8 +116,8 @@ gUnknown_80F4CC4: @ 80F4CC4 .byte 0x10, 0x48, 0x0f, 0x08, 0x01, 0x00, 0x01, 0x00, 0x30, 0x4b, 0x0f, 0x08, 0x01, 0x00, 0x01, 0x00, 0x9c, 0x49, 0x0f, 0x08, 0x01, 0x00, 0x01, 0x00, 0x30, 0x4b, 0x0f, 0x08, 0x01, 0x00, 0xff, 0xff .byte 0x10, 0x48, 0x0f, 0x08, 0xff, 0xff, 0xff, 0xff, 0x30, 0x4b, 0x0f, 0x08, 0xff, 0xff, 0xff, 0xff, 0x9c, 0x49, 0x0f, 0x08, 0xff, 0xff, 0xff, 0xff, 0x30, 0x4b, 0x0f, 0x08, 0xff, 0xff, 0x01, 0x00 - .global gUnknown_80F4D04 -gUnknown_80F4D04: @ 80F4D04 + .global gFaceDirectionIncrements +gFaceDirectionIncrements: @ 80F4D04 @ replacing .incbin "baserom.gba", 0x000f4d04, 0x40 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0xfd, 0xff, 0xff, 0xff, 0x04, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0xfd, 0xff, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 @@ -180,8 +180,8 @@ gUnknown_80F4DB0: @ 80F4DB0 @ replacing .incbin "baserom.gba", 0x000f4db0, 0x2 .byte 0x28, 0x00 - .global gUnknown_80F4DB2 -gUnknown_80F4DB2: @ 80F4DB2 + .global gConfusedAttackChance +gConfusedAttackChance: @ 80F4DB2 @ replacing .incbin "baserom.gba", 0x000f4db2, 0x2 .byte 0x46, 0x00 @@ -1271,8 +1271,8 @@ gUnknown_80F51EC: @ 80F51EC gUnknown_80F520C: @ 80F520C .incbin "baserom.gba", 0xF520C, 0x20 - .global gUnknown_80F522C -gUnknown_80F522C: @ 80F522C + .global gTypeEffectivenessChart +gTypeEffectivenessChart: @ 80F522C .incbin "baserom.gba", 0xF522C, 0x288 .global gUnknown_80F54B4 @@ -1295,12 +1295,12 @@ gUnknown_80F55BC: @ 80F55BC gUnknown_80F55EC: @ 80F55EC .incbin "baserom.gba", 0xF55EC, 0x30 - .global gUnknown_80F561C -gUnknown_80F561C: @ 80F561C + .global gDungeonCamouflageTypes +gDungeonCamouflageTypes: @ 80F561C .incbin "baserom.gba", 0xF561C, 0x4C - .global gUnknown_80F5668 -gUnknown_80F5668: @ 80F5668 + .global gDungeonMusic +gDungeonMusic: @ 80F5668 .incbin "baserom.gba", 0xF5668, 0x98 .global gUnknown_80F5700 @@ -1344,8 +1344,8 @@ gUnknown_80F58F4: @ 80F58F4 gUnknown_80F5978: @ 80F5978 .incbin "baserom.gba", 0xF5978, 0x4C - .global gUnknown_80F59C4 -gUnknown_80F59C4: @ 80F59C4 + .global gItemMasterMinWildLevel +gItemMasterMinWildLevel: @ 80F59C4 .incbin "baserom.gba", 0xF59C4, 0x4 .global gUnknown_80F59C8 @@ -1725,8 +1725,8 @@ gUnknown_80F683C: @ 80F683C gUnknown_80F6850: @ 80F6850 .incbin "baserom.gba", 0xF6850, 0x10 - .global gUnknown_80F6860 -gUnknown_80F6860: @ 80F6860 + .global gSpeedTurns +gSpeedTurns: @ 80F6860 .incbin "baserom.gba", 0xF6860, 0x104 .global gUnknown_80F6964 @@ -1873,8 +1873,8 @@ gActions: @ 80F7B14 .global gEquipPutOnDescription gEquipPutOnDescription: @ 80F7B94 - .string "$m0 put on\n" - .string "the $i0.\0" + .string "{ARG_POKEMON_0} put on\n" + .string "the {ARG_MOVE_ITEM_0}.\0" .global gPeelText gPeelText: @ 80F7BA8 @@ -1883,8 +1883,8 @@ gPeelText: @ 80F7BA8 .global gPeelDescription gPeelDescription: @ 80F7BB0 - .string "$m0 peeled\n" - .string "the $i0.\0" + .string "{ARG_POKEMON_0} peeled\n" + .string "the {ARG_MOVE_ITEM_0}.\0" .align 2,0 .global gIngestText @@ -1894,8 +1894,8 @@ gIngestText: @ 80F7BC4 .global gIngestDescription gIngestDescription: @ 80F7BCC - .string "$m0 swallowed\n" - .string "the $i0.\0" + .string "{ARG_POKEMON_0} swallowed\n" + .string "the {ARG_MOVE_ITEM_0}.\0" .align 2,0 .global gEatText @@ -1905,8 +1905,8 @@ gEatText: @ 80F7BE4 .global gEatDescription gEatDescription: @ 80F7BE8 - .string "$m0 ate\n" - .string "the $i0.\0" + .string "{ARG_POKEMON_0} ate\n" + .string "the {ARG_MOVE_ITEM_0}.\0" .align 2,0 .global gEquipText @@ -1916,8 +1916,8 @@ gEquipText: @ 80F7BFC .global gEquipDescription gEquipDescription: @ 80F7C04 - .string "$m0 equipped\n" - .string "the $i0.\0" + .string "{ARG_POKEMON_0} equipped\n" + .string "the {ARG_MOVE_ITEM_0}.\0" .align 2,0 .global gThrowText @@ -1927,8 +1927,8 @@ gThrowText: @ 80F7C1C .global gThrowDescription gThrowDescription: @ 80F7C24 - .string "$m0 threw\n" - .string "the $i0.\0" + .string "{ARG_POKEMON_0} threw\n" + .string "the {ARG_MOVE_ITEM_0}.\0" .align 2,0 .global gUseText @@ -1938,8 +1938,8 @@ gUseText: @ 80F7C38 .global gUseDescription gUseDescription: @ 80F7C3C - .string "$m0 used\n" - .string "the $i0.\0" + .string "{ARG_POKEMON_0} used\n" + .string "the {ARG_MOVE_ITEM_0}.\0" .align 2,0 .global gUnknown_80F7C50 @@ -2259,23 +2259,23 @@ gUnknown_80F7F70: @ 80F7F70 .global gRescueSpotDescription gRescueSpotDescription: @ 80F7F7C .string "You reached the rescue spot where your\n" - .string "friend~27s team went down!\n" + .string "friend{APOSTROPHE}s team went down!\n" .string "Send an {COLOR_2 RED}A-OK Mail{END_COLOR_TEXT_2} from the Pelipper Post\n" - .string "Office to let your friend know you~27ve\n" + .string "Office to let your friend know you{APOSTROPHE}ve\n" .string "rescued the defeated team.\0" .align 2,0 .global gWarpZoneDescription gWarpZoneDescription: @ 80F8030 .string "The warp zone leading to the next floor.\n" - .string "If you are on the final floor~2c you will\n" + .string "If you are on the final floor{COMMA} you will\n" .string "escape from the dungeon.\0" .align 2,0 .global gDungeonStairsDescription gDungeonStairsDescription: @ 80F809C .string "Stairs leading to the next floor.\n" - .string "If you are on the final floor~2c you will\n" + .string "If you are on the final floor{COMMA} you will\n" .string "escape from the dungeon.\0" .align 2,0 @@ -2324,7 +2324,7 @@ gUnknown_80F8994: @ 80F8994 .global PartnerFainted_80F8998 PartnerFainted_80F8998: - .string "Your partner $m0 fainted!\0" + .string "Your partner {ARG_POKEMON_0} fainted!\0" .align 2,0 .global gUnknown_80F89B4 @@ -2333,7 +2333,7 @@ gUnknown_80F89B4: @ 80F89B4 .global ClientFainted_80F89B8 ClientFainted_80F89B8: - .string "Your client $m0 fainted!\0" + .string "Your client {ARG_POKEMON_0} fainted!\0" .align 2,0 .global gUnknown_80F89D4 @@ -2353,7 +2353,7 @@ gUnknown_80F89D8: @ 80F89D8 gUnknown_80F89F4: @ 80F89F4 .4byte NothingHappened_80F89DC - .string "$m0 was blown away!\0" + .string "{ARG_POKEMON_0} was blown away!\0" .align 2,0 .global gUnknown_80F8A0C @@ -2365,37 +2365,37 @@ gUnknown_80F8A0C: @ 80F8A0C .global gUnknown_80F8A28 gUnknown_80F8A28: @ 80F8A28 .byte 0x10, 0x8A, 0x0F, 0x08 - .string "The set move can~27t be used.\0" + .string "The set move can{APOSTROPHE}t be used.\0" .align 2,0 .global gUnknown_80F8A4C gUnknown_80F8A4C: @ 80F8A4C .byte 0x2C, 0x8A, 0x0F, 0x08 - .string "You~27re being constricted!\0" + .string "You{APOSTROPHE}re being constricted!\0" .align 2,0 .global gUnknown_80F8A6C gUnknown_80F8A6C: @ 80F8A6C .byte 0x50, 0x8A, 0x0F, 0x08 - .string "You can~27t move!\0" + .string "You can{APOSTROPHE}t move!\0" .align 2,0 .global gUnknown_80F8A84 gUnknown_80F8A84: @ 80F8A84 .byte 0x70, 0x8A, 0x0F, 0x08 - .string "You can~27t move while you~27re rooted!\0" + .string "You can{APOSTROPHE}t move while you{APOSTROPHE}re rooted!\0" .align 2,0 .global gUnknown_80F8AB0 gUnknown_80F8AB0: @ 80F8AB0 .byte 0x88, 0x8A, 0x0F, 0x08 - .string "You can~27t move while wrapping a foe!\0" + .string "You can{APOSTROPHE}t move while wrapping a foe!\0" .align 2,0 .global gUnknown_80F8ADC gUnknown_80F8ADC: @ 80F8ADC .byte 0xB4, 0x8A, 0x0F, 0x08 - .string "The foe has you wrapped! You can~27t move!\0" + .string "The foe has you wrapped! You can{APOSTROPHE}t move!\0" .align 2,0 .global gUnknown_80F8B0C @@ -2406,20 +2406,20 @@ gUnknown_80F8B0C: @ 80F8B0C .global gUnknown_80F8B24 gUnknown_80F8B24: @ 80F8B24 .byte 0x10, 0x8B, 0x0F, 0x08 - .string "The move $i0 was set.\0" + .string "The move {ARG_MOVE_ITEM_0} was set.\0" .align 2,0 .global gUnknown_80F8B40 gUnknown_80F8B40: @ 80F8B40 .byte 0x28, 0x8B, 0x0F, 0x08 - .string "The move $i0 was deselected.\0" + .string "The move {ARG_MOVE_ITEM_0} was deselected.\0" .align 2,0 .global gUnknown_80F8B64 gUnknown_80F8B64: @ 80F8B64 .byte 0x44, 0x8B, 0x0F, 0x08 .4byte gMenuEmpty - .string "The move $i0 was delinked.\0" + .string "The move {ARG_MOVE_ITEM_0} was delinked.\0" .align 2,0 .global gUnknown_80F8B88 @@ -2431,7 +2431,7 @@ gUnknown_80F8B88: @ 80F8B88 .global gUnknown_80F8BB4 gUnknown_80F8BB4: @ 80F8BB4 .byte 0x8C, 0x8B, 0x0F, 0x08 - .string "It~27s all sticky and doesn~27t work!\0" + .string "It{APOSTROPHE}s all sticky and doesn{APOSTROPHE}t work!\0" .align 2,0 .global gUnknown_80F8BE0 @@ -2449,14 +2449,14 @@ gUnknown_80F8C44: @ 80F8C44 .global gUnknown_80F8C48 gUnknown_80F8C48: @ 80F8C48 .byte 0x14, 0x8C, 0x0F, 0x08 - .string "The $i0 is all sticky!\nIt can~27t be equipped.\0" + .string "The {ARG_MOVE_ITEM_0} is all sticky!\nIt can{APOSTROPHE}t be equipped.\0" .align 2,0 .global gUnknown_80F8C7C gUnknown_80F8C7C: @ 80F8C7C .byte 0x4C, 0x8C, 0x0F, 0x08 - .string "$m1 took the $i0\n" - .string "and returned the $i1.\0" + .string "{ARG_POKEMON_1} took the {ARG_MOVE_ITEM_0}\n" + .string "and returned the {ARG_MOVE_ITEM_1}.\0" .align 2,0 .global gUnknown_80F8CA8 @@ -2470,19 +2470,19 @@ gUnknown_80F8CE4: @ 80F8CE4 .global gUnknown_80F8CE8 gUnknown_80F8CE8: @ 80F8CE8 .byte 0xAC, 0x8C, 0x0F, 0x08 - .string "Equipped the item $i0.\0" + .string "Equipped the item {ARG_MOVE_ITEM_0}.\0" .align 2,0 .global gUnknown_80F8D04 gUnknown_80F8D04: @ 80F8D04 .byte 0xEC, 0x8C, 0x0F, 0x08 - .string "The $i0 was deselected.\0" + .string "The {ARG_MOVE_ITEM_0} was deselected.\0" .global gUnknown_80F8D20 gUnknown_80F8D20: @ 80F8D20 .byte 0x08, 0x8D, 0x0F, 0x08 - .string "The item $i0 was given\n" - .string "to $m1.\0" + .string "The item {ARG_MOVE_ITEM_0} was given\n" + .string "to {ARG_POKEMON_1}.\0" .align 2,0 .global gUnknown_80F8D44 @@ -2719,28 +2719,28 @@ gUnknown_80F9510: @ 80F9510 gUnknown_80F9530: @ 80F9530 .incbin "baserom.gba", 0xF9530, 0x1C - .global gUnknown_80F954C -gUnknown_80F954C: @ 80F954C + .global gFrozenMessage +gFrozenMessage: @ 80F954C .incbin "baserom.gba", 0xF954C, 0x20 - .global gUnknown_80F956C -gUnknown_80F956C: @ 80F956C + .global gWrappedAroundMessage +gWrappedAroundMessage: @ 80F956C .incbin "baserom.gba", 0xF956C, 0x20 - .global gUnknown_80F958C -gUnknown_80F958C: @ 80F958C + .global gWrappedByMessage +gWrappedByMessage: @ 80F958C .incbin "baserom.gba", 0xF958C, 0x18 - .global gUnknown_80F95A4 -gUnknown_80F95A4: @ 80F95A4 + .global gPausedMessage +gPausedMessage: @ 80F95A4 .incbin "baserom.gba", 0xF95A4, 0x18 - .global gUnknown_80F95BC -gUnknown_80F95BC: @ 80F95BC + .global gInfatuatedMessage +gInfatuatedMessage: @ 80F95BC .incbin "baserom.gba", 0xF95BC, 0x1C - .global gUnknown_80F95D8 -gUnknown_80F95D8: @ 80F95D8 + .global gBideMessage +gBideMessage: @ 80F95D8 .incbin "baserom.gba", 0xF95D8, 0x14 .global gUnknown_80F95EC @@ -5178,7 +5178,7 @@ gFieldItemMenuGroundTextPtr: @ 80FE92C .global ItemText_80FE930 ItemText_80FE930: - .string "$m0~27s item\0" + .string "{ARG_POKEMON_0}{APOSTROPHE}s item\0" .align 2,0 .global gUnknown_80FE940 @@ -5204,7 +5204,7 @@ gUnknown_80FE954: @ 80FE954 .global ItemText_80FE958 ItemText_80FE958: - .string "$i0\0" + .string "{ARG_MOVE_ITEM_0}\0" .align 2,0 .global gUnknown_80FE95C @@ -5221,7 +5221,7 @@ gUnknown_80FE964: @ 80FE964 .global PokeMove_80FE968 PokeMove_80FE968: - .string "$m0~27s moves\0" + .string "{ARG_POKEMON_0}{APOSTROPHE}s moves\0" .align 2,0 .global gUnknown_80FE978 @@ -5610,7 +5610,7 @@ gUnknown_8100208: @ 8100208 .global gMagnitudeMessage gMagnitudeMessage: @ 810020C - .string "It~27s Magnitude $d0!\0" + .string "It{APOSTROPHE}s Magnitude $d0!\0" .align 2, 0 .global gPtrMagnitudeMessage @@ -5628,7 +5628,7 @@ gPtrSleepingTargetOnlyMessage: @ 810024C .global gFeralFoundItemMessage gFeralFoundItemMessage: @ 8100250 - .string "$m0 found an item somewhere.\0" + .string "{ARG_POKEMON_0} found an item somewhere.\0" .align 2, 0 .global gPtrFeralFoundItemMessage @@ -5729,7 +5729,7 @@ gPtrWishStoneCrumbledMessage: @ 810044C .global gMusicBoxPlayedCrumbledMessage gMusicBoxPlayedCrumbledMessage: @ 8100450 - .string "The Music Box played a beautiful melody~2c\n" + .string "The Music Box played a beautiful melody{COMMA}\n" .string "then crumbled away...\0" .align 2, 0 @@ -5748,7 +5748,7 @@ gPtrMysteriousPowerPreventedUseMessage: @ 81004C4 .global gCouldntBeUsedMessage gCouldntBeUsedMessage: @ 81004C8 - .string "But it couldn~27t be used!\0" + .string "But it couldn{APOSTROPHE}t be used!\0" .align 2, 0 .global gPtrCouldntBeUsedMessage @@ -5769,7 +5769,7 @@ gUnknown_81004F0: @ 81004F0 .global gUnknown_81004F4 gUnknown_81004F4: @ 81004F4 - .string "$m1~27s Soundproof suppressed\n" + .string "{ARG_POKEMON_1}{APOSTROPHE}s Soundproof suppressed\n" .string "the sound move!\0" .align 2, 0 @@ -5797,7 +5797,7 @@ gUnknown_810056C: @ 810056C .global gUnknown_8100570 gUnknown_8100570: @ 8100570 - .string "Perish Song~27s effect wore off!\0" + .string "Perish Song{APOSTROPHE}s effect wore off!\0" .align 2, 0 .global gUnknown_8100594 @@ -5824,7 +5824,7 @@ gPtrSealedMoveReleasedMessage: @ 81005DC .global gCantLeechSeedSelfMessage gCantLeechSeedSelfMessage: @ 81005E0 - .string "A leech seed can~27t be planted on the user!\0" + .string "A leech seed can{APOSTROPHE}t be planted on the user!\0" .align 2, 0 .global gPtrCantLeechSeedSelfMessage @@ -5833,8 +5833,8 @@ gPtrCantLeechSeedSelfMessage: @ 8100610 .global gCantLeechSeedMonMessage gCantLeechSeedMonMessage: @ 8100614 - .string "A leech seed couldn~27t be planted on\n" - .string "$m0!\0" + .string "A leech seed couldn{APOSTROPHE}t be planted on\n" + .string "{ARG_POKEMON_0}!\0" .align 2, 0 .global gPtrCantLeechSeedMonMessage @@ -5853,7 +5853,7 @@ gPtrMoveInterruptedMessage: @ 8100660 .global gClientFaintedMessage gClientFaintedMessage: @ 8100664 .string "Your client Pokémon has fainted!\n" - .string "A rescue call can~27t be made!\0" + .string "A rescue call can{APOSTROPHE}t be made!\0" .align 2, 0 .global gPtrClientFaintedMessage @@ -5862,7 +5862,7 @@ gPtrClientFaintedMessage: @ 81006A4 .global gCantUseInDungeonMessage gCantUseInDungeonMessage: @ 81006A8 - .string "It can~27t be used in a dungeon!\0" + .string "It can{APOSTROPHE}t be used in a dungeon!\0" .align 2, 0 .global gPtrCantUseInDungeonMessage @@ -5917,8 +5917,8 @@ gUnknown_8100768: @ 8100768 .global gUnknown_8100774 gUnknown_8100774: @ 8100774 - .string " Look~2c $m0!\n" - .string "$m2~27s over there!\0" + .string " Look{COMMA} {ARG_POKEMON_0}!\n" + .string "{ARG_POKEMON_2}{APOSTROPHE}s over there!\0" .align 2, 0 .global gUnknown_8100798 @@ -5931,13 +5931,13 @@ gUnknown_8100798: @ 8100798 .global gUnknown_81007B0 gUnknown_81007B0: @ 81007B0 .string " Hey! Are you all right?\n" - .string "We~27ve come to rescue you!\0" + .string "We{APOSTROPHE}ve come to rescue you!\0" .align 2, 0 .global gUnknown_81007E8 gUnknown_81007E8: @ 81007E8 .string " Hey! Are you all right?\n" - .string "We~27re here to rescue you!\0" + .string "We{APOSTROPHE}re here to rescue you!\0" .align 2, 0 .global gUnknown_8100820 @@ -5948,7 +5948,7 @@ gUnknown_8100820: @ 8100820 .global gUnknown_810082C gUnknown_810082C: @ 810082C .string " ...I...\n" - .string "I~27m scared.\0" + .string "I{APOSTROPHE}m scared.\0" .align 2, 0 .global gUnknown_8100844 @@ -5967,12 +5967,12 @@ gUnknown_8100928: @ 8100928 .global gUnknown_8100934 gUnknown_8100934: @ 8100934 .string " How dare you!#W\n" - .string "It~27s their fault!#P" - .string " I haven~27t slept in days\n" + .string "It{APOSTROPHE}s their fault!#P" + .string " I haven{APOSTROPHE}t slept in days\n" .string "because the earthquakes frighten me so!\n" .string "Every night we had them!#P" .string " Those earthquakes are\n" - .string "caused by this brat~27s ilk running wild\n" + .string "caused by this brat{APOSTROPHE}s ilk running wild\n" .string "underground!\0" .align 2, 0 @@ -6611,8 +6611,8 @@ gUnknown_8103E34: @ 8103E34 .global gUnknown_8103E40 gUnknown_8103E40: @ 8103E40 .string "#+There appears to be no one here.#P" - .string "#+It~27s impossible to go farther.#W\n" - .string "#+It~27s time to go back.\0" + .string "#+It{APOSTROPHE}s impossible to go farther.#W\n" + .string "#+It{APOSTROPHE}s time to go back.\0" .align 2, 0 .global gUnknown_8103EA4 @@ -7136,7 +7136,7 @@ gUnknown_81063D0: @ 81063D0 .global gPurityForestSomeoneThereText gPurityForestSomeoneThereText: @ 81063DC .string "#+Oh?#W\n" - .string "#+There~27s someone there.\0" + .string "#+There{APOSTROPHE}s someone there.\0" .align 2, 0 .global gUnknown_8106400 @@ -7147,8 +7147,8 @@ gUnknown_8106400: @ 8106400 .global gPurityForestCelebiIntroText gPurityForestCelebiIntroText: @ 810640C - .string "#+It~27s...#W\n" - .string "#+The Time Travel Pokémon $m2!\0" + .string "#+It{APOSTROPHE}s...#W\n" + .string "#+The Time Travel Pokémon {ARG_POKEMON_2}!\0" .align 2, 0 .global gUnknown_810643C @@ -7159,7 +7159,7 @@ gUnknown_810643C: @ 810643C .global gPurityForestCelebiWantsToJoinText gPurityForestCelebiWantsToJoinText: @ 8106448 - .string "#+$m2 wants to join the team.\0" + .string "#+{ARG_POKEMON_2} wants to join the team.\0" .align 2, 0 .global gUnknown_8106468 @@ -7170,7 +7170,7 @@ gUnknown_8106468: @ 8106468 .global gPurityForestCelebiJoinedText gPurityForestCelebiJoinedText: @ 8106474 - .string "#+$m2 joined the team! \0" + .string "#+{ARG_POKEMON_2} joined the team! \0" .align 2, 0 .global gUnknown_810648C @@ -7181,7 +7181,7 @@ gUnknown_810648C: @ 810648C .global gPurityForestCelebiVeryHappyText gPurityForestCelebiVeryHappyText: @ 8106498 - .string "#+$m3 appears to\n" + .string "#+{ARG_POKEMON_3} appears to\n" .string "#+be very happy!\0" .align 2, 0 @@ -7193,7 +7193,7 @@ gUnknown_81064BC: @ 81064BC .global gPurityForestCelebiDelightedToJoinText gPurityForestCelebiDelightedToJoinText: @ 81064C8 - .string "#+It~27s delighted to have\n" + .string "#+It{APOSTROPHE}s delighted to have\n" .string "#+joined the rescue team!\0" .align 2, 0 @@ -7205,7 +7205,7 @@ gUnknown_8106500: @ 8106500 .global gPurityForestTurnedDownOfferText gPurityForestTurnedDownOfferText: @ 810650C - .string "#+$m0 turned down\n" + .string "#+{ARG_POKEMON_0} turned down\n" .string "#+the offer to join.\0" .align 2, 0 @@ -7228,13 +7228,13 @@ gUnknown_8106560: @ 8106560 .global gPurityForestCelebiLeftDejectedlyText gPurityForestCelebiLeftDejectedlyText: @ 810656C - .string "#+$m2 left\n" + .string "#+{ARG_POKEMON_2} left\n" .string "#+dejectedly...\0" .align 2, 0 .global gPurityForestAllowCelebiToJoinText gPurityForestAllowCelebiToJoinText: @ 8106588 - .string "#+Allow $m2\n" + .string "#+Allow {ARG_POKEMON_2}\n" .string "#+to join the team?\0" .align 2, 0 @@ -7264,7 +7264,7 @@ gPurityForestAllowCelebiToJoinYesText: @ 81065C8 .global gPurityForestRefuseCelebiConfirmText gPurityForestRefuseCelebiConfirmText: @ 81065D0 .string "#+Are you sure?#W\n" - .string "#+You~27re sure you won~27t accept it?\0" + .string "#+You{APOSTROPHE}re sure you won{APOSTROPHE}t accept it?\0" .align 2, 0 .global gPtrPurityForestRefuseCelebiConfirmText @@ -7370,8 +7370,8 @@ gUnknown_81069BC: @ 81069BC gUnknown_81069D4: @ 81069D4 .incbin "baserom.gba", 0x1069D4, 0x20 - .global gUnknown_81069F4 -gUnknown_81069F4: @ 81069F4 + .global gChargeMovesToStatuses +gChargeMovesToStatuses: @ 81069F4 .incbin "baserom.gba", 0x1069F4, 0x28 .global gMultiTurnChargingStatuses @@ -7536,7 +7536,7 @@ gUnknown_8106C90: @ 8106C90 .global gUnknown_8106C98 gUnknown_8106C98: @ 8106C98 - .string "$i0\0" + .string "{ARG_MOVE_ITEM_0}\0" .align 2,0 .global gUnknown_8106C9C @@ -7557,7 +7557,7 @@ gUnknown_8106CAC: @ 8106CAC .global gUnknown_8106CC4 gUnknown_8106CC4: @ 8106CC4 - .string "$i0\0" + .string "{ARG_MOVE_ITEM_0}\0" .align 2,0 .global gUnknown_8106CC8 @@ -7566,7 +7566,7 @@ gUnknown_8106CC8: @ 8106CC8 .global gUnknown_8106CCC gUnknown_8106CCC: @ 8106CCC - .string "$m0\0" + .string "{ARG_POKEMON_0}\0" .align 2,0 .string "pksdir0\0" .align 2,0 @@ -7602,7 +7602,7 @@ gUnknown_8106D68: @ 8106D68 .global gUnknown_8106D8C gUnknown_8106D8C: @ 8106D8C - .string "#c%d$m0\0" + .string "#c%d{ARG_POKEMON_0}\0" .align 2,0 .string "pksdir0\0" .align 2,0 @@ -7622,7 +7622,7 @@ gUnknown_8106DC8: @ 8106DC8 .global gUnknown_8106E28 gUnknown_8106E28: @ 8106E28 - .string "$m0\0" + .string "{ARG_POKEMON_0}\0" .align 2,0 .global gUnknown_8106E2C @@ -7635,12 +7635,12 @@ gUnknown_8106E30: @ 8106E30 .global gUnknown_8106E34 gUnknown_8106E34: @ 8106E34 - .string "$i0{COLOR_2 CYAN}$v02:$m0{END_COLOR_TEXT_2}\0" + .string "{ARG_MOVE_ITEM_0}{COLOR_2 CYAN}$v02:{ARG_POKEMON_0}{END_COLOR_TEXT_2}\0" .align 2,0 .global gUnknown_8106E48 gUnknown_8106E48: @ 8106E48 - .string "$i0{COLOR_2 YELLOW}$v02:$m0{END_COLOR_TEXT_2}\0" + .string "{ARG_MOVE_ITEM_0}{COLOR_2 YELLOW}$v02:{ARG_POKEMON_0}{END_COLOR_TEXT_2}\0" .align 2,0 .global gUnknown_8106E5C @@ -7737,8 +7737,8 @@ gUnknown_8106F64: @ 8106F64 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0xC0, 0x00, 0x00 - .global gUnknown_8106F6C -gUnknown_8106F6C: @ 8106F6C + .global gTypeEffectivenessMultipliers +gTypeEffectivenessMultipliers: @ 8106F6C .byte 0x00, 0x00, 0x00, 0x00 .byte 0x01, 0x00, 0x00, 0x00 .byte 0x02, 0x00, 0x00, 0x00 @@ -7752,8 +7752,8 @@ gUnknown_8106F7C: @ 8106F7C gUnknown_8106FA4: @ 8106FA4 .string "{COLOR_2}%c%s{END_COLOR_TEXT_2}\0" - .global gUnknown_8106FAD -gUnknown_8106FAD: @ 8106FAD + .global gDirectionBitMasks +gDirectionBitMasks: @ 8106FAD @ replacing .incbin "baserom.gba", 0x00106fad, 0x8 .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 @@ -7777,13 +7777,13 @@ gUnknown_8106FCD: @ 8106FCD @ replacing .incbin "baserom.gba", 0x00106fcd, 0x8 .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 - .global gUnknown_8106FD5 -gUnknown_8106FD5: @ 8106FD5 + .global gDirectionBitMasks_2 +gDirectionBitMasks_2: @ 8106FD5 @ replacing .incbin "baserom.gba", 0x00106fd5, 0x8 .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 - .global gUnknown_8106FDD -gUnknown_8106FDD: @ 8106FDD + .global gDirectionBitMasks_3 +gDirectionBitMasks_3: @ 8106FDD @ replacing .incbin "baserom.gba", 0x00106fdd, 0x8 .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 @@ -7870,12 +7870,12 @@ gUnknown_81075F4: @ 81075F4 .global gUnknown_8107600 gUnknown_8107600: @ 8107600 - .string "{COLOR_2 YELLOW_ALT}%s{END_COLOR_TEXT_2}" + .string "{COLOR_2 YELLOW_2}%s{END_COLOR_TEXT_2}" .align 2,0 .global gUnknown_8107608 gUnknown_8107608: @ 8107608 - .string "{COLOR_2 CYAN_ALT}%s{END_COLOR_TEXT_2}" + .string "{COLOR_2 CYAN_2}%s{END_COLOR_TEXT_2}" .align 2,0 .global gUnownLetters @@ -7981,7 +7981,7 @@ gUnknown_8107770: @ 8107770 .global gUnknown_8107784 gUnknown_8107784: @ 8107784 - .string "$i1\0" + .string "{ARG_MOVE_ITEM_1}\0" .align 2,0 .global gUnknown_8107788 @@ -7994,7 +7994,7 @@ gUnknown_810778C: @ 810778C .global gUnknown_8107790 gUnknown_8107790: @ 8107790 - .string "$i0$i1\0" + .string "{ARG_MOVE_ITEM_0}{ARG_MOVE_ITEM_1}\0" .align 2,0 .global gUnknown_8107798 @@ -8057,19 +8057,19 @@ gUnknown_8108EC0: @ 8108EC0 .global gUnknown_8108F10 gUnknown_8108F10: @ 8108F10 - .string "{COLOR_2 YELLOW_3}%s{END_COLOR_TEXT_2}\0" + .string "{COLOR_2 YELLOW_4}%s{END_COLOR_TEXT_2}\0" .align 2,0 .global gUnknown_8108F18 gUnknown_8108F18: @ 8108F18 - .string "{COLOR_2 YELLOW_3}%s{END_COLOR_TEXT_2}" + .string "{COLOR_2 YELLOW_4}%s{END_COLOR_TEXT_2}" .byte 0x81, 0x40 .string "{COLOR_2 CYAN}%d{END_COLOR_TEXT_2}F\0" .align 2,0 .global gUnknown_8108F2C gUnknown_8108F2C: @ 8108F2C - .string "{COLOR_2 YELLOW_3}%s{END_COLOR_TEXT_2}" + .string "{COLOR_2 YELLOW_4}%s{END_COLOR_TEXT_2}" .byte 0x81, 0x40 .string "B{COLOR_2 CYAN}%d{END_COLOR_TEXT_2}F\0" .align 2,0 @@ -8268,7 +8268,7 @@ gUnknown_810992C: @ 810992C .global gUnknown_8109930 gUnknown_8109930: @ 8109930 - .string "$m0\0" + .string "{ARG_POKEMON_0}\0" .align 2,0 .string "pksdir0\0" .align 2,0 @@ -8306,7 +8306,7 @@ gStoryMissionText: @ 8109994 .global gDummyScenarioText gDummyScenarioText: @ 8109CA8 - .string "{COLOR_1 YELLOW_2}Scenario try dummy{END_COLOR_TEXT_1}\0" + .string "{COLOR_1 YELLOW_3}Scenario try dummy{END_COLOR_TEXT_1}\0" .align 2,0 .global gUnknown_8109CC0 diff --git a/data/data_810AC60.s b/data/data_810AC60.s index 1629dba..d12480b 100644 --- a/data/data_810AC60.s +++ b/data/data_810AC60.s @@ -93,8 +93,8 @@ gBlastBurnIQReq: @ 810ACBC gVoltTackleIQReq: @ 810ACBE .2byte 333 - .global gUnknown_810ACC0 -gUnknown_810ACC0: @ 810ACC0 + .global gDungeonWaterType +gDungeonWaterType: @ 810ACC0 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x02, 0x00, 0x00 diff --git a/data/data_810AE24.s b/data/data_810AE24.s index 0ac3eb7..d19e31c 100644 --- a/data/data_810AE24.s +++ b/data/data_810AE24.s @@ -300,7 +300,7 @@ BrokeCurse_810B3C4: .global PreventMeteor_810B3E4 PreventMeteor_810B3E4: -.string "Prevented the meteor~27s collision.\0" +.string "Prevented the meteor{APOSTROPHE}s collision.\0" .align 2,0 .global Fugitive_810B408 @@ -603,7 +603,7 @@ gUnknown_810DE58: @ 810DE58 .global Item_810DE5C Item_810DE5C: - .string "Item:#>46.$i0 \0" + .string "Item:#>46.{ARG_MOVE_ITEM_0} \0" .align 2,0 .global gUnknown_810DE6C @@ -612,7 +612,7 @@ gUnknown_810DE6C: @ 810DE6C .global IQ_810DE70 IQ_810DE70: - .string "IQ:#>52.$m0 \0" + .string "IQ:#>52.{ARG_POKEMON_0} \0" .align 2,0 .global gUnknown_810DE80 @@ -621,7 +621,7 @@ gUnknown_810DE80: @ 810DE80 .global Tactics_810DE84 Tactics_810DE84: - .string "Tactics:#>52.$m0 \0" + .string "Tactics:#>52.{ARG_POKEMON_0} \0" .align 2,0 .global gUnknown_810DE98 @@ -630,7 +630,7 @@ gUnknown_810DE98: @ 810DE98 .global Species_810DE9C Species_810DE9C: - .string "Species:#>54.{COLOR_1 YELLOW}$m0{END_COLOR_TEXT_1} \0" + .string "Species:#>54.{COLOR_1 YELLOW}{ARG_POKEMON_0}{END_COLOR_TEXT_1} \0" .align 2,0 .global gUnknown_810DEB4 @@ -646,14 +646,14 @@ gUnknown_810DEB4: @ 810DEB4 gUnknown_810DEC8: @ 810DEC8 .4byte FriendArea_810DEB8 - .string "#>22.{COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}\0" + .string "#>22.{COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}\0" .align 2,0 .global gUnknown_810DEDC gUnknown_810DEDC: @ 810DEDC .4byte 0x810DECC - .string "{COLOR_1 CYAN}$m0 Pokémon{END_COLOR_TEXT_1} \0" + .string "{COLOR_1 CYAN}{ARG_POKEMON_0} Pokémon{END_COLOR_TEXT_1} \0" .align 2,0 .global gUnknown_810DEF4 @@ -675,7 +675,7 @@ gUnknown_810DF84: @ 810DF84 .global Size_810DF88 Size_810DF88: - .string "Size:#>82.$m0\0" + .string "Size:#>82.{ARG_POKEMON_0}\0" .align 2,0 .global gUnknown_810DF98 @@ -693,7 +693,7 @@ gUnknown_810DFB4: @ 810DFB4 .global ItemPlaceholder_810DFB8 ItemPlaceholder_810DFB8: - .string "#>22.{COLOR_1 CYAN}$i0{END_COLOR_TEXT_1}\0" + .string "#>22.{COLOR_1 CYAN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}\0" .align 2,0 .global gUnknown_810DFC8 @@ -819,7 +819,7 @@ gTactics: @ 8112C14 .global LetsGoTogetherTactic LetsGoTogetherTactic: - .string "Let~27s go together\0" + .string "Let{APOSTROPHE}s go together\0" .align 2,0 @@ -837,7 +837,7 @@ gUnknown_811383C: @ 811383C .global PlaceText PlaceText: - .string "#+Place: $m0\0" + .string "#+Place: {ARG_POKEMON_0}\0" .align 2,0 .global gUnknown_8113850 @@ -846,7 +846,7 @@ gUnknown_8113850: @ 8113850 .global DefeatedbyText DefeatedbyText: - .string "$m1 was defeated by\0" + .string "{ARG_POKEMON_1} was defeated by\0" .global gUnknown_8113868 gUnknown_8113868: @ 8113868 @@ -854,7 +854,7 @@ gUnknown_8113868: @ 8113868 .global Monster_811386C Monster_811386C: - .string "$m1\0" + .string "{ARG_POKEMON_1}\0" .align 2,0 .global gUnknown_8113870 @@ -966,7 +966,7 @@ gUnknown_81139B8: @ 81139B8 .global Item_81139BC Item_81139BC: - .string "Item:#>42.$i0 \0" + .string "Item:#>42.{ARG_MOVE_ITEM_0} \0" .align 2,0 .global gUnknown_81139CC @@ -1213,7 +1213,7 @@ gUnknown_8115A80: @ 8115A80 .global ItemLimitAlsoText_8105A84 ItemLimitAlsoText_8105A84: - .string "Also~2c only $d0 items may be brought\n" + .string "Also{COMMA} only $d0 items may be brought\n" .string "into this dungeon.\n" .string "Please put away $d1 item(s).\0" .align 2,0 @@ -1224,7 +1224,7 @@ gUnknown_8115ADC: @ 8115ADC .global PartyMemberLimitText_8115AE0 PartyMemberLimitText_8115AE0: - .string "Your client~2c $m0~2c could not join\n" + .string "Your client{COMMA} {ARG_POKEMON_0}{COMMA} could not join\n" .string "the team because there are too many\n" .string "members already.\0" .align 2,0 @@ -1235,7 +1235,7 @@ gUnknown_8115B3C: @ 8115B3C .global PartyMemberLimitText_8115B40 PartyMemberLimitText_8115B40: - .string "Also~2c your client~2c $m0~2c could not\n" + .string "Also{COMMA} your client{COMMA} {ARG_POKEMON_0}{COMMA} could not\n" .string "join the team because there are too many\n" .string "members already.\0" .align 2,0 @@ -1246,7 +1246,7 @@ gUnknown_8115BA4: @ 8115BA4 .global SizeLimitText_8115BA8 SizeLimitText_8115BA8: - .string "Your client~2c $m0~2c could not join\n" + .string "Your client{COMMA} {ARG_POKEMON_0}{COMMA} could not join\n" .string "the team because there is no space.\0" .align 2,0 @@ -1256,7 +1256,7 @@ gUnknown_8115BF4: @ 8115BF4 .global SizeLimitText_8115BF8 SizeLimitText_8115BF8: - .string "Also~2c your client~2c $m0~2c could not\n" + .string "Also{COMMA} your client{COMMA} {ARG_POKEMON_0}{COMMA} could not\n" .string "join the team because there is no space.\0" .align 2,0 @@ -1266,9 +1266,9 @@ gUnknown_8115C4C: @ 8115C4C .global MoveReqText_8115C50 MoveReqText_8115C50: - .string "To enter this dungeon~2c the team must have\n" - .string "a Pokémon with the move $i0\n" - .string "or have the Hidden Machine $i0.\0" + .string "To enter this dungeon{COMMA} the team must have\n" + .string "a Pokémon with the move {ARG_MOVE_ITEM_0}\n" + .string "or have the Hidden Machine {ARG_MOVE_ITEM_0}.\0" .align 2,0 .global gUnknown_8115CB8 @@ -1277,9 +1277,9 @@ gUnknown_8115CB8: @ 8115CB8 .global MoveReqText_8115CBC MoveReqText_8115CBC: - .string "Also~2c the team must have a Pokémon with\n" - .string "the move $i0 or have the\n" - .string "Hidden Machine $i0.\0" + .string "Also{COMMA} the team must have a Pokémon with\n" + .string "the move {ARG_MOVE_ITEM_0} or have the\n" + .string "Hidden Machine {ARG_MOVE_ITEM_0}.\0" .align 2,0 .global gUnknown_8115D14 @@ -1288,7 +1288,7 @@ gUnknown_8115D14: @ 8115D14 .global WaterTypeNeeded_8115D18 WaterTypeNeeded_8115D18: - .string "To enter this dungeon~2c the team must have\n" + .string "To enter this dungeon{COMMA} the team must have\n" .string "a Water-type Pokémon.\0" .align 2,0 @@ -1298,7 +1298,7 @@ gUnknown_8115D5C: @ 8115D5C .global AlsoWaterTypeNeeded_8115D60 AlsoWaterTypeNeeded_8115D60: - .string "Also~2c the team must have a Water-type\n" + .string "Also{COMMA} the team must have a Water-type\n" .string "Pokémon.\0" .align 2,0 @@ -1490,13 +1490,13 @@ gUnknown_811617C: @ 811617C .global gUnknown_8116180 gUnknown_8116180: @ 8116180 - .string "#CN" + .string "{COLOR_1 YELLOW_5}" .byte 0x87, 0x45 .string "{END_COLOR_TEXT_1}\0" .global gUnknown_8116188 gUnknown_8116188: @ 8116188 - .string "#CN%s{END_COLOR_TEXT_1}\0" + .string "{COLOR_1 YELLOW_5}%s{END_COLOR_TEXT_1}\0" .align 2,0 .global gUnknown_8116190 @@ -1680,13 +1680,13 @@ gUnknown_81163E4: @ 81163E4 .global gUnknown_81163F0 gUnknown_81163F0: @ 81163F0 - .string "#+However~2c $n0~27s team\n" + .string "#+However{COMMA} $n0{APOSTROPHE}s team\n" .string "#+had too much money already...\0" .align 2,0 .global gUnknown_811642C gUnknown_811642C: @ 811642C - .string "#+However~2c $n0~27s team\n" + .string "#+However{COMMA} $n0{APOSTROPHE}s team\n" .string "#+had too many items already...\0" .align 2,0 .string "pksdir0\0" @@ -1902,7 +1902,7 @@ gUnknown_81167E8: @ 81167E8 .global gUnknown_81167EC gUnknown_81167EC: @ 81167EC .string "#+The rescue rank went up from\n" - .string "#+$i0 to $i1!\0" + .string "#+{ARG_MOVE_ITEM_0} to {ARG_MOVE_ITEM_1}!\0" .align 2,0 .global gUnknown_811681C @@ -1989,11 +1989,11 @@ gUnknown_8117000: @ 8117000 .string "#CWinvalidity{END_COLOR_TEXT_1}\0" .align 2,0 - .string "{COLOR_1 YELLOW_2}scene{END_COLOR_TEXT_1}\0" + .string "{COLOR_1 YELLOW_3}scene{END_COLOR_TEXT_1}\0" .align 2,0 .string "New Game\0" .align 2,0 - .string "{COLOR_1 YELLOW_2}direction{END_COLOR_TEXT_1}\0" + .string "{COLOR_1 YELLOW_3}direction{END_COLOR_TEXT_1}\0" .align 2,0 .string "Western Cave\0" .align 2,0 diff --git a/data/friend_area.inc b/data/friend_area.inc index 09ce66b..eba3b8d 100644 --- a/data/friend_area.inc +++ b/data/friend_area.inc @@ -49,27 +49,27 @@ gUnknown_80DD1A8: @ 80DD1A8 .global gUnknown_80DD1C8 gUnknown_80DD1C8: @ 80DD1C8 - .string "#+The {COLOR_1 GREEN}$i1{END_COLOR_TEXT_1} was\n" + .string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n" .string "#+handed over. \0" .align 2,0 .global gUnknown_80DD1EC gUnknown_80DD1EC: @ 80DD1EC - .string "#+The {COLOR_1 GREEN}$i1{END_COLOR_TEXT_1} was\n" + .string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n" .string "#+handed over.#P" - .string "#+The {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} was\n" + .string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n" .string "#+returned to the Toolbox.\0" .align 2,0 .global gUnknown_80DD240 gUnknown_80DD240: @ 80DD240 - .string "#+The {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} was\n" + .string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n" .string "#+returned to the Toolbox.\0" .align 2,0 .global gUnknown_80DD270 gUnknown_80DD270: @ 80DD270 - .string "#+$m1 left the team to remain\n" + .string "#+{ARG_POKEMON_1} left the team to remain\n" .string "#+on standby in the Friend Area.\0" .align 2,0 @@ -115,7 +115,7 @@ gUnknown_80DD2EC: @ 80DD2EC .global gUnknown_80DD2F8 gUnknown_80DD2F8: @ 80DD2F8 - .string "Item: {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} \0" + .string "Item: {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} \0" .align 2,0 .string "pksdir0\0" .align 2,0 diff --git a/data/friend_area_dialogue.s b/data/friend_area_dialogue.s index 4b3d0f9..a5c557f 100644 --- a/data/friend_area_dialogue.s +++ b/data/friend_area_dialogue.s @@ -24,8 +24,8 @@ gFriendAreaDialogue: @ 813237C .global FriendAreaSleepyEnergy FriendAreaSleepyEnergy: - .string "#+It appears to be a little sleepy~2c\n" - .string "#+but it~27s still full of energy.\0" + .string "#+It appears to be a little sleepy{COMMA}\n" + .string "#+but it{APOSTROPHE}s still full of energy.\0" .align 2,0 .global FriendAreaGummi @@ -41,13 +41,13 @@ gFriendAreaDialogue: @ 813237C .global FriendAreaPensive FriendAreaPensive: - .string "#+It looked pensive for a moment~2c\n" - .string "#+but it~27s grinning widely again.\0" + .string "#+It looked pensive for a moment{COMMA}\n" + .string "#+but it{APOSTROPHE}s grinning widely again.\0" .align 2,0 .global FriendAreaGrin FriendAreaGrin: - .string "#+It~27s looking this way with a grin.\0" + .string "#+It{APOSTROPHE}s looking this way with a grin.\0" .align 2,0 .global FriendAreaEager @@ -58,7 +58,7 @@ gFriendAreaDialogue: @ 813237C .global FriendAreaWorried FriendAreaWorried: - .string "#+It appeared to have been worried~2c\n" + .string "#+It appeared to have been worried{COMMA}\n" .string "#+but seems to have solved it.\0" .align 2,0 @@ -94,8 +94,8 @@ gFriendAreaDialogue: @ 813237C .global FriendAreaStraight FriendAreaStraight: - .string "#+It~27s trying to keep a straight face~2c\n" - .string "#+but it can~27t stop laughing!\0" + .string "#+It{APOSTROPHE}s trying to keep a straight face{COMMA}\n" + .string "#+but it can{APOSTROPHE}t stop laughing!\0" .align 2,0 .global FriendAreaGrinning diff --git a/data/item/item_descriptions.s b/data/item/item_descriptions.s index 8a428e5..e7480bd 100644 --- a/data/item/item_descriptions.s +++ b/data/item/item_descriptions.s @@ -4,175 +4,175 @@ ItemDescriptionNone: .global ItemDescriptionSpike ItemDescriptionSpike: -.string "A throwing item that inflicts damage if#nit hits.\n\0" +.string "A throwing item that inflicts damage if{NEW_LINE}it hits.\n\0" .global ItemDescriptionRock ItemDescriptionRock: -.string "A throwing item that flies in an arc to#nclear obstacles and strike the target.#nIt is not affected by {COLOR_2 CYAN}Pierce{END_COLOR_TEXT_2} or {COLOR_2 CYAN}Long Toss{END_COLOR_TEXT_2}#nstatuses.\n\0" +.string "A throwing item that flies in an arc to{NEW_LINE}clear obstacles and strike the target.{NEW_LINE}It is not affected by {COLOR_2 CYAN}Pierce{END_COLOR_TEXT_2} or {COLOR_2 CYAN}Long Toss{END_COLOR_TEXT_2}{NEW_LINE}statuses.\n\0" .global ItemDescriptionMobileScarf ItemDescriptionMobileScarf: -.string "A hold item that enables the Pokémon to#nmove and attack through walls and on#nmagma~2c etc.#nThe Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} will go down faster#nwhile traveling through walls~2c however.\n\0" +.string "A hold item that enables the Pokémon to{NEW_LINE}move and attack through walls and on{NEW_LINE}magma{COMMA} etc.{NEW_LINE}The Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} will go down faster{NEW_LINE}while traveling through walls{COMMA} however.\n\0" .global ItemDescriptionHealRibbon ItemDescriptionHealRibbon: -.string "A hold item that speeds up the Pokémon~27s#nnatural {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} regeneration.#nThe Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} will go down faster~2c#nhowever.\n\0" +.string "A hold item that speeds up the Pokémon{APOSTROPHE}s{NEW_LINE}natural {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} regeneration.{NEW_LINE}The Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} will go down faster{COMMA}{NEW_LINE}however.\n\0" .global ItemDescriptionTwistBand ItemDescriptionTwistBand: -.string "A hold item that prevents the Pokémon~27s#n{COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2} from going#ndown.\n\0" +.string "A hold item that prevents the Pokémon{APOSTROPHE}s{NEW_LINE}{COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2} from going{NEW_LINE}down.\n\0" .global ItemDescriptionScopeLens ItemDescriptionScopeLens: -.string "A hold item that boosts the Pokémon~27s#ncritical-hit rate for moves and attacks.\n\0" +.string "A hold item that boosts the Pokémon{APOSTROPHE}s{NEW_LINE}critical-hit rate for moves and attacks.\n\0" .global ItemDescriptionPatsyBand ItemDescriptionPatsyBand: -.string "A hold item that boosts the Pokémon~27s#nchances of taking critical hits from#nenemy moves and attacks.\n\0" +.string "A hold item that boosts the Pokémon{APOSTROPHE}s{NEW_LINE}chances of taking critical hits from{NEW_LINE}enemy moves and attacks.\n\0" .global ItemDescriptionNoStickCap ItemDescriptionNoStickCap: -.string "A hold item that prevents the Pokémon~27s#nitems from becoming sticky and gummed#nup.\n\0" +.string "A hold item that prevents the Pokémon{APOSTROPHE}s{NEW_LINE}items from becoming sticky and gummed{NEW_LINE}up.\n\0" .global ItemDescriptionPierceBand ItemDescriptionPierceBand: -.string "A hold item that makes the Pokémon~27s#nthrown items pierce other Pokémon~2c walls~2c#nand obstacles without ever stopping.\n\0" +.string "A hold item that makes the Pokémon{APOSTROPHE}s{NEW_LINE}thrown items pierce other Pokémon{COMMA} walls{COMMA}{NEW_LINE}and obstacles without ever stopping.\n\0" .global ItemDescriptionJoyRibbon ItemDescriptionJoyRibbon: -.string "A hold item that earns the Pokémon Exp.#nPoints when taking damage.\n\0" +.string "A hold item that earns the Pokémon Exp.{NEW_LINE}Points when taking damage.\n\0" .global ItemDescriptionXRaySpecs ItemDescriptionXRaySpecs: -.string "A hold item that enables the Pokémon to#nsee the locations of items and foes.\n\0" +.string "A hold item that enables the Pokémon to{NEW_LINE}see the locations of items and foes.\n\0" .global ItemDescriptionPersimBand ItemDescriptionPersimBand: -.string "A hold item that prevents the Pokémon#nfrom becoming {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2}.\n\0" +.string "A hold item that prevents the Pokémon{NEW_LINE}from becoming {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionPowerBand ItemDescriptionPowerBand: -.string "A hold item that boosts the Pokémon~27s#n{COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}.\n\0" +.string "A hold item that boosts the Pokémon{APOSTROPHE}s{NEW_LINE}{COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionPechaScarf ItemDescriptionPechaScarf: -.string "A hold item that prevents the Pokémon#nfrom being {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2} or {COLOR_2 CYAN}badly poisoned{END_COLOR_TEXT_2}.\n\0" +.string "A hold item that prevents the Pokémon{NEW_LINE}from being {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2} or {COLOR_2 CYAN}badly poisoned{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionInsomniscope ItemDescriptionInsomniscope: -.string "A hold item that prevents the Pokémon#nfrom going to {COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}~2c {COLOR_2 CYAN}napping{END_COLOR_TEXT_2}~2c having#na {COLOR_2 CYAN}nightmare{END_COLOR_TEXT_2}~2c or {COLOR_2 CYAN}yawning{END_COLOR_TEXT_2}.\n\0" +.string "A hold item that prevents the Pokémon{NEW_LINE}from going to {COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}{COMMA} {COLOR_2 CYAN}napping{END_COLOR_TEXT_2}{COMMA} having{NEW_LINE}a {COLOR_2 CYAN}nightmare{END_COLOR_TEXT_2}{COMMA} or {COLOR_2 CYAN}yawning{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionWarpScarf ItemDescriptionWarpScarf: -.string "A hold item that occasionally warps the#nPokémon to another place on the same#nfloor.\n\0" +.string "A hold item that occasionally warps the{NEW_LINE}Pokémon to another place on the same{NEW_LINE}floor.\n\0" .global ItemDescriptionTightBelt ItemDescriptionTightBelt: -.string "A hold item that prevents the Pokémon~27s#n{COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} from going down each turn.\n\0" +.string "A hold item that prevents the Pokémon{APOSTROPHE}s{NEW_LINE}{COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} from going down each turn.\n\0" .global ItemDescriptionSneakScarf ItemDescriptionSneakScarf: -.string "A hold item that prevents the Pokémon#nfrom awakening sleeping foes.#nIt only works against foes that are asleep#nto begin with.\n\0" +.string "A hold item that prevents the Pokémon{NEW_LINE}from awakening sleeping foes.{NEW_LINE}It only works against foes that are asleep{NEW_LINE}to begin with.\n\0" .global ItemDescriptionGoldRibbon ItemDescriptionGoldRibbon: -.string "An item that has no effect even if it is#nheld by a Pokémon.#nIt can be sold for a good price.\n\0" +.string "An item that has no effect even if it is{NEW_LINE}held by a Pokémon.{NEW_LINE}It can be sold for a good price.\n\0" .global ItemDescriptionGoggleSpecs ItemDescriptionGoggleSpecs: -.string "A hold item that improves the Pokémon~27s#nvision.#nIt reveals hidden traps and {COLOR_2 CYAN}invisible{END_COLOR_TEXT_2}#nPokémon.\n\0" +.string "A hold item that improves the Pokémon{APOSTROPHE}s{NEW_LINE}vision.{NEW_LINE}It reveals hidden traps and {COLOR_2 CYAN}invisible{END_COLOR_TEXT_2}{NEW_LINE}Pokémon.\n\0" .global ItemDescriptionDietRibbon ItemDescriptionDietRibbon: -.string "A hold item that changes the Pokémon~27s#nstatus to {COLOR_2 CYAN}Hungry Pal{END_COLOR_TEXT_2} and prevents#nits {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} from filling.#nIf the team leader is holding it~2c its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}#nwill go down faster.\n\0" +.string "A hold item that changes the Pokémon{APOSTROPHE}s{NEW_LINE}status to {COLOR_2 CYAN}Hungry Pal{END_COLOR_TEXT_2} and prevents{NEW_LINE}its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} from filling.{NEW_LINE}If the team leader is holding it{COMMA} its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}{NEW_LINE}will go down faster.\n\0" .global ItemDescriptionTrapScarf ItemDescriptionTrapScarf: -.string "A hold item that prevents traps from#ngoing off if they are stepped on by the#nPokémon.\n\0" +.string "A hold item that prevents traps from{NEW_LINE}going off if they are stepped on by the{NEW_LINE}Pokémon.\n\0" .global ItemDescriptionRacketBand ItemDescriptionRacketBand: -.string "A hold item that helps awaken hostile#nsleeping Pokémon.#nIt only works against Pokémon that were#nasleep from the start.\n\0" +.string "A hold item that helps awaken hostile{NEW_LINE}sleeping Pokémon.{NEW_LINE}It only works against Pokémon that were{NEW_LINE}asleep from the start.\n\0" .global ItemDescriptionDefScarf ItemDescriptionDefScarf: -.string "A hold item that boosts the Pokémon~27s#n{COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}.\n\0" +.string "A hold item that boosts the Pokémon{APOSTROPHE}s{NEW_LINE}{COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionStaminaBand ItemDescriptionStaminaBand: -.string "A hold item that slows how quickly the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} goes down.\n\0" +.string "A hold item that slows how quickly the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} goes down.\n\0" .global ItemDescriptionPlainRibbon ItemDescriptionPlainRibbon: -.string "An item that has no effect~2c even if it is#nheld by a Pokémon.\n\0" +.string "An item that has no effect{COMMA} even if it is{NEW_LINE}held by a Pokémon.\n\0" .global ItemDescriptionSpecialBand ItemDescriptionSpecialBand: -.string "A hold item that boosts the Pokémon~27s#n{COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}.\n\0" +.string "A hold item that boosts the Pokémon{APOSTROPHE}s{NEW_LINE}{COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionZincBand ItemDescriptionZincBand: -.string "A hold item that boosts the Pokémon~27s#n{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}.\n\0" +.string "A hold item that boosts the Pokémon{APOSTROPHE}s{NEW_LINE}{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionDetectBand ItemDescriptionDetectBand: -.string "A hold item that boosts the Pokémon~27s#n{COLOR_2 YELLOW}Evasion{END_COLOR_TEXT_2}.\n\0" +.string "A hold item that boosts the Pokémon{APOSTROPHE}s{NEW_LINE}{COLOR_2 YELLOW}Evasion{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionAlertSpecs ItemDescriptionAlertSpecs: -.string "A hold item that prevents the Pokémon#nfrom having its held item snatched away#nor swatted down.\n\0" +.string "A hold item that prevents the Pokémon{NEW_LINE}from having its held item snatched away{NEW_LINE}or swatted down.\n\0" .global ItemDescriptionDodgeScarf ItemDescriptionDodgeScarf: -.string "A hold item that prevents any thrown#nitem from hitting the Pokémon.\n\0" +.string "A hold item that prevents any thrown{NEW_LINE}item from hitting the Pokémon.\n\0" .global ItemDescriptionBounceBand ItemDescriptionBounceBand: -.string "A hold item that makes thrown items#nbounce off the Pokémon.\n\0" +.string "A hold item that makes thrown items{NEW_LINE}bounce off the Pokémon.\n\0" .global ItemDescriptionCurveBand ItemDescriptionCurveBand: -.string "A hold item that makes thrown items#nbounce off walls and fly sideways.#nIt has no effect if the Pokémon~27s status#nis {COLOR_2 CYAN}Pierce{END_COLOR_TEXT_2} or if a rock is thrown.\n\0" +.string "A hold item that makes thrown items{NEW_LINE}bounce off walls and fly sideways.{NEW_LINE}It has no effect if the Pokémon{APOSTROPHE}s status{NEW_LINE}is {COLOR_2 CYAN}Pierce{END_COLOR_TEXT_2} or if a rock is thrown.\n\0" .global ItemDescriptionWhiffSpecs ItemDescriptionWhiffSpecs: -.string "A hold item that prevents items thrown#nby the Pokémon from hitting another#nPokémon.\n\0" +.string "A hold item that prevents items thrown{NEW_LINE}by the Pokémon from hitting another{NEW_LINE}Pokémon.\n\0" .global ItemDescriptionNoAimScope ItemDescriptionNoAimScope: -.string "A hold item that causes items thrown#nby the Pokémon to fly wildly in any#ndirection.\n\0" +.string "A hold item that causes items thrown{NEW_LINE}by the Pokémon to fly wildly in any{NEW_LINE}direction.\n\0" .global ItemDescriptionLockonSpecs ItemDescriptionLockonSpecs: -.string "A hold item that raises the accuracy of#nitems thrown at foes by the Pokémon.\n\0" +.string "A hold item that raises the accuracy of{NEW_LINE}items thrown at foes by the Pokémon.\n\0" .global ItemDescriptionMunchBelt ItemDescriptionMunchBelt: -.string "A hold item that slightly boosts the#nPokémon~27s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}.#nHowever~2c it also makes the Pokémon~27s#n{COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} go down faster.\n\0" +.string "A hold item that slightly boosts the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}.{NEW_LINE}However{COMMA} it also makes the Pokémon{APOSTROPHE}s{NEW_LINE}{COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} go down faster.\n\0" .global ItemDescriptionPassScarf ItemDescriptionPassScarf: -.string "A hold item that can enable the#nPokémon to pass off the effects of#nattacks and certain kinds of hostile moves#nto a Pokémon next to it. However~2c it also#nmakes the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} go down.\n\0" +.string "A hold item that can enable the{NEW_LINE}Pokémon to pass off the effects of{NEW_LINE}attacks and certain kinds of hostile moves{NEW_LINE}to a Pokémon next to it. However{COMMA} it also{NEW_LINE}makes the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} go down.\n\0" .global ItemDescriptionWeatherBand ItemDescriptionWeatherBand: -.string "A hold item that prevents the Pokémon#nfrom feeling the effects of the weather.\n\0" +.string "A hold item that prevents the Pokémon{NEW_LINE}from feeling the effects of the weather.\n\0" .global ItemDescriptionFriendBow ItemDescriptionFriendBow: -.string "When held by the team leader~2c this hold#nitem makes it easier to recruit defeated#nPokémon into the rescue team.\n\0" +.string "When held by the team leader{COMMA} this hold{NEW_LINE}item makes it easier to recruit defeated{NEW_LINE}Pokémon into the rescue team.\n\0" .global ItemDescriptionBeautyScarf ItemDescriptionBeautyScarf: -.string "A fashionable accessory for dressing up.#nIt enables a certain kind of Pokémon to#nevolve.#nGive it to the Pokémon when it~27s ready to#nevolve.\n\0" +.string "A fashionable accessory for dressing up.{NEW_LINE}It enables a certain kind of Pokémon to{NEW_LINE}evolve.{NEW_LINE}Give it to the Pokémon when it{APOSTROPHE}s ready to{NEW_LINE}evolve.\n\0" .global ItemDescriptionSunRibbon ItemDescriptionSunRibbon: -.string "A ribbon infused with sunshine.#nIt enables a certain kind of Pokémon to#nevolve.#nGive it to the Pokémon when it~27s ready to#nevolve.\n\0" +.string "A ribbon infused with sunshine.{NEW_LINE}It enables a certain kind of Pokémon to{NEW_LINE}evolve.{NEW_LINE}Give it to the Pokémon when it{APOSTROPHE}s ready to{NEW_LINE}evolve.\n\0" .global ItemDescriptionLunarRibbon ItemDescriptionLunarRibbon: -.string "A ribbon filled with moonlight.#nIt enables a certain kind of Pokémon to#nevolve.#nGive it to the Pokémon when it~27s ready to#nevolve.\n\0" +.string "A ribbon filled with moonlight.{NEW_LINE}It enables a certain kind of Pokémon to{NEW_LINE}evolve.{NEW_LINE}Give it to the Pokémon when it{APOSTROPHE}s ready to{NEW_LINE}evolve.\n\0" .global ItemDescriptionRingD ItemDescriptionRingD: @@ -188,627 +188,627 @@ ItemDescriptionRingF: .global ItemDescriptionHealSeed ItemDescriptionHealSeed: -.string "A food item that heals all status problems.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that heals all status problems.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionWishStone ItemDescriptionWishStone: -.string "A mysterious stone shaped like a musical#nnote.#nIt is said to make a wish come true if it#nis held while exploring the depths of#n{COLOR_1 YELLOW_3}Wish Cave{END_COLOR_TEXT_1}.\n\0" +.string "A mysterious stone shaped like a musical{NEW_LINE}note.{NEW_LINE}It is said to make a wish come true if it{NEW_LINE}is held while exploring the depths of{NEW_LINE}{COLOR_1 YELLOW_4}Wish Cave{END_COLOR_TEXT_1}.\n\0" .global ItemDescriptionOranBerry ItemDescriptionOranBerry: -.string "A food item that restores {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that restores {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionSitrusBerry ItemDescriptionSitrusBerry: -.string "A food item that restores {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.#nIf the Pokémon has full {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}~2c eating this#nitem will slightly boost its {COLOR_2 YELLOW}Maximum HP{END_COLOR_TEXT_2}.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that restores {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.{NEW_LINE}If the Pokémon has full {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}{COMMA} eating this{NEW_LINE}item will slightly boost its {COLOR_2 YELLOW}Maximum HP{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionEyedropSeed ItemDescriptionEyedropSeed: -.string "A food item that changes the Pokémon~27s#nstatus to {COLOR_2 CYAN}Eyedrops{END_COLOR_TEXT_2}.#nIt reveals hidden traps and {COLOR_2 CYAN}invisible{END_COLOR_TEXT_2}#nPokémon.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that changes the Pokémon{APOSTROPHE}s{NEW_LINE}status to {COLOR_2 CYAN}Eyedrops{END_COLOR_TEXT_2}.{NEW_LINE}It reveals hidden traps and {COLOR_2 CYAN}invisible{END_COLOR_TEXT_2}{NEW_LINE}Pokémon.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionReviverSeed ItemDescriptionReviverSeed: -.string "An item that could revive a fainted#nPokémon.#nIt becomes a Plain Seed after use.#nIf held~2c it revives only the holder.#nIt can only be used by an {COLOR_2 YELLOW}Item Master{END_COLOR_TEXT_2}.\n\0" +.string "An item that could revive a fainted{NEW_LINE}Pokémon.{NEW_LINE}It becomes a Plain Seed after use.{NEW_LINE}If held{COMMA} it revives only the holder.{NEW_LINE}It can only be used by an {COLOR_2 YELLOW}Item Master{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionBlinkerSeed ItemDescriptionBlinkerSeed: -.string "A food item that gives the Pokémon#n{COLOR_2 CYAN}Blinker{END_COLOR_TEXT_2} status.#nIt makes other Pokémon~2c unclaimed#nitems~2c and the ground impossible to see.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that gives the Pokémon{NEW_LINE}{COLOR_2 CYAN}Blinker{END_COLOR_TEXT_2} status.{NEW_LINE}It makes other Pokémon{COMMA} unclaimed{NEW_LINE}items{COMMA} and the ground impossible to see.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionDoomSeed ItemDescriptionDoomSeed: -.string "A food item that lowers the Pokémon~27s#n{COLOR_2 YELLOW}level{END_COLOR_TEXT_2} by one.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that lowers the Pokémon{APOSTROPHE}s{NEW_LINE}{COLOR_2 YELLOW}level{END_COLOR_TEXT_2} by one.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionAllureSeed ItemDescriptionAllureSeed: -.string "A food item that gives the Pokémon#n{COLOR_2 CYAN}Cross-Eyed{END_COLOR_TEXT_2} status.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that gives the Pokémon{NEW_LINE}{COLOR_2 CYAN}Cross-Eyed{END_COLOR_TEXT_2} status.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionLifeSeed ItemDescriptionLifeSeed: -.string "A food item that slightly boosts the#nPokémon~27s {COLOR_2 YELLOW}Maximum HP{END_COLOR_TEXT_2}.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that slightly boosts the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Maximum HP{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionRawstBerry ItemDescriptionRawstBerry: -.string "A food item that heals the Pokémon~27s {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that heals the Pokémon{APOSTROPHE}s {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionHungerSeed ItemDescriptionHungerSeed: -.string "A food item that slightly lowers the#nPokémon~27s maximum {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} size.#nIf used by a Pokémon other than the#nleader~2c its status changes to {COLOR_2 CYAN}Hungry Pal{END_COLOR_TEXT_2}.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that slightly lowers the{NEW_LINE}Pokémon{APOSTROPHE}s maximum {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} size.{NEW_LINE}If used by a Pokémon other than the{NEW_LINE}leader{COMMA} its status changes to {COLOR_2 CYAN}Hungry Pal{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionQuickSeed ItemDescriptionQuickSeed: -.string "A food item that boosts the Pokémon~27s#n{COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} by one level.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that boosts the Pokémon{APOSTROPHE}s{NEW_LINE}{COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} by one level.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionPechaBerry ItemDescriptionPechaBerry: -.string "A food item that heals the Pokémon when#n{COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2} or {COLOR_2 CYAN}badly poisoned{END_COLOR_TEXT_2}.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that heals the Pokémon when{NEW_LINE}{COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2} or {COLOR_2 CYAN}badly poisoned{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionCheriBerry ItemDescriptionCheriBerry: -.string "A food item that heals the Pokémon from#n{COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that heals the Pokémon from{NEW_LINE}{COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionTotterSeed ItemDescriptionTotterSeed: -.string "A food item that makes the Pokémon#n{COLOR_2 CYAN}confused{END_COLOR_TEXT_2}.#nThe Pokémon~27s movements turn erratic~2c#nand its attacks and moves may hit friends.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that makes the Pokémon{NEW_LINE}{COLOR_2 CYAN}confused{END_COLOR_TEXT_2}.{NEW_LINE}The Pokémon{APOSTROPHE}s movements turn erratic{COMMA}{NEW_LINE}and its attacks and moves may hit friends.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionSleepSeed ItemDescriptionSleepSeed: -.string "A food item that makes the user#n{COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}.#nThe Pokémon will be unable to do anything.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that makes the user{NEW_LINE}{COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}.{NEW_LINE}The Pokémon will be unable to do anything.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionPlainSeed ItemDescriptionPlainSeed: -.string "A food item that has no special effect.#nIt does slightly fill the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that has no special effect.{NEW_LINE}It does slightly fill the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionWarpSeed ItemDescriptionWarpSeed: -.string "A food item that warps the Pokémon to#na different place on the same floor.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that warps the Pokémon to{NEW_LINE}a different place on the same floor.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionBlastSeed ItemDescriptionBlastSeed: -.string "A food item that makes the Pokémon#nbreathe highly damaging fire.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that makes the Pokémon{NEW_LINE}breathe highly damaging fire.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionGinseng ItemDescriptionGinseng: -.string "A drink that boosts the power of the#nPokémon~27s set move.#nIt may not have any effect on certain#nkinds of moves.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A drink that boosts the power of the{NEW_LINE}Pokémon{APOSTROPHE}s set move.{NEW_LINE}It may not have any effect on certain{NEW_LINE}kinds of moves.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionJoySeed ItemDescriptionJoySeed: -.string "A food item that raises the Pokémon~27s#n{COLOR_2 YELLOW}level{END_COLOR_TEXT_2} by one.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that raises the Pokémon{APOSTROPHE}s{NEW_LINE}{COLOR_2 YELLOW}level{END_COLOR_TEXT_2} by one.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionChestoBerry ItemDescriptionChestoBerry: -.string "A food item that causes the Pokémon to#nbecome {COLOR_2 CYAN}sleepless{END_COLOR_TEXT_2}.#nThe Pokémon will not be able to go to#n{COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that causes the Pokémon to{NEW_LINE}become {COLOR_2 CYAN}sleepless{END_COLOR_TEXT_2}.{NEW_LINE}The Pokémon will not be able to go to{NEW_LINE}{COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionStunSeed ItemDescriptionStunSeed: -.string "A food item that causes the Pokémon to#nbecome {COLOR_2 CYAN}petrified{END_COLOR_TEXT_2}.#nThe Pokémon will be unable to do anything#nuntil it takes damage.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A food item that causes the Pokémon to{NEW_LINE}become {COLOR_2 CYAN}petrified{END_COLOR_TEXT_2}.{NEW_LINE}The Pokémon will be unable to do anything{NEW_LINE}until it takes damage.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionMaxElixir ItemDescriptionMaxElixir: -.string "A drink that completely restores the#n{COLOR_2 YELLOW}PP{END_COLOR_TEXT_2} of all the Pokémon~27s moves.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A drink that completely restores the{NEW_LINE}{COLOR_2 YELLOW}PP{END_COLOR_TEXT_2} of all the Pokémon{APOSTROPHE}s moves.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionProtein ItemDescriptionProtein: -.string "A drink that boosts the Pokémon~27s#n{COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A drink that boosts the Pokémon{APOSTROPHE}s{NEW_LINE}{COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionCalcium ItemDescriptionCalcium: -.string "A drink that boosts the Pokémon~27s#n{COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A drink that boosts the Pokémon{APOSTROPHE}s{NEW_LINE}{COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionIron ItemDescriptionIron: -.string "A drink that boosts the Pokémon~27s#n{COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A drink that boosts the Pokémon{APOSTROPHE}s{NEW_LINE}{COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionZinc ItemDescriptionZinc: -.string "A drink that boosts the Pokémon~27s#n{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}.#nIt also slightly fills the Pokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" +.string "A drink that boosts the Pokémon{APOSTROPHE}s{NEW_LINE}{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly fills the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionApple ItemDescriptionApple: -.string "A food item that somewhat fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nEating this when its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} is full will#nslightly enlarge its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} size.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}Eating this when its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} is full will{NEW_LINE}slightly enlarge its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} size.\n\0" .global ItemDescriptionBigApple ItemDescriptionBigApple: -.string "A food item that amply fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nEating this when its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} is full will#nslightly enlarge its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} size.\n\0" +.string "A food item that amply fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}Eating this when its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} is full will{NEW_LINE}slightly enlarge its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} size.\n\0" .global ItemDescriptionGrimyFood ItemDescriptionGrimyFood: -.string "A food item that somewhat fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nHowever~2c it will cause a variety of#nstatus problems.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}However{COMMA} it will cause a variety of{NEW_LINE}status problems.\n\0" .global ItemDescriptionHugeApple ItemDescriptionHugeApple: -.string "A food item that completely fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nIt also slightly enlarges the {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} size.\n\0" +.string "A food item that completely fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}It also slightly enlarges the {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} size.\n\0" .global ItemDescriptionWhiteGummi ItemDescriptionWhiteGummi: -.string "A food item that somewhat fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nWhen given to a rescue team member~2c#nit raises the Pokémon~27s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.#nNormal-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member{COMMA}{NEW_LINE}it raises the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Normal-type Pokémon like it the best.\n\0" .global ItemDescriptionRedGummi ItemDescriptionRedGummi: -.string "A food item that somewhat fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nWhen given to a rescue team member~2c#nit raises the Pokémon~27s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.#nFire-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member{COMMA}{NEW_LINE}it raises the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Fire-type Pokémon like it the best.\n\0" .global ItemDescriptionBlueGummi ItemDescriptionBlueGummi: -.string "A food item that somewhat fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nWhen given to a rescue team member~2c#nit raises the Pokémon~27s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.#nWater-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member{COMMA}{NEW_LINE}it raises the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Water-type Pokémon like it the best.\n\0" .global ItemDescriptionGrassGummi ItemDescriptionGrassGummi: -.string "A food item that somewhat fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nWhen given to a rescue team member~2c#nit raises the Pokémon~27s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.#nGrass-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member{COMMA}{NEW_LINE}it raises the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Grass-type Pokémon like it the best.\n\0" .global ItemDescriptionYellowGummi ItemDescriptionYellowGummi: -.string "A food item that somewhat fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nWhen given to a rescue team member~2c#nit raises the Pokémon~27s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.#nElectric-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member{COMMA}{NEW_LINE}it raises the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Electric-type Pokémon like it the best.\n\0" .global ItemDescriptionClearGummi ItemDescriptionClearGummi: -.string "A food item that somewhat fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nWhen given to a rescue team member~2c#nit raises the Pokémon~27s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.#nIce-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member{COMMA}{NEW_LINE}it raises the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Ice-type Pokémon like it the best.\n\0" .global ItemDescriptionOrangeGummi ItemDescriptionOrangeGummi: -.string "A food item that somewhat fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nWhen given to a rescue team member~2c#nit raises the Pokémon~27s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.#nFighting-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member{COMMA}{NEW_LINE}it raises the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Fighting-type Pokémon like it the best.\n\0" .global ItemDescriptionPinkGummi ItemDescriptionPinkGummi: -.string "A food item that somewhat fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nWhen given to a rescue team member~2c#nit raises the Pokémon~27s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.#nPoison-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member{COMMA}{NEW_LINE}it raises the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Poison-type Pokémon like it the best.\n\0" .global ItemDescriptionBrownGummi ItemDescriptionBrownGummi: -.string "A food item that somewhat fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nWhen given to a rescue team member~2c#nit raises the Pokémon~27s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.#nGround-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member{COMMA}{NEW_LINE}it raises the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Ground-type Pokémon like it the best.\n\0" .global ItemDescriptionSkyGummi ItemDescriptionSkyGummi: -.string "A food item that somewhat fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nWhen given to a rescue team member~2c#nit raises the Pokémon~27s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.#nFlying-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member{COMMA}{NEW_LINE}it raises the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Flying-type Pokémon like it the best.\n\0" .global ItemDescriptionGoldGummi ItemDescriptionGoldGummi: -.string "A food item that somewhat fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nWhen given to a rescue team member~2c#nit raises the Pokémon~27s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.#nPsychic-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member{COMMA}{NEW_LINE}it raises the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Psychic-type Pokémon like it the best.\n\0" .global ItemDescriptionGreenGummi ItemDescriptionGreenGummi: -.string "A food item that somewhat fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nWhen given to a rescue team member~2c#nit raises the Pokémon~27s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.#nBug-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member{COMMA}{NEW_LINE}it raises the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Bug-type Pokémon like it the best.\n\0" .global ItemDescriptionGrayGummi ItemDescriptionGrayGummi: -.string "A food item that somewhat fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nWhen given to a rescue team member~2c#nit raises the Pokémon~27s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.#nRock-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member{COMMA}{NEW_LINE}it raises the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Rock-type Pokémon like it the best.\n\0" .global ItemDescriptionPurpleGummi ItemDescriptionPurpleGummi: -.string "A food item that somewhat fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nWhen given to a rescue team member~2c#nit raises the Pokémon~27s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.#nGhost-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member{COMMA}{NEW_LINE}it raises the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Ghost-type Pokémon like it the best.\n\0" .global ItemDescriptionRoyalGummi ItemDescriptionRoyalGummi: -.string "A food item that somewhat fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nWhen given to a rescue team member~2c#nit raises the Pokémon~27s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.#nDragon-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member{COMMA}{NEW_LINE}it raises the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Dragon-type Pokémon like it the best.\n\0" .global ItemDescriptionBlackGummi ItemDescriptionBlackGummi: -.string "A food item that somewhat fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nWhen given to a rescue team member~2c#nit raises the Pokémon~27s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.#nDark-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member{COMMA}{NEW_LINE}it raises the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Dark-type Pokémon like it the best.\n\0" .global ItemDescriptionSilverGummi ItemDescriptionSilverGummi: -.string "A food item that somewhat fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nWhen given to a rescue team member~2c#nit raises the Pokémon~27s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.#nSteel-type Pokémon like it the best.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}When given to a rescue team member{COMMA}{NEW_LINE}it raises the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.{NEW_LINE}Steel-type Pokémon like it the best.\n\0" .global ItemDescriptionBanana ItemDescriptionBanana: -.string "A rare food item that somewhat fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nEating this when its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} is full will#nslightly enlarge its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} size.#nIt is occasionally found inside walls.\n\0" +.string "A rare food item that somewhat fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}Eating this when its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} is full will{NEW_LINE}slightly enlarge its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} size.{NEW_LINE}It is occasionally found inside walls.\n\0" .global ItemDescriptionChestnut ItemDescriptionChestnut: -.string "A food item that somewhat fills the#nPokémon~27s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.#nMankey love to eat this.\n\0" +.string "A food item that somewhat fills the{NEW_LINE}Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2}.{NEW_LINE}Mankey love to eat this.\n\0" .global ItemDescriptionPoke ItemDescriptionPoke: -.string "Money used at shops~2c etc.\n\0" +.string "Money used at shops{COMMA} etc.\n\0" .global ItemDescriptionEvolutionItemSingle ItemDescriptionEvolutionItemSingle: -.string "It enables a certain kind of Pokémon to#nevolve.#nGive it to the Pokémon when it~27s ready to#nevolve.\n\0" +.string "It enables a certain kind of Pokémon to{NEW_LINE}evolve.{NEW_LINE}Give it to the Pokémon when it{APOSTROPHE}s ready to{NEW_LINE}evolve.\n\0" .global ItemDescriptionEvolutionItemMulti ItemDescriptionEvolutionItemMulti: -.string "It enables certain kinds of Pokémon to#nevolve.#nGive it to the Pokémon when it~27s ready to#nevolve.\n\0" +.string "It enables certain kinds of Pokémon to{NEW_LINE}evolve.{NEW_LINE}Give it to the Pokémon when it{APOSTROPHE}s ready to{NEW_LINE}evolve.\n\0" .global ItemDescriptionIcePart ItemDescriptionIcePart: -.string "An item that was guarded by #CNRegice{END_COLOR_TEXT_1}.#nIt may be related to this saying about the#n{COLOR_1 YELLOW_3}Buried Relic{END_COLOR_TEXT_1}: ~93Three parts guarded by#nthree servants. When they are one again~2c#na mirage shall appear to the bearer.~94\n\0" +.string "An item that was guarded by {COLOR_1 YELLOW_5}Regice{END_COLOR_TEXT_1}.{NEW_LINE}It may be related to this saying about the{NEW_LINE}{COLOR_1 YELLOW_4}Buried Relic{END_COLOR_TEXT_1}: {QUOTE_START}Three parts guarded by{NEW_LINE}three servants. When they are one again{COMMA}{NEW_LINE}a mirage shall appear to the bearer.{QUOTE_END}\n\0" .global ItemDescriptionSteelPart ItemDescriptionSteelPart: -.string "A mysterious item that was guarded by#n#CNRegisteel{END_COLOR_TEXT_1}.#n#CNRegirock{END_COLOR_TEXT_1} and #CNRegice{END_COLOR_TEXT_1} also guarded parts#nin similar fashion.#nWhat is the secret behind these parts?\n\0" +.string "A mysterious item that was guarded by{NEW_LINE}{COLOR_1 YELLOW_5}Registeel{END_COLOR_TEXT_1}.{NEW_LINE}{COLOR_1 YELLOW_5}Regirock{END_COLOR_TEXT_1} and {COLOR_1 YELLOW_5}Regice{END_COLOR_TEXT_1} also guarded parts{NEW_LINE}in similar fashion.{NEW_LINE}What is the secret behind these parts?\n\0" .global ItemDescriptionRockPart ItemDescriptionRockPart: -.string "A mysterious item that was jealously#nguarded by #CNRegirock{END_COLOR_TEXT_1}.#nHow it is to be used remains unknown~2c#nhowever.\n\0" +.string "A mysterious item that was jealously{NEW_LINE}guarded by {COLOR_1 YELLOW_5}Regirock{END_COLOR_TEXT_1}.{NEW_LINE}How it is to be used remains unknown{COMMA}{NEW_LINE}however.\n\0" .global ItemDescriptionMusicBox ItemDescriptionMusicBox: -.string "An enchanting music box that plays a#nbeautiful melody.#nIt is said to draw something special to it#nwhen it is kept close by.\n\0" +.string "An enchanting music box that plays a{NEW_LINE}beautiful melody.{NEW_LINE}It is said to draw something special to it{NEW_LINE}when it is kept close by.\n\0" .global ItemDescriptionKey ItemDescriptionKey: -.string "A key that unlocks a door inside a#ndungeon.\n\0" +.string "A key that unlocks a door inside a{NEW_LINE}dungeon.\n\0" .global ItemDescriptionUsedTM ItemDescriptionUsedTM: -.string "The remains of the item $i0#nafter use.#nIt can be restored using the move {COLOR_2 GREEN}Recycle{END_COLOR_TEXT_2}.#nThis item cannot be placed in storage.\n\0" +.string "The remains of the item {ARG_MOVE_ITEM_0}{NEW_LINE}after use.{NEW_LINE}It can be restored using the move {COLOR_2 GREEN}Recycle{END_COLOR_TEXT_2}.{NEW_LINE}This item cannot be placed in storage.\n\0" .global ItemDescriptionFocusPunch ItemDescriptionFocusPunch: -.string "Teaches the move {COLOR_2 GREEN}Focus Punch{END_COLOR_TEXT_2}.#nThe user~27s status changes to {COLOR_2 CYAN}Focus Punch{END_COLOR_TEXT_2}~2c#nand it attacks on the next turn.#nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Focus Punch{END_COLOR_TEXT_2}.{NEW_LINE}The user{APOSTROPHE}s status changes to {COLOR_2 CYAN}Focus Punch{END_COLOR_TEXT_2}{COMMA}{NEW_LINE}and it attacks on the next turn.{NEW_LINE}It is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\n\0" .global ItemDescriptionDragonClaw ItemDescriptionDragonClaw: -.string "Teaches the move {COLOR_2 GREEN}Dragon Claw{END_COLOR_TEXT_2}.#nIt inflicts damage on the target.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Dragon Claw{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.\n\0" .global ItemDescriptionWaterPulse ItemDescriptionWaterPulse: -.string "Teaches the move {COLOR_2 GREEN}Water Pulse{END_COLOR_TEXT_2}.#nIt inflicts damage on the target even at a#ndistance.#nIt may also leave the target {COLOR_2 CYAN}confused{END_COLOR_TEXT_2}.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Water Pulse{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance.{NEW_LINE}It may also leave the target {COLOR_2 CYAN}confused{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionCalmMind ItemDescriptionCalmMind: -.string "Teaches the move {COLOR_2 GREEN}Calm Mind{END_COLOR_TEXT_2}.#nIt raises the Pokémon~27s {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}#nand {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by one level.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Calm Mind{END_COLOR_TEXT_2}.{NEW_LINE}It raises the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}{NEW_LINE}and {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by one level.\n\0" .global ItemDescriptionRoar ItemDescriptionRoar: -.string "Teaches the move {COLOR_2 GREEN}Roar{END_COLOR_TEXT_2}.#nIt sends the target flying.#nIf the foe hits a wall or another#nPokémon~2c it sustains damage.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Roar{END_COLOR_TEXT_2}.{NEW_LINE}It sends the target flying.{NEW_LINE}If the foe hits a wall or another{NEW_LINE}Pokémon{COMMA} it sustains damage.\n\0" .global ItemDescriptionToxic ItemDescriptionToxic: -.string "Teaches the move {COLOR_2 GREEN}Toxic{END_COLOR_TEXT_2}.#nIt {COLOR_2 CYAN}badly poisons{END_COLOR_TEXT_2} the foe Pokémon.#nIf a Pokémon is {COLOR_2 CYAN}badly poisoned{END_COLOR_TEXT_2}~2c it#nsustains damage over several turns.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Toxic{END_COLOR_TEXT_2}.{NEW_LINE}It {COLOR_2 CYAN}badly poisons{END_COLOR_TEXT_2} the foe Pokémon.{NEW_LINE}If a Pokémon is {COLOR_2 CYAN}badly poisoned{END_COLOR_TEXT_2}{COMMA} it{NEW_LINE}sustains damage over several turns.\n\0" .global ItemDescriptionHail ItemDescriptionHail: -.string "An item that changes the dungeon floor~27s#nweather to {COLOR_2 CYAN}Hail{END_COLOR_TEXT_2} for several turns.#n#n#nRange: All Pokémon on floor\n\0" +.string "An item that changes the dungeon floor{APOSTROPHE}s{NEW_LINE}weather to {COLOR_2 CYAN}Hail{END_COLOR_TEXT_2} for several turns.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: All Pokémon on floor\n\0" .global ItemDescriptionBulkUp ItemDescriptionBulkUp: -.string "Teaches the move {COLOR_2 GREEN}Bulk Up{END_COLOR_TEXT_2}.#nIt boosts the user~27s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}#nby one level.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Bulk Up{END_COLOR_TEXT_2}.{NEW_LINE}It boosts the user{APOSTROPHE}s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}{NEW_LINE}by one level.\n\0" .global ItemDescriptionBulletSeed ItemDescriptionBulletSeed: -.string "Teaches the move {COLOR_2 GREEN}Bullet Seed{END_COLOR_TEXT_2}.#nIt inflicts damage on the target even at a#ndistance.#nIt hits two to five times per use.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Bullet Seed{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance.{NEW_LINE}It hits two to five times per use.\n\0" .global ItemDescriptionHiddenPower ItemDescriptionHiddenPower: -.string "Teaches the move {COLOR_2 GREEN}Hidden Power{END_COLOR_TEXT_2}.#nIt inflicts damage on the target.#nIts type and power change with the#ndungeon.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Hidden Power{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}Its type and power change with the{NEW_LINE}dungeon.\n\0" .global ItemDescriptionSunnyDay ItemDescriptionSunnyDay: -.string "An item that changes the dungeon floor~27s#nweather to {COLOR_2 CYAN}Sunny{END_COLOR_TEXT_2} for several turns.#n#n#nRange: All Pokémon on floor\n\0" +.string "An item that changes the dungeon floor{APOSTROPHE}s{NEW_LINE}weather to {COLOR_2 CYAN}Sunny{END_COLOR_TEXT_2} for several turns.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: All Pokémon on floor\n\0" .global ItemDescriptionTaunt ItemDescriptionTaunt: -.string "Teaches the move {COLOR_2 GREEN}Taunt{END_COLOR_TEXT_2}.#nThe targeted Pokémon~27s status changes#nto {COLOR_2 CYAN}Taunted{END_COLOR_TEXT_2}.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Taunt{END_COLOR_TEXT_2}.{NEW_LINE}The targeted Pokémon{APOSTROPHE}s status changes{NEW_LINE}to {COLOR_2 CYAN}Taunted{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionIceBeam ItemDescriptionIceBeam: -.string "Teaches the move {COLOR_2 GREEN}Ice Beam{END_COLOR_TEXT_2}.#nIt inflicts damage on the target even at a#ndistance. It may also leave the target#n{COLOR_2 CYAN}frozen{END_COLOR_TEXT_2} and incapable of action.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Ice Beam{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance. It may also leave the target{NEW_LINE}{COLOR_2 CYAN}frozen{END_COLOR_TEXT_2} and incapable of action.\n\0" .global ItemDescriptionBlizzard ItemDescriptionBlizzard: -.string "Teaches the move {COLOR_2 GREEN}Blizzard{END_COLOR_TEXT_2}.#nIt inflicts damage on the target.#nIt may also leave the target {COLOR_2 CYAN}frozen{END_COLOR_TEXT_2} and#nincapable of action.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Blizzard{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It may also leave the target {COLOR_2 CYAN}frozen{END_COLOR_TEXT_2} and{NEW_LINE}incapable of action.\n\0" .global ItemDescriptionHyperBeam ItemDescriptionHyperBeam: -.string "Teaches the move {COLOR_2 GREEN}Hyper Beam{END_COLOR_TEXT_2}.#nIt inflicts damage on the target even at a#ndistance. However~2c it also makes the user#n{COLOR_2 CYAN}paused{END_COLOR_TEXT_2} and incapable of action.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Hyper Beam{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance. However{COMMA} it also makes the user{NEW_LINE}{COLOR_2 CYAN}paused{END_COLOR_TEXT_2} and incapable of action.\n\0" .global ItemDescriptionLightScreen ItemDescriptionLightScreen: -.string "Teaches the move {COLOR_2 GREEN}Light Screen{END_COLOR_TEXT_2}.#nIt makes the user~27s status {COLOR_2 CYAN}Light Screen{END_COLOR_TEXT_2}.#nIt halves the damage from#n{COLOR_2 CYAN}Special Attack moves{END_COLOR_TEXT_2}.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Light Screen{END_COLOR_TEXT_2}.{NEW_LINE}It makes the user{APOSTROPHE}s status {COLOR_2 CYAN}Light Screen{END_COLOR_TEXT_2}.{NEW_LINE}It halves the damage from{NEW_LINE}{COLOR_2 CYAN}Special Attack moves{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionProtect ItemDescriptionProtect: -.string "Teaches the move {COLOR_2 GREEN}Protect{END_COLOR_TEXT_2}.#nIt changes the Pokémon~27s status to#n{COLOR_2 CYAN}Protect{END_COLOR_TEXT_2} and prevents damage from#nenemy attacks and moves.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Protect{END_COLOR_TEXT_2}.{NEW_LINE}It changes the Pokémon{APOSTROPHE}s status to{NEW_LINE}{COLOR_2 CYAN}Protect{END_COLOR_TEXT_2} and prevents damage from{NEW_LINE}enemy attacks and moves.\n\0" .global ItemDescriptionRainDance ItemDescriptionRainDance: -.string "An item that changes the dungeon floor~27s#nweather to {COLOR_2 CYAN}Rain{END_COLOR_TEXT_2} for several turns.#n#n#nRange: All Pokémon on floor\n\0" +.string "An item that changes the dungeon floor{APOSTROPHE}s{NEW_LINE}weather to {COLOR_2 CYAN}Rain{END_COLOR_TEXT_2} for several turns.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: All Pokémon on floor\n\0" .global ItemDescriptionGigaDrain ItemDescriptionGigaDrain: -.string "Teaches the move {COLOR_2 GREEN}Giga Drain{END_COLOR_TEXT_2}.#nIt inflicts damage on the target.#nIt also restores the user~27s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} based#non the damage it inflicted.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Giga Drain{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It also restores the user{APOSTROPHE}s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} based{NEW_LINE}on the damage it inflicted.\n\0" .global ItemDescriptionSafeguard ItemDescriptionSafeguard: -.string "Teaches the move {COLOR_2 GREEN}Safeguard{END_COLOR_TEXT_2}.#nIt changes the status of the user and team#nmembers in the same room to {COLOR_2 CYAN}Safeguard{END_COLOR_TEXT_2}#nand prevents status problems.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Safeguard{END_COLOR_TEXT_2}.{NEW_LINE}It changes the status of the user and team{NEW_LINE}members in the same room to {COLOR_2 CYAN}Safeguard{END_COLOR_TEXT_2}{NEW_LINE}and prevents status problems.\n\0" .global ItemDescriptionFrustration ItemDescriptionFrustration: -.string "Teaches the move {COLOR_2 GREEN}Frustration{END_COLOR_TEXT_2}.#nIt inflicts damage on the target and#ninflicts greater damage if the user~27s#n{COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2} is low.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Frustration{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target and{NEW_LINE}inflicts greater damage if the user{APOSTROPHE}s{NEW_LINE}{COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2} is low.\n\0" .global ItemDescriptionSolarBeam ItemDescriptionSolarBeam: -.string "Teaches the move {COLOR_2 GREEN}Solarbeam{END_COLOR_TEXT_2}.#nThe user~27s status becomes {COLOR_2 CYAN}Solarbeam{END_COLOR_TEXT_2}~2c#nand it attacks on the next turn.#nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Solarbeam{END_COLOR_TEXT_2}.{NEW_LINE}The user{APOSTROPHE}s status becomes {COLOR_2 CYAN}Solarbeam{END_COLOR_TEXT_2}{COMMA}{NEW_LINE}and it attacks on the next turn.{NEW_LINE}It is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\n\0" .global ItemDescriptionIronTail ItemDescriptionIronTail: -.string "Teaches the move {COLOR_2 GREEN}Iron Tail{END_COLOR_TEXT_2}.#nIt inflicts damage on the target.#nIt may also lower the target~27s {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}#nby one level.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Iron Tail{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It may also lower the target{APOSTROPHE}s {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}{NEW_LINE}by one level.\n\0" .global ItemDescriptionThunderbolt ItemDescriptionThunderbolt: -.string "Teaches the move {COLOR_2 GREEN}Thunderbolt{END_COLOR_TEXT_2}.#nIt damages all foes around the user.#nIt may also cause {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}~2c which#nprevents attacks and moves.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Thunderbolt{END_COLOR_TEXT_2}.{NEW_LINE}It damages all foes around the user.{NEW_LINE}It may also cause {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}{COMMA} which{NEW_LINE}prevents attacks and moves.\n\0" .global ItemDescriptionThunder ItemDescriptionThunder: -.string "Teaches the move {COLOR_2 GREEN}Thunder{END_COLOR_TEXT_2}.#nIt inflicts damage on the target#nand may also cause {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}.#nIts accuracy is affected by the weather.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Thunder{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target{NEW_LINE}and may also cause {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}.{NEW_LINE}Its accuracy is affected by the weather.\n\0" .global ItemDescriptionEarthquake ItemDescriptionEarthquake: -.string "Teaches the move {COLOR_2 GREEN}Earthquake{END_COLOR_TEXT_2}.#nIt damages all Pokémon in the same room.#nIt inflicts double damage on any {COLOR_2 CYAN}digging{END_COLOR_TEXT_2}#nPokémon.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Earthquake{END_COLOR_TEXT_2}.{NEW_LINE}It damages all Pokémon in the same room.{NEW_LINE}It inflicts double damage on any {COLOR_2 CYAN}digging{END_COLOR_TEXT_2}{NEW_LINE}Pokémon.\n\0" .global ItemDescriptionReturn ItemDescriptionReturn: -.string "Teaches the move {COLOR_2 GREEN}Return{END_COLOR_TEXT_2}.#nIt inflicts damage on the target.#nIts power rises with the user~27s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Return{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}Its power rises with the user{APOSTROPHE}s {COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionDig ItemDescriptionDig: -.string "Teaches the move {COLOR_2 GREEN}Dig{END_COLOR_TEXT_2}.#nThe user~27s status becomes {COLOR_2 CYAN}Digging{END_COLOR_TEXT_2}~2c#nand it attacks on the next turn.#nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Dig{END_COLOR_TEXT_2}.{NEW_LINE}The user{APOSTROPHE}s status becomes {COLOR_2 CYAN}Digging{END_COLOR_TEXT_2}{COMMA}{NEW_LINE}and it attacks on the next turn.{NEW_LINE}It is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\n\0" .global ItemDescriptionPsychic ItemDescriptionPsychic: -.string "Teaches the move {COLOR_2 GREEN}Psychic{END_COLOR_TEXT_2}.#nIt inflicts damage on the target.#nIt may also lower the target~27s {COLOR_2 YELLOW}Special#nDefense{END_COLOR_TEXT_2} by one level.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Psychic{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It may also lower the target{APOSTROPHE}s {COLOR_2 YELLOW}Special{NEW_LINE}Defense{END_COLOR_TEXT_2} by one level.\n\0" .global ItemDescriptionShadowBall ItemDescriptionShadowBall: -.string "Teaches the move {COLOR_2 GREEN}Shadow Ball{END_COLOR_TEXT_2}.#nIt inflicts damage on the target even at a#ndistance. It may also lower the target~27s#n{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by one level.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Shadow Ball{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance. It may also lower the target{APOSTROPHE}s{NEW_LINE}{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by one level.\n\0" .global ItemDescriptionBrickBreak ItemDescriptionBrickBreak: -.string "Teaches the move {COLOR_2 GREEN}Brick Break{END_COLOR_TEXT_2}.#nIt shatters the target~27s {COLOR_2 CYAN}Reflect{END_COLOR_TEXT_2}#nor {COLOR_2 CYAN}Light Screen{END_COLOR_TEXT_2} to inflict damage.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Brick Break{END_COLOR_TEXT_2}.{NEW_LINE}It shatters the target{APOSTROPHE}s {COLOR_2 CYAN}Reflect{END_COLOR_TEXT_2}{NEW_LINE}or {COLOR_2 CYAN}Light Screen{END_COLOR_TEXT_2} to inflict damage.\n\0" .global ItemDescriptionDoubleTeam ItemDescriptionDoubleTeam: -.string "An item that raises the user~27s {COLOR_2 YELLOW}Evasion{END_COLOR_TEXT_2}#nby one level.#n#n#nRange: User\n\0" +.string "An item that raises the user{APOSTROPHE}s {COLOR_2 YELLOW}Evasion{END_COLOR_TEXT_2}{NEW_LINE}by one level.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: User\n\0" .global ItemDescriptionReflect ItemDescriptionReflect: -.string "Teaches the move {COLOR_2 GREEN}Reflect{END_COLOR_TEXT_2}.#nIt makes the user~27s status {COLOR_2 CYAN}Reflect{END_COLOR_TEXT_2}#nand halves the damage from all#n{COLOR_2 CYAN}Physical Attack moves{END_COLOR_TEXT_2} and#nregular attacks.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Reflect{END_COLOR_TEXT_2}.{NEW_LINE}It makes the user{APOSTROPHE}s status {COLOR_2 CYAN}Reflect{END_COLOR_TEXT_2}{NEW_LINE}and halves the damage from all{NEW_LINE}{COLOR_2 CYAN}Physical Attack moves{END_COLOR_TEXT_2} and{NEW_LINE}regular attacks.\n\0" .global ItemDescriptionShockWave ItemDescriptionShockWave: -.string "Teaches the move {COLOR_2 GREEN}Shock Wave{END_COLOR_TEXT_2}.#nIt inflicts damage on the target even at a#ndistance.#nIt never misses.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Shock Wave{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance.{NEW_LINE}It never misses.\n\0" .global ItemDescriptionFlamethrower ItemDescriptionFlamethrower: -.string "Teaches the move {COLOR_2 GREEN}Flamethrower{END_COLOR_TEXT_2}.#nIt inflicts damage on the target even at a#ndistance. It may also cause a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}.#nIt thaws and frees frozen Pokémon.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Flamethrower{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance. It may also cause a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}.{NEW_LINE}It thaws and frees frozen Pokémon.\n\0" .global ItemDescriptionSludgeBomb ItemDescriptionSludgeBomb: -.string "Teaches the move {COLOR_2 GREEN}Sludge Bomb{END_COLOR_TEXT_2}.#nIt inflicts damage on the target even at a#ndistance. It may also leave the target#n{COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}~2c damaging it over several turns.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Sludge Bomb{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target even at a{NEW_LINE}distance. It may also leave the target{NEW_LINE}{COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}{COMMA} damaging it over several turns.\n\0" .global ItemDescriptionSandstorm ItemDescriptionSandstorm: -.string "An item that changes the dungeon floor~27s#nweather to {COLOR_2 CYAN}Sandstorm{END_COLOR_TEXT_2} for several turns.#n#n#nRange: All Pokémon on floor\n\0" +.string "An item that changes the dungeon floor{APOSTROPHE}s{NEW_LINE}weather to {COLOR_2 CYAN}Sandstorm{END_COLOR_TEXT_2} for several turns.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: All Pokémon on floor\n\0" .global ItemDescriptionFireBlast ItemDescriptionFireBlast: -.string "Teaches the move {COLOR_2 GREEN}Fire Blast{END_COLOR_TEXT_2}.#nIt inflicts damage on the target.#nIt may also cause a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}.#nIt thaws and frees frozen Pokémon.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Fire Blast{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It may also cause a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}.{NEW_LINE}It thaws and frees frozen Pokémon.\n\0" .global ItemDescriptionRockTomb ItemDescriptionRockTomb: -.string "It inflicts damage on the target.#nIt also lowers the target~27s {COLOR_2 YELLOW}Movement#nSpeed{END_COLOR_TEXT_2} by one level.#n#nRange: Foe in front\n\0" +.string "It inflicts damage on the target.{NEW_LINE}It also lowers the target{APOSTROPHE}s {COLOR_2 YELLOW}Movement{NEW_LINE}Speed{END_COLOR_TEXT_2} by one level.{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" .global ItemDescriptionAerialAce ItemDescriptionAerialAce: -.string "Teaches the move {COLOR_2 GREEN}Aerial Ace{END_COLOR_TEXT_2}.#nIt inflicts damage on the target.#nIt never misses.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Aerial Ace{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It never misses.\n\0" .global ItemDescriptionTorment ItemDescriptionTorment: -.string "Teaches the move {COLOR_2 GREEN}Torment{END_COLOR_TEXT_2}.#nIt prevents the targeted Pokémon from#nrepeating its last move while it#nremains on the floor.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Torment{END_COLOR_TEXT_2}.{NEW_LINE}It prevents the targeted Pokémon from{NEW_LINE}repeating its last move while it{NEW_LINE}remains on the floor.\n\0" .global ItemDescriptionFacade ItemDescriptionFacade: -.string "Teaches the move {COLOR_2 GREEN}Facade{END_COLOR_TEXT_2}.#nIt inflicts damage on the target.#nIf the user is {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}~2c {COLOR_2 CYAN}badly poisoned{END_COLOR_TEXT_2}~2c#nor has a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}~2c its power is doubled.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Facade{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}If the user is {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}{COMMA} {COLOR_2 CYAN}badly poisoned{END_COLOR_TEXT_2}{COMMA}{NEW_LINE}or has a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}{COMMA} its power is doubled.\n\0" .global ItemDescriptionSecretPower ItemDescriptionSecretPower: -.string "Teaches the move {COLOR_2 GREEN}Secret Power{END_COLOR_TEXT_2}.#nIt inflicts damage on the target.#nIt may also trigger other effects#ndepending on the terrain.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Secret Power{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It may also trigger other effects{NEW_LINE}depending on the terrain.\n\0" .global ItemDescriptionRest ItemDescriptionRest: -.string "Teaches the move {COLOR_2 GREEN}Rest{END_COLOR_TEXT_2}.#nIt makes the user go to {COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}.#nUpon awakening~2c the Pokémon regains {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}#nand recovers from any status problems.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Rest{END_COLOR_TEXT_2}.{NEW_LINE}It makes the user go to {COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}.{NEW_LINE}Upon awakening{COMMA} the Pokémon regains {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}{NEW_LINE}and recovers from any status problems.\n\0" .global ItemDescriptionAttract ItemDescriptionAttract: -.string "Teaches the move {COLOR_2 GREEN}Attract{END_COLOR_TEXT_2}.#nIt changes the target~27s status to#n{COLOR_2 CYAN}Infatuated{END_COLOR_TEXT_2}.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Attract{END_COLOR_TEXT_2}.{NEW_LINE}It changes the target{APOSTROPHE}s status to{NEW_LINE}{COLOR_2 CYAN}Infatuated{END_COLOR_TEXT_2}.\n\0" .global ItemDescriptionThief ItemDescriptionThief: -.string "Teaches the move {COLOR_2 GREEN}Thief{END_COLOR_TEXT_2}.#nIt inflicts damage on the target.#nIt also snatches the target~27s hold item#nand makes it the user~27s hold item.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Thief{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It also snatches the target{APOSTROPHE}s hold item{NEW_LINE}and makes it the user{APOSTROPHE}s hold item.\n\0" .global ItemDescriptionSteelWIng ItemDescriptionSteelWIng: -.string "Teaches the move {COLOR_2 GREEN}Steel Wing{END_COLOR_TEXT_2}.#nIt inflicts damage on the target.#nIt may also raise the user~27s {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by#none level.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Steel Wing{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on the target.{NEW_LINE}It may also raise the user{APOSTROPHE}s {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by{NEW_LINE}one level.\n\0" .global ItemDescriptionSkillSwap ItemDescriptionSkillSwap: -.string "Teaches the move {COLOR_2 GREEN}Skill Swap{END_COLOR_TEXT_2}.#nIt switches the user~27s {COLOR_2 YELLOW}Special Ability{END_COLOR_TEXT_2} with#nthat of the target.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Skill Swap{END_COLOR_TEXT_2}.{NEW_LINE}It switches the user{APOSTROPHE}s {COLOR_2 YELLOW}Special Ability{END_COLOR_TEXT_2} with{NEW_LINE}that of the target.\n\0" .global ItemDescriptionSnatch ItemDescriptionSnatch: -.string "It switches the user~27s status to {COLOR_2 CYAN}Snatch{END_COLOR_TEXT_2}.#nIt steals the moves of Pokémon on#nthe same floor.#n#nRange: User\n\0" +.string "It switches the user{APOSTROPHE}s status to {COLOR_2 CYAN}Snatch{END_COLOR_TEXT_2}.{NEW_LINE}It steals the moves of Pokémon on{NEW_LINE}the same floor.{NEW_LINE}{NEW_LINE}Range: User\n\0" .global ItemDescriptionOverheat ItemDescriptionOverheat: -.string "Teaches the move {COLOR_2 GREEN}Overheat{END_COLOR_TEXT_2}.#nIt damages all foes around the user~2c but it#nalso lowers the user~27s {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}#nby two levels and thaws frozen Pokémon.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Overheat{END_COLOR_TEXT_2}.{NEW_LINE}It damages all foes around the user{COMMA} but it{NEW_LINE}also lowers the user{APOSTROPHE}s {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}{NEW_LINE}by two levels and thaws frozen Pokémon.\n\0" .global ItemDescriptionWideSlash ItemDescriptionWideSlash: -.string "Teaches the move {COLOR_2 GREEN}Wide Slash{END_COLOR_TEXT_2}.#nIt inflicts damage on foes on the 3#ntiles diagonally and directly in front.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Wide Slash{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on foes on the 3{NEW_LINE}tiles diagonally and directly in front.\n\0" .global ItemDescriptionExcavate ItemDescriptionExcavate: -.string "Teaches the move {COLOR_2 GREEN}Excavate{END_COLOR_TEXT_2}.#nIt digs through the wall the user is facing.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Excavate{END_COLOR_TEXT_2}.{NEW_LINE}It digs through the wall the user is facing.\n\0" .global ItemDescriptionSpinSlash ItemDescriptionSpinSlash: -.string "Teaches the move {COLOR_2 GREEN}Spin Slash{END_COLOR_TEXT_2}.#nIt inflicts damage on all foes surrounding#nthe user.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Spin Slash{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on all foes surrounding{NEW_LINE}the user.\n\0" .global ItemDescriptionSeeTrapOrb ItemDescriptionSeeTrapOrb: -.string "It reveals all hidden traps in the same#nroom.#n#n#nRange: User\n\0" +.string "It reveals all hidden traps in the same{NEW_LINE}room.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: User\n\0" .global ItemDescriptionMugOrb ItemDescriptionMugOrb: -.string "It inflicts damage on the target.#nIt also snatches the target~27s hold item#nto make it the user~27s.#n#nRange: Foe in front\n\0" +.string "It inflicts damage on the target.{NEW_LINE}It also snatches the target{APOSTROPHE}s hold item{NEW_LINE}to make it the user{APOSTROPHE}s.{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" .global ItemDescriptionReboundOrb ItemDescriptionReboundOrb: -.string "Changes the user~27s status to {COLOR_2 CYAN}Mini Counter{END_COLOR_TEXT_2}.#nAny damage from {COLOR_2 CYAN}Physical Attack moves{END_COLOR_TEXT_2}#nor a regular attack is partially returned.#n#nRange: User\n\0" +.string "Changes the user{APOSTROPHE}s status to {COLOR_2 CYAN}Mini Counter{END_COLOR_TEXT_2}.{NEW_LINE}Any damage from {COLOR_2 CYAN}Physical Attack moves{END_COLOR_TEXT_2}{NEW_LINE}or a regular attack is partially returned.{NEW_LINE}{NEW_LINE}Range: User\n\0" .global ItemDescriptionLobOrb ItemDescriptionLobOrb: -.string "Inflicts damage on the target up to#n2 tiles away.#n#n#nRange: 2 tiles\n\0" +.string "Inflicts damage on the target up to{NEW_LINE}2 tiles away.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: 2 tiles\n\0" .global ItemDescriptionSwitcherOrb ItemDescriptionSwitcherOrb: -.string "Switches the user~27s position with another#nPokémon~2c however distant.#n#n#nRange: Straight line\n\0" +.string "Switches the user{APOSTROPHE}s position with another{NEW_LINE}Pokémon{COMMA} however distant.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Straight line\n\0" .global ItemDescriptionBlowbackOrb ItemDescriptionBlowbackOrb: -.string "Knocks a distant target flying.#nIf the target hits a wall or another#nPokémon~2c it sustains damage.#n#nRange: Straight line\n\0" +.string "Knocks a distant target flying.{NEW_LINE}If the target hits a wall or another{NEW_LINE}Pokémon{COMMA} it sustains damage.{NEW_LINE}{NEW_LINE}Range: Straight line\n\0" .global ItemDescriptionWarpOrb ItemDescriptionWarpOrb: -.string "Warps foes in the same room to other#nplaces on the same floor.#n#n#nRange: Foes in room\n\0" +.string "Warps foes in the same room to other{NEW_LINE}places on the same floor.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Foes in room\n\0" .global ItemDescriptionTransferOrb ItemDescriptionTransferOrb: -.string "Transforms the target into a different#nPokémon.#n#n#nRange: Foe in front\n\0" +.string "Transforms the target into a different{NEW_LINE}Pokémon.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" .global ItemDescriptionSlowOrb ItemDescriptionSlowOrb: -.string "Lowers the {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} of foes in#nthe same room by one level.#n#n#nRange: Foes in room\n\0" +.string "Lowers the {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} of foes in{NEW_LINE}the same room by one level.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Foes in room\n\0" .global ItemDescriptionQuickOrb ItemDescriptionQuickOrb: -.string "Boosts the {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} of the user#nand team members in the room by one#nlevel.#n#nRange: All team members in room\n\0" +.string "Boosts the {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} of the user{NEW_LINE}and team members in the room by one{NEW_LINE}level.{NEW_LINE}{NEW_LINE}Range: All team members in room\n\0" .global ItemDescriptionLuminousOrb ItemDescriptionLuminousOrb: -.string "Reveals the entire floor to the user.#n#n#n#nRange: User\n\0" +.string "Reveals the entire floor to the user.{NEW_LINE}{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: User\n\0" .global ItemDescriptionPetrifyOrb ItemDescriptionPetrifyOrb: -.string "Changes the status of foes in the room to#n{COLOR_2 CYAN}Petrified{END_COLOR_TEXT_2}~2c making them incapable of action.#n#n#nRange: Foes in room\n\0" +.string "Changes the status of foes in the room to{NEW_LINE}{COLOR_2 CYAN}Petrified{END_COLOR_TEXT_2}{COMMA} making them incapable of action.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Foes in room\n\0" .global ItemDescriptionStayawayOrb ItemDescriptionStayawayOrb: -.string "Changes the status of the target to#n{COLOR_2 CYAN}Petrified{END_COLOR_TEXT_2} and warps it near the stairs.#n#n#nRange: Foe in front\n\0" +.string "Changes the status of the target to{NEW_LINE}{COLOR_2 CYAN}Petrified{END_COLOR_TEXT_2} and warps it near the stairs.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" .global ItemDescriptionPounceOrb ItemDescriptionPounceOrb: -.string "Makes the user pounce on the Pokémon#nin front~2c however distant. If no Pokémon#nis in the way~2c the user leaps to the wall.#n#nRange: Special\n\0" +.string "Makes the user pounce on the Pokémon{NEW_LINE}in front{COMMA} however distant. If no Pokémon{NEW_LINE}is in the way{COMMA} the user leaps to the wall.{NEW_LINE}{NEW_LINE}Range: Special\n\0" .global ItemDescriptionTrawlOrb ItemDescriptionTrawlOrb: -.string "Pulls all items on the floor to the user.#nBeware: if there is a shop~2c the user will#nbe considered a shoplifter.#n#nRange: User\n\0" +.string "Pulls all items on the floor to the user.{NEW_LINE}Beware: if there is a shop{COMMA} the user will{NEW_LINE}be considered a shoplifter.{NEW_LINE}{NEW_LINE}Range: User\n\0" .global ItemDescriptionCleanseOrb ItemDescriptionCleanseOrb: -.string "Sticky~2c gummed-up items are cleansed of#ngrime~2c making them usable again.#n#n#nRange: All team members on floor\n\0" +.string "Sticky{COMMA} gummed-up items are cleansed of{NEW_LINE}grime{COMMA} making them usable again.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: All team members on floor\n\0" .global ItemDescriptionObserverOrb ItemDescriptionObserverOrb: -.string "Changes the status of the target to#n{COLOR_2 CYAN}Paused{END_COLOR_TEXT_2}~2c making it incapable of action.#n#n#nRange: Foe in front\n\0" +.string "Changes the status of the target to{NEW_LINE}{COLOR_2 CYAN}Paused{END_COLOR_TEXT_2}{COMMA} making it incapable of action.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" .global ItemDescriptionDecoyOrb ItemDescriptionDecoyOrb: -.string "Changes the status of the target to#n{COLOR_2 CYAN}Decoy{END_COLOR_TEXT_2}~2c making it the target of its fellow#nPokémon.#n#nRange: Foe in front\n\0" +.string "Changes the status of the target to{NEW_LINE}{COLOR_2 CYAN}Decoy{END_COLOR_TEXT_2}{COMMA} making it the target of its fellow{NEW_LINE}Pokémon.{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" .global ItemDescriptionSlumberOrb ItemDescriptionSlumberOrb: -.string "Changes the status of foes in the same#nroom to {COLOR_2 CYAN}Sleep{END_COLOR_TEXT_2}~2c making them incapable#nof action.#n#nRange: Foes in room\n\0" +.string "Changes the status of foes in the same{NEW_LINE}room to {COLOR_2 CYAN}Sleep{END_COLOR_TEXT_2}{COMMA} making them incapable{NEW_LINE}of action.{NEW_LINE}{NEW_LINE}Range: Foes in room\n\0" .global ItemDescriptionTotterOrb ItemDescriptionTotterOrb: -.string "Changes the status of foes in the same#nroom to {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2}~2c making their#nattacks and movements erratic.#n#nRange: Foes in room\n\0" +.string "Changes the status of foes in the same{NEW_LINE}room to {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2}{COMMA} making their{NEW_LINE}attacks and movements erratic.{NEW_LINE}{NEW_LINE}Range: Foes in room\n\0" .global ItemDescriptionTwoEdgeOrb ItemDescriptionTwoEdgeOrb: -.string "Drops the {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} of foes in the same#nroom to one. If it hits~2c it also halves#nthe user~27s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.#n#nRange: Foes in room\n\0" +.string "Drops the {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} of foes in the same{NEW_LINE}room to one. If it hits{COMMA} it also halves{NEW_LINE}the user{APOSTROPHE}s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.{NEW_LINE}{NEW_LINE}Range: Foes in room\n\0" .global ItemDescriptionSilenceOrb ItemDescriptionSilenceOrb: -.string "Changes the status of the target to#n{COLOR_2 CYAN}Muzzled{END_COLOR_TEXT_2}~2c making it incapable of attacks or#nmoves using its mouth.#n#nRange: Foe in front\n\0" +.string "Changes the status of the target to{NEW_LINE}{COLOR_2 CYAN}Muzzled{END_COLOR_TEXT_2}{COMMA} making it incapable of attacks or{NEW_LINE}moves using its mouth.{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" .global ItemDescriptionEscapeOrb ItemDescriptionEscapeOrb: -.string "Allows the rescue team to escape#nfrom the dungeon.#n#n#nRange: All team members on floor\n\0" +.string "Allows the rescue team to escape{NEW_LINE}from the dungeon.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: All team members on floor\n\0" .global ItemDescriptionScannerOrb ItemDescriptionScannerOrb: -.string "Reveals the location of all unclaimed#nitems on the floor.#n#n#nRange: User\n\0" +.string "Reveals the location of all unclaimed{NEW_LINE}items on the floor.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: User\n\0" .global ItemDescriptionRadarOrb ItemDescriptionRadarOrb: -.string "Reveals the location of all foes on#nthe floor.#n#n#nRange: User\n\0" +.string "Reveals the location of all foes on{NEW_LINE}the floor.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: User\n\0" .global ItemDescriptionDroughtOrb ItemDescriptionDroughtOrb: -.string "Drains water and magma from the dungeon#nfloor.#n#n#nRange: Special\n\0" +.string "Drains water and magma from the dungeon{NEW_LINE}floor.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Special\n\0" .global ItemDescriptionTrapbustOrb ItemDescriptionTrapbustOrb: -.string "Destroys traps in the same room.#n#n#n#nRange: Room\n\0" +.string "Destroys traps in the same room.{NEW_LINE}{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Room\n\0" .global ItemDescriptionRollcallOrb ItemDescriptionRollcallOrb: -.string "Draws all team members to the user.#n#n#n#nRange: All team members on floor\n\0" +.string "Draws all team members to the user.{NEW_LINE}{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: All team members on floor\n\0" .global ItemDescriptionInvisifyOrb ItemDescriptionInvisifyOrb: -.string "The user becomes {COLOR_2 CYAN}invisible{END_COLOR_TEXT_2} to other#nPokémon.#n#n#nRange: User\n\0" +.string "The user becomes {COLOR_2 CYAN}invisible{END_COLOR_TEXT_2} to other{NEW_LINE}Pokémon.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: User\n\0" .global ItemDescriptionOneShotOrb ItemDescriptionOneShotOrb: -.string "Defeats the target in one shot--if it hits.#n#n#n#nRange: Foe in front\n\0" +.string "Defeats the target in one shot--if it hits.{NEW_LINE}{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" .global ItemDescriptionIdentifyOrb ItemDescriptionIdentifyOrb: -.string "Reveals if Pokémon on the floor are#nholding items or not.#n#n#nRange: All Pokémon on floor\n\0" +.string "Reveals if Pokémon on the floor are{NEW_LINE}holding items or not.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: All Pokémon on floor\n\0" .global ItemDescriptionVacuumCut ItemDescriptionVacuumCut: -.string "Teaches the move {COLOR_2 GREEN}Vacuum Cut{END_COLOR_TEXT_2}.#nIt inflicts damage on all foes in the room.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Vacuum Cut{END_COLOR_TEXT_2}.{NEW_LINE}It inflicts damage on all foes in the room.\n\0" .global ItemDescriptionReviverOrb ItemDescriptionReviverOrb: -.string "A hold item that revives the Pokémon#nif it faints.#nIt does not work if the holder faints#nfrom an explosion.#nRange: Holder\n\0" +.string "A hold item that revives the Pokémon{NEW_LINE}if it faints.{NEW_LINE}It does not work if the holder faints{NEW_LINE}from an explosion.{NEW_LINE}Range: Holder\n\0" .global ItemDescriptionShockerOrb ItemDescriptionShockerOrb: -.string "Changes the target~27s status to {COLOR_2 CYAN}Cowering{END_COLOR_TEXT_2}~2c#nmaking its attacks go in the opposite#ndirection.#n#nRange: Foe in front\n\0" +.string "Changes the target{APOSTROPHE}s status to {COLOR_2 CYAN}Cowering{END_COLOR_TEXT_2}{COMMA}{NEW_LINE}making its attacks go in the opposite{NEW_LINE}direction.{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" .global ItemDescriptionSizebustOrb ItemDescriptionSizebustOrb: -.string "Inflicts damage on the target.#nThe bigger the target~27s size~2c the greater#nthe damage.#n#nRange: Foe in front\n\0" +.string "Inflicts damage on the target.{NEW_LINE}The bigger the target{APOSTROPHE}s size{COMMA} the greater{NEW_LINE}the damage.{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" .global ItemDescriptionOneRoomOrb ItemDescriptionOneRoomOrb: -.string "Destroys all walls on the floor~2c turning#nthe floor into one vast room.#n#n#nRange: Special\n\0" +.string "Destroys all walls on the floor{COMMA} turning{NEW_LINE}the floor into one vast room.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Special\n\0" .global ItemDescriptionFillInOrb ItemDescriptionFillInOrb: -.string "Makes water or magma in front of the#nuser turn into a solid floor tile.#n#n#nRange: Special\n\0" +.string "Makes water or magma in front of the{NEW_LINE}user turn into a solid floor tile.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Special\n\0" .global ItemDescriptionTrapperOrb ItemDescriptionTrapperOrb: -.string "Sets a trap where the user is standing.#nIt does not work if used in a hallway.#n#n#nRange: User\n\0" +.string "Sets a trap where the user is standing.{NEW_LINE}It does not work if used in a hallway.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: User\n\0" .global ItemDescriptionPossessOrb ItemDescriptionPossessOrb: -.string "A leader~27s hold item that enables the#nleader to possess a friend and survive.#nIt only works for the team leader.\n\0" +.string "A leader{APOSTROPHE}s hold item that enables the{NEW_LINE}leader to possess a friend and survive.{NEW_LINE}It only works for the team leader.\n\0" .global ItemDescriptionItemizerOrb ItemDescriptionItemizerOrb: -.string "Turns the target Pokémon into an item.#n#n#n#nRange: Foe in front\n\0" +.string "Turns the target Pokémon into an item.{NEW_LINE}{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" .global ItemDescriptionHurlOrb ItemDescriptionHurlOrb: -.string "Hurls the target at another foe to inflict#ndamage.#n#n#nRange: Foe in front\n\0" +.string "Hurls the target at another foe to inflict{NEW_LINE}damage.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: Foe in front\n\0" .global ItemDescriptionMobileOrb ItemDescriptionMobileOrb: -.string "Changes the user~27s status to {COLOR_2 CYAN}Mobile{END_COLOR_TEXT_2}~2c#nenabling it to move and attack through#nwalls and on lava~2c water~2c and clouds.#n#nRange: User\n\0" +.string "Changes the user{APOSTROPHE}s status to {COLOR_2 CYAN}Mobile{END_COLOR_TEXT_2}{COMMA}{NEW_LINE}enabling it to move and attack through{NEW_LINE}walls and on lava{COMMA} water{COMMA} and clouds.{NEW_LINE}{NEW_LINE}Range: User\n\0" .global ItemDescriptionTossOrb ItemDescriptionTossOrb: @@ -816,55 +816,55 @@ ItemDescriptionTossOrb: .global ItemDescriptionStairsOrb ItemDescriptionStairsOrb: -.string "Reveals the location of the stairs on the#nfloor.#n#n#nRange: User\n\0" +.string "Reveals the location of the stairs on the{NEW_LINE}floor.{NEW_LINE}{NEW_LINE}{NEW_LINE}Range: User\n\0" .global ItemDescriptionLongtossOrb ItemDescriptionLongtossOrb: -.string "Changes the user~27s status to {COLOR_2 CYAN}Long Toss{END_COLOR_TEXT_2}.#nItems thrown by the user will fly until#nthey hit a wall or a Pokémon.#n#nRange: User\n\0" +.string "Changes the user{APOSTROPHE}s status to {COLOR_2 CYAN}Long Toss{END_COLOR_TEXT_2}.{NEW_LINE}Items thrown by the user will fly until{NEW_LINE}they hit a wall or a Pokémon.{NEW_LINE}{NEW_LINE}Range: User\n\0" .global ItemDescriptionPierceOrb ItemDescriptionPierceOrb: -.string "Changes the user~27s status to {COLOR_2 CYAN}Pierce{END_COLOR_TEXT_2}.#nItems thrown by the user will fly through#nwalls and Pokémon without stopping.#n#nRange: User\n\0" +.string "Changes the user{APOSTROPHE}s status to {COLOR_2 CYAN}Pierce{END_COLOR_TEXT_2}.{NEW_LINE}Items thrown by the user will fly through{NEW_LINE}walls and Pokémon without stopping.{NEW_LINE}{NEW_LINE}Range: User\n\0" .global ItemDescriptionCut ItemDescriptionCut: -.string "Teaches the move {COLOR_2 GREEN}Cut{END_COLOR_TEXT_2}. It does not break~2c#nbut cannot be used in a dungeon.#nThe move damages all foes around the#nuser.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Cut{END_COLOR_TEXT_2}. It does not break{COMMA}{NEW_LINE}but cannot be used in a dungeon.{NEW_LINE}The move damages all foes around the{NEW_LINE}user.\n\0" .global ItemDescriptionFly ItemDescriptionFly: -.string "Teaches the move {COLOR_2 GREEN}Fly{END_COLOR_TEXT_2}. It does not break~2c#nbut cannot be used in a dungeon.#nThe move makes the user~27s status {COLOR_2 CYAN}Flying{END_COLOR_TEXT_2}~2c#nmaking it attack on the next turn.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Fly{END_COLOR_TEXT_2}. It does not break{COMMA}{NEW_LINE}but cannot be used in a dungeon.{NEW_LINE}The move makes the user{APOSTROPHE}s status {COLOR_2 CYAN}Flying{END_COLOR_TEXT_2}{COMMA}{NEW_LINE}making it attack on the next turn.\n\0" .global ItemDescriptionSurf ItemDescriptionSurf: -.string "Teaches the move {COLOR_2 GREEN}Surf{END_COLOR_TEXT_2}. It does not break~2c#nbut cannot be used in a dungeon.#nThe move damages the target.#nInflicts double damage on a {COLOR_2 CYAN}diving{END_COLOR_TEXT_2} foe.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Surf{END_COLOR_TEXT_2}. It does not break{COMMA}{NEW_LINE}but cannot be used in a dungeon.{NEW_LINE}The move damages the target.{NEW_LINE}Inflicts double damage on a {COLOR_2 CYAN}diving{END_COLOR_TEXT_2} foe.\n\0" .global ItemDescriptionStrength ItemDescriptionStrength: -.string "Teaches the move {COLOR_2 GREEN}Strength{END_COLOR_TEXT_2}. It does not#nbreak~2c but cannot be used in a dungeon.#nThe move hurls the target at another#nPokémon to inflict damage.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Strength{END_COLOR_TEXT_2}. It does not{NEW_LINE}break{COMMA} but cannot be used in a dungeon.{NEW_LINE}The move hurls the target at another{NEW_LINE}Pokémon to inflict damage.\n\0" .global ItemDescriptionFlash ItemDescriptionFlash: -.string "Teaches the move {COLOR_2 GREEN}Flash{END_COLOR_TEXT_2}. It does not break~2c#nbut cannot be used in a dungeon.#nThe move lowers the target~27s {COLOR_2 YELLOW}Accuracy{END_COLOR_TEXT_2}#nby one level.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Flash{END_COLOR_TEXT_2}. It does not break{COMMA}{NEW_LINE}but cannot be used in a dungeon.{NEW_LINE}The move lowers the target{APOSTROPHE}s {COLOR_2 YELLOW}Accuracy{END_COLOR_TEXT_2}{NEW_LINE}by one level.\n\0" .global ItemDescriptionRockSmash ItemDescriptionRockSmash: -.string "Teaches the move {COLOR_2 GREEN}Rock Smash{END_COLOR_TEXT_2}. It does not#nbreak~2c but cannot be used in a dungeon.#nThe move digs through the wall the user#nis facing.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Rock Smash{END_COLOR_TEXT_2}. It does not{NEW_LINE}break{COMMA} but cannot be used in a dungeon.{NEW_LINE}The move digs through the wall the user{NEW_LINE}is facing.\n\0" .global ItemDescriptionWaterfall ItemDescriptionWaterfall: -.string "Teaches the move {COLOR_2 GREEN}Waterfall{END_COLOR_TEXT_2}. It does not#nbreak~2c but cannot be used in a dungeon.#nThe move damages the target.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Waterfall{END_COLOR_TEXT_2}. It does not{NEW_LINE}break{COMMA} but cannot be used in a dungeon.{NEW_LINE}The move damages the target.\n\0" .global ItemDescriptionDive ItemDescriptionDive: -.string "Teaches the move {COLOR_2 GREEN}Dive{END_COLOR_TEXT_2}. It does not break~2c#nbut cannot be used in a dungeon.#nThe move makes the user~27s status {COLOR_2 CYAN}Diving{END_COLOR_TEXT_2}~2c#nmaking it attack strongly on the next turn.\n\0" +.string "Teaches the move {COLOR_2 GREEN}Dive{END_COLOR_TEXT_2}. It does not break{COMMA}{NEW_LINE}but cannot be used in a dungeon.{NEW_LINE}The move makes the user{APOSTROPHE}s status {COLOR_2 CYAN}Diving{END_COLOR_TEXT_2}{COMMA}{NEW_LINE}making it attack strongly on the next turn.\n\0" .global ItemDescriptionLinkBox ItemDescriptionLinkBox: -.string "A marvelous box that enables the user to#n{COLOR_2 CYAN}link{END_COLOR_TEXT_2} and delink moves.#n{COLOR_2 CYAN}Linked{END_COLOR_TEXT_2} moves become separated if#ntheir combined {COLOR_2 YELLOW}PP{END_COLOR_TEXT_2} drops to zero.\n\0" +.string "A marvelous box that enables the user to{NEW_LINE}{COLOR_2 CYAN}link{END_COLOR_TEXT_2} and delink moves.{NEW_LINE}{COLOR_2 CYAN}Linked{END_COLOR_TEXT_2} moves become separated if{NEW_LINE}their combined {COLOR_2 YELLOW}PP{END_COLOR_TEXT_2} drops to zero.\n\0" .global ItemDescriptionSwitchBox ItemDescriptionSwitchBox: -.string "A curious box that enables the user to#nswitch the rescue team~27s leader.#nOnly official team members may become#nthe team leader.\n\0" +.string "A curious box that enables the user to{NEW_LINE}switch the rescue team{APOSTROPHE}s leader.{NEW_LINE}Only official team members may become{NEW_LINE}the team leader.\n\0" .global ItemDescriptionWeavileFig ItemDescriptionWeavileFig: diff --git a/data/move/move_names.s b/data/move/move_names.s index ca40fd8..46e32f4 100644 --- a/data/move/move_names.s +++ b/data/move/move_names.s @@ -270,7 +270,7 @@ MoveNamePlaceholder: .global MoveUseTextBide MoveUseTextBide: -.string "$m0 can~27t take it anymore!\0" +.string "{ARG_POKEMON_0} can{APOSTROPHE}t take it anymore!\0" .align 2,0 .global MoveNameBide2 @@ -290,7 +290,7 @@ MoveNameIsWatching: .global MoveUseTextRegularAttack MoveUseTextRegularAttack: -.string "$m0 attacked!\0" +.string "{ARG_POKEMON_0} attacked!\0" .align 2,0 .global MoveDescriptionNull @@ -305,7 +305,7 @@ MoveNameRegularAttack: .global MoveDescriptionVoltTackle MoveDescriptionVoltTackle: -.string "Inflicts damage on the target~2c even at a\ndistance.\nHowever~2c it also hurts the user.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance.\nHowever{COMMA} it also hurts the user.\0" .align 2,0 .global MoveNameVoltTackle @@ -320,7 +320,7 @@ MoveNameAeroblast: .global MoveDescriptionStruggle MoveDescriptionStruggle: -.string "Inflicts damage on the target.\nHowever~2c the user also takes damage one\nquarter of its {COLOR_2 YELLOW}maximum HP{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target.\nHowever{COMMA} the user also takes damage one\nquarter of its {COLOR_2 YELLOW}maximum HP{END_COLOR_TEXT_2}.\0" .align 2,0 .global MoveNameStruggle @@ -340,7 +340,7 @@ MoveNameRockBlast: .global MoveDescriptionLockOn MoveDescriptionLockOn: -.string "Gives the user the {COLOR_2 CYAN}Sure Shot{END_COLOR_TEXT_2} status~2c\nmaking all its moves and attacks\ncompletely accurate.\0" +.string "Gives the user the {COLOR_2 CYAN}Sure Shot{END_COLOR_TEXT_2} status{COMMA}\nmaking all its moves and attacks\ncompletely accurate.\0" .align 2,0 .global MoveNameLockOn @@ -350,7 +350,7 @@ MoveNameLockOn: .global MoveDescriptionSkullBash MoveDescriptionSkullBash: -.string "The user gains the {COLOR_2 CYAN}Skull Bash{END_COLOR_TEXT_2} status~2c\ncausing it to attack strongly on the\nnext turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" +.string "The user gains the {COLOR_2 CYAN}Skull Bash{END_COLOR_TEXT_2} status{COMMA}\ncausing it to attack strongly on the\nnext turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" .align 2,0 .global MoveNameSkullBash @@ -370,7 +370,7 @@ MoveNameFuryCutter: .global MoveDescriptionIceBeam MoveDescriptionIceBeam: -.string "Inflicts damage on the target~2c even at a\ndistance. It may also leave the target\n{COLOR_2 CYAN}frozen{END_COLOR_TEXT_2} and incapable of action.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance. It may also leave the target\n{COLOR_2 CYAN}frozen{END_COLOR_TEXT_2} and incapable of action.\0" .align 2,0 .global MoveNameIceBeam @@ -385,7 +385,7 @@ MoveNameIcePunch: .global MoveDescriptionDragonDance MoveDescriptionDragonDance: -.string "Boosts the user~27s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Movement\nSpeed{END_COLOR_TEXT_2} by one level.\0" +.string "Boosts the user{APOSTROPHE}s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Movement\nSpeed{END_COLOR_TEXT_2} by one level.\0" .align 2,0 .global MoveNameDragonDance @@ -395,7 +395,7 @@ MoveNameDragonDance: .global MoveDescriptionDragonbreath MoveDescriptionDragonbreath: -.string "Inflicts damage on the target~2c even at a\ndistance. It may also cause {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}~2c\npreventing any attacks or moves.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance. It may also cause {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}{COMMA}\npreventing any attacks or moves.\0" .align 2,0 .global MoveNameDragonbreath @@ -430,7 +430,7 @@ MoveNameRefresh: .global MoveDescriptionReflect MoveDescriptionReflect: -.string "The user gains the {COLOR_2 CYAN}Reflect{END_COLOR_TEXT_2} status~2c\nhalving the damage from all\n{COLOR_2 CYAN}Physical Attack moves{END_COLOR_TEXT_2} and\nregular attacks.\0" +.string "The user gains the {COLOR_2 CYAN}Reflect{END_COLOR_TEXT_2} status{COMMA}\nhalving the damage from all\n{COLOR_2 CYAN}Physical Attack moves{END_COLOR_TEXT_2} and\nregular attacks.\0" .align 2,0 .global MoveNameReflect @@ -440,7 +440,7 @@ MoveNameReflect: .global MoveDescriptionRecycle MoveDescriptionRecycle: -.string "Repairs the item {COLOR_2 GREEN}{TM}Used TM{END_COLOR_TEXT_2} and restores\nit to its original~2c unused state.\0" +.string "Repairs the item {COLOR_2 GREEN}{TM}Used TM{END_COLOR_TEXT_2} and restores\nit to its original{COMMA} unused state.\0" .align 2,0 .global MoveNameRecycle @@ -470,7 +470,7 @@ MoveNameSnatch: .global MoveDescriptionAcid MoveDescriptionAcid: -.string "Inflicts damage on the target.\nIt may also lower the user~27s {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by\none level.\0" +.string "Inflicts damage on the target.\nIt may also lower the user{APOSTROPHE}s {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by\none level.\0" .align 2,0 .global MoveNameAcid @@ -480,7 +480,7 @@ MoveNameAcid: .global MoveDescriptionDreamEater MoveDescriptionDreamEater: -.string "Inflicts damage on the target and restores\nthe user~27s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\nEffective only against sleeping foes.\0" +.string "Inflicts damage on the target and restores\nthe user{APOSTROPHE}s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\nEffective only against sleeping foes.\0" .align 2,0 .global MoveNameDreamEater @@ -500,7 +500,7 @@ MoveNameMetronome: .global MoveDescriptionLeechSeed MoveDescriptionLeechSeed: -.string "Inflicts the {COLOR_2 CYAN}Leech Seed{END_COLOR_TEXT_2} status\non the target.\nThe target~27s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} is leeched every several\nturns to restore the user~27s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\0" +.string "Inflicts the {COLOR_2 CYAN}Leech Seed{END_COLOR_TEXT_2} status\non the target.\nThe target{APOSTROPHE}s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} is leeched every several\nturns to restore the user{APOSTROPHE}s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\0" .align 2,0 .global MoveNameLeechSeed @@ -510,7 +510,7 @@ MoveNameLeechSeed: .global MoveDescriptionFrustration MoveDescriptionFrustration: -.string "Inflicts damage on the target.\nIt inflicts greater damage if the user~27s\n{COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2} is low.\0" +.string "Inflicts damage on the target.\nIt inflicts greater damage if the user{APOSTROPHE}s\n{COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2} is low.\0" .align 2,0 .global MoveNameFrustration @@ -540,7 +540,7 @@ MoveNameAttract: .global MoveDescriptionMetalClaw MoveDescriptionMetalClaw: -.string "Inflicts damage on the target.\nIt may also boost the user~27s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} by\none level.\0" +.string "Inflicts damage on the target.\nIt may also boost the user{APOSTROPHE}s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} by\none level.\0" .align 2,0 .global MoveNameMetalClaw @@ -580,7 +580,7 @@ MoveNameMegaDrain: .global MoveDescriptionCalmMind MoveDescriptionCalmMind: -.string "Boosts the Pokémon~27s {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2} and\n{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by one level.\0" +.string "Boosts the Pokémon{APOSTROPHE}s {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2} and\n{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by one level.\0" .align 2,0 .global MoveNameCalmMind @@ -655,7 +655,7 @@ MoveNameFuryAttack: .global MoveDescriptionWaterPulse MoveDescriptionWaterPulse: -.string "Inflicts damage on the target~2c even at a\ndistance.\nIt may also leave the target {COLOR_2 CYAN}confused{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance.\nIt may also leave the target {COLOR_2 CYAN}confused{END_COLOR_TEXT_2}.\0" .align 2,0 .global MoveNameWaterPulse @@ -665,7 +665,7 @@ MoveNameWaterPulse: .global MoveDescriptionMistBall MoveDescriptionMistBall: -.string "Inflicts damage on the target.\nIt may lower the target~27s {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}\nby one level.\0" +.string "Inflicts damage on the target.\nIt may lower the target{APOSTROPHE}s {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}\nby one level.\0" .align 2,0 .global MoveNameMistBall @@ -680,7 +680,7 @@ MoveNameWaterGun: .global MoveDescriptionWaterSport MoveDescriptionWaterSport: -.string "Changes the floor~27s status to {COLOR_2 CYAN}Water Sport{END_COLOR_TEXT_2}~2c\nwhich halves the power of Fire-type\nmoves.\0" +.string "Changes the floor{APOSTROPHE}s status to {COLOR_2 CYAN}Water Sport{END_COLOR_TEXT_2}{COMMA}\nwhich halves the power of Fire-type\nmoves.\0" .align 2,0 .global MoveNameWaterSport @@ -700,7 +700,7 @@ MoveNameDetect: .global MoveDescriptionSubstitute MoveDescriptionSubstitute: -.string "The target gains the {COLOR_2 CYAN}Decoy{END_COLOR_TEXT_2} status~2c\nmaking it the target of its fellow\nPokémon.\0" +.string "The target gains the {COLOR_2 CYAN}Decoy{END_COLOR_TEXT_2} status{COMMA}\nmaking it the target of its fellow\nPokémon.\0" .align 2,0 .global MoveNameSubstitute @@ -720,7 +720,7 @@ MoveNameDefenseCurl: .global MoveDescriptionProtect MoveDescriptionProtect: -.string "The user gains the {COLOR_2 CYAN}Protect{END_COLOR_TEXT_2} status~2c\npreventing damage from enemy attacks\nand moves.\0" +.string "The user gains the {COLOR_2 CYAN}Protect{END_COLOR_TEXT_2} status{COMMA}\npreventing damage from enemy attacks\nand moves.\0" .align 2,0 .global MoveNameProtect @@ -770,7 +770,7 @@ MoveDescriptionSpikes: .global MoveDescriptionWrap MoveDescriptionWrap: -.string "The user gains the {COLOR_2 CYAN}Wrap{END_COLOR_TEXT_2} status~2c and\nthe {COLOR_2 CYAN}Wrapped{END_COLOR_TEXT_2} status is inflicted on\nthe target.\nBoth Pokémon become incapable of action.\0" +.string "The user gains the {COLOR_2 CYAN}Wrap{END_COLOR_TEXT_2} status{COMMA} and\nthe {COLOR_2 CYAN}Wrapped{END_COLOR_TEXT_2} status is inflicted on\nthe target.\nBoth Pokémon become incapable of action.\0" .align 2,0 .global MoveNameWrap @@ -805,7 +805,7 @@ MoveNameFireSpin: .global MoveDescriptionBonemerang MoveDescriptionBonemerang: -.string "Strikes the target twice~2c even at a\ndistance.\0" +.string "Strikes the target twice{COMMA} even at a\ndistance.\0" .align 2,0 .global MoveNameBonemerang @@ -820,7 +820,7 @@ MoveNameBoneClub: .global MoveDescriptionTailGlow MoveDescriptionTailGlow: -.string "Boosts the user~27s {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2} by\ntwo levels.\0" +.string "Boosts the user{APOSTROPHE}s {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2} by\ntwo levels.\0" .align 2,0 .global MoveNameTailGlow @@ -835,7 +835,7 @@ MoveNameCovet: .global MoveDescriptionCamouflage MoveDescriptionCamouflage: -.string "The user~27s type changes to match the\nterrain.\0" +.string "The user{APOSTROPHE}s type changes to match the\nterrain.\0" .align 2,0 .global MoveNameCamouflage @@ -875,7 +875,7 @@ MoveNameGlare: .global MoveDescriptionSludgeBomb MoveDescriptionSludgeBomb: -.string "Inflicts damage on the target~2c even at a\ndistance. It may also leave the target\n{COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}~2c damaging it for several turns.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance. It may also leave the target\n{COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}{COMMA} damaging it for several turns.\0" .align 2,0 .global MoveNameSludgeBomb @@ -885,12 +885,12 @@ MoveNameSludgeBomb: .global MoveDescriptionSludge MoveDescriptionSludge: -.string "Inflicts damage on the target.\nIt may also leave the target {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}~2c\ndamaging it for several turns.\0" +.string "Inflicts damage on the target.\nIt may also leave the target {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}{COMMA}\ndamaging it for several turns.\0" .align 2,0 .global MoveDescriptionEruption MoveDescriptionEruption: -.string "Inflicts damage on the target.\nThe higher the user~27s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}~2c the greater\nthe damage.\nIt thaws and frees frozen Pokémon.\0" +.string "Inflicts damage on the target.\nThe higher the user{APOSTROPHE}s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}{COMMA} the greater\nthe damage.\nIt thaws and frees frozen Pokémon.\0" .align 2,0 .global MoveDescriptionPresent @@ -920,7 +920,7 @@ MoveNameCrushClaw: .global MoveDescriptionTeeterDance MoveDescriptionTeeterDance: -.string "Inflicts the {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2} status on all\nPokémon on the floor~2c making their attacks\nand movements erratic.\0" +.string "Inflicts the {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2} status on all\nPokémon on the floor{COMMA} making their attacks\nand movements erratic.\0" .align 2,0 .global MoveNameTeeterDance @@ -935,7 +935,7 @@ MoveNameFlash: .global MoveDescriptionBlastBurn MoveDescriptionBlastBurn: -.string "Inflicts damage on the target. However~2c it\nalso inflicts the {COLOR_2 CYAN}Paused{END_COLOR_TEXT_2} status on the user.\nIt also thaws and frees frozen Pokémon.\0" +.string "Inflicts damage on the target. However{COMMA} it\nalso inflicts the {COLOR_2 CYAN}Paused{END_COLOR_TEXT_2} status on the user.\nIt also thaws and frees frozen Pokémon.\0" .align 2,0 .global MoveNameBlastBurn @@ -965,7 +965,7 @@ MoveNameBeatUp: .global MoveDescriptionWhirlwind MoveDescriptionWhirlwind: -.string "Knocks the target flying.\nIf the target hits a wall or another\nPokémon~2c it sustains damage.\0" +.string "Knocks the target flying.\nIf the target hits a wall or another\nPokémon{COMMA} it sustains damage.\0" .align 2,0 .global MoveNameWhirlwind @@ -975,7 +975,7 @@ MoveNameWhirlwind: .global MoveDescriptionFeatherdance MoveDescriptionFeatherdance: -.string "Lowers the target~27s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} by two levels.\0" +.string "Lowers the target{APOSTROPHE}s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} by two levels.\0" .align 2,0 .global MoveNameFeatherdance @@ -985,7 +985,7 @@ MoveNameFeatherdance: .global MoveDescriptionImprison MoveDescriptionImprison: -.string "Inflicts the {COLOR_2 CYAN}Paused{END_COLOR_TEXT_2} status on the target~2c\nmaking it incapable of action.\0" +.string "Inflicts the {COLOR_2 CYAN}Paused{END_COLOR_TEXT_2} status on the target{COMMA}\nmaking it incapable of action.\0" .align 2,0 .global MoveNameImprison @@ -995,7 +995,7 @@ MoveNameImprison: .global MoveDescriptionBulkUp MoveDescriptionBulkUp: -.string "Raises the user~27s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}\nby one level.\0" +.string "Raises the user{APOSTROPHE}s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}\nby one level.\0" .align 2,0 .global MoveNameBulkUp @@ -1045,7 +1045,7 @@ MoveNameLightScreen: .global MoveDescriptionBellyDrum MoveDescriptionBellyDrum: -.string "Boosts the user~27s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} to maximum~2c\nbut empties its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} to just one.\nIt has no effect if the {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} is one or less.\0" +.string "Boosts the user{APOSTROPHE}s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} to maximum{COMMA}\nbut empties its {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} to just one.\nIt has no effect if the {COLOR_2 YELLOW}Belly{END_COLOR_TEXT_2} is one or less.\0" .align 2,0 .global MoveNameBellyDrum @@ -1055,7 +1055,7 @@ MoveNameBellyDrum: .global MoveDescriptionFixedDamage MoveDescriptionFixedDamage: -.string "The user gains the {COLOR_2 CYAN}Set Damage{END_COLOR_TEXT_2} status.\nIn this state~2c all damage inflicted by the\nuser will remain constant.\0" +.string "The user gains the {COLOR_2 CYAN}Set Damage{END_COLOR_TEXT_2} status.\nIn this state{COMMA} all damage inflicted by the\nuser will remain constant.\0" .align 2,0 .global MoveNameDoomDesire @@ -1070,7 +1070,7 @@ MoveNameBubblebeam: .global MoveDescriptionSplash MoveDescriptionSplash: -.string "Makes the user flop around as it moves.\nIf there is another Pokémon where it\nlands~2c both Pokémon are hurt.\0" +.string "Makes the user flop around as it moves.\nIf there is another Pokémon where it\nlands{COMMA} both Pokémon are hurt.\0" .align 2,0 .global MoveNameSplash @@ -1090,7 +1090,7 @@ MoveNamePetalDance: .global MoveDescriptionBatonPass MoveDescriptionBatonPass: -.string "Successively switches the user~27s position\nwith the positions of other Pokémon in\nthe room.\0" +.string "Successively switches the user{APOSTROPHE}s position\nwith the positions of other Pokémon in\nthe room.\0" .align 2,0 .global MoveNameBatonPass @@ -1100,7 +1100,7 @@ MoveNameBatonPass: .global MoveDescriptionHighCriticalDistance MoveDescriptionHighCriticalDistance: -.string "Inflicts damage on the target~2c even at a\ndistance.\nIt has a high critical-hit rate.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance.\nIt has a high critical-hit rate.\0" .align 2,0 .global MoveNameRazorLeaf @@ -1115,7 +1115,7 @@ MoveNamePound: .global MoveDescriptionKnockOff MoveDescriptionKnockOff: -.string "Knocks the target~27s hold item to\nthe ground.\0" +.string "Knocks the target{APOSTROPHE}s hold item to\nthe ground.\0" .align 2,0 .global MoveNameKnockOff @@ -1155,7 +1155,7 @@ MoveNameSpitUp: .global MoveDescriptionSteelWing MoveDescriptionSteelWing: -.string "Inflicts damage on the target.\nIt may also raise the user~27s {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by\none level.\0" +.string "Inflicts damage on the target.\nIt may also raise the user{APOSTROPHE}s {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by\none level.\0" .align 2,0 .global MoveNameSteelWing @@ -1165,12 +1165,12 @@ MoveNameSteelWing: .global MoveDescriptionSuperpower MoveDescriptionSuperpower: -.string "Inflicts damage on the target.\nHowever~2c it also lowers the user~27s\n{COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by one level.\0" +.string "Inflicts damage on the target.\nHowever{COMMA} it also lowers the user{APOSTROPHE}s\n{COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by one level.\0" .align 2,0 .global MoveDescriptionHyperBeam MoveDescriptionHyperBeam: -.string "Inflicts damage on the target~2c even at a\ndistance. It also inflicts the {COLOR_2 CYAN}Paused{END_COLOR_TEXT_2} status\non the user~2c making it incapable of action.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance. It also inflicts the {COLOR_2 CYAN}Paused{END_COLOR_TEXT_2} status\non the user{COMMA} making it incapable of action.\0" .align 2,0 .global MoveNameHyperBeam @@ -1185,7 +1185,7 @@ MoveNameHyperVoice: .global MoveDescriptionHydroPump MoveDescriptionHydroPump: -.string "Inflicts damage on the target~2c even at a\ndistance.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance.\0" .align 2,0 .global MoveNameHydroPump @@ -1195,7 +1195,7 @@ MoveNameHydroPump: .global MoveDescriptionHydroCannon MoveDescriptionHydroCannon: -.string "Inflicts damage on the target~2c even at a\ndistance. It also inflicts the {COLOR_2 CYAN}Paused{END_COLOR_TEXT_2}\nstatus on the user~2c making it incapable\nof action.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance. It also inflicts the {COLOR_2 CYAN}Paused{END_COLOR_TEXT_2}\nstatus on the user{COMMA} making it incapable\nof action.\0" .align 2,0 .global MoveNameHydroCannon @@ -1205,7 +1205,7 @@ MoveNameHydroCannon: .global MoveDescriptionFrenzyPlant MoveDescriptionFrenzyPlant: -.string "Inflicts damage on the target.\nHowever~2c it also inflicts the {COLOR_2 CYAN}Paused{END_COLOR_TEXT_2} status\non the user~2c making it incapable of action.\0" +.string "Inflicts damage on the target.\nHowever{COMMA} it also inflicts the {COLOR_2 CYAN}Paused{END_COLOR_TEXT_2} status\non the user{COMMA} making it incapable of action.\0" .align 2,0 .global MoveNameFrenzyPlant @@ -1215,7 +1215,7 @@ MoveNameFrenzyPlant: .global MoveDescriptionCurse MoveDescriptionCurse: -.string "Boosts the user~27s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by\none level~2c but also lowers {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2}\nby one level. If used by a Ghost type~2c the\ntarget is {COLOR_2 CYAN}cursed{END_COLOR_TEXT_2}~2c and the user~27s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} halved.\0" +.string "Boosts the user{APOSTROPHE}s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by\none level{COMMA} but also lowers {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2}\nby one level. If used by a Ghost type{COMMA} the\ntarget is {COLOR_2 CYAN}cursed{END_COLOR_TEXT_2}{COMMA} and the user{APOSTROPHE}s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} halved.\0" .align 2,0 .global MoveNameCurse @@ -1225,7 +1225,7 @@ MoveNameCurse: .global MoveDescriptionSwallow MoveDescriptionSwallow: -.string "Restores the user~27s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\nThe {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} recovered depends on how often\nthe move {COLOR_2 GREEN}Stockpile{END_COLOR_TEXT_2} was used before.\0" +.string "Restores the user{APOSTROPHE}s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\nThe {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} recovered depends on how often\nthe move {COLOR_2 GREEN}Stockpile{END_COLOR_TEXT_2} was used before.\0" .align 2,0 .global MoveNameBodySlam @@ -1245,7 +1245,7 @@ MoveNameConfusion: .global MoveDescriptionIngrain MoveDescriptionIngrain: -.string "The user gains the {COLOR_2 CYAN}Ingrain{END_COLOR_TEXT_2} status.\nThe user becomes incapable of moving~2c\nbut regains {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} over several turns.\0" +.string "The user gains the {COLOR_2 CYAN}Ingrain{END_COLOR_TEXT_2} status.\nThe user becomes incapable of moving{COMMA}\nbut regains {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} over several turns.\0" .align 2,0 .global MoveNameIngrain @@ -1255,7 +1255,7 @@ MoveNameIngrain: .global MoveDescriptionRest MoveDescriptionRest: -.string "The user gains the {COLOR_2 CYAN}Napping{END_COLOR_TEXT_2} status.\nUpon awakening~2c the Pokémon regains {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}\nand recovers from any status problems.\0" +.string "The user gains the {COLOR_2 CYAN}Napping{END_COLOR_TEXT_2} status.\nUpon awakening{COMMA} the Pokémon regains {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}\nand recovers from any status problems.\0" .align 2,0 .global MoveNameRest @@ -1265,7 +1265,7 @@ MoveNameRest: .global MoveDescriptionSleepPowder MoveDescriptionSleepPowder: -.string "Makes all foes around the user go to\n{COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}~2c making them incapable of action.\0" +.string "Makes all foes around the user go to\n{COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}{COMMA} making them incapable of action.\0" .align 2,0 .global MoveNameSleepPowder @@ -1285,7 +1285,7 @@ MoveNameHeatWave: .global MoveUseTextAssist MoveUseTextAssist: -.string "$m0 chose $i0!\0" +.string "{ARG_POKEMON_0} chose {ARG_MOVE_ITEM_0}!\0" .align 2,0 .global MoveDescriptionAssist @@ -1300,7 +1300,7 @@ MoveNameAssist: .global MoveDescriptionPayDay MoveDescriptionPayDay: -.string "Inflicts damage on the target.\nIf the foe faints~2c it will drop money.\0" +.string "Inflicts damage on the target.\nIf the foe faints{COMMA} it will drop money.\0" .align 2,0 .global MoveNamePayDay @@ -1330,7 +1330,7 @@ MoveNameFakeOut: .global MoveDescriptionWish MoveDescriptionWish: -.string "The user gains the {COLOR_2 CYAN}Wish{END_COLOR_TEXT_2} status.\nIt boosts the user~27s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} recovery rate.\0" +.string "The user gains the {COLOR_2 CYAN}Wish{END_COLOR_TEXT_2} status.\nIt boosts the user{APOSTROPHE}s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} recovery rate.\0" .align 2,0 .global MoveNameLeer @@ -1340,7 +1340,7 @@ MoveNameLeer: .global MoveDescriptionSunnyDay MoveDescriptionSunnyDay: -.string "Changes the dungeon floor~27s weather to\n{COLOR_2 CYAN}Sunny{END_COLOR_TEXT_2} over several turns.\0" +.string "Changes the dungeon floor{APOSTROPHE}s weather to\n{COLOR_2 CYAN}Sunny{END_COLOR_TEXT_2} over several turns.\0" .align 2,0 .global MoveNameSunnyDay @@ -1365,7 +1365,7 @@ MoveNameNeedleArm: .global MoveDescriptionRolePlay MoveDescriptionRolePlay: -.string "Copies the target~27s {COLOR_2 YELLOW}Special Ability{END_COLOR_TEXT_2}.\nThe user regains its own {COLOR_2 YELLOW}Special Ability{END_COLOR_TEXT_2}\nwhen it leaves the floor.\0" +.string "Copies the target{APOSTROPHE}s {COLOR_2 YELLOW}Special Ability{END_COLOR_TEXT_2}.\nThe user regains its own {COLOR_2 YELLOW}Special Ability{END_COLOR_TEXT_2}\nwhen it leaves the floor.\0" .align 2,0 .global MoveNameRolePlay @@ -1400,7 +1400,7 @@ MoveNameGrowl: .global MoveDescriptionNightShade MoveDescriptionNightShade: -.string "Damages all foes around the user.\nThe amount of damage depends on the\nuser~27s {COLOR_2 YELLOW}level{END_COLOR_TEXT_2}.\0" +.string "Damages all foes around the user.\nThe amount of damage depends on the\nuser{APOSTROPHE}s {COLOR_2 YELLOW}level{END_COLOR_TEXT_2}.\0" .align 2,0 .global MoveNameNightShade @@ -1410,7 +1410,7 @@ MoveNameNightShade: .global MoveDescriptionAmnesia MoveDescriptionAmnesia: -.string "Boosts the user~27s {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by\ntwo levels.\0" +.string "Boosts the user{APOSTROPHE}s {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by\ntwo levels.\0" .align 2,0 .global MoveNameAmnesia @@ -1420,7 +1420,7 @@ MoveNameAmnesia: .global MoveDescriptionThief MoveDescriptionThief: -.string "Inflicts damage on the target.\nIt also snatches the target~27s hold item\nto make it the user~27s.\0" +.string "Inflicts damage on the target.\nIt also snatches the target{APOSTROPHE}s hold item\nto make it the user{APOSTROPHE}s.\0" .align 2,0 .global MoveNameThief @@ -1430,7 +1430,7 @@ MoveNameThief: .global MoveDescriptionMudSlap MoveDescriptionMudSlap: -.string "Inflicts damage on the target.\nIt also lowers the target~27s {COLOR_2 YELLOW}Accuracy{END_COLOR_TEXT_2} by\none level.\0" +.string "Inflicts damage on the target.\nIt also lowers the target{APOSTROPHE}s {COLOR_2 YELLOW}Accuracy{END_COLOR_TEXT_2} by\none level.\0" .align 2,0 .global MoveNameMudSlap @@ -1440,7 +1440,7 @@ MoveNameMudSlap: .global MoveDescriptionMudSport MoveDescriptionMudSport: -.string "Changes the floor~27s status to {COLOR_2 CYAN}Mud Sport{END_COLOR_TEXT_2}~2c\nwhich halves the power of Electric-type\nmoves.\0" +.string "Changes the floor{APOSTROPHE}s status to {COLOR_2 CYAN}Mud Sport{END_COLOR_TEXT_2}{COMMA}\nwhich halves the power of Electric-type\nmoves.\0" .align 2,0 .global MoveNameMudSport @@ -1465,7 +1465,7 @@ MoveNameTripleKick: .global MoveDescriptionTrick MoveDescriptionTrick: -.string "Switches the user~27s hold item with the\ntarget~27s hold item.\nIt only works if both Pokémon hold items.\0" +.string "Switches the user{APOSTROPHE}s hold item with the\ntarget{APOSTROPHE}s hold item.\nIt only works if both Pokémon hold items.\0" .align 2,0 .global MoveNameTrick @@ -1480,7 +1480,7 @@ MoveNameDragonClaw: .global MoveDescriptionTriAttack MoveDescriptionTriAttack: -.string "Inflicts damage on the target.\nIt may also cause a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}~2c\n{COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}~2c or leave the target {COLOR_2 CYAN}frozen{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target.\nIt may also cause a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}{COMMA}\n{COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}{COMMA} or leave the target {COLOR_2 CYAN}frozen{END_COLOR_TEXT_2}.\0" .align 2,0 .global MoveNameTriAttack @@ -1495,12 +1495,12 @@ MoveNameHiJumpKick: .global MoveDescriptionBounce MoveDescriptionBounce: -.string "The user gains the {COLOR_2 CYAN}Bouncing{END_COLOR_TEXT_2} status~2c\nmaking it attack strongly on the next turn.\nIt may also cause {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" +.string "The user gains the {COLOR_2 CYAN}Bouncing{END_COLOR_TEXT_2} status{COMMA}\nmaking it attack strongly on the next turn.\nIt may also cause {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" .align 2,0 .global MoveDescriptionJumpKick MoveDescriptionJumpKick: -.string "Inflicts damage on the target~2c but hurts\nthe user if it misses.\0" +.string "Inflicts damage on the target{COMMA} but hurts\nthe user if it misses.\0" .align 2,0 .global MoveNameJumpKick @@ -1510,7 +1510,7 @@ MoveNameJumpKick: .global MoveDescriptionTakeDown MoveDescriptionTakeDown: -.string "Inflicts damage on the target~2c but also\nhurts the user.\0" +.string "Inflicts damage on the target{COMMA} but also\nhurts the user.\0" .align 2,0 .global MoveNameTakeDown @@ -1540,7 +1540,7 @@ MoveNamePoisonpowder: .global MoveDescriptionPoisonFang MoveDescriptionPoisonFang: -.string "Inflicts damage on the target.\nIt may also leave the target\n{COLOR_2 CYAN}badly poisoned{END_COLOR_TEXT_2}~2c damaging it over\nseveral turns.\0" +.string "Inflicts damage on the target.\nIt may also leave the target\n{COLOR_2 CYAN}badly poisoned{END_COLOR_TEXT_2}{COMMA} damaging it over\nseveral turns.\0" .align 2,0 .global MoveNamePoisonFang @@ -1550,7 +1550,7 @@ MoveNamePoisonFang: .global MoveDescriptionToxic MoveDescriptionToxic: -.string "{COLOR_2 CYAN}Badly poisons{END_COLOR_TEXT_2} the target.\nIf a Pokémon is {COLOR_2 CYAN}badly poisoned{END_COLOR_TEXT_2}~2c it\nsustains damage over several turns.\0" +.string "{COLOR_2 CYAN}Badly poisons{END_COLOR_TEXT_2} the target.\nIf a Pokémon is {COLOR_2 CYAN}badly poisoned{END_COLOR_TEXT_2}{COMMA} it\nsustains damage over several turns.\0" .align 2,0 .global MoveNameToxic @@ -1560,7 +1560,7 @@ MoveNameToxic: .global MoveDescriptionPoison MoveDescriptionPoison: -.string "{COLOR_2 CYAN}Poisons{END_COLOR_TEXT_2} the target.\nIf a Pokémon is {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}~2c it sustains\ndamage over several turns.\0" +.string "{COLOR_2 CYAN}Poisons{END_COLOR_TEXT_2} the target.\nIf a Pokémon is {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}{COMMA} it sustains\ndamage over several turns.\0" .align 2,0 .global MoveNameHowl @@ -1570,7 +1570,7 @@ MoveNameHowl: .global MoveDescriptionBlock MoveDescriptionBlock: -.string "Inflicts the {COLOR_2 CYAN}Leg Hold{END_COLOR_TEXT_2} status on the\ntarget~2c making it incapable of movement.\0" +.string "Inflicts the {COLOR_2 CYAN}Leg Hold{END_COLOR_TEXT_2} status on the\ntarget{COMMA} making it incapable of movement.\0" .align 2,0 .global MoveNameBlock @@ -1580,7 +1580,7 @@ MoveNameBlock: .global MoveDescriptionZapCannon MoveDescriptionZapCannon: -.string "Inflicts damage on the target~2c even at a\ndistance. It also causes {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}~2c\npreventing any attacks or moves.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance. It also causes {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}{COMMA}\npreventing any attacks or moves.\0" .align 2,0 .global MoveNameZapCannon @@ -1605,7 +1605,7 @@ MoveNameQuickAttack: .global MoveDescriptionShockWave MoveDescriptionShockWave: -.string "Inflicts damage on the target~2c even at a\ndistance.\nIt never misses.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance.\nIt never misses.\0" .align 2,0 .global MoveNameShockWave @@ -1630,7 +1630,7 @@ MoveNameTeleport: .global MoveDescriptionBoostDefenseTwo MoveDescriptionBoostDefenseTwo: -.string "Boosts the user~27s {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by two levels.\0" +.string "Boosts the user{APOSTROPHE}s {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by two levels.\0" .align 2,0 .global MoveNameIronDefense @@ -1650,7 +1650,7 @@ MoveNameHelpingHand: .global MoveDescriptionConversion2 MoveDescriptionConversion2: -.string "The user gains the {COLOR_2 CYAN}Conversion 2{END_COLOR_TEXT_2} status.\nIt changes the user~27s type to one that is\nstrong against the move type it took last.\0" +.string "The user gains the {COLOR_2 CYAN}Conversion 2{END_COLOR_TEXT_2} status.\nIt changes the user{APOSTROPHE}s type to one that is\nstrong against the move type it took last.\0" .align 2,0 .global MoveNameConversion2 @@ -1660,7 +1660,7 @@ MoveNameConversion2: .global MoveDescriptionConversion MoveDescriptionConversion: -.string "Changes the user~27s type into the same\ntype as one of its moves.\0" +.string "Changes the user{APOSTROPHE}s type into the same\ntype as one of its moves.\0" .align 2,0 .global MoveNameConversion @@ -1675,7 +1675,7 @@ MoveNameVineWhip: .global MoveDescriptionSwordsDance MoveDescriptionSwordsDance: -.string "Boosts the user~27s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} by two levels.\0" +.string "Boosts the user{APOSTROPHE}s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} by two levels.\0" .align 2,0 .global MoveNameSwordsDance @@ -1735,7 +1735,7 @@ MoveNameTaunt: .global MoveDescriptionConfuse MoveDescriptionConfuse: -.string "Inflicts the {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2} status on the\ntarget~2c making its attacks and\nmovements erratic.\0" +.string "Inflicts the {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2} status on the\ntarget{COMMA} making its attacks and\nmovements erratic.\0" .align 2,0 .global MoveNameSupersonic @@ -1745,7 +1745,7 @@ MoveNameSupersonic: .global MoveDescriptionSeismicToss MoveDescriptionSeismicToss: -.string "Inflicts damage on the target.\nThe amount of damage depends on the\nuser~27s {COLOR_2 YELLOW}level{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target.\nThe amount of damage depends on the\nuser{APOSTROPHE}s {COLOR_2 YELLOW}level{END_COLOR_TEXT_2}.\0" .align 2,0 .global MoveNameSeismicToss @@ -1785,7 +1785,7 @@ MoveNameSoftboiled: .global MoveDescriptionTwineedle MoveDescriptionTwineedle: -.string "Hits the target twice~2c even at a distance.\nIt may also leave the target {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}~2c\ndamaging it over several turns.\0" +.string "Hits the target twice{COMMA} even at a distance.\nIt may also leave the target {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}{COMMA}\ndamaging it over several turns.\0" .align 2,0 .global MoveNameTwineedle @@ -1795,7 +1795,7 @@ MoveNameTwineedle: .global MoveDescriptionMultiHitDistance MoveDescriptionMultiHitDistance: -.string "Inflicts damage on the target~2c even at a\ndistance.\nIt hits two to five times in succession.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance.\nIt hits two to five times in succession.\0" .align 2,0 .global MoveNameBulletSeed @@ -1805,7 +1805,7 @@ MoveNameBulletSeed: .global MoveDescriptionTwister MoveDescriptionTwister: -.string "Inflicts damage on the target. It may also\ncause the target to {COLOR_2 CYAN}cringe{END_COLOR_TEXT_2}~2c making\nit incapable of action. Doubles damage\non a {COLOR_2 CYAN}flying{END_COLOR_TEXT_2} or {COLOR_2 CYAN}bouncing{END_COLOR_TEXT_2} Pokémon.\0" +.string "Inflicts damage on the target. It may also\ncause the target to {COLOR_2 CYAN}cringe{END_COLOR_TEXT_2}{COMMA} making\nit incapable of action. Doubles damage\non a {COLOR_2 CYAN}flying{END_COLOR_TEXT_2} or {COLOR_2 CYAN}bouncing{END_COLOR_TEXT_2} Pokémon.\0" .align 2,0 .global MoveNameTwister @@ -1830,7 +1830,7 @@ MoveNameStockpile: .global MoveDescriptionMuddyWater MoveDescriptionMuddyWater: -.string "Inflicts damage on the target.\nIt may also lower the target~27s {COLOR_2 YELLOW}Accuracy{END_COLOR_TEXT_2}\nby one level.\0" +.string "Inflicts damage on the target.\nIt may also lower the target{APOSTROPHE}s {COLOR_2 YELLOW}Accuracy{END_COLOR_TEXT_2}\nby one level.\0" .align 2,0 .global MoveNameMuddyWater @@ -1850,7 +1850,7 @@ MoveNameFireBlast: .global MoveDescriptionDive MoveDescriptionDive: -.string "The user gains the {COLOR_2 CYAN}Diving{END_COLOR_TEXT_2} status~2c\nmaking it attack strongly on the next turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\nIt can~27t be used without water.\0" +.string "The user gains the {COLOR_2 CYAN}Diving{END_COLOR_TEXT_2} status{COMMA}\nmaking it attack strongly on the next turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\nIt can{APOSTROPHE}t be used without water.\0" .align 2,0 .global MoveNameDive @@ -1860,7 +1860,7 @@ MoveNameDive: .global MoveDescriptionExplosion MoveDescriptionExplosion: -.string "Makes the user blow up in\na {COLOR_2 CYAN}huge explosion{END_COLOR_TEXT_2}~2c inflicting damage on all\nsurrounding Pokémon. It also destroys\nsurrounding items and walls.\0" +.string "Makes the user blow up in\na {COLOR_2 CYAN}huge explosion{END_COLOR_TEXT_2}{COMMA} inflicting damage on all\nsurrounding Pokémon. It also destroys\nsurrounding items and walls.\0" .align 2,0 .global MoveNameExplosion @@ -1875,7 +1875,7 @@ MoveNameTackle: .global MoveDescriptionFly MoveDescriptionFly: -.string "The user gains the {COLOR_2 CYAN}Flying{END_COLOR_TEXT_2} status~2c \nmaking it attack strongly on the next turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" +.string "The user gains the {COLOR_2 CYAN}Flying{END_COLOR_TEXT_2} status{COMMA} \nmaking it attack strongly on the next turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" .align 2,0 .global MoveNameFly @@ -1885,7 +1885,7 @@ MoveNameFly: .global MoveDescriptionSonicboom MoveDescriptionSonicboom: -.string "Inflicts a set amount of damage on the\ntarget~2c even at a distance.\0" +.string "Inflicts a set amount of damage on the\ntarget{COMMA} even at a distance.\0" .align 2,0 .global MoveNameSonicboom @@ -1895,7 +1895,7 @@ MoveNameSonicboom: .global MoveDescriptionSolarbeam MoveDescriptionSolarbeam: -.string "The user gains the {COLOR_2 CYAN}Solarbeam{END_COLOR_TEXT_2} status~2c\nmaking it attack strongly on the next turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" +.string "The user gains the {COLOR_2 CYAN}Solarbeam{END_COLOR_TEXT_2} status{COMMA}\nmaking it attack strongly on the next turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" .align 2,0 .global MoveNameSolarbeam @@ -1925,7 +1925,7 @@ MoveNameSacredFire: .global MoveDescriptionGrowth MoveDescriptionGrowth: -.string "Boosts the user~27s {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2} by one\nlevel.\0" +.string "Boosts the user{APOSTROPHE}s {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2} by one\nlevel.\0" .align 2,0 .global MoveNameGrowth @@ -1935,7 +1935,7 @@ MoveNameGrowth: .global MoveDescriptionPoisonChance MoveDescriptionPoisonChance: -.string "Inflicts damage on the target.\nIt may also leave the target {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}~2c\ndamaging it over several turns.\0" +.string "Inflicts damage on the target.\nIt may also leave the target {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}{COMMA}\ndamaging it over several turns.\0" .align 2,0 .global MoveNameSmog @@ -1965,7 +1965,7 @@ MoveNameSandTomb: .global MoveDescriptionLowerAccuracy MoveDescriptionLowerAccuracy: -.string "Lowers the target~27s {COLOR_2 YELLOW}Accuracy{END_COLOR_TEXT_2} by one level.\0" +.string "Lowers the target{APOSTROPHE}s {COLOR_2 YELLOW}Accuracy{END_COLOR_TEXT_2} by one level.\0" .align 2,0 .global MoveNameSandAttack @@ -1975,7 +1975,7 @@ MoveNameSandAttack: .global MoveDescriptionSandstorm MoveDescriptionSandstorm: -.string "Changes the dungeon floor~27s weather to\n{COLOR_2 CYAN}Sandstorm{END_COLOR_TEXT_2} for several turns.\0" +.string "Changes the dungeon floor{APOSTROPHE}s weather to\n{COLOR_2 CYAN}Sandstorm{END_COLOR_TEXT_2} for several turns.\0" .align 2,0 .global MoveNameSandstorm @@ -1995,7 +1995,7 @@ MoveNameHeadbutt: .global MoveDescriptionSketch MoveDescriptionSketch: -.string "Copies the move last used by the target\nand makes it the user~27s.\n{COLOR_2 GREEN}Sketch{END_COLOR_TEXT_2} disappears after it copies a move.\0" +.string "Copies the move last used by the target\nand makes it the user{APOSTROPHE}s.\n{COLOR_2 GREEN}Sketch{END_COLOR_TEXT_2} disappears after it copies a move.\0" .align 2,0 .global MoveNameSketch @@ -2005,7 +2005,7 @@ MoveNameSketch: .global MoveDescriptionSkillSwap MoveDescriptionSkillSwap: -.string "Switches the user~27s {COLOR_2 YELLOW}Special Ability{END_COLOR_TEXT_2} with\nthat of the target.\0" +.string "Switches the user{APOSTROPHE}s {COLOR_2 YELLOW}Special Ability{END_COLOR_TEXT_2} with\nthat of the target.\0" .align 2,0 .global MoveNameSkillSwap @@ -2030,7 +2030,7 @@ MoveNameAbsorb: .global MoveDescriptionSafeguard MoveDescriptionSafeguard: -.string "The user and team members in the same\nroom gain the {COLOR_2 CYAN}Safeguard{END_COLOR_TEXT_2} status~2c\nwhich prevents status problems.\0" +.string "The user and team members in the same\nroom gain the {COLOR_2 CYAN}Safeguard{END_COLOR_TEXT_2} status{COMMA}\nwhich prevents status problems.\0" .align 2,0 .global MoveNameSafeguard @@ -2040,7 +2040,7 @@ MoveNameSafeguard: .global MoveDescriptionExtrasensory MoveDescriptionExtrasensory: -.string "Inflicts damage on the target.\nIt may also cause the target to {COLOR_2 CYAN}cringe{END_COLOR_TEXT_2}~2c\nmaking it incapable of attacking\nor using moves.\0" +.string "Inflicts damage on the target.\nIt may also cause the target to {COLOR_2 CYAN}cringe{END_COLOR_TEXT_2}{COMMA}\nmaking it incapable of attacking\nor using moves.\0" .align 2,0 .global MoveNameExtrasensory @@ -2070,7 +2070,7 @@ MoveNameFissure: .global MoveDescriptionMist MoveDescriptionMist: -.string "The user gains the {COLOR_2 CYAN}Mist{END_COLOR_TEXT_2} status.\nIt prevents {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}~2c {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}~2c {COLOR_2 YELLOW}Special\nAttack{END_COLOR_TEXT_2}~2c {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}~2c {COLOR_2 YELLOW}Accuracy{END_COLOR_TEXT_2}~2c and\n{COLOR_2 YELLOW}Evasion{END_COLOR_TEXT_2} from being reduced.\0" +.string "The user gains the {COLOR_2 CYAN}Mist{END_COLOR_TEXT_2} status.\nIt prevents {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}{COMMA} {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}{COMMA} {COLOR_2 YELLOW}Special\nAttack{END_COLOR_TEXT_2}{COMMA} {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}{COMMA} {COLOR_2 YELLOW}Accuracy{END_COLOR_TEXT_2}{COMMA} and\n{COLOR_2 YELLOW}Evasion{END_COLOR_TEXT_2} from being reduced.\0" .align 2,0 .global MoveNameMist @@ -2100,7 +2100,7 @@ MoveNameCharge: .global MoveDescriptionShadowBall MoveDescriptionShadowBall: -.string "Inflicts damage on the target~2c even at a\ndistance. It may also lower the target~27s\n{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by one level.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance. It may also lower the target{APOSTROPHE}s\n{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by one level.\0" .align 2,0 .global MoveNameShadowBall @@ -2135,7 +2135,7 @@ MoveNameStunSpore: .global MoveDescriptionSelfdestruct MoveDescriptionSelfdestruct: -.string "Makes the user {COLOR_2 CYAN}explode{END_COLOR_TEXT_2}~2c inflicting\ndamage on all surrounding Pokémon.\nIt also destroys surrounding items.\0" +.string "Makes the user {COLOR_2 CYAN}explode{END_COLOR_TEXT_2}{COMMA} inflicting\ndamage on all surrounding Pokémon.\nIt also destroys surrounding items.\0" .align 2,0 .global MoveNameSelfdestruct @@ -2145,7 +2145,7 @@ MoveNameSelfdestruct: .global MoveDescriptionLowerDefense MoveDescriptionLowerDefense: -.string "Lowers the target~27s {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by one level.\0" +.string "Lowers the target{APOSTROPHE}s {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by one level.\0" .align 2,0 .global MoveNameTailWhip @@ -2155,7 +2155,7 @@ MoveNameTailWhip: .global MoveDescriptionFlail MoveDescriptionFlail: -.string "Inflicts damage on the target.\nThe lower the user~27s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}~2c the greater\nthe damage.\0" +.string "Inflicts damage on the target.\nThe lower the user{APOSTROPHE}s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}{COMMA} the greater\nthe damage.\0" .align 2,0 .global MoveNameFlail @@ -2190,7 +2190,7 @@ MoveNameEarthquake: .global MoveDescriptionRecover MoveDescriptionRecover: -.string "Restores the user~27s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} by half its\n{COLOR_2 YELLOW}maximum HP{END_COLOR_TEXT_2}.\0" +.string "Restores the user{APOSTROPHE}s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} by half its\n{COLOR_2 YELLOW}maximum HP{END_COLOR_TEXT_2}.\0" .align 2,0 .global MoveNameRecover @@ -2200,7 +2200,7 @@ MoveNameRecover: .global MoveDescriptionRecoil MoveDescriptionRecoil: -.string "Inflicts damage on the target.\nHowever~2c it also damages the user.\0" +.string "Inflicts damage on the target.\nHowever{COMMA} it also damages the user.\0" .align 2,0 .global MoveNameSubmission @@ -2210,7 +2210,7 @@ MoveNameSubmission: .global MoveDescriptionPsychUp MoveDescriptionPsychUp: -.string "Copies the target~27s levels for stats such\nas {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}.\0" +.string "Copies the target{APOSTROPHE}s levels for stats such\nas {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}.\0" .align 2,0 .global MoveNamePsychUp @@ -2225,7 +2225,7 @@ MoveNameSignalBeam: .global MoveDescriptionWaterSpout MoveDescriptionWaterSpout: -.string "Inflicts damage on the target.\nThe higher the user~27s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}~2c the greater\nthe damage.\0" +.string "Inflicts damage on the target.\nThe higher the user{APOSTROPHE}s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}{COMMA} the greater\nthe damage.\0" .align 2,0 .global MoveNameWaterSpout @@ -2235,7 +2235,7 @@ MoveNameWaterSpout: .global MoveDescriptionUproar MoveDescriptionUproar: -.string "The user and team members in the room\ngain the {COLOR_2 CYAN}Sleepless{END_COLOR_TEXT_2} status~2c\nso they cannot fall asleep.\nIt also awakens sleeping team members.\0" +.string "The user and team members in the room\ngain the {COLOR_2 CYAN}Sleepless{END_COLOR_TEXT_2} status{COMMA}\nso they cannot fall asleep.\nIt also awakens sleeping team members.\0" .align 2,0 .global MoveNameUproar @@ -2245,7 +2245,7 @@ MoveNameUproar: .global MoveDescriptionPsychoBoost MoveDescriptionPsychoBoost: -.string "Inflicts damage on the target.\nHowever~2c it also lowers the user~27s {COLOR_2 YELLOW}Special\nAttack{END_COLOR_TEXT_2} by two levels.\0" +.string "Inflicts damage on the target.\nHowever{COMMA} it also lowers the user{APOSTROPHE}s {COLOR_2 YELLOW}Special\nAttack{END_COLOR_TEXT_2} by two levels.\0" .align 2,0 .global MoveNamePsychoBoost @@ -2260,7 +2260,7 @@ MoveNamePsychic: .global MoveDescriptionPsywave MoveDescriptionPsywave: -.string "Inflicts damage on the target~2c even at a\ndistance. The amount of damage depends\non the user~27s {COLOR_2 YELLOW}level{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance. The amount of damage depends\non the user{APOSTROPHE}s {COLOR_2 YELLOW}level{END_COLOR_TEXT_2}.\0" .align 2,0 .global MoveNamePsywave @@ -2270,7 +2270,7 @@ MoveNamePsywave: .global MoveDescriptionConfuseChanceDistance MoveDescriptionConfuseChanceDistance: -.string "Inflicts damage on the target~2c even at a\ndistance. It may also leave the target\n{COLOR_2 CYAN}confused{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance. It may also leave the target\n{COLOR_2 CYAN}confused{END_COLOR_TEXT_2}.\0" .align 2,0 .global MoveNamePsybeam @@ -2280,7 +2280,7 @@ MoveNamePsybeam: .global MoveDescriptionLowerSpeed MoveDescriptionLowerSpeed: -.string "Lowers the target~27s {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} by\none level.\0" +.string "Lowers the target{APOSTROPHE}s {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} by\none level.\0" .align 2,0 .global MoveNameScaryFace @@ -2305,7 +2305,7 @@ MoveNameEndure: .global MoveDescriptionMeteorMash MoveDescriptionMeteorMash: -.string "Inflicts damage on the target~2c even at a\ndistance. It may also boost the user~27s\n{COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} by one level.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance. It may also boost the user{APOSTROPHE}s\n{COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} by one level.\0" .align 2,0 .global MoveNameMeteorMash @@ -2315,7 +2315,7 @@ MoveNameMeteorMash: .global MoveDescriptionFollowMe MoveDescriptionFollowMe: -.string "The user gains the {COLOR_2 CYAN}Decoy{END_COLOR_TEXT_2} status~2c\nmaking it the primary target of foes.\0" +.string "The user gains the {COLOR_2 CYAN}Decoy{END_COLOR_TEXT_2} status{COMMA}\nmaking it the primary target of foes.\0" .align 2,0 .global MoveNameFollowMe @@ -2335,7 +2335,7 @@ MoveNamePowderSnow: .global MoveDescriptionSkyAttack MoveDescriptionSkyAttack: -.string "The user gains the {COLOR_2 CYAN}Sky Attack{END_COLOR_TEXT_2} status~2c\nand it attacks strongly on the next turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" +.string "The user gains the {COLOR_2 CYAN}Sky Attack{END_COLOR_TEXT_2} status{COMMA}\nand it attacks strongly on the next turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" .align 2,0 .global MoveNameSkyAttack @@ -2345,7 +2345,7 @@ MoveNameSkyAttack: .global MoveDescriptionCosmicPower MoveDescriptionCosmicPower: -.string "Boosts the user~27s {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Special\nDefense{END_COLOR_TEXT_2} by one level.\0" +.string "Boosts the user{APOSTROPHE}s {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Special\nDefense{END_COLOR_TEXT_2} by one level.\0" .align 2,0 .global MoveNameCosmicPower @@ -2355,7 +2355,7 @@ MoveNameCosmicPower: .global MoveDescriptionMindReader MoveDescriptionMindReader: -.string "Gives the user {COLOR_2 CYAN}Sure Shot{END_COLOR_TEXT_2} status~2c making\nall its moves and attacks completely\naccurate.\0" +.string "Gives the user {COLOR_2 CYAN}Sure Shot{END_COLOR_TEXT_2} status{COMMA} making\nall its moves and attacks completely\naccurate.\0" .align 2,0 .global MoveNameMindReader @@ -2365,7 +2365,7 @@ MoveNameMindReader: .global MoveDescriptionIcyWind MoveDescriptionIcyWind: -.string "Inflicts damage on the target~2c even at a\ndistance. It also lowers the target~27s\n{COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} by one level.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance. It also lowers the target{APOSTROPHE}s\n{COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} by one level.\0" .align 2,0 .global MoveNameIcyWind @@ -2375,7 +2375,7 @@ MoveNameIcyWind: .global MoveDescriptionRapidSpin MoveDescriptionRapidSpin: -.string "Inflicts damage on the target.\nIt also frees the user from {COLOR_2 CYAN}Leech Seed{END_COLOR_TEXT_2}~2c\n{COLOR_2 CYAN}Leg Hold{END_COLOR_TEXT_2}~2c {COLOR_2 CYAN}Ingrain{END_COLOR_TEXT_2}~2c or {COLOR_2 CYAN}Constriction{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target.\nIt also frees the user from {COLOR_2 CYAN}Leech Seed{END_COLOR_TEXT_2}{COMMA}\n{COLOR_2 CYAN}Leg Hold{END_COLOR_TEXT_2}{COMMA} {COLOR_2 CYAN}Ingrain{END_COLOR_TEXT_2}{COMMA} or {COLOR_2 CYAN}Constriction{END_COLOR_TEXT_2}.\0" .align 2,0 .global MoveNameRapidSpin @@ -2395,7 +2395,7 @@ MoveNameAgility: .global MoveDescriptionSynthesis MoveDescriptionSynthesis: -.string "Restores the user~27s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\nThe amount of {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} regained depends on\nthe weather.\0" +.string "Restores the user{APOSTROPHE}s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\nThe amount of {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} regained depends on\nthe weather.\0" .align 2,0 .global MoveNameSynthesis @@ -2405,7 +2405,7 @@ MoveNameSynthesis: .global MoveDescriptionAncientpower MoveDescriptionAncientpower: -.string "Inflicts damage on the target.\nIt may also simultaneously raise by one\nlevel {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}~2c {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}~2c {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}~2c\n{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}~2c and {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target.\nIt may also simultaneously raise by one\nlevel {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}{COMMA} {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}{COMMA} {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}{COMMA}\n{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}{COMMA} and {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2}.\0" .align 2,0 .global MoveNameAncientpower @@ -2415,7 +2415,7 @@ MoveNameAncientpower: .global MoveDescriptionLowKick MoveDescriptionLowKick: -.string "Inflicts damage on the target.\nThe heavier the target~2c the greater the\ndamage.\0" +.string "Inflicts damage on the target.\nThe heavier the target{COMMA} the greater the\ndamage.\0" .align 2,0 .global MoveNameLowKick @@ -2425,7 +2425,7 @@ MoveNameLowKick: .global MoveDescriptionOutrage MoveDescriptionOutrage: -.string "Hits the target two to five times in\nsuccession. However~2c it also makes the\nuser {COLOR_2 CYAN}confused{END_COLOR_TEXT_2}.\0" +.string "Hits the target two to five times in\nsuccession. However{COMMA} it also makes the\nuser {COLOR_2 CYAN}confused{END_COLOR_TEXT_2}.\0" .align 2,0 .global MoveNameOutrage @@ -2445,7 +2445,7 @@ MoveNameMeanLook: .global MoveDescriptionHaze MoveDescriptionHaze: -.string "Resets the {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}~2c {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}~2c etc.~2c of all\nPokémon on the floor whether they were\nboosted or lowered.\0" +.string "Resets the {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}{COMMA} {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}{COMMA} etc.{COMMA} of all\nPokémon on the floor whether they were\nboosted or lowered.\0" .align 2,0 .global MoveNameHaze @@ -2460,7 +2460,7 @@ MoveNameCrabhammer: .global MoveDescriptionLegHolder MoveDescriptionLegHolder: -.string "Inflicts the {COLOR_2 CYAN}Leg Hold{END_COLOR_TEXT_2} status on the target~2c\nmaking it incapable of movement.\0" +.string "Inflicts the {COLOR_2 CYAN}Leg Hold{END_COLOR_TEXT_2} status on the target{COMMA}\nmaking it incapable of movement.\0" .align 2,0 .global MoveNameSpiderWeb @@ -2470,7 +2470,7 @@ MoveNameSpiderWeb: .global MoveDescriptionTickle MoveDescriptionTickle: -.string "Reduces the target~27s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}\nby one level.\0" +.string "Reduces the target{APOSTROPHE}s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}\nby one level.\0" .align 2,0 .global MoveNameTickle @@ -2480,7 +2480,7 @@ MoveNameTickle: .global MoveDescriptionSleep MoveDescriptionSleep: -.string "Makes the target go to {COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}~2c causing it\nto be incapable of action.\0" +.string "Makes the target go to {COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}{COMMA} causing it\nto be incapable of action.\0" .align 2,0 .global MoveNameGrasswhistle @@ -2490,7 +2490,7 @@ MoveNameGrasswhistle: .global MoveDescriptionMetalSound MoveDescriptionMetalSound: -.string "Reduces the target~27s {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by\nthree levels.\0" +.string "Reduces the target{APOSTROPHE}s {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by\nthree levels.\0" .align 2,0 .global MoveNameMetalSound @@ -2500,7 +2500,7 @@ MoveNameMetalSound: .global MoveDescriptionSilverWind MoveDescriptionSilverWind: -.string "Inflicts damage on foes in the same room.\nIt may also simultaneously raise by one\nlevel {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}~2c {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}~2c {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}~2c\n{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}~2c and {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on foes in the same room.\nIt may also simultaneously raise by one\nlevel {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}{COMMA} {COLOR_2 YELLOW}Special Attack{END_COLOR_TEXT_2}{COMMA} {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}{COMMA}\n{COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}{COMMA} and {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2}.\0" .align 2,0 .global MoveNameSilverWind @@ -2530,7 +2530,7 @@ MoveNameSpore: .global MoveDescriptionSmellingsalt MoveDescriptionSmellingsalt: -.string "Inflicts damage on the target.\nIt inflicts greater damage if the target\nhas {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}~2c but it also heals {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target.\nIt inflicts greater damage if the target\nhas {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}{COMMA} but it also heals {COLOR_2 CYAN}paralysis{END_COLOR_TEXT_2}.\0" .align 2,0 .global MoveNameSmellingsalt @@ -2540,7 +2540,7 @@ MoveNameSmellingsalt: .global MoveDescriptionReversal MoveDescriptionReversal: -.string "Inflicts damage on the target.\nThe lower the user~27s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}~2c the greater the\ndamage it inflicts.\0" +.string "Inflicts damage on the target.\nThe lower the user{APOSTROPHE}s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}{COMMA} the greater the\ndamage it inflicts.\0" .align 2,0 .global MoveNameReversal @@ -2550,7 +2550,7 @@ MoveNameReversal: .global MoveDescriptionDrain MoveDescriptionDrain: -.string "Inflicts damage on the target.\nIt also restores the user~27s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} based\non the damage it inflicted.\0" +.string "Inflicts damage on the target.\nIt also restores the user{APOSTROPHE}s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} based\non the damage it inflicted.\0" .align 2,0 .global MoveNameGigaDrain @@ -2560,7 +2560,7 @@ MoveNameGigaDrain: .global MoveDescriptionFocusPunch MoveDescriptionFocusPunch: -.string "The user gains the {COLOR_2 CYAN}Focus Punch{END_COLOR_TEXT_2} status~2c\nand it attacks on the next turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" +.string "The user gains the {COLOR_2 CYAN}Focus Punch{END_COLOR_TEXT_2} status{COMMA}\nand it attacks on the next turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" .align 2,0 .global MoveNameFocusPunch @@ -2570,7 +2570,7 @@ MoveNameFocusPunch: .global MoveDescriptionFocusEnergy MoveDescriptionFocusEnergy: -.string "The user gains the {COLOR_2 CYAN}Focus Energy{END_COLOR_TEXT_2} status~2c\nraising its critical-hit rate.\0" +.string "The user gains the {COLOR_2 CYAN}Focus Energy{END_COLOR_TEXT_2} status{COMMA}\nraising its critical-hit rate.\0" .align 2,0 .global MoveNameFocusEnergy @@ -2580,7 +2580,7 @@ MoveNameFocusEnergy: .global MoveDescriptionDamageLowerSpeed MoveDescriptionDamageLowerSpeed: -.string "Inflicts damage on the target.\nIt also lowers the target~27s {COLOR_2 YELLOW}Movement\nSpeed{END_COLOR_TEXT_2} by one level.\0" +.string "Inflicts damage on the target.\nIt also lowers the target{APOSTROPHE}s {COLOR_2 YELLOW}Movement\nSpeed{END_COLOR_TEXT_2} by one level.\0" .align 2,0 .global MoveNameRockTomb @@ -2590,7 +2590,7 @@ MoveNameRockTomb: .global MoveDescriptionBrickBreak MoveDescriptionBrickBreak: -.string "Shatters the target~27s {COLOR_2 CYAN}Reflect{END_COLOR_TEXT_2}\nor {COLOR_2 CYAN}Light Screen{END_COLOR_TEXT_2} to inflict damage.\0" +.string "Shatters the target{APOSTROPHE}s {COLOR_2 CYAN}Reflect{END_COLOR_TEXT_2}\nor {COLOR_2 CYAN}Light Screen{END_COLOR_TEXT_2} to inflict damage.\0" .align 2,0 .global MoveNameBrickBreak @@ -2600,7 +2600,7 @@ MoveNameBrickBreak: .global MoveDescriptionConstrict MoveDescriptionConstrict: -.string "Inflicts damage on the target.\nIt may also lower the target~27s {COLOR_2 YELLOW}Movement\nSpeed{END_COLOR_TEXT_2} by one level.\0" +.string "Inflicts damage on the target.\nIt may also lower the target{APOSTROPHE}s {COLOR_2 YELLOW}Movement\nSpeed{END_COLOR_TEXT_2} by one level.\0" .align 2,0 .global MoveNameConstrict @@ -2615,7 +2615,7 @@ MoveNameWithdraw: .global MoveDescriptionConstriction MoveDescriptionConstriction: -.string "Inflicts damage on the target.\nIt may also cause {COLOR_2 CYAN}constriction{END_COLOR_TEXT_2}~2c making the\nfoe incapable of movement.\0" +.string "Inflicts damage on the target.\nIt may also cause {COLOR_2 CYAN}constriction{END_COLOR_TEXT_2}{COMMA} making the\nfoe incapable of movement.\0" .align 2,0 .global MoveNameClamp @@ -2630,7 +2630,7 @@ MoveNameKarateChop: .global MoveDescriptionFacade MoveDescriptionFacade: -.string "Inflicts damage on the target.\nIf the user is {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}~2c {COLOR_2 CYAN}badly poisoned{END_COLOR_TEXT_2}~2c\nor has a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}~2c its power is doubled.\0" +.string "Inflicts damage on the target.\nIf the user is {COLOR_2 CYAN}poisoned{END_COLOR_TEXT_2}{COMMA} {COLOR_2 CYAN}badly poisoned{END_COLOR_TEXT_2}{COMMA}\nor has a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}{COMMA} its power is doubled.\0" .align 2,0 .global MoveNameFacade @@ -2640,7 +2640,7 @@ MoveNameFacade: .global MoveDescriptionEndeavor MoveDescriptionEndeavor: -.string "The difference between the foe~27s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} and\nthe user~27s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} is applied as this move~27s\ndamage.\0" +.string "The difference between the foe{APOSTROPHE}s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} and\nthe user{APOSTROPHE}s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} is applied as this move{APOSTROPHE}s\ndamage.\0" .align 2,0 .global MoveNameEndeavor @@ -2665,7 +2665,7 @@ MoveDescriptionThunder: .global MoveDescriptionLowerSpecialDefenseChance MoveDescriptionLowerSpecialDefenseChance: -.string "Inflicts damage on the target.\nIt may also lower the target~27s {COLOR_2 YELLOW}Special\nDefense{END_COLOR_TEXT_2} by one level.\0" +.string "Inflicts damage on the target.\nIt may also lower the target{APOSTROPHE}s {COLOR_2 YELLOW}Special\nDefense{END_COLOR_TEXT_2} by one level.\0" .align 2,0 .global MoveNameCrunch @@ -2675,7 +2675,7 @@ MoveNameCrunch: .global MoveDescriptionBide MoveDescriptionBide: -.string "The user gains the {COLOR_2 CYAN}Bide{END_COLOR_TEXT_2} status.\nWhen {COLOR_2 CYAN}Bide{END_COLOR_TEXT_2} is released~2c the user looses an\nattack double the damage it took\nwhile waiting.\0" +.string "The user gains the {COLOR_2 CYAN}Bide{END_COLOR_TEXT_2} status.\nWhen {COLOR_2 CYAN}Bide{END_COLOR_TEXT_2} is released{COMMA} the user looses an\nattack double the damage it took\nwhile waiting.\0" .align 2,0 .global MoveNameBide @@ -2685,7 +2685,7 @@ MoveNameBide: .global MoveDescriptionRazorWind MoveDescriptionRazorWind: -.string "The user gains the {COLOR_2 CYAN}Razor Wind{END_COLOR_TEXT_2} status~2c\nand it looses a powerful attack with a\nhigh critical-hit rate on the next turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" +.string "The user gains the {COLOR_2 CYAN}Razor Wind{END_COLOR_TEXT_2} status{COMMA}\nand it looses a powerful attack with a\nhigh critical-hit rate on the next turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" .align 2,0 .global MoveNameRazorWind @@ -2705,7 +2705,7 @@ MoveNameDisable: .global MoveDescriptionBoostDefense MoveDescriptionBoostDefense: -.string "Boosts the user~27s {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by one level.\0" +.string "Boosts the user{APOSTROPHE}s {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2} by one level.\0" .align 2,0 .global MoveNameHarden @@ -2725,7 +2725,7 @@ MoveNameGust: .global MoveDescriptionBoostEvasion MoveDescriptionBoostEvasion: -.string "Boosts the user~27s {COLOR_2 YELLOW}Evasion{END_COLOR_TEXT_2} by one level.\0" +.string "Boosts the user{APOSTROPHE}s {COLOR_2 YELLOW}Evasion{END_COLOR_TEXT_2} by one level.\0" .align 2,0 .global MoveNameDoubleTeam @@ -2735,7 +2735,7 @@ MoveNameDoubleTeam: .global MoveDescriptionBoostAttack MoveDescriptionBoostAttack: -.string "Boosts the user~27s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} by one level.\0" +.string "Boosts the user{APOSTROPHE}s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} by one level.\0" .align 2,0 .global MoveNameSharpen @@ -2755,7 +2755,7 @@ MoveNameOdorSleuth: .global MoveDescriptionFlamethrower MoveDescriptionFlamethrower: -.string "Inflicts damage on the target~2c even at a\ndistance. It may also cause a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}.\nIt thaws and frees frozen Pokémon.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance. It may also cause a {COLOR_2 CYAN}burn{END_COLOR_TEXT_2}.\nIt thaws and frees frozen Pokémon.\0" .align 2,0 .global MoveNameFlamethrower @@ -2790,7 +2790,7 @@ MoveNameStrength: .global MoveDescriptionGrudge MoveDescriptionGrudge: -.string "The user gains the {COLOR_2 CYAN}Grudge{END_COLOR_TEXT_2} status.\nIf the user is defeated~2c it zeroes the {COLOR_2 YELLOW}PP{END_COLOR_TEXT_2}\nof the move last used by the foe.\0" +.string "The user gains the {COLOR_2 CYAN}Grudge{END_COLOR_TEXT_2} status.\nIf the user is defeated{COMMA} it zeroes the {COLOR_2 YELLOW}PP{END_COLOR_TEXT_2}\nof the move last used by the foe.\0" .align 2,0 .global MoveNameGrudge @@ -2800,7 +2800,7 @@ MoveNameGrudge: .global MoveDescriptionReturn MoveDescriptionReturn: -.string "Inflicts damage on the target.\nIts power rises with the user~27s\n{COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target.\nIts power rises with the user{APOSTROPHE}s\n{COLOR_2 YELLOW}IQ{END_COLOR_TEXT_2}.\0" .align 2,0 .global MoveNameReturn @@ -2820,7 +2820,7 @@ MoveNameWillOWisp: .global MoveDescriptionCringe MoveDescriptionCringe: -.string "Inflicts damage on the target.\nIt may also cause the target to {COLOR_2 CYAN}cringe{END_COLOR_TEXT_2}~2c\nmaking it incapable of action.\0" +.string "Inflicts damage on the target.\nIt may also cause the target to {COLOR_2 CYAN}cringe{END_COLOR_TEXT_2}{COMMA}\nmaking it incapable of action.\0" .align 2,0 .global MoveNameAstonish @@ -2830,7 +2830,7 @@ MoveNameAstonish: .global MoveDescriptionFlatter MoveDescriptionFlatter: -.string "Inflicts the {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2} status on the\ntarget~2c but also raises its {COLOR_2 YELLOW}Special\nAttack{END_COLOR_TEXT_2} by one level.\0" +.string "Inflicts the {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2} status on the\ntarget{COMMA} but also raises its {COLOR_2 YELLOW}Special\nAttack{END_COLOR_TEXT_2} by one level.\0" .align 2,0 .global MoveNameFlatter @@ -2840,7 +2840,7 @@ MoveNameFlatter: .global MoveDescriptionOctazooka MoveDescriptionOctazooka: -.string "Inflicts damage on the target~2c even at a\ndistance. It may also lower the target~27s\n{COLOR_2 YELLOW}Accuracy{END_COLOR_TEXT_2} by one level.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance. It may also lower the target{APOSTROPHE}s\n{COLOR_2 YELLOW}Accuracy{END_COLOR_TEXT_2} by one level.\0" .align 2,0 .global MoveNameOctazooka @@ -2850,7 +2850,7 @@ MoveNameOctazooka: .global MoveDescriptionMemento MoveDescriptionMemento: -.string "Sharply reduces the {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Special\nAttack{END_COLOR_TEXT_2} of all foes in the room. It also\ncuts the user~27s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} to one and warps the\nuser to a different place on the floor.\n\0" +.string "Sharply reduces the {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} and {COLOR_2 YELLOW}Special\nAttack{END_COLOR_TEXT_2} of all foes in the room. It also\ncuts the user{APOSTROPHE}s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} to one and warps the\nuser to a different place on the floor.\n\0" .align 2,0 .global MoveNameMemento @@ -2860,7 +2860,7 @@ MoveNameMemento: .global MoveDescriptionAuroraBeam MoveDescriptionAuroraBeam: -.string "Inflicts damage on the target~2c even at a\ndistance. It may also halve the \ntarget~27s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance. It may also halve the \ntarget{APOSTROPHE}s {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2}.\0" .align 2,0 .global MoveNameAuroraBeam @@ -2870,7 +2870,7 @@ MoveNameAuroraBeam: .global MoveDescriptionOverheat MoveDescriptionOverheat: -.string "Damages all foes around the user~2c but\nalso lowers the user~27s {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}\nby two levels and thaws frozen Pokémon.\0" +.string "Damages all foes around the user{COMMA} but\nalso lowers the user{APOSTROPHE}s {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2}\nby two levels and thaws frozen Pokémon.\0" .align 2,0 .global MoveNameOverheat @@ -2910,7 +2910,7 @@ MoveNamePursuit: .global MoveDescriptionSmokescreen MoveDescriptionSmokescreen: -.string "Inflicts the {COLOR_2 CYAN}Whiffer{END_COLOR_TEXT_2} status on the target~2c\nmaking it miss almost all of its attacks\nand moves.\0" +.string "Inflicts the {COLOR_2 CYAN}Whiffer{END_COLOR_TEXT_2} status on the target{COMMA}\nmaking it miss almost all of its attacks\nand moves.\0" .align 2,0 .global MoveNameSmokescreen @@ -2930,7 +2930,7 @@ MoveNameAirCutter: .global MoveDescriptionSpite MoveDescriptionSpite: -.string "Zeroes the {COLOR_2 YELLOW}PP{END_COLOR_TEXT_2} of the move last used by\nthe target~2c making it unusable.\0" +.string "Zeroes the {COLOR_2 YELLOW}PP{END_COLOR_TEXT_2} of the move last used by\nthe target{COMMA} making it unusable.\0" .align 2,0 .global MoveNameSpite @@ -2940,7 +2940,7 @@ MoveNameSpite: .global MoveDescriptionSing MoveDescriptionSing: -.string "Makes the target go to {COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}~2c causing\nit to be incapable of action.\0" +.string "Makes the target go to {COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}{COMMA} causing\nit to be incapable of action.\0" .align 2,0 .global MoveNameSing @@ -2950,7 +2950,7 @@ MoveNameSing: .global MoveDescriptionFakeTears MoveDescriptionFakeTears: -.string "Lowers the target~27s {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by\ntwo levels.\0" +.string "Lowers the target{APOSTROPHE}s {COLOR_2 YELLOW}Special Defense{END_COLOR_TEXT_2} by\ntwo levels.\0" .align 2,0 .global MoveNameFakeTears @@ -2960,7 +2960,7 @@ MoveNameFakeTears: .global MoveDescriptionWhirlpool MoveDescriptionWhirlpool: -.string "Inflicts damage on the target.\nIt may also cause {COLOR_2 CYAN}constriction{END_COLOR_TEXT_2}~2c making the\nfoe incapable of movement.\nInflicts double damage on a {COLOR_2 CYAN}diving{END_COLOR_TEXT_2} foe.\0" +.string "Inflicts damage on the target.\nIt may also cause {COLOR_2 CYAN}constriction{END_COLOR_TEXT_2}{COMMA} making the\nfoe incapable of movement.\nInflicts double damage on a {COLOR_2 CYAN}diving{END_COLOR_TEXT_2} foe.\0" .align 2,0 .global MoveNameWhirlpool @@ -2970,7 +2970,7 @@ MoveNameWhirlpool: .global MoveDescriptionWeatherBall MoveDescriptionWeatherBall: -.string "Inflicts damage on the target~2c even at a\ndistance~2c using the weather~27s power.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance{COMMA} using the weather{APOSTROPHE}s power.\0" .align 2,0 .global MoveNameWeatherBall @@ -2980,7 +2980,7 @@ MoveNameWeatherBall: .global MoveDescriptionRockSlide MoveDescriptionRockSlide: -.string "Inflicts damage on the target.\nIt may also cause the target to {COLOR_2 CYAN}cringe{END_COLOR_TEXT_2}~2c \nmaking it incapable of action.\0" +.string "Inflicts damage on the target.\nIt may also cause the target to {COLOR_2 CYAN}cringe{END_COLOR_TEXT_2}{COMMA} \nmaking it incapable of action.\0" .align 2,0 .global MoveNameRockSlide @@ -3010,7 +3010,7 @@ MoveNameRockThrow: .global MoveDescriptionScreech MoveDescriptionScreech: -.string "Sharply lowers the target~27s {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}.\0" +.string "Sharply lowers the target{APOSTROPHE}s {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}.\0" .align 2,0 .global MoveNameHealBell @@ -3020,7 +3020,7 @@ MoveNameHealBell: .global MoveDescriptionSnore MoveDescriptionSnore: -.string "If the user is attacked while asleep~2c it\ncounterattacks. It may also cause the\ntarget to {COLOR_2 CYAN}cringe{END_COLOR_TEXT_2}~2c making it incapable\nof action.\0" +.string "If the user is attacked while asleep{COMMA} it\ncounterattacks. It may also cause the\ntarget to {COLOR_2 CYAN}cringe{END_COLOR_TEXT_2}{COMMA} making it incapable\nof action.\0" .align 2,0 .global MoveNameSnore @@ -3030,7 +3030,7 @@ MoveNameSnore: .global MoveDescriptionSwagger MoveDescriptionSwagger: -.string "Inflicts the {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2} status on the\ntarget~2c but also raises its {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} by\ntwo levels.\0" +.string "Inflicts the {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2} status on the\ntarget{COMMA} but also raises its {COLOR_2 YELLOW}Attack{END_COLOR_TEXT_2} by\ntwo levels.\0" .align 2,0 .global MoveNameSwagger @@ -3040,7 +3040,7 @@ MoveNameSwagger: .global MoveDescriptionStringShot MoveDescriptionStringShot: -.string "Reduces the target~27s {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} by\none level~2c even at a distance.\0" +.string "Reduces the target{APOSTROPHE}s {COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} by\none level{COMMA} even at a distance.\0" .align 2,0 .global MoveNameStringShot @@ -3050,7 +3050,7 @@ MoveNameStringShot: .global MoveDescriptionTorment MoveDescriptionTorment: -.string "Prevents the targeted Pokémon~2c\nwhile it remains on the floor~2c from \nusing the last move it used.\0" +.string "Prevents the targeted Pokémon{COMMA}\nwhile it remains on the floor{COMMA} from \nusing the last move it used.\0" .align 2,0 .global MoveNameTorment @@ -3060,7 +3060,7 @@ MoveNameTorment: .global MoveDescriptionPainSplit MoveDescriptionPainSplit: -.string "Adds the {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} of the user and the target~2c\nthen shares it equally.\0" +.string "Adds the {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2} of the user and the target{COMMA}\nthen shares it equally.\0" .align 2,0 .global MoveNamePainSplit @@ -3070,7 +3070,7 @@ MoveNamePainSplit: .global MoveDescriptionSuperFang MoveDescriptionSuperFang: -.string "Halves the target~27s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\0" +.string "Halves the target{APOSTROPHE}s {COLOR_2 YELLOW}HP{END_COLOR_TEXT_2}.\0" .align 2,0 .global MoveNameSuperFang @@ -3100,7 +3100,7 @@ MoveNameCut: .global MoveDescriptionEncore MoveDescriptionEncore: -.string "Inflicts the {COLOR_2 CYAN}Encore{END_COLOR_TEXT_2} status on the target~2c\nmaking it capable of using only\nthe move it last used.\0" +.string "Inflicts the {COLOR_2 CYAN}Encore{END_COLOR_TEXT_2} status on the target{COMMA}\nmaking it capable of using only\nthe move it last used.\0" .align 2,0 .global MoveNameEncore @@ -3110,7 +3110,7 @@ MoveNameEncore: .global MoveDescriptionLowerSpeedChanceDistance MoveDescriptionLowerSpeedChanceDistance: -.string "Inflicts damage on the target~2c even at a\ndistance. It may also lower the target~27s\n{COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} by one level.\0" +.string "Inflicts damage on the target{COMMA} even at a\ndistance. It may also lower the target{APOSTROPHE}s\n{COLOR_2 YELLOW}Movement Speed{END_COLOR_TEXT_2} by one level.\0" .align 2,0 .global MoveNameBubble @@ -3130,7 +3130,7 @@ MoveNameAromatherapy: .global MoveDescriptionHail MoveDescriptionHail: -.string "Changes the dungeon floor~27s weather to\n{COLOR_2 CYAN}Hail{END_COLOR_TEXT_2} for several turns.\0" +.string "Changes the dungeon floor{APOSTROPHE}s weather to\n{COLOR_2 CYAN}Hail{END_COLOR_TEXT_2} for several turns.\0" .align 2,0 .global MoveNameHail @@ -3140,7 +3140,7 @@ MoveNameHail: .global MoveDescriptionConfuseRay MoveDescriptionConfuseRay: -.string "Inflicts the {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2} status on\nthe target~2c making its attacks and\nmovements erratic.\0" +.string "Inflicts the {COLOR_2 CYAN}Confused{END_COLOR_TEXT_2} status on\nthe target{COMMA} making its attacks and\nmovements erratic.\0" .align 2,0 .global MoveNameConfuseRay @@ -3150,7 +3150,7 @@ MoveNameConfuseRay: .global MoveDescriptionRainDance MoveDescriptionRainDance: -.string "Changes the dungeon floor~27s weather to\n{COLOR_2 CYAN}Rain{END_COLOR_TEXT_2} over several turns.\0" +.string "Changes the dungeon floor{APOSTROPHE}s weather to\n{COLOR_2 CYAN}Rain{END_COLOR_TEXT_2} over several turns.\0" .align 2,0 .global MoveNameRainDance @@ -3190,7 +3190,7 @@ MoveNameThrash: .global MoveDescriptionDig MoveDescriptionDig: -.string "The user gains the {COLOR_2 CYAN}Digging{END_COLOR_TEXT_2} status~2c\nand it attacks on the next turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" +.string "The user gains the {COLOR_2 CYAN}Digging{END_COLOR_TEXT_2} status{COMMA}\nand it attacks on the next turn.\nIt is not possible to {COLOR_2 CYAN}link{END_COLOR_TEXT_2} this move.\0" .align 2,0 .global MoveNameDig @@ -3220,7 +3220,7 @@ MoveNameMorningSun: .global MoveDescriptionNightmare MoveDescriptionNightmare: -.string "Inflicts the {COLOR_2 CYAN}Nightmare{END_COLOR_TEXT_2} status\non the target~2c making it incapable\nof action.\0" +.string "Inflicts the {COLOR_2 CYAN}Nightmare{END_COLOR_TEXT_2} status\non the target{COMMA} making it incapable\nof action.\0" .align 2,0 .global MoveNameNightmare @@ -3230,7 +3230,7 @@ MoveNameNightmare: .global MoveDescriptionLovelyKiss MoveDescriptionLovelyKiss: -.string "Makes all foes around the user go to {COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}~2c\ncausing them to be incapable of action.\0" +.string "Makes all foes around the user go to {COLOR_2 CYAN}sleep{END_COLOR_TEXT_2}{COMMA}\ncausing them to be incapable of action.\0" .align 2,0 .global MoveNameLovelyKiss @@ -3260,12 +3260,12 @@ MoveNameIceBall: .global MoveUseTextUse MoveUseTextUse: -.string "$m0 used $i0!\0" +.string "{ARG_POKEMON_0} used {ARG_MOVE_ITEM_0}!\0" .align 2,0 .global MoveDescriptionLowerDefenseChance MoveDescriptionLowerDefenseChance: -.string "Inflicts damage on the target.\nIt may also lower the target~27s {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}\nby one level.\0" +.string "Inflicts damage on the target.\nIt may also lower the target{APOSTROPHE}s {COLOR_2 YELLOW}Defense{END_COLOR_TEXT_2}\nby one level.\0" .align 2,0 .global MoveNameIronTail diff --git a/data/personality_test.s b/data/personality_test.s index ffbef22..c70e045 100644 --- a/data/personality_test.s +++ b/data/personality_test.s @@ -89,7 +89,7 @@ .4byte HardyQuest3Points HardyQuest3Question: - .string "When the going gets tough~2c do you get\n" + .string "When the going gets tough{COMMA} do you get\n" .string "going?\0" .align 2,0 @@ -129,7 +129,7 @@ HardyQuest4Question: .string "There is a bucket. If you put\n" - .string "water in it~2c how high will you fill it?\0" + .string "water in it{COMMA} how high will you fill it?\0" .align 2,0 @ Question 1, Category 2 (Docile) @@ -213,7 +213,7 @@ .4byte -1 DocileQuest3_Cool: - .string "Say thanks~2c but be cool.\0" + .string "Say thanks{COMMA} but be cool.\0" .align 2,0 DocileQuest3_Joke: @@ -231,7 +231,7 @@ .4byte DocileQuest3Points DocileQuest3Question: - .string "A friend brought over something you~27d\n" + .string "A friend brought over something you{APOSTROPHE}d\n" .string "forgotten.#W\n" .string "How do you thank your friend?\0" .align 2,0 @@ -294,8 +294,8 @@ .4byte BraveQuest1Points BraveQuest1Question: - .string "You~27re going bungee jumping for the first\n" - .string "time.#PSince it~27s scary~2c you decide to test the\n" + .string "You{APOSTROPHE}re going bungee jumping for the first\n" + .string "time.#PSince it{APOSTROPHE}s scary{COMMA} you decide to test the\n" .string "jump with a doll...#W\n" .string "And the bungee cord snaps!#P" .string "Will you still try to make a jump anyway?\0" @@ -368,9 +368,9 @@ BraveQuest2BQuestion: .string "You valiantly fight the aliens...#W\n" - .string "But~2c you are defeated...#PAn alien says to you...#P~93YOU HAVE IMPRESSED US.\n" - .string "IT WAS A PLEASURE TO SEE.#PJOIN US~2c AND TOGETHER WE SHALL\n" - .string "RULE THE WORLD.~94#W\n" + .string "But{COMMA} you are defeated...#PAn alien says to you...#P{QUOTE_START}YOU HAVE IMPRESSED US.\n" + .string "IT WAS A PLEASURE TO SEE.#PJOIN US{COMMA} AND TOGETHER WE SHALL\n" + .string "RULE THE WORLD.{QUOTE_END}#W\n" .string "What will you do?\0" .align 2,0 @@ -434,7 +434,7 @@ .align 2,0 BraveQuest4_Scared: - .string "Help~2c even if scared.\0" + .string "Help{COMMA} even if scared.\0" .align 2,0 BraveQuest4_Hesitation: @@ -457,7 +457,7 @@ JollyQuest1Points: .byte 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 - + JollyQuest1Answers: .4byte HardyQuest2_Yes .byte 0x00, 0x00, 0x00, 0x00 @@ -535,7 +535,7 @@ .4byte JollyQuest3Points JollyQuest3Question: - .string "It~27s the summer holidays!\n" + .string "It{APOSTROPHE}s the summer holidays!\n" .string "Where would you like to go?\0" .align 2,0 @@ -556,7 +556,7 @@ .4byte -1 JollyQuest4_Go: - .string "Right... Well~2c I gotta go.\0" + .string "Right... Well{COMMA} I gotta go.\0" .align 2,0 JollyQuest4_Again: @@ -576,7 +576,7 @@ JollyQuest4Question: .string "A foreign person has started up a\n" .string "conversation with you.#P" - .string "To be honest~2c you don~27t have a clue what\n" + .string "To be honest{COMMA} you don{APOSTROPHE}t have a clue what\n" .string "this fellow is saying.#W\n" .string "How do you reply?\0" .align 2,0 @@ -1038,8 +1038,8 @@ .global HastyQuest1Question HastyQuest1Question: .string "You receive a gift!#W\n" - .string "But you don~27t know what~27s in it.#W\n" - .string "You~27re curious~2c so what do you do?\0" + .string "But you don{APOSTROPHE}t know what{APOSTROPHE}s in it.#W\n" + .string "You{APOSTROPHE}re curious{COMMA} so what do you do?\0" .align 2,0 @ Question 2, Category 8 (Hasty) @@ -1107,7 +1107,7 @@ .global HastyQuest3_Empty HastyQuest3_Empty: - .string "It~27s going to be empty...\0" + .string "It{APOSTROPHE}s going to be empty...\0" .align 2,0 .global HastyQuest3_Trap @@ -1219,7 +1219,7 @@ .global SassyQuest1Question SassyQuest1Question: - .string "Your country~27s leader is in front of you.\n" + .string "Your country{APOSTROPHE}s leader is in front of you.\n" .string "How do you speak to him or her?\0" .align 2,0 @@ -1458,7 +1458,7 @@ .global RelaxedQuest2Question RelaxedQuest2Question: - .string "Do you get the feeling that you~27ve slowed\n" + .string "Do you get the feeling that you{APOSTROPHE}ve slowed\n" .string "down lately?\0" .align 2,0 @@ -1621,8 +1621,8 @@ .global LonelyQuest3Question LonelyQuest3Question: - .string "What do you do with your room~27s light\n" - .string "when you~27re going to bed at night?\0" + .string "What do you do with your room{APOSTROPHE}s light\n" + .string "when you{APOSTROPHE}re going to bed at night?\0" .align 2,0 @ Question 4, Category 12 (Lonely) @@ -1666,7 +1666,7 @@ .global LonelyQuest4Question LonelyQuest4Question: - .string "It~27s a weekend~2c but no one will play\n" + .string "It{APOSTROPHE}s a weekend{COMMA} but no one will play\n" .string "with you...\n" .string "What do you do?\0" .align 2,0 @@ -1723,7 +1723,7 @@ .global QuirkyQuest2_MayMayNot QuirkyQuest2_MayMayNot: - .string "May reply~2c may not.\0" + .string "May reply{COMMA} may not.\0" .align 2,0 .global QuirkyQuest2_Reply @@ -1792,7 +1792,7 @@ .global QuirkyQuest3Question QuirkyQuest3Question: .string "There is a person you like...#W\n" - .string "But there~27s no opportunity to get close.\n" + .string "But there{APOSTROPHE}s no opportunity to get close.\n" .string "What do you do?\0" .align 2,0 @@ -1821,7 +1821,7 @@ .global QuirkyQuest4_GoLeft QuirkyQuest4_GoLeft: - .string "It~27s a trap! Go left.\0" + .string "It{APOSTROPHE}s a trap! Go left.\0" .align 2,0 .global QuirkyQuest4_GoRight @@ -1875,7 +1875,7 @@ .global MiscQuest1Question MiscQuest1Question: - .string "On vacation outings~2c you want to...\0" + .string "On vacation outings{COMMA} you want to...\0" .align 2,0 @ Question 2, Category 14 (Miscellaneous) @@ -1895,7 +1895,7 @@ .global MiscQuest2_DontCare MiscQuest2_DontCare: - .string "Don~27t care.\0" + .string "Don{APOSTROPHE}t care.\0" .align 2,0 .global MiscQuest2 @@ -1906,7 +1906,7 @@ .global MiscQuest2Question MiscQuest2Question: - .string "It~27s the summer festival!\n" + .string "It{APOSTROPHE}s the summer festival!\n" .string "Do you like carnivals?\0" .align 2,0 @@ -1943,7 +1943,7 @@ .global MiscQuest3Question MiscQuest3Question: - .string "Somebody calls you ~93weird but funny.~94\n" + .string "Somebody calls you {QUOTE_START}weird but funny.{QUOTE_END}\n" .string "How does that make you feel?\0" .align 2,0 diff --git a/data/pokemon_mail.s b/data/pokemon_mail.s index 55f5bf9..35ece2a 100644 --- a/data/pokemon_mail.s +++ b/data/pokemon_mail.s @@ -122,8 +122,8 @@ gPokemonMail: @ 80EBA18 .string "Areas for sale!\n" .string "Rescue Teams are urged to check with\n" .string "Wigglytuff for what is available.\n" - .string "By adding to your Friend Areas~2c you can\n" - .string "recruit Pokémon that wouldn~27t join your\n" + .string "By adding to your Friend Areas{COMMA} you can\n" + .string "recruit Pokémon that wouldn{APOSTROPHE}t join your\n" .string "rescue team before!\0" .align 2,0 @@ -137,8 +137,8 @@ gPokemonMail: @ 80EBA18 .string "Congratulations! Your team has attained\n" .string "the Lucario Rank--the top rank among\n" .string "rescue teams! In commemoration of your\n" - .string "fantastic achievement~2c we award you the\n" - .string "Lucario Statue~2c crafted after the legendary\n" + .string "fantastic achievement{COMMA} we award you the\n" + .string "Lucario Statue{COMMA} crafted after the legendary\n" .string "rescue team leader.\n" .string "Keep working for world peace!\n" .string " - Pokémon Rescue Organization -\0" @@ -167,14 +167,14 @@ gPokemonMail: @ 80EBA18 .global gMail_NewsText2 gMail_NewsText2: - .string "#+{COLOR_1 CYAN}$m0 Innocent! Part 2{END_COLOR_TEXT_1}\n" + .string "#+{COLOR_1 CYAN}{ARG_POKEMON_0} Innocent! Part 2{END_COLOR_TEXT_1}\n" .string "{COLOR_1 GREEN}Quote from Charizard on the scene:{END_COLOR_TEXT_1}\n" - .string "~93That~27s what I thought right from\n" - .string "the start~2c hahaha!~94\n" + .string "{QUOTE_START}That{APOSTROPHE}s what I thought right from\n" + .string "the start{COMMA} hahaha!{QUOTE_END}\n" .string "{COLOR_1 GREEN}Quote from Tyranitar on the scene:{END_COLOR_TEXT_1}\n" - .string "~93That muckraking Gengar...\n" - .string "He~27s not getting away with this!\n" - .string "He~27d better be ready for it!~94\0" + .string "{QUOTE_START}That muckraking Gengar...\n" + .string "He{APOSTROPHE}s not getting away with this!\n" + .string "He{APOSTROPHE}d better be ready for it!{QUOTE_END}\0" .align 2,0 .global gMail_NewsHeadline2 @@ -184,14 +184,14 @@ gPokemonMail: @ 80EBA18 .global gMail_NewsText1 gMail_NewsText1: - .string "#+{COLOR_1 CYAN}$m0 Innocent! Part 1{END_COLOR_TEXT_1}\n" - .string "$m1 met with Ninetales on {COLOR_1 RED}Mt. Freeze{END_COLOR_TEXT_1}.\n" - .string "Ninetales testified that $m0 was\n" + .string "#+{COLOR_1 CYAN}{ARG_POKEMON_0} Innocent! Part 1{END_COLOR_TEXT_1}\n" + .string "{ARG_POKEMON_1} met with Ninetales on {COLOR_1 RED}Mt. Freeze{END_COLOR_TEXT_1}.\n" + .string "Ninetales testified that {ARG_POKEMON_0} was\n" .string "not the human that appeared in the legend.\n" - .string "As a result~2c Gengar~27s claims were found to\n" + .string "As a result{COMMA} Gengar{APOSTROPHE}s claims were found to\n" .string "be malicious lies.\n" - .string "{COLOR_1 GREEN}The clearly dismayed Gengar~27s quote:{END_COLOR_TEXT_1}\n" - .string "~93Ugegegegegegegegegegegeh!~94\0" + .string "{COLOR_1 GREEN}The clearly dismayed Gengar{APOSTROPHE}s quote:{END_COLOR_TEXT_1}\n" + .string "{QUOTE_START}Ugegegegegegegegegegegeh!{QUOTE_END}\0" .align 2,0 .global gMail_NewsHeadline1 @@ -201,13 +201,13 @@ gPokemonMail: @ 80EBA18 .global gMail_PelipperText gMail_PelipperText: - .string "Yo! Amigo! It~27s awesome you~27re back!\n" - .string "I~27ll be delivering mail to you again!\n" - .string "I~27ve been looking forward to this with\n" + .string "Yo! Amigo! It{APOSTROPHE}s awesome you{APOSTROPHE}re back!\n" + .string "I{APOSTROPHE}ll be delivering mail to you again!\n" + .string "I{APOSTROPHE}ve been looking forward to this with\n" .string "my bill outstretched!\n" - .string "I~27ll deliver tons of mail~2c so you~27d better\n" - .string "be ready~2c amigo!\n\n" - .string " - The wandering postal carrier~2c Pelipper -\0" + .string "I{APOSTROPHE}ll deliver tons of mail{COMMA} so you{APOSTROPHE}d better\n" + .string "be ready{COMMA} amigo!\n\n" + .string " - The wandering postal carrier{COMMA} Pelipper -\0" .align 2,0 .global gMail_PelipperHeadline @@ -258,13 +258,13 @@ gPokemonMail: @ 80EBA18 .global gMail_SlakothText gMail_SlakothText: - .string "{CENTER_ALIGN COLOR_1 YELLOW}Relief for Delicate Souls Who Can~27t{END_COLOR_TEXT_1}\n" + .string "{CENTER_ALIGN COLOR_1 YELLOW}Relief for Delicate Souls Who Can{APOSTROPHE}t{END_COLOR_TEXT_1}\n" .string "{CENTER_ALIGN COLOR_1 YELLOW}Sleep with Different Pillows!{END_COLOR_TEXT_1}\n" .string "Insomniacs rejoiced over the announcement\n" - .string "of the Slakoth Pillow~2c which is said to\n" + .string "of the Slakoth Pillow{COMMA} which is said to\n" .string "induce sleepiness just by seeing it.\n" .string "Already the inventor is swamped with\n" - .string "inquiries from all over. However~2c\n" + .string "inquiries from all over. However{COMMA}\n" .string "production is said to be not yet ready.\0" .align 2,0 @@ -275,10 +275,10 @@ gPokemonMail: @ 80EBA18 .global gMail_PitfallText gMail_PitfallText: - .string "As a result of the natural disasters~2c\n" + .string "As a result of the natural disasters{COMMA}\n" .string "there have been many reports of Pitfall\n" .string "Traps appearing in dungeons.\n" - .string "However~2c there also appear to be pitfalls\n" + .string "However{COMMA} there also appear to be pitfalls\n" .string "made by Pokémon that are not harmful.\n" .string "The latter are thought to be made by\n" .string "foraging Swinub. Some even turn out to\n" @@ -295,10 +295,10 @@ gPokemonMail: @ 80EBA18 .string "A high-seas rescue in the {COLOR_1 RED}Stormy Sea{END_COLOR_TEXT_1} by\n" .string "{COLOR_1 CYAN}Team Sea Dragons{END_COLOR_TEXT_1} ended yesterday with\n" .string "the successful recovery of Tentacool.\n" - .string "The client~2c Corsola~2c is said to be delighted\n" + .string "The client{COMMA} Corsola{COMMA} is said to be delighted\n" .string "by the outcome.\n" - .string "Tentacool stated~2c ~93I didn~27t realize how far\n" - .string "I~27d been washed out to sea.~94\n" + .string "Tentacool stated{COMMA} {QUOTE_START}I didn{APOSTROPHE}t realize how far\n" + .string "I{APOSTROPHE}d been washed out to sea.{QUOTE_END}\n" .string "The {COLOR_1 RED}Stormy Sea{END_COLOR_TEXT_1} is unforgiving!\0" .align 2,0 @@ -310,42 +310,42 @@ gPokemonMail: @ 80EBA18 .global gMail_VileplumeText gMail_VileplumeText: .string "Vileplume are widely recognized for \n" - .string "their massive flower. However~2c few dare\n" + .string "their massive flower. However{COMMA} few dare\n" .string "to approach Vileplume because they\n" .string "scatter clouds of allergy-inducing\n" .string "pollen. Vileplume complain that they tire\n" - .string "very easily because the flower~27s weight\n" + .string "very easily because the flower{APOSTROPHE}s weight\n" .string "makes their head heavy.\0" .align 2,0 .global gMail_VileplumeHeadline gMail_VileplumeHeadline: - .string "#45 Vileplume~27s Weighty Problem\0" + .string "#45 Vileplume{APOSTROPHE}s Weighty Problem\0" .align 2,0 .global gMail_RawstText gMail_RawstText: .string "Research has revealed that {COLOR_1 GREEN}Rawst Berries{END_COLOR_TEXT_1}\n" .string "found in dungeons are usually unripened\n" - .string "and colored green. When ripe~2c they turn a\n" + .string "and colored green. When ripe{COMMA} they turn a\n" .string "sky blue color. An unripened one is easier\n" - .string "to eat~2c however~2c because it has not yet\n" + .string "to eat{COMMA} however{COMMA} because it has not yet\n" .string "turned bitter. It is known to heal all\n" .string "burns.\0" .align 2,0 .global gMail_RawstHeadline gMail_RawstHeadline: - .string "#44 Rawst Berry~27s Effect\0" + .string "#44 Rawst Berry{APOSTROPHE}s Effect\0" .align 2,0 .global gMail_ClubText gMail_ClubText: .string "We proudly announce the foundation of\n" - .string "the Red & Blue Fan Club~2c an organization\n" + .string "the Red & Blue Fan Club{COMMA} an organization\n" .string "for supporting Pokémon rescue teams.\n" .string "We are currently recruiting new members.\n" - .string "Won~27t you join and throw your support\n" + .string "Won{APOSTROPHE}t you join and throw your support\n" .string "behind our hard-working rescue heroes?\n\n" .string " - Plusle and Minun -\0" .align 2,0 @@ -357,19 +357,19 @@ gPokemonMail: @ 80EBA18 .global gMail_ChanseyText gMail_ChanseyText: - .string "As a special treat~2c I~27ll share a simple\n" + .string "As a special treat{COMMA} I{APOSTROPHE}ll share a simple\n" .string "way to tell fortunes with you!\n" .string "The key is the first thing you find in the\n" - .string "day~27s first dungeon.\n" - .string "If it~27s money~2c you~27ll be sure to make more.\n" - .string "If it~27s a Berry~2c your health luck is good.\n" - .string "If it~27s an Apple~2c you~27re super lucky!\n" + .string "day{APOSTROPHE}s first dungeon.\n" + .string "If it{APOSTROPHE}s money{COMMA} you{APOSTROPHE}ll be sure to make more.\n" + .string "If it{APOSTROPHE}s a Berry{COMMA} your health luck is good.\n" + .string "If it{APOSTROPHE}s an Apple{COMMA} you{APOSTROPHE}re super lucky!\n" .string " - Chansey -\0" .align 2,0 .global gMail_ChanseyHeadline gMail_ChanseyHeadline: - .string "#42 Chansey~27s Fortune-Telling\0" + .string "#42 Chansey{APOSTROPHE}s Fortune-Telling\0" .align 2,0 .global gMail_KabutoText @@ -377,11 +377,11 @@ gPokemonMail: @ 80EBA18 .string "One of our oldest residents claims to feel\n" .string "rejuvenated. Kabuto reportedly had an\n" .string "encounter with Relicanth in which both\n" - .string "parties reminisced about the ~93old days.~94\n" - .string "However~2c even Kabuto could not keep up\n" - .string "with Relicanth~27s tales from a hundred\n" - .string "million years ago. Kabuto stated~2c ~93It\n" - .string "made me feel young talking to Relicanth.~94\0" + .string "parties reminisced about the {QUOTE_START}old days.{QUOTE_END}\n" + .string "However{COMMA} even Kabuto could not keep up\n" + .string "with Relicanth{APOSTROPHE}s tales from a hundred\n" + .string "million years ago. Kabuto stated{COMMA} {QUOTE_START}It\n" + .string "made me feel young talking to Relicanth.{QUOTE_END}\0" .align 2,0 .global gMail_KabutoHeadline @@ -391,11 +391,11 @@ gPokemonMail: @ 80EBA18 .global gMail_SmeargleText gMail_SmeargleText: - .string "Smeargle~2c the artist known for his unique\n" - .string "artistic vision~2c had a windfall day as one\n" + .string "Smeargle{COMMA} the artist known for his unique\n" + .string "artistic vision{COMMA} had a windfall day as one\n" .string "of his paintings was auctioned for 300\n" .string "million {POKE} yesterday. The auctioned\n" - .string "artwork was one of Smeargle~27s signature\n" + .string "artwork was one of Smeargle{APOSTROPHE}s signature\n" .string "works from early in his career.\0" .align 2,0 @@ -406,28 +406,28 @@ gPokemonMail: @ 80EBA18 .global gMail_CastformText gMail_CastformText: - .string "Today~2c the weather over Pokémon\n" + .string "Today{COMMA} the weather over Pokémon\n" .string "Square promises to be clear with no\n" .string "chance of showers.\n" .string "Other regions can expect showers followed\n" .string "by clouds. There may be sun breaks\n" - .string "depending on the day~27s moods.\0" + .string "depending on the day{APOSTROPHE}s moods.\0" .align 2,0 .global gMail_CastformHeadline gMail_CastformHeadline: - .string "#39 Castform~27s Daily Weather\0" + .string "#39 Castform{APOSTROPHE}s Daily Weather\0" .align 2,0 .global gMail_GasText gMail_GasText: .string "Reports of a noxious gas leak caused\n" - .string "widespread chaos in the {COLOR_1 YELLOW_3}Sinister Woods{END_COLOR_TEXT_1}.\n" + .string "widespread chaos in the {COLOR_1 YELLOW_4}Sinister Woods{END_COLOR_TEXT_1}.\n" .string "Specialists speculate that the recent\n" - .string "natural disasters are to blame. However~2c\n" - .string "some also blame {COLOR_1 CYAN}Team Koffing{END_COLOR_TEXT_1}~27s training\n" + .string "natural disasters are to blame. However{COMMA}\n" + .string "some also blame {COLOR_1 CYAN}Team Koffing{END_COLOR_TEXT_1}{APOSTROPHE}s training\n" .string "in the area for the foul-smelling gas.\n" - .string "The answer~2c apparently~2c is blowing in the\n" + .string "The answer{COMMA} apparently{COMMA} is blowing in the\n" .string "wind.\0" .align 2,0 @@ -439,18 +439,18 @@ gPokemonMail: @ 80EBA18 .global gMail_KeyItemText2 gMail_KeyItemText2: .string "{CENTER_ALIGN COLOR_1 YELLOW}When Used Somewhere Special...{END_COLOR_TEXT_1}\n" - .string "Eevee and Water Stone~2c Fire Stone~2c\n" - .string "Thunderstone~2c or...\n" + .string "Eevee and Water Stone{COMMA} Fire Stone{COMMA}\n" + .string "Thunderstone{COMMA} or...\n" .string "Exeggcute and Leaf Stone...\n" - .string "Onix~2c Metal Coat~2c and Link Cable...\n" + .string "Onix{COMMA} Metal Coat{COMMA} and Link Cable...\n" .string "There appear to be many others!\0" .align 2,0 - + .global gMail_KeyItemHeadline2 gMail_KeyItemHeadline2: .string "#37 Key Items for Pokémon 2\0" .align 2,0 - + .global gMail_KeyItemText1 gMail_KeyItemText1: .string "{CENTER_ALIGN COLOR_1 YELLOW}When Used Somewhere Special...{END_COLOR_TEXT_1}\n" @@ -461,90 +461,90 @@ gPokemonMail: @ 80EBA18 .string "Clamperl and Deepseatooth...\n" .string "There appear to be many others!\0" .align 2,0 - + .global gMail_KeyItemHeadline1 gMail_KeyItemHeadline1: .string "#36 Key Items for Pokémon 1\0" .align 2,0 - + .global gMail_SwitchText gMail_SwitchText: .string "{CENTER_ALIGN COLOR_1 YELLOW}Power Up Combination Attacks!{END_COLOR_TEXT_1}\n" .string "Some dungeons allow rescue teams to\n" .string "switch leaders on the spot for doing\n" .string "combination attacks and so on.\n" - .string "When you enter a dungeon~2c open the menu~2c\n" + .string "When you enter a dungeon{COMMA} open the menu{COMMA}\n" .string "choose the Pokémon you want as the\n" - .string "leader under {COLOR_1 YELLOW}Team{END_COLOR_TEXT_1}~2c then select the\n" + .string "leader under {COLOR_1 YELLOW}Team{END_COLOR_TEXT_1}{COMMA} then select the\n" .string "command {COLOR_1 YELLOW}Leader{END_COLOR_TEXT_1}.\0" .align 2,0 - + .global gMail_SwitchHeadline gMail_SwitchHeadline: .string "#35 Switching Leaders\0" .align 2,0 - + .global gMail_KecleonText gMail_KecleonText: .string "There have been numerous reports that\n" .string "the older of the Kecleon merchants in\n" .string "Pokémon Square occasionally goes\n" - .string "missing. Some residents claim~2c ~93He~27s\n" + .string "missing. Some residents claim{COMMA} {QUOTE_START}He{APOSTROPHE}s\n" .string "greedy. He must be off doing business\n" - .string "somewhere.~94 His younger brother denies\n" - .string "such claims: ~93He wouldn~27t get free items\n" - .string "in dungeons and try to sell them...~94\0" + .string "somewhere.{QUOTE_END} His younger brother denies\n" + .string "such claims: {QUOTE_START}He wouldn{APOSTROPHE}t get free items\n" + .string "in dungeons and try to sell them...{QUOTE_END}\0" .align 2,0 - + .global gMail_KecleonHeadline gMail_KecleonHeadline: .string "#34 Where Is Kecleon?\0" .align 2,0 - + .global gMail_WeatherText2 gMail_WeatherText2: .string "Clear: Pleasant weather.\n" - .string "Hail: Regularly inflicts damage~2c\n" + .string "Hail: Regularly inflicts damage{COMMA}\n" .string "except on the Ice type.\n" .string "Fog: Turns the status of all Pokémon on\n" .string "the floor to Mud Sport.\n" .string "Blizzard: Boosts the movement speed of\n" .string "Ice-type Pokémon by one level.\0" .align 2,0 - + .global gMail_WeatherHeadline2 gMail_WeatherHeadline2: .string "#33 Dungeons and Weather 2\0" .align 2,0 - + .global gMail_WobbuffetText gMail_WobbuffetText: - .string "Earlier today~2c Wobbuffet reportedly\n" + .string "Earlier today{COMMA} Wobbuffet reportedly\n" .string "wobbled the wrong way and wandered off.\n" .string "It had to be rescued by the famous\n" .string "{COLOR_1 CYAN}Team Hydro{END_COLOR_TEXT_1}.\n" - .string "Fortunately~2c the wayward wanderer\n" + .string "Fortunately{COMMA} the wayward wanderer\n" .string "Wobbuffet was only wobbly and otherwise\n" .string "unharmed.\0" .align 2,0 - + .global gMail_WobbuffetHeadline gMail_WobbuffetHeadline: .string "#32 Wobbly Wobbuffet Wanders!\0" .align 2,0 - + .global gMail_PechaText gMail_PechaText: - .string "Among rescue teams~2c there is growing\n" + .string "Among rescue teams{COMMA} there is growing\n" .string "demand for equipment that is not only\n" - .string "practical~2c but also fashionably appealing.\n" + .string "practical{COMMA} but also fashionably appealing.\n" .string "The pink {COLOR_1 GREEN}Pecha Scarf{END_COLOR_TEXT_1} is especially popular.\n" .string "Even the {COLOR_1 CYAN}Kecleon Shop{END_COLOR_TEXT_1} is having trouble\n" .string "keeping it in stock.\n" - .string "If you~27re lucky enough to spot one~2c make a\n" + .string "If you{APOSTROPHE}re lucky enough to spot one{COMMA} make a\n" .string "beeline for it!\0" .align 2,0 - + .global gMail_PechaHeadline gMail_PechaHeadline: .string "#31 Pecha Scarf--Top Popularity!\0" @@ -552,79 +552,79 @@ gPokemonMail: @ 80EBA18 .global gMail_WeatherText1 gMail_WeatherText1: - .string "Sunny: Boosts Fire-type moves~2c and\n" + .string "Sunny: Boosts Fire-type moves{COMMA} and\n" .string "weakens Water-type moves.\n" .string "Sandstorm: Regularly inflicts damage\n" - .string "except on Ground~2c Rock~2c and Steel types.\n" - .string "Cloudy: All moves and attacks~2c excluding\n" - .string "the Normal type~2c are weakened.\n" - .string "Rain: Boosts Water-type moves~2c and\n" + .string "except on Ground{COMMA} Rock{COMMA} and Steel types.\n" + .string "Cloudy: All moves and attacks{COMMA} excluding\n" + .string "the Normal type{COMMA} are weakened.\n" + .string "Rain: Boosts Water-type moves{COMMA} and\n" .string "weakens Fire. Prevents explosions.\0" .align 2,0 - + .global gMail_WeatherHeadline1 gMail_WeatherHeadline1: .string "#30 Dungeons and Weather 1\0" .align 2,0 - + .global gMail_AzurillText gMail_AzurillText: - .string "With a simple act of courage~2c Azurill\n" + .string "With a simple act of courage{COMMA} Azurill\n" .string "became a hero despite being small in size.\n" - .string "Azurill came across Slowpoke~2c who had\n" - .string "fallen into a pond. Our hero~27s tail~2c thrown\n" - .string "at the struggling Slowpoke~2c saved a sure\n" + .string "Azurill came across Slowpoke{COMMA} who had\n" + .string "fallen into a pond. Our hero{APOSTROPHE}s tail{COMMA} thrown\n" + .string "at the struggling Slowpoke{COMMA} saved a sure\n" .string "drowning! Slowpoke claimed to have\n" .string "entirely forgotten having the ability to\n" .string "swim capably.\0" .align 2,0 - + .global gMail_AzurillHeadline gMail_AzurillHeadline: .string "#29 Azurill--the Little Hero!\0" .align 2,0 - + .global gMail_KeyText gMail_KeyText: .string "{CENTER_ALIGN COLOR_1 YELLOW}Head Out to the Desert Region!{END_COLOR_TEXT_1}\n" - .string "If you~27ve been wondering what lies behind\n" + .string "If you{APOSTROPHE}ve been wondering what lies behind\n" .string "the mysterious locked doors of the #CDSolar\n" - .string "Cave{END_COLOR_TEXT_1}~2c there~27s been a breakthrough!\n" + .string "Cave{END_COLOR_TEXT_1}{COMMA} there{APOSTROPHE}s been a breakthrough!\n" .string "Reports indicate the door keys are easily\n" .string "found in the #CDDesert Region{END_COLOR_TEXT_1}. Explorers are\n" .string "advised to compose teams with Pokémon\n" .string "adapted to the desert environment.\0" .align 2,0 - + .global gMail_KeyHeadline gMail_KeyHeadline: .string "#28 The Key\0" .align 2,0 - + .global gMail_SweetText gMail_SweetText: .string "{CENTER_ALIGN COLOR_1 YELLOW}Feel a Little Envious?{END_COLOR_TEXT_1}\n" .string "Teddiursa is often seen licking its paws\n" .string "that have soaked up sweet honey. While it\n" .string "may be sticky shaking paws with\n" - .string "Teddiursa~2c one can~27t help but feel a\n" + .string "Teddiursa{COMMA} one can{APOSTROPHE}t help but feel a\n" .string "twinge of envy.\0" .align 2,0 - + .global gMail_SweetHeadline gMail_SweetHeadline: .string "#27 Sweet Hands!\0" .align 2,0 - + .global gMail_RangeText gMail_RangeText: .string "{CENTER_ALIGN COLOR_1 YELLOW}All Moves Have Effective Ranges{END_COLOR_TEXT_1}\n" .string "Moves that affect an entire room have a\n" .string "range of two tiles in a corridor. The move\n" - .string "{COLOR_1 GREEN}Growl{END_COLOR_TEXT_1}~2c which lowers the Attack stat of\n" - .string "foes in a room~2c will reach two tiles away\n" - .string "in a corridor~2c for example. If~2c however~2c\n" - .string "the visibility is limited to just one tile~2c\n" + .string "{COLOR_1 GREEN}Growl{END_COLOR_TEXT_1}{COMMA} which lowers the Attack stat of\n" + .string "foes in a room{COMMA} will reach two tiles away\n" + .string "in a corridor{COMMA} for example. If{COMMA} however{COMMA}\n" + .string "the visibility is limited to just one tile{COMMA}\n" .string "the range of moves will also be limited.\0" .align 2,0 @@ -638,9 +638,9 @@ gPokemonMail: @ 80EBA18 .string "{CENTER_ALIGN COLOR_1 YELLOW}Make Your Explorations Easier by{END_COLOR_TEXT_1}\n" .string "{CENTER_ALIGN COLOR_1 YELLOW}Boosting the IQ of Team Members!{END_COLOR_TEXT_1}\n" .string "Eating Gummis boosts the IQ of Pokémon.\n" - .string "Upon reaching certain IQ levels~2c a Pokémon\n" + .string "Upon reaching certain IQ levels{COMMA} a Pokémon\n" .string "learns IQ Skills that can be very helpful\n" - .string "(for example~2c learning to seek out foes\n" + .string "(for example{COMMA} learning to seek out foes\n" .string "with type disadvantages). Check\n" .string "the IQ Skills of your team members!\0" .align 2,0 @@ -656,7 +656,7 @@ gPokemonMail: @ 80EBA18 .string "There have been numerous reports of new\n" .string "floor tiles other than Wonder Tiles.\n" .string "Believed to have been made by the recent\n" - .string "natural disasters~2c these floor tiles remain\n" + .string "natural disasters{COMMA} these floor tiles remain\n" .string "hidden until they are stepped on. They then\n" .string "trigger a variety of traps. Rescue teams\n" .string "are urged to use extreme caution.\0" @@ -671,11 +671,11 @@ gPokemonMail: @ 80EBA18 gMail_MakuhitaText: .string "{CENTER_ALIGN COLOR_1 YELLOW}Study Type Matchups{END_COLOR_TEXT_1}\n" .string "{CENTER_ALIGN COLOR_1 YELLOW}at the Makuhita Dojo!{END_COLOR_TEXT_1}\n" - .string "At the Makuhita Dojo~2c one can learn how\n" + .string "At the Makuhita Dojo{COMMA} one can learn how\n" .string "Pokémon type matchups affect battles.\n" - .string "It~27s because the dojo~27s training rooms are\n" - .string "divided by type. For example~2c in the #CDFire\n" - .string "Maze{END_COLOR_TEXT_1}~2c there are only Fire-type Pokémon.\n" + .string "It{APOSTROPHE}s because the dojo{APOSTROPHE}s training rooms are\n" + .string "divided by type. For example{COMMA} in the #CDFire\n" + .string "Maze{END_COLOR_TEXT_1}{COMMA} there are only Fire-type Pokémon.\n" .string "Try move types to see what works best!\0" .align 2,0 @@ -687,12 +687,12 @@ gPokemonMail: @ 80EBA18 .global gMail_MachineText gMail_MachineText: .string "{CENTER_ALIGN COLOR_1 YELLOW}New Types of Machines Discovered?{END_COLOR_TEXT_1}\n" - .string "In a recently discovered cave~2c explorers\n" + .string "In a recently discovered cave{COMMA} explorers\n" .string "found unique types of Technical Machines.\n" .string "They apparently do not break after a single\n" .string "use. Further studies are said to be under\n" .string "consideration by the authorities.\n" - .string "In related news~2c the cave is to be named\n" + .string "In related news{COMMA} the cave is to be named\n" .string "the #CDSolar Cave{END_COLOR_TEXT_1}.\0" .align 2,0 @@ -705,12 +705,12 @@ gPokemonMail: @ 80EBA18 gMail_UltimateText: .string "{CENTER_ALIGN COLOR_1 YELLOW}The Ultimate Dungeon{END_COLOR_TEXT_1}\n" .string "{CENTER_ALIGN COLOR_1 YELLOW}Challenges You to Do Your Best!{END_COLOR_TEXT_1}\n" - .string "Somewhere in the world~2c there supposedly\n" + .string "Somewhere in the world{COMMA} there supposedly\n" .string "is an incredibly tough dungeon. One must\n" - .string "enter alone at Level 1~2c and without any\n" + .string "enter alone at Level 1{COMMA} and without any\n" .string "items. No one has ever completed the\n" .string "challenge. It is considered a test not of\n" - .string "power~2c but of intelligence and wits.\0" + .string "power{COMMA} but of intelligence and wits.\0" .align 2,0 .global gMail_UltimateHeadline @@ -722,11 +722,11 @@ gPokemonMail: @ 80EBA18 gMail_GummiText: .string "{CENTER_ALIGN COLOR_1 YELLOW}Gummis That Make You Smart{END_COLOR_TEXT_1}\n" .string "Research has revealed that popular Gummi\n" - .string "treats not only enhance intelligence~2c they\n" + .string "treats not only enhance intelligence{COMMA} they\n" .string "also have different effects depending on\n" .string "type. Share Gummis with your friends and\n" .string "get smarter for your adventures! In\n" - .string "dungeons~2c throw them at your friends.\n" + .string "dungeons{COMMA} throw them at your friends.\n" .string "Use them in Friend Areas and...?\0" .align 2,0 @@ -740,11 +740,11 @@ gPokemonMail: @ 80EBA18 .string "{CENTER_ALIGN COLOR_1 YELLOW}Moving Diagonally{END_COLOR_TEXT_1}\n" .string "Move diagonally to avoid foes!\n" .string "Keeping {R_BUTTON}" - .string " pressed~2c use\n" + .string " pressed{COMMA} use\n" .byte 0x87 .string "R to move diagonally.\n" .string "{CENTER_ALIGN COLOR_1 YELLOW}Changing Direction{END_COLOR_TEXT_1}\n" - .string "It~27s also very important to change\n" + .string "It{APOSTROPHE}s also very important to change\n" .string "directions without moving. Check Hints to\n" .string "see how you can do this maneuver!\0" .align 2,0 @@ -756,13 +756,13 @@ gPokemonMail: @ 80EBA18 .global gMail_AddMembersText gMail_AddMembersText: - .string "If you want to enlarge your rescue team~2c\n" + .string "If you want to enlarge your rescue team{COMMA}\n" .string "you must first get Friend Areas. When\n" .string "a Pokémon that can live in an obtained\n" - .string "Friend Area is defeated~2c it may ask to\n" + .string "Friend Area is defeated{COMMA} it may ask to\n" .string "join your rescue team. Add to your\n" .string "Friend Areas so you can recruit more\n" - .string "members! Incidentally~2c you may take no\n" + .string "members! Incidentally{COMMA} you may take no\n" .string "more than three friends into a dungeon.\0" .align 2,0 @@ -774,13 +774,13 @@ gPokemonMail: @ 80EBA18 .global gMail_TeamMoveText gMail_TeamMoveText: .string "{CENTER_ALIGN COLOR_1 YELLOW}Use Team Members Effectively!{END_COLOR_TEXT_1}\n" - .string "When you~27re fighting in a dungeon~2c it~27s\n" + .string "When you{APOSTROPHE}re fighting in a dungeon{COMMA} it{APOSTROPHE}s\n" .string "important to use your team members. If\n" - .string "attacked from the side~2c move horizontally.\n" - .string "If attacked from above or below~2c move\n" - .string "vertically. That way~2c you can have several\n" + .string "attacked from the side{COMMA} move horizontally.\n" + .string "If attacked from above or below{COMMA} move\n" + .string "vertically. That way{COMMA} you can have several\n" .string "Pokémon fighting a single foe. Change\n" - .string "Tactics if members don~27t move properly.\0" + .string "Tactics if members don{APOSTROPHE}t move properly.\0" .align 2,0 .global gMail_TeamMoveHeadline @@ -792,9 +792,9 @@ gPokemonMail: @ 80EBA18 gMail_WondersText: .string "{CENTER_ALIGN COLOR_1 YELLOW}The Seven Wonders of Pokémon?{END_COLOR_TEXT_1}\n" .string "The mysterious feet of Diglett.\n" - .string "What is inside Forretress~27s shell.\n" - .string "The intelligence of Girafarig~27s tail.\n" - .string "Arbok~27s variety of patterns.\n" + .string "What is inside Forretress{APOSTROPHE}s shell.\n" + .string "The intelligence of Girafarig{APOSTROPHE}s tail.\n" + .string "Arbok{APOSTROPHE}s variety of patterns.\n" .string "We await submissions from readers on\n" .string "other Pokémon mysteries!\n" .string " - Mystery Hunter Team -\0" @@ -810,10 +810,10 @@ gPokemonMail: @ 80EBA18 .string "{COLOR_1 YELLOW}First#=2Gravelerock{END_COLOR_TEXT_1}\n" .string "{COLOR_1 YELLOW}Second#=2Oran Berry{END_COLOR_TEXT_1}\n" .string "In a nationwide survey involving rescue\n" - .string "teams~2c the most popular item was found to\n" + .string "teams{COMMA} the most popular item was found to\n" .string "be {COLOR_1 GREEN}Gravelerocks{END_COLOR_TEXT_1}. According to Sudowoodo\n" - .string "of {COLOR_1 CYAN}Team Fakers{END_COLOR_TEXT_1}~2c ~93It lets you attack\n" - .string "from far away. It~27s invaluable.~94 The next\n" + .string "of {COLOR_1 CYAN}Team Fakers{END_COLOR_TEXT_1}{COMMA} {QUOTE_START}It lets you attack\n" + .string "from far away. It{APOSTROPHE}s invaluable.{QUOTE_END} The next\n" .string "most popular item was {COLOR_1 GREEN}Oran Berries{END_COLOR_TEXT_1}.\0" .align 2,0 @@ -868,7 +868,7 @@ gPokemonMail: @ 80EBA18 gMail_LinkedEntryText1: .string "{CENTER_ALIGN COLOR_1 YELLOW}These Are the Recommended{END_COLOR_TEXT_1}\n" .string "{CENTER_ALIGN COLOR_1 YELLOW}Linked Moves for Beginners!{END_COLOR_TEXT_1}\n" - .string "{COLOR_1 RED}Grass~2c Fighting~2c and Ground Types{END_COLOR_TEXT_1}\n" + .string "{COLOR_1 RED}Grass{COMMA} Fighting{COMMA} and Ground Types{END_COLOR_TEXT_1}\n" .string "Bulbasaur\n" .string "{COLOR_1 GREEN}Vine Whip{END_COLOR_TEXT_1} + {COLOR_1 GREEN}Growl{END_COLOR_TEXT_1}\n" .string "Chikorita\n" @@ -888,11 +888,11 @@ gPokemonMail: @ 80EBA18 .global gMail_TypeText gMail_TypeText: .string "{CENTER_ALIGN COLOR_1 YELLOW}Learn How Types Match Up!{END_COLOR_TEXT_1}\n" - .string "All Pokémon are of certain types~2c such as\n" - .string "{COLOR_1 RED}Fire{END_COLOR_TEXT_1} and {COLOR_1 CYAN}Water{END_COLOR_TEXT_1}. In a battle~2c the damage\n" - .string "inflicted depends on how the Pokémon~27s\n" - .string "type matches up with the move~27s type.\n" - .string "For example~2c a {COLOR_1 RED}Fire{END_COLOR_TEXT_1}-type Pokémon is\n" + .string "All Pokémon are of certain types{COMMA} such as\n" + .string "{COLOR_1 RED}Fire{END_COLOR_TEXT_1} and {COLOR_1 CYAN}Water{END_COLOR_TEXT_1}. In a battle{COMMA} the damage\n" + .string "inflicted depends on how the Pokémon{APOSTROPHE}s\n" + .string "type matches up with the move{APOSTROPHE}s type.\n" + .string "For example{COMMA} a {COLOR_1 RED}Fire{END_COLOR_TEXT_1}-type Pokémon is\n" .string "weak against {COLOR_1 CYAN}Water{END_COLOR_TEXT_1}-type moves.\n" .string "Exploit type matchups to win battles!\0" .align 2,0 @@ -905,9 +905,9 @@ gPokemonMail: @ 80EBA18 .global gMail_DungeonText gMail_DungeonText: .string "If your rescue team is defeated in a\n" - .string "dungeon~2c you lose several items and\n" + .string "dungeon{COMMA} you lose several items and\n" .string "all the money you are carrying.\n" - .string "Beware of what you~27re carrying before\n" + .string "Beware of what you{APOSTROPHE}re carrying before\n" .string "you go off on a rescue or an outing.\n" .string "Use {COLOR_1 CYAN}Kangaskhan Storage{END_COLOR_TEXT_1} to keep\n" .string "invaluable items safely stored.\n" @@ -922,12 +922,12 @@ gPokemonMail: @ 80EBA18 .global gMail_WonderText gMail_WonderText: .string "{CENTER_ALIGN COLOR_1 YELLOW}Wonder Tiles Reset Attack and Defense!{END_COLOR_TEXT_1}\n" - .string "If your Attack is lowered by a foe~27s\n" - .string "{COLOR_1 GREEN}Growl{END_COLOR_TEXT_1}~2c or your Defense is lowered\n" - .string "by a foe~27s {COLOR_1 GREEN}Tail Whip{END_COLOR_TEXT_1}~2c for example~2c the\n" + .string "If your Attack is lowered by a foe{APOSTROPHE}s\n" + .string "{COLOR_1 GREEN}Growl{END_COLOR_TEXT_1}{COMMA} or your Defense is lowered\n" + .string "by a foe{APOSTROPHE}s {COLOR_1 GREEN}Tail Whip{END_COLOR_TEXT_1}{COMMA} for example{COMMA} the\n" .string "affected stat can be reset to normal by\n" .string "stepping on a Wonder Tile or going to the\n" - .string "next floor. Beware~2c enhanced stats are\n" + .string "next floor. Beware{COMMA} enhanced stats are\n" .string "also reset to normal!\0" .align 2,0 @@ -939,25 +939,25 @@ gPokemonMail: @ 80EBA18 .global gMail_MoveText gMail_MoveText: .string "{CENTER_ALIGN COLOR_1 YELLOW}The Benefits of Using Moves{END_COLOR_TEXT_1}\n" - .string "If a move is used on a foe~2c when it is\n" - .string "defeated~2c {COLOR_1 CYAN}you earn more Exp. Points{END_COLOR_TEXT_1}!\n" + .string "If a move is used on a foe{COMMA} when it is\n" + .string "defeated{COMMA} {COLOR_1 CYAN}you earn more Exp. Points{END_COLOR_TEXT_1}!\n" .string "A move only has to be used once on the\n" .string "foe: after that it can be defeated using a\n" .string "regular attack to earn more Exp. Points.\n" .string "Moves are also more likely to become\n" - .string "{COLOR_1 CYAN}critical hits{END_COLOR_TEXT_1}! Don~27t overuse them~2c though!\0" + .string "{COLOR_1 CYAN}critical hits{END_COLOR_TEXT_1}! Don{APOSTROPHE}t overuse them{COMMA} though!\0" .align 2,0 .global gMail_MoveHeadline gMail_MoveHeadline: - .string "#8 Let~27s Use Moves!\0" + .string "#8 Let{APOSTROPHE}s Use Moves!\0" .align 2,0 .global gMail_OptionsText gMail_OptionsText: .string "{CENTER_ALIGN COLOR_1 YELLOW}Change Your Option Settings{END_COLOR_TEXT_1}\n" .string "{CENTER_ALIGN COLOR_1 YELLOW}to Suit Your Play Style!{END_COLOR_TEXT_1}\n" - .string "Press {B_BUTTON} to open the menu~2c then\n" + .string "Press {B_BUTTON} to open the menu{COMMA} then\n" .string "choose {COLOR_1 YELLOW}Others{END_COLOR_TEXT_1} and {COLOR_1 YELLOW}Game Options{END_COLOR_TEXT_1}.\n" .string "You can change settings to suit the way\n" .string "you play.\0" @@ -976,7 +976,7 @@ gPokemonMail: @ 80EBA18 .string "outsider without hesitation. Some believe\n" .string "a mysterious force is behind their\n" .string "behavior. One source blamed Diglett\n" - .string "for triggering earthquakes~2c but the\n" + .string "for triggering earthquakes{COMMA} but the\n" .string "investigative team is skeptical.\0" .align 2,0 @@ -987,13 +987,13 @@ gPokemonMail: @ 80EBA18 .global gMail_SeedText gMail_SeedText: - .string "{CENTER_ALIGN COLOR_1 YELLOW}Seeds Can Be Thrown~2c Too!{END_COLOR_TEXT_1}\n" + .string "{CENTER_ALIGN COLOR_1 YELLOW}Seeds Can Be Thrown{COMMA} Too!{END_COLOR_TEXT_1}\n" .string "Seeds are usually meant to be eaten.\n" .string "But did you know? They can also be thrown\n" .string "at other Pokémon to unlock their effects.\n" - .string "Toss seeds you don~27t want to eat at foes!\n" + .string "Toss seeds you don{APOSTROPHE}t want to eat at foes!\n" .string "Throw good seeds at friends!\n" - .string "Don~27t be afraid to throw your seeds!\0" + .string "Don{APOSTROPHE}t be afraid to throw your seeds!\0" .align 2,0 .global gMail_SeedHeadline @@ -1004,11 +1004,11 @@ gPokemonMail: @ 80EBA18 .global gMail_HungerText gMail_HungerText: .string "{CENTER_ALIGN COLOR_1 YELLOW}Eat Something When You Get Hungry!{END_COLOR_TEXT_1}\n" - .string "While you~27re exploring a dungeon~2c you will\n" + .string "While you{APOSTROPHE}re exploring a dungeon{COMMA} you will\n" .string "get progressively hungry (your Belly goes\n" - .string "down). If you become famished~2c you will\n" + .string "down). If you become famished{COMMA} you will\n" .string "eventually lose HP and even faint.\n" - .string "That~27s why you should eat something to fill\n" + .string "That{APOSTROPHE}s why you should eat something to fill\n" .string "your Belly! You can always buy food at the\n" .string "{COLOR_1 CYAN}Kecleon Shop{END_COLOR_TEXT_1}.\0" .align 2,0 @@ -1022,8 +1022,8 @@ gPokemonMail: @ 80EBA18 gMail_JobText: .string "If you want to go on a rescue job listed\n" .string "on the Bulletin Board at the Pelipper Post\n" - .string "Office~2c or one that~27s delivered to your\n" - .string "Mailbox~2c you first need to {COLOR_1 YELLOW}Accept{END_COLOR_TEXT_1} the job~2c\n" + .string "Office{COMMA} or one that{APOSTROPHE}s delivered to your\n" + .string "Mailbox{COMMA} you first need to {COLOR_1 YELLOW}Accept{END_COLOR_TEXT_1} the job{COMMA}\n" .string "then choose {COLOR_1 YELLOW}Take Job{END_COLOR_TEXT_1}. Only then will you\n" .string "be able to handle that job.\n" .string "Try to do accepted jobs quickly!\n" @@ -1034,14 +1034,14 @@ gPokemonMail: @ 80EBA18 gMail_JobHeadline: .string "#3 Accepting Rescue Jobs\0" .align 2,0 - + .global gMail_BasicsText gMail_BasicsText: .string "{CENTER_ALIGN COLOR_1 YELLOW}Saving Your Adventure and Pokémon News{END_COLOR_TEXT_1}\n" .string "You can save your adventure by going to\n" .string "your bed. Get in the habit of saving often.\n" .string "You should also store old Pokémon News.\n" - .string "If your Mailbox is full~2c you won~27t get the\n" + .string "If your Mailbox is full{COMMA} you won{APOSTROPHE}t get the\n" .string "latest issue of the news or any job mail.\n" .string "Check the Mailbox and store old news!\n" .string " - Pokémon Rescue Organization -\0" @@ -1056,10 +1056,10 @@ gPokemonMail: @ 80EBA18 gMail_WelcomeText: .string "{CENTER_ALIGN COLOR_1 YELLOW}To All New Members!{END_COLOR_TEXT_1}\n" .string "Your badge has the power to send back\n" - .string "to town any Pokémon you~27ve rescued. Just\n" - .string "hold the badge up~2c and it does the rest.\n" - .string "By completing rescue jobs~2c you will be\n" - .string "awarded points that raise your team~27s\n" + .string "to town any Pokémon you{APOSTROPHE}ve rescued. Just\n" + .string "hold the badge up{COMMA} and it does the rest.\n" + .string "By completing rescue jobs{COMMA} you will be\n" + .string "awarded points that raise your team{APOSTROPHE}s\n" .string "ranking. Aim for the Bronze Rank for now!\n" .string " - Pokémon Rescue Organization -\0" .align 2,0 diff --git a/data/scripts/personality_test.inc b/data/scripts/personality_test.inc index 0cc922b..ca7c88e 100644 --- a/data/scripts/personality_test.inc +++ b/data/scripts/personality_test.inc @@ -48,7 +48,7 @@ .align 2,0 SeveralQuestions_826E16C: - .string "#+But before I can let you through~2c\n" + .string "#+But before I can let you through{COMMA}\n" .string "#+I have several questions for you.\0" .align 2,0 diff --git a/data/text/luminous_cave.inc b/data/text/luminous_cave.inc index 60ab2f8..ad99469 100644 --- a/data/text/luminous_cave.inc +++ b/data/text/luminous_cave.inc @@ -16,7 +16,7 @@ gLuminousCaveEvolutionInfo:: @ 80DCAD0 .string "#+spot if they satisfy certain conditions.#P" .string "#+Evolution brings about changes\n" .string "#+in appearance and abilities.#P" - .string "#+Not only that~2c some Pokémon even change\n" + .string "#+Not only that{COMMA} some Pokémon even change\n" .string "#+type and learn different moves.#P" .string "#+However...#W The requirements for\n" .string "#+evolution differ among Pokémon.#P" @@ -25,7 +25,7 @@ gLuminousCaveEvolutionInfo:: @ 80DCAD0 .string "#+Still others may need special items\n" .string "#+to attain evolution.#P" .string "#+Ye must also be aware of this:#P" - .string "#+Once it has evolved~2c a Pokémon\n" + .string "#+Once it has evolved{COMMA} a Pokémon\n" .string "#+can never regain its previous form.#P" .string "#+That is why ye must think carefully\n" .string "#+before committing to evolution.\0" @@ -45,7 +45,7 @@ gLuminousCaveGiveAnotherItem:: @ 80DCDB8 .align 2, 0 gLuminousCaveLackWhatIsNeeded:: @ 80DCDDC - .string "#+Alas~2c ye seem to lack what is needed\n" + .string "#+Alas{COMMA} ye seem to lack what is needed\n" .string "#+for evolution.\0" .align 2, 0 @@ -60,12 +60,12 @@ gLuminousCaveLetUsBegin:: @ 80DCE38 gLuminousCaveChangedAppearance:: @ 80DCE68 .string "#+...#W$n0 is undergoing changes...#P" - .string "#+$n0~27s appearance changed...#P\0" + .string "#+$n0{APOSTROPHE}s appearance changed...#P\0" .align 2, 0 gLuminousCaveEvolved:: @ 80DCEB0 - .string "#+It evolved from {COLOR_1 GREEN}$m0{END_COLOR_TEXT_1}\n" - .string "#+to {COLOR_1 YELLOW}$m1{END_COLOR_TEXT_1}!\0" + .string "#+It evolved from {COLOR_1 GREEN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}\n" + .string "#+to {COLOR_1 YELLOW}{ARG_POKEMON_1}{END_COLOR_TEXT_1}!\0" .align 2, 0 gLuminousCaveComeAlone:: @ 80DCEDC diff --git a/data/text/party_menu.inc b/data/text/party_menu.inc index 40cc664..7296f91 100644 --- a/data/text/party_menu.inc +++ b/data/text/party_menu.inc @@ -8,52 +8,52 @@ gUnknown_80DD388:: @ 80DD388 gUnknown_80DD420:: @ 80DD420 .string "If you say farewell to this\n" - .string "Pokémon~2c it will be gone forever.#P" + .string "Pokémon{COMMA} it will be gone forever.#P" .string "You will never be able to get another one\n" .string "like it to join your team.\n" .string "Will you release it anyway?\0" .align 2, 0 gUnknown_80DD4C4:: @ 80DD4C4 - .string "#+$m1 joined the\n" + .string "#+{ARG_POKEMON_1} joined the\n" .string "#+rescue team for adventures!\0" .align 2, 0 gUnknown_80DD4F4:: @ 80DD4F4 - .string "#+$m1 left the team to remain\n" + .string "#+{ARG_POKEMON_1} left the team to remain\n" .string "#+on standby in the Friend Area.\0" .align 2, 0 gUnknown_80DD534:: @ 80DD534 - .string "#+$m1 became the leader\n" + .string "#+{ARG_POKEMON_1} became the leader\n" .string "#+of the rescue team.\0" .align 2, 0 gUnknown_80DD564:: @ 80DD564 - .string "#+$m1 left\n" + .string "#+{ARG_POKEMON_1} left\n" .string "#+the Friend Area.\n" - .string "#+Bye-bye~2c $m1!\0" + .string "#+Bye-bye{COMMA} {ARG_POKEMON_1}!\0" .align 2,0 gUnknown_80DD594:: @ 80DD594 - .string "#+The {COLOR_1 GREEN}$i1{END_COLOR_TEXT_1} was\n" + .string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n" .string "#+handed over. \0" .align 2, 0 gUnknown_80DD5B8:: @ 80DD5B8 - .string "#+The {COLOR_1 GREEN}$i1{END_COLOR_TEXT_1} was\n" + .string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n" .string "#+handed over.#P" - .string "#+The {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} was\n" + .string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n" .string "#+returned to the Toolbox.\0" .align 2, 0 gUnknown_80DD60C:: @ 80DD60C - .string "#+The {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} was\n" + .string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n" .string "#+returned to the Toolbox.\0" .align 2, 0 gUnknown_80DD63C:: @ 80DD63C - .string "#+The {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} was\n" + .string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n" .string "#+sent to storage.\0" .align 2, 0 @@ -98,7 +98,7 @@ gPartyMenuCheckIQ:: @ 80DD6C4 .align 2, 0 gPartyMenuItemPlaceholder:: @ 80DD6D0 - .string "Item: {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} \0" + .string "Item: {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} \0" .align 2, 0 gUnknown_80DD6E0:: @ 80DD6E0 diff --git a/data/text/save.inc b/data/text/save.inc index f20a139..4ab070c 100644 --- a/data/text/save.inc +++ b/data/text/save.inc @@ -1,6 +1,6 @@ gSaveTextQuicksaving:: @ 80B6A34 .string "#+Quicksaving your adventure...\n" - .string "#+Please don~27t turn off the power.\0" + .string "#+Please don{APOSTROPHE}t turn off the power.\0" .align 2, 0 gSaveTextYourAdventureHasBeenSaved:: @ 80B6A7C @@ -9,7 +9,7 @@ gSaveTextYourAdventureHasBeenSaved:: @ 80B6A7C gSaveTextYourAdventureHasBeenSavedLong:: @ 80B6AA0 .string "#+Your adventure has been saved.\n" - .string "#+When you are in a dungeon~2c quicksave\n" + .string "#+When you are in a dungeon{COMMA} quicksave\n" .string "#+your progress before ending the game.\0" .align 2, 0 @@ -30,11 +30,11 @@ gSaveTextError:: @ 80B6B88 .align 2, 0 gSaveTextCantResume:: @ 80B6BDC - .string "#+Your data was not properly saved~2c\n" + .string "#+Your data was not properly saved{COMMA}\n" .string "#+so your game cannot be resumed\n" .string "#+from your last spot.#P#+Your last outing is considered a defeat.\n" - .string "#+Before shutting down~2c save in your\n" - .string "#+team base~2c or quicksave in a dungeon.\0" + .string "#+Before shutting down{COMMA} save in your\n" + .string "#+team base{COMMA} or quicksave in a dungeon.\0" .align 2, 0 gSaveTextMayNotResume:: @ 80B6CB8 diff --git a/data/text/wonder_mail_complete.inc b/data/text/wonder_mail_complete.inc index 06308a4..ea8f9c9 100644 --- a/data/text/wonder_mail_complete.inc +++ b/data/text/wonder_mail_complete.inc @@ -4,22 +4,22 @@ gWonderMailClientThanksForRescuingMe:: @ 80E0184 gWonderMailClientThanksForRescuingThem:: @ 80E01A0 .string " Thank you for rescuing\n" - .string "{COLOR_1 CYAN}$m1{END_COLOR_TEXT_1}!\0" + .string "{COLOR_1 CYAN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}!\0" .align 2, 0 gWonderMailClientEscorted:: @ 80E01C4 .string " Thank you for escorting me\n" - .string "to {COLOR_1 CYAN}$m1{END_COLOR_TEXT_1}! \0" + .string "to {COLOR_1 CYAN}{ARG_POKEMON_1}{END_COLOR_TEXT_1}! \0" .align 2, 0 gWonderMailClientItemDelivered1:: @ 80E01F0 .string " Thank you for delivering\n" - .string "the {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}!\0" + .string "the {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}!\0" .align 2, 0 gWonderMailClientItemDelivered2:: @ 80E0218 .string " Thank you for getting me\n" - .string "the {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1}!\0" + .string "the {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1}!\0" .align 2, 0 .string "pksdir0\0" diff --git a/src/code_8012A18_1.c b/src/code_8012A18_1.c index d5b6be7..d654e57 100644 --- a/src/code_8012A18_1.c +++ b/src/code_8012A18_1.c @@ -176,7 +176,7 @@ void sub_8016110(void) else { sub_80922B4(gAvailablePokemonNames,gUnknown_203B200->pokeName, POKEMON_NAME_LENGTH); } - // Is the name {COLOR_1 CYAN}$m0{END_COLOR_TEXT_1} OK? + // Is the name {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1} OK? sub_8014248(&gUnknown_80DB688,0,3,gUnknown_203B200->menus,0,4,0,0,0x20); break; diff --git a/src/code_801AFA4.c b/src/code_801AFA4.c index e60fec1..03183ae 100644 --- a/src/code_801AFA4.c +++ b/src/code_801AFA4.c @@ -126,7 +126,7 @@ void sub_801B080(void) case 0: sub_801B178(); // #+Who will learn the move - // #+{COLOR_1 CYAN}$m7{END_COLOR_TEXT_1}? + // #+{COLOR_1 CYAN}{ARG_POKEMON_7}{END_COLOR_TEXT_1}? sub_8014248(&gUnknown_80DB9BC, 0, gUnknown_203B22C->unk60, gUnknown_203B22C->menuItems, 0, 4, 0, 0, 0x20); break; case 1: @@ -140,8 +140,8 @@ void sub_801B080(void) gTeamInventory_203B460->teamItems[gUnknown_203B22C->teamItemIndex].itemIndex = ITEM_ID_USED_TM; } PlaySound(0x9C << 1); - // #+CM$m8{END_COLOR_TEXT_1} learned - // #+the move {COLOR_1 CYAN}$m7{END_COLOR_TEXT_1}! + // #+CM{ARG_POKEMON_8}{END_COLOR_TEXT_1} learned + // #+the move {COLOR_1 CYAN}{ARG_POKEMON_7}{END_COLOR_TEXT_1}! sub_80141B4(&gUnknown_80DB9E4, 0, 0, 0x121); break; case 3: diff --git a/src/code_801B3C0.c b/src/code_801B3C0.c index 502ce60..19f2f7f 100644 --- a/src/code_801B3C0.c +++ b/src/code_801B3C0.c @@ -115,7 +115,7 @@ void sub_801B480(void) sub_80073B8(gUnknown_203B230->unk24); preload = gUnknown_203B230->unk10[gUnknown_203B230->unk8]; strcpy(gAvailablePokemonNames, preload->pokeName); - xxx_format_and_draw(16, 0, gUnknown_80DBA4C, gUnknown_203B230->unk24, 0); // $m0 + xxx_format_and_draw(16, 0, gUnknown_80DBA4C, gUnknown_203B230->unk24, 0); // {ARG_POKEMON_0} xxx_format_and_draw(4, 16, gUnknown_203B230->unk10[gUnknown_203B230->unk8]->unk4, gUnknown_203B230->unk24, 0); sub_80073E0(gUnknown_203B230->unk24); break; @@ -156,7 +156,7 @@ void sub_801B51C(void) void sub_801B590(void) { - + if (gUnknown_203B230->unk8 < (gUnknown_203B230->unkC - 1)) { if ((gUnknown_203B230->unk20 & 8)) { sub_8013F84(); diff --git a/src/code_801C620.c b/src/code_801C620.c index 7ae8c6a..c28e347 100644 --- a/src/code_801C620.c +++ b/src/code_801C620.c @@ -23,8 +23,8 @@ struct unkStruct_203B240 }; extern struct unkStruct_203B240 *gUnknown_203B240; -extern char gUnknown_80DBE2C[]; // $i0 -extern char gUnknown_80DBE30[]; // $m0 +extern char gUnknown_80DBE2C[]; // {ARG_MOVE_ITEM_0} +extern char gUnknown_80DBE30[]; // {ARG_POKEMON_0} extern u8 gUnknown_202DE58[0x58]; extern u8 gAvailablePokemonNames[0x58]; @@ -103,7 +103,7 @@ void sub_801C6E4(void) { char *skillName; struct subStruct_203B240 *preload; - + switch(gUnknown_203B240->state) { case 0: @@ -111,7 +111,7 @@ void sub_801C6E4(void) sub_80073B8(gUnknown_203B240->unk24); skillName = GetIQSkillName(gUnknown_203B240->unk4); strcpy(gUnknown_202DE58,skillName); - xxx_format_and_draw(16,0,gUnknown_80DBE2C,0,0); // $i0 + xxx_format_and_draw(16,0,gUnknown_80DBE2C,0,0); // {ARG_MOVE_ITEM_0} xxx_call_draw_string(8,16,GetIQSkillDescription(gUnknown_203B240->unk4),gUnknown_203B240->unk24,0); sub_80073E0(gUnknown_203B240->unk24); gUnknown_203B240->unkC = sub_8097DF0(GetIQSkillDescription(gUnknown_203B240->unk4),gUnknown_203B240->unk10); @@ -122,7 +122,7 @@ void sub_801C6E4(void) sub_80073B8(gUnknown_203B240->unk24); preload = gUnknown_203B240->unk10[gUnknown_203B240->unk8]; strcpy(gAvailablePokemonNames,preload->unk0); - xxx_format_and_draw(16,0,gUnknown_80DBE30,gUnknown_203B240->unk24,0); // $m0 + xxx_format_and_draw(16,0,gUnknown_80DBE30,gUnknown_203B240->unk24,0); // {ARG_POKEMON_0} xxx_format_and_draw(4,16,gUnknown_203B240->unk10[gUnknown_203B240->unk8]->unk4, gUnknown_203B240->unk24,0); sub_80073E0(gUnknown_203B240->unk24); break; @@ -161,7 +161,7 @@ void sub_801C7D4(void) void sub_801C848(void) { - + if (gUnknown_203B240->unk8 < (gUnknown_203B240->unkC - 1)) { if ((gUnknown_203B240->unk20 & 8)) { sub_8013F84(); diff --git a/src/code_8040094.c b/src/code_8040094.c index 608bbf4..4e30873 100644 --- a/src/code_8040094.c +++ b/src/code_8040094.c @@ -31,7 +31,7 @@ struct unk8049590 u16 unk4; }; -extern struct unk8049590 *sub_8049590(u32, u32); +extern struct unk8049590 *GetMapEntity(u32, u32); // Luminous Orb??? void sub_804002C(u32 param_1) @@ -47,7 +47,7 @@ void sub_804002C(u32 param_1) innerCounter = 0; iVar4 = iVar3 + 1; do { - iVar1 = sub_8049590(innerCounter, iVar3); + iVar1 = GetMapEntity(innerCounter, iVar3); iVar1->unk4 = iVar1->unk4 | 1; innerCounter++; } while (innerCounter < 0x38); diff --git a/src/code_8041AD0.c b/src/code_8041AD0.c index 6388af1..f711b92 100644 --- a/src/code_8041AD0.c +++ b/src/code_8041AD0.c @@ -17,7 +17,7 @@ extern void sub_804151C(struct DungeonEntity *r0, u32 r1, u8 r2); extern void sub_80416E0(struct DungeonEntity *r0, u32, u32); extern u8 sub_8042768(struct DungeonEntity *r0); extern void sub_806CDD4(struct DungeonEntity *r0, u8, u32); -extern u8 sub_8071858(struct DungeonEntity *r0, u8); +extern u8 HasType(struct DungeonEntity *r0, u8); extern u32 sub_806F62C(u32); extern void PlaySoundEffect(u32); extern u8 sub_803F428(struct DungeonEntity *r0); @@ -344,7 +344,7 @@ void sub_8041DD8(struct DungeonEntity *r0, s16 r1) u32 temp; temp = r1; - if(sub_8071858(r0, 0xE) != 0) + if(HasType(r0, 0xE) != 0) sub_804151C(r0, temp, 1); else sub_804151C(r0, 0xE, 1); diff --git a/src/code_80428A0.c b/src/code_80428A0.c index da72193..01f9f1f 100644 --- a/src/code_80428A0.c +++ b/src/code_80428A0.c @@ -40,7 +40,7 @@ void sub_8042900(struct DungeonEntity *r0) sub_804151C(r0, 0xD4 << 1, 0); } -void sub_8042910(struct DungeonEntity *r0) +void ShowVisualFlags(struct DungeonEntity *r0) { sub_804151C(r0, 0x29, 0); } diff --git a/src/code_80521D0_1.c b/src/code_80521D0_1.c index 482e3ba..04e70a9 100644 --- a/src/code_80521D0_1.c +++ b/src/code_80521D0_1.c @@ -148,7 +148,7 @@ struct unk8049590 u8 unk8; }; -extern struct unk8049590 *sub_8049590(u32, u32); +extern struct unk8049590 *GetMapEntity(u32, u32); extern void sub_806BFC0(struct DungeonEntityData *, u32); void sub_808BBA8(struct DungeonEntity *param_1) @@ -217,7 +217,7 @@ void sub_808BCE4(void) { struct unk8049590 *puVar1; - puVar1 = sub_8049590(gDungeonGlobalData->unkE23C, gDungeonGlobalData->unkE23E); + puVar1 = GetMapEntity(gDungeonGlobalData->unkE23C, gDungeonGlobalData->unkE23E); puVar1->unk0 &= 0xfffc; puVar1->unk0 |= 16; puVar1->unk0 &= 0xfdff; @@ -231,7 +231,7 @@ void sub_808BD38(void) { struct unk8049590 *puVar1; - puVar1 = sub_8049590(gDungeonGlobalData->unkE23C, gDungeonGlobalData->unkE23E); + puVar1 = GetMapEntity(gDungeonGlobalData->unkE23C, gDungeonGlobalData->unkE23E); puVar1->unk0 &= 0xfffc; puVar1->unk0 |= 1; puVar1->unk0 &= 0xffef; @@ -478,10 +478,10 @@ void KyogrePreFightDialogue(void) sub_803E708(10,0x46); sub_8083EA8(0x23,0x3c); sub_808C360(); - // My duels agaisnt $m3 (Groudon) left us both exhausted + // My duels against {ARG_POKEMON_3} (Groudon) left us both exhausted sub_8052910(&gUnknown_8106140); KyogreScreenFlash(); - // I am $m2 (Kyogre)! + // I am {ARG_POKEMON_2} (Kyogre)! // The lord of the sea! sub_8052910(&gUnknown_8106214); KyogreScreenFlash(); @@ -694,7 +694,7 @@ void CelebiJoinDialogue(void) sub_8086598(); sub_8086598(); sub_8086598(); - // The Time-Traveling Pokemon $m2 (Celebi)! + // The Time-Traveling Pokemon {ARG_POKEMON_2} (Celebi)! sub_8052910(&gUnknown_8106400); PlaySoundEffect(0x1c7); sub_806CDD4(local_1c,10,0); diff --git a/src/code_8057824.c b/src/code_8057824.c index 7f02fd5..031d063 100644 --- a/src/code_8057824.c +++ b/src/code_8057824.c @@ -96,7 +96,7 @@ bool32 sub_8057948(struct DungeonEntity *param_1, struct DungeonEntity *param_2) bool32 sub_8057954(struct DungeonEntity *param_1, struct DungeonEntity *param_2, u32 param_3) { - // $m0 is enraged + // {ARG_POKEMON_0} is enraged sub_8079618(param_1,param_2,0xc,param_3,gUnknown_80FAC88); return TRUE; } diff --git a/src/code_8057824_1.c b/src/code_8057824_1.c index 4dfc978..b29e46e 100644 --- a/src/code_8057824_1.c +++ b/src/code_8057824_1.c @@ -255,7 +255,7 @@ extern void sub_806CE68(struct DungeonEntity *, u32); extern void sub_8052D44(u8 *, struct DungeonEntity *, struct DungeonEntity *); extern void sub_8097FD0(u32); extern void SetMessageArgument(u8 *, struct DungeonEntity *, u32); -extern struct DungeonEntity *sub_8083600(); +extern struct DungeonEntity *GetLeaderEntity(); extern void sub_80421C0(struct DungeonEntity *, u32); extern void sub_8046D20(); extern void sub_808B1CC(u8); @@ -1595,7 +1595,7 @@ void MagmaCavernMidDialogue(void) SpriteLookAroundEffect(uVar2); PlaySoundEffect(0x1c7); sub_80856E0(uVar2,4); - // Hey! $m0! + // Hey! {ARG_POKEMON_0}! // Over there! sub_8052910(&gUnknown_8102C30); iVar3->entityData->unk15E = 0; @@ -1622,7 +1622,7 @@ void MagmaCavernMidDialogue(void) sub_8052910(&gUnknown_8102CB0); sub_803E708(10,0x46); // We challenged.. - // $m2... + // {ARG_POKEMON_2}... // And wiped out.. sub_8052910(&gUnknown_8102CF8); sub_803E708(10,0x46); @@ -1637,21 +1637,21 @@ void MagmaCavernMidDialogue(void) PlaySoundEffect(0x1d5); SpriteLookAroundEffect(uVar2); // That's right... - // What happened to $m3? - // Where is $m3? + // What happened to {ARG_POKEMON_3}? + // Where is {ARG_POKEMON_3}? // // Wait... - // What about $m3? - // Where did $m3 go? + // What about {ARG_POKEMON_3}? + // Where did {ARG_POKEMON_3} go? sub_8052910(&gUnknown_8102D7C); sub_803E708(0x1e,0x46); - // $m3 is... - // Still battling $m2... + // {ARG_POKEMON_3} is... + // Still battling {ARG_POKEMON_2}... sub_8052910(&gUnknown_8102DFC); sub_803E708(10,0x46); sub_80869E4(uVar2,4,1,2); sub_80869E4(uVar1,4,2,6); - // $m0! + // {ARG_POKEMON_0}! // We've got to hurry! sub_8052910(&gUnknown_8102E2C); sub_8089294(); @@ -3105,7 +3105,7 @@ void sub_808AE54(char param_1,char param_2,u32 *param_3) sub_808B1CC(0); if (sub_8098100(0x1d) == 0) { xxx_init_itemslot_8090A8C(&auStack20,ITEM_ID_ROCK_PART,0); - sub_80464C8(sub_8083600(),param_3,&auStack20); + sub_80464C8(GetLeaderEntity(),param_3,&auStack20); sub_8083E88(0x72); // Something fell from Regirock's body // Regirock was apparently guarding this item @@ -3128,7 +3128,7 @@ void sub_808AEC8(char param_1,char param_2,u32 *param_3) sub_808B1CC(0); if (sub_8098100(0x1d) == 0) { xxx_init_itemslot_8090A8C(&auStack20,ITEM_ID_ICE_PART,0); - sub_80464C8(sub_8083600(),param_3,&auStack20); + sub_80464C8(GetLeaderEntity(),param_3,&auStack20); sub_8083E88(0x72); // Something fell from Regice's body // Regice was apparently guarding this item @@ -3150,7 +3150,7 @@ void sub_808AF3C(char param_1,char param_2,u32 *param_3) sub_808B1CC(0); if (sub_8098100(0x1d) == 0) { xxx_init_itemslot_8090A8C(&auStack20,ITEM_ID_STEEL_PART,0); - sub_80464C8(sub_8083600(),param_3, &auStack20); + sub_80464C8(GetLeaderEntity(),param_3, &auStack20); sub_8083E88(0x72); // Something fell from Registeel's body // Registeel was apparently guarding this item @@ -3168,8 +3168,8 @@ void sub_808AFB0(char param_1) sub_8052D44(auStack12,uVar3,0); if ((sub_8098100(0x22) == 0) && (param_1 == 0x2E) && (sub_8098100(0x1d) == 0) && (sub_80860A8(ITEM_ID_ROCK_PART) != 0)) { sub_8097FD0(0x1d); - SetMessageArgument(gAvailablePokemonNames,sub_8083600(),0); - // $m0 obatined the Rock Part that Regirock was guarding + SetMessageArgument(gAvailablePokemonNames,GetLeaderEntity(),0); + // {ARG_POKEMON_0} obtained the Rock Part that Regirock was guarding sub_8052910(&gUnknown_81050B4); sub_80421C0(0,0xd4); sub_803E708(10,70); @@ -3186,8 +3186,8 @@ void sub_808B030(char param_1) sub_8052D44(auStack12,uVar3,0); if ((sub_8098100(0x22) == 0) && (param_1 == 0x2F) && (sub_8098100(0x1d) == 0) && (sub_80860A8(ITEM_ID_ICE_PART) != 0)) { sub_8097FD0(0x1d); - SetMessageArgument(gAvailablePokemonNames,sub_8083600(),0); - // $m0 obatined the Ice Part that Regice was guarding + SetMessageArgument(gAvailablePokemonNames,GetLeaderEntity(),0); + // {ARG_POKEMON_0} obtained the Ice Part that Regice was guarding sub_8052910(&gUnknown_810517C); sub_80421C0(0,0xd4); sub_803E708(10,70); @@ -3204,8 +3204,8 @@ void sub_808B0B0(char param_1) sub_8052D44(auStack12,uVar3,0); if ((sub_8098100(0x22) == 0) && (param_1 == 0x30) && (sub_8098100(0x1d) == 0) && (sub_80860A8(ITEM_ID_STEEL_PART) != 0)) { sub_8097FD0(0x1d); - SetMessageArgument(gAvailablePokemonNames, sub_8083600(), 0); - // $m0 obatined the Steel Part that Registeel was guarding + SetMessageArgument(gAvailablePokemonNames, GetLeaderEntity(), 0); + // {ARG_POKEMON_0} obtained the Steel Part that Registeel was guarding sub_8052910(&gUnknown_8105244); sub_80421C0(0,0xd4); sub_803E708(10,70); @@ -3284,7 +3284,7 @@ void sub_808B1CC(u8 r0) "\tcmp r2, 0\n" "\tbge _0808B244\n" "_0808B208:\n" - "\tbl sub_8083600\n" + "\tbl GetLeaderEntity\n" "\tadds r2, r0, 0\n" "\tcmp r2, 0\n" "\tbne _0808B230\n" @@ -3319,7 +3319,7 @@ void sub_808B1CC(u8 r0) "\tldrsh r0, [r0, r2]\n" "\tmovs r3, 0x2\n" "\tldrsh r1, [r5, r3]\n" - "\tbl sub_8049590\n" + "\tbl GetMapEntity\n" "\tldrh r2, [r0]\n" "\tmovs r3, 0x80\n" "\tlsls r3, 2\n" diff --git a/src/code_8086A3C.c b/src/code_8086A3C.c index 67fd08d..db438c0 100644 --- a/src/code_8086A3C.c +++ b/src/code_8086A3C.c @@ -4,7 +4,7 @@ #include "pokemon.h" extern struct DungeonGlobalData *gDungeonGlobalData; -extern void sub_807191C(struct DungeonEntity *); +extern void LoadIQSkills(struct DungeonEntity *); extern struct DungeonEntity *sub_8085480(void); extern struct DungeonEntity *sub_8085680(u32); extern void SetDefaultIQSkills(u8 *param_1, u8 param_2); @@ -57,7 +57,7 @@ void SetupBossFightHP(struct DungeonEntity *param_1, s32 newHP, u16 param_3) gDungeonGlobalData->unk66A = param_3; SetDefaultIQSkills(iVar2->IQSkillsSelected,iVar2->isBoss); - sub_807191C(param_1); + LoadIQSkills(param_1); } void sub_8086AC0(void) diff --git a/src/code_8090208.c b/src/code_8090208.c index 3a60640..970154c 100644 --- a/src/code_8090208.c +++ b/src/code_8090208.c @@ -16,7 +16,7 @@ struct unkDungeonStruct void sub_8090208(u8 *buffer, struct unkDungeonStruct *dungeonLocation) { - ExpandPlaceholdersBuffer(buffer, gUnknown_8108F10, gDungeonNames[dungeonLocation->index].name1); // {COLOR_2 YELLOW_3}%s{END_COLOR_TEXT_2} (normal floor print (no B) + ExpandPlaceholdersBuffer(buffer, gUnknown_8108F10, gDungeonNames[dungeonLocation->index].name1); // {COLOR_2 YELLOW_4}%s{END_COLOR_TEXT_2} (normal floor print (no B) } void PrintDungeonLocationtoBuffer(u8 *buffer, struct unkDungeonStruct *dungeonLocation) diff --git a/src/code_8097F40.c b/src/code_8097F40.c index 9a9c193..d7f6490 100644 --- a/src/code_8097F40.c +++ b/src/code_8097F40.c @@ -1,8 +1,8 @@ #include "global.h" -extern u8 gUnknown_810ACC0[]; +extern u8 gDungeonWaterType[]; bool8 sub_8097F40(u32 r0) { - return gUnknown_810ACC0[r0] == 2; + return gDungeonWaterType[r0] == 2; } diff --git a/src/code_80983D8.c b/src/code_80983D8.c index 4c0e870..25c57d2 100644 --- a/src/code_80983D8.c +++ b/src/code_80983D8.c @@ -31,7 +31,7 @@ s32 CalculateFacingDir(short *param_1,short *param_2) return uVar1; } -s32 sub_8098434(short param_1[],short param_2[]) +s32 GetMaxPositionDifference(short param_1[],short param_2[]) { s32 diff_index1; s32 diff_index0; diff --git a/src/data/nature_description.h b/src/data/nature_description.h index 7281705..8ee5d45 100644 --- a/src/data/nature_description.h +++ b/src/data/nature_description.h @@ -12,7 +12,7 @@ ALIGNED(4) const char gQuirkyDescription[] = _( "{CENTER_ALIGN}Maybe people are even upset\n" "{CENTER_ALIGN}with you for being so fickle?{EXTRA_MSG}" "{CENTER_ALIGN}If you realize how selfishly\n" - "{CENTER_ALIGN}you~27re behaving~2c try to think\n" + "{CENTER_ALIGN}you{APOSTROPHE}re behaving{COMMA} try to think\n" "{CENTER_ALIGN}before you do anything rash.{EXTRA_MSG}" "{CENTER_ALIGN}A quirky person like you should be..."); @@ -21,23 +21,23 @@ ALIGNED(4) const char gLonelyDescription[] = _( "{CENTER_ALIGN}The lonely type.{EXTRA_MSG}" "{CENTER_ALIGN}You always act cheerful and\n" "{CENTER_ALIGN}jocular around other people.{EXTRA_MSG}" - "{CENTER_ALIGN}But that~27s only because\n" + "{CENTER_ALIGN}But that{APOSTROPHE}s only because\n" "{CENTER_ALIGN}you are with other people.{EXTRA_MSG}" - "{CENTER_ALIGN}However~2c when you get alone...{EXTRA_MSG}" + "{CENTER_ALIGN}However{COMMA} when you get alone...{EXTRA_MSG}" "{CENTER_ALIGN}Do you find yourself\n" "{CENTER_ALIGN}feeling oddly depressed?{EXTRA_MSG}" - "{CENTER_ALIGN}That~27s why you always\n" + "{CENTER_ALIGN}That{APOSTROPHE}s why you always\n" "{CENTER_ALIGN}want to be with others.{EXTRA_MSG}" "{CENTER_ALIGN}But if you go around feeling\n" "{CENTER_ALIGN}depressed too much...{EXTRA_MSG}" "{CENTER_ALIGN}Your nutritional balance goes out\n" "{CENTER_ALIGN}of wack. Eat more vegetables!{EXTRA_MSG}" "{CENTER_ALIGN}However...{WAIT_PRESS}\n" - "{CENTER_ALIGN}It~27s not a bad thing\n" + "{CENTER_ALIGN}It{APOSTROPHE}s not a bad thing\n" "{CENTER_ALIGN}to feel lonely.{EXTRA_MSG}" - "{CENTER_ALIGN}You know what it~27s like when you aren~27t\n" - "{CENTER_ALIGN}alone~2c so that~27s why you feel lonesome.{EXTRA_MSG}" - "{CENTER_ALIGN}And that~27s why you aren~27t really alone.{EXTRA_MSG}" + "{CENTER_ALIGN}You know what it{APOSTROPHE}s like when you aren{APOSTROPHE}t\n" + "{CENTER_ALIGN}alone{COMMA} so that{APOSTROPHE}s why you feel lonesome.{EXTRA_MSG}" + "{CENTER_ALIGN}And that{APOSTROPHE}s why you aren{APOSTROPHE}t really alone.{EXTRA_MSG}" "{CENTER_ALIGN}A lonely person like you should be..."); ALIGNED(4) const char gRelaxedDescription[] = _( @@ -48,28 +48,28 @@ ALIGNED(4) const char gRelaxedDescription[] = _( "{CENTER_ALIGN}Or do you find yourself dozing off?{EXTRA_MSG}" "{CENTER_ALIGN}Or is your reaction time\n" "{CENTER_ALIGN}a little slower than others?{EXTRA_MSG}" - "{CENTER_ALIGN}But that~27s not necessarily\n" + "{CENTER_ALIGN}But that{APOSTROPHE}s not necessarily\n" "{CENTER_ALIGN}a bad thing.{EXTRA_MSG}" "{CENTER_ALIGN}You can do things at your own\n" "{CENTER_ALIGN}tempo without feeling pressured.{EXTRA_MSG}" "{CENTER_ALIGN}You can live in a relaxed and\n" "{CENTER_ALIGN}unhurried manner without worries.{EXTRA_MSG}" - "{CENTER_ALIGN}I think that~27s a happy\n" - "{CENTER_ALIGN}lifestyle to be envied~2c even.{EXTRA_MSG}" - "{CENTER_ALIGN}You~27re also surprisingly popular.{EXTRA_MSG}" + "{CENTER_ALIGN}I think that{APOSTROPHE}s a happy\n" + "{CENTER_ALIGN}lifestyle to be envied{COMMA} even.{EXTRA_MSG}" + "{CENTER_ALIGN}You{APOSTROPHE}re also surprisingly popular.{EXTRA_MSG}" "{CENTER_ALIGN}The way you vacantly stare\n" "{CENTER_ALIGN}off into the distance...{EXTRA_MSG}" "{CENTER_ALIGN}It should make that someone\n" - "{CENTER_ALIGN}special~27s pulse race.{EXTRA_MSG}" + "{CENTER_ALIGN}special{APOSTROPHE}s pulse race.{EXTRA_MSG}" "{CENTER_ALIGN}A relaxed person like you should be..."); ALIGNED(4) const char gCalmDescription[] = _( "{CENTER_ALIGN}You appear to be...{WAIT_PRESS}\n" "{CENTER_ALIGN}The calm type.{EXTRA_MSG}" - "{CENTER_ALIGN}You~27re capable of giving advice\n" + "{CENTER_ALIGN}You{APOSTROPHE}re capable of giving advice\n" "{CENTER_ALIGN}to friends with worries.{EXTRA_MSG}" - "{CENTER_ALIGN}You don~27t like to fight.{EXTRA_MSG}" - "{CENTER_ALIGN}You~27re a warm~2c kindhearted\n" + "{CENTER_ALIGN}You don{APOSTROPHE}t like to fight.{EXTRA_MSG}" + "{CENTER_ALIGN}You{APOSTROPHE}re a warm{COMMA} kindhearted\n" "{CENTER_ALIGN}person who cares.{EXTRA_MSG}" "{CENTER_ALIGN}You must have many friends\n" "{CENTER_ALIGN}who look up to you.{EXTRA_MSG}" @@ -85,21 +85,21 @@ ALIGNED(4) const char gSassyDescription[] = _( "{CENTER_ALIGN}You appear to be...{WAIT_PRESS}\n" "{CENTER_ALIGN}The sassy type.{EXTRA_MSG}" "{CENTER_ALIGN}You tend to be somewhat cynical.{EXTRA_MSG}" - "{CENTER_ALIGN}Despite that~2c there is something\n" + "{CENTER_ALIGN}Despite that{COMMA} there is something\n" "{CENTER_ALIGN}appealing and lovable about you.{EXTRA_MSG}" "{CENTER_ALIGN}But do you occasionally say something\n" "{CENTER_ALIGN}arrogant that angers others?{EXTRA_MSG}" "{CENTER_ALIGN}Do you make that mistake?{EXTRA_MSG}" "{CENTER_ALIGN}Or have people called you\n" - "{CENTER_ALIGN}conceited~2c vain~2c or selfish?{EXTRA_MSG}" + "{CENTER_ALIGN}conceited{COMMA} vain{COMMA} or selfish?{EXTRA_MSG}" "{CENTER_ALIGN}Have people said that about you?{EXTRA_MSG}" - "{CENTER_ALIGN}Huh?{WAIT_PRESS} You~27re telling me to get lost?{EXTRA_MSG}" - "{CENTER_ALIGN}Why~2c you... Come here and say that!{WAIT_PRESS}\n" + "{CENTER_ALIGN}Huh?{WAIT_PRESS} You{APOSTROPHE}re telling me to get lost?{EXTRA_MSG}" + "{CENTER_ALIGN}Why{COMMA} you... Come here and say that!{WAIT_PRESS}\n" "{CENTER_ALIGN}......Gasp!{EXTRA_MSG}" - "{CENTER_ALIGN}...I~27m sorry.\n" + "{CENTER_ALIGN}...I{APOSTROPHE}m sorry.\n" "{CENTER_ALIGN}I let my feelings run away.\n" - "{CENTER_ALIGN}I truly regret this~2c really.{EXTRA_MSG}" - "{CENTER_ALIGN}Anyway~2c your cool and aloof\n" + "{CENTER_ALIGN}I truly regret this{COMMA} really.{EXTRA_MSG}" + "{CENTER_ALIGN}Anyway{COMMA} your cool and aloof\n" "{CENTER_ALIGN}attitude is what defines you.{EXTRA_MSG}" "{CENTER_ALIGN}It makes you exasperating and\n" "{CENTER_ALIGN}appealing at the same time.{EXTRA_MSG}" @@ -110,18 +110,18 @@ ALIGNED(4) const char gHastyDescription[] = _( "{CENTER_ALIGN}The hasty type.{EXTRA_MSG}" "{CENTER_ALIGN}You like to take charge\n" "{CENTER_ALIGN}and get things done.{EXTRA_MSG}" - "{CENTER_ALIGN}You~27re a real go-getter.{EXTRA_MSG}" + "{CENTER_ALIGN}You{APOSTROPHE}re a real go-getter.{EXTRA_MSG}" "{CENTER_ALIGN}But are you also stressed out?{EXTRA_MSG}" "{CENTER_ALIGN}You get irritated when your\n" - "{CENTER_ALIGN}friends don~27t show up on time.{EXTRA_MSG}" + "{CENTER_ALIGN}friends don{APOSTROPHE}t show up on time.{EXTRA_MSG}" "{CENTER_ALIGN}You get frustrated when things\n" - "{CENTER_ALIGN}don~27t turn out the way you expect.{EXTRA_MSG}" + "{CENTER_ALIGN}don{APOSTROPHE}t turn out the way you expect.{EXTRA_MSG}" "{CENTER_ALIGN}Maybe you jab the elevator button\n" "{CENTER_ALIGN}if the elevator is slow to arrive.{EXTRA_MSG}" - "{CENTER_ALIGN}...Maybe you~27re already jabbing\n" + "{CENTER_ALIGN}...Maybe you{APOSTROPHE}re already jabbing\n" "{CENTER_ALIGN}the A Button repeatedly now.{EXTRA_MSG}" "{CENTER_ALIGN}Beware--getting too easily irritated\n" - "{CENTER_ALIGN}just isn~27t good for your well-being.{EXTRA_MSG}" + "{CENTER_ALIGN}just isn{APOSTROPHE}t good for your well-being.{EXTRA_MSG}" "{CENTER_ALIGN}A hasty person like you should be..."); ALIGNED(4) const char gTimidDescription[] = _( @@ -132,8 +132,8 @@ ALIGNED(4) const char gTimidDescription[] = _( "{CENTER_ALIGN}You may also find it too frightening\n" "{CENTER_ALIGN}to go back to school to get something\n" "{CENTER_ALIGN}you left behind in class.{EXTRA_MSG}" - "{CENTER_ALIGN}If you~27re ever walking on a dark\n" - "{CENTER_ALIGN}street at night~2c you probably turn\n" + "{CENTER_ALIGN}If you{APOSTROPHE}re ever walking on a dark\n" + "{CENTER_ALIGN}street at night{COMMA} you probably turn\n" "{CENTER_ALIGN}around often to check behind you.{EXTRA_MSG}" "{CENTER_ALIGN}But your timid nature is\n" "{CENTER_ALIGN}also your good point!{EXTRA_MSG}" @@ -144,7 +144,7 @@ ALIGNED(4) const char gTimidDescription[] = _( ALIGNED(4) const char gNaiveDescription[] = _( "{CENTER_ALIGN}You appear to be...{WAIT_PRESS}\n" "{CENTER_ALIGN}The naive type.{EXTRA_MSG}" - "{CENTER_ALIGN}You are highly curious~2c\n" + "{CENTER_ALIGN}You are highly curious{COMMA}\n" "{CENTER_ALIGN}and you love rare things.{EXTRA_MSG}" "{CENTER_ALIGN}Your cheerful and carefree\n" "{CENTER_ALIGN}attitude should make things fun\n" @@ -152,38 +152,38 @@ ALIGNED(4) const char gNaiveDescription[] = _( "{CENTER_ALIGN}But you do have one flaw.\n" "{CENTER_ALIGN}You can be childish.{EXTRA_MSG}" "{CENTER_ALIGN}You can never sit still.\n" - "{CENTER_ALIGN}You~27re always on the move.{EXTRA_MSG}" - "{CENTER_ALIGN}You can also be selfish~2c\n" + "{CENTER_ALIGN}You{APOSTROPHE}re always on the move.{EXTRA_MSG}" + "{CENTER_ALIGN}You can also be selfish{COMMA}\n" "{CENTER_ALIGN}so you should watch yourself.{EXTRA_MSG}" "{CENTER_ALIGN}A naive person like you should be..."); ALIGNED(4) const char gImpishDescription[] = _( "{CENTER_ALIGN}You appear to be...{WAIT_PRESS}\n" "{CENTER_ALIGN}The impish type.{EXTRA_MSG}" - "{CENTER_ALIGN}You~27re playful~2c cheerful~2c\n" + "{CENTER_ALIGN}You{APOSTROPHE}re playful{COMMA} cheerful{COMMA}\n" "{CENTER_ALIGN}and you love pranks.{EXTRA_MSG}" - "{CENTER_ALIGN}You~27re also kindhearted.{EXTRA_MSG}" - "{CENTER_ALIGN}That~27s why the people around\n" + "{CENTER_ALIGN}You{APOSTROPHE}re also kindhearted.{EXTRA_MSG}" + "{CENTER_ALIGN}That{APOSTROPHE}s why the people around\n" "{CENTER_ALIGN}you find you so irresistible.{EXTRA_MSG}" "{CENTER_ALIGN}You must be the most\n" "{CENTER_ALIGN}popular person around!{EXTRA_MSG}" - "{CENTER_ALIGN}Oh?{WAIT_PRESS} You~27re not that popular?{WAIT_PRESS}\n" - "{CENTER_ALIGN}You~27re either being modest...\n" - "{CENTER_ALIGN}or you just don~27t notice it.{EXTRA_MSG}" + "{CENTER_ALIGN}Oh?{WAIT_PRESS} You{APOSTROPHE}re not that popular?{WAIT_PRESS}\n" + "{CENTER_ALIGN}You{APOSTROPHE}re either being modest...\n" + "{CENTER_ALIGN}or you just don{APOSTROPHE}t notice it.{EXTRA_MSG}" "{CENTER_ALIGN}I bet people are just too shy\n" "{CENTER_ALIGN}to let their feelings be known.{EXTRA_MSG}" - "{CENTER_ALIGN}There~27s someone out there who~27s\n" + "{CENTER_ALIGN}There{APOSTROPHE}s someone out there who{APOSTROPHE}s\n" "{CENTER_ALIGN}afraid to declare their love for you!{EXTRA_MSG}" "{CENTER_ALIGN}An impish person like you should be..."); ALIGNED(4) const char gJollyDescription[] = _( "{CENTER_ALIGN}You appear to be...{WAIT_PRESS}\n" "{CENTER_ALIGN}The jolly type.{EXTRA_MSG}" - "{CENTER_ALIGN}Always laughing and smiling~2c\n" + "{CENTER_ALIGN}Always laughing and smiling{COMMA}\n" "{CENTER_ALIGN}you uplift everyone around you.{EXTRA_MSG}" "{CENTER_ALIGN}You love jokes!{EXTRA_MSG}" - "{CENTER_ALIGN}You have lots of friends~2c and\n" - "{CENTER_ALIGN}you~27re popular wherever you go.{EXTRA_MSG}" + "{CENTER_ALIGN}You have lots of friends{COMMA} and\n" + "{CENTER_ALIGN}you{APOSTROPHE}re popular wherever you go.{EXTRA_MSG}" "{CENTER_ALIGN}But sometimes you get carried away\n" "{CENTER_ALIGN}and say things that get you in trouble.{EXTRA_MSG}" "{CENTER_ALIGN}You should learn to think before\n" @@ -201,19 +201,19 @@ ALIGNED(4) const char gBraveDescription[] = _( "{CENTER_ALIGN}For justice...{WAIT_PRESS}\n" "{CENTER_ALIGN}For peace on earth...{WAIT_PRESS}\n" "{CENTER_ALIGN}Fight the forces of evil!{EXTRA_MSG}" - "{CENTER_ALIGN}......{WAIT_PRESS}If I~27m wrong...{WAIT_PRESS}\n" + "{CENTER_ALIGN}......{WAIT_PRESS}If I{APOSTROPHE}m wrong...{WAIT_PRESS}\n" "{CENTER_ALIGN}Work at becoming a true hero!{EXTRA_MSG}" "{CENTER_ALIGN}A brave person like you should be..."); ALIGNED(4) const char gDocileDescription[] = _( "{CENTER_ALIGN}You appear to be...{WAIT_PRESS}\n" "{CENTER_ALIGN}The docile type.{EXTRA_MSG}" - "{CENTER_ALIGN}You~27re very kindhearted.{WAIT_PRESS}\n" + "{CENTER_ALIGN}You{APOSTROPHE}re very kindhearted.{WAIT_PRESS}\n" "{CENTER_ALIGN}Very helpful.{WAIT_PRESS}\n" "{CENTER_ALIGN}You can make friends with anyone.{EXTRA_MSG}" - "{CENTER_ALIGN}You~27re a wonderful person.{EXTRA_MSG}" + "{CENTER_ALIGN}You{APOSTROPHE}re a wonderful person.{EXTRA_MSG}" "{CENTER_ALIGN}......{WAIT_PRESS}Is that going overboard?{WAIT_PRESS}\n" - "{CENTER_ALIGN}I don~27t think so.{EXTRA_MSG}" + "{CENTER_ALIGN}I don{APOSTROPHE}t think so.{EXTRA_MSG}" "{CENTER_ALIGN}You yourself should be\n" "{CENTER_ALIGN}the best judge of that.{EXTRA_MSG}" "{CENTER_ALIGN}A docile person like you should be..."); @@ -222,12 +222,12 @@ ALIGNED(4) const char gDocileDescription[] = _( ALIGNED(4) const char gHardyDescription[] = _( "{CENTER_ALIGN}You appear to be...{WAIT_PRESS}\n" "{CENTER_ALIGN}The hardy type.{EXTRA_MSG}" - "{CENTER_ALIGN}You do your homework diligently~2c\n" + "{CENTER_ALIGN}You do your homework diligently{COMMA}\n" "{CENTER_ALIGN}and you know to eat properly.{EXTRA_MSG}" "{CENTER_ALIGN}You have strong willpower that lets\n" - "{CENTER_ALIGN}you complete tasks~2c however tough.{EXTRA_MSG}" - "{CENTER_ALIGN}But~2c you can also be stubborn to the\n" + "{CENTER_ALIGN}you complete tasks{COMMA} however tough.{EXTRA_MSG}" + "{CENTER_ALIGN}But{COMMA} you can also be stubborn to the\n" "{CENTER_ALIGN}point of even feuding with friends...{EXTRA_MSG}" - "{CENTER_ALIGN}Nothing will go right for you when you~27re\n" - "{CENTER_ALIGN}irritated~2c so learn to laugh it off.{EXTRA_MSG}" + "{CENTER_ALIGN}Nothing will go right for you when you{APOSTROPHE}re\n" + "{CENTER_ALIGN}irritated{COMMA} so learn to laugh it off.{EXTRA_MSG}" "{CENTER_ALIGN}A hardy person like you should be..."); diff --git a/src/data/pelipper_help_guide_dialogue.h b/src/data/pelipper_help_guide_dialogue.h index 678be4f..0c442fb 100644 --- a/src/data/pelipper_help_guide_dialogue.h +++ b/src/data/pelipper_help_guide_dialogue.h @@ -1,112 +1,112 @@ -ALIGNED(4) const char gWhatdYouWantToKnow[] = - _(" So~2c what~27d you want to\n" +ALIGNED(4) const char gWhatdYouWantToKnow[] = + _(" So{COMMA} what{APOSTROPHE}d you want to\n" "know?"); -ALIGNED(4) const char gGettingHelpExplaination[] = +ALIGNED(4) const char gGettingHelpExplanation[] = _(" If you need to call for\n" - "help~2c first send your friend\n" + "help{COMMA} first send your friend\n" "an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" - " Once you send that mail~2c\n" + " Once you send that mail{COMMA}\n" "wait until your friend sends you back\n" "an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" " When you get that\n" - "{COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} back~2c your team\n" + "{COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} back{COMMA} your team\n" "can continue from where it went down.{EXTRA_MSG}" " Make sure you send your\n" "friend a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.\n" - "That~27s if you get revived~2c of course."); + "That{APOSTROPHE}s if you get revived{COMMA} of course."); -ALIGNED(4) const char gSendSOSMailExplaination[] = +ALIGNED(4) const char gSendSOSMailExplanation[] = _(" If your team gets defeated\n" - "in a dungeon~2c you can send an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}\n" + "in a dungeon{COMMA} you can send an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}\n" "to a friend willing to help.{EXTRA_MSG}" " But I have to warn you.\n" - "You can~27t get anyone to rescue you\n" + "You can{APOSTROPHE}t get anyone to rescue you\n" "in certain places.{EXTRA_MSG}" " If you need to send\n" - "an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}~2c you send it from the\n" + "an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}{COMMA} you send it from the\n" "{COLOR_1 LIGHT_BLUE_2}main menu{END_COLOR_TEXT_1}."); - -ALIGNED(4) const char gReceiveAOKMailExplaination[] = + +ALIGNED(4) const char gReceiveAOKMailExplanation[] = _(" If your friend manages to\n" - "rescue your team~2c you need to receive\n" + "rescue your team{COMMA} you need to receive\n" "an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} from your friend.{EXTRA_MSG}" - " See~2c once you get that\n" - "{COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}~2c your team can continue from\n" + " See{COMMA} once you get that\n" + "{COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}{COMMA} your team can continue from\n" "where it went down in the dungeon.{EXTRA_MSG}" - " And~2c if you use\n" - "a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}~2c your friend can\n" + " And{COMMA} if you use\n" + "a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}{COMMA} your friend can\n" "even send you a {COLOR_1 LIGHT_BLUE_2}helper Pokémon{END_COLOR_TEXT_1}.{EXTRA_MSG}" - " There~27s just one thing.\n" - "A {COLOR_1 LIGHT_BLUE_2}helper Pokémon{END_COLOR_TEXT_1} can~27t bring\n" + " There{APOSTROPHE}s just one thing.\n" + "A {COLOR_1 LIGHT_BLUE_2}helper Pokémon{END_COLOR_TEXT_1} can{APOSTROPHE}t bring\n" "any item it happens to be holding.{EXTRA_MSG}" " You can receive that\n" - "team-saving {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} on the {COLOR_1 LIGHT_BLUE_2}main menu{END_COLOR_TEXT_1}~2c\n" + "team-saving {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} on the {COLOR_1 LIGHT_BLUE_2}main menu{END_COLOR_TEXT_1}{COMMA}\n" "all right?"); -ALIGNED(4) const char gSendThankYouMailExplaination[] = - _(" If your team gets rescued~2c\n" +ALIGNED(4) const char gSendThankYouMailExplanation[] = + _(" If your team gets rescued{COMMA}\n" "be sure to send your friend\n" "a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" " You do that by going to\n" - "the {COLOR_1 LIGHT_BLUE_2}right counter{END_COLOR_TEXT_1}~2c or\n" + "the {COLOR_1 LIGHT_BLUE_2}right counter{END_COLOR_TEXT_1}{COMMA} or\n" "by selecting it from the {COLOR_1 LIGHT_BLUE_2}main menu{END_COLOR_TEXT_1}.{EXTRA_MSG}" " You can attach an item in\n" "storage to your {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}\n" "as a {COLOR_1 LIGHT_BLUE_2}reward item{END_COLOR_TEXT_1}.{EXTRA_MSG}" - " You don~27t want to ever\n" + " You don{APOSTROPHE}t want to ever\n" "forget to express your thanks."); -ALIGNED(4) const char gRescueProceduresExplaination[] = +ALIGNED(4) const char gRescueProceduresExplanation[] = _(" If you want to go and\n" - "rescue your friend~27s KO~27d team~2c\n" + "rescue your friend{APOSTROPHE}s KO{APOSTROPHE}d team{COMMA}\n" "you need to receive an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" - " When you get that mail~2c\n" + " When you get that mail{COMMA}\n" "you can rescue your friend at\n" "the {COLOR_1 LIGHT_BLUE_2}left counter{END_COLOR_TEXT_1} over there.{EXTRA_MSG}" " If you do manage to rescue\n" - "the team~2c you send your friend\n" + "the team{COMMA} you send your friend\n" "an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" - " After you do that~2c your\n" + " After you do that{COMMA} your\n" "friend can send back to you\n" "a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}."); -ALIGNED(4) const char gReceiveSOSMailExplaination[] = - _(" To go off on a rescue~2c\n" - "you first need to receive your friend~27s\n" +ALIGNED(4) const char gReceiveSOSMailExplanation[] = + _(" To go off on a rescue{COMMA}\n" + "you first need to receive your friend{APOSTROPHE}s\n" "{COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" " You do that at\n" - "the {COLOR_1 LIGHT_BLUE_2}left counter{END_COLOR_TEXT_1} over there~2c\n" + "the {COLOR_1 LIGHT_BLUE_2}left counter{END_COLOR_TEXT_1} over there{COMMA}\n" "or by selecting it from the {COLOR_1 LIGHT_BLUE_2}main menu{END_COLOR_TEXT_1}."); -ALIGNED(4) const char gSendAOKMailExplaination[] = +ALIGNED(4) const char gSendAOKMailExplanation[] = _(" If you succeed in rescuing\n" - "that team~2c you send your friend an\n" + "that team{COMMA} you send your friend an\n" "{COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" " You do that by going to\n" - "the {COLOR_1 LIGHT_BLUE_2}left counter{END_COLOR_TEXT_1}~2c\n" + "the {COLOR_1 LIGHT_BLUE_2}left counter{END_COLOR_TEXT_1}{COMMA}\n" "or from the {COLOR_1 LIGHT_BLUE_2}main menu{END_COLOR_TEXT_1}.{EXTRA_MSG}" " You can send your friend\n" "a Pokémon as a helper from your Friend\n" "Areas using a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}.{EXTRA_MSG}" - " This Pokémon won~27t\n" - "disappear from its Friend Area~2c so\n" - "don~27t you worry any."); + " This Pokémon won{APOSTROPHE}t\n" + "disappear from its Friend Area{COMMA} so\n" + "don{APOSTROPHE}t you worry any."); -ALIGNED(4) const char gLeaveForRescueExplaination[] = - _(" If you get an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}~2c\n" +ALIGNED(4) const char gLeaveForRescueExplanation[] = + _(" If you get an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}{COMMA}\n" "you head off on the rescue from\n" "the {COLOR_1 LIGHT_BLUE_2}left counter{END_COLOR_TEXT_1}.{EXTRA_MSG}" - " But~2c I have to warn you.\n" - "You can~27t go off to rescue in a dungeon\n" - "if you can~27t get into it.{EXTRA_MSG}" - " You~27ll be able to get\n" + " But{COMMA} I have to warn you.\n" + "You can{APOSTROPHE}t go off to rescue in a dungeon\n" + "if you can{APOSTROPHE}t get into it.{EXTRA_MSG}" + " You{APOSTROPHE}ll be able to get\n" "there when you go farther in your\n" - "adventure~2c so it won~27t do to fret."); + "adventure{COMMA} so it won{APOSTROPHE}t do to fret."); -ALIGNED(4) const char gGetThankYouMailExplaination[] = +ALIGNED(4) const char gGetThankYouMailExplanation[] = _(" If you send your friend\n" - "an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}~2c you can look forward\n" + "an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}{COMMA} you can look forward\n" "to getting a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} back.{EXTRA_MSG}" " You can receive it at\n" "the {COLOR_1 LIGHT_BLUE_2}right counter{END_COLOR_TEXT_1}\n" @@ -115,73 +115,73 @@ ALIGNED(4) const char gGetThankYouMailExplaination[] = "You {COLOR_1 RED}must not delete the A-OK Mail{END_COLOR_TEXT_1}\n" "before you get the {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} back."); -ALIGNED(4) const char gImYourGuide[] = - _(" I~27m your guide to what you\n" +ALIGNED(4) const char gImYourGuide[] = + _(" I{APOSTROPHE}m your guide to what you\n" "can expect at the Pelipper Post Office.\n" - "If you have any questions~2c just ask away!"); + "If you have any questions{COMMA} just ask away!"); ALIGNED(4) const char gAnythingElse[] = _(" Did you want to ask about\n" "anything else?"); -ALIGNED(4) const char gPostOfficeExplaination[] = +ALIGNED(4) const char gPostOfficeExplanation[] = _(" {COLOR_1 LIGHT_BLUE_2}The Pelipper Post Office{END_COLOR_TEXT_1}\n" "keeps track of information from\n" "around the world.{EXTRA_MSG}" " We inform folks\n" "about everything from gossip to calls\n" "for help from fellow Pokémon.{EXTRA_MSG}" - " For the latest news~2c check\n" + " For the latest news{COMMA} check\n" "{COLOR_1 LIGHT_BLUE_2}your Mailbox{END_COLOR_TEXT_1} or the {COLOR_1 LIGHT_BLUE_2}Bulletin Board{END_COLOR_TEXT_1}\n" - "outside~2c all right?{EXTRA_MSG}" - " Oh~2c that~27s not all.\n" + "outside{COMMA} all right?{EXTRA_MSG}" + " Oh{COMMA} that{APOSTROPHE}s not all.\n" "You can arrange for {COLOR_1 LIGHT_BLUE_2}Friend Rescue{END_COLOR_TEXT_1}\n" "missions at that counter there.{EXTRA_MSG}" " The {COLOR_1 LIGHT_BLUE_2}left counter{END_COLOR_TEXT_1} is\n" - "for rescues~2c and the {COLOR_1 LIGHT_BLUE_2}right counter{END_COLOR_TEXT_1}\n" + "for rescues{COMMA} and the {COLOR_1 LIGHT_BLUE_2}right counter{END_COLOR_TEXT_1}\n" "is for Thank-You Mail."); -ALIGNED(4) const char gBulletinBoardExplaination[] = +ALIGNED(4) const char gBulletinBoardExplanation[] = _(" The {COLOR_1 LIGHT_BLUE_2}Bulletin Board{END_COLOR_TEXT_1} outside\n" "here lists rescue requests.{EXTRA_MSG}" " Take on rescue jobs from\n" "the Bulletin Board. Be a hero and handle\n" "the jobs for fellow Pokémon in need!"); -ALIGNED(4) const char gDeliveryExplaination[] = +ALIGNED(4) const char gDeliveryExplanation[] = _(" If your rescue team\n" - "becomes famous for doing lots of rescues~2c\n" + "becomes famous for doing lots of rescues{COMMA}\n" "expect to get rescue requests directly.{EXTRA_MSG}" - " Our delivery $m0\n" + " Our delivery {ARG_POKEMON_0}\n" "will take those jobs straight to your\n" "{COLOR_1 LIGHT_BLUE_2}Mailbox{END_COLOR_TEXT_1}."); -ALIGNED(4) const char gFriendRescueExplaination[] = +ALIGNED(4) const char gFriendRescueExplanation[] = _(" Friend Rescue is what we\n" "call rescue missions between friends using\n" - "a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}~2c {COLOR_1 LIGHT_BLUE_2}passwords{END_COLOR_TEXT_1}~2c etc.{EXTRA_MSG}" - " For instance~2c you can send\n" + "a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}{COMMA} {COLOR_1 LIGHT_BLUE_2}passwords{END_COLOR_TEXT_1}{COMMA} etc.{EXTRA_MSG}" + " For instance{COMMA} you can send\n" "out for help saying your team wiped out\n" "in a dungeon at such and such a place.{EXTRA_MSG}" " Your friend could play\n" - "the hero and come to your team~27s rescue.\n" - "Or it can be the other way around~2c too.{EXTRA_MSG}" - " If you use {COLOR_1 LIGHT_BLUE_2}passwords{END_COLOR_TEXT_1}~2c\n" + "the hero and come to your team{APOSTROPHE}s rescue.\n" + "Or it can be the other way around{COMMA} too.{EXTRA_MSG}" + " If you use {COLOR_1 LIGHT_BLUE_2}passwords{END_COLOR_TEXT_1}{COMMA}\n" "you can do rescues with friends in\n" "far-away places.{EXTRA_MSG}" " You can apply for Friend\n" "Rescue jobs at the {COLOR_1 LIGHT_BLUE_2}left counter{END_COLOR_TEXT_1} of\n" "that counter there."); -ALIGNED(4) const char gDeletingMailExplaination[] = +ALIGNED(4) const char gDeletingMailExplanation[] = _(" Deleting mail just means\n" - "getting rid of old mail that you don~27t\n" + "getting rid of old mail that you don{APOSTROPHE}t\n" "need anymore.{EXTRA_MSG}" " If you do lots of Friend\n" - "Rescues~2c you~27ll find {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1} and\n" + "Rescues{COMMA} you{APOSTROPHE}ll find {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1} and\n" "{COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} piling up.{EXTRA_MSG}" - " Once you get {COLOR_1 LIGHT_BLUE_2}30 pieces{END_COLOR_TEXT_1}~2c\n" - "you won~27t be able to receive more mail.\n" - "That~27s why you~27ll need to delete old mail.{EXTRA_MSG}" + " Once you get {COLOR_1 LIGHT_BLUE_2}30 pieces{END_COLOR_TEXT_1}{COMMA}\n" + "you won{APOSTROPHE}t be able to receive more mail.\n" + "That{APOSTROPHE}s why you{APOSTROPHE}ll need to delete old mail.{EXTRA_MSG}" " You can look through old\n" "mail at the {COLOR_1 LIGHT_BLUE_2}left counter{END_COLOR_TEXT_1} over there."); diff --git a/src/data/wonder_mail_1.h b/src/data/wonder_mail_1.h index 19c49dd..e7dc2b3 100644 --- a/src/data/wonder_mail_1.h +++ b/src/data/wonder_mail_1.h @@ -5,10 +5,10 @@ ALIGNED(4) const char gUnknown_80DDBA8[] = _( ALIGNED(4) const char gUnknown_80DDBFC[] = _( " All righty!\n" - "Here~27s your {COLOR_1 LIGHT_BLUE_2}A-OK Mail password{END_COLOR_TEXT_1}."); + "Here{APOSTROPHE}s your {COLOR_1 LIGHT_BLUE_2}A-OK Mail password{END_COLOR_TEXT_1}."); ALIGNED(4) const char gUnknown_80DDC30[] = _( - " Okeydoke! That~27s all done.\n" + " Okeydoke! That{APOSTROPHE}s all done.\n" "Come around whenever you need."); ALIGNED(4) const char gUnknown_80DDC70[] = _( @@ -22,106 +22,106 @@ ALIGNED(4) const char gUnknown_80DDCBC[] = _( "{CENTER_ALIGN}(Its hold item will not be sent.)"); ALIGNED(4) const char gUnknown_80DDD2C[] = _( - " ...Uh~2c no?\n" + " ...Uh{COMMA} no?\n" "There appear to be no Pokémon in your\n" "Friend Areas. What do you want to do?"); ALIGNED(4) const char gUnknown_80DDD88[] = _( - " You~27re sure you want to\n" + " You{APOSTROPHE}re sure you want to\n" "send this here Pokémon?"); ALIGNED(4) const char gUnknown_80DDDBC[] = _( - " You~27re sure about this?"); + " You{APOSTROPHE}re sure about this?"); ALIGNED(4) const char gUnknown_80DDDD8[] = _( " All righty. I need you to\n" "pick the {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} you want to send."); ALIGNED(4) const char gUnknown_80DDE20[] = _( - " ...Uh~2c no?\n" - "I don~27t see any {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} here."); + " ...Uh{COMMA} no?\n" + "I don{APOSTROPHE}t see any {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} here."); ALIGNED(4) const char gUnknown_80DDE58[] = _( " Did you know? If you use\n" - "a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}~2c you can send\n" + "a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}{COMMA} you can send\n" "a {COLOR_1 LIGHT_BLUE_2}helper Pokémon{END_COLOR_TEXT_1} to your friend."); ALIGNED(4) const char gUnknown_80DDEC0[] = _( - " Don~27t you worry. Sending\n" - "a Pokémon doesn~27t mean it will go away.\n" + " Don{APOSTROPHE}t you worry. Sending\n" + "a Pokémon doesn{APOSTROPHE}t mean it will go away.\n" "So! Want to send one to your friend?"); ALIGNED(4) const char gUnknown_80DDF2C[] = _( - " ...Uh~2c no?\n" - "There~27s no space at all to receive\n" + " ...Uh{COMMA} no?\n" + "There{APOSTROPHE}s no space at all to receive\n" "any more mail.{EXTRA_MSG}" - " Delete some old mail~2c\n" + " Delete some old mail{COMMA}\n" "and then come to me to receive\n" - "your mail~2c OK?"); + "your mail{COMMA} OK?"); ALIGNED(4) const char gUnknown_80DDFB8[] = _( " All righty! Connect up\n" - "the {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}~2c if you~27d please.\n" - "Your friend ready~2c too?"); + "the {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}{COMMA} if you{APOSTROPHE}d please.\n" + "Your friend ready{COMMA} too?"); ALIGNED(4) const char gUnknown_80DE01C[] = _( "{CENTER_ALIGN}Communicating...\n" "{CENTER_ALIGN}Please wait with the power on.\n" - "{CENTER_ALIGN}To cancel~2c press {B_BUTTON}."); + "{CENTER_ALIGN}To cancel{COMMA} press {B_BUTTON}."); ALIGNED(4) const char gUnknown_80DE06C[] = _( " Okeydoke!\n" - "I received your friend~27s {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" + "I received your friend{APOSTROPHE}s {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" " Let me save your adventure."); ALIGNED(4) const char gUnknown_80DE0C0[] = _( - " Okeydoke! You~27re good to go.\n" - "Just give me a shout when you~27d like\n" + " Okeydoke! You{APOSTROPHE}re good to go.\n" + "Just give me a shout when you{APOSTROPHE}d like\n" "to go rescue your friend."); ALIGNED(4) const char gUnknown_80DE124[] = _( - " OK~2c I need you to enter\n" + " OK{COMMA} I need you to enter\n" "the {COLOR_1 LIGHT_BLUE_2}SOS Mail password{END_COLOR_TEXT_1} that your\n" "friend gave you."); ALIGNED(4) const char gUnknown_80DE178[] = _( " How do you want to receive\n" - "your friend~27s {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}?"); + "your friend{APOSTROPHE}s {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}?"); ALIGNED(4) const char gUnknown_80DE1B4[] = _( " How do you want to send\n" "your {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}?"); ALIGNED(4) const char gUnknown_80DE1E4[] = _( - " ...Uh~2c no?\n" - "You don~27t have an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" - " You~27ll need to arrange\n" - "to receive your friend~27s {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1} first.\n" - "That~27s what you need to do."); + " ...Uh{COMMA} no?\n" + "You don{APOSTROPHE}t have an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" + " You{APOSTROPHE}ll need to arrange\n" + "to receive your friend{APOSTROPHE}s {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1} first.\n" + "That{APOSTROPHE}s what you need to do."); ALIGNED(4) const char gUnknown_80DE280[] = _( " Okeydoke!\n" "Let me show you to the rescue site."); ALIGNED(4) const char gUnknown_80DE2B0[] = _( - " ...Uh~2c no?\n" - "Doesn~27t look like you can go to the dungeon\n" + " ...Uh{COMMA} no?\n" + "Doesn{APOSTROPHE}t look like you can go to the dungeon\n" "named in this {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" " Come see me about doing\n" "this rescue when you can actually go\n" - "to that dungeon~2c all right?"); + "to that dungeon{COMMA} all right?"); ALIGNED(4) const char gUnknown_80DE368[] = _( - " ...Uh~2c no?\n" - "You~27ve blown this rescue mission too\n" - "often. Your friend~27s team is beyond help.{EXTRA_MSG}" - " I~27m sorry to say this~2c\n" - "but you~27ll have to tell your friend that\n" + " ...Uh{COMMA} no?\n" + "You{APOSTROPHE}ve blown this rescue mission too\n" + "often. Your friend{APOSTROPHE}s team is beyond help.{EXTRA_MSG}" + " I{APOSTROPHE}m sorry to say this{COMMA}\n" + "but you{APOSTROPHE}ll have to tell your friend that\n" "your rescue attempts failed."); ALIGNED(4) const char gUnknown_80DE430[] = _( " Okeydoke.\n" - "I~27ll need you to choose the {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}\n" + "I{APOSTROPHE}ll need you to choose the {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}\n" "for you to go on a rescue mission."); ALIGNED(4) const char gUnknown_80DE48C[] = _( @@ -130,52 +130,52 @@ ALIGNED(4) const char gUnknown_80DE48C[] = _( ALIGNED(4) const char gUnknown_80DE4B8[] = _( " All righty. Choose\n" - "the {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1} you don~27t need."); + "the {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1} you don{APOSTROPHE}t need."); ALIGNED(4) const char gUnknown_80DE4F0[] = _( - " ...Uh~2c no?\n" - "You don~27t have any {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}."); + " ...Uh{COMMA} no?\n" + "You don{APOSTROPHE}t have any {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}."); ALIGNED(4) const char gUnknown_80DE524[] = _( - " If you want a reward~2c {COLOR_1 RED}don~27t\n" + " If you want a reward{COMMA} {COLOR_1 RED}don{APOSTROPHE}t\n" "delete an A-OK Mail{END_COLOR_TEXT_1} before getting a\n" "{COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} back for it.{EXTRA_MSG}" - " {COLOR_1 RED}Be careful{END_COLOR_TEXT_1} if you~27re going\n" + " {COLOR_1 RED}Be careful{END_COLOR_TEXT_1} if you{APOSTROPHE}re going\n" "to delete any {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}" " Okeydoke.\n" "Choose an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}\n" - "you don~27t need anymore."); + "you don{APOSTROPHE}t need anymore."); ALIGNED(4) const char gUnknown_80DE614[] = _( - " ...Uh~2c no?\n" - "You don~27t have any {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}."); + " ...Uh{COMMA} no?\n" + "You don{APOSTROPHE}t have any {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}."); ALIGNED(4) const char gUnknown_80DE648[] = _( - " Uh~2c OK.\n" - "So~2c you want me to delete every piece\n" + " Uh{COMMA} OK.\n" + "So{COMMA} you want me to delete every piece\n" "of mail that you have."); ALIGNED(4) const char gUnknown_80DE694[] = _( - " ...Uh~2c no?\n" - "You don~27t have a single piece of\n" + " ...Uh{COMMA} no?\n" + "You don{APOSTROPHE}t have a single piece of\n" "mail on you!"); ALIGNED(4) const char gUnknown_80DE6D4[] = _( - " So~2c delete all your {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}~2c\n" - "{COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}~2c and your {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}?\n" - "You~27re absolutely~2c positively sure?"); + " So{COMMA} delete all your {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}{COMMA}\n" + "{COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}{COMMA} and your {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}?\n" + "You{APOSTROPHE}re absolutely{COMMA} positively sure?"); ALIGNED(4) const char gUnknown_80DE754[] = _( - " If I delete any mail~2c it~27s\n" + " If I delete any mail{COMMA} it{APOSTROPHE}s\n" "gone forever and ever. Bye-bye.\n" - "You~27re really~2c really sure now?"); + "You{APOSTROPHE}re really{COMMA} really sure now?"); ALIGNED(4) const char gUnknown_80DE7B8[] = _( - " OK~2c then.\n" + " OK{COMMA} then.\n" "Let me save your adventure now."); ALIGNED(4) const char gUnknown_80DE7E8[] = _( - " Okeydoke. That~27s all done."); + " Okeydoke. That{APOSTROPHE}s all done."); ALIGNED(4) const char gUnknown_80DE808[] = _( " Do you want to delete\n" @@ -183,7 +183,7 @@ ALIGNED(4) const char gUnknown_80DE808[] = _( ALIGNED(4) const char gUnknown_80DE830[] = _( " Okeydoke.\n" - "I~27ll delete {COLOR_1 LIGHT_BLUE_2}every piece of mail{END_COLOR_TEXT_1}."); + "I{APOSTROPHE}ll delete {COLOR_1 LIGHT_BLUE_2}every piece of mail{END_COLOR_TEXT_1}."); ALIGNED(4) const char gUnknown_80DE864[] = _( " Okeydoke.\n" @@ -191,7 +191,7 @@ ALIGNED(4) const char gUnknown_80DE864[] = _( " Let me save your adventure."); ALIGNED(4) const char gUnknown_80DE8B4[] = _( - " Well~2c hello~2c there!\n" + " Well{COMMA} hello{COMMA} there!\n" "This is the {COLOR_1 LIGHT_BLUE_2}Friend Rescue{END_COLOR_TEXT_1} counter.\n" "What can I help you with today?"); @@ -203,53 +203,53 @@ ALIGNED(4) const char gUnknown_80DE93C[] = _( " Come again anytime!"); ALIGNED(4) const char gWonderMailErrorText[] = _( - " ...Uh~2c no?\n" - "Something~27s not working right here..."); + " ...Uh{COMMA} no?\n" + "Something{APOSTROPHE}s not working right here..."); ALIGNED(4) const char gWonderMailNumGBAsText[] = _( - " ...Uh~2c no?\n" - "The number of GBA systems isn~27t right.\n" - "You~27d better try this again from the top."); + " ...Uh{COMMA} no?\n" + "The number of GBA systems isn{APOSTROPHE}t right.\n" + "You{APOSTROPHE}d better try this again from the top."); ALIGNED(4) const char gWonderMailWrongModeText[] = _( - " ...Uh~2c no? You~27re not in the\n" + " ...Uh{COMMA} no? You{APOSTROPHE}re not in the\n" "same mode as your friend.\n" - "You~27d better try this again from the top."); + "You{APOSTROPHE}d better try this again from the top."); ALIGNED(4) const char gWonderMailStorageFullText[] = _( - " ...Uh~2c no?\n" + " ...Uh{COMMA} no?\n" "Your storage space is stuffed full.\n" - "You~27d better make room and try again."); + "You{APOSTROPHE}d better make room and try again."); ALIGNED(4) const char gWonderMailDuplicateText[] = _( - " ...Uh~2c no? It looks like\n" + " ...Uh{COMMA} no? It looks like\n" "you received this mail before.\n" - "You can~27t get the same mail twice. "); + "You can{APOSTROPHE}t get the same mail twice. "); ALIGNED(4) const char gWonderMailNotEligibleReceiveText[] = _( - " ...Uh~2c no?\n" - "You~27re not eligible to receive this mail."); + " ...Uh{COMMA} no?\n" + "You{APOSTROPHE}re not eligible to receive this mail."); ALIGNED(4) const char gWonderMailNoRoomText[] = _( - " ...Uh~2c no?\n" - "There~27s no room for you to \n" + " ...Uh{COMMA} no?\n" + "There{APOSTROPHE}s no room for you to \n" "receive any more mail.{EXTRA_MSG}" - " You~27d better delete some\n" + " You{APOSTROPHE}d better delete some\n" "mail and make room before you come see\n" "me again about receiving new mail."); ALIGNED(4) const char gWonderMailFriendErrorText[] = _( - " ...Uh~2c no? Looks like your\n" - "friend didn~27t do what needed doing.\n" - "You~27d better do this again from the top."); + " ...Uh{COMMA} no? Looks like your\n" + "friend didn{APOSTROPHE}t do what needed doing.\n" + "You{APOSTROPHE}d better do this again from the top."); ALIGNED(4) const char gWonderMailPasswordIncorrectText[] = _( - " ...Uh~2c no?\n" + " ...Uh{COMMA} no?\n" "This here password looks wrong.\n" "Do you want to try that again?"); ALIGNED(4) const char gWonderMailSOSPasswordIncorrectText[] = _( - " ...Uh~2c no? This password~27s\n" + " ...Uh{COMMA} no? This password{APOSTROPHE}s\n" "not for any {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}."); ALIGNED(4) const char gWonderMailAOKMailReceivedText[] = _( diff --git a/src/dungeon_pokemon_attributes_1.c b/src/dungeon_pokemon_attributes_1.c index ac865a9..02e9af0 100644 --- a/src/dungeon_pokemon_attributes_1.c +++ b/src/dungeon_pokemon_attributes_1.c @@ -7,7 +7,7 @@ extern bool8 IsIQSkillSet(u8 *, u32); extern u8 HasItem(struct DungeonEntity *, u32); -bool8 sub_8071884(struct DungeonEntity *pokemon) +bool8 CanSeeInvisible(struct DungeonEntity *pokemon) { struct DungeonEntityData *pokemonData = pokemon->entityData; if(pokemonData->eyesightStatus != EYESIGHT_STATUS_EYEDROPS) diff --git a/src/dungeon_util.c b/src/dungeon_util.c index 94cd327..f70148a 100644 --- a/src/dungeon_util.c +++ b/src/dungeon_util.c @@ -12,7 +12,7 @@ struct unk8049590 u8 unk8; }; -extern struct unk8049590 *sub_8049590(s16, s16); +extern struct unk8049590 *GetMapEntity(s16, s16); bool8 EntityExists(struct DungeonEntity *entity) { @@ -60,5 +60,5 @@ struct MapTile *sub_8045114(struct DungeonEntity *entity) struct unk8049590 *sub_8045128(struct DungeonEntity *entity) { - return sub_8049590(entity->posWorldX, entity->posWorldY); + return GetMapEntity(entity->posWorldX, entity->posWorldY); } diff --git a/src/friend_area_action_menu.c b/src/friend_area_action_menu.c index 48ebb1a..7da7a59 100644 --- a/src/friend_area_action_menu.c +++ b/src/friend_area_action_menu.c @@ -234,13 +234,13 @@ void sub_8027274(void) break; case 6: gUnknown_203B2BC->unk4 = 2; - // The {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} was + // The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was // returned to the Toolbox sub_80141B4(gUnknown_80DD8A0,0,0,0x101); break; case 7: gUnknown_203B2BC->unk4 = 2; - // The {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} was + // The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was // returned to storage sub_80141B4(gUnknown_80DD8D0,0,0,0x101); break; diff --git a/src/personality_test.c b/src/personality_test.c index d129d8c..2a623b6 100644 --- a/src/personality_test.c +++ b/src/personality_test.c @@ -74,7 +74,7 @@ extern const char gRelaxedDescription[]; extern const char gLonelyDescription[]; extern const char gQuirkyDescription[]; -ALIGNED(4) const char gStarterReveal[] = _("\n{CENTER_ALIGN}The Pokémon $m0!"); +ALIGNED(4) const char gStarterReveal[] = _("\n{CENTER_ALIGN}The Pokémon {ARG_POKEMON_0}!"); const char * const gStarterRevealPtr = gStarterReveal; ALIGNED(4) const char gPartnerPrompt[] = _( @@ -84,17 +84,17 @@ ALIGNED(4) const char gPartnerPrompt[] = _( "{CENTER_ALIGN}as your partner from this group."); const char * const gPartnerPromptPtr = gPartnerPrompt; -ALIGNED(4) const char gPartnerNickPrompt[] = _("{CENTER_ALIGN}What is your partner~27s nickname?"); +ALIGNED(4) const char gPartnerNickPrompt[] = _("{CENTER_ALIGN}What is your partner{APOSTROPHE}s nickname?"); const char * const gPartnerNickPromptPtr = gPartnerNickPrompt; ALIGNED(4) const char gEndIntroText[] = _( - "{CENTER_ALIGN}OK! We~27re all set!{EXTRA_MSG}" - "{CENTER_ALIGN}Let~27s get you into the\n" + "{CENTER_ALIGN}OK! We{APOSTROPHE}re all set!{EXTRA_MSG}" + "{CENTER_ALIGN}Let{APOSTROPHE}s get you into the\n" "{CENTER_ALIGN}world of Pokémon!{EXTRA_MSG}" "{CENTER_ALIGN}Go for it!"); const char * const gEndIntroTextPtr = gEndIntroText; -const char * const gPersonalityTypeDescriptionTable[NUM_PERSONALITIES] = +const char * const gPersonalityTypeDescriptionTable[NUM_PERSONALITIES] = { [HARDY] = gHardyDescription, [DOCILE] = gDocileDescription, @@ -113,7 +113,7 @@ const char * const gPersonalityTypeDescriptionTable[NUM_PERSONALITIES] = #include "data/nature_description.h" -const struct UnkTextStruct2 gUnknown_80F4244 = +const struct UnkTextStruct2 gUnknown_80F4244 = { 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, @@ -125,7 +125,7 @@ const struct UnkTextStruct2 gUnknown_80F4244 = const char filler[] = "pksdir0"; // CHUNSOFT inserted for aligning data -const s16 gPartners[NUM_PARTNERS] = +const s16 gPartners[NUM_PARTNERS] = { SPECIES_CHARMANDER, SPECIES_BULBASAUR, @@ -139,7 +139,7 @@ const s16 gPartners[NUM_PARTNERS] = SPECIES_MUDKIP }; -const struct UnkTextStruct2 gUnknown_80F4278 = +const struct UnkTextStruct2 gUnknown_80F4278 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, @@ -149,7 +149,7 @@ const struct UnkTextStruct2 gUnknown_80F4278 = NULL }; -const struct UnkTextStruct2 gUnknown_80F4290 = +const struct UnkTextStruct2 gUnknown_80F4290 = { 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, @@ -159,7 +159,7 @@ const struct UnkTextStruct2 gUnknown_80F4290 = NULL }; -const struct UnkTextStruct2 gUnknown_80F42A8 = +const struct UnkTextStruct2 gUnknown_80F42A8 = { 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, @@ -324,7 +324,7 @@ void UpdateNatureTotals() s32 answerIndex; s32 natureIndex; const u8 *pointArray; - + if (!sub_80144A4(&answerIndex)) { if (answerIndex == 99) @@ -585,7 +585,7 @@ void PersonalityTest_DisplayStarterSprite(void) sub_8008C54(1); sub_80073B8(1); faceFile = GetDialogueSpriteDataPtr(starterID); - r6 = ((struct FaceData *)(faceFile->data))->unk0[1 + EMOTION_HAPPY]; + r6 = ((struct FaceData *)(faceFile->data))->unk0[1 + EMOTION_HAPPY]; faceIndex = EMOTION_HAPPY; for(palleteIndex = 0; palleteIndex < 16; palleteIndex++){ SetBGPaletteBufferColorArray(palleteIndex + 224, &((struct FaceData *)(faceFile->data))->unk0[faceIndex][palleteIndex << 2]); @@ -696,10 +696,10 @@ void RedrawPartnerSelectionMenu(void) u32 yCoord; const char *monName; s32 monCounter; - + sVar1 = sub_80095E4(gUnknown_203B404->unk32, 0xc); - // Have a feeling this is some graphical thing but + // Have a feeling this is some graphical thing but // still not sure structure so it's not matching yet bc of that // and some casting stuff sVar1 += 2; @@ -855,7 +855,7 @@ s32 GetValidPartners(void) s32 counter; s32 ValidPartnerCounter; s32 CurrentPartnerID; - + ValidPartnerCounter = 0; PlayerType[0] = GetPokemonType(gUnknown_203B404->StarterID, 0); PlayerType[1] = GetPokemonType(gUnknown_203B404->StarterID, 1); diff --git a/src/pokemon_3.c b/src/pokemon_3.c index beaa4a3..427e0ed 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -27,7 +27,7 @@ struct unkStruct_808E9EC }; extern u32 gUnknown_81076C4[]; -struct unkStruct_202F3E8 +struct unkStruct_202F3E8 { u16 unk0; u16 unk2; @@ -64,7 +64,7 @@ extern void sub_809447C(struct unkStruct_8094924*, void*); extern void sub_808F428(struct unkStruct_8094924*, struct unkStruct_808E6F4*); -bool8 sub_808E668(s16 a1, s16* a2, s16* a3) +bool8 sub_808E668(s16 a1, s16* a2, s16* a3) { u32 shifted = a1 << 16; @@ -92,7 +92,7 @@ bool8 sub_808E668(s16 a1, s16* a2, s16* a3) void sub_808E6F4(struct unkStruct_808E6F4* a1) { - s32 i; + s32 i; a1->unk0 = gUnknown_810AC90[RandomCapped(10)]; for (i = 0; i < 100; i++) { @@ -108,7 +108,7 @@ bool8 HasRecruitedMon(s16 species_) { s32 species = species_; s32 i = 0; struct PokemonStruct *pokemon = gRecruitedPokemonRef->pokemon; - + for (i = 0; i < NUM_SPECIES; i++) { if (((u8)pokemon->unk0 & 1)) { if(pokemon->speciesNum == species) @@ -188,7 +188,7 @@ s32 GetBaseSpecies(s16 index) { return SPECIES_DEOXYS_NORMAL; if (index == SPECIES_RAYQUAZA_CUTSCENE) return SPECIES_RAYQUAZA; - + return index; } @@ -278,7 +278,7 @@ s32 GetUnownIndex(s16 index) return 0; } -u32 sub_808E9B8(struct PokemonStruct *r0) +u32 ExtractSpeciesIndex(struct PokemonStruct *r0) { return r0->unk0 & 0x000001ff; } @@ -295,7 +295,7 @@ void sub_808E9D8(struct PokemonStruct *r0, s32 r1, s16 r2) r0->unk0 = r2_32 | (r1 << 9) ; } -u32 sub_808E9E4(struct PokemonStruct *r0) +u32 ExtractLevel(struct PokemonStruct *r0) { return (r0->unk0 >> 9); } @@ -481,7 +481,7 @@ u32 GetTacticsDescription(u8 r0) return gTacticsDescriptions[r0]; } -u8 sub_808EAFC(u8 r0) +u8 TacticsTargetLeader(u8 r0) { return gUnknown_810A36B[r0]; } @@ -620,9 +620,9 @@ void SetDefaultIQSkills(u8 *param_1, bool8 enableSelfCurer) bool8 IsIQSkillSet(u8 *param_1, u32 param_2) { - if ((((param_1[0] & param_2) == 0) && + if ((((param_1[0] & param_2) == 0) && ((param_1[1] & param_2 >> 8) == 0)) && - ((param_1[2] & param_2 >> 0x10) == 0)) + ((param_1[2] & param_2 >> 0x10) == 0)) { return FALSE; } @@ -652,7 +652,7 @@ void sub_808ED00() { } } -s32 SaveRecruitedPokemon(u8 *a1, s32 a2) +s32 SaveRecruitedPokemon(u8 *a1, s32 a2) { u16 buffer[6]; struct unkStruct_8094924 backup; @@ -689,7 +689,7 @@ s32 SaveRecruitedPokemon(u8 *a1, s32 a2) } else { pokemon->unkHasNextStage = 0; - } + } SavePokemonStruct(&backup, pokemon); } @@ -699,7 +699,7 @@ s32 SaveRecruitedPokemon(u8 *a1, s32 a2) } else { data_u8 = 0; - } + } SaveIntegerBits(&backup, &data_u8, 1); SavePokemonStruct(&backup, &gRecruitedPokemonRef->team[i]); } @@ -712,7 +712,7 @@ s32 SaveRecruitedPokemon(u8 *a1, s32 a2) return backup.unk8; } -s32 RestoreRecruitedPokemon(u8 *a1, s32 a2) +s32 RestoreRecruitedPokemon(u8 *a1, s32 a2) { struct unkStruct_8094924 backup; u8 data_u8; // same as saverecruitedpokemon @@ -749,7 +749,7 @@ s32 RestoreRecruitedPokemon(u8 *a1, s32 a2) return backup.unk8; } -void SavePokemonStruct(struct unkStruct_8094924* a1, struct PokemonStruct* pokemon) +void SavePokemonStruct(struct unkStruct_8094924* a1, struct PokemonStruct* pokemon) { SaveIntegerBits(a1, &pokemon->unkHasNextStage, 7); SaveIntegerBits(a1, &pokemon->speciesNum, 9); @@ -770,7 +770,7 @@ void SavePokemonStruct(struct unkStruct_8094924* a1, struct PokemonStruct* pokem SaveIntegerBits(a1, pokemon->name, 80); } -void RestorePokemonStruct(struct unkStruct_8094924* a1, struct PokemonStruct* pokemon) +void RestorePokemonStruct(struct unkStruct_8094924* a1, struct PokemonStruct* pokemon) { memset(pokemon, 0, sizeof(struct PokemonStruct)); pokemon->unk0 = 0; @@ -797,7 +797,7 @@ void RestorePokemonStruct(struct unkStruct_8094924* a1, struct PokemonStruct* po RestoreIntegerBits(a1, pokemon->name, 80); } -s32 SavePokemonStruct2(u8* a1, s32 size) +s32 SavePokemonStruct2(u8* a1, s32 size) { struct unkStruct_8094924 backup; s32 i; @@ -809,13 +809,13 @@ s32 SavePokemonStruct2(u8* a1, s32 size) data_u8_zero = 0; for (i = 0; i < 4; i++) { - struct PokemonStruct2* pokemon2 = &gRecruitedPokemonRef->pokemon2[i]; + struct PokemonStruct2* pokemon2 = &gRecruitedPokemonRef->pokemon2[i]; SaveIntegerBits(&backup, &pokemon2->unk0, 2); SaveIntegerBits(&backup, pokemon2->unk2 ? &data_u8_neg1 : &data_u8_zero, 1); SaveIntegerBits(&backup, &pokemon2->unkHasNextStage, 7); - xxx_save_poke_sub_4_80902F4(&backup, &pokemon2->unk4); + xxx_save_poke_sub_4_80902F4(&backup, &pokemon2->unk4); SaveIntegerBits(&backup, &pokemon2->IQ, 10); SaveIntegerBits(&backup, &pokemon2->unkA, 16); SaveIntegerBits(&backup, &pokemon2->unkC, 16); @@ -840,18 +840,18 @@ s32 SavePokemonStruct2(u8* a1, s32 size) return backup.unk8; } -s32 RestorePokemonStruct2(u8* a1, s32 size) +s32 RestorePokemonStruct2(u8* a1, s32 size) { struct unkStruct_8094924 backup; - s32 i; - + s32 i; + xxx_init_struct_8094924_restore_809485C(&backup, a1, size); for (i = 0; i < 4; i++) { - struct PokemonStruct2* pokemon2 = &gRecruitedPokemonRef->pokemon2[i]; + struct PokemonStruct2* pokemon2 = &gRecruitedPokemonRef->pokemon2[i]; u8 unk2; memset(pokemon2, 0, sizeof(struct PokemonStruct2)); - + RestoreIntegerBits(&backup, &pokemon2->unk0, 2); RestoreIntegerBits(&backup, &unk2, 1); @@ -863,7 +863,7 @@ s32 RestorePokemonStruct2(u8* a1, s32 size) } RestoreIntegerBits(&backup, &pokemon2->unkHasNextStage, 7); - xxx_restore_poke_sub_4_8090314(&backup, &pokemon2->unk4); + xxx_restore_poke_sub_4_8090314(&backup, &pokemon2->unk4); RestoreIntegerBits(&backup, &pokemon2->IQ, 10); RestoreIntegerBits(&backup, &pokemon2->unkA, 16); RestoreIntegerBits(&backup, &pokemon2->unkC, 16); diff --git a/src/post_office_guide.c b/src/post_office_guide.c index 388955c..63470f5 100644 --- a/src/post_office_guide.c +++ b/src/post_office_guide.c @@ -314,16 +314,16 @@ void UpdateHelperPelipperText(void) switch(gPostOfficeHelper->currMenuChoice) { case GETTING_HELP: - sub_80141B4(gGettingHelpExplaination, 0, faceFile, 0x10d); + sub_80141B4(gGettingHelpExplanation, 0, faceFile, 0x10d); break; case SEND_SOS_MAIL: - sub_80141B4(gSendSOSMailExplaination, 0, faceFile, 0x10d); + sub_80141B4(gSendSOSMailExplanation, 0, faceFile, 0x10d); break; case RECEIVE_AOK_MAIL: - sub_80141B4(gReceiveAOKMailExplaination, 0, faceFile, 0x10d); + sub_80141B4(gReceiveAOKMailExplanation, 0, faceFile, 0x10d); break; case SEND_THANK_YOU_MAIL: - sub_80141B4(gSendThankYouMailExplaination, 0, faceFile, 0x10d); + sub_80141B4(gSendThankYouMailExplanation, 0, faceFile, 0x10d); break; default: break; @@ -336,19 +336,19 @@ void UpdateHelperPelipperText(void) switch(gPostOfficeHelper->currMenuChoice) { case RESCUE_PROCEDURES: - sub_80141B4(gRescueProceduresExplaination, 0, faceFile, 0x10d); + sub_80141B4(gRescueProceduresExplanation, 0, faceFile, 0x10d); break; case RECEIVE_SOS_MAIL: - sub_80141B4(gReceiveSOSMailExplaination, 0, faceFile, 0x10d); + sub_80141B4(gReceiveSOSMailExplanation, 0, faceFile, 0x10d); break; case SEND_AOK_MAIL: - sub_80141B4(gSendAOKMailExplaination, 0, faceFile, 0x10d); + sub_80141B4(gSendAOKMailExplanation, 0, faceFile, 0x10d); break; case LEAVE_FOR_RESCUE: - sub_80141B4(gLeaveForRescueExplaination, 0, faceFile, 0x10d); + sub_80141B4(gLeaveForRescueExplanation, 0, faceFile, 0x10d); break; case GET_THANK_YOU_MAIL: - sub_80141B4(gGetThankYouMailExplaination, 0, faceFile, 0x10d); + sub_80141B4(gGetThankYouMailExplanation, 0, faceFile, 0x10d); break; default: break; @@ -364,13 +364,13 @@ void UpdateHelperPelipperText(void) switch(gPostOfficeHelper->currMenuChoice) { case POST_OFFICE: - sub_80141B4(gPostOfficeExplaination, 0, faceFile, 0x10d); + sub_80141B4(gPostOfficeExplanation, 0, faceFile, 0x10d); break; case BULLETIN_BOARD: - sub_80141B4(gBulletinBoardExplaination, 0, faceFile, 0x10d); + sub_80141B4(gBulletinBoardExplanation, 0, faceFile, 0x10d); break; case DELIVERY: - sub_80141B4(gDeliveryExplaination, 0, faceFile, 0x10d); + sub_80141B4(gDeliveryExplanation, 0, faceFile, 0x10d); break; default: break; @@ -383,10 +383,10 @@ void UpdateHelperPelipperText(void) switch(gPostOfficeHelper->currMenuChoice) { case FRIEND_RESCUE_INFO: - sub_80141B4(gFriendRescueExplaination, 0, faceFile, 0x10d); + sub_80141B4(gFriendRescueExplanation, 0, faceFile, 0x10d); break; case DELETING_MAIL: - sub_80141B4(gDeletingMailExplaination, 0, faceFile, 0x10d); + sub_80141B4(gDeletingMailExplanation, 0, faceFile, 0x10d); break; default: break; @@ -95,7 +95,7 @@ ALIGNED(4) const char gSaveCorrupted[] = _("{CENTER_ALIGN}The game data is corru ALIGNED(4) const char fill_save4[] = _("pksdir0"); ALIGNED(4) const char gSavingAdventure[] = _("{CENTER_ALIGN}Saving your adventure...\n" - "{CENTER_ALIGN}Please don~27t turn off the power."); + "{CENTER_ALIGN}Please don{APOSTROPHE}t turn off the power."); ALIGNED(4) const char gWriteGamePak[] = _("{CENTER_ALIGN}Writing to GBA Game Pak.\n" "{CENTER_ALIGN}Do not remove the GBA Game Pak.\n" @@ -111,27 +111,27 @@ ALIGNED(4) const char gSaveFailed[] = _("{CENTER_ALIGN}Save failed."); ALIGNED(4) const char fill_save5[] = _("pksdir0"); -ALIGNED(4) const char gUnknown_80D44C8[] = _("{CENTER_ALIGN}Your data was not properly saved~2c\n" +ALIGNED(4) const char gUnknown_80D44C8[] = _("{CENTER_ALIGN}Your data was not properly saved{COMMA}\n" "{CENTER_ALIGN}so your game cannot be resumed\n" "{CENTER_ALIGN}from your last spot.{EXTRA_MSG}" "{CENTER_ALIGN}Your last outing is considered a defeat.\n" - "{CENTER_ALIGN}Before shutting down~2c save in your\n" - "{CENTER_ALIGN}team base~2c or quicksave in a dungeon."); + "{CENTER_ALIGN}Before shutting down{COMMA} save in your\n" + "{CENTER_ALIGN}team base{COMMA} or quicksave in a dungeon."); ALIGNED(4) const char fill_save6[] = _("pksdir0"); ALIGNED(4) const char gUnknown_80D45AC[] = _("{CENTER_ALIGN}Quicksaving your adventure...\n" - "{CENTER_ALIGN}Please don~27t turn off the power."); + "{CENTER_ALIGN}Please don{APOSTROPHE}t turn off the power."); ALIGNED(4) const char gUnknown_80D45F4[] = _("{CENTER_ALIGN}Your adventure has been saved.\n" - "{CENTER_ALIGN}When you are in a dungeon~2c quicksave\n" + "{CENTER_ALIGN}When you are in a dungeon{COMMA} quicksave\n" "{CENTER_ALIGN}your progress before ending the game."); ALIGNED(4) const char gUnknown_80D4668[] = _("{CENTER_ALIGN}Your adventure has been saved.\n" - "{CENTER_ALIGN}When you resume play~2c the quicksave\n" + "{CENTER_ALIGN}When you resume play{COMMA} the quicksave\n" "{CENTER_ALIGN}data will be deleted.{EXTRA_MSG}" - "{CENTER_ALIGN}When you are shutting down the game~2c\n" - "{CENTER_ALIGN}save your progress in your team base~2c\n" + "{CENTER_ALIGN}When you are shutting down the game{COMMA}\n" + "{CENTER_ALIGN}save your progress in your team base{COMMA}\n" "{CENTER_ALIGN}or quicksave in a dungeon."); ALIGNED(4) const char gSaveNotWritten2[] = _("{CENTER_ALIGN}The data could not be written.\n" @@ -458,7 +458,7 @@ u32 WriteSavetoPak(s32 *param_1,u32 param_2) int r5; int r4; u8 *array_ptr; - + iVar1 = MemoryAlloc(sizeof(struct UnkStruct_sub_8011DAC),5); array_ptr = iVar1->unk448; if (gUnknown_203B184 == NULL) { @@ -720,7 +720,7 @@ void PrepareSavePakWrite(s16 PokemonID) u8 *preload_face; id_s32 = PokemonID; // had to cast for asr shift - + sub_80993D8(); gSavePakWrite = MemoryAlloc(sizeof(struct SavePakWrite),5); gSavePakWrite->pokeID = id_s32; @@ -737,7 +737,7 @@ void PrepareSavePakWrite(s16 PokemonID) gSavePakWrite->unk16 = 8; } if (gSavePakWrite->faceFile != 0) { - preload_face = (u8 *)&gSavePakWrite->faceFile; + preload_face = (u8 *)&gSavePakWrite->faceFile; sub_80141B4(gSavingAdventure,0,preload_face,0x20); } else { @@ -751,12 +751,12 @@ bool8 WriteSavePak(void) struct OpenedFile **faceFile; u32 local_14; u32 other_stack; - + faceFile = NULL; if (gSavePakWrite->faceFile != 0) { faceFile = &gSavePakWrite->faceFile; } - switch(gSavePakWrite->state) + switch(gSavePakWrite->state) { case 0: gSavePakWrite->state = 7; diff --git a/src/thank_you_wonder_mail.c b/src/thank_you_wonder_mail.c index 078fc50..3f105c5 100644 --- a/src/thank_you_wonder_mail.c +++ b/src/thank_you_wonder_mail.c @@ -154,7 +154,7 @@ const struct MenuItem gUnknown_80DEE7C[4] = {NULL, 0x0}, }; -ALIGNED(4) const u8 DontSendItem_Text[] = "Don~27t Send Item"; +ALIGNED(4) const u8 DontSendItem_Text[] = _("Don{APOSTROPHE}t Send Item"); ALIGNED(4) const u8 SendItem_Text[] = "Send Item"; const struct MenuItem gUnknown_80DEEBC[3] = @@ -174,8 +174,8 @@ const struct MenuItem gUnknown_80DEEE4[4] = {NULL, 0x0}, }; -ALIGNED(4) const char gUnknown_80DEF04[] = " ...Oh?\n" - "Something~27s gone wrong."; +ALIGNED(4) const char gUnknown_80DEF04[] = _(" ...Oh?\n" + "Something{APOSTROPHE}s gone wrong."); ALIGNED(4) const char gUnknown_80DEF28[] = " ...Oh? The number of linked\n" "GBA systems is incorrect.\n" @@ -191,25 +191,25 @@ ALIGNED(4) const u8 gUnknown_80DEFDC[]= "storage space is full. Please clear some\n" "space and try again from the start."; -ALIGNED(4) const u8 gUnknown_80DF044[]= +ALIGNED(4) const u8 gUnknown_80DF044[]= _( " ...Oh?\n" - "I think you~27ve received this mail before.\n" - "You can~27t get the same mail twice."; + "I think you{APOSTROPHE}ve received this mail before.\n" + "You can{APOSTROPHE}t get the same mail twice."); -ALIGNED(4) const u8 gUnknown_80DF0A0[]= +ALIGNED(4) const u8 gUnknown_80DF0A0[]= _( " ...Oh?\n" - "I don~27t think you~27re eligible to receive\n" - "this mail."; + "I don{APOSTROPHE}t think you{APOSTROPHE}re eligible to receive\n" + "this mail."); ALIGNED(4) const u8 gUnknown_80DF0E0[]= " ...Oh?\n" "There is no room to receive new mail.\n" "Please delete some mail and try again."; -ALIGNED(4) const u8 gUnknown_80DF138[]= - " ...Oh? Your friend didn~27t\n" +ALIGNED(4) const u8 gUnknown_80DF138[]= _( + " ...Oh? Your friend didn{APOSTROPHE}t\n" "follow through on their side.\n" - "Please try again from the start."; + "Please try again from the start."); ALIGNED(4) const u8 gUnknown_80DF194[]= _( " Your {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}\n" @@ -221,14 +221,14 @@ ALIGNED(4) const u8 gUnknown_80DF1C0[]= "Would you like to try again?"; ALIGNED(4) const u8 gUnknown_80DF208[]= _( - " ...Oh? This password doesn~27t\n" + " ...Oh? This password doesn{APOSTROPHE}t\n" "appear to be for a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}."); ALIGNED(4) const u8 gUnknown_80DF250[]= _( ": This is the counter for\n" "{COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.#P" - ": Oh~2c hi~2c #CN%s{END_COLOR_TEXT_1}.\n" - "I~27ve been waiting for you. You wanted me\n" + ": Oh{COMMA} hi{COMMA} {COLOR_1 YELLOW_5}%s{END_COLOR_TEXT_1}.\n" + "I{APOSTROPHE}ve been waiting for you. You wanted me\n" "to process a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}?#P" ": Let me get on it right away."); @@ -252,19 +252,19 @@ ALIGNED(4) const u8 gUnknown_80DF3B4[]= "adventure."; ALIGNED(4) const u8 gUnknown_80DF418[]= _( - " OK~2c here is your\n" + " OK{COMMA} here is your\n" "{COLOR_1 LIGHT_BLUE_2}Thank-You Mail password{END_COLOR_TEXT_1}."); ALIGNED(4) const u8 gUnknown_80DF44C[]= " I need to save your\n" "adventure."; -ALIGNED(4) const u8 gUnknown_80DF46C[]= +ALIGNED(4) const u8 gUnknown_80DF46C[]= _( " There we go.\n" - "I~27m all done.#P" - " Doesn~27t it feel great to\n" + "I{APOSTROPHE}m all done.#P" + " Doesn{APOSTROPHE}t it feel great to\n" "be appreciated for doing something good?\n" - "Please keep up your rescue work!"; + "Please keep up your rescue work!"); ALIGNED(4) const u8 gUnknown_80DF4F4[]= _( " A {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} has\n" @@ -274,10 +274,10 @@ ALIGNED(4) const u8 gUnknown_80DF4F4[]= _( ALIGNED(4) const u8 gUnknown_80DF544[]= _( "#+Communicating...\n" "#+Please wait with the power on.\n" - "#+To cancel~2c press {B_BUTTON}."); + "#+To cancel{COMMA} press {B_BUTTON}."); ALIGNED(4) const u8 gUnknown_80DF594[]= _( - " There. I~27ve sent your\n" + " There. I{APOSTROPHE}ve sent your\n" "{COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.\n" "I need to save your adventure."); @@ -287,21 +287,21 @@ ALIGNED(4) const u8 gUnknown_80DF5E4[]= _( "Is your friend also ready?"); ALIGNED(4) const u8 gUnknown_80DF63C[]= _( - " There~2c all done.\n" - "#CN%s{END_COLOR_TEXT_1}~2c I hope your friend\n" + " There{COMMA} all done.\n" + "{COLOR_1 YELLOW_5}%s{END_COLOR_TEXT_1}{COMMA} I hope your friend\n" "appreciates your sense of gratitude."); -ALIGNED(4) const u8 gUnknown_80DF694[]= - " The item you~27ve chosen\n" - "here can~27t be exchanged later.\n" - "Are you certain this item is OK?"; +ALIGNED(4) const u8 gUnknown_80DF694[]= _( + " The item you{APOSTROPHE}ve chosen\n" + "here can{APOSTROPHE}t be exchanged later.\n" + "Are you certain this item is OK?"); -ALIGNED(4) const u8 gUnknown_80DF6F0[]= - " I~27ve saved your adventure. "; +ALIGNED(4) const u8 gUnknown_80DF6F0[]= _( + " I{APOSTROPHE}ve saved your adventure. "); -ALIGNED(4) const u8 gUnknown_80DF710[]= - " OK~2c please choose\n" - "the item to be sent."; +ALIGNED(4) const u8 gUnknown_80DF710[]= _( + " OK{COMMA} please choose\n" + "the item to be sent."); ALIGNED(4) const u8 gUnknown_80DF73C[]= " ...Oh?\n" @@ -315,10 +315,10 @@ ALIGNED(4) const u8 gUnknown_80DF77C[]= _( ALIGNED(4) const u8 gUnknown_80DF7D4[]= _( " ...Oh?\n" - "You~27ve already attached a {COLOR_1 LIGHT_BLUE_2}reward item{END_COLOR_TEXT_1}\n" + "You{APOSTROPHE}ve already attached a {COLOR_1 LIGHT_BLUE_2}reward item{END_COLOR_TEXT_1}\n" "to this mail.#P" - " I~27m sorry~2c but once an item\n" - "has been attached to mail~2c it can~27t be\n" + " I{APOSTROPHE}m sorry{COMMA} but once an item\n" + "has been attached to mail{COMMA} it can{APOSTROPHE}t be\n" "exchanged."); ALIGNED(4) const u8 gUnknown_80DF870[]= @@ -327,7 +327,7 @@ ALIGNED(4) const u8 gUnknown_80DF870[]= ALIGNED(4) const u8 gUnknown_80DF8B4[]= _( " ...Oh?\n" - "You don~27t seem to have a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}."); + "You don{APOSTROPHE}t seem to have a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}."); ALIGNED(4) const u8 gUnknown_80DF8EC[]= _( " Hello.\n" @@ -348,7 +348,7 @@ ALIGNED(4) const u8 gUnknown_80DF96C[] = _( ALIGNED(4) const u8 gUnknown_80DF9A4[]= _( " How would you like to\n" - "receive your friend~27s {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}?"); + "receive your friend{APOSTROPHE}s {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}?"); ALIGNED(4) const u8 thank_you_fill[] = "pksdir0"; diff --git a/src/wonder_mail_2.c b/src/wonder_mail_2.c index 8a9c0ed..34feee1 100644 --- a/src/wonder_mail_2.c +++ b/src/wonder_mail_2.c @@ -163,23 +163,23 @@ ALIGNED(4) const char gUnknown_80DF9F0[] = "????"; // NOTE: had to be pre-proc'd to match ALIGNED(4) const char gUnknown_80DF9F8[] = _( - " Oh~2c hello!\n" - "Your rescue mission went well~2c didn~27t it?\n" - "I wouldn~27t expect any less~2c {COLOR_1 LIGHT_BLUE_2}%s{END_COLOR_TEXT_1}!#P" - " Well~2c well!\n" + " Oh{COMMA} hello!\n" + "Your rescue mission went well{COMMA} didn{APOSTROPHE}t it?\n" + "I wouldn{APOSTROPHE}t expect any less{COMMA} {COLOR_1 LIGHT_BLUE_2}%s{END_COLOR_TEXT_1}!#P" + " Well{COMMA} well!\n" "Here is your reward from the Pokémon\n" "Rescue Organization!"); -ALIGNED(4) const char gUnknown_80DFAA8[] = +ALIGNED(4) const char gUnknown_80DFAA8[] = _( " I hope you will keep on\n" "rescuing your friends in\n" "dire straits.#P" - " And now~2c I must save\n" - "your adventure."; + " And now{COMMA} I must save\n" + "your adventure."); ALIGNED(4) const char gUnknown_80DFB14[] = _( - " Oh~2c yes~2c that~27s right.\n" - "Please don~27t forget to send an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}\n" + " Oh{COMMA} yes{COMMA} that{APOSTROPHE}s right.\n" + "Please don{APOSTROPHE}t forget to send an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}\n" "to the friend you just rescued.#P" " Please give me a shout if\n" "you would like to send {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}."); diff --git a/src/wonder_mail_main_menu.c b/src/wonder_mail_main_menu.c index 340e804..9566614 100644 --- a/src/wonder_mail_main_menu.c +++ b/src/wonder_mail_main_menu.c @@ -88,9 +88,9 @@ ALIGNED(4) const char gUnknown_80E79E4[] = "The sender and receiver appear to be "in different modes.\n" "Please redo the process from the start."; -ALIGNED(4) const char gUnknown_80E7A48[] = "There is no response from your friend.\n" - "Please make sure the sender and receiver\n" - "are ready~2c then redo this from the start."; +ALIGNED(4) const char gUnknown_80E7A48[] = _("There is no response from your friend.\n" + "Please make sure the sender and receiver\n" + "are ready{COMMA} then redo this from the start."); ALIGNED(4) const char gUnknown_80E7AC4[] = "What would you like to do?"; @@ -110,12 +110,12 @@ ALIGNED(4) const char gUnknown_80E7B88[] = _("The received {COLOR_1 LIGHT_BLUE_2 ALIGNED(4) const char gUnknown_80E7BC8[] = _("The {COLOR_1 LIGHT_BLUE_2}Wonder Mail{END_COLOR_TEXT_1} was refused."); ALIGNED(4) const char gUnknown_80E7BEC[] = _("Connect a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}.\n" - "When you and your friend are ready~2c\n" + "When you and your friend are ready{COMMA}\n" "you may communicate. "); ALIGNED(4) const char gUnknown_80E7C48[] = _("#+In communication...\n" "#+Please wait with the power on.\n" - "#+To cancel~2c press {B_BUTTON}."); + "#+To cancel{COMMA} press {B_BUTTON}."); ALIGNED(4) const char gUnknown_80E7C98[] = _("Please enter the\n" "{COLOR_1 LIGHT_BLUE_2}Wonder Mail password{END_COLOR_TEXT_1}."); diff --git a/sym_ewram.txt b/sym_ewram.txt index 56a505b..ab64731 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -429,10 +429,10 @@ gAvailablePokemonNames = .; /* 202DF98 */ gUnknown_202DFE8 = .; /* 202DFE8 */ . += 0x50; -gUnknown_202E038 = .; /* 202E038 ($m2) */ +gUnknown_202E038 = .; /* 202E038 ({ARG_POKEMON_2}) */ . += 0x50; -gUnknown_202E088 = .; /* 202E088 ($m3)? */ +gUnknown_202E088 = .; /* 202E088 ({ARG_POKEMON_3})? */ . += 0xA0; gUnknown_202E128 = .; /* 202E128 */ @@ -849,7 +849,7 @@ gUnknown_202F32D = .; /* 202F32D */ gPotentialTargetDirections = .; /* 202F330 */ . += 0x20; -gUnknown_202F350 = .; /* 202F350 */ +gTargetAhead = .; /* 202F350 */ . += 0x8; gPotentialTargetWeights = .; /* 202F358 */ @@ -858,13 +858,13 @@ gPotentialTargetWeights = .; /* 202F358 */ gUnknown_202F378 = .; /* 202F378 */ . += 0x8; -gUnknown_202F380 = .; /* 202F380 */ +gCanAttackInDirection = .; /* 202F380 */ . += 0x8; gUnknown_202F388 = .; /* 202F388 */ . += 0x8; -gUnknown_202F390 = .; /* 202F390 */ +gPotentialTargetWeights_2 = .; /* 202F390 */ . += 0x20; gUnknown_202F3B0 = .; /* 202F3B0 */ diff --git a/sym_ewram2.txt b/sym_ewram2.txt index 52a5165..ba1c931 100644 --- a/sym_ewram2.txt +++ b/sym_ewram2.txt @@ -575,7 +575,7 @@ gNumPotentialTargets = .; /* 203B440 */ gUnknown_203B444 = .; /* 203B444 */ . += 0xC; -gUnknown_203B450 = .; /* 203B450 */ +gLeaderPokemon = .; /* 203B450 */ . += 0x4; gUnknown_203B454 = .; /* 203B454 */ |