dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokeemerald

Browse Source
This commit is contained in:
Diegoisawesome
2018-01-07 18:47:05 -06:00
parent a11c65ff1a 75c359e300
commit 75f9c16504
1232 changed files with 50110 additions and 7001 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/battle.h
-46
View File
@@ -778,52 +778,6 @@ extern struct BattleStruct* gBattleStruct;
#define MOVE_EFFECT_AFFECTS_USER 0x40
#define MOVE_EFFECT_CERTAIN 0x80
// table ids for general animations
#define B_ANIM_CASTFORM_CHANGE 0x0
#define B_ANIM_STATS_CHANGE 0x1
#define B_ANIM_SUBSTITUTE_FADE 0x2
#define B_ANIM_SUBSTITUTE_APPEAR 0x3
#define B_ANIM_x4 0x4
#define B_ANIM_ITEM_KNOCKOFF 0x5
#define B_ANIM_TURN_TRAP 0x6
#define B_ANIM_ITEM_EFFECT 0x7
#define B_ANIM_SMOKEBALL_ESCAPE 0x8
#define B_ANIM_HANGED_ON 0x9
#define B_ANIM_RAIN_CONTINUES 0xA
#define B_ANIM_SUN_CONTINUES 0xB
#define B_ANIM_SANDSTORM_CONTINUES 0xC
#define B_ANIM_HAIL_CONTINUES 0xD
#define B_ANIM_LEECH_SEED_DRAIN 0xE
#define B_ANIM_MON_HIT 0xF
#define B_ANIM_ITEM_STEAL 0x10
#define B_ANIM_SNATCH_MOVE 0x11
#define B_ANIM_FUTURE_SIGHT_HIT 0x12
#define B_ANIM_DOOM_DESIRE_HIT 0x13
#define B_ANIM_x14 0x14
#define B_ANIM_INGRAIN_HEAL 0x15
#define B_ANIM_WISH_HEAL 0x16
// special animations table
#define B_ANIM_LVL_UP 0x0
#define B_ANIM_SWITCH_OUT_PLAYER_MON 0x1
#define B_ANIM_SWITCH_OUT_OPPONENT_MON 0x2
#define B_ANIM_BALL_THROW 0x3
#define B_ANIM_SAFARI_BALL_THROW 0x4
#define B_ANIM_SUBSTITUTE_TO_MON 0x5
#define B_ANIM_MON_TO_SUBSTITUTE 0x6
// status animation table
#define B_ANIM_STATUS_PSN 0x0
#define B_ANIM_STATUS_CONFUSION 0x1
#define B_ANIM_STATUS_BRN 0x2
#define B_ANIM_STATUS_INFATUATION 0x3
#define B_ANIM_STATUS_SLP 0x4
#define B_ANIM_STATUS_PRZ 0x5
#define B_ANIM_STATUS_FRZ 0x6
#define B_ANIM_STATUS_CURSED 0x7
#define B_ANIM_STATUS_NIGHTMARE 0x8
#define B_ANIM_STATUS_WRAPPED 0x9
#define GET_STAT_BUFF_ID(n)((n & 0xF)) // first four bits 0x1, 0x2, 0x4, 0x8
#define GET_STAT_BUFF_VALUE(n)(((n >> 4) & 7)) // 0x10, 0x20, 0x40
#define STAT_BUFF_NEGATIVE 0x80 // 0x80, the sign bit
include/battle_anim.h
-8
View File
@@ -1,14 +1,6 @@
#ifndef GUARD_BATTLE_ANIM_H
#define GUARD_BATTLE_ANIM_H
enum
{
ANIM_BANK_ATTACKER,
ANIM_BANK_TARGET,
ANIM_BANK_ATK_PARTNER,
ANIM_BANK_DEF_PARTNER,
};
enum
{
BG_ANIM_SCREEN_SIZE,
include/bike.h
+78
View File
@@ -0,0 +1,78 @@
#ifndef GUARD_BIKE_H
#define GUARD_BIKE_H
// the struct below is used for checking button combinations of the last input so that the acro can potentially perform a side/turn jump.
// its possible that at some point Game Freak intended for the acro bike to have more complex tricks: but only the acro jump combinations can be seen in the final ROM.
struct BikeHistoryInputInfo
{
u32 dirHistoryMatch; // the direction you need to press
u32 abStartSelectHistoryMatch; // the button you need to press
u32 dirHistoryMask; // mask applied so that way only the recent nybble (the recent input) is checked
u32 abStartSelectHistoryMask; // mask applied so that way only the recent nybble (the recent input) is checked
const u8 *dirTimerHistoryList; // list of timers to check for direction before the button+dir combination can be verified.
const u8 *abStartSelectHistoryList; // list of timers to check for buttons before the button+dir combination can be verified.
u32 direction; // direction to jump
};
// Player speeds
enum
{
SPEED_STANDING,
SPEED_NORMAL,
SPEED_FAST,
SPEED_FASTER,
SPEED_FASTEST,
};
// mach bike transitions enum
enum
{
MACH_TRANS_FACE_DIRECTION,
MACH_TRANS_TURN_DIRECTION,
MACH_TRANS_KEEP_MOVING,
MACH_TRANS_START_MOVING
};
// Acro bike states
enum
{
ACRO_STATE_NORMAL,
ACRO_STATE_TURNING,
ACRO_STATE_WHEELIE_STANDING,
ACRO_STATE_BUNNY_HOP,
ACRO_STATE_WHEELIE_MOVING,
ACRO_STATE_SIDE_JUMP,
ACRO_STATE_TURN_JUMP,
};
// Acro bike transitions
enum
{
ACRO_TRANS_FACE_DIRECTION,
ACRO_TRANS_TURN_DIRECTION,
ACRO_TRANS_MOVING,
ACRO_TRANS_NORMAL_TO_WHEELIE,
ACRO_TRANS_WHEELIE_TO_NORMAL,
ACRO_TRANS_WHEELIE_IDLE,
ACRO_TRANS_WHEELIE_HOPPING_STANDING,
ACRO_TRANS_WHEELIE_HOPPING_MOVING,
ACRO_TRANS_SIDE_JUMP,
ACRO_TRANS_TURN_JUMP,
ACRO_TRANS_WHEELIE_MOVING,
ACRO_TRANS_WHEELIE_RISING_MOVING,
ACRO_TRANS_WHEELIE_LOWERING_MOVING,
};
void MovePlayerOnBike(u8 direction, u16 newKeys, u16 heldKeys);
void Bike_TryAcroBikeHistoryUpdate(u16 newKeys, u16 heldKeys);
bool8 RS_IsRunningDisallowed(u8 tile);
bool8 IsBikingDisallowedByPlayer(void);
bool8 player_should_look_direction_be_enforced_upon_movement(void);
void GetOnOffBike(u8 transitionFlags);
void BikeClearState(int newDirHistory, int newAbStartHistory);
void Bike_UpdateBikeCounterSpeed(u8 counter);
s16 GetPlayerSpeed(void);
void Bike_HandleBumpySlopeJump(void);
bool32 IsRunningDisallowed(u8 metatile);
#endif // GUARD_BIKE_H
include/constants/battle_ai.h
+52
View File
@@ -0,0 +1,52 @@
#ifndef GUARD_BATTLE_AI_H
#define GUARD_BATTLE_AI_H
// banks enum
#define AI_TARGET 0
#define AI_USER 1
#define AI_TARGET_PARTNER 2
#define AI_USER_PARTNER 3
// get_type command
#define AI_TYPE1_TARGET 0
#define AI_TYPE1_USER 1
#define AI_TYPE2_TARGET 2
#define AI_TYPE2_USER 3
#define AI_TYPE_MOVE 4
// type effectiveness
#define AI_EFFECTIVENESS_x4 160
#define AI_EFFECTIVENESS_x2 80
#define AI_EFFECTIVENESS_x1 40
#define AI_EFFECTIVENESS_x0_5 20
#define AI_EFFECTIVENESS_x0_25 10
#define AI_EFFECTIVENESS_x0 0
// ai weather enum
#define AI_WEATHER_SUN 0
#define AI_WEATHER_RAIN 1
#define AI_WEATHER_SANDSTORM 2
#define AI_WEATHER_HAIL 3
// get_how_powerful_move_is
#define MOVE_POWER_DISCOURAGED 0
#define MOVE_NOT_MOST_POWERFUL 1
#define MOVE_MOST_POWERFUL 2
// script's table id to bit
#define AI_SCRIPT_CHECK_BAD_MOVE (1 << 0)
#define AI_SCRIPT_CHECK_VIABILITY (1 << 1)
#define AI_SCRIPT_TRY_TO_FAINT (1 << 2)
#define AI_SCRIPT_SETUP_FIRST_TURN (1 << 3)
#define AI_SCRIPT_RISKY (1 << 4)
#define AI_SCRIPT_PREFER_STRONGEST_MOVE (1 << 5)
#define AI_SCRIPT_PREFER_BATON_PASS (1 << 6)
#define AI_SCRIPT_DOUBLE_BATTLE (1 << 7)
#define AI_SCRIPT_HP_AWARE (1 << 8)
#define AI_SCRIPT_UNKNOWN (1 << 9)
// 10 - 28 are not used
#define AI_SCRIPT_ROAMING (1 << 29)
#define AI_SCRIPT_SAFARI (1 << 30)
#define AI_SCRIPT_FIRST_BATTLE (1 << 31)
#endif // GUARD_BATTLE_AI_H
include/constants/battle_anim.h
+85
View File
@@ -0,0 +1,85 @@
#ifndef GUARD_CONSTANTS_BATTLE_ANIM_H
#define GUARD_CONSTANTS_BATTLE_ANIM_H
// banks enum used in scripts
#define ANIM_ATTACKER 0
#define ANIM_TARGET 1
#define ANIM_ATK_PARTNER 2
#define ANIM_DEF_PARTNER 3
// move background ids
#define BG_DARK_ 0 // the same as BG_DARK but is unused
#define BG_DARK 1
#define BG_GHOST 2
#define BG_PSYCHIC 3
#define BG_IMPACT_OPPONENT 4
#define BG_IMPACT_PLAYER 5
#define BG_IMPACT_CONTESTS 6
#define BG_DRILL 7
#define BG_DRILL_CONTESTS 8
#define BG_HIGHSPEED_OPPONENT 9
#define BG_HIGHSPEED_PLAYER 10
#define BG_THUNDER 11
#define BG_GUILLOTINE_OPPONENT 12
#define BG_GUILLOTINE_PLAYER 13
#define BG_GUILLOTINE_CONTESTS 14
#define BG_ICE 15
#define BG_COSMIC 16
#define BG_SEISMICTOSS_SKUUPPERCUT 17
#define BG_FLYING 18
#define BG_FLYING_CONTESTS 19
#define BG_AURORABEAM 20
#define BG_FISSURE 21
#define BG_BUG_OPPONENT 22
#define BG_BUG_PLAYER 23
#define BG_SOLARBEAM_OPPONENT 24
#define BG_SOLARBEAM_PLAYER 25
#define BG_SOLARBEAM_CONTESTS 26
// table ids for general animations
#define B_ANIM_CASTFORM_CHANGE 0x0
#define B_ANIM_STATS_CHANGE 0x1
#define B_ANIM_SUBSTITUTE_FADE 0x2
#define B_ANIM_SUBSTITUTE_APPEAR 0x3
#define B_ANIM_x4 0x4
#define B_ANIM_ITEM_KNOCKOFF 0x5
#define B_ANIM_TURN_TRAP 0x6
#define B_ANIM_ITEM_EFFECT 0x7
#define B_ANIM_SMOKEBALL_ESCAPE 0x8
#define B_ANIM_HANGED_ON 0x9
#define B_ANIM_RAIN_CONTINUES 0xA
#define B_ANIM_SUN_CONTINUES 0xB
#define B_ANIM_SANDSTORM_CONTINUES 0xC
#define B_ANIM_HAIL_CONTINUES 0xD
#define B_ANIM_LEECH_SEED_DRAIN 0xE
#define B_ANIM_MON_HIT 0xF
#define B_ANIM_ITEM_STEAL 0x10
#define B_ANIM_SNATCH_MOVE 0x11
#define B_ANIM_FUTURE_SIGHT_HIT 0x12
#define B_ANIM_DOOM_DESIRE_HIT 0x13
#define B_ANIM_x14 0x14
#define B_ANIM_INGRAIN_HEAL 0x15
#define B_ANIM_WISH_HEAL 0x16
// special animations table
#define B_ANIM_LVL_UP 0x0
#define B_ANIM_SWITCH_OUT_PLAYER_MON 0x1
#define B_ANIM_SWITCH_OUT_OPPONENT_MON 0x2
#define B_ANIM_BALL_THROW 0x3
#define B_ANIM_SAFARI_BALL_THROW 0x4
#define B_ANIM_SUBSTITUTE_TO_MON 0x5
#define B_ANIM_MON_TO_SUBSTITUTE 0x6
// status animation table
#define B_ANIM_STATUS_PSN 0x0
#define B_ANIM_STATUS_CONFUSION 0x1
#define B_ANIM_STATUS_BRN 0x2
#define B_ANIM_STATUS_INFATUATION 0x3
#define B_ANIM_STATUS_SLP 0x4
#define B_ANIM_STATUS_PRZ 0x5
#define B_ANIM_STATUS_FRZ 0x6
#define B_ANIM_STATUS_CURSED 0x7
#define B_ANIM_STATUS_NIGHTMARE 0x8
#define B_ANIM_STATUS_WRAPPED 0x9 // does not actually exist
#endif // GUARD_CONSTANTS_BATTLE_ANIM_H
include/constants/opponents.h
+860
View File
@@ -0,0 +1,860 @@
#ifndef GUARD_CONSTANTS_OPPONENTS_H
#define GUARD_CONSTANTS_OPPONENTS_H
#define OPPONENT_NONE 0
#define OPPONENT_SAWYER_1 1
#define OPPONENT_GRUNT_1 2
#define OPPONENT_GRUNT_2 3
#define OPPONENT_GRUNT_3 4
#define OPPONENT_GRUNT_4 5
#define OPPONENT_GRUNT_5 6
#define OPPONENT_GRUNT_6 7
#define OPPONENT_GRUNT_7 8
#define OPPONENT_GABRIELLE_1 9
#define OPPONENT_GRUNT_8 10
#define OPPONENT_MARCEL 11
#define OPPONENT_ALBERTO 12
#define OPPONENT_ED 13
#define OPPONENT_GRUNT_9 14
#define OPPONENT_DECLAN 15
#define OPPONENT_GRUNT_10 16
#define OPPONENT_GRUNT_11 17
#define OPPONENT_GRUNT_12 18
#define OPPONENT_GRUNT_13 19
#define OPPONENT_GRUNT_14 20
#define OPPONENT_GRUNT_15 21
#define OPPONENT_GRUNT_16 22
#define OPPONENT_GRUNT_17 23
#define OPPONENT_GRUNT_18 24
#define OPPONENT_GRUNT_19 25
#define OPPONENT_GRUNT_20 26
#define OPPONENT_GRUNT_21 27
#define OPPONENT_GRUNT_22 28
#define OPPONENT_FREDRICK 29
#define OPPONENT_MATT_1 30
#define OPPONENT_ZANDER 31
#define OPPONENT_SHELLY_1 32
#define OPPONENT_SHELLY_2 33
#define OPPONENT_ARCHIE 34
#define OPPONENT_LEAH 35
#define OPPONENT_DAISY 36
#define OPPONENT_ROSE_1 37
#define OPPONENT_FELIX 38
#define OPPONENT_VIOLET 39
#define OPPONENT_ROSE_2 40
#define OPPONENT_ROSE_3 41
#define OPPONENT_ROSE_4 42
#define OPPONENT_ROSE_5 43
#define OPPONENT_DUSTY_1 44
#define OPPONENT_CHIP 45
#define OPPONENT_FOSTER 46
#define OPPONENT_DUSTY_2 47
#define OPPONENT_DUSTY_3 48
#define OPPONENT_DUSTY_4 49
#define OPPONENT_DUSTY_5 50
#define OPPONENT_GABBY_AND_TY_1 51
#define OPPONENT_GABBY_AND_TY_2 52
#define OPPONENT_GABBY_AND_TY_3 53
#define OPPONENT_GABBY_AND_TY_4 54
#define OPPONENT_GABBY_AND_TY_5 55
#define OPPONENT_GABBY_AND_TY_6 56
#define OPPONENT_LOLA_1 57
#define OPPONENT_AUSTINA 58
#define OPPONENT_GWEN 59
#define OPPONENT_LOLA_2 60
#define OPPONENT_LOLA_3 61
#define OPPONENT_LOLA_4 62
#define OPPONENT_LOLA_5 63
#define OPPONENT_RICKY_1 64
#define OPPONENT_SIMON 65
#define OPPONENT_CHARLIE 66
#define OPPONENT_RICKY_2 67
#define OPPONENT_RICKY_3 68
#define OPPONENT_RICKY_4 69
#define OPPONENT_RICKY_5 70
#define OPPONENT_RANDALL 71
#define OPPONENT_PARKER 72
#define OPPONENT_GEORGE 73
#define OPPONENT_BERKE 74
#define OPPONENT_BRAXTON 75
#define OPPONENT_VINCENT 76
#define OPPONENT_LEROY 77
#define OPPONENT_WILTON_1 78
#define OPPONENT_EDGAR 79
#define OPPONENT_ALBERT 80
#define OPPONENT_SAMUEL 81
#define OPPONENT_VITO 82
#define OPPONENT_OWEN 83
#define OPPONENT_WILTON_2 84
#define OPPONENT_WILTON_3 85
#define OPPONENT_WILTON_4 86
#define OPPONENT_WILTON_5 87
#define OPPONENT_WARREN 88
#define OPPONENT_MARY 89
#define OPPONENT_ALEXIA 90
#define OPPONENT_JODY 91
#define OPPONENT_WENDY 92
#define OPPONENT_KEIRA 93
#define OPPONENT_BROOKE_1 94
#define OPPONENT_JENNIFER 95
#define OPPONENT_HOPE 96
#define OPPONENT_SHANNON 97
#define OPPONENT_MICHELLE 98
#define OPPONENT_CAROLINE 99
#define OPPONENT_JULIE 100
#define OPPONENT_BROOKE_2 101
#define OPPONENT_BROOKE_3 102
#define OPPONENT_BROOKE_4 103
#define OPPONENT_BROOKE_5 104
#define OPPONENT_PATRICIA 105
#define OPPONENT_KINDRA 106
#define OPPONENT_TAMMY 107
#define OPPONENT_VALERIE_1 108
#define OPPONENT_TASHA 109
#define OPPONENT_VALERIE_2 110
#define OPPONENT_VALERIE_3 111
#define OPPONENT_VALERIE_4 112
#define OPPONENT_VALERIE_5 113
#define OPPONENT_CINDY_1 114
#define OPPONENT_DAPHNE 115
#define OPPONENT_GRUNT_23 116
#define OPPONENT_CINDY_2 117
#define OPPONENT_BRIANNA 118
#define OPPONENT_NAOMI 119
#define OPPONENT_CINDY_3 120
#define OPPONENT_CINDY_4 121
#define OPPONENT_CINDY_5 122
#define OPPONENT_CINDY_6 123
#define OPPONENT_MELISSA 124
#define OPPONENT_SHEILA 125
#define OPPONENT_SHIRLEY 126
#define OPPONENT_JESSICA_1 127
#define OPPONENT_CONNIE 128
#define OPPONENT_BRIDGET 129
#define OPPONENT_OLIVIA 130
#define OPPONENT_TIFFANY 131
#define OPPONENT_JESSICA_2 132
#define OPPONENT_JESSICA_3 133
#define OPPONENT_JESSICA_4 134
#define OPPONENT_JESSICA_5 135
#define OPPONENT_WINSTON_1 136
#define OPPONENT_MOLLIE 137
#define OPPONENT_GARRET 138
#define OPPONENT_WINSTON_2 139
#define OPPONENT_WINSTON_3 140
#define OPPONENT_WINSTON_4 141
#define OPPONENT_WINSTON_5 142
#define OPPONENT_STEVE_1 143
#define OPPONENT_THALIA_1 144
#define OPPONENT_MARK 145
#define OPPONENT_GRUNT_24 146
#define OPPONENT_STEVE_2 147
#define OPPONENT_STEVE_3 148
#define OPPONENT_STEVE_4 149
#define OPPONENT_STEVE_5 150
#define OPPONENT_LUIS 151
#define OPPONENT_DOMINIK 152
#define OPPONENT_DOUGLAS 153
#define OPPONENT_DARRIN 154
#define OPPONENT_TONY_1 155
#define OPPONENT_JEROME 156
#define OPPONENT_MATTHEW 157
#define OPPONENT_DAVID 158
#define OPPONENT_SPENCER 159
#define OPPONENT_ROLAND 160
#define OPPONENT_NOLEN 161
#define OPPONENT_STAN 162
#define OPPONENT_BARRY 163
#define OPPONENT_DEAN 164
#define OPPONENT_RODNEY 165
#define OPPONENT_RICHARD 166
#define OPPONENT_HERMAN 167
#define OPPONENT_SANTIAGO 168
#define OPPONENT_GILBERT 169
#define OPPONENT_FRANKLIN 170
#define OPPONENT_KEVIN 171
#define OPPONENT_JACK 172
#define OPPONENT_DUDLEY 173
#define OPPONENT_CHAD 174
#define OPPONENT_TONY_2 175
#define OPPONENT_TONY_3 176
#define OPPONENT_TONY_4 177
#define OPPONENT_TONY_5 178
#define OPPONENT_TAKAO 179
#define OPPONENT_HITOSHI 180
#define OPPONENT_KIYO 181
#define OPPONENT_KOICHI 182
#define OPPONENT_NOB_1 183
#define OPPONENT_NOB_2 184
#define OPPONENT_NOB_3 185
#define OPPONENT_NOB_4 186
#define OPPONENT_NOB_5 187
#define OPPONENT_YUJI 188
#define OPPONENT_DAISUKE 189
#define OPPONENT_ATSUSHI 190
#define OPPONENT_KIRK 191
#define OPPONENT_GRUNT_25 192
#define OPPONENT_GRUNT_26 193
#define OPPONENT_SHAWN 194
#define OPPONENT_FERNANDO_1 195
#define OPPONENT_DALTON_1 196
#define OPPONENT_DALTON_2 197
#define OPPONENT_DALTON_3 198
#define OPPONENT_DALTON_4 199
#define OPPONENT_DALTON_5 200
#define OPPONENT_COLE 201
#define OPPONENT_JEFF 202
#define OPPONENT_AXLE 203
#define OPPONENT_JACE 204
#define OPPONENT_KEEGAN 205
#define OPPONENT_BERNIE_1 206
#define OPPONENT_BERNIE_2 207
#define OPPONENT_BERNIE_3 208
#define OPPONENT_BERNIE_4 209
#define OPPONENT_BERNIE_5 210
#define OPPONENT_DREW 211
#define OPPONENT_BEAU 212
#define OPPONENT_LARRY 213
#define OPPONENT_SHANE 214
#define OPPONENT_JUSTIN 215
#define OPPONENT_ETHAN_1 216
#define OPPONENT_AUTUMN 217
#define OPPONENT_TRAVIS 218
#define OPPONENT_ETHAN_2 219
#define OPPONENT_ETHAN_3 220
#define OPPONENT_ETHAN_4 221
#define OPPONENT_ETHAN_5 222
#define OPPONENT_BRENT 223
#define OPPONENT_DONALD 224
#define OPPONENT_TAYLOR 225
#define OPPONENT_JEFFREY_1 226
#define OPPONENT_DEREK 227
#define OPPONENT_JEFFREY_2 228
#define OPPONENT_JEFFREY_3 229
#define OPPONENT_JEFFREY_4 230
#define OPPONENT_JEFFREY_5 231
#define OPPONENT_EDWARD 232
#define OPPONENT_PRESTON 233
#define OPPONENT_VIRGIL 234
#define OPPONENT_BLAKE 235
#define OPPONENT_WILLIAM 236
#define OPPONENT_JOSHUA 237
#define OPPONENT_CAMERON_1 238
#define OPPONENT_CAMERON_2 239
#define OPPONENT_CAMERON_3 240
#define OPPONENT_CAMERON_4 241
#define OPPONENT_CAMERON_5 242
#define OPPONENT_JACLYN 243
#define OPPONENT_HANNAH 244
#define OPPONENT_SAMANTHA 245
#define OPPONENT_MAURA 246
#define OPPONENT_KAYLA 247
#define OPPONENT_ALEXIS 248
#define OPPONENT_JACKI_1 249
#define OPPONENT_JACKI_2 250
#define OPPONENT_JACKI_3 251
#define OPPONENT_JACKI_4 252
#define OPPONENT_JACKI_5 253
#define OPPONENT_WALTER_1 254
#define OPPONENT_MICAH 255
#define OPPONENT_THOMAS 256
#define OPPONENT_WALTER_2 257
#define OPPONENT_WALTER_3 258
#define OPPONENT_WALTER_4 259
#define OPPONENT_WALTER_5 260
#define OPPONENT_SIDNEY 261
#define OPPONENT_PHOEBE 262
#define OPPONENT_GLACIA 263
#define OPPONENT_DRAKE 264
#define OPPONENT_ROXANNE_1 265
#define OPPONENT_BRAWLY_1 266
#define OPPONENT_WATTSON_1 267
#define OPPONENT_FLANNERY_1 268
#define OPPONENT_NORMAN_1 269
#define OPPONENT_WINONA_1 270
#define OPPONENT_TATE_AND_LIZA_1 271
#define OPPONENT_JUAN_1 272
#define OPPONENT_JERRY_1 273
#define OPPONENT_TED 274
#define OPPONENT_PAUL 275
#define OPPONENT_JERRY_2 276
#define OPPONENT_JERRY_3 277
#define OPPONENT_JERRY_4 278
#define OPPONENT_JERRY_5 279
#define OPPONENT_KAREN_1 280
#define OPPONENT_GEORGIA 281
#define OPPONENT_KAREN_2 282
#define OPPONENT_KAREN_3 283
#define OPPONENT_KAREN_4 284
#define OPPONENT_KAREN_5 285
#define OPPONENT_KATE_AND_JOY 286
#define OPPONENT_ANNA_AND_MEG_1 287
#define OPPONENT_ANNA_AND_MEG_2 288
#define OPPONENT_ANNA_AND_MEG_3 289
#define OPPONENT_ANNA_AND_MEG_4 290
#define OPPONENT_ANNA_AND_MEG_5 291
#define OPPONENT_VICTOR 292
#define OPPONENT_MIGUEL_1 293
#define OPPONENT_COLTON 294
#define OPPONENT_MIGUEL_2 295
#define OPPONENT_MIGUEL_3 296
#define OPPONENT_MIGUEL_4 297
#define OPPONENT_MIGUEL_5 298
#define OPPONENT_VICTORIA 299
#define OPPONENT_VANESSA 300
#define OPPONENT_BETHANY 301
#define OPPONENT_ISABEL_1 302
#define OPPONENT_ISABEL_2 303
#define OPPONENT_ISABEL_3 304
#define OPPONENT_ISABEL_4 305
#define OPPONENT_ISABEL_5 306
#define OPPONENT_TIMOTHY_1 307
#define OPPONENT_TIMOTHY_2 308
#define OPPONENT_TIMOTHY_3 309
#define OPPONENT_TIMOTHY_4 310
#define OPPONENT_TIMOTHY_5 311
#define OPPONENT_VICKY 312
#define OPPONENT_SHELBY_1 313
#define OPPONENT_SHELBY_2 314
#define OPPONENT_SHELBY_3 315
#define OPPONENT_SHELBY_4 316
#define OPPONENT_SHELBY_5 317
#define OPPONENT_CALVIN_1 318
#define OPPONENT_BILLY 319
#define OPPONENT_JOSH 320
#define OPPONENT_TOMMY 321
#define OPPONENT_JOEY 322
#define OPPONENT_BEN 323
#define OPPONENT_QUINCY 324
#define OPPONENT_KATELYNN 325
#define OPPONENT_JAYLEN 326
#define OPPONENT_DILLON 327
#define OPPONENT_CALVIN_2 328
#define OPPONENT_CALVIN_3 329
#define OPPONENT_CALVIN_4 330
#define OPPONENT_CALVIN_5 331
#define OPPONENT_EDDIE 332
#define OPPONENT_ALLEN 333
#define OPPONENT_TIMMY 334
#define OPPONENT_WALLACE 335
#define OPPONENT_ANDREW 336
#define OPPONENT_IVAN 337
#define OPPONENT_CLAUDE 338
#define OPPONENT_ELLIOT_1 339
#define OPPONENT_NED 340
#define OPPONENT_DALE 341
#define OPPONENT_NOLAN 342
#define OPPONENT_BARNY 343
#define OPPONENT_WADE 344
#define OPPONENT_CARTER 345
#define OPPONENT_ELLIOT_2 346
#define OPPONENT_ELLIOT_3 347
#define OPPONENT_ELLIOT_4 348
#define OPPONENT_ELLIOT_5 349
#define OPPONENT_RONALD 350
#define OPPONENT_JACOB 351
#define OPPONENT_ANTHONY 352
#define OPPONENT_BENJAMIN_1 353
#define OPPONENT_BENJAMIN_2 354
#define OPPONENT_BENJAMIN_3 355
#define OPPONENT_BENJAMIN_4 356
#define OPPONENT_BENJAMIN_5 357
#define OPPONENT_ABIGAIL_1 358
#define OPPONENT_JASMINE 359
#define OPPONENT_ABIGAIL_2 360
#define OPPONENT_ABIGAIL_3 361
#define OPPONENT_ABIGAIL_4 362
#define OPPONENT_ABIGAIL_5 363
#define OPPONENT_DYLAN_1 364
#define OPPONENT_DYLAN_2 365
#define OPPONENT_DYLAN_3 366
#define OPPONENT_DYLAN_4 367
#define OPPONENT_DYLAN_5 368
#define OPPONENT_MARIA_1 369
#define OPPONENT_MARIA_2 370
#define OPPONENT_MARIA_3 371
#define OPPONENT_MARIA_4 372
#define OPPONENT_MARIA_5 373
#define OPPONENT_CAMDEN 374
#define OPPONENT_DEMETRIUS 375
#define OPPONENT_ISAIAH_1 376
#define OPPONENT_PABLO_1 377
#define OPPONENT_CHASE 378
#define OPPONENT_ISAIAH_2 379
#define OPPONENT_ISAIAH_3 380
#define OPPONENT_ISAIAH_4 381
#define OPPONENT_ISAIAH_5 382
#define OPPONENT_ISOBEL 383
#define OPPONENT_DONNY 384
#define OPPONENT_TALIA 385
#define OPPONENT_KATELYN_1 386
#define OPPONENT_ALLISON 387
#define OPPONENT_KATELYN_2 388
#define OPPONENT_KATELYN_3 389
#define OPPONENT_KATELYN_4 390
#define OPPONENT_KATELYN_5 391
#define OPPONENT_NICOLAS_1 392
#define OPPONENT_NICOLAS_2 393
#define OPPONENT_NICOLAS_3 394
#define OPPONENT_NICOLAS_4 395
#define OPPONENT_NICOLAS_5 396
#define OPPONENT_AARON 397
#define OPPONENT_PERRY 398
#define OPPONENT_HUGH 399
#define OPPONENT_PHIL 400
#define OPPONENT_JARED 401
#define OPPONENT_HUMBERTO 402
#define OPPONENT_PRESLEY 403
#define OPPONENT_EDWARDO 404
#define OPPONENT_COLIN 405
#define OPPONENT_ROBERT_1 406
#define OPPONENT_BENNY 407
#define OPPONENT_CHESTER 408
#define OPPONENT_ROBERT_2 409
#define OPPONENT_ROBERT_3 410
#define OPPONENT_ROBERT_4 411
#define OPPONENT_ROBERT_5 412
#define OPPONENT_ALEX 413
#define OPPONENT_BECK 414
#define OPPONENT_YASU 415
#define OPPONENT_TAKASHI 416
#define OPPONENT_DIANNE 417
#define OPPONENT_JANI 418
#define OPPONENT_LAO_1 419
#define OPPONENT_LUNG 420
#define OPPONENT_LAO_2 421
#define OPPONENT_LAO_3 422
#define OPPONENT_LAO_4 423
#define OPPONENT_LAO_5 424
#define OPPONENT_JOCELYN 425
#define OPPONENT_LAURA 426
#define OPPONENT_CYNDY_1 427
#define OPPONENT_CORA 428
#define OPPONENT_PAULA 429
#define OPPONENT_CYNDY_2 430
#define OPPONENT_CYNDY_3 431
#define OPPONENT_CYNDY_4 432
#define OPPONENT_CYNDY_5 433
#define OPPONENT_MADELINE_1 434
#define OPPONENT_CLARISSA 435
#define OPPONENT_ANGELICA 436
#define OPPONENT_MADELINE_2 437
#define OPPONENT_MADELINE_3 438
#define OPPONENT_MADELINE_4 439
#define OPPONENT_MADELINE_5 440
#define OPPONENT_BEVERLY 441
#define OPPONENT_IMANI 442
#define OPPONENT_KYLA 443
#define OPPONENT_DENISE 444
#define OPPONENT_BETH 445
#define OPPONENT_TARA 446
#define OPPONENT_MISSY 447
#define OPPONENT_ALICE 448
#define OPPONENT_JENNY_1 449
#define OPPONENT_GRACE 450
#define OPPONENT_TANYA 451
#define OPPONENT_SHARON 452
#define OPPONENT_NIKKI 453
#define OPPONENT_BRENDA 454
#define OPPONENT_KATIE 455
#define OPPONENT_SUSIE 456
#define OPPONENT_KARA 457
#define OPPONENT_DANA 458
#define OPPONENT_SIENNA 459
#define OPPONENT_DEBRA 460
#define OPPONENT_LINDA 461
#define OPPONENT_KAYLEE 462
#define OPPONENT_LAUREL 463
#define OPPONENT_CARLEE 464
#define OPPONENT_JENNY_2 465
#define OPPONENT_JENNY_3 466
#define OPPONENT_JENNY_4 467
#define OPPONENT_JENNY_5 468
#define OPPONENT_HEIDI 469
#define OPPONENT_BECKY 470
#define OPPONENT_CAROL 471
#define OPPONENT_NANCY 472
#define OPPONENT_MARTHA 473
#define OPPONENT_DIANA_1 474
#define OPPONENT_CEDRIC 475
#define OPPONENT_IRENE 476
#define OPPONENT_DIANA_2 477
#define OPPONENT_DIANA_3 478
#define OPPONENT_DIANA_4 479
#define OPPONENT_DIANA_5 480
#define OPPONENT_AMY_AND_LIV_1 481
#define OPPONENT_AMY_AND_LIV_2 482
#define OPPONENT_GINA_AND_MIA_1 483
#define OPPONENT_MIU_AND_YUKI 484
#define OPPONENT_AMY_AND_LIV_3 485
#define OPPONENT_GINA_AND_MIA_2 486
#define OPPONENT_AMY_AND_LIV_4 487
#define OPPONENT_AMY_AND_LIV_5 488
#define OPPONENT_AMY_AND_LIV_6 489
#define OPPONENT_HUEY 490
#define OPPONENT_EDMOND 491
#define OPPONENT_ERNEST_1 492
#define OPPONENT_DWAYNE 493
#define OPPONENT_PHILLIP 494
#define OPPONENT_LEONARD 495
#define OPPONENT_DUNCAN 496
#define OPPONENT_ERNEST_2 497
#define OPPONENT_ERNEST_3 498
#define OPPONENT_ERNEST_4 499
#define OPPONENT_ERNEST_5 500
#define OPPONENT_ELI 501
#define OPPONENT_ANNIKA 502
#define OPPONENT_JAZMYN 503
#define OPPONENT_JONAS 504
#define OPPONENT_KAYLEY 505
#define OPPONENT_AURON 506
#define OPPONENT_KELVIN 507
#define OPPONENT_MARLEY 508
#define OPPONENT_REYNA 509
#define OPPONENT_HUDSON 510
#define OPPONENT_CONOR 511
#define OPPONENT_EDWIN_1 512
#define OPPONENT_HECTOR 513
#define OPPONENT_TABITHA_1 514
#define OPPONENT_EDWIN_2 515
#define OPPONENT_EDWIN_3 516
#define OPPONENT_EDWIN_4 517
#define OPPONENT_EDWIN_5 518
#define OPPONENT_WALLY_1 519
#define OPPONENT_BRENDAN_1 520
#define OPPONENT_BRENDAN_2 521
#define OPPONENT_BRENDAN_3 522
#define OPPONENT_BRENDAN_4 523
#define OPPONENT_BRENDAN_5 524
#define OPPONENT_BRENDAN_6 525
#define OPPONENT_BRENDAN_7 526
#define OPPONENT_BRENDAN_8 527
#define OPPONENT_BRENDAN_9 528
#define OPPONENT_MAY_1 529
#define OPPONENT_MAY_2 530
#define OPPONENT_MAY_3 531
#define OPPONENT_MAY_4 532
#define OPPONENT_MAY_5 533
#define OPPONENT_MAY_6 534
#define OPPONENT_MAY_7 535
#define OPPONENT_MAY_8 536
#define OPPONENT_MAY_9 537
#define OPPONENT_ISAAC_1 538
#define OPPONENT_DAVIS 539
#define OPPONENT_MITCHELL 540
#define OPPONENT_ISAAC_2 541
#define OPPONENT_ISAAC_3 542
#define OPPONENT_ISAAC_4 543
#define OPPONENT_ISAAC_5 544
#define OPPONENT_LYDIA_1 545
#define OPPONENT_HALLE 546
#define OPPONENT_GARRISON 547
#define OPPONENT_LYDIA_2 548
#define OPPONENT_LYDIA_3 549
#define OPPONENT_LYDIA_4 550
#define OPPONENT_LYDIA_5 551
#define OPPONENT_JACKSON_1 552
#define OPPONENT_LORENZO 553
#define OPPONENT_SEBASTIAN 554
#define OPPONENT_JACKSON_2 555
#define OPPONENT_JACKSON_3 556
#define OPPONENT_JACKSON_4 557
#define OPPONENT_JACKSON_5 558
#define OPPONENT_CATHERINE_1 559
#define OPPONENT_JENNA 560
#define OPPONENT_SOPHIA 561
#define OPPONENT_CATHERINE_2 562
#define OPPONENT_CATHERINE_3 563
#define OPPONENT_CATHERINE_4 564
#define OPPONENT_CATHERINE_5 565
#define OPPONENT_JULIO 566
#define OPPONENT_GRUNT_27 567
#define OPPONENT_GRUNT_28 568
#define OPPONENT_GRUNT_29 569
#define OPPONENT_GRUNT_30 570
#define OPPONENT_MARC 571
#define OPPONENT_BRENDEN 572
#define OPPONENT_LILITH 573
#define OPPONENT_CRISTIAN 574
#define OPPONENT_SYLVIA 575
#define OPPONENT_LEONARDO 576
#define OPPONENT_ATHENA 577
#define OPPONENT_HARRISON 578
#define OPPONENT_GRUNT_31 579
#define OPPONENT_CLARENCE 580
#define OPPONENT_TERRY 581
#define OPPONENT_NATE 582
#define OPPONENT_KATHLEEN 583
#define OPPONENT_CLIFFORD 584
#define OPPONENT_NICHOLAS 585
#define OPPONENT_GRUNT_32 586
#define OPPONENT_GRUNT_33 587
#define OPPONENT_GRUNT_34 588
#define OPPONENT_GRUNT_35 589
#define OPPONENT_GRUNT_36 590
#define OPPONENT_MACEY 591
#define OPPONENT_BRENDAN_10 592
#define OPPONENT_BRENDAN_11 593
#define OPPONENT_PAXTON 594
#define OPPONENT_ISABELLA 595
#define OPPONENT_GRUNT_37 596
#define OPPONENT_TABITHA_2 597
#define OPPONENT_JONATHAN 598
#define OPPONENT_BRENDAN_12 599
#define OPPONENT_MAY_10 600
#define OPPONENT_MAXIE_1 601
#define OPPONENT_MAXIE_2 602
#define OPPONENT_TIANA 603
#define OPPONENT_HALEY_1 604
#define OPPONENT_JANICE 605
#define OPPONENT_VIVI 606
#define OPPONENT_HALEY_2 607
#define OPPONENT_HALEY_3 608
#define OPPONENT_HALEY_4 609
#define OPPONENT_HALEY_5 610
#define OPPONENT_SALLY 611
#define OPPONENT_ROBIN 612
#define OPPONENT_ANDREA 613
#define OPPONENT_CRISSY 614
#define OPPONENT_RICK 615
#define OPPONENT_LYLE 616
#define OPPONENT_JOSE 617
#define OPPONENT_DOUG 618
#define OPPONENT_GREG 619
#define OPPONENT_KENT 620
#define OPPONENT_JAMES_1 621
#define OPPONENT_JAMES_2 622
#define OPPONENT_JAMES_3 623
#define OPPONENT_JAMES_4 624
#define OPPONENT_JAMES_5 625
#define OPPONENT_BRICE 626
#define OPPONENT_TRENT_1 627
#define OPPONENT_LENNY 628
#define OPPONENT_LUCAS_1 629
#define OPPONENT_ALAN 630
#define OPPONENT_CLARK 631
#define OPPONENT_ERIC 632
#define OPPONENT_LUCAS_2 633
#define OPPONENT_MIKE_1 634
#define OPPONENT_MIKE_2 635
#define OPPONENT_TRENT_2 636
#define OPPONENT_TRENT_3 637
#define OPPONENT_TRENT_4 638
#define OPPONENT_TRENT_5 639
#define OPPONENT_DEZ_AND_LUKE 640
#define OPPONENT_LEA_AND_JED 641
#define OPPONENT_KIRA_AND_DAN_1 642
#define OPPONENT_KIRA_AND_DAN_2 643
#define OPPONENT_KIRA_AND_DAN_3 644
#define OPPONENT_KIRA_AND_DAN_4 645
#define OPPONENT_KIRA_AND_DAN_5 646
#define OPPONENT_JOHANNA 647
#define OPPONENT_GERALD 648
#define OPPONENT_VIVIAN 649
#define OPPONENT_DANIELLE 650
#define OPPONENT_HIDEO 651
#define OPPONENT_KEIGO 652
#define OPPONENT_RILEY 653
#define OPPONENT_FLINT 654
#define OPPONENT_ASHLEY 655
#define OPPONENT_WALLY_2 656
#define OPPONENT_WALLY_3 657
#define OPPONENT_WALLY_4 658
#define OPPONENT_WALLY_5 659
#define OPPONENT_WALLY_6 660
#define OPPONENT_BRENDAN_13 661
#define OPPONENT_BRENDAN_14 662
#define OPPONENT_BRENDAN_15 663
#define OPPONENT_MAY_11 664
#define OPPONENT_MAY_12 665
#define OPPONENT_MAY_13 666
#define OPPONENT_JONAH 667
#define OPPONENT_HENRY 668
#define OPPONENT_ROGER 669
#define OPPONENT_ALEXA 670
#define OPPONENT_RUBEN 671
#define OPPONENT_KOJI_1 672
#define OPPONENT_WAYNE 673
#define OPPONENT_AIDAN 674
#define OPPONENT_REED 675
#define OPPONENT_TISHA 676
#define OPPONENT_TORI_AND_TIA 677
#define OPPONENT_KIM_AND_IRIS 678
#define OPPONENT_TYRA_AND_IVY 679
#define OPPONENT_MEL_AND_PAUL 680
#define OPPONENT_JOHN_AND_JAY_1 681
#define OPPONENT_JOHN_AND_JAY_2 682
#define OPPONENT_JOHN_AND_JAY_3 683
#define OPPONENT_JOHN_AND_JAY_4 684
#define OPPONENT_JOHN_AND_JAY_5 685
#define OPPONENT_RELI_AND_IAN 686
#define OPPONENT_LILA_AND_ROY_1 687
#define OPPONENT_LILA_AND_ROY_2 688
#define OPPONENT_LILA_AND_ROY_3 689
#define OPPONENT_LILA_AND_ROY_4 690
#define OPPONENT_LILA_AND_ROY_5 691
#define OPPONENT_LISA_AND_RAY 692
#define OPPONENT_CHRIS 693
#define OPPONENT_DAWSON 694
#define OPPONENT_SARAH 695
#define OPPONENT_DARIAN 696
#define OPPONENT_HAILEY 697
#define OPPONENT_CHANDLER 698
#define OPPONENT_KALEB 699
#define OPPONENT_JOSEPH 700
#define OPPONENT_ALYSSA 701
#define OPPONENT_MARCOS 702
#define OPPONENT_RHETT 703
#define OPPONENT_TYRON 704
#define OPPONENT_CELINA 705
#define OPPONENT_BIANCA 706
#define OPPONENT_HAYDEN 707
#define OPPONENT_SOPHIE 708
#define OPPONENT_COBY 709
#define OPPONENT_LAWRENCE 710
#define OPPONENT_WYATT 711
#define OPPONENT_ANGELINA 712
#define OPPONENT_KAI 713
#define OPPONENT_CHARLOTTE 714
#define OPPONENT_DEANDRE 715
#define OPPONENT_GRUNT_38 716
#define OPPONENT_GRUNT_39 717
#define OPPONENT_GRUNT_40 718
#define OPPONENT_GRUNT_41 719
#define OPPONENT_GRUNT_42 720
#define OPPONENT_GRUNT_43 721
#define OPPONENT_GRUNT_44 722
#define OPPONENT_GRUNT_45 723
#define OPPONENT_GRUNT_46 724
#define OPPONENT_GRUNT_47 725
#define OPPONENT_GRUNT_48 726
#define OPPONENT_GRUNT_49 727
#define OPPONENT_GRUNT_50 728
#define OPPONENT_GRUNT_51 729
#define OPPONENT_GRUNT_52 730
#define OPPONENT_GRUNT_53 731
#define OPPONENT_TABITHA_3 732
#define OPPONENT_DARCY 733
#define OPPONENT_MAXIE_3 734
#define OPPONENT_PETE 735
#define OPPONENT_ISABELLE 736
#define OPPONENT_ANDRES_1 737
#define OPPONENT_JOSUE 738
#define OPPONENT_CAMRON 739
#define OPPONENT_CORY_1 740
#define OPPONENT_CAROLINA 741
#define OPPONENT_ELIJAH 742
#define OPPONENT_CELIA 743
#define OPPONENT_BRYAN 744
#define OPPONENT_BRANDEN 745
#define OPPONENT_BRYANT 746
#define OPPONENT_SHAYLA 747
#define OPPONENT_KYRA 748
#define OPPONENT_JAIDEN 749
#define OPPONENT_ALIX 750
#define OPPONENT_HELENE 751
#define OPPONENT_MARLENE 752
#define OPPONENT_DEVAN 753
#define OPPONENT_JOHNSON 754
#define OPPONENT_MELINA 755
#define OPPONENT_BRANDI 756
#define OPPONENT_AISHA 757
#define OPPONENT_MAKAYLA 758
#define OPPONENT_FABIAN 759
#define OPPONENT_DAYTON 760
#define OPPONENT_RACHEL 761
#define OPPONENT_LEONEL 762
#define OPPONENT_CALLIE 763
#define OPPONENT_CALE 764
#define OPPONENT_MYLES 765
#define OPPONENT_PAT 766
#define OPPONENT_CRISTIN_1 767
#define OPPONENT_MAY_14 768
#define OPPONENT_MAY_15 769
#define OPPONENT_ROXANNE_2 770
#define OPPONENT_ROXANNE_3 771
#define OPPONENT_ROXANNE_4 772
#define OPPONENT_ROXANNE_5 773
#define OPPONENT_BRAWLY_2 774
#define OPPONENT_BRAWLY_3 775
#define OPPONENT_BRAWLY_4 776
#define OPPONENT_BRAWLY_5 777
#define OPPONENT_WATTSON_2 778
#define OPPONENT_WATTSON_3 779
#define OPPONENT_WATTSON_4 780
#define OPPONENT_WATTSON_5 781
#define OPPONENT_FLANNERY_2 782
#define OPPONENT_FLANNERY_3 783
#define OPPONENT_FLANNERY_4 784
#define OPPONENT_FLANNERY_5 785
#define OPPONENT_NORMAN_2 786
#define OPPONENT_NORMAN_3 787
#define OPPONENT_NORMAN_4 788
#define OPPONENT_NORMAN_5 789
#define OPPONENT_WINONA_2 790
#define OPPONENT_WINONA_3 791
#define OPPONENT_WINONA_4 792
#define OPPONENT_WINONA_5 793
#define OPPONENT_TATE_AND_LIZA_2 794
#define OPPONENT_TATE_AND_LIZA_3 795
#define OPPONENT_TATE_AND_LIZA_4 796
#define OPPONENT_TATE_AND_LIZA_5 797
#define OPPONENT_JUAN_2 798
#define OPPONENT_JUAN_3 799
#define OPPONENT_JUAN_4 800
#define OPPONENT_JUAN_5 801
#define OPPONENT_ANGELO 802
#define OPPONENT_DARIUS 803
#define OPPONENT_STEVEN 804
#define OPPONENT_ANABEL 805
#define OPPONENT_TUCKER 806
#define OPPONENT_SPENSER 807
#define OPPONENT_GRETA 808
#define OPPONENT_NOLAND 809
#define OPPONENT_LUCY 810
#define OPPONENT_BRANDON 811
#define OPPONENT_ANDRES_2 812
#define OPPONENT_ANDRES_3 813
#define OPPONENT_ANDRES_4 814
#define OPPONENT_ANDRES_5 815
#define OPPONENT_CORY_2 816
#define OPPONENT_CORY_3 817
#define OPPONENT_CORY_4 818
#define OPPONENT_CORY_5 819
#define OPPONENT_PABLO_2 820
#define OPPONENT_PABLO_3 821
#define OPPONENT_PABLO_4 822
#define OPPONENT_PABLO_5 823
#define OPPONENT_KOJI_2 824
#define OPPONENT_KOJI_3 825
#define OPPONENT_KOJI_4 826
#define OPPONENT_KOJI_5 827
#define OPPONENT_CRISTIN_2 828
#define OPPONENT_CRISTIN_3 829
#define OPPONENT_CRISTIN_4 830
#define OPPONENT_CRISTIN_5 831
#define OPPONENT_FERNANDO_2 832
#define OPPONENT_FERNANDO_3 833
#define OPPONENT_FERNANDO_4 834
#define OPPONENT_FERNANDO_5 835
#define OPPONENT_SAWYER_2 836
#define OPPONENT_SAWYER_3 837
#define OPPONENT_SAWYER_4 838
#define OPPONENT_SAWYER_5 839
#define OPPONENT_GABRIELLE_2 840
#define OPPONENT_GABRIELLE_3 841
#define OPPONENT_GABRIELLE_4 842
#define OPPONENT_GABRIELLE_5 843
#define OPPONENT_THALIA_2 844
#define OPPONENT_THALIA_3 845
#define OPPONENT_THALIA_4 846
#define OPPONENT_THALIA_5 847
#define OPPONENT_MARIELA 848
#define OPPONENT_ALVARO 848
#define OPPONENT_EVERETT 850
#define OPPONENT_RED 851
#define OPPONENT_LEAF 852
#define OPPONENT_BRENDAN_16 853
#define OPPONENT_MAY_16 854
#endif // GUARD_CONSTANTS_OPPONENTS_H
include/constants/vars.h
+1 -2
View File
@@ -51,8 +51,7 @@
#define VAR_0x402D 0x402D
#define VAR_0x402E 0x402E
#define VAR_FRONTIER_MANIAC_FACILITY 0x402F
#define VAR_FRONTIER_MANIAC_FACILITY 0x402F
#define VAR_FRONTIER_GAMBLER_FACILITY 0x4030
#define VAR_FRONTIER_GAMBLER_SET_FACILITY_F 0x4031
#define VAR_FRONTIER_GAMBLER_AMOUNT_BET 0x4032
include/data/pokedex_orders.h
+1199
View File
File diff suppressed because it is too large Load Diff
include/field_effect.h
+2
View File
@@ -75,5 +75,7 @@ u32 FieldEffectStart(u8);
bool8 FieldEffectActiveListContains(u8 id);
void sub_80B69DC(void);
void FieldEffectStop(struct Sprite *sprite, u8 id);
void sub_80B7FC8(void);
void FieldEffectActiveListRemove(u8 id);
#endif //GUARD_FIELD_EFFECTS_H
include/field_player_avatar.h
+21
View File
@@ -9,6 +9,27 @@ void PlayerGetDestCoords(s16 *, s16 *);
u8 player_get_direction_lower_nybble(void);
u8 player_get_direction_upper_nybble(void);
u8 player_get_x22(void);
void PlayerGoSpeed1(u8);
void PlayerGoSpeed2(u8);
void PlayerGoSpeed3(u8);
void PlayerGoSpeed4(u8);
void PlayerOnBikeCollide(u8);
void PlayerFaceDirection(u8 a);
void PlayerTurnInPlace(u8 a);
void PlayerJumpLedge(u8 a);
void PlayerIdleWheelie(u8 a);
void PlayerStartWheelie(u8 a);
void PlayerEndWheelie(u8 a);
void PlayerStandingHoppingWheelie(u8 a);
void PlayerMovingHoppingWheelie(u8 a);
void PlayerLedgeHoppingWheelie(u8 a);
void PlayerAcroTurnJump(u8 a);
void PlayerSetAnimId(u8 a, u8 b);
bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction);
void PlayerOnBikeCollideWithFarawayIslandMew(u8 direction);
u8 CheckForFieldObjectCollision(struct MapObject *a, s16 b, s16 c, u8 d, u8 e);
u8 PlayerGetZCoord(void);
void SetPlayerAvatarTransitionFlags(u16 a);
void sub_808BCE8(void);
void sub_808D074(u8);
include/fldeff_teleport.h
+7
View File
@@ -0,0 +1,7 @@
#ifndef GUARD_FLDEFF_TELEPORT_H
#define GUARD_FLDEFF_TELEPORT_H
void hm_teleport_run_dp02scr(void);
void sub_817C94C(void);
#endif // GUARD_FLDEFF_TELEPORT_H
include/global.fieldmap.h
+31 -14
View File
@@ -299,25 +299,42 @@ enum
COLLISION_LEDGE_JUMP = 6
};
struct PlayerAvatar /* 0x202E858 */
// player running states
enum
{
NOT_MOVING,
TURN_DIRECTION, // not the same as turning! turns your avatar without moving. also known as a turn frame in some circles
MOVING,
};
// player tile transition states
enum
{
T_NOT_MOVING,
T_TILE_TRANSITION,
T_TILE_CENTER, // player is on a frame in which they are centered on a tile during which the player either stops or keeps their momentum and keeps going, changing direction if necessary.
};
struct PlayerAvatar
{
/*0x00*/ u8 flags;
/*0x01*/ u8 bike;
/*0x02*/ u8 running2;
/*0x03*/ u8 running1;
/*0x01*/ u8 unk1; // used to be named bike, but its definitely not that. seems to be some transition flags
/*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving.
/*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning.
/*0x04*/ u8 spriteId;
/*0x05*/ u8 mapObjectId;
/*0x06*/ u8 unk6;
/*0x06*/ bool8 preventStep;
/*0x07*/ u8 gender;
u8 acroBikeState;
u8 unk9;
u8 bikeFrameCounter;
u8 unkB;
u32 unkC;
u32 unk10;
u8 unk14[8];
u8 unk1C[8];
// TODO: rest of struct
/*0x08*/ u8 acroBikeState; // 00 is normal, 01 is turning, 02 is standing wheelie, 03 is hopping wheelie
/*0x09*/ u8 newDirBackup; // during bike movement, the new direction as opposed to player's direction is backed up here.
/*0x0A*/ u8 bikeFrameCounter; // on the mach bike, when this value is 1, the bike is moving but not accelerating yet for 1 tile. on the acro bike, this acts as a timer for acro bike.
/*0x0B*/ u8 bikeSpeed;
// acro bike only
/*0x0C*/ u32 directionHistory; // up/down/left/right history is stored in each nybble, but using the field directions and not the io inputs.
/*0x10*/ u32 abStartSelectHistory; // same as above but for A + B + start + select only
// these two are timer history arrays which [0] is the active timer for acro bike. every element is backed up to the next element upon update.
/*0x14*/ u8 dirTimerHistory[8];
/*0x1C*/ u8 abStartSelectTimerHistory[8];
};
struct Camera
include/global.h
+2
View File
@@ -31,6 +31,8 @@ char* strcpy(char *dst0, const char *src0);
#define POKEMON_NAME_LENGTH 10
#define OT_NAME_LENGTH 7
#define HEAP_SIZE 0x1C000
extern u8 gStringVar1[];
extern u8 gStringVar2[];
extern u8 gStringVar3[];
include/graphics.h
+2458 -21
View File
File diff suppressed because it is too large Load Diff
include/overworld.h
+3
View File
@@ -42,6 +42,9 @@ void sub_8084EBC(s16, s16);
void player_avatar_init_params_reset(void);
bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType);
void Overworld_ResetStateAfterTeleport(void);
void Overworld_SetFlashLevel(s32 a1);
//u8 Overworld_GetFlashLevel(void);
void sub_8085524(u16);
include/party_menu.h
+2
View File
@@ -16,5 +16,7 @@ void sub_81B58A8(void);
void DoWallyTutorialBagMenu(void);
u8 pokemon_ailments_get_primary(u32 status);
u8 *GetMonNickname(struct Pokemon *mon, u8 *dst);
u8 GetCursorSelectionMonId(void);
bool8 FieldCallback_Teleport(void);
#endif // GUARD_PARTY_MENU_H
include/rom6.h
+1
View File
@@ -11,5 +11,6 @@ void UpdateBirchState(u16 days);
void UpdateFrontierManiac(u16 days);
void UpdateFrontierGambler(u16 days);
void SetShoalItemFlag(u16 days);
u8 oei_task_add(void);
#endif //GUARD_ROM6_H
include/sprite.h
-4
View File
@@ -120,10 +120,6 @@ union AffineAnimCmd
{.jump = {.type = AFFINEANIMCMDTYPE_JUMP, .target = _target}}
#define AFFINEANIMCMD_END \
{.type = AFFINEANIMCMDTYPE_END}
#define AFFINEANIMCMD_LOOP(_count) \
{.loop = {.type = AFFINEANIMCMDTYPE_LOOP, .count = _count}}
#define AFFINEANIMCMD_JUMP(_target) \
{.jump = {.type = AFFINEANIMCMDTYPE_JUMP, .target = _target}}
struct AffineAnimState
{
include/strings.h
+33
View File
@@ -137,4 +137,37 @@ extern const u8 gMenuText_Give2[];
extern const u8 gText_Cancel2[];
extern const u8 gText_WithdrawPokemon[];
extern const u8 gText_WithdrawMonDescription[];
extern const u8 gText_DepositPokemon[];
extern const u8 gText_DepositMonDescription[];
extern const u8 gText_MovePokemon[];
extern const u8 gText_MoveMonDescription[];
extern const u8 gText_MoveItems[];
extern const u8 gText_MoveItemsDescription[];
extern const u8 gText_SeeYa[];
extern const u8 gText_SeeYaDescription[];
// menu texts
extern const u8 gText_MenuPokedex[];
extern const u8 gText_MenuPokemon[];
extern const u8 gText_MenuBag[];
extern const u8 gText_MenuPokenav[];
extern const u8 gText_MenuPlayer[];
extern const u8 gText_MenuSave[];
extern const u8 gText_MenuOption[];
extern const u8 gText_MenuExit[];
extern const u8 gText_MenuRetire[];
extern const u8 gText_MenuRest[];
extern const u8 gText_Floor1[];
extern const u8 gText_Floor2[];
extern const u8 gText_Floor3[];
extern const u8 gText_Floor4[];
extern const u8 gText_Floor5[];
extern const u8 gText_Floor6[];
extern const u8 gText_Floor7[];
extern const u8 gText_Peak[];
extern const u8 gText_SafariBallStock[];
extern const u8 gText_BattlePyramidFloor[];
#endif //GUARD_STRINGS_H