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

Finish decompiling field_specials

Browse Source
This commit is contained in:
Diegoisawesome
2018-08-11 14:51:54 -07:00
parent 1e0f3ec433
commit b54793be91
15 changed files with 1060 additions and 1897 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/cable_club.h
+3
View File
@@ -1,6 +1,8 @@
#ifndef GUARD_CABLE_CLUB_H
#define GUARD_CABLE_CLUB_H
#include "task.h"
// Exported type declarations
// Exported RAM declarations
@@ -11,5 +13,6 @@ void sub_80B37D4(TaskFunc taskFunc);
u8 sub_80B3050(void);
void sub_80B360C(void);
bool32 sub_80B2AF4(u16 *arg0, u16 *arg1);
void sub_80B3AF8(u8 taskId);
#endif //GUARD_CABLE_CLUB_H
include/constants/flags.h
+4 -4
View File
@@ -790,10 +790,10 @@
#define FLAG_0x312 0x312
#define FLAG_0x313 0x313
#define FLAG_0x314 0x314
#define FLAG_0x315 0x315
#define FLAG_0x316 0x316
#define FLAG_0x317 0x317
#define FLAG_0x318 0x318
#define FLAG_HIDE_FANCLUB_OLD_LADY 0x315
#define FLAG_HIDE_FANCLUB_BOY 0x316
#define FLAG_HIDE_FANCLUB_LITTLE_BOY 0x317
#define FLAG_HIDE_FANCLUB_LADY 0x318
#define FLAG_0x319 0x319
#define FLAG_0x31A 0x31A
#define FLAG_0x31B 0x31B
include/constants/vars.h
+3 -3
View File
@@ -81,8 +81,8 @@
#define VAR_ALTERING_CAVE_WILD_SET 0x403E
#define VAR_0x403F 0x403F
#define VAR_DAYS 0x4040
#define VAR_0x4041 0x4041
#define VAR_0x4042 0x4042
#define VAR_FANCLUB_UNKNOWN_1 0x4041
#define VAR_FANCLUB_UNKNOWN_2 0x4042
#define VAR_DEPT_STORE_FLOOR 0x4043
#define VAR_0x4044 0x4044
#define VAR_POKELOT_PRIZE 0x4045
@@ -165,7 +165,7 @@
#define VAR_0x4092 0x4092
#define VAR_0x4093 0x4093
#define VAR_0x4094 0x4094
#define VAR_0x4095 0x4095
#define VAR_LILYCOVE_FAN_CLUB_STATE 0x4095
#define VAR_0x4096 0x4096
#define VAR_0x4097 0x4097
#define VAR_0x4098 0x4098
include/field_screen.h
+1
View File
@@ -15,5 +15,6 @@ void sub_80AC3D0(void);
void sub_80AC3E4(void);
void PreservePaletteInWeather(u8);
void sub_80AF128(void);
void sub_80AB104(u8);
#endif //GUARD_FIELD_SCREEN_H
include/global.h
+10
View File
@@ -163,6 +163,16 @@ enum
OPTIONS_BATTLE_STYLE_SET
};
struct Coords8 {
s8 x;
s8 y;
};
struct UCoords8 {
u8 x;
u8 y;
};
struct Coords16
{
s16 x;
include/match_call.h
+2
View File
@@ -10,4 +10,6 @@ enum {
MATCH_CALL_TYPE_GYMLEADER_ELITEFOUR
};
s32 GetRematchIdxByTrainerIdx(s32 trainerIdx);
#endif //GUARD_MATCH_CALL_H
include/strings.h
+9
View File
@@ -753,4 +753,13 @@ extern const u8 BattleFrontier_Lounge7_Text_26615F[];
extern const u8 BattleFrontier_Lounge7_Text_266185[];
extern const u8 BattleFrontier_Lounge7_Text_2661B5[];
extern const u8 gText_YourPartnerHasRetired[];
extern const u8 gText_Wallace[];
extern const u8 gText_Steven[];
extern const u8 gText_Brawly[];
extern const u8 gText_Winona[];
extern const u8 gText_Phoebe[];
extern const u8 gText_Glacia[];
#endif //GUARD_STRINGS_H