ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use macros for summary windows

Browse Source 
Other minor changes and fixes are included
This commit is contained in:
Phlosioneer 2019-03-03 16:50:51 -05:00
parent 043071ae12
commit 63e700af6c
5 changed files with 627 additions and 569 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle_tent.h
View File

@ -1,6 +1,6 @@
#ifndef GUARD_BATTLE_TENT_H #ifndef GUARD_BATTLE_TENT_H
#define GUARD_BATTLE_TENT_H #define GUARD_BATTLE_TENT_H
bool8 sub_81B9E94(void); bool8 InSlateportBattleTent(void);
#endif //GUARD_BATTLE_TENT_H #endif //GUARD_BATTLE_TENT_H

2
include/party_menu.h
View File

@ -62,7 +62,7 @@ u8 sub_81B1B5C(const u8* str, u8 b);
bool8 sub_81B1BD4(void); bool8 sub_81B1BD4(void);
void sub_81B1F18(u8 taskId, u8 slot, s8 c, s16 HPDifference, TaskFunc func); void sub_81B1F18(u8 taskId, u8 slot, s8 c, s16 HPDifference, TaskFunc func);
u8 pokemon_ailments_get_primary(u32 status); u8 pokemon_ailments_get_primary(u32 status);
u8 sub_81B205C(struct Pokemon *mon); u8 GetMonAilment(struct Pokemon *mon);
void display_pokemon_menu_message(u32 stringID); void display_pokemon_menu_message(u32 stringID);
void sub_81B47E0(u8 taskId); void sub_81B47E0(u8 taskId);
bool8 FieldCallback_PrepareFadeInFromMenu(void); bool8 FieldCallback_PrepareFadeInFromMenu(void);

2
src/battle_tent.c
View File

@ -269,7 +269,7 @@ static void sub_81B9E88(void)
DoBattleFactorySwapScreen(); DoBattleFactorySwapScreen();
} }
bool8 sub_81B9E94(void) bool8 InSlateportBattleTent(void)
{ {
return gMapHeader.regionMapSectionId == MAPSEC_SLATEPORT_CITY return gMapHeader.regionMapSectionId == MAPSEC_SLATEPORT_CITY
&& (gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_CORRIDOR || gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_BATTLE_ROOM); && (gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_CORRIDOR || gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_BATTLE_ROOM);

6
src/party_menu.c
View File

@ -2936,7 +2936,7 @@ u8 pokemon_ailments_get_primary(u32 status)
return AILMENT_NONE; return AILMENT_NONE;
} }
u8 sub_81B205C(struct Pokemon *mon) u8 GetMonAilment(struct Pokemon *mon)
{ {
u8 ailment; u8 ailment;
@ -3355,7 +3355,7 @@ static void DisplayPartyPokemonLevelCheck(struct Pokemon *mon, struct Struct203C
{ {
if (GetMonData(mon, MON_DATA_SPECIES) != SPECIES_NONE) if (GetMonData(mon, MON_DATA_SPECIES) != SPECIES_NONE)
{ {
u8 ailment = sub_81B205C(mon); u8 ailment = GetMonAilment(mon);
if (ailment == AILMENT_NONE || ailment == AILMENT_PKRS) if (ailment == AILMENT_NONE || ailment == AILMENT_PKRS)
{ {
if (c != 0) if (c != 0)
@ -5183,7 +5183,7 @@ static void party_menu_link_mon_status_condition_object(u16 species, u8 status,
static void party_menu_get_status_condition_and_update_object(struct Pokemon *mon, struct Struct203CEDC *ptr) static void party_menu_get_status_condition_and_update_object(struct Pokemon *mon, struct Struct203CEDC *ptr)
{ {
party_menu_update_status_condition_object(sub_81B205C(mon), ptr); party_menu_update_status_condition_object(GetMonAilment(mon), ptr);
} }
static void party_menu_update_status_condition_object(u8 status, struct Struct203CEDC *ptr) static void party_menu_update_status_condition_object(u8 status, struct Struct203CEDC *ptr)

1184
src/pokemon_summary_screen.c
View File

File diff suppressed because it is too large Load Diff