diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-05-16 14:59:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-16 14:59:02 -0400 |
| commit | fa52c7fc159a749cb97f4a78d7cf39781b55c62f (patch) | |
| tree | 8a88de09420ad7f53eb2154ba49f04d3d93c4e0b /src | |
| parent | 683c9edf348c8a7730e72eb4a21a934e158a58c0 (diff) | |
| parent | 4156dd6b5789e613e4c25ec2cfe9867ec491f85a (diff) | |
Merge pull request #56 from pret/document_map_vars
Document map vars, 1
Diffstat (limited to 'src')
| -rw-r--r-- | src/quest_log.c | 6 | ||||
| -rw-r--r-- | src/scrcmd.c | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/quest_log.c b/src/quest_log.c index 366af45f3..ea695d3af 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -2515,7 +2515,7 @@ void sub_81130BC(struct Var4038Struct * varPtr) FlagClear(FLAG_0x06D); FlagClear(FLAG_0x06E); FlagClear(FLAG_0x06F); - VarSet(VAR_0x4073, 1); + VarSet(VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1); } } @@ -2523,7 +2523,7 @@ ALIGNED(4) const u8 gUnknown_8456934[] = {2, 1, 2, 1}; u8 sub_8113114(struct Var4038Struct * a0, u8 a1) { - if (VarGet(VAR_0x4073) == 2) + if (VarGet(VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB) == 2) { if (a0->unk_0_0 + gUnknown_8456934[a1] >= 20) { @@ -2743,7 +2743,7 @@ void sub_81134B8(void) void sub_81134CC(struct Var4038Struct * a0) { - if (VarGet(VAR_0x4073) == 2) + if (VarGet(VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB) == 2) { sub_8113078(a0); if (gUnknown_2023E8A == 1) diff --git a/src/scrcmd.c b/src/scrcmd.c index e7c61db1f..7c27293a7 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -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; |