Merge branch 'master' into make_naix

1 files changed, 449 insertions, 449 deletions

diff --git a/arm9/global.inc b/arm9/global.inc
index fda0c781..bb0db560 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -2784,374 +2784,374 @@
 .extern ScrCmd_Unk02CF
 .extern ScrCmd_Unk02D0
 .extern ScrCmd_Unk005E
-.extern FUN_0203B024
-.extern FUN_0203B148
-.extern FUN_0203B1F0
-.extern FUN_0203B2E0
-.extern FUN_0203B3B0
-.extern FUN_0203B3C0
-.extern FUN_0203B3DC
-.extern FUN_0203B3F8
-.extern FUN_0203B440
-.extern FUN_0203B468
-.extern FUN_0203B500
-.extern FUN_0203B544
-.extern FUN_0203B574
-.extern FUN_0203B5B8
-.extern FUN_0203B618
-.extern FUN_0203B640
-.extern FUN_0203B724
-.extern FUN_0203B758
-.extern FUN_0203B790
-.extern FUN_0203B7D8
-.extern FUN_0203B7F0
-.extern FUN_0203B81C
-.extern FUN_0203B85C
-.extern FUN_0203B8A0
-.extern FUN_0203B8E4
-.extern FUN_0203B914
-.extern FUN_0203B944
-.extern FUN_0203B968
-.extern FUN_0203B9B4
-.extern FUN_0203BA3C
-.extern FUN_0203BAB0
-.extern FUN_0203BAF4
-.extern FUN_0203BB34
-.extern FUN_0203BB80
-.extern FUN_0203BB84
-.extern FUN_0203BB88
-.extern FUN_0203BB8C
+.extern ScrCmd_Unk02A1
+.extern ScrCmd_Unk005F
+.extern ScrCmd_Unk0060
+.extern ScrCmd_Unk02B4
+.extern ScrCmd_Unk0061
+.extern ScrCmd_Unk0062
+.extern ScrCmd_Unk0063
+.extern ScrCmd_Unk0064
+.extern ScrCmd_Unk0065
+.extern ScrCmd_Unk0066
+.extern ScrCmd_Unk0067
+.extern ScrCmd_Unk0068
+.extern ScrCmd_Unk0069
+.extern ScrCmd_Unk006A
+.extern ScrCmd_Unk01BD
+.extern ScrCmd_Unk006B
+.extern ScrCmd_Unk006C
+.extern ScrCmd_Unk006D
+.extern ScrCmd_Unk02AD
+.extern ScrCmd_Unk006E
+.extern ScrCmd_Unk02AB
+.extern ScrCmd_Unk0093
+.extern ScrCmd_Unk0094
+.extern ScrCmd_Unk0095
+.extern ScrCmd_Unk0191
+.extern ScrCmd_Unk02A5
+.extern ScrCmd_Unk0192
+.extern ScrCmd_Unk0193
+.extern ScrCmd_Unk0194
+.extern ScrCmd_Unk0195
+.extern ScrCmd_Unk0196
+.extern ScrCmd_Unk0197
+.extern ScrCmd_Unk009B
+.extern ScrCmd_Unk009C
+.extern ScrCmd_Unk009D
+.extern ScrCmd_Unk009E
+.extern ScrCmd_Unk009F
 .extern FUN_0203BC04
-.extern FUN_0203BC1C
-.extern FUN_0203BC2C
-.extern FUN_0203BCBC
-.extern FUN_0203BCCC
-.extern FUN_0203BCD8
-.extern FUN_0203BD08
-.extern FUN_0203BD28
-.extern FUN_0203BDB8
-.extern FUN_0203BE50
-.extern FUN_0203BE68
-.extern FUN_0203BE80
-.extern FUN_0203BECC
-.extern FUN_0203BF00
-.extern FUN_0203BF20
-.extern FUN_0203BF2C
-.extern FUN_0203BF84
-.extern FUN_0203BFEC
-.extern FUN_0203C054
-.extern FUN_0203C090
-.extern FUN_0203C0CC
-.extern FUN_0203C0FC
-.extern FUN_0203C118
-.extern FUN_0203C12C
-.extern FUN_0203C174
-.extern FUN_0203C1AC
-.extern FUN_0203C200
-.extern ScrCmd_monstoragepc
-.extern FUN_0203C2C4
-.extern FUN_0203C2E0
-.extern FUN_0203C2F0
-.extern FUN_0203C300
-.extern ScrCmd_halloffame
-.extern FUN_0203C33C
-.extern FUN_0203C368
-.extern FUN_0203C3C8
-.extern FUN_0203C3E8
-.extern FUN_0203C430
-.extern FUN_0203C460
-.extern FUN_0203C4B0
-.extern FUN_0203C4F0
-.extern FUN_0203C520
-.extern FUN_0203C58C
-.extern FUN_0203C5BC
-.extern FUN_0203C614
-.extern FUN_0203C680
-.extern FUN_0203C6C4
-.extern FUN_0203C70C
-.extern FUN_0203C730
-.extern FUN_0203C788
-.extern FUN_0203C7E4
-.extern FUN_0203C7F4
-.extern FUN_0203C820
-.extern FUN_0203C844
-.extern FUN_0203C874
-.extern FUN_0203C8B4
-.extern FUN_0203C8E4
-.extern FUN_0203C930
-.extern FUN_0203C960
-.extern FUN_0203C990
-.extern FUN_0203CA20
-.extern FUN_0203CA2C
-.extern FUN_0203CA5C
-.extern FUN_0203CAE8
-.extern FUN_0203CB08
-.extern FUN_0203CB20
-.extern FUN_0203CB48
-.extern FUN_0203CB60
-.extern FUN_0203CB70
-.extern FUN_0203CBBC
-.extern FUN_0203CBE8
-.extern FUN_0203CC88
-.extern FUN_0203CD20
-.extern FUN_0203CDB8
-.extern FUN_0203CDC4
-.extern FUN_0203CDD0
-.extern FUN_0203CE00
-.extern FUN_0203CE0C
-.extern FUN_0203CE8C
-.extern FUN_0203CEBC
-.extern FUN_0203CF04
-.extern FUN_0203CF34
-.extern FUN_0203CF64
-.extern FUN_0203CF94
-.extern FUN_0203CFC4
-.extern FUN_0203CFC8
-.extern FUN_0203D050
-.extern FUN_0203D0A4
-.extern FUN_0203D0F8
-.extern FUN_0203D134
-.extern FUN_0203D140
-.extern FUN_0203D150
-.extern FUN_0203D178
-.extern FUN_0203D194
-.extern FUN_0203D1A4
-.extern FUN_0203D1C0
-.extern FUN_0203D214
-.extern FUN_0203D23C
-.extern FUN_0203D248
-.extern FUN_0203D278
-.extern FUN_0203D2A4
-.extern FUN_0203D2E4
-.extern FUN_0203D330
-.extern FUN_0203D33C
-.extern FUN_0203D36C
-.extern FUN_0203D3A4
-.extern FUN_0203D3DC
-.extern FUN_0203D448
-.extern FUN_0203D458
-.extern FUN_0203D490
-.extern FUN_0203D4E8
-.extern FUN_0203D528
-.extern FUN_0203D560
-.extern FUN_0203D5B0
-.extern FUN_0203D5F8
-.extern FUN_0203D60C
-.extern FUN_0203D61C
-.extern FUN_0203D630
-.extern FUN_0203D66C
-.extern FUN_0203D6C4
-.extern FUN_0203D728
-.extern FUN_0203D738
-.extern FUN_0203D774
-.extern FUN_0203D7DC
-.extern FUN_0203D834
-.extern FUN_0203D868
-.extern FUN_0203D874
-.extern ScrCmd_getplayergender
-.extern ScrCmd_healparty
-.extern FUN_0203D8E8
-.extern FUN_0203D8EC
-.extern FUN_0203D920
-.extern FUN_0203D938
-.extern FUN_0203D948
-.extern FUN_0203D958
-.extern FUN_0203D998
-.extern FUN_0203D9E8
-.extern FUN_0203DA78
-.extern FUN_0203DAB0
-.extern FUN_0203DAE8
-.extern FUN_0203DB38
-.extern FUN_0203DB88
-.extern FUN_0203DBD4
-.extern FUN_0203DC00
-.extern FUN_0203DC58
-.extern FUN_0203DC70
-.extern FUN_0203DC88
-.extern FUN_0203DCA0
-.extern FUN_0203DCB8
-.extern FUN_0203DCC8
-.extern FUN_0203DCD8
-.extern FUN_0203DCE8
-.extern FUN_0203DCF8
-.extern FUN_0203DD08
-.extern FUN_0203DD18
-.extern FUN_0203DD34
-.extern FUN_0203DD50
-.extern FUN_0203DD60
-.extern FUN_0203DE00
-.extern FUN_0203DE4C
-.extern FUN_0203DE58
-.extern FUN_0203DE80
-.extern FUN_0203DEA8
-.extern FUN_0203DEC4
-.extern FUN_0203DEF8
-.extern FUN_0203DF2C
-.extern FUN_0203DF38
-.extern FUN_0203DF64
-.extern FUN_0203DF84
-.extern FUN_0203DFA8
-.extern FUN_0203DFE0
-.extern FUN_0203E018
-.extern FUN_0203E054
-.extern FUN_0203E078
-.extern FUN_0203E0CC
-.extern FUN_0203E120
-.extern FUN_0203E138
-.extern FUN_0203E168
-.extern FUN_0203E254
-.extern FUN_0203E258
-.extern FUN_0203E29C
-.extern FUN_0203E2F8
-.extern FUN_0203E35C
-.extern FUN_0203E38C
-.extern FUN_0203E3D0
-.extern FUN_0203E408
-.extern FUN_0203E440
-.extern FUN_0203E470
-.extern FUN_0203E4A0
-.extern FUN_0203E4B0
-.extern FUN_0203E4D8
-.extern FUN_0203E4F0
-.extern FUN_0203E510
-.extern FUN_0203E568
-.extern FUN_0203E5DC
-.extern FUN_0203E674
-.extern FUN_0203E684
-.extern FUN_0203E6B4
-.extern FUN_0203E6C4
-.extern FUN_0203E6FC
-.extern FUN_0203E72C
-.extern FUN_0203E744
-.extern FUN_0203E774
-.extern FUN_0203E7F0
-.extern FUN_0203E81C
-.extern FUN_0203E848
-.extern FUN_0203E858
-.extern FUN_0203E870
-.extern FUN_0203E894
-.extern FUN_0203E8C4
-.extern FUN_0203E8F4
-.extern FUN_0203E928
-.extern FUN_0203E940
-.extern FUN_0203E954
-.extern FUN_0203E968
-.extern FUN_0203E9CC
-.extern FUN_0203EA68
-.extern FUN_0203EA90
-.extern FUN_0203EAB0
-.extern FUN_0203EB20
-.extern FUN_0203EB48
-.extern FUN_0203EB88
-.extern ScrCmd_gameversion
-.extern ScrCmd_givewallpaper
-.extern FUN_0203ECAC
-.extern FUN_0203ECD8
-.extern FUN_0203ECF4
-.extern FUN_0203ED10
-.extern ScrCmd_pcfreespace
-.extern FUN_0203EDA4
-.extern FUN_0203EDC8
-.extern FUN_0203EDE0
-.extern FUN_0203EE08
-.extern FUN_0203EE18
-.extern FUN_0203EE28
-.extern FUN_0203EE58
-.extern FUN_0203EE68
-.extern FUN_0203EE78
-.extern FUN_0203EE98
-.extern FUN_0203EED8
-.extern FUN_0203EF58
-.extern FUN_0203F00C
-.extern FUN_0203F020
-.extern FUN_0203F034
-.extern FUN_0203F058
-.extern FUN_0203F07C
-.extern FUN_0203F110
-.extern FUN_0203F174
-.extern FUN_0203F19C
-.extern FUN_0203F234
-.extern FUN_0203F254
-.extern FUN_0203F26C
-.extern FUN_0203F2AC
-.extern FUN_0203F2E4
-.extern FUN_0203F31C
-.extern FUN_0203F348
-.extern FUN_0203F38C
-.extern FUN_0203F39C
-.extern FUN_0203F3AC
-.extern FUN_0203F418
-.extern FUN_0203F44C
-.extern FUN_0203F484
-.extern FUN_0203F4D8
-.extern FUN_0203F508
-.extern FUN_0203F5D4
-.extern FUN_0203F604
-.extern FUN_0203F634
-.extern FUN_0203F664
-.extern FUN_0203F6E4
-.extern FUN_0203F720
-.extern FUN_0203F760
-.extern FUN_0203F7C8
-.extern FUN_0203F80C
-.extern FUN_0203F880
-.extern FUN_0203F8C0
-.extern FUN_0203F924
-.extern FUN_0203F954
-.extern FUN_0203F988
-.extern FUN_0203F9B0
-.extern FUN_0203F9DC
-.extern FUN_0203FA14
-.extern FUN_0203FA58
-.extern FUN_0203FB4C
-.extern FUN_0203FB64
-.extern FUN_0203FB94
-.extern FUN_0203FBA0
-.extern FUN_0203FBAC
-.extern FUN_0203FBBC
-.extern FUN_0203FC1C
-.extern FUN_0203FC58
-.extern FUN_0203FC80
-.extern FUN_0203FCB0
-.extern FUN_0203FCDC
+.extern ScrCmd_Unk00A1
+.extern ScrCmd_Unk01F8
+.extern ScrCmd_Unk00A2
+.extern ScrCmd_Unk00A3
+.extern ScrCmd_Unk00A4
+.extern ScrCmd_Unk0207
+.extern ScrCmd_Unk0208
+.extern ScrCmd_Unk028C
+.extern ScrCmd_Unk0209
+.extern ScrCmd_Unk028D
+.extern ScrCmd_Unk028E
+.extern ScrCmd_Unk020A
+.extern ScrCmd_Unk020B
+.extern ScrCmd_Unk00A5
+.extern ScrCmd_Unk00A6
+.extern ScrCmd_Unk00A7
+.extern ScrCmd_Unk00A8
+.extern ScrCmd_Unk012E
+.extern ScrCmd_Unk012F
+.extern ScrCmd_Unk0130
+.extern ScrCmd_Unk0205
+.extern ScrCmd_Unk00A9
+.extern ScrCmd_Unk00AA
+.extern ScrCmd_Unk01D7
+.extern ScrCmd_Unk01D8
+.extern ScrCmd_Unk01D9
+.extern ScrCmd_MonStoragePC
+.extern ScrCmd_Unk00AC
+.extern ScrCmd_Unk00AD
+.extern ScrCmd_Unk00AE
+.extern ScrCmd_Unk00AF
+.extern ScrCmd_HallOfFame
+.extern ScrCmd_Unk00B1
+.extern ScrCmd_Unk00B2
+.extern ScrCmd_Unk00B3
+.extern ScrCmd_Unk00B4
+.extern ScrCmd_Unk00B5
+.extern ScrCmd_Unk0178
+.extern ScrCmd_Unk0179
+.extern ScrCmd_Unk00BA
+.extern ScrCmd_Unk00BB
+.extern ScrCmd_Unk0271
+.extern ScrCmd_Unk0243
+.extern ScrCmd_Unk0244
+.extern ScrCmd_Unk0245
+.extern ScrCmd_Unk00BC
+.extern ScrCmd_Unk00BD
+.extern ScrCmd_Unk00BE
+.extern ScrCmd_Unk0203
+.extern ScrCmd_Unk0204
+.extern ScrCmd_Unk0200
+.extern ScrCmd_Unk0201
+.extern ScrCmd_Unk00BF
+.extern ScrCmd_Unk00C0
+.extern ScrCmd_Unk00C1
+.extern ScrCmd_Unk00C2
+.extern ScrCmd_Unk00C3
+.extern ScrCmd_Unk00C4
+.extern ScrCmd_Unk00C5
+.extern ScrCmd_Unk00C6
+.extern ScrCmd_Unk00C7
+.extern ScrCmd_Unk00C8
+.extern ScrCmd_Unk02BF
+.extern ScrCmd_Unk00C9
+.extern ScrCmd_Unk00CA
+.extern ScrCmd_Unk00CB
+.extern ScrCmd_Unk00CC
+.extern ScrCmd_Unk00E3
+.extern ScrCmd_Unk00DE
+.extern ScrCmd_Unk00E6
+.extern ScrCmd_Unk00F2
+.extern ScrCmd_Unk00F3
+.extern ScrCmd_Unk00F4
+.extern ScrCmd_Unk00F5
+.extern ScrCmd_Unk00F6
+.extern ScrCmd_Unk00F7
+.extern ScrCmd_Unk011B
+.extern ScrCmd_Unk011C
+.extern ScrCmd_Unk011D
+.extern ScrCmd_Unk011E
+.extern ScrCmd_Unk011F
+.extern ScrCmd_Unk0120
+.extern ScrCmd_Unk0121
+.extern ScrCmd_Unk0122
+.extern ScrCmd_Unk0123
+.extern ScrCmd_Unk0124
+.extern ScrCmd_Unk02BD
+.extern ScrCmd_Unk0125
+.extern ScrCmd_Unk0126
+.extern ScrCmd_Unk0127
+.extern ScrCmd_Unk0128
+.extern ScrCmd_Unk0129
+.extern ScrCmd_Unk012A
+.extern ScrCmd_Unk012B
+.extern ScrCmd_Unk012C
+.extern ScrCmd_Unk012D
+.extern ScrCmd_Unk0131
+.extern ScrCmd_Unk0132
+.extern ScrCmd_Unk0133
+.extern ScrCmd_Unk0134
+.extern ScrCmd_Unk0135
+.extern ScrCmd_Unk0136
+.extern ScrCmd_Unk0137
+.extern ScrCmd_Unk0138
+.extern ScrCmd_Unk0139
+.extern ScrCmd_Unk013C
+.extern ScrCmd_Unk013D
+.extern ScrCmd_Unk013E
+.extern ScrCmd_Unk013F
+.extern ScrCmd_Unk02BA
+.extern ScrCmd_Unk0140
+.extern ScrCmd_Unk0146
+.extern ScrCmd_Unk0141
+.extern ScrCmd_Unk0142
+.extern ScrCmd_Unk013A
+.extern ScrCmd_Unk013B
+.extern ScrCmd_Unk0143
+.extern ScrCmd_Unk0144
+.extern ScrCmd_Unk0145
+.extern ScrCmd_Unk0153
+.extern ScrCmd_Unk0154
+.extern ScrCmd_Unk0155
+.extern ScrCmd_Unk029C
+.extern ScrCmd_Unk0156
+.extern ScrCmd_Unk014B
+.extern ScrCmd_Unk014C
+.extern ScrCmd_GetPlayerGender
+.extern ScrCmd_HealParty
+.extern ScrCmd_Unk014F
+.extern ScrCmd_Unk0150
+.extern ScrCmd_Unk02BB
+.extern ScrCmd_Unk0151
+.extern ScrCmd_Unk0152
+.extern ScrCmd_Unk017A
+.extern ScrCmd_Unk0186
+.extern ScrCmd_Unk0187
+.extern ScrCmd_Unk0188
+.extern ScrCmd_Unk0189
+.extern ScrCmd_Unk018A
+.extern ScrCmd_Unk018B
+.extern ScrCmd_Unk018C
+.extern ScrCmd_Unk018F
+.extern ScrCmd_Unk0168
+.extern ScrCmd_Unk0169
+.extern ScrCmd_Unk016A
+.extern ScrCmd_Unk016B
+.extern ScrCmd_Unk016C
+.extern ScrCmd_Unk016F
+.extern ScrCmd_Unk0170
+.extern ScrCmd_Unk0171
+.extern ScrCmd_Unk0172
+.extern ScrCmd_Unk0173
+.extern ScrCmd_Unk0174
+.extern ScrCmd_Unk0175
+.extern ScrCmd_Unk0176
+.extern ScrCmd_Unk01AC
+.extern ScrCmd_Unk019E
+.extern ScrCmd_Unk019F
+.extern ScrCmd_Unk01A0
+.extern ScrCmd_Unk01A1
+.extern ScrCmd_Unk01A2
+.extern ScrCmd_Unk003F
+.extern ScrCmd_Unk01B1
+.extern ScrCmd_Unk01B2
+.extern ScrCmd_Unk01B3
+.extern ScrCmd_Unk01B4
+.extern ScrCmd_Unk01B5
+.extern ScrCmd_Unk01B6
+.extern ScrCmd_Unk01B7
+.extern ScrCmd_Unk01B8
+.extern ScrCmd_Unk01C1
+.extern ScrCmd_Unk01C2
+.extern ScrCmd_Unk01C3
+.extern ScrCmd_Unk01C4
+.extern ScrCmd_Unk01C5
+.extern ScrCmd_Unk01CC
+.extern ScrCmd_Unk01CD
+.extern ScrCmd_Unk01CE
+.extern ScrCmd_Unk01D2
+.extern ScrCmd_Unk01D3
+.extern ScrCmd_Unk01D4
+.extern ScrCmd_Unk01D5
+.extern ScrCmd_Unk01D6
+.extern ScrCmd_Unk01E8
+.extern ScrCmd_Unk01E9
+.extern ScrCmd_Unk01EA
+.extern ScrCmd_Unk01EB
+.extern ScrCmd_Unk01EC
+.extern ScrCmd_Unk01ED
+.extern ScrCmd_Unk01EF
+.extern ScrCmd_Unk01E5
+.extern ScrCmd_Unk01E6
+.extern ScrCmd_Unk01E7
+.extern ScrCmd_Unk0202
+.extern ScrCmd_Unk0206
+.extern ScrCmd_Unk020D
+.extern ScrCmd_Unk020E
+.extern ScrCmd_Unk020F
+.extern ScrCmd_Unk0210
+.extern ScrCmd_Unk0211
+.extern ScrCmd_Unk0214
+.extern ScrCmd_Unk0218
+.extern ScrCmd_Unk0219
+.extern ScrCmd_Unk021A
+.extern ScrCmd_Unk021B
+.extern ScrCmd_Unk021C
+.extern ScrCmd_Unk0226
+.extern ScrCmd_Unk0227
+.extern ScrCmd_Unk0228
+.extern ScrCmd_Unk0229
+.extern ScrCmd_Unk022A
+.extern ScrCmd_Unk022B
+.extern ScrCmd_Unk022C
+.extern ScrCmd_Unk022D
+.extern ScrCmd_Unk0233
+.extern ScrCmd_Unk0234
+.extern ScrCmd_Unk0239
+.extern ScrCmd_Unk023A
+.extern ScrCmd_Unk023B
+.extern ScrCmd_Unk023C
+.extern ScrCmd_Unk023D
+.extern ScrCmd_GameVersion
+.extern ScrCmd_GiveWallpaper
+.extern ScrCmd_Unk024A
+.extern ScrCmd_Unk024B
+.extern ScrCmd_Unk024C
+.extern ScrCmd_Unk024D
+.extern ScrCmd_PCFreeSpace
+.extern ScrCmd_Unk0258
+.extern ScrCmd_Unk0259
+.extern ScrCmd_Unk025A
+.extern ScrCmd_Unk025B
+.extern ScrCmd_Unk025C
+.extern ScrCmd_Unk025D
+.extern ScrCmd_Unk025E
+.extern ScrCmd_Unk025F
+.extern ScrCmd_Unk0260
+.extern ScrCmd_Unk0262
+.extern ScrCmd_Unk0263
+.extern ScrCmd_Unk0264
+.extern ScrCmd_Unk0265
+.extern ScrCmd_Unk0266
+.extern ScrCmd_Unk0267
+.extern ScrCmd_Unk0268
+.extern ScrCmd_Unk0269
+.extern ScrCmd_Unk026A
+.extern ScrCmd_Unk026B
+.extern ScrCmd_Unk026C
+.extern ScrCmd_Unk026E
+.extern ScrCmd_Unk026F
+.extern ScrCmd_Unk0270
+.extern ScrCmd_Unk0273
+.extern ScrCmd_Unk0275
+.extern ScrCmd_Unk0277
+.extern ScrCmd_Unk0279
+.extern ScrCmd_Unk027A
+.extern ScrCmd_Unk027B
+.extern ScrCmd_Unk027D
+.extern ScrCmd_Unk027F
+.extern ScrCmd_Unk027E
+.extern ScrCmd_Unk0282
+.extern ScrCmd_Unk0284
+.extern ScrCmd_Unk0285
+.extern ScrCmd_Unk0286
+.extern ScrCmd_Unk0287
+.extern ScrCmd_Unk0288
+.extern ScrCmd_Unk0289
+.extern ScrCmd_Unk028A
+.extern ScrCmd_Unk028B
+.extern ScrCmd_Unk028F
+.extern ScrCmd_Unk0290
+.extern ScrCmd_Unk0291
+.extern ScrCmd_Unk0292
+.extern ScrCmd_Unk029E
+.extern ScrCmd_Unk0293
+.extern ScrCmd_Unk029F
+.extern ScrCmd_Unk02A3
+.extern ScrCmd_Unk02A4
+.extern ScrCmd_Unk02A2
+.extern ScrCmd_Unk02A7
+.extern ScrCmd_Unk02AA
+.extern ScrCmd_Unk02AC
+.extern ScrCmd_Unk02AF
+.extern ScrCmd_Unk02B0
+.extern ScrCmd_Unk02B1
+.extern ScrCmd_Unk02B2
+.extern ScrCmd_Unk02B5
+.extern ScrCmd_Unk02B6
+.extern ScrCmd_Unk02BE
+.extern ScrCmd_Unk02C1
+.extern ScrCmd_Unk02C2
+.extern ScrCmd_Unk02C3
 .extern ScrCmd_NormalMart
 .extern ScrCmd_SpecialMart
 .extern ScrCmd_GoodsMart
 .extern ScrCmd_SealsMart
 .extern ScrCmd_AccessoriesShop
-.extern FUN_0203FE90
-.extern FUN_0203FEC0
-.extern FUN_0203FF10
-.extern FUN_02040028
-.extern FUN_02040074
-.extern FUN_020400C8
-.extern FUN_0204011C
-.extern FUN_02040170
-.extern FUN_020401CC
-.extern FUN_02040204
-.extern FUN_02040220
-.extern FUN_0204025C
-.extern FUN_02040298
-.extern FUN_020402D4
-.extern FUN_02040304
-.extern FUN_02040340
-.extern FUN_02040370
-.extern FUN_020403A0
-.extern FUN_020403D0
-.extern FUN_02040414
-.extern FUN_02040458
-.extern FUN_02040488
-.extern FUN_020404FC
-.extern FUN_0204052C
-.extern FUN_0204056C
-.extern FUN_0204059C
-.extern FUN_020405B4
-.extern FUN_020405CC
-.extern FUN_020405F8
-.extern FUN_02040638
-.extern FUN_0204064C
-.extern FUN_02040660
-.extern FUN_020406C0
+.extern ScrCmd_Unk00F8
+.extern ScrCmd_Unk00F9
+.extern ScrCmd_Unk00FA
+.extern ScrCmd_Unk00FB
+.extern ScrCmd_Unk00FC
+.extern ScrCmd_Unk00FD
+.extern ScrCmd_Unk00FE
+.extern ScrCmd_Unk00FF
+.extern ScrCmd_Unk0100
+.extern ScrCmd_Unk0101
+.extern ScrCmd_Unk0102
+.extern ScrCmd_Unk0103
+.extern ScrCmd_Unk0104
+.extern ScrCmd_Unk0105
+.extern ScrCmd_Unk0106
+.extern ScrCmd_Unk0107
+.extern ScrCmd_Unk0108
+.extern ScrCmd_Unk0109
+.extern ScrCmd_Unk010A
+.extern ScrCmd_Unk010B
+.extern ScrCmd_Unk010C
+.extern ScrCmd_Unk0110
+.extern ScrCmd_Unk010D
+.extern ScrCmd_Unk010E
+.extern ScrCmd_Unk010F
+.extern ScrCmd_Unk0117
+.extern ScrCmd_Unk0118
+.extern ScrCmd_Unk0111
+.extern ScrCmd_Unk0112
+.extern ScrCmd_Unk0113
+.extern ScrCmd_Unk0114
+.extern ScrCmd_Unk0115
+.extern ScrCmd_Unk0116
 .extern ScrCmd_GetPlayerName
 .extern ScrCmd_GetRivalName
 .extern ScrCmd_GetFriendName
@@ -3193,9 +3193,9 @@
 .extern ScrCmd_Unk02CC
 .extern ScrCmd_GetSealNamePlural
 .extern ScrCmd_CapitalizeFirstChar
-.extern FUN_02041194
-.extern FUN_020411C4
-.extern FUN_02041340
+.extern ScrCmd_Unk024E
+.extern ScrCmd_Unk024F
+.extern ScrCmd_Unk0250
 .extern ScrCmd_Unk02AE
 .extern ScrCmd_Unk0050
 .extern ScrCmd_Unk0051
@@ -3219,51 +3219,51 @@
 .extern ScrCmd_Unk005C
 .extern ScrCmd_Unk005D
 .extern ScrCmd_Unk0283
-.extern FUN_020416A8
-.extern FUN_02041770
-.extern FUN_020417E0
-.extern FUN_02041808
-.extern FUN_0204185C
-.extern FUN_0204188C
-.extern FUN_0204190C
-.extern FUN_02041970
-.extern FUN_020419F8
-.extern FUN_02041A80
-.extern FUN_02041AB4
-.extern FUN_02041AD4
-.extern FUN_02041AE0
-.extern FUN_02041B10
-.extern FUN_02041B40
-.extern FUN_02041B70
-.extern FUN_02041B9C
-.extern FUN_02041BC4
-.extern FUN_02041BF0
+.extern ScrCmd_Unk00B6
+.extern ScrCmd_Unk00B7
+.extern ScrCmd_Unk00B8
+.extern ScrCmd_Unk00B9
+.extern ScrCmd_Unk00E4
+.extern ScrCmd_Unk00E5
+.extern ScrCmd_Unk02A0
+.extern ScrCmd_Unk00E7
+.extern ScrCmd_Unk00E8
+.extern ScrCmd_Unk00E9
+.extern ScrCmd_Unk00EA
+.extern ScrCmd_Unk00EB
+.extern ScrCmd_Unk00EC
+.extern ScrCmd_Unk00ED
+.extern ScrCmd_Unk02BC
+.extern ScrCmd_Unk00EE
+.extern ScrCmd_Unk00EF
+.extern ScrCmd_Unk00F0
+.extern ScrCmd_Unk00F1
 .extern ScrCmd_Unk021D
-.extern FUN_02041E40
-.extern FUN_02041FDC
-.extern FUN_02042000
-.extern FUN_02042038
-.extern FUN_02042110
-.extern FUN_0204214C
-.extern FUN_02042354
-.extern FUN_02042364
-.extern FUN_02042394
-.extern FUN_020423B0
-.extern FUN_02042700
-.extern FUN_02042780
-.extern FUN_020427A8
-.extern FUN_020427D0
-.extern FUN_02042864
-.extern FUN_02042894
-.extern FUN_020428E0
-.extern FUN_02042950
-.extern FUN_02042980
-.extern FUN_02042998
-.extern FUN_020429B8
-.extern FUN_020429E8
-.extern FUN_02042A18
-.extern FUN_02042A48
-.extern FUN_02042A98
+.extern ScrCmd_Unk0235
+.extern ScrCmd_Unk0236
+.extern ScrCmd_Unk02B8
+.extern ScrCmd_Unk0237
+.extern ScrCmd_Unk0238
+.extern ScrCmd_Unk027C
+.extern ScrCmd_Unk01DA
+.extern ScrCmd_Unk01DB
+.extern ScrCmd_Unk01DC
+.extern ScrCmd_Unk01DD
+.extern ScrCmd_Unk01DE
+.extern ScrCmd_Unk01DF
+.extern ScrCmd_Unk01E0
+.extern ScrCmd_Unk01E1
+.extern ScrCmd_Unk01E2
+.extern ScrCmd_Unk01E3
+.extern ScrCmd_Unk01E4
+.extern ScrCmd_Unk0294
+.extern ScrCmd_Unk0295
+.extern ScrCmd_Unk0296
+.extern ScrCmd_Unk0297
+.extern ScrCmd_Unk0298
+.extern ScrCmd_Unk0299
+.extern ScrCmd_Unk029A
+.extern ScrCmd_Unk029B
 .extern ScrCmd_Unk017D
 .extern ScrCmd_Unk017E
 .extern ScrCmd_Unk017F
@@ -3273,7 +3273,7 @@
 .extern ScrCmd_Unk0183
 .extern ScrCmd_Unk0184
 .extern ScrCmd_Unk0185
-.extern FUN_02042D1C
+.extern ScrCmd_Unk023E
 .extern ScrCmd_Unk0253
 .extern ScrCmd_Unk0254
 .extern ScrCmd_Unk0255
@@ -3312,46 +3312,46 @@
 .extern ScrCmd_Unk01A6
 .extern ScrCmd_Unk01A7
 .extern ScrCmd_Unk01AD
-.extern FUN_02044158
-.extern FUN_0204416C
-.extern FUN_02044198
+.extern ScrCmd_Unk0215
+.extern ScrCmd_Unk0216
+.extern ScrCmd_Unk0217
 .extern ScrCmd_GiveMon
-.extern ScrCmd_getpartyspecies
-.extern ScrCmd_checkpartymonotid
-.extern ScrCmd_giveegg
-.extern ScrCmd_setpartymonmove
-.extern ScrCmd_partymonhasmove
-.extern ScrCmd_findpartymonwithmove
-.extern ScrCmd_survivepsn
-.extern ScrCmd_countpartymonsatorbelowlevel
-.extern ScrCmd_getpartymonlevel
-.extern ScrCmd_getpartymonnature
-.extern ScrCmd_findpartymonwithnature
-.extern ScrCmd_getpartymonfriendship
-.extern FUN_020448D4
-.extern FUN_020449A4
-.extern FUN_02044A0C
-.extern FUN_02044A6C
-.extern FUN_02044A94
-.extern FUN_02044B00
-.extern FUN_02044B2C
-.extern FUN_02044B84
-.extern FUN_02044C0C
-.extern FUN_02044C88
-.extern FUN_02044CE0
-.extern FUN_02044D44
-.extern FUN_02044D8C
-.extern FUN_02044E34
-.extern FUN_02044E78
-.extern FUN_02044ED8
-.extern FUN_02044F20
-.extern FUN_02044F58
-.extern FUN_02044FE8
-.extern FUN_0204505C
-.extern FUN_02045104
-.extern FUN_02045170
-.extern FUN_020451D0
-.extern FUN_02045264
+.extern ScrCmd_GetPartySpecies
+.extern ScrCmd_CheckPartyMonOTID
+.extern ScrCmd_GiveEgg
+.extern ScrCmd_SetPartyMonMove
+.extern ScrCmd_PartyMonHasMove
+.extern ScrCmd_FindPartyMonWithMove
+.extern ScrCmd_SurvivePsn
+.extern ScrCmd_CountPartyMonsAtOrBelowLevel
+.extern ScrCmd_GetPartyMonLevel
+.extern ScrCmd_GetPartyMonNature
+.extern ScrCmd_FindPartyMonWithNature
+.extern ScrCmd_GetPartyMonFriendship
+.extern ScrCmd_Unk01BA
+.extern ScrCmd_Unk01BB
+.extern ScrCmd_Unk0281
+.extern ScrCmd_Unk0247
+.extern ScrCmd_Unk0248
+.extern ScrCmd_Unk0177
+.extern ScrCmd_Unk019A
+.extern ScrCmd_Unk019B
+.extern ScrCmd_Unk019C
+.extern ScrCmd_Unk019D
+.extern ScrCmd_Unk0119
+.extern ScrCmd_Unk011A
+.extern ScrCmd_Unk01C8
+.extern ScrCmd_Unk01C9
+.extern ScrCmd_Unk01CA
+.extern ScrCmd_Unk01EE
+.extern ScrCmd_Unk01F0
+.extern ScrCmd_Unk01C0
+.extern ScrCmd_Unk022E
+.extern ScrCmd_Unk022F
+.extern ScrCmd_Unk0230
+.extern ScrCmd_Unk0231
+.extern ScrCmd_Unk02B7
+.extern ScrCmd_Unk00A0
 .extern ScrCmd_Unk01F1
 .extern ScrCmd_Unk01F4
 .extern ScrCmd_Unk01F5