diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-10 17:49:19 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-10 17:49:19 -0500 |
| commit | e0088adb3f692e03e695f912bb0c4bf2e8189e75 (patch) | |
| tree | f4cb2f482f7cbe78af47d698b542c81127a4f7c7 | |
| parent | c8575823a0e3694cba7c63e7ef468c55bb301804 (diff) | |
Other files belong in data/battle/
| -rw-r--r-- | data/battle/battle_text.asm (renamed from data/battle_text.asm) | 0 | ||||
| -rw-r--r-- | data/battle/critical_hits.asm | 14 | ||||
| -rw-r--r-- | data/battle/effect_command_pointers.asm (renamed from data/battle_command_pointers.asm) | 0 | ||||
| -rw-r--r-- | data/battle/stat_names.asm | 2 | ||||
| -rw-r--r-- | docs/move_effect_commands.md | 2 | ||||
| -rw-r--r-- | macros/scripts/battle_commands.asm | 2 | ||||
| -rw-r--r-- | main.asm | 4 |
7 files changed, 12 insertions, 12 deletions
diff --git a/data/battle_text.asm b/data/battle/battle_text.asm index 7e1b06069..7e1b06069 100644 --- a/data/battle_text.asm +++ b/data/battle/battle_text.asm diff --git a/data/battle/critical_hits.asm b/data/battle/critical_hits.asm index dcbfa36fa..5800d57f4 100644 --- a/data/battle/critical_hits.asm +++ b/data/battle/critical_hits.asm @@ -9,10 +9,10 @@ CriticalHitMoves: db -1 CriticalHitChances: - db 7 percent ; 0 - db 12 percent + 2 ; 1 - db 25 percent + 1 ; 2 - db 33 percent + 1 ; 3 - db 50 percent + 1 ; 4 - db 50 percent + 1 ; 5 - db 50 percent + 1 ; 6 + db 7 percent ; 0 + db 12 percent + 2 ; +1 + db 25 percent + 1 ; +2 + db 33 percent + 1 ; +3 + db 50 percent + 1 ; +4 + db 50 percent + 1 ; +5 + db 50 percent + 1 ; +6 diff --git a/data/battle_command_pointers.asm b/data/battle/effect_command_pointers.asm index b3eeea273..b3eeea273 100644 --- a/data/battle_command_pointers.asm +++ b/data/battle/effect_command_pointers.asm diff --git a/data/battle/stat_names.asm b/data/battle/stat_names.asm index 86164ceb4..a144a225f 100644 --- a/data/battle/stat_names.asm +++ b/data/battle/stat_names.asm @@ -7,4 +7,4 @@ StatNames: db "SPCL.DEF@" db "ACCURACY@" db "EVASION@" - db "ABILITY@" + db "ABILITY@" ; used for BattleCommand_Curse diff --git a/docs/move_effect_commands.md b/docs/move_effect_commands.md index b8b09c5c2..a7a779123 100644 --- a/docs/move_effect_commands.md +++ b/docs/move_effect_commands.md @@ -1,6 +1,6 @@ # Move Effect Commands -Defined in [macros/scripts/battle_commands.asm](/macros/scripts/battle_commands.asm) and [data/battle_command_pointers.asm:BattleCommandPointers](/data/battle_command_pointers.asm). +Defined in [macros/scripts/battle_commands.asm](/macros/scripts/battle_commands.asm) and [data/battle/effect_command_pointers.asm:BattleCommandPointers](/data/battle/effect_command_pointers.asm). ## `$01`: `checkturn` diff --git a/macros/scripts/battle_commands.asm b/macros/scripts/battle_commands.asm index 5933740f0..4ae8dbaf4 100644 --- a/macros/scripts/battle_commands.asm +++ b/macros/scripts/battle_commands.asm @@ -3,7 +3,7 @@ command: MACRO \1 EQUS "db \1_command" ENDM -; BattleCommandPointers indexes (see data/battle_command_pointers.asm) +; BattleCommandPointers indexes (see data/battle/effect_command_pointers.asm) enum_start 1 command checkturn ; 01 command checkobedience ; 02 @@ -170,7 +170,7 @@ INCLUDE "data/trainers/parties.asm" SECTION "Battle Core", ROMX INCLUDE "engine/battle/core.asm" -INCLUDE "data/battle_command_pointers.asm" +INCLUDE "data/battle/effect_command_pointers.asm" SECTION "bank10", ROMX @@ -300,7 +300,7 @@ SECTION "bank20", ROMX INCLUDE "engine/player_movement.asm" INCLUDE "engine/engine_flags.asm" INCLUDE "engine/variables.asm" -INCLUDE "data/battle_text.asm" +INCLUDE "data/battle/battle_text.asm" INCLUDE "engine/debug.asm" |