finished pokemon data decomp

This commit is contained in:
jiangzhengwenjz
2019-07-15 13:10:29 +08:00
parent 00cd1d483d
commit 51a779aa7b
10 changed files with 6998 additions and 363 deletions
-12
View File
@@ -356,18 +356,6 @@ gUnknown_8250A34:: @ 8250A34
gUnknown_8250B20:: @ 8250B20 gUnknown_8250B20:: @ 8250B20
.incbin "baserom.gba", 0x250B20, 0xE4 .incbin "baserom.gba", 0x250B20, 0xE4
gBattleMoves:: @ 8250C04
.incbin "baserom.gba", 0x250C04, 0x10B4
gUnknown_8251CB8:: @ 8251CB8
.incbin "baserom.gba", 0x251CB8, 0x336
gUnknown_8251FEE:: @ 8251FEE
.incbin "baserom.gba", 0x251FEE, 0x336
gUnknown_8252324:: @ 8252324
.incbin "baserom.gba", 0x252324, 0x338
.section .rodata.825EF0C .section .rodata.825EF0C
.align 2 .align 2
+1 -1
View File
@@ -151,7 +151,7 @@
#define EFFECT_EARTHQUAKE 147 #define EFFECT_EARTHQUAKE 147
#define EFFECT_FUTURE_SIGHT 148 #define EFFECT_FUTURE_SIGHT 148
#define EFFECT_GUST 149 #define EFFECT_GUST 149
#define EFFECT_FLINCH_HIT_2 150 // STOMP ASTONISH EXTRASENSORY NEEDLE_ARM #define EFFECT_FLINCH_MINIMIZE_HIT 150 // STOMP ASTONISH EXTRASENSORY NEEDLE_ARM
#define EFFECT_SOLARBEAM 151 #define EFFECT_SOLARBEAM 151
#define EFFECT_THUNDER 152 #define EFFECT_THUNDER 152
#define EFFECT_TELEPORT 153 #define EFFECT_TELEPORT 153
+2
View File
@@ -359,4 +359,6 @@
#define LAST_MOVE_INDEX MOVE_PSYCHO_BOOST #define LAST_MOVE_INDEX MOVE_PSYCHO_BOOST
#define MOVES_COUNT 355
#endif // GUARD_CONSTANTS_MOVES_H #endif // GUARD_CONSTANTS_MOVES_H
+834
View File
@@ -450,4 +450,838 @@
#define NUM_SPECIES SPECIES_EGG #define NUM_SPECIES SPECIES_EGG
// National Dex Index Defines
#define NATIONAL_DEX_NONE 0
#define NATIONAL_DEX_BULBASAUR 1
#define NATIONAL_DEX_IVYSAUR 2
#define NATIONAL_DEX_VENUSAUR 3
#define NATIONAL_DEX_CHARMANDER 4
#define NATIONAL_DEX_CHARMELEON 5
#define NATIONAL_DEX_CHARIZARD 6
#define NATIONAL_DEX_SQUIRTLE 7
#define NATIONAL_DEX_WARTORTLE 8
#define NATIONAL_DEX_BLASTOISE 9
#define NATIONAL_DEX_CATERPIE 10
#define NATIONAL_DEX_METAPOD 11
#define NATIONAL_DEX_BUTTERFREE 12
#define NATIONAL_DEX_WEEDLE 13
#define NATIONAL_DEX_KAKUNA 14
#define NATIONAL_DEX_BEEDRILL 15
#define NATIONAL_DEX_PIDGEY 16
#define NATIONAL_DEX_PIDGEOTTO 17
#define NATIONAL_DEX_PIDGEOT 18
#define NATIONAL_DEX_RATTATA 19
#define NATIONAL_DEX_RATICATE 20
#define NATIONAL_DEX_SPEAROW 21
#define NATIONAL_DEX_FEAROW 22
#define NATIONAL_DEX_EKANS 23
#define NATIONAL_DEX_ARBOK 24
#define NATIONAL_DEX_PIKACHU 25
#define NATIONAL_DEX_RAICHU 26
#define NATIONAL_DEX_SANDSHREW 27
#define NATIONAL_DEX_SANDSLASH 28
#define NATIONAL_DEX_NIDORAN_F 29
#define NATIONAL_DEX_NIDORINA 30
#define NATIONAL_DEX_NIDOQUEEN 31
#define NATIONAL_DEX_NIDORAN_M 32
#define NATIONAL_DEX_NIDORINO 33
#define NATIONAL_DEX_NIDOKING 34
#define NATIONAL_DEX_CLEFAIRY 35
#define NATIONAL_DEX_CLEFABLE 36
#define NATIONAL_DEX_VULPIX 37
#define NATIONAL_DEX_NINETALES 38
#define NATIONAL_DEX_JIGGLYPUFF 39
#define NATIONAL_DEX_WIGGLYTUFF 40
#define NATIONAL_DEX_ZUBAT 41
#define NATIONAL_DEX_GOLBAT 42
#define NATIONAL_DEX_ODDISH 43
#define NATIONAL_DEX_GLOOM 44
#define NATIONAL_DEX_VILEPLUME 45
#define NATIONAL_DEX_PARAS 46
#define NATIONAL_DEX_PARASECT 47
#define NATIONAL_DEX_VENONAT 48
#define NATIONAL_DEX_VENOMOTH 49
#define NATIONAL_DEX_DIGLETT 50
#define NATIONAL_DEX_DUGTRIO 51
#define NATIONAL_DEX_MEOWTH 52
#define NATIONAL_DEX_PERSIAN 53
#define NATIONAL_DEX_PSYDUCK 54
#define NATIONAL_DEX_GOLDUCK 55
#define NATIONAL_DEX_MANKEY 56
#define NATIONAL_DEX_PRIMEAPE 57
#define NATIONAL_DEX_GROWLITHE 58
#define NATIONAL_DEX_ARCANINE 59
#define NATIONAL_DEX_POLIWAG 60
#define NATIONAL_DEX_POLIWHIRL 61
#define NATIONAL_DEX_POLIWRATH 62
#define NATIONAL_DEX_ABRA 63
#define NATIONAL_DEX_KADABRA 64
#define NATIONAL_DEX_ALAKAZAM 65
#define NATIONAL_DEX_MACHOP 66
#define NATIONAL_DEX_MACHOKE 67
#define NATIONAL_DEX_MACHAMP 68
#define NATIONAL_DEX_BELLSPROUT 69
#define NATIONAL_DEX_WEEPINBELL 70
#define NATIONAL_DEX_VICTREEBEL 71
#define NATIONAL_DEX_TENTACOOL 72
#define NATIONAL_DEX_TENTACRUEL 73
#define NATIONAL_DEX_GEODUDE 74
#define NATIONAL_DEX_GRAVELER 75
#define NATIONAL_DEX_GOLEM 76
#define NATIONAL_DEX_PONYTA 77
#define NATIONAL_DEX_RAPIDASH 78
#define NATIONAL_DEX_SLOWPOKE 79
#define NATIONAL_DEX_SLOWBRO 80
#define NATIONAL_DEX_MAGNEMITE 81
#define NATIONAL_DEX_MAGNETON 82
#define NATIONAL_DEX_FARFETCHD 83
#define NATIONAL_DEX_DODUO 84
#define NATIONAL_DEX_DODRIO 85
#define NATIONAL_DEX_SEEL 86
#define NATIONAL_DEX_DEWGONG 87
#define NATIONAL_DEX_GRIMER 88
#define NATIONAL_DEX_MUK 89
#define NATIONAL_DEX_SHELLDER 90
#define NATIONAL_DEX_CLOYSTER 91
#define NATIONAL_DEX_GASTLY 92
#define NATIONAL_DEX_HAUNTER 93
#define NATIONAL_DEX_GENGAR 94
#define NATIONAL_DEX_ONIX 95
#define NATIONAL_DEX_DROWZEE 96
#define NATIONAL_DEX_HYPNO 97
#define NATIONAL_DEX_KRABBY 98
#define NATIONAL_DEX_KINGLER 99
#define NATIONAL_DEX_VOLTORB 100
#define NATIONAL_DEX_ELECTRODE 101
#define NATIONAL_DEX_EXEGGCUTE 102
#define NATIONAL_DEX_EXEGGUTOR 103
#define NATIONAL_DEX_CUBONE 104
#define NATIONAL_DEX_MAROWAK 105
#define NATIONAL_DEX_HITMONLEE 106
#define NATIONAL_DEX_HITMONCHAN 107
#define NATIONAL_DEX_LICKITUNG 108
#define NATIONAL_DEX_KOFFING 109
#define NATIONAL_DEX_WEEZING 110
#define NATIONAL_DEX_RHYHORN 111
#define NATIONAL_DEX_RHYDON 112
#define NATIONAL_DEX_CHANSEY 113
#define NATIONAL_DEX_TANGELA 114
#define NATIONAL_DEX_KANGASKHAN 115
#define NATIONAL_DEX_HORSEA 116
#define NATIONAL_DEX_SEADRA 117
#define NATIONAL_DEX_GOLDEEN 118
#define NATIONAL_DEX_SEAKING 119
#define NATIONAL_DEX_STARYU 120
#define NATIONAL_DEX_STARMIE 121
#define NATIONAL_DEX_MR_MIME 122
#define NATIONAL_DEX_SCYTHER 123
#define NATIONAL_DEX_JYNX 124
#define NATIONAL_DEX_ELECTABUZZ 125
#define NATIONAL_DEX_MAGMAR 126
#define NATIONAL_DEX_PINSIR 127
#define NATIONAL_DEX_TAUROS 128
#define NATIONAL_DEX_MAGIKARP 129
#define NATIONAL_DEX_GYARADOS 130
#define NATIONAL_DEX_LAPRAS 131
#define NATIONAL_DEX_DITTO 132
#define NATIONAL_DEX_EEVEE 133
#define NATIONAL_DEX_VAPOREON 134
#define NATIONAL_DEX_JOLTEON 135
#define NATIONAL_DEX_FLAREON 136
#define NATIONAL_DEX_PORYGON 137
#define NATIONAL_DEX_OMANYTE 138
#define NATIONAL_DEX_OMASTAR 139
#define NATIONAL_DEX_KABUTO 140
#define NATIONAL_DEX_KABUTOPS 141
#define NATIONAL_DEX_AERODACTYL 142
#define NATIONAL_DEX_SNORLAX 143
#define NATIONAL_DEX_ARTICUNO 144
#define NATIONAL_DEX_ZAPDOS 145
#define NATIONAL_DEX_MOLTRES 146
#define NATIONAL_DEX_DRATINI 147
#define NATIONAL_DEX_DRAGONAIR 148
#define NATIONAL_DEX_DRAGONITE 149
#define NATIONAL_DEX_MEWTWO 150
#define NATIONAL_DEX_MEW 151
#define NATIONAL_DEX_CHIKORITA 152
#define NATIONAL_DEX_BAYLEEF 153
#define NATIONAL_DEX_MEGANIUM 154
#define NATIONAL_DEX_CYNDAQUIL 155
#define NATIONAL_DEX_QUILAVA 156
#define NATIONAL_DEX_TYPHLOSION 157
#define NATIONAL_DEX_TOTODILE 158
#define NATIONAL_DEX_CROCONAW 159
#define NATIONAL_DEX_FERALIGATR 160
#define NATIONAL_DEX_SENTRET 161
#define NATIONAL_DEX_FURRET 162
#define NATIONAL_DEX_HOOTHOOT 163
#define NATIONAL_DEX_NOCTOWL 164
#define NATIONAL_DEX_LEDYBA 165
#define NATIONAL_DEX_LEDIAN 166
#define NATIONAL_DEX_SPINARAK 167
#define NATIONAL_DEX_ARIADOS 168
#define NATIONAL_DEX_CROBAT 169
#define NATIONAL_DEX_CHINCHOU 170
#define NATIONAL_DEX_LANTURN 171
#define NATIONAL_DEX_PICHU 172
#define NATIONAL_DEX_CLEFFA 173
#define NATIONAL_DEX_IGGLYBUFF 174
#define NATIONAL_DEX_TOGEPI 175
#define NATIONAL_DEX_TOGETIC 176
#define NATIONAL_DEX_NATU 177
#define NATIONAL_DEX_XATU 178
#define NATIONAL_DEX_MAREEP 179
#define NATIONAL_DEX_FLAAFFY 180
#define NATIONAL_DEX_AMPHAROS 181
#define NATIONAL_DEX_BELLOSSOM 182
#define NATIONAL_DEX_MARILL 183
#define NATIONAL_DEX_AZUMARILL 184
#define NATIONAL_DEX_SUDOWOODO 185
#define NATIONAL_DEX_POLITOED 186
#define NATIONAL_DEX_HOPPIP 187
#define NATIONAL_DEX_SKIPLOOM 188
#define NATIONAL_DEX_JUMPLUFF 189
#define NATIONAL_DEX_AIPOM 190
#define NATIONAL_DEX_SUNKERN 191
#define NATIONAL_DEX_SUNFLORA 192
#define NATIONAL_DEX_YANMA 193
#define NATIONAL_DEX_WOOPER 194
#define NATIONAL_DEX_QUAGSIRE 195
#define NATIONAL_DEX_ESPEON 196
#define NATIONAL_DEX_UMBREON 197
#define NATIONAL_DEX_MURKROW 198
#define NATIONAL_DEX_SLOWKING 199
#define NATIONAL_DEX_MISDREAVUS 200
#define NATIONAL_DEX_UNOWN 201
#define NATIONAL_DEX_WOBBUFFET 202
#define NATIONAL_DEX_GIRAFARIG 203
#define NATIONAL_DEX_PINECO 204
#define NATIONAL_DEX_FORRETRESS 205
#define NATIONAL_DEX_DUNSPARCE 206
#define NATIONAL_DEX_GLIGAR 207
#define NATIONAL_DEX_STEELIX 208
#define NATIONAL_DEX_SNUBBULL 209
#define NATIONAL_DEX_GRANBULL 210
#define NATIONAL_DEX_QWILFISH 211
#define NATIONAL_DEX_SCIZOR 212
#define NATIONAL_DEX_SHUCKLE 213
#define NATIONAL_DEX_HERACROSS 214
#define NATIONAL_DEX_SNEASEL 215
#define NATIONAL_DEX_TEDDIURSA 216
#define NATIONAL_DEX_URSARING 217
#define NATIONAL_DEX_SLUGMA 218
#define NATIONAL_DEX_MAGCARGO 219
#define NATIONAL_DEX_SWINUB 220
#define NATIONAL_DEX_PILOSWINE 221
#define NATIONAL_DEX_CORSOLA 222
#define NATIONAL_DEX_REMORAID 223
#define NATIONAL_DEX_OCTILLERY 224
#define NATIONAL_DEX_DELIBIRD 225
#define NATIONAL_DEX_MANTINE 226
#define NATIONAL_DEX_SKARMORY 227
#define NATIONAL_DEX_HOUNDOUR 228
#define NATIONAL_DEX_HOUNDOOM 229
#define NATIONAL_DEX_KINGDRA 230
#define NATIONAL_DEX_PHANPY 231
#define NATIONAL_DEX_DONPHAN 232
#define NATIONAL_DEX_PORYGON2 233
#define NATIONAL_DEX_STANTLER 234
#define NATIONAL_DEX_SMEARGLE 235
#define NATIONAL_DEX_TYROGUE 236
#define NATIONAL_DEX_HITMONTOP 237
#define NATIONAL_DEX_SMOOCHUM 238
#define NATIONAL_DEX_ELEKID 239
#define NATIONAL_DEX_MAGBY 240
#define NATIONAL_DEX_MILTANK 241
#define NATIONAL_DEX_BLISSEY 242
#define NATIONAL_DEX_RAIKOU 243
#define NATIONAL_DEX_ENTEI 244
#define NATIONAL_DEX_SUICUNE 245
#define NATIONAL_DEX_LARVITAR 246
#define NATIONAL_DEX_PUPITAR 247
#define NATIONAL_DEX_TYRANITAR 248
#define NATIONAL_DEX_LUGIA 249
#define NATIONAL_DEX_HO_OH 250
#define NATIONAL_DEX_CELEBI 251
#define NATIONAL_DEX_OLD_UNOWN_B 387
#define NATIONAL_DEX_OLD_UNOWN_C 388
#define NATIONAL_DEX_OLD_UNOWN_D 389
#define NATIONAL_DEX_OLD_UNOWN_E 390
#define NATIONAL_DEX_OLD_UNOWN_F 391
#define NATIONAL_DEX_OLD_UNOWN_G 392
#define NATIONAL_DEX_OLD_UNOWN_H 393
#define NATIONAL_DEX_OLD_UNOWN_I 394
#define NATIONAL_DEX_OLD_UNOWN_J 395
#define NATIONAL_DEX_OLD_UNOWN_K 396
#define NATIONAL_DEX_OLD_UNOWN_L 397
#define NATIONAL_DEX_OLD_UNOWN_M 398
#define NATIONAL_DEX_OLD_UNOWN_N 399
#define NATIONAL_DEX_OLD_UNOWN_O 400
#define NATIONAL_DEX_OLD_UNOWN_P 401
#define NATIONAL_DEX_OLD_UNOWN_Q 402
#define NATIONAL_DEX_OLD_UNOWN_R 403
#define NATIONAL_DEX_OLD_UNOWN_S 404
#define NATIONAL_DEX_OLD_UNOWN_T 405
#define NATIONAL_DEX_OLD_UNOWN_U 406
#define NATIONAL_DEX_OLD_UNOWN_V 407
#define NATIONAL_DEX_OLD_UNOWN_W 408
#define NATIONAL_DEX_OLD_UNOWN_X 409
#define NATIONAL_DEX_OLD_UNOWN_Y 410
#define NATIONAL_DEX_OLD_UNOWN_Z 411
#define NATIONAL_DEX_TREECKO 252
#define NATIONAL_DEX_GROVYLE 253
#define NATIONAL_DEX_SCEPTILE 254
#define NATIONAL_DEX_TORCHIC 255
#define NATIONAL_DEX_COMBUSKEN 256
#define NATIONAL_DEX_BLAZIKEN 257
#define NATIONAL_DEX_MUDKIP 258
#define NATIONAL_DEX_MARSHTOMP 259
#define NATIONAL_DEX_SWAMPERT 260
#define NATIONAL_DEX_POOCHYENA 261
#define NATIONAL_DEX_MIGHTYENA 262
#define NATIONAL_DEX_ZIGZAGOON 263
#define NATIONAL_DEX_LINOONE 264
#define NATIONAL_DEX_WURMPLE 265
#define NATIONAL_DEX_SILCOON 266
#define NATIONAL_DEX_BEAUTIFLY 267
#define NATIONAL_DEX_CASCOON 268
#define NATIONAL_DEX_DUSTOX 269
#define NATIONAL_DEX_LOTAD 270
#define NATIONAL_DEX_LOMBRE 271
#define NATIONAL_DEX_LUDICOLO 272
#define NATIONAL_DEX_SEEDOT 273
#define NATIONAL_DEX_NUZLEAF 274
#define NATIONAL_DEX_SHIFTRY 275
#define NATIONAL_DEX_NINCADA 290
#define NATIONAL_DEX_NINJASK 291
#define NATIONAL_DEX_SHEDINJA 292
#define NATIONAL_DEX_TAILLOW 276
#define NATIONAL_DEX_SWELLOW 277
#define NATIONAL_DEX_SHROOMISH 285
#define NATIONAL_DEX_BRELOOM 286
#define NATIONAL_DEX_SPINDA 327
#define NATIONAL_DEX_WINGULL 278
#define NATIONAL_DEX_PELIPPER 279
#define NATIONAL_DEX_SURSKIT 283
#define NATIONAL_DEX_MASQUERAIN 284
#define NATIONAL_DEX_WAILMER 320
#define NATIONAL_DEX_WAILORD 321
#define NATIONAL_DEX_SKITTY 300
#define NATIONAL_DEX_DELCATTY 301
#define NATIONAL_DEX_KECLEON 352
#define NATIONAL_DEX_BALTOY 343
#define NATIONAL_DEX_CLAYDOL 344
#define NATIONAL_DEX_NOSEPASS 299
#define NATIONAL_DEX_TORKOAL 324
#define NATIONAL_DEX_SABLEYE 302
#define NATIONAL_DEX_BARBOACH 339
#define NATIONAL_DEX_WHISCASH 340
#define NATIONAL_DEX_LUVDISC 370
#define NATIONAL_DEX_CORPHISH 341
#define NATIONAL_DEX_CRAWDAUNT 342
#define NATIONAL_DEX_FEEBAS 349
#define NATIONAL_DEX_MILOTIC 350
#define NATIONAL_DEX_CARVANHA 318
#define NATIONAL_DEX_SHARPEDO 319
#define NATIONAL_DEX_TRAPINCH 328
#define NATIONAL_DEX_VIBRAVA 329
#define NATIONAL_DEX_FLYGON 330
#define NATIONAL_DEX_MAKUHITA 296
#define NATIONAL_DEX_HARIYAMA 297
#define NATIONAL_DEX_ELECTRIKE 309
#define NATIONAL_DEX_MANECTRIC 310
#define NATIONAL_DEX_NUMEL 322
#define NATIONAL_DEX_CAMERUPT 323
#define NATIONAL_DEX_SPHEAL 363
#define NATIONAL_DEX_SEALEO 364
#define NATIONAL_DEX_WALREIN 365
#define NATIONAL_DEX_CACNEA 331
#define NATIONAL_DEX_CACTURNE 332
#define NATIONAL_DEX_SNORUNT 361
#define NATIONAL_DEX_GLALIE 362
#define NATIONAL_DEX_LUNATONE 337
#define NATIONAL_DEX_SOLROCK 338
#define NATIONAL_DEX_AZURILL 298
#define NATIONAL_DEX_SPOINK 325
#define NATIONAL_DEX_GRUMPIG 326
#define NATIONAL_DEX_PLUSLE 311
#define NATIONAL_DEX_MINUN 312
#define NATIONAL_DEX_MAWILE 303
#define NATIONAL_DEX_MEDITITE 307
#define NATIONAL_DEX_MEDICHAM 308
#define NATIONAL_DEX_SWABLU 333
#define NATIONAL_DEX_ALTARIA 334
#define NATIONAL_DEX_WYNAUT 360
#define NATIONAL_DEX_DUSKULL 355
#define NATIONAL_DEX_DUSCLOPS 356
#define NATIONAL_DEX_ROSELIA 315
#define NATIONAL_DEX_SLAKOTH 287
#define NATIONAL_DEX_VIGOROTH 288
#define NATIONAL_DEX_SLAKING 289
#define NATIONAL_DEX_GULPIN 316
#define NATIONAL_DEX_SWALOT 317
#define NATIONAL_DEX_TROPIUS 357
#define NATIONAL_DEX_WHISMUR 293
#define NATIONAL_DEX_LOUDRED 294
#define NATIONAL_DEX_EXPLOUD 295
#define NATIONAL_DEX_CLAMPERL 366
#define NATIONAL_DEX_HUNTAIL 367
#define NATIONAL_DEX_GOREBYSS 368
#define NATIONAL_DEX_ABSOL 359
#define NATIONAL_DEX_SHUPPET 353
#define NATIONAL_DEX_BANETTE 354
#define NATIONAL_DEX_SEVIPER 336
#define NATIONAL_DEX_ZANGOOSE 335
#define NATIONAL_DEX_RELICANTH 369
#define NATIONAL_DEX_ARON 304
#define NATIONAL_DEX_LAIRON 305
#define NATIONAL_DEX_AGGRON 306
#define NATIONAL_DEX_CASTFORM 351
#define NATIONAL_DEX_VOLBEAT 313
#define NATIONAL_DEX_ILLUMISE 314
#define NATIONAL_DEX_LILEEP 345
#define NATIONAL_DEX_CRADILY 346
#define NATIONAL_DEX_ANORITH 347
#define NATIONAL_DEX_ARMALDO 348
#define NATIONAL_DEX_RALTS 280
#define NATIONAL_DEX_KIRLIA 281
#define NATIONAL_DEX_GARDEVOIR 282
#define NATIONAL_DEX_BAGON 371
#define NATIONAL_DEX_SHELGON 372
#define NATIONAL_DEX_SALAMENCE 373
#define NATIONAL_DEX_BELDUM 374
#define NATIONAL_DEX_METANG 375
#define NATIONAL_DEX_METAGROSS 376
#define NATIONAL_DEX_REGIROCK 377
#define NATIONAL_DEX_REGICE 378
#define NATIONAL_DEX_REGISTEEL 379
#define NATIONAL_DEX_KYOGRE 382
#define NATIONAL_DEX_GROUDON 383
#define NATIONAL_DEX_RAYQUAZA 384
#define NATIONAL_DEX_LATIAS 380
#define NATIONAL_DEX_LATIOS 381
#define NATIONAL_DEX_JIRACHI 385
#define NATIONAL_DEX_DEOXYS 386
#define NATIONAL_DEX_CHIMECHO 358
// Hoenn Dex Index Defines
#define HOENN_DEX_NONE 0
#define HOENN_DEX_BULBASAUR 203
#define HOENN_DEX_IVYSAUR 204
#define HOENN_DEX_VENUSAUR 205
#define HOENN_DEX_CHARMANDER 206
#define HOENN_DEX_CHARMELEON 207
#define HOENN_DEX_CHARIZARD 208
#define HOENN_DEX_SQUIRTLE 209
#define HOENN_DEX_WARTORTLE 210
#define HOENN_DEX_BLASTOISE 211
#define HOENN_DEX_CATERPIE 212
#define HOENN_DEX_METAPOD 213
#define HOENN_DEX_BUTTERFREE 214
#define HOENN_DEX_WEEDLE 215
#define HOENN_DEX_KAKUNA 216
#define HOENN_DEX_BEEDRILL 217
#define HOENN_DEX_PIDGEY 218
#define HOENN_DEX_PIDGEOTTO 219
#define HOENN_DEX_PIDGEOT 220
#define HOENN_DEX_RATTATA 221
#define HOENN_DEX_RATICATE 222
#define HOENN_DEX_SPEAROW 223
#define HOENN_DEX_FEAROW 224
#define HOENN_DEX_EKANS 225
#define HOENN_DEX_ARBOK 226
#define HOENN_DEX_PIKACHU 156
#define HOENN_DEX_RAICHU 157
#define HOENN_DEX_SANDSHREW 112
#define HOENN_DEX_SANDSLASH 113
#define HOENN_DEX_NIDORAN_F 227
#define HOENN_DEX_NIDORINA 228
#define HOENN_DEX_NIDOQUEEN 229
#define HOENN_DEX_NIDORAN_M 230
#define HOENN_DEX_NIDORINO 231
#define HOENN_DEX_NIDOKING 232
#define HOENN_DEX_CLEFAIRY 233
#define HOENN_DEX_CLEFABLE 234
#define HOENN_DEX_VULPIX 153
#define HOENN_DEX_NINETALES 154
#define HOENN_DEX_JIGGLYPUFF 138
#define HOENN_DEX_WIGGLYTUFF 139
#define HOENN_DEX_ZUBAT 63
#define HOENN_DEX_GOLBAT 64
#define HOENN_DEX_ODDISH 88
#define HOENN_DEX_GLOOM 89
#define HOENN_DEX_VILEPLUME 90
#define HOENN_DEX_PARAS 235
#define HOENN_DEX_PARASECT 236
#define HOENN_DEX_VENONAT 237
#define HOENN_DEX_VENOMOTH 238
#define HOENN_DEX_DIGLETT 239
#define HOENN_DEX_DUGTRIO 240
#define HOENN_DEX_MEOWTH 241
#define HOENN_DEX_PERSIAN 242
#define HOENN_DEX_PSYDUCK 158
#define HOENN_DEX_GOLDUCK 159
#define HOENN_DEX_MANKEY 243
#define HOENN_DEX_PRIMEAPE 244
#define HOENN_DEX_GROWLITHE 245
#define HOENN_DEX_ARCANINE 246
#define HOENN_DEX_POLIWAG 247
#define HOENN_DEX_POLIWHIRL 248
#define HOENN_DEX_POLIWRATH 249
#define HOENN_DEX_ABRA 39
#define HOENN_DEX_KADABRA 40
#define HOENN_DEX_ALAKAZAM 41
#define HOENN_DEX_MACHOP 73
#define HOENN_DEX_MACHOKE 74
#define HOENN_DEX_MACHAMP 75
#define HOENN_DEX_BELLSPROUT 250
#define HOENN_DEX_WEEPINBELL 251
#define HOENN_DEX_VICTREEBEL 252
#define HOENN_DEX_TENTACOOL 66
#define HOENN_DEX_TENTACRUEL 67
#define HOENN_DEX_GEODUDE 57
#define HOENN_DEX_GRAVELER 58
#define HOENN_DEX_GOLEM 59
#define HOENN_DEX_PONYTA 253
#define HOENN_DEX_RAPIDASH 254
#define HOENN_DEX_SLOWPOKE 255
#define HOENN_DEX_SLOWBRO 256
#define HOENN_DEX_MAGNEMITE 82
#define HOENN_DEX_MAGNETON 83
#define HOENN_DEX_FARFETCHD 257
#define HOENN_DEX_DODUO 92
#define HOENN_DEX_DODRIO 93
#define HOENN_DEX_SEEL 258
#define HOENN_DEX_DEWGONG 259
#define HOENN_DEX_GRIMER 106
#define HOENN_DEX_MUK 107
#define HOENN_DEX_SHELLDER 260
#define HOENN_DEX_CLOYSTER 261
#define HOENN_DEX_GASTLY 262
#define HOENN_DEX_HAUNTER 263
#define HOENN_DEX_GENGAR 264
#define HOENN_DEX_ONIX 265
#define HOENN_DEX_DROWZEE 266
#define HOENN_DEX_HYPNO 267
#define HOENN_DEX_KRABBY 268
#define HOENN_DEX_KINGLER 269
#define HOENN_DEX_VOLTORB 84
#define HOENN_DEX_ELECTRODE 85
#define HOENN_DEX_EXEGGCUTE 270
#define HOENN_DEX_EXEGGUTOR 271
#define HOENN_DEX_CUBONE 272
#define HOENN_DEX_MAROWAK 273
#define HOENN_DEX_HITMONLEE 274
#define HOENN_DEX_HITMONCHAN 275
#define HOENN_DEX_LICKITUNG 276
#define HOENN_DEX_KOFFING 108
#define HOENN_DEX_WEEZING 109
#define HOENN_DEX_RHYHORN 169
#define HOENN_DEX_RHYDON 170
#define HOENN_DEX_CHANSEY 277
#define HOENN_DEX_TANGELA 278
#define HOENN_DEX_KANGASKHAN 279
#define HOENN_DEX_HORSEA 184
#define HOENN_DEX_SEADRA 185
#define HOENN_DEX_GOLDEEN 50
#define HOENN_DEX_SEAKING 51
#define HOENN_DEX_STARYU 143
#define HOENN_DEX_STARMIE 144
#define HOENN_DEX_MR_MIME 280
#define HOENN_DEX_SCYTHER 281
#define HOENN_DEX_JYNX 282
#define HOENN_DEX_ELECTABUZZ 283
#define HOENN_DEX_MAGMAR 284
#define HOENN_DEX_PINSIR 167
#define HOENN_DEX_TAUROS 285
#define HOENN_DEX_MAGIKARP 52
#define HOENN_DEX_GYARADOS 53
#define HOENN_DEX_LAPRAS 286
#define HOENN_DEX_DITTO 287
#define HOENN_DEX_EEVEE 288
#define HOENN_DEX_VAPOREON 289
#define HOENN_DEX_JOLTEON 290
#define HOENN_DEX_FLAREON 291
#define HOENN_DEX_PORYGON 292
#define HOENN_DEX_OMANYTE 293
#define HOENN_DEX_OMASTAR 294
#define HOENN_DEX_KABUTO 295
#define HOENN_DEX_KABUTOPS 296
#define HOENN_DEX_AERODACTYL 297
#define HOENN_DEX_SNORLAX 298
#define HOENN_DEX_ARTICUNO 299
#define HOENN_DEX_ZAPDOS 300
#define HOENN_DEX_MOLTRES 301
#define HOENN_DEX_DRATINI 302
#define HOENN_DEX_DRAGONAIR 303
#define HOENN_DEX_DRAGONITE 304
#define HOENN_DEX_MEWTWO 305
#define HOENN_DEX_MEW 306
#define HOENN_DEX_CHIKORITA 307
#define HOENN_DEX_BAYLEEF 308
#define HOENN_DEX_MEGANIUM 309
#define HOENN_DEX_CYNDAQUIL 310
#define HOENN_DEX_QUILAVA 311
#define HOENN_DEX_TYPHLOSION 312
#define HOENN_DEX_TOTODILE 313
#define HOENN_DEX_CROCONAW 314
#define HOENN_DEX_FERALIGATR 315
#define HOENN_DEX_SENTRET 316
#define HOENN_DEX_FURRET 317
#define HOENN_DEX_HOOTHOOT 318
#define HOENN_DEX_NOCTOWL 319
#define HOENN_DEX_LEDYBA 320
#define HOENN_DEX_LEDIAN 321
#define HOENN_DEX_SPINARAK 322
#define HOENN_DEX_ARIADOS 323
#define HOENN_DEX_CROBAT 65
#define HOENN_DEX_CHINCHOU 181
#define HOENN_DEX_LANTURN 182
#define HOENN_DEX_PICHU 155
#define HOENN_DEX_CLEFFA 324
#define HOENN_DEX_IGGLYBUFF 137
#define HOENN_DEX_TOGEPI 325
#define HOENN_DEX_TOGETIC 326
#define HOENN_DEX_NATU 162
#define HOENN_DEX_XATU 163
#define HOENN_DEX_MAREEP 327
#define HOENN_DEX_FLAAFFY 328
#define HOENN_DEX_AMPHAROS 329
#define HOENN_DEX_BELLOSSOM 91
#define HOENN_DEX_MARILL 55
#define HOENN_DEX_AZUMARILL 56
#define HOENN_DEX_SUDOWOODO 330
#define HOENN_DEX_POLITOED 331
#define HOENN_DEX_HOPPIP 332
#define HOENN_DEX_SKIPLOOM 333
#define HOENN_DEX_JUMPLUFF 334
#define HOENN_DEX_AIPOM 335
#define HOENN_DEX_SUNKERN 336
#define HOENN_DEX_SUNFLORA 337
#define HOENN_DEX_YANMA 338
#define HOENN_DEX_WOOPER 339
#define HOENN_DEX_QUAGSIRE 340
#define HOENN_DEX_ESPEON 341
#define HOENN_DEX_UMBREON 342
#define HOENN_DEX_MURKROW 343
#define HOENN_DEX_SLOWKING 344
#define HOENN_DEX_MISDREAVUS 345
#define HOENN_DEX_UNOWN 346
#define HOENN_DEX_WOBBUFFET 161
#define HOENN_DEX_GIRAFARIG 164
#define HOENN_DEX_PINECO 347
#define HOENN_DEX_FORRETRESS 348
#define HOENN_DEX_DUNSPARCE 349
#define HOENN_DEX_GLIGAR 350
#define HOENN_DEX_STEELIX 351
#define HOENN_DEX_SNUBBULL 352
#define HOENN_DEX_GRANBULL 353
#define HOENN_DEX_QWILFISH 354
#define HOENN_DEX_SCIZOR 355
#define HOENN_DEX_SHUCKLE 356
#define HOENN_DEX_HERACROSS 168
#define HOENN_DEX_SNEASEL 357
#define HOENN_DEX_TEDDIURSA 358
#define HOENN_DEX_URSARING 359
#define HOENN_DEX_SLUGMA 103
#define HOENN_DEX_MAGCARGO 104
#define HOENN_DEX_SWINUB 360
#define HOENN_DEX_PILOSWINE 361
#define HOENN_DEX_CORSOLA 180
#define HOENN_DEX_REMORAID 362
#define HOENN_DEX_OCTILLERY 363
#define HOENN_DEX_DELIBIRD 364
#define HOENN_DEX_MANTINE 365
#define HOENN_DEX_SKARMORY 115
#define HOENN_DEX_HOUNDOUR 366
#define HOENN_DEX_HOUNDOOM 367
#define HOENN_DEX_KINGDRA 186
#define HOENN_DEX_PHANPY 165
#define HOENN_DEX_DONPHAN 166
#define HOENN_DEX_PORYGON2 368
#define HOENN_DEX_STANTLER 369
#define HOENN_DEX_SMEARGLE 370
#define HOENN_DEX_TYROGUE 371
#define HOENN_DEX_HITMONTOP 372
#define HOENN_DEX_SMOOCHUM 373
#define HOENN_DEX_ELEKID 374
#define HOENN_DEX_MAGBY 375
#define HOENN_DEX_MILTANK 376
#define HOENN_DEX_BLISSEY 377
#define HOENN_DEX_RAIKOU 378
#define HOENN_DEX_ENTEI 379
#define HOENN_DEX_SUICUNE 380
#define HOENN_DEX_LARVITAR 381
#define HOENN_DEX_PUPITAR 382
#define HOENN_DEX_TYRANITAR 383
#define HOENN_DEX_LUGIA 384
#define HOENN_DEX_HO_OH 385
#define HOENN_DEX_CELEBI 386
#define HOENN_DEX_OLD_UNOWN_B 387
#define HOENN_DEX_OLD_UNOWN_C 388
#define HOENN_DEX_OLD_UNOWN_D 389
#define HOENN_DEX_OLD_UNOWN_E 390
#define HOENN_DEX_OLD_UNOWN_F 391
#define HOENN_DEX_OLD_UNOWN_G 392
#define HOENN_DEX_OLD_UNOWN_H 393
#define HOENN_DEX_OLD_UNOWN_I 394
#define HOENN_DEX_OLD_UNOWN_J 395
#define HOENN_DEX_OLD_UNOWN_K 396
#define HOENN_DEX_OLD_UNOWN_L 397
#define HOENN_DEX_OLD_UNOWN_M 398
#define HOENN_DEX_OLD_UNOWN_N 399
#define HOENN_DEX_OLD_UNOWN_O 400
#define HOENN_DEX_OLD_UNOWN_P 401
#define HOENN_DEX_OLD_UNOWN_Q 402
#define HOENN_DEX_OLD_UNOWN_R 403
#define HOENN_DEX_OLD_UNOWN_S 404
#define HOENN_DEX_OLD_UNOWN_T 405
#define HOENN_DEX_OLD_UNOWN_U 406
#define HOENN_DEX_OLD_UNOWN_V 407
#define HOENN_DEX_OLD_UNOWN_W 408
#define HOENN_DEX_OLD_UNOWN_X 409
#define HOENN_DEX_OLD_UNOWN_Y 410
#define HOENN_DEX_OLD_UNOWN_Z 411
#define HOENN_DEX_TREECKO 1
#define HOENN_DEX_GROVYLE 2
#define HOENN_DEX_SCEPTILE 3
#define HOENN_DEX_TORCHIC 4
#define HOENN_DEX_COMBUSKEN 5
#define HOENN_DEX_BLAZIKEN 6
#define HOENN_DEX_MUDKIP 7
#define HOENN_DEX_MARSHTOMP 8
#define HOENN_DEX_SWAMPERT 9
#define HOENN_DEX_POOCHYENA 10
#define HOENN_DEX_MIGHTYENA 11
#define HOENN_DEX_ZIGZAGOON 12
#define HOENN_DEX_LINOONE 13
#define HOENN_DEX_WURMPLE 14
#define HOENN_DEX_SILCOON 15
#define HOENN_DEX_BEAUTIFLY 16
#define HOENN_DEX_CASCOON 17
#define HOENN_DEX_DUSTOX 18
#define HOENN_DEX_LOTAD 19
#define HOENN_DEX_LOMBRE 20
#define HOENN_DEX_LUDICOLO 21
#define HOENN_DEX_SEEDOT 22
#define HOENN_DEX_NUZLEAF 23
#define HOENN_DEX_SHIFTRY 24
#define HOENN_DEX_NINCADA 42
#define HOENN_DEX_NINJASK 43
#define HOENN_DEX_SHEDINJA 44
#define HOENN_DEX_TAILLOW 25
#define HOENN_DEX_SWELLOW 26
#define HOENN_DEX_SHROOMISH 34
#define HOENN_DEX_BRELOOM 35
#define HOENN_DEX_SPINDA 114
#define HOENN_DEX_WINGULL 27
#define HOENN_DEX_PELIPPER 28
#define HOENN_DEX_SURSKIT 32
#define HOENN_DEX_MASQUERAIN 33
#define HOENN_DEX_WAILMER 99
#define HOENN_DEX_WAILORD 100
#define HOENN_DEX_SKITTY 61
#define HOENN_DEX_DELCATTY 62
#define HOENN_DEX_KECLEON 145
#define HOENN_DEX_BALTOY 131
#define HOENN_DEX_CLAYDOL 132
#define HOENN_DEX_NOSEPASS 60
#define HOENN_DEX_TORKOAL 105
#define HOENN_DEX_SABLEYE 68
#define HOENN_DEX_BARBOACH 127
#define HOENN_DEX_WHISCASH 128
#define HOENN_DEX_LUVDISC 183
#define HOENN_DEX_CORPHISH 129
#define HOENN_DEX_CRAWDAUNT 130
#define HOENN_DEX_FEEBAS 140
#define HOENN_DEX_MILOTIC 141
#define HOENN_DEX_CARVANHA 97
#define HOENN_DEX_SHARPEDO 98
#define HOENN_DEX_TRAPINCH 116
#define HOENN_DEX_VIBRAVA 117
#define HOENN_DEX_FLYGON 118
#define HOENN_DEX_MAKUHITA 48
#define HOENN_DEX_HARIYAMA 49
#define HOENN_DEX_ELECTRIKE 78
#define HOENN_DEX_MANECTRIC 79
#define HOENN_DEX_NUMEL 101
#define HOENN_DEX_CAMERUPT 102
#define HOENN_DEX_SPHEAL 173
#define HOENN_DEX_SEALEO 174
#define HOENN_DEX_WALREIN 175
#define HOENN_DEX_CACNEA 119
#define HOENN_DEX_CACTURNE 120
#define HOENN_DEX_SNORUNT 171
#define HOENN_DEX_GLALIE 172
#define HOENN_DEX_LUNATONE 125
#define HOENN_DEX_SOLROCK 126
#define HOENN_DEX_AZURILL 54
#define HOENN_DEX_SPOINK 110
#define HOENN_DEX_GRUMPIG 111
#define HOENN_DEX_PLUSLE 80
#define HOENN_DEX_MINUN 81
#define HOENN_DEX_MAWILE 69
#define HOENN_DEX_MEDITITE 76
#define HOENN_DEX_MEDICHAM 77
#define HOENN_DEX_SWABLU 121
#define HOENN_DEX_ALTARIA 122
#define HOENN_DEX_WYNAUT 160
#define HOENN_DEX_DUSKULL 148
#define HOENN_DEX_DUSCLOPS 149
#define HOENN_DEX_ROSELIA 94
#define HOENN_DEX_SLAKOTH 36
#define HOENN_DEX_VIGOROTH 37
#define HOENN_DEX_SLAKING 38
#define HOENN_DEX_GULPIN 95
#define HOENN_DEX_SWALOT 96
#define HOENN_DEX_TROPIUS 150
#define HOENN_DEX_WHISMUR 45
#define HOENN_DEX_LOUDRED 46
#define HOENN_DEX_EXPLOUD 47
#define HOENN_DEX_CLAMPERL 176
#define HOENN_DEX_HUNTAIL 177
#define HOENN_DEX_GOREBYSS 178
#define HOENN_DEX_ABSOL 152
#define HOENN_DEX_SHUPPET 146
#define HOENN_DEX_BANETTE 147
#define HOENN_DEX_SEVIPER 124
#define HOENN_DEX_ZANGOOSE 123
#define HOENN_DEX_RELICANTH 179
#define HOENN_DEX_ARON 70
#define HOENN_DEX_LAIRON 71
#define HOENN_DEX_AGGRON 72
#define HOENN_DEX_CASTFORM 142
#define HOENN_DEX_VOLBEAT 86
#define HOENN_DEX_ILLUMISE 87
#define HOENN_DEX_LILEEP 133
#define HOENN_DEX_CRADILY 134
#define HOENN_DEX_ANORITH 135
#define HOENN_DEX_ARMALDO 136
#define HOENN_DEX_RALTS 29
#define HOENN_DEX_KIRLIA 30
#define HOENN_DEX_GARDEVOIR 31
#define HOENN_DEX_BAGON 187
#define HOENN_DEX_SHELGON 188
#define HOENN_DEX_SALAMENCE 189
#define HOENN_DEX_BELDUM 190
#define HOENN_DEX_METANG 191
#define HOENN_DEX_METAGROSS 192
#define HOENN_DEX_REGIROCK 193
#define HOENN_DEX_REGICE 194
#define HOENN_DEX_REGISTEEL 195
#define HOENN_DEX_KYOGRE 198
#define HOENN_DEX_GROUDON 199
#define HOENN_DEX_RAYQUAZA 200
#define HOENN_DEX_LATIAS 196
#define HOENN_DEX_LATIOS 197
#define HOENN_DEX_JIRACHI 201
#define HOENN_DEX_DEOXYS 202
#define HOENN_DEX_CHIMECHO 151
#endif // GUARD_CONSTANTS_SPECIES_H #endif // GUARD_CONSTANTS_SPECIES_H
-3
View File
@@ -22,9 +22,6 @@ extern const u16 gUnknown_8251CB8[];
extern const u16 gUnknown_8251FEE[]; extern const u16 gUnknown_8251FEE[];
extern const u16 gUnknown_8252324[]; extern const u16 gUnknown_8252324[];
extern const u16 gUnknown_82539D4[]; extern const u16 gUnknown_82539D4[];
extern const struct SpindaSpot gSpindaSpotGraphics[];
extern const s8 gNatureStatTable[][5];
extern const u32 gTMHMLearnsets[][2];
extern const struct CompressedSpritePalette gMonPaletteTable[]; extern const struct CompressedSpritePalette gMonPaletteTable[];
extern const struct CompressedSpritePalette gMonShinyPaletteTable[]; extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
File diff suppressed because it is too large Load Diff
+126 -179
View File
@@ -1,84 +1,84 @@
const u8 gItemEffect_Potion[7] = { static const u8 sItemEffect_Potion[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[6] = 20, [6] = 20,
}; };
const u8 gItemEffect_Antidote[6] = { static const u8 sItemEffect_Antidote[6] = {
[3] = ITEM3_POISON, [3] = ITEM3_POISON,
}; };
const u8 gItemEffect_BurnHeal[6] = { static const u8 sItemEffect_BurnHeal[6] = {
[3] = ITEM3_BURN, [3] = ITEM3_BURN,
}; };
const u8 gItemEffect_IceHeal[6] = { static const u8 sItemEffect_IceHeal[6] = {
[3] = ITEM3_FREEZE, [3] = ITEM3_FREEZE,
}; };
const u8 gItemEffect_Awakening[6] = { static const u8 sItemEffect_Awakening[6] = {
[3] = ITEM3_SLEEP, [3] = ITEM3_SLEEP,
}; };
const u8 gItemEffect_ParalyzeHeal[6] = { static const u8 sItemEffect_ParalyzeHeal[6] = {
[3] = ITEM3_PARALYSIS, [3] = ITEM3_PARALYSIS,
}; };
const u8 gItemEffect_FullRestore[7] = { static const u8 sItemEffect_FullRestore[7] = {
[3] = ITEM3_STATUS_ALL, [3] = ITEM3_STATUS_ALL,
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[6] = -1, [6] = -1,
}; };
const u8 gItemEffect_MaxPotion[7] = { static const u8 sItemEffect_MaxPotion[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[6] = -1, [6] = -1,
}; };
const u8 gItemEffect_HyperPotion[7] = { static const u8 sItemEffect_HyperPotion[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[6] = 200, [6] = 200,
}; };
const u8 gItemEffect_SuperPotion[7] = { static const u8 sItemEffect_SuperPotion[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[6] = 50, [6] = 50,
}; };
const u8 gItemEffect_FullHeal[6] = { static const u8 sItemEffect_FullHeal[6] = {
[3] = ITEM3_STATUS_ALL, [3] = ITEM3_STATUS_ALL,
}; };
const u8 gItemEffect_Revive[7] = { static const u8 sItemEffect_Revive[7] = {
[4] = ITEM4_REVIVE | ITEM4_HEAL_HP, [4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
[6] = -2, [6] = -2,
}; };
const u8 gItemEffect_MaxRevive[7] = { static const u8 sItemEffect_MaxRevive[7] = {
[4] = ITEM4_REVIVE | ITEM4_HEAL_HP, [4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
[6] = -1, [6] = -1,
}; };
const u8 gItemEffect_FreshWater[7] = { static const u8 sItemEffect_FreshWater[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[6] = 50, [6] = 50,
}; };
const u8 gItemEffect_SodaPop[7] = { static const u8 sItemEffect_SodaPop[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[6] = 60, [6] = 60,
}; };
const u8 gItemEffect_Lemonade[7] = { static const u8 sItemEffect_Lemonade[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[6] = 80, [6] = 80,
}; };
const u8 gItemEffect_MoomooMilk[7] = { static const u8 sItemEffect_MoomooMilk[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[6] = 100, [6] = 100,
}; };
const u8 gItemEffect_EnergyPowder[10] = { static const u8 sItemEffect_EnergyPowder[10] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[5] = ITEM5_FRIENDSHIP_ALL, [5] = ITEM5_FRIENDSHIP_ALL,
[6] = 50, [6] = 50,
@@ -87,7 +87,7 @@ const u8 gItemEffect_EnergyPowder[10] = {
[9] = -10, [9] = -10,
}; };
const u8 gItemEffect_EnergyRoot[10] = { static const u8 sItemEffect_EnergyRoot[10] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[5] = ITEM5_FRIENDSHIP_ALL, [5] = ITEM5_FRIENDSHIP_ALL,
[6] = 200, [6] = 200,
@@ -96,7 +96,7 @@ const u8 gItemEffect_EnergyRoot[10] = {
[9] = -15, [9] = -15,
}; };
const u8 gItemEffect_HealPowder[9] = { static const u8 sItemEffect_HealPowder[9] = {
[3] = ITEM3_STATUS_ALL, [3] = ITEM3_STATUS_ALL,
[5] = ITEM5_FRIENDSHIP_ALL, [5] = ITEM5_FRIENDSHIP_ALL,
[6] = -5, [6] = -5,
@@ -104,7 +104,7 @@ const u8 gItemEffect_HealPowder[9] = {
[8] = -10, [8] = -10,
}; };
const u8 gItemEffect_RevivalHerb[10] = { static const u8 sItemEffect_RevivalHerb[10] = {
[4] = ITEM4_REVIVE | ITEM4_HEAL_HP, [4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
[5] = ITEM5_FRIENDSHIP_ALL, [5] = ITEM5_FRIENDSHIP_ALL,
[6] = -1, [6] = -1,
@@ -113,54 +113,54 @@ const u8 gItemEffect_RevivalHerb[10] = {
[9] = -20, [9] = -20,
}; };
const u8 gItemEffect_Ether[7] = { static const u8 sItemEffect_Ether[7] = {
[4] = ITEM4_HEAL_PP_ONE | ITEM4_HEAL_PP_ALL, [4] = ITEM4_HEAL_PP_ONE | ITEM4_HEAL_PP_ALL,
[6] = 10, [6] = 10,
}; };
const u8 gItemEffect_MaxEther[7] = { static const u8 sItemEffect_MaxEther[7] = {
[4] = ITEM4_HEAL_PP_ONE | ITEM4_HEAL_PP_ALL, [4] = ITEM4_HEAL_PP_ONE | ITEM4_HEAL_PP_ALL,
[6] = 0x7F, [6] = 0x7F,
}; };
const u8 gItemEffect_Elixir[7] = { static const u8 sItemEffect_Elixir[7] = {
[4] = ITEM4_HEAL_PP_ALL, [4] = ITEM4_HEAL_PP_ALL,
[6] = 10, [6] = 10,
}; };
const u8 gItemEffect_MaxElixir[7] = { static const u8 sItemEffect_MaxElixir[7] = {
[4] = ITEM4_HEAL_PP_ALL, [4] = ITEM4_HEAL_PP_ALL,
[6] = 0x7F, [6] = 0x7F,
}; };
const u8 gItemEffect_LavaCookie[6] = { static const u8 sItemEffect_LavaCookie[6] = {
[3] = ITEM3_STATUS_ALL, [3] = ITEM3_STATUS_ALL,
}; };
const u8 gItemEffect_BlueFlute[6] = { static const u8 sItemEffect_BlueFlute[6] = {
[3] = ITEM3_SLEEP, [3] = ITEM3_SLEEP,
}; };
const u8 gItemEffect_YellowFlute[6] = { static const u8 sItemEffect_YellowFlute[6] = {
[3] = ITEM3_CONFUSION, [3] = ITEM3_CONFUSION,
}; };
const u8 gItemEffect_RedFlute[6] = { static const u8 sItemEffect_RedFlute[6] = {
[0] = ITEM0_INFATUATION, [0] = ITEM0_INFATUATION,
}; };
const u8 gItemEffect_BerryJuice[7] = { static const u8 sItemEffect_BerryJuice[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[6] = 20, [6] = 20,
}; };
const u8 gItemEffect_SacredAsh[7] = { static const u8 sItemEffect_SacredAsh[7] = {
[0] = ITEM0_SACRED_ASH, [0] = ITEM0_SACRED_ASH,
[4] = ITEM4_REVIVE | ITEM4_HEAL_HP, [4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
[6] = -1, [6] = -1,
}; };
const u8 gItemEffect_HPUp[10] = { static const u8 sItemEffect_HPUp[10] = {
[4] = ITEM4_EV_HP, [4] = ITEM4_EV_HP,
[5] = ITEM5_FRIENDSHIP_ALL, [5] = ITEM5_FRIENDSHIP_ALL,
[6] = 10, [6] = 10,
@@ -169,7 +169,7 @@ const u8 gItemEffect_HPUp[10] = {
[9] = 2, [9] = 2,
}; };
const u8 gItemEffect_Protein[10] = { static const u8 sItemEffect_Protein[10] = {
[4] = ITEM4_EV_ATK, [4] = ITEM4_EV_ATK,
[5] = ITEM5_FRIENDSHIP_ALL, [5] = ITEM5_FRIENDSHIP_ALL,
[6] = 10, [6] = 10,
@@ -178,7 +178,7 @@ const u8 gItemEffect_Protein[10] = {
[9] = 2, [9] = 2,
}; };
const u8 gItemEffect_Iron[10] = { static const u8 sItemEffect_Iron[10] = {
[5] = ITEM5_EV_DEF | ITEM5_FRIENDSHIP_ALL, [5] = ITEM5_EV_DEF | ITEM5_FRIENDSHIP_ALL,
[6] = 10, [6] = 10,
[7] = 5, [7] = 5,
@@ -186,7 +186,7 @@ const u8 gItemEffect_Iron[10] = {
[9] = 2, [9] = 2,
}; };
const u8 gItemEffect_Carbos[10] = { static const u8 sItemEffect_Carbos[10] = {
[5] = ITEM5_EV_SPEED | ITEM5_FRIENDSHIP_ALL, [5] = ITEM5_EV_SPEED | ITEM5_FRIENDSHIP_ALL,
[6] = 10, [6] = 10,
[7] = 5, [7] = 5,
@@ -194,7 +194,7 @@ const u8 gItemEffect_Carbos[10] = {
[9] = 2, [9] = 2,
}; };
const u8 gItemEffect_Calcium[10] = { static const u8 sItemEffect_Calcium[10] = {
[5] = ITEM5_EV_SPATK | ITEM5_FRIENDSHIP_ALL, [5] = ITEM5_EV_SPATK | ITEM5_FRIENDSHIP_ALL,
[6] = 10, [6] = 10,
[7] = 5, [7] = 5,
@@ -202,7 +202,7 @@ const u8 gItemEffect_Calcium[10] = {
[9] = 2, [9] = 2,
}; };
const u8 gItemEffect_RareCandy[10] = { static const u8 sItemEffect_RareCandy[10] = {
[3] = ITEM3_LEVEL_UP, [3] = ITEM3_LEVEL_UP,
[4] = ITEM4_REVIVE | ITEM4_HEAL_HP, [4] = ITEM4_REVIVE | ITEM4_HEAL_HP,
[5] = ITEM5_FRIENDSHIP_ALL, [5] = ITEM5_FRIENDSHIP_ALL,
@@ -212,7 +212,7 @@ const u8 gItemEffect_RareCandy[10] = {
[9] = 2, [9] = 2,
}; };
const u8 gItemEffect_PPUp[9] = { static const u8 sItemEffect_PPUp[9] = {
[4] = ITEM4_PP_UP, [4] = ITEM4_PP_UP,
[5] = ITEM5_FRIENDSHIP_ALL, [5] = ITEM5_FRIENDSHIP_ALL,
[6] = 5, [6] = 5,
@@ -220,7 +220,7 @@ const u8 gItemEffect_PPUp[9] = {
[8] = 2, [8] = 2,
}; };
const u8 gItemEffect_Zinc[10] = { static const u8 sItemEffect_Zinc[10] = {
[5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL, [5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL,
[6] = 10, [6] = 10,
[7] = 5, [7] = 5,
@@ -228,246 +228,193 @@ const u8 gItemEffect_Zinc[10] = {
[9] = 2, [9] = 2,
}; };
const u8 gItemEffect_PPMax[9] = { static const u8 sItemEffect_PPMax[9] = {
[5] = ITEM5_PP_MAX | ITEM5_FRIENDSHIP_ALL, [5] = ITEM5_PP_MAX | ITEM5_FRIENDSHIP_ALL,
[6] = 5, [6] = 5,
[7] = 3, [7] = 3,
[8] = 2, [8] = 2,
}; };
const u8 gItemEffect_GuardSpec[8] = { static const u8 sItemEffect_GuardSpec[8] = {
[3] = ITEM3_MIST, [3] = ITEM3_MIST,
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
[6] = 1, [6] = 1,
[7] = 1, [7] = 1,
}; };
const u8 gItemEffect_DireHit[8] = { static const u8 sItemEffect_DireHit[8] = {
[0] = 2 << 4, [0] = 2 << 4,
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
[6] = 1, [6] = 1,
[7] = 1, [7] = 1,
}; };
const u8 gItemEffect_XAttack[8] = { static const u8 sItemEffect_XAttack[8] = {
[0] = 1, [0] = 1,
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
[6] = 1, [6] = 1,
[7] = 1, [7] = 1,
}; };
const u8 gItemEffect_XDefend[8] = { static const u8 sItemEffect_XDefend[8] = {
[1] = 1 << 4, [1] = 1 << 4,
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
[6] = 1, [6] = 1,
[7] = 1, [7] = 1,
}; };
const u8 gItemEffect_XSpeed[8] = { static const u8 sItemEffect_XSpeed[8] = {
[1] = 1, [1] = 1,
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
[6] = 1, [6] = 1,
[7] = 1, [7] = 1,
}; };
const u8 gItemEffect_XAccuracy[8] = { static const u8 sItemEffect_XAccuracy[8] = {
[2] = 1 << 4, [2] = 1 << 4,
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
[6] = 1, [6] = 1,
[7] = 1, [7] = 1,
}; };
const u8 gItemEffect_XSpecial[8] = { static const u8 sItemEffect_XSpecial[8] = {
[2] = 1, [2] = 1,
[5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID, [5] = ITEM5_FRIENDSHIP_LOW | ITEM5_FRIENDSHIP_MID,
[6] = 1, [6] = 1,
[7] = 1, [7] = 1,
}; };
const u8 gItemEffect_SunStone[6] = { static const u8 sItemEffect_SunStone[6] = {
[4] = ITEM4_EVO_STONE, [4] = ITEM4_EVO_STONE,
}; };
const u8 gItemEffect_MoonStone[6] = { static const u8 sItemEffect_MoonStone[6] = {
[4] = ITEM4_EVO_STONE, [4] = ITEM4_EVO_STONE,
}; };
const u8 gItemEffect_FireStone[6] = { static const u8 sItemEffect_FireStone[6] = {
[4] = ITEM4_EVO_STONE, [4] = ITEM4_EVO_STONE,
}; };
const u8 gItemEffect_ThunderStone[6] = { static const u8 sItemEffect_ThunderStone[6] = {
[4] = ITEM4_EVO_STONE, [4] = ITEM4_EVO_STONE,
}; };
const u8 gItemEffect_WaterStone[6] = { static const u8 sItemEffect_WaterStone[6] = {
[4] = ITEM4_EVO_STONE, [4] = ITEM4_EVO_STONE,
}; };
const u8 gItemEffect_LeafStone[6] = { static const u8 sItemEffect_LeafStone[6] = {
[4] = ITEM4_EVO_STONE, [4] = ITEM4_EVO_STONE,
}; };
const u8 gItemEffect_CheriBerry[6] = { static const u8 sItemEffect_CheriBerry[6] = {
[3] = ITEM3_PARALYSIS, [3] = ITEM3_PARALYSIS,
}; };
const u8 gItemEffect_ChestoBerry[6] = { static const u8 sItemEffect_ChestoBerry[6] = {
[3] = ITEM3_SLEEP, [3] = ITEM3_SLEEP,
}; };
const u8 gItemEffect_PechaBerry[6] = { static const u8 sItemEffect_PechaBerry[6] = {
[3] = ITEM3_POISON, [3] = ITEM3_POISON,
}; };
const u8 gItemEffect_RawstBerry[6] = { static const u8 sItemEffect_RawstBerry[6] = {
[3] = ITEM3_BURN, [3] = ITEM3_BURN,
}; };
const u8 gItemEffect_AspearBerry[6] = { static const u8 sItemEffect_AspearBerry[6] = {
[3] = ITEM3_FREEZE, [3] = ITEM3_FREEZE,
}; };
const u8 gItemEffect_LeppaBerry[7] = { static const u8 sItemEffect_LeppaBerry[7] = {
[4] = ITEM4_HEAL_PP_ONE | ITEM4_HEAL_PP_ALL, [4] = ITEM4_HEAL_PP_ONE | ITEM4_HEAL_PP_ALL,
[6] = 10, [6] = 10,
}; };
const u8 gItemEffect_OranBerry[7] = { static const u8 sItemEffect_OranBerry[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[6] = 10, [6] = 10,
}; };
const u8 gItemEffect_PersimBerry[6] = { static const u8 sItemEffect_PersimBerry[6] = {
[3] = ITEM3_CONFUSION, [3] = ITEM3_CONFUSION,
}; };
const u8 gItemEffect_LumBerry[6] = { static const u8 sItemEffect_LumBerry[6] = {
[3] = ITEM3_STATUS_ALL, [3] = ITEM3_STATUS_ALL,
}; };
const u8 gItemEffect_SitrusBerry[7] = { static const u8 sItemEffect_SitrusBerry[7] = {
[4] = ITEM4_HEAL_HP, [4] = ITEM4_HEAL_HP,
[6] = 30, [6] = 30,
}; };
// emerald berry effects
/*
const u8 gItemEffect_PomegBerry[10] = {
[4] = ITEM4_EV_HP,
[5] = ITEM5_FRIENDSHIP_ALL,
[6] = -10,
[7] = 10,
[8] = 5,
[9] = 2,
};
const u8 gItemEffect_KelpsyBerry[10] = {
[4] = ITEM4_EV_ATK,
[5] = ITEM5_FRIENDSHIP_ALL,
[6] = -10,
[7] = 10,
[8] = 5,
[9] = 2,
};
const u8 gItemEffect_QualotBerry[10] = {
[5] = ITEM5_EV_DEF | ITEM5_FRIENDSHIP_ALL,
[6] = -10,
[7] = 10,
[8] = 5,
[9] = 2,
};
const u8 gItemEffect_HondrewBerry[10] = {
[5] = ITEM5_EV_SPATK | ITEM5_FRIENDSHIP_ALL,
[6] = -10,
[7] = 10,
[8] = 5,
[9] = 2,
};
const u8 gItemEffect_GrepaBerry[10] = {
[5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL,
[6] = -10,
[7] = 10,
[8] = 5,
[9] = 2,
};
const u8 gItemEffect_TamatoBerry[10] = {
[5] = ITEM5_EV_SPEED | ITEM5_FRIENDSHIP_ALL,
[6] = -10,
[7] = 10,
[8] = 5,
[9] = 2,
};
*/
const u8 *const gItemEffectTable[] = const u8 *const gItemEffectTable[] =
{ {
[ITEM_POTION - ITEM_POTION] = gItemEffect_Potion, [ITEM_POTION - ITEM_POTION] = sItemEffect_Potion,
[ITEM_ANTIDOTE - ITEM_POTION] = gItemEffect_Antidote, [ITEM_ANTIDOTE - ITEM_POTION] = sItemEffect_Antidote,
[ITEM_BURN_HEAL - ITEM_POTION] = gItemEffect_BurnHeal, [ITEM_BURN_HEAL - ITEM_POTION] = sItemEffect_BurnHeal,
[ITEM_ICE_HEAL - ITEM_POTION] = gItemEffect_IceHeal, [ITEM_ICE_HEAL - ITEM_POTION] = sItemEffect_IceHeal,
[ITEM_AWAKENING - ITEM_POTION] = gItemEffect_Awakening, [ITEM_AWAKENING - ITEM_POTION] = sItemEffect_Awakening,
[ITEM_PARALYZE_HEAL - ITEM_POTION] = gItemEffect_ParalyzeHeal, [ITEM_PARALYZE_HEAL - ITEM_POTION] = sItemEffect_ParalyzeHeal,
[ITEM_FULL_RESTORE - ITEM_POTION] = gItemEffect_FullRestore, [ITEM_FULL_RESTORE - ITEM_POTION] = sItemEffect_FullRestore,
[ITEM_MAX_POTION - ITEM_POTION] = gItemEffect_MaxPotion, [ITEM_MAX_POTION - ITEM_POTION] = sItemEffect_MaxPotion,
[ITEM_HYPER_POTION - ITEM_POTION] = gItemEffect_HyperPotion, [ITEM_HYPER_POTION - ITEM_POTION] = sItemEffect_HyperPotion,
[ITEM_SUPER_POTION - ITEM_POTION] = gItemEffect_SuperPotion, [ITEM_SUPER_POTION - ITEM_POTION] = sItemEffect_SuperPotion,
[ITEM_FULL_HEAL - ITEM_POTION] = gItemEffect_FullHeal, [ITEM_FULL_HEAL - ITEM_POTION] = sItemEffect_FullHeal,
[ITEM_REVIVE - ITEM_POTION] = gItemEffect_Revive, [ITEM_REVIVE - ITEM_POTION] = sItemEffect_Revive,
[ITEM_MAX_REVIVE - ITEM_POTION] = gItemEffect_MaxRevive, [ITEM_MAX_REVIVE - ITEM_POTION] = sItemEffect_MaxRevive,
[ITEM_FRESH_WATER - ITEM_POTION] = gItemEffect_FreshWater, [ITEM_FRESH_WATER - ITEM_POTION] = sItemEffect_FreshWater,
[ITEM_SODA_POP - ITEM_POTION] = gItemEffect_SodaPop, [ITEM_SODA_POP - ITEM_POTION] = sItemEffect_SodaPop,
[ITEM_LEMONADE - ITEM_POTION] = gItemEffect_Lemonade, [ITEM_LEMONADE - ITEM_POTION] = sItemEffect_Lemonade,
[ITEM_MOOMOO_MILK - ITEM_POTION] = gItemEffect_MoomooMilk, [ITEM_MOOMOO_MILK - ITEM_POTION] = sItemEffect_MoomooMilk,
[ITEM_ENERGY_POWDER - ITEM_POTION] = gItemEffect_EnergyPowder, [ITEM_ENERGY_POWDER - ITEM_POTION] = sItemEffect_EnergyPowder,
[ITEM_ENERGY_ROOT - ITEM_POTION] = gItemEffect_EnergyRoot, [ITEM_ENERGY_ROOT - ITEM_POTION] = sItemEffect_EnergyRoot,
[ITEM_HEAL_POWDER - ITEM_POTION] = gItemEffect_HealPowder, [ITEM_HEAL_POWDER - ITEM_POTION] = sItemEffect_HealPowder,
[ITEM_REVIVAL_HERB - ITEM_POTION] = gItemEffect_RevivalHerb, [ITEM_REVIVAL_HERB - ITEM_POTION] = sItemEffect_RevivalHerb,
[ITEM_ETHER - ITEM_POTION] = gItemEffect_Ether, [ITEM_ETHER - ITEM_POTION] = sItemEffect_Ether,
[ITEM_MAX_ETHER - ITEM_POTION] = gItemEffect_MaxEther, [ITEM_MAX_ETHER - ITEM_POTION] = sItemEffect_MaxEther,
[ITEM_ELIXIR - ITEM_POTION] = gItemEffect_Elixir, [ITEM_ELIXIR - ITEM_POTION] = sItemEffect_Elixir,
[ITEM_MAX_ELIXIR - ITEM_POTION] = gItemEffect_MaxElixir, [ITEM_MAX_ELIXIR - ITEM_POTION] = sItemEffect_MaxElixir,
[ITEM_LAVA_COOKIE - ITEM_POTION] = gItemEffect_LavaCookie, [ITEM_LAVA_COOKIE - ITEM_POTION] = sItemEffect_LavaCookie,
[ITEM_BLUE_FLUTE - ITEM_POTION] = gItemEffect_BlueFlute, [ITEM_BLUE_FLUTE - ITEM_POTION] = sItemEffect_BlueFlute,
[ITEM_YELLOW_FLUTE - ITEM_POTION] = gItemEffect_YellowFlute, [ITEM_YELLOW_FLUTE - ITEM_POTION] = sItemEffect_YellowFlute,
[ITEM_RED_FLUTE - ITEM_POTION] = gItemEffect_RedFlute, [ITEM_RED_FLUTE - ITEM_POTION] = sItemEffect_RedFlute,
[ITEM_BERRY_JUICE - ITEM_POTION] = gItemEffect_BerryJuice, [ITEM_BERRY_JUICE - ITEM_POTION] = sItemEffect_BerryJuice,
[ITEM_SACRED_ASH - ITEM_POTION] = gItemEffect_SacredAsh, [ITEM_SACRED_ASH - ITEM_POTION] = sItemEffect_SacredAsh,
[ITEM_HP_UP - ITEM_POTION] = gItemEffect_HPUp, [ITEM_HP_UP - ITEM_POTION] = sItemEffect_HPUp,
[ITEM_PROTEIN - ITEM_POTION] = gItemEffect_Protein, [ITEM_PROTEIN - ITEM_POTION] = sItemEffect_Protein,
[ITEM_IRON - ITEM_POTION] = gItemEffect_Iron, [ITEM_IRON - ITEM_POTION] = sItemEffect_Iron,
[ITEM_CARBOS - ITEM_POTION] = gItemEffect_Carbos, [ITEM_CARBOS - ITEM_POTION] = sItemEffect_Carbos,
[ITEM_CALCIUM - ITEM_POTION] = gItemEffect_Calcium, [ITEM_CALCIUM - ITEM_POTION] = sItemEffect_Calcium,
[ITEM_RARE_CANDY - ITEM_POTION] = gItemEffect_RareCandy, [ITEM_RARE_CANDY - ITEM_POTION] = sItemEffect_RareCandy,
[ITEM_PP_UP - ITEM_POTION] = gItemEffect_PPUp, [ITEM_PP_UP - ITEM_POTION] = sItemEffect_PPUp,
[ITEM_ZINC - ITEM_POTION] = gItemEffect_Zinc, [ITEM_ZINC - ITEM_POTION] = sItemEffect_Zinc,
[ITEM_PP_MAX - ITEM_POTION] = gItemEffect_PPMax, [ITEM_PP_MAX - ITEM_POTION] = sItemEffect_PPMax,
[ITEM_GUARD_SPEC - ITEM_POTION] = gItemEffect_GuardSpec, [ITEM_GUARD_SPEC - ITEM_POTION] = sItemEffect_GuardSpec,
[ITEM_DIRE_HIT - ITEM_POTION] = gItemEffect_DireHit, [ITEM_DIRE_HIT - ITEM_POTION] = sItemEffect_DireHit,
[ITEM_X_ATTACK - ITEM_POTION] = gItemEffect_XAttack, [ITEM_X_ATTACK - ITEM_POTION] = sItemEffect_XAttack,
[ITEM_X_DEFEND - ITEM_POTION] = gItemEffect_XDefend, [ITEM_X_DEFEND - ITEM_POTION] = sItemEffect_XDefend,
[ITEM_X_SPEED - ITEM_POTION] = gItemEffect_XSpeed, [ITEM_X_SPEED - ITEM_POTION] = sItemEffect_XSpeed,
[ITEM_X_ACCURACY - ITEM_POTION] = gItemEffect_XAccuracy, [ITEM_X_ACCURACY - ITEM_POTION] = sItemEffect_XAccuracy,
[ITEM_X_SPECIAL - ITEM_POTION] = gItemEffect_XSpecial, [ITEM_X_SPECIAL - ITEM_POTION] = sItemEffect_XSpecial,
[ITEM_SUN_STONE - ITEM_POTION] = gItemEffect_SunStone, [ITEM_SUN_STONE - ITEM_POTION] = sItemEffect_SunStone,
[ITEM_MOON_STONE - ITEM_POTION] = gItemEffect_MoonStone, [ITEM_MOON_STONE - ITEM_POTION] = sItemEffect_MoonStone,
[ITEM_FIRE_STONE - ITEM_POTION] = gItemEffect_FireStone, [ITEM_FIRE_STONE - ITEM_POTION] = sItemEffect_FireStone,
[ITEM_THUNDER_STONE - ITEM_POTION] = gItemEffect_ThunderStone, [ITEM_THUNDER_STONE - ITEM_POTION] = sItemEffect_ThunderStone,
[ITEM_WATER_STONE - ITEM_POTION] = gItemEffect_WaterStone, [ITEM_WATER_STONE - ITEM_POTION] = sItemEffect_WaterStone,
[ITEM_LEAF_STONE - ITEM_POTION] = gItemEffect_LeafStone, [ITEM_LEAF_STONE - ITEM_POTION] = sItemEffect_LeafStone,
[ITEM_CHERI_BERRY - ITEM_POTION] = gItemEffect_CheriBerry, [ITEM_CHERI_BERRY - ITEM_POTION] = sItemEffect_CheriBerry,
[ITEM_CHESTO_BERRY - ITEM_POTION] = gItemEffect_ChestoBerry, [ITEM_CHESTO_BERRY - ITEM_POTION] = sItemEffect_ChestoBerry,
[ITEM_PECHA_BERRY - ITEM_POTION] = gItemEffect_PechaBerry, [ITEM_PECHA_BERRY - ITEM_POTION] = sItemEffect_PechaBerry,
[ITEM_RAWST_BERRY - ITEM_POTION] = gItemEffect_RawstBerry, [ITEM_RAWST_BERRY - ITEM_POTION] = sItemEffect_RawstBerry,
[ITEM_ASPEAR_BERRY - ITEM_POTION] = gItemEffect_AspearBerry, [ITEM_ASPEAR_BERRY - ITEM_POTION] = sItemEffect_AspearBerry,
[ITEM_LEPPA_BERRY - ITEM_POTION] = gItemEffect_LeppaBerry, [ITEM_LEPPA_BERRY - ITEM_POTION] = sItemEffect_LeppaBerry,
[ITEM_ORAN_BERRY - ITEM_POTION] = gItemEffect_OranBerry, [ITEM_ORAN_BERRY - ITEM_POTION] = sItemEffect_OranBerry,
[ITEM_PERSIM_BERRY - ITEM_POTION] = gItemEffect_PersimBerry, [ITEM_PERSIM_BERRY - ITEM_POTION] = sItemEffect_PersimBerry,
[ITEM_LUM_BERRY - ITEM_POTION] = gItemEffect_LumBerry, [ITEM_LUM_BERRY - ITEM_POTION] = sItemEffect_LumBerry,
[ITEM_SITRUS_BERRY - ITEM_POTION] = gItemEffect_SitrusBerry, [ITEM_SITRUS_BERRY - ITEM_POTION] = sItemEffect_SitrusBerry,
[LAST_BERRY_INDEX - ITEM_POTION] = NULL, [LAST_BERRY_INDEX - ITEM_POTION] = NULL,
}; };
+2 -2
View File
@@ -3,8 +3,8 @@
// This table determines which TMs and HMs a species is capable of learning. // This table determines which TMs and HMs a species is capable of learning.
// Each entry is a 64-bit bit array spread across two 32-bit values, with // Each entry is a 64-bit bit array spread across two 32-bit values, with
// each bit corresponding to a . // each bit corresponding to a machine.
const u32 gTMHMLearnsets[][2] = static const u32 sTMHMLearnsets[][2] =
{ {
[SPECIES_NONE] = TMHM_LEARNSET(0), [SPECIES_NONE] = TMHM_LEARNSET(0),
+151 -151
View File
@@ -1,156 +1,156 @@
// TODO: document the indices for GCC extension // TODO: document trainer pic indices with macro
const u8 gFacilityClassToPicIndex[] = const u8 gFacilityClassToPicIndex[] =
{ {
[0] = FACILITY_CLASS_AQUA_LEADER, [FACILITY_CLASS_AQUA_LEADER] = 0,
[1] = FACILITY_CLASS_TEAM_AQUA, [FACILITY_CLASS_TEAM_AQUA] = 1,
[2] = FACILITY_CLASS_TEAM_AQUA_2, [FACILITY_CLASS_TEAM_AQUA_2] = 2,
[3] = FACILITY_CLASS_AROMA_LADY, [FACILITY_CLASS_AROMA_LADY] = 3,
[4] = FACILITY_CLASS_RUIN_MANIAC, [FACILITY_CLASS_RUIN_MANIAC] = 4,
[5] = FACILITY_CLASS_INTERVIEWER, [FACILITY_CLASS_INTERVIEWER] = 5,
[6] = FACILITY_CLASS_TUBER, [FACILITY_CLASS_TUBER] = 6,
[7] = FACILITY_CLASS_TUBER_2, [FACILITY_CLASS_TUBER_2] = 7,
[8] = FACILITY_CLASS_COOLTRAINER, [FACILITY_CLASS_COOLTRAINER] = 8,
[9] = FACILITY_CLASS_COOLTRAINER_2, [FACILITY_CLASS_COOLTRAINER_2] = 9,
[10] = FACILITY_CLASS_HEX_MANIAC, [FACILITY_CLASS_HEX_MANIAC] = 10,
[11] = FACILITY_CLASS_LADY, [FACILITY_CLASS_LADY] = 11,
[12] = FACILITY_CLASS_BEAUTY, [FACILITY_CLASS_BEAUTY] = 12,
[13] = FACILITY_CLASS_RICH_BOY, [FACILITY_CLASS_RICH_BOY] = 13,
[14] = FACILITY_CLASS_POKEMANIAC, [FACILITY_CLASS_POKEMANIAC] = 14,
[15] = FACILITY_CLASS_SWIMMER_MALE, [FACILITY_CLASS_SWIMMER_MALE] = 15,
[16] = FACILITY_CLASS_BLACK_BELT, [FACILITY_CLASS_BLACK_BELT] = 16,
[17] = FACILITY_CLASS_GUITARIST, [FACILITY_CLASS_GUITARIST] = 17,
[18] = FACILITY_CLASS_KINDLER, [FACILITY_CLASS_KINDLER] = 18,
[19] = FACILITY_CLASS_CAMPER, [FACILITY_CLASS_CAMPER] = 19,
[20] = FACILITY_CLASS_BUG_MANIAC, [FACILITY_CLASS_BUG_MANIAC] = 20,
[21] = FACILITY_CLASS_PSYCHIC, [FACILITY_CLASS_PSYCHIC] = 21,
[22] = FACILITY_CLASS_PSYCHIC_2, [FACILITY_CLASS_PSYCHIC_2] = 22,
[23] = FACILITY_CLASS_GENTLEMAN, [FACILITY_CLASS_GENTLEMAN] = 23,
[24] = FACILITY_CLASS_ELITE_FOUR, [FACILITY_CLASS_ELITE_FOUR] = 24,
[25] = FACILITY_CLASS_ELITE_FOUR_2, [FACILITY_CLASS_ELITE_FOUR_2] = 25,
[26] = FACILITY_CLASS_LEADER, [FACILITY_CLASS_LEADER] = 26,
[27] = FACILITY_CLASS_LEADER_2, [FACILITY_CLASS_LEADER_2] = 27,
[28] = FACILITY_CLASS_LEADER_3, [FACILITY_CLASS_LEADER_3] = 28,
[29] = FACILITY_CLASS_SCHOOL_KID, [FACILITY_CLASS_SCHOOL_KID] = 29,
[30] = FACILITY_CLASS_SCHOOL_KID_2, [FACILITY_CLASS_SCHOOL_KID_2] = 30,
[31] = FACILITY_CLASS_SR_AND_JR, [FACILITY_CLASS_SR_AND_JR] = 31,
[32] = FACILITY_CLASS_POKEFAN, [FACILITY_CLASS_POKEFAN] = 32,
[33] = FACILITY_CLASS_POKEFAN_2, [FACILITY_CLASS_POKEFAN_2] = 33,
[34] = FACILITY_CLASS_EXPERT, [FACILITY_CLASS_EXPERT] = 34,
[35] = FACILITY_CLASS_EXPERT_2, [FACILITY_CLASS_EXPERT_2] = 35,
[36] = FACILITY_CLASS_YOUNGSTER, [FACILITY_CLASS_YOUNGSTER] = 36,
[37] = FACILITY_CLASS_CHAMPION, [FACILITY_CLASS_CHAMPION] = 37,
[38] = FACILITY_CLASS_FISHERMAN, [FACILITY_CLASS_FISHERMAN] = 38,
[39] = FACILITY_CLASS_TRIATHLETE, [FACILITY_CLASS_TRIATHLETE] = 39,
[40] = FACILITY_CLASS_TRIATHLETE_2, [FACILITY_CLASS_TRIATHLETE_2] = 40,
[41] = FACILITY_CLASS_TRIATHLETE_3, [FACILITY_CLASS_TRIATHLETE_3] = 41,
[42] = FACILITY_CLASS_TRIATHLETE_4, [FACILITY_CLASS_TRIATHLETE_4] = 42,
[43] = FACILITY_CLASS_TRIATHLETE_5, [FACILITY_CLASS_TRIATHLETE_5] = 43,
[44] = FACILITY_CLASS_TRIATHLETE_6, [FACILITY_CLASS_TRIATHLETE_6] = 44,
[45] = FACILITY_CLASS_DRAGON_TAMER, [FACILITY_CLASS_DRAGON_TAMER] = 45,
[46] = FACILITY_CLASS_BIRD_KEEPER, [FACILITY_CLASS_BIRD_KEEPER] = 46,
[47] = FACILITY_CLASS_NINJA_BOY, [FACILITY_CLASS_NINJA_BOY] = 47,
[48] = FACILITY_CLASS_BATTLE_GIRL, [FACILITY_CLASS_BATTLE_GIRL] = 48,
[49] = FACILITY_CLASS_PARASOL_LADY, [FACILITY_CLASS_PARASOL_LADY] = 49,
[50] = FACILITY_CLASS_SWIMMER_FEMALE, [FACILITY_CLASS_SWIMMER_FEMALE] = 50,
[51] = FACILITY_CLASS_PICNICKER, [FACILITY_CLASS_PICNICKER] = 51,
[52] = FACILITY_CLASS_TWINS, [FACILITY_CLASS_TWINS] = 52,
[53] = FACILITY_CLASS_SAILOR, [FACILITY_CLASS_SAILOR] = 53,
[54] = FACILITY_CLASS_YOUNGSTER, [FACILITY_CLASS_BOARDER] = 36,
[55] = FACILITY_CLASS_YOUNGSTER, [FACILITY_CLASS_BOARDER_2] = 36,
[56] = FACILITY_CLASS_BOARDER, [FACILITY_CLASS_COLLECTOR] = 54,
[57] = FACILITY_CLASS_BOARDER_2, [FACILITY_CLASS_PKMN_TRAINER] = 55,
[58] = FACILITY_CLASS_COLLECTOR, [FACILITY_CLASS_PKMN_TRAINER_2] = 56,
[59] = FACILITY_CLASS_COLLECTOR, [FACILITY_CLASS_PKMN_TRAINER_3] = 56,
[60] = FACILITY_CLASS_COLLECTOR, [FACILITY_CLASS_PKMN_TRAINER_4] = 56,
[61] = FACILITY_CLASS_PKMN_TRAINER, [FACILITY_CLASS_PKMN_TRAINER_5] = 57,
[62] = FACILITY_CLASS_PKMN_TRAINER, [FACILITY_CLASS_PKMN_TRAINER_6] = 57,
[63] = FACILITY_CLASS_PKMN_TRAINER, [FACILITY_CLASS_PKMN_TRAINER_7] = 57,
[64] = FACILITY_CLASS_PKMN_TRAINER_2, [FACILITY_CLASS_PKMN_BREEDER] = 58,
[65] = FACILITY_CLASS_PKMN_TRAINER_3, [FACILITY_CLASS_PKMN_BREEDER_2] = 59,
[66] = FACILITY_CLASS_PKMN_TRAINER_4, [FACILITY_CLASS_PKMN_RANGER] = 60,
[67] = FACILITY_CLASS_PKMN_TRAINER_5, [FACILITY_CLASS_PKMN_RANGER_2] = 61,
[68] = FACILITY_CLASS_PKMN_TRAINER_6, [FACILITY_CLASS_MAGMA_LEADER] = 62,
[69] = FACILITY_CLASS_PKMN_TRAINER_7, [FACILITY_CLASS_TEAM_MAGMA] = 63,
[70] = FACILITY_CLASS_PKMN_BREEDER, [FACILITY_CLASS_TEAM_MAGMA_2] = 64,
[71] = FACILITY_CLASS_PKMN_BREEDER_2, [FACILITY_CLASS_LASS] = 65,
[72] = FACILITY_CLASS_PKMN_RANGER, [FACILITY_CLASS_BUG_CATCHER] = 66,
[73] = FACILITY_CLASS_PKMN_RANGER_2, [FACILITY_CLASS_HIKER] = 67,
[74] = FACILITY_CLASS_MAGMA_LEADER, [FACILITY_CLASS_YOUNG_COUPLE] = 68,
[75] = FACILITY_CLASS_TEAM_MAGMA, [FACILITY_CLASS_OLD_COUPLE] = 69,
[76] = FACILITY_CLASS_TEAM_MAGMA_2, [FACILITY_CLASS_SIS_AND_BRO] = 70,
[77] = FACILITY_CLASS_LASS, [FACILITY_CLASS_AQUA_ADMIN] = 71,
[78] = FACILITY_CLASS_BUG_CATCHER, [FACILITY_CLASS_AQUA_ADMIN_2] = 72,
[79] = FACILITY_CLASS_HIKER, [FACILITY_CLASS_MAGMA_ADMIN] = 73,
[80] = FACILITY_CLASS_YOUNG_COUPLE, [FACILITY_CLASS_MAGMA_ADMIN_2] = 74,
[81] = FACILITY_CLASS_OLD_COUPLE, [FACILITY_CLASS_LEADER_4] = 75,
[82] = FACILITY_CLASS_SIS_AND_BRO, [FACILITY_CLASS_LEADER_5] = 76,
[83] = FACILITY_CLASS_AQUA_ADMIN, [FACILITY_CLASS_LEADER_6] = 77,
[84] = FACILITY_CLASS_AQUA_ADMIN_2, [FACILITY_CLASS_LEADER_7] = 78,
[85] = FACILITY_CLASS_MAGMA_ADMIN, [FACILITY_CLASS_LEADER_8] = 79,
[86] = FACILITY_CLASS_MAGMA_ADMIN_2, [FACILITY_CLASS_ELITE_FOUR_3] = 80,
[87] = FACILITY_CLASS_LEADER_4, [FACILITY_CLASS_ELITE_FOUR_4] = 81,
[88] = FACILITY_CLASS_LEADER_5, [FACILITY_CLASS_YOUNGSTER_2] = 82,
[89] = FACILITY_CLASS_LEADER_6, [FACILITY_CLASS_BUG_CATCHER_2] = 83,
[90] = FACILITY_CLASS_LEADER_7, [FACILITY_CLASS_LASS_2] = 84,
[91] = FACILITY_CLASS_LEADER_8, [FACILITY_CLASS_SAILOR_2] = 85,
[92] = FACILITY_CLASS_ELITE_FOUR_3, [FACILITY_CLASS_CAMPER_2] = 86,
[93] = FACILITY_CLASS_ELITE_FOUR_4, [FACILITY_CLASS_PICNICKER_2] = 87,
[94] = FACILITY_CLASS_YOUNGSTER_2, [FACILITY_CLASS_POKEMANIAC_2] = 88,
[95] = FACILITY_CLASS_BUG_CATCHER_2, [FACILITY_CLASS_SUPER_NERD] = 89,
[96] = FACILITY_CLASS_LASS_2, [FACILITY_CLASS_HIKER_2] = 90,
[97] = FACILITY_CLASS_SAILOR_2, [FACILITY_CLASS_BIKER] = 91,
[98] = FACILITY_CLASS_CAMPER_2, [FACILITY_CLASS_BURGLAR] = 92,
[99] = FACILITY_CLASS_PICNICKER_2, [FACILITY_CLASS_ENGINEER] = 93,
[100] = FACILITY_CLASS_POKEMANIAC_2, [FACILITY_CLASS_FISHERMAN_2] = 94,
[101] = FACILITY_CLASS_SUPER_NERD, [FACILITY_CLASS_SWIMMER_MALE_2] = 95,
[102] = FACILITY_CLASS_HIKER_2, [FACILITY_CLASS_CUE_BALL] = 96,
[103] = FACILITY_CLASS_BIKER, [FACILITY_CLASS_GAMER] = 97,
[104] = FACILITY_CLASS_BURGLAR, [FACILITY_CLASS_BEAUTY_2] = 98,
[105] = FACILITY_CLASS_ENGINEER, [FACILITY_CLASS_SWIMMER_FEMALE_2] = 99,
[106] = FACILITY_CLASS_FISHERMAN_2, [FACILITY_CLASS_PSYCHIC_3] = 100,
[107] = FACILITY_CLASS_SWIMMER_MALE_2, [FACILITY_CLASS_ROCKER] = 101,
[108] = FACILITY_CLASS_CUE_BALL, [FACILITY_CLASS_JUGGLER] = 102,
[109] = FACILITY_CLASS_GAMER, [FACILITY_CLASS_TAMER] = 103,
[110] = FACILITY_CLASS_BEAUTY_2, [FACILITY_CLASS_BIRD_KEEPER_2] = 104,
[111] = FACILITY_CLASS_SWIMMER_FEMALE_2, [FACILITY_CLASS_BLACK_BELT_2] = 105,
[112] = FACILITY_CLASS_PSYCHIC_3, [FACILITY_CLASS_RIVAL] = 106,
[113] = FACILITY_CLASS_ROCKER, [FACILITY_CLASS_SCIENTIST] = 107,
[114] = FACILITY_CLASS_JUGGLER, [FACILITY_CLASS_BOSS] = 108,
[115] = FACILITY_CLASS_TAMER, [FACILITY_CLASS_TEAM_ROCKET] = 109,
[116] = FACILITY_CLASS_BIRD_KEEPER_2, [FACILITY_CLASS_COOLTRAINER_3] = 110,
[117] = FACILITY_CLASS_BLACK_BELT_2, [FACILITY_CLASS_COOLTRAINER_4] = 111,
[118] = FACILITY_CLASS_RIVAL, [FACILITY_CLASS_ELITE_FOUR_5] = 112,
[119] = FACILITY_CLASS_SCIENTIST, [FACILITY_CLASS_ELITE_FOUR_6] = 113,
[120] = FACILITY_CLASS_COOLTRAINER_3, [FACILITY_CLASS_LEADER_9] = 116,
[121] = FACILITY_CLASS_COOLTRAINER_4, [FACILITY_CLASS_LEADER_10] = 117,
[122] = FACILITY_CLASS_RIVAL_2, [FACILITY_CLASS_GENTLEMAN_2] = 123,
[123] = FACILITY_CLASS_CHAMPION_2, [FACILITY_CLASS_RIVAL_2] = 124,
[124] = FACILITY_CLASS_CHANNELER, [FACILITY_CLASS_CHAMPION_2] = 125,
[125] = FACILITY_CLASS_TWINS_2, [FACILITY_CLASS_CHANNELER] = 126,
[126] = FACILITY_CLASS_COOL_COUPLE, [FACILITY_CLASS_TWINS_2] = 127,
[127] = FACILITY_CLASS_YOUNG_COUPLE_2, [FACILITY_CLASS_COOL_COUPLE] = 128,
[128] = FACILITY_CLASS_CRUSH_KIN, [FACILITY_CLASS_YOUNG_COUPLE_2] = 129,
[129] = FACILITY_CLASS_SIS_AND_BRO_2, [FACILITY_CLASS_CRUSH_KIN] = 130,
[130] = FACILITY_CLASS_PKMN_PROF, [FACILITY_CLASS_SIS_AND_BRO_2] = 131,
[131] = FACILITY_CLASS_PLAYER, [FACILITY_CLASS_PKMN_PROF] = 132,
[132] = FACILITY_CLASS_PLAYER_2, [FACILITY_CLASS_PLAYER] = 133,
[133] = FACILITY_CLASS_PLAYER_3, [FACILITY_CLASS_PLAYER_2] = 134,
[134] = FACILITY_CLASS_PLAYER_4, [FACILITY_CLASS_PLAYER_3] = 135,
[135] = FACILITY_CLASS_TEAM_ROCKET_2, [FACILITY_CLASS_PLAYER_4] = 136,
[136] = FACILITY_CLASS_PSYCHIC_4, [FACILITY_CLASS_TEAM_ROCKET_2] = 137,
[137] = FACILITY_CLASS_CRUSH_GIRL, [FACILITY_CLASS_PSYCHIC_4] = 138,
[138] = FACILITY_CLASS_TUBER_3, [FACILITY_CLASS_CRUSH_GIRL] = 139,
[139] = FACILITY_CLASS_PKMN_BREEDER_3, [FACILITY_CLASS_TUBER_3] = 140,
[140] = FACILITY_CLASS_PKMN_RANGER_3, [FACILITY_CLASS_PKMN_BREEDER_3] = 141,
[141] = FACILITY_CLASS_PKMN_RANGER_4, [FACILITY_CLASS_PKMN_RANGER_3] = 142,
[142] = FACILITY_CLASS_AROMA_LADY_2, [FACILITY_CLASS_PKMN_RANGER_4] = 143,
[143] = FACILITY_CLASS_RUIN_MANIAC_2, [FACILITY_CLASS_AROMA_LADY_2] = 144,
[144] = FACILITY_CLASS_LADY_2, [FACILITY_CLASS_RUIN_MANIAC_2] = 145,
[145] = FACILITY_CLASS_PAINTER, [FACILITY_CLASS_LADY_2] = 146,
[146] = FACILITY_CLASS_ELITE_FOUR_7, [FACILITY_CLASS_PAINTER] = 147,
[147] = FACILITY_CLASS_RIVAL, [FACILITY_CLASS_ELITE_FOUR_7] = 112,
[148] = FACILITY_CLASS_SCIENTIST, [FACILITY_CLASS_ELITE_FOUR_8] = 113,
[149] = FACILITY_CLASS_CHANNELER, [FACILITY_CLASS_CHAMPION_3] = 125,
}; };
const u8 gFacilityClassToTrainerClass[] = const u8 gFacilityClassToTrainerClass[] =
+1265 -15
View File
File diff suppressed because it is too large Load Diff