diff options
| author | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2021-06-05 17:38:22 +0100 |
|---|---|---|
| committer | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2021-06-05 17:38:22 +0100 |
| commit | c693d08b4c40c6d9da0be6a77e51c394270356ca (patch) | |
| tree | 4da16a2409e01d2c8d81a79c4336d7c26bff4b42 /src/constants | |
| parent | 38ac7a22c3a4a0dc00a55db38330d1740492a7a5 (diff) | |
| parent | d4d63a97e41c40d9081a279e3f113177c8640767 (diff) | |
Merge https://github.com/pret/poketcg into temp
Diffstat (limited to 'src/constants')
| -rw-r--r-- | src/constants/misc_constants.asm | 2 | ||||
| -rw-r--r-- | src/constants/npc_constants.asm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/constants/misc_constants.asm b/src/constants/misc_constants.asm index 033ce71..4147b1d 100644 --- a/src/constants/misc_constants.asm +++ b/src/constants/misc_constants.asm @@ -55,6 +55,8 @@ OWMODE_SCRIPT EQU 3 CARDPOP_NAME_LIST_MAX_ELEMS EQU 16 CARDPOP_NAME_LIST_SIZE EQUS "CARDPOP_NAME_LIST_MAX_ELEMS * NAME_BUFFER_LENGTH" +NUM_CHALLENGE_MACHINE_OPPONENTS EQU 5 + ; commands transmitted through IR to be ; executed by the other device ; (see ExecuteReceivedIRCommands) diff --git a/src/constants/npc_constants.asm b/src/constants/npc_constants.asm index 0aa3ad7..bf5aafd 100644 --- a/src/constants/npc_constants.asm +++ b/src/constants/npc_constants.asm @@ -9,7 +9,7 @@ LOADED_NPC_MAX EQU $08 const LOADED_NPC_DIRECTION const LOADED_NPC_FLAGS const LOADED_NPC_ANIM - const LOADED_NPC_UNKNOWN + const LOADED_NPC_DIRECTION_BACKUP const LOADED_NPC_MOVEMENT_STEP const LOADED_NPC_MOVEMENT_PTR const_value = const_value+1 |