Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename more script commands for consistency and predictability

Browse Source 
Fixes #540
This commit is contained in:
Rangi
2019-03-10 15:31:59 -04:00
parent 6393ecb7e5
commit e002b536af
157 changed files with 1494 additions and 1004 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
constants/battle_tower_constants.asm
View File

@@ -7,7 +7,7 @@ BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70
BATTLETOWER_TRAINERDATALENGTH EQU $24
BATTLE_TOWER_STRUCT_LENGTH EQUS "(NAME_LENGTH + BATTLETOWER_PARTY_LENGTH * NICKNAMED_MON_STRUCT_LENGTH + BATTLETOWER_TRAINERDATALENGTH)"
; BattleTowerAction writebyte arguments (see engine/events/battle_tower/battle_tower.asm)
; BattleTowerAction setval arguments (see engine/events/battle_tower/battle_tower.asm)
const_def
const BATTLETOWERACTION_CHECK_EXPLANATION_READ
const BATTLETOWERACTION_SET_EXPLANATION_READ

28
constants/script_constants.asm
View File

@@ -2,12 +2,12 @@
PLAYER EQU 0
LAST_TALKED EQU -2
; memory constants
; string buffer constants
const_def
const MEM_BUFFER_0 ; use wStringBuffer3
const MEM_BUFFER_1 ; use wStringBuffer4
const MEM_BUFFER_2 ; use wStringBuffer5
NUM_MEM_BUFFERS EQU const_value
const STRING_BUFFER_3 ; use wStringBuffer3
const STRING_BUFFER_4 ; use wStringBuffer4
const STRING_BUFFER_5 ; use wStringBuffer5
NUM_STRING_BUFFERS EQU const_value
; checkmoney/takemoney accounts
const_def
@@ -34,7 +34,13 @@ NUM_MEM_BUFFERS EQU const_value
const PHONE_CONTACTS_FULL ; 1
const PHONE_CONTACT_REFUSED ; 2
; writecode/checkcode arguments
; trainertext arguments
const_def
const TRAINERTEXT_SEEN
const TRAINERTEXT_WIN
const TRAINERTEXT_LOSS
; readvar/writevar/loadvar arguments
; _GetVarAction.VarActionTable indexes (see engine/overworld/variables.asm)
const_def
const VAR_STRINGBUFFER2 ; 00
@@ -223,7 +229,7 @@ NUM_FRUIT_TREES EQU const_value + -1
const SWARM_DUNSPARCE ; 0
const SWARM_YANMA ; 1
; ActivateFishingSwarm writebyte arguments
; ActivateFishingSwarm setval arguments
const_def
const FISHSWARM_NONE ; 0
const FISHSWARM_QWILFISH ; 1
@@ -256,14 +262,14 @@ NUM_FRUIT_TREES EQU const_value + -1
const BUGCONTEST_BOXED_MON ; 1
const BUGCONTEST_NO_CATCH ; 2
; HealMachineAnim writebyte arguments
; HealMachineAnim setval arguments
; HealMachineAnim.Pointers indexes (see engine/events/heal_machine_anim.asm)
const_def
const HEALMACHINE_POKECENTER ; 0
const HEALMACHINE_ELMS_LAB ; 1
const HEALMACHINE_HALL_OF_FAME ; 2
; UnownPuzzle writebyte arguments
; UnownPuzzle setval arguments
; LoadUnownPuzzlePiecesGFX.LZPointers indexes (see engine/games/unown_puzzle.asm)
const_def
const UNOWNPUZZLE_KABUTO ; 0
@@ -272,7 +278,7 @@ NUM_FRUIT_TREES EQU const_value + -1
const UNOWNPUZZLE_HO_OH ; 3
NUM_UNOWN_PUZZLES EQU const_value
; DisplayUnownWords writebyte arguments
; DisplayUnownWords setval arguments
; UnownWalls and MenuHeaders_UnownWalls indexes (see data/events/unown_walls.asm)
const_def
const UNOWNWORDS_ESCAPE ; 0
@@ -280,7 +286,7 @@ NUM_UNOWN_PUZZLES EQU const_value
const UNOWNWORDS_WATER ; 2
const UNOWNWORDS_HO_OH ; 3
; MoveTutor writebyte arguments
; MoveTutor setval arguments
const_def 1
const MOVETUTOR_FLAMETHROWER ; 1
const MOVETUTOR_THUNDERBOLT ; 2