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

Remove deadnaming, sync BgEvent

Browse Source
This commit is contained in:
GriffinR
2020-12-31 14:27:46 -05:00
parent d74f739e05
commit ef60edd933
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
berry_fix/payload/include/global.fieldmap.h
View File

@@ -79,23 +79,16 @@ struct CoordEvent
struct BgEvent struct BgEvent
{ {
/*0x00*/u16 x; u16 x, y;
/*0x02*/u16 y; u8 elevation;
/*0x04*/u8 elevation; u8 kind; // The "kind" field determines how to access bgUnion union below.
/*0x05*/u8 kind; union {
/*0x08*/union { // carried over from diego's FR/LG work, seems to be the same struct
// in gen 3, "kind" (0x3 in BgEvent struct) determines the method to read the union.
u8 *script; u8 *script;
// hidden item type
struct { struct {
u16 item; u16 item;
u16 hiddenItemId; // flag offset to determine flag lookup u16 hiddenItemId;
} hiddenItem; } hiddenItem;
// secret base type
u32 secretBaseId; u32 secretBaseId;
} bgUnion; } bgUnion;
}; };

8
tools/gbafix/gbafix.c
View File

@@ -28,14 +28,14 @@
// gbafix.c // gbafix.c
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------
/* /*
Gameboy Advance ROM fixer (by Dark Fader / BlackThunder / WinterMute / Diegoisawesome) Gameboy Advance ROM fixer (by Dark Fader / BlackThunder / WinterMute / Sierraffinity)
Validates header of GBA roms. Validates header of GBA roms.
History History
------- -------
v1.07 - added support for ELF input, (PikalaxALT) v1.07 - added support for ELF input, (PikalaxALT)
v1.06 - added output silencing, (Diegoisawesome) v1.06 - added output silencing, (Sierraffinity)
v1.05 - added debug offset argument, (Diegoisawesome) v1.05 - added debug offset argument, (Sierraffinity)
v1.04 - converted to plain C, (WinterMute) v1.04 - converted to plain C, (WinterMute)
v1.03 - header.fixed, header.device_type v1.03 - header.fixed, header.device_type
v1.02 - redefined the options (rgbfix style), checksum=0 v1.02 - redefined the options (rgbfix style), checksum=0
@@ -146,7 +146,7 @@ int main(int argc, char *argv[])
// show syntax // show syntax
if (argc <= 1) if (argc <= 1)
{ {
printf("GBA ROM fixer v"VER" by Dark Fader / BlackThunder / WinterMute / Diegoisawesome \n"); printf("GBA ROM fixer v"VER" by Dark Fader / BlackThunder / WinterMute / Sierraffinity \n");
printf("Syntax: gbafix <rom.gba> [-p] [-t[title]] [-c<game_code>] [-m<maker_code>] [-r<version>] [-d<debug>] [--silent]\n"); printf("Syntax: gbafix <rom.gba> [-p] [-t[title]] [-c<game_code>] [-m<maker_code>] [-r<version>] [-d<debug>] [--silent]\n");
printf("\n"); printf("\n");
printf("parameters:\n"); printf("parameters:\n");