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

Expand MatchCallStruct defs, use REMATCH_* enum

Browse Source
This commit is contained in:
Phlosioneer
2019-04-02 03:22:07 -04:00
committed by huderlem
parent 65d8b68f9d
commit 6916f09cd5
5 changed files with 298 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/battle_setup.h
View File

@@ -1,10 +1,11 @@
#ifndef GUARD_BATTLE_SETUP_H
#define GUARD_BATTLE_SETUP_H
#include "gym_leader_rematch.h"
#define REMATCHES_COUNT 5
#define REMATCH_TABLE_ENTRIES 78
#define REMATCH_WALLY_ENTRY 64
#define REMATCH_ELITE_FOUR_ENTRIES 73
#define REMATCH_ELITE_FOUR_ENTRIES REMATCH_SIDNEY
struct RematchTrainer
{

13
include/constants/flags.h
View File

@@ -445,13 +445,14 @@
#define FLAG_REMATCH_NORMAN 0x1A2
#define FLAG_REMATCH_WINONA 0x1A3
#define FLAG_REMATCH_TATE_AND_LIZA 0x1A4
#define FLAG_REMATCH_JUAN 0x1A5
#define FLAG_REMATCH_SIDNEY 0x1A6
#define FLAG_REMATCH_PHOEBE 0x1A7
#define FLAG_REMATCH_GLACIA 0x1A8
#define FLAG_REMATCH_DRAKE 0x1A9
#define FLAG_REMATCH_WALLACE 0x1AA
// Note: FLAG_REMATCH_JUAN is handled by FLAG_ENABLE_JUAN_MATCH_CALL instead.
#define FLAG_REMATCH_SIDNEY 0x1A5
#define FLAG_REMATCH_PHOEBE 0x1A6
#define FLAG_REMATCH_GLACIA 0x1A7
#define FLAG_REMATCH_DRAKE 0x1A8
#define FLAG_REMATCH_WALLACE 0x1A9
#define FLAG_UNUSED_0x1AA 0x1AA // Unused Flag
#define FLAG_UNUSED_0x1AB 0x1AB // Unused Flag
#define FLAG_DEFEATED_DEOXYS 0x1AC

2
include/gym_leader_rematch.h
View File

@@ -75,6 +75,8 @@ enum {
REMATCH_WINONA,
REMATCH_TATE_AND_LIZA,
REMATCH_JUAN,
// Entries below SIDNEY are considered part of REMATCH_ELITE_FOUR_ENTRIES.
REMATCH_SIDNEY,
REMATCH_PHOEBE,
REMATCH_GLACIA,