dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix scrcmd names and define world map flags

Browse Source
This commit is contained in:
PikalaxALT
2019-05-14 16:45:10 -04:00
parent 683c9edf34
commit efbbd67f81
3 changed files with 71 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/script_cmd_table.inc
+8 -8
View File
@@ -200,17 +200,17 @@ gScriptCmdTable:: @ 815F9B4
.4byte ScrCmd_setescapewarp
.4byte ScrCmd_waitmoncry
.4byte ScrCmd_bufferboxname
.4byte ScrCmd_cmdC7
.4byte ScrCmd_cmdC8
.4byte ScrCmd_cmdC9
.4byte ScrCmd_cmdCA
.4byte ScrCmd_cmdCB
.4byte ScrCmd_textcolor
.4byte ScrCmd_loadhelp
.4byte ScrCmd_unloadhelp
.4byte ScrCmd_signmsg
.4byte ScrCmd_normalmsg
.4byte ScrCmd_comparestattoword
.4byte ScrCmd_setmonobedient
.4byte ScrCmd_checkmonobedience
.4byte ScrCmd_cmdCF
.4byte ScrCmd_cmdD0
.4byte ScrCmd_warpD1
.4byte ScrCmd_execram
.4byte ScrCmd_setworldmapflag
.4byte ScrCmd_warpteleport2
.4byte ScrCmd_setmonmetlocation
.4byte ScrCmd_getbraillestringwidth
.4byte ScrCmd_bufferitemnameplural
include/constants/flags.h
+55
View File
@@ -1,6 +1,61 @@
#ifndef GUARD_CONSTANTS_FLAGS_H
#define GUARD_CONSTANTS_FLAGS_H
// World Map Flags
#define FLAG_WORLD_MAP_PALLET_TOWN 0x890
#define FLAG_WORLD_MAP_VIRIDIAN_CITY 0x891
#define FLAG_WORLD_MAP_PEWTER_CITY 0x892
#define FLAG_WORLD_MAP_CERULEAN_CITY 0x893
#define FLAG_WORLD_MAP_LAVENDER_TOWN 0x894
#define FLAG_WORLD_MAP_VERMILION_CITY 0x895
#define FLAG_WORLD_MAP_CELADON_CITY 0x896
#define FLAG_WORLD_MAP_FUCHSIA_CITY 0x897
#define FLAG_WORLD_MAP_CINNABAR_ISLAND 0x898
#define FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR 0x899
#define FLAG_WORLD_MAP_SAFFRON_CITY_DUPLICATE 0x89a
#define FLAG_WORLD_MAP_ONE_ISLAND 0x89b
#define FLAG_WORLD_MAP_TWO_ISLAND 0x89c
#define FLAG_WORLD_MAP_THREE_ISLAND 0x89d
#define FLAG_WORLD_MAP_FOUR_ISLAND 0x89e
#define FLAG_WORLD_MAP_FIVE_ISLAND 0x89f
#define FLAG_WORLD_MAP_SEVEN_ISLAND 0x8a0
#define FLAG_WORLD_MAP_SIX_ISLAND 0x8a1
#define FLAG_WORLD_MAP_ROUTE4_POKEMON_CENTER_1F 0x8a2
#define FLAG_WORLD_MAP_ROUTE10_POKEMON_CENTER_1F 0x8a3
#define FLAG_WORLD_MAP_VIRIDIAN_FOREST 0x8a4
#define FLAG_WORLD_MAP_MT_MOON_1F 0x8a5
#define FLAG_WORLD_MAP_SSANNE_EXTERIOR 0x8a6
#define FLAG_WORLD_MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL 0x8a7
#define FLAG_WORLD_MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL 0x8a8
#define FLAG_WORLD_MAP_DIGLETTS_CAVE_B1F 0x8a9
#define FLAG_WORLD_MAP_VICTORY_ROAD_1F 0x8aa
#define FLAG_WORLD_MAP_ROCKET_HIDEOUT_B1F 0x8ab
#define FLAG_WORLD_MAP_SILPH_CO_1F 0x8ac
#define FLAG_WORLD_MAP_POKEMON_MANSION_1F 0x8ad
#define FLAG_WORLD_MAP_SAFARI_ZONE_CENTER 0x8ae
#define FLAG_WORLD_MAP_POKEMON_LEAGUE_LORELEIS_ROOM 0x8af
#define FLAG_WORLD_MAP_ROCK_TUNNEL_1F 0x8b0
#define FLAG_WORLD_MAP_SEAFOAM_ISLANDS_1F 0x8b1
#define FLAG_WORLD_MAP_POKEMON_TOWER_1F 0x8b2
#define FLAG_WORLD_MAP_CERULEAN_CAVE_1F 0x8b3
#define FLAG_WORLD_MAP_POWER_PLANT 0x8b4
#define FLAG_WORLD_MAP_NAVEL_ROCK_EXTERIOR 0x8b5
#define FLAG_WORLD_MAP_MT_EMBER_EXTERIOR 0x8b6
#define FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST 0x8b7
#define FLAG_WORLD_MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE 0x8b8
#define FLAG_WORLD_MAP_FIVE_ISLAND_ROCKET_WAREHOUSE 0x8b9
#define FLAG_WORLD_MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY 0x8ba
#define FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F 0x8bb
#define FLAG_WORLD_MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE 0x8bc
#define FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH 0x8bd
#define FLAG_WORLD_MAP_SIX_ISLAND_ALTERING_CAVE 0x8be
#define FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER 0x8bf
#define FLAG_WORLD_MAP_THREE_ISLAND_DUNSPARCE_TUNNEL 0x8c0
#define FLAG_WORLD_MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY 0x8c1
#define FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR 0x8c2
// Emerald Flags
// TODO: Get correct names and numbers
#define FLAG_0x001 0x1
src/scrcmd.c
+8 -8
View File
@@ -276,7 +276,7 @@ bool8 ScrCmd_setmysteryeventstatus(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrCmd_cmdCF(struct ScriptContext *ctx)
bool8 ScrCmd_execram(struct ScriptContext *ctx)
{
const u8 * script = sub_8069E48();
if (script != NULL)
@@ -599,7 +599,7 @@ bool8 ScrCmd_comparestattoword(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrCmd_cmdD0(struct ScriptContext *ctx)
bool8 ScrCmd_setworldmapflag(struct ScriptContext *ctx)
{
u16 value = ScriptReadHalfword(ctx);
sub_8115748(value);
@@ -798,7 +798,7 @@ bool8 ScrCmd_warpteleport(struct ScriptContext *ctx)
return TRUE;
}
bool8 ScrCmd_warpD1(struct ScriptContext *ctx)
bool8 ScrCmd_warpteleport2(struct ScriptContext *ctx)
{
u8 mapGroup = ScriptReadByte(ctx);
u8 mapNum = ScriptReadByte(ctx);
@@ -1261,7 +1261,7 @@ bool8 ScrCmd_release(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrCmd_cmdC7(struct ScriptContext *ctx)
bool8 ScrCmd_textcolor(struct ScriptContext *ctx)
{
gUnknown_20370DC = gUnknown_20370DA;
gUnknown_20370DA = ScriptReadByte(ctx);
@@ -1278,7 +1278,7 @@ bool8 ScrCmd_message(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrCmd_cmdC8(struct ScriptContext *ctx)
bool8 ScrCmd_loadhelp(struct ScriptContext *ctx)
{
const u8 *msg = (const u8 *)ScriptReadWord(ctx);
@@ -1289,7 +1289,7 @@ bool8 ScrCmd_cmdC8(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrCmd_cmdC9(struct ScriptContext *ctx)
bool8 ScrCmd_unloadhelp(struct ScriptContext *ctx)
{
sub_80F7998();
return FALSE;
@@ -2226,13 +2226,13 @@ bool8 ScrCmd_takecoins(struct ScriptContext *ctx)
return FALSE;
}
bool8 ScrCmd_cmdCA(struct ScriptContext *ctx)
bool8 ScrCmd_signmsg(struct ScriptContext *ctx)
{
sub_8069A20();
return FALSE;
}
bool8 ScrCmd_cmdCB(struct ScriptContext *ctx)
bool8 ScrCmd_normalmsg(struct ScriptContext *ctx)
{
sub_8069A2C();
return FALSE;