Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-09-12 02:56:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Labeled more symbols (#77)

Browse Source 
* Labeled more symbols

* Fixed comment typo

* Renamed some functions
This commit is contained in:
Cheng Hann Gan
2021-11-20 10:47:46 -06:00
committed by GitHub
parent 1355271988
commit 938a88551f
72 changed files with 2771 additions and 2751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
asm/code_803D110.s
View File

@@ -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

26
asm/code_8040094.s
View File

@@ -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

6
asm/code_8041AD0.s
View File

@@ -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

104
asm/code_80428A0.s
View File

@@ -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:

54
asm/code_80450F8.s
View File

@@ -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

362
asm/code_8048480.s
View File

File diff suppressed because it is too large Load Diff

96
asm/code_80521D0.s
View File

@@ -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

20
asm/code_8057144.s
View File

@@ -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

464
asm/code_8057824.s
View File

File diff suppressed because it is too large Load Diff

100
asm/code_807001C.s
View File

@@ -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

88
asm/code_8070D04.s
View File

@@ -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

26
asm/code_8071518.s
View File

@@ -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:

6
asm/code_8071858.s
View File

@@ -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

92
asm/code_80718D8.s
View File

@@ -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

100
asm/code_80739DC.s
View File

@@ -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

564
asm/code_8075BA4.s
View File

File diff suppressed because it is too large Load Diff

4
asm/code_80848F0.s
View File

@@ -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

2
asm/code_8085B0C.s
View File

@@ -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

6
asm/code_8094148.s
View File

@@ -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:

10
asm/jirachi_wish.s
View File

@@ -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

30
charmap.txt
View File

@@ -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

8
data/cutscenes_1.s
View File

@@ -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

2
data/data.s
View File

@@ -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

6
data/data_80B9BB8.s
View File

@@ -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

756
data/data_80D47B8.s
View File

File diff suppressed because it is too large Load Diff

32
data/data_80DED44.s
View File

@@ -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"

110
data/data_80E2068.s
View File

@@ -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

14
data/data_80E59A8.s
View File

@@ -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

52
data/data_80E7D40.s
View File

@@ -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

254
data/data_80F4278.s
View File

@@ -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

4
data/data_810AC60.s
View File

@@ -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

68
data/data_810AE24.s
View File

@@ -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

12
data/friend_area.inc
View File

@@ -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

16
data/friend_area_dialogue.s
View File

@@ -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

424
data/item/item_descriptions.s
View File

File diff suppressed because it is too large Load Diff

354
data/move/move_names.s
View File

File diff suppressed because it is too large Load Diff

58
data/personality_test.s
View File

@@ -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

346
data/pokemon_mail.s
View File

@@ -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

2
data/scripts/personality_test.inc
View File

@@ -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

12
data/text/luminous_cave.inc
View File

@@ -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

24
data/text/party_menu.inc
View File

@@ -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

10
data/text/save.inc
View File

@@ -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

8
data/text/wonder_mail_complete.inc
View File

@@ -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"

2
src/code_8012A18_1.c
View File

@@ -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;

6
src/code_801AFA4.c
View File

@@ -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:

4
src/code_801B3C0.c
View File

@@ -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();

12
src/code_801C620.c
View File

@@ -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();

4
src/code_8040094.c
View File

@@ -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);

4
src/code_8041AD0.c
View File

@@ -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);

2
src/code_80428A0.c
View File

@@ -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);
}

12
src/code_80521D0_1.c
View File

@@ -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);

2
src/code_8057824.c
View File

@@ -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;
}

42
src/code_8057824_1.c
View File

@@ -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"

4
src/code_8086A3C.c
View File

@@ -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)

2
src/code_8090208.c
View File

@@ -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)

4
src/code_8097F40.c
View File

@@ -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;
}

2
src/code_80983D8.c
View File

@@ -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;

104
src/data/nature_description.h
View File

@@ -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...");

146
src/data/pelipper_help_guide_dialogue.h
View File

@@ -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.");

156
src/data/wonder_mail_1.h
View File

@@ -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[] = _(

2
src/dungeon_pokemon_attributes_1.c
View File

@@ -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)

4
src/dungeon_util.c
View File

@@ -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);
}

4
src/friend_area_action_menu.c
View File

@@ -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;

30
src/personality_test.c
View File

@@ -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);

50
src/pokemon_3.c
View File

@@ -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);

28
src/post_office_guide.c
View File

@@ -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;

28
src/save.c
View File

@@ -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;

76
src/thank_you_wonder_mail.c
View File

@@ -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";

18
src/wonder_mail_2.c
View File

@@ -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}.");

10
src/wonder_mail_main_menu.c
View File

@@ -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}.");

10
sym_ewram.txt
View File

@@ -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 */

2
sym_ewram2.txt
View File

@@ -575,7 +575,7 @@ gNumPotentialTargets = .; /* 203B440 */
gUnknown_203B444 = .; /* 203B444 */
. += 0xC;
gUnknown_203B450 = .; /* 203B450 */
gLeaderPokemon = .; /* 203B450 */
. += 0x4;
gUnknown_203B454 = .; /* 203B454 */