diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-01-10 23:17:43 -0500 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-01-10 20:17:43 -0800 |
| commit | f88eeb607409528dadbf841f2cb8e805d6e86deb (patch) | |
| tree | 6b4f6411a0e02bff918cb924251b68a5038ae1f8 /src/scrcmd.c | |
| parent | 6b0268e0c0fb98014cb72f8a918a33c0645162d2 (diff) | |
more labels and finish decompiling battle_ai.c except for unk_24 (#184)
* labels for save_menu_util.c
* formatting, i suck at it
* fix sub_80712B4 to not use MyTask struct
* pls don't kill me
* current changes
* decompile BattleAICmd_if_damage_bonus
* formatting
* label thinking struct unk8
* decompile BattleAICMd_if_status_not_in_party
* decompile more battle_ai.c functions
* Began decompilation of a random file
* decompile BattleAICmd_if_can_faint and BattleAICmd_if_cant_faint
* decompile unk_3F and unk_40
* decompile if_move_effect and if_not_move_effect
* formatting, silly
* decompile if_last_move_did_damage and if_encored
* decompile unk_45 if_random_2 and unk_47
* decompile get_hold_effect and get_gender
* decompile is_first_turn and get_stockpile_count
* decompile unk_4C and get_item
* decompile unk_4E unk_4F and unk_50
* decompile get_protect_count and the remaining stub macros
* decompile call jump and unk_5A
* decompile if_level_cond
* decompile the last AI macros besides unk_24
* finish decompiling battle_ai.c except for unk_24
Diffstat (limited to 'src/scrcmd.c')
| -rw-r--r-- | src/scrcmd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c index d3d28f923..f41d57ffb 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -561,7 +561,7 @@ bool8 ScrCmd_darken(struct ScriptContext *ctx) return FALSE; } -bool8 sub_8066248(void) +bool8 IsPaletteNotActive(void) { if (!gPaletteFade.active) return TRUE; @@ -572,7 +572,7 @@ bool8 sub_8066248(void) bool8 ScrCmd_fadescreen(struct ScriptContext *ctx) { fade_screen(ScriptReadByte(ctx), 0); - SetupNativeScript(ctx, sub_8066248); + SetupNativeScript(ctx, IsPaletteNotActive); return TRUE; } @@ -581,7 +581,7 @@ bool8 ScrCmd_fadescreendelay(struct ScriptContext *ctx) u8 duration = ScriptReadByte(ctx); u8 delay = ScriptReadByte(ctx); fade_screen(duration, delay); - SetupNativeScript(ctx, sub_8066248); + SetupNativeScript(ctx, IsPaletteNotActive); return TRUE; } @@ -1170,7 +1170,7 @@ bool8 ScrCmd_closebutton(struct ScriptContext *ctx) return FALSE; } -bool8 sub_80670C0() +bool8 WaitForAorBPress(void) { if (gMain.newKeys & A_BUTTON) return TRUE; @@ -1181,7 +1181,7 @@ bool8 sub_80670C0() bool8 ScrCmd_waitbutton(struct ScriptContext *ctx) { - SetupNativeScript(ctx, sub_80670C0); + SetupNativeScript(ctx, WaitForAorBPress); return TRUE; } |