pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Comments distinguish "move effects" and "effect commands"

Browse Source 
Effect command enums are used like constants, not macros
This commit is contained in:
Remy Oukaour 2017-12-11 17:41:18 -05:00
parent 4afc2f01ef
commit 720cdc72b2
5 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
battle/effect_command_pointers.asm
View File

@ -1,6 +1,7 @@
dw 0 ; padding dw 0 ; padding
BattleCommandPointers: ; 3fd28 BattleCommandPointers: ; 3fd28
; entries correspond to constants/effect_command_constants.asm
dw BattleCommand_CheckTurn ; 34084 dw BattleCommand_CheckTurn ; 34084
dw BattleCommand_CheckObedience ; 343db dw BattleCommand_CheckObedience ; 343db
dw BattleCommand_UsedMoveText ; 34541 dw BattleCommand_UsedMoveText ; 34541

1
battle/moves/move_effects_pointers.asm
View File

@ -1,3 +1,4 @@
; entries correspond to EFFECT_* constants
dw NormalHit dw NormalHit
dw DoSleep dw DoSleep
dw PoisonHit dw PoisonHit

1
constants.asm
View File

@ -7,6 +7,7 @@ INCLUDE "constants/wram_constants.asm"
INCLUDE "constants/pokemon_constants.asm" INCLUDE "constants/pokemon_constants.asm"
INCLUDE "constants/type_constants.asm" INCLUDE "constants/type_constants.asm"
INCLUDE "constants/move_constants.asm" INCLUDE "constants/move_constants.asm"
INCLUDE "constants/effect_command_constants.asm"
INCLUDE "constants/battle_constants.asm" INCLUDE "constants/battle_constants.asm"
INCLUDE "constants/map_dimension_constants.asm" INCLUDE "constants/map_dimension_constants.asm"
INCLUDE "constants/map_constants.asm" INCLUDE "constants/map_constants.asm"

3
macros/move_effect.asm → constants/effect_command_constants.asm
View File

@ -1,10 +1,11 @@
; BattleCommandPointers indexes (see battle/effect_commands.asm)
command: macro command: macro
enum \1_command enum \1_command
\1 equs "db \1_command" \1 equs "db \1_command"
endm endm
enum_start 1 enum_start 1
command checkturn ; 01 command checkturn ; 01
command checkobedience ; 02 command checkobedience ; 02
command usedmovetext ; 03 command usedmovetext ; 03

2
macros.asm
View File

@ -1,11 +1,9 @@
INCLUDE "macros/enum.asm" INCLUDE "macros/enum.asm"
INCLUDE "macros/basestats.asm" INCLUDE "macros/basestats.asm"
INCLUDE "macros/event.asm" INCLUDE "macros/event.asm"
INCLUDE "macros/sound.asm" INCLUDE "macros/sound.asm"
INCLUDE "macros/text.asm" INCLUDE "macros/text.asm"
INCLUDE "macros/charmap.asm" INCLUDE "macros/charmap.asm"
INCLUDE "macros/move_effect.asm"
INCLUDE "macros/move_anim.asm" INCLUDE "macros/move_anim.asm"
INCLUDE "macros/movement.asm" INCLUDE "macros/movement.asm"
INCLUDE "macros/map.asm" INCLUDE "macros/map.asm"