ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changes from review

Browse Source
This commit is contained in:
GriffinR 2019-08-18 01:35:30 -04:00 committed by huderlem
parent 5fb7ab05dd
commit f08615881e
4 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data/event_scripts.s
View File

@ -1,6 +1,7 @@
#include "constants/global.h" #include "constants/global.h"
#include "constants/battle_frontier.h" #include "constants/battle_frontier.h"
#include "constants/battle_setup.h" #include "constants/battle_setup.h"
#include "constants/contest.h"
#include "constants/easy_chat.h" #include "constants/easy_chat.h"
#include "constants/event_objects.h" #include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h" #include "constants/event_object_movement_constants.h"
@ -4818,15 +4819,15 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A89C7:: @ 82A89C7
specialvar VAR_RESULT, GetContestLadyCategory specialvar VAR_RESULT, GetContestLadyCategory
special Script_BufferContestLadyCategoryAndMonName special Script_BufferContestLadyCategoryAndMonName
special GetContestLadyMonSpecies special GetContestLadyMonSpecies
compare VAR_RESULT, 0 @CONTEST_CATEGORY_COOL compare VAR_RESULT, CONTEST_CATEGORY_COOL
goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A0A goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A0A
compare VAR_RESULT, 1 @CONTEST_CATEGORY_BEAUTY compare VAR_RESULT, CONTEST_CATEGORY_BEAUTY
goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A1D goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A1D
compare VAR_RESULT, 2 @CONTEST_CATEGORY_CUTE compare VAR_RESULT, CONTEST_CATEGORY_CUTE
goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A30 goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A30
compare VAR_RESULT, 3 @CONTEST_CATEGORY_SMART compare VAR_RESULT, CONTEST_CATEGORY_SMART
goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A43 goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A43
compare VAR_RESULT, 4 @CONTEST_CATEGORY_TOUGH compare VAR_RESULT, CONTEST_CATEGORY_TOUGH
goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A56 goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A56
end end

19
include/constants/contest.h Normal file
View File

@ -0,0 +1,19 @@
#ifndef GUARD_CONSTANTS_CONTEST_H
#define GUARD_CONSTANTS_CONTEST_H
#define CONTESTANT_COUNT 4
#define APPLAUSE_METER_SIZE 5
#define CONTEST_TURN_COUNT 5
#define LINK_CONTEST_FLAG_IS_LINK (1 << 0)
#define LINK_CONTEST_FLAG_IS_WIRELESS (1 << 1)
#define LINK_CONTEST_FLAG_HAS_RS_PLAYER (1 << 2)
#define CONTEST_CATEGORY_COOL 0
#define CONTEST_CATEGORY_BEAUTY 1
#define CONTEST_CATEGORY_CUTE 2
#define CONTEST_CATEGORY_SMART 3
#define CONTEST_CATEGORY_TOUGH 4
#define CONTEST_CATEGORIES_COUNT 5
#endif // GUARD_CONSTANTS_CONTEST_H

19
include/contest.h
View File

@ -2,10 +2,7 @@
#define GUARD_CONTEST_H #define GUARD_CONTEST_H
#include "palette.h" #include "palette.h"
#include "constants/contest.h"
#define CONTESTANT_COUNT 4
#define APPLAUSE_METER_SIZE 5
#define CONTEST_TURN_COUNT 5
enum enum
{ {
@ -18,20 +15,6 @@ enum
CONTEST_DEBUG_MODE_PRINT_UNK_D CONTEST_DEBUG_MODE_PRINT_UNK_D
}; };
#define LINK_CONTEST_FLAG_IS_LINK (1 << 0)
#define LINK_CONTEST_FLAG_IS_WIRELESS (1 << 1)
#define LINK_CONTEST_FLAG_HAS_RS_PLAYER (1 << 2)
enum
{
CONTEST_CATEGORY_COOL,
CONTEST_CATEGORY_BEAUTY,
CONTEST_CATEGORY_CUTE,
CONTEST_CATEGORY_SMART,
CONTEST_CATEGORY_TOUGH,
CONTEST_CATEGORIES_COUNT,
};
enum enum
{ {
CONTEST_EFFECT_HIGHLY_APPEALING, CONTEST_EFFECT_HIGHLY_APPEALING,

1
src/lilycove_lady.c
View File

@ -17,6 +17,7 @@
#include "contest.h" #include "contest.h"
#include "strings.h" #include "strings.h"
#include "constants/lilycove_lady.h" #include "constants/lilycove_lady.h"
#include "data/lilycove_lady.h" #include "data/lilycove_lady.h"
static void InitLilycoveQuizLady(void); static void InitLilycoveQuizLady(void);