diff options
Diffstat (limited to 'constants')
| -rwxr-xr-x | constants/audio_constants.asm | 8 | ||||
| -rw-r--r-- | constants/battle_constants.asm | 20 | ||||
| -rw-r--r-- | constants/event_flags.asm | 2 | ||||
| -rw-r--r-- | constants/gfx_constants.asm | 2 | ||||
| -rw-r--r-- | constants/map_data_constants.asm | 2 | ||||
| -rw-r--r-- | constants/map_object_constants.asm | 2 | ||||
| -rw-r--r-- | constants/pokemon_data_constants.asm | 116 | ||||
| -rw-r--r-- | constants/script_constants.asm | 6 | ||||
| -rw-r--r-- | constants/sprite_constants.asm | 2 | ||||
| -rw-r--r-- | constants/wram_constants.asm | 33 |
10 files changed, 97 insertions, 96 deletions
diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm index 861c35ee0..7aa0895a3 100755 --- a/constants/audio_constants.asm +++ b/constants/audio_constants.asm @@ -66,23 +66,23 @@ NUM_CHANNELS EQU const_value const NOTE_REST ; 5 const NOTE_VIBRATO_OVERRIDE ; 6 -; Volume: +; wVolume VOLUME_SO1_F EQU 3 VOLUME_SO2_F EQU 7 VOLUME_SO1_LEVEL EQU %00000111 VOLUME_SO2_LEVEL EQU %01110000 MAX_VOLUME EQU $77 -; SoundInput: +; wSoundInput SOUND_INPUT_CH1_F EQU 0 SOUND_INPUT_CH2_F EQU 1 SOUND_INPUT_CH3_F EQU 2 SOUND_INPUT_CH4_F EQU 3 SOUND_INPUT_GLOBAL_F EQU 7 -; Danger: +; wLowHealthAlarm DANGER_PITCH_F EQU 4 DANGER_ON_F EQU 7 -; MusicFade: +; wMusicFade MUSIC_FADE_IN_F EQU 7 diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index 949e28ab4..b1f57514a 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -27,7 +27,7 @@ EFFECTIVE EQU 10 NOT_VERY_EFFECTIVE EQU 05 NO_EFFECT EQU 00 -; PlayerStatLevels and EnemyStatLevels indexes (see wram.asm) +; wPlayerStatLevels and wEnemyStatLevels indexes (see wram.asm) ; GetStatName arguments (see data/battle/stat_names.asm) const_def const ATTACK @@ -53,7 +53,7 @@ MOVE_LENGTH EQU const_value ; stat constants ; indexes for: -; - PlayerStats and EnemyStats (see wram.asm) +; - wPlayerStats and wEnemyStats (see wram.asm) ; - party_struct and battle_struct members (see macros/wram.asm) const_def 1 const STAT_HP @@ -80,7 +80,7 @@ SPDSPCDV_SHINY EQU $AA const WILD_BATTLE const TRAINER_BATTLE -; battle types (BattleType values) +; battle types (wBattleType values) const_def const BATTLETYPE_NORMAL const BATTLETYPE_CANLOSE @@ -159,7 +159,7 @@ SLP EQU %111 ; 0-7 turns ALL_STATUS EQU (1 << PSN) + (1 << BRN) + (1 << FRZ) + (1 << PAR) + SLP -; PlayerSubStatus1 or EnemySubStatus1 bit flags +; wPlayerSubStatus1 or wEnemySubStatus1 bit flags enum_start 7, -1 enum SUBSTATUS_IN_LOVE enum SUBSTATUS_ROLLOUT @@ -170,10 +170,10 @@ ALL_STATUS EQU (1 << PSN) + (1 << BRN) + (1 << FRZ) + (1 << PAR) + SLP enum SUBSTATUS_CURSE enum SUBSTATUS_NIGHTMARE -; PlayerSubStatus2 or EnemySubStatus2 bit flags +; wPlayerSubStatus2 or wEnemySubStatus2 bit flags SUBSTATUS_CURLED EQU 0 -; PlayerSubStatus3 or EnemySubStatus3 bit flags +; wPlayerSubStatus3 or wEnemySubStatus3 bit flags enum_start 7, -1 enum SUBSTATUS_CONFUSED enum SUBSTATUS_FLYING @@ -184,7 +184,7 @@ SUBSTATUS_CURLED EQU 0 enum SUBSTATUS_RAMPAGE enum SUBSTATUS_BIDE -; PlayerSubStatus4 or EnemySubStatus4 bit flags +; wPlayerSubStatus4 or wEnemySubStatus4 bit flags enum_start 7, -1 enum SUBSTATUS_LEECH_SEED enum SUBSTATUS_RAGE @@ -195,7 +195,7 @@ SUBSTATUS_CURLED EQU 0 enum SUBSTATUS_MIST enum SUBSTATUS_X_ACCURACY -; PlayerSubStatus5 or EnemySubStatus5 bit flags +; wPlayerSubStatus5 or wEnemySubStatus5 bit flags enum_start 7, -1 enum SUBSTATUS_CANT_RUN enum SUBSTATUS_DESTINY_BOND @@ -206,7 +206,7 @@ SUBSTATUS_CURLED EQU 0 enum SUBSTATUS_UNKNOWN_3 enum SUBSTATUS_TOXIC -; PlayerScreens or EnemyScreens bit flags +; wPlayerScreens or wEnemyScreens bit flags enum_start 4, -1 enum SCREENS_REFLECT enum SCREENS_LIGHT_SCREEN @@ -214,7 +214,7 @@ SUBSTATUS_CURLED EQU 0 enum SCREENS_UNUSED enum SCREENS_SPIKES -; Weather values +; values in wBattleWeather const_def const WEATHER_NONE const WEATHER_RAIN diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 7c9b67fa9..879f12852 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -1,4 +1,4 @@ -; EventFlags bit flags +; wEventFlags bit flags const_def ; The first eight flags are reset upon reloading the map const EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 ; 000 diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index a3d68da1a..d0f8b2b62 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -38,7 +38,7 @@ HP_RED EQU 2 const SPRITEOAMSTRUCT_TILE_ID ; 2 const SPRITEOAMSTRUCT_ATTRIBUTES ; 3 SPRITEOAMSTRUCT_LENGTH EQU const_value -NUM_SPRITE_OAM_STRUCTS EQU 40 ; see Sprites +NUM_SPRITE_OAM_STRUCTS EQU 40 ; see wVirtualOAM ; PokeAnims indexes (see engine/pic_animation.asm) diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index ed0e2fbc6..0178e22b1 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -59,7 +59,7 @@ MAP_NONE EQU 0 const SOUTH_F const NORTH_F -; MapConnections +; wMapConnections const_def shift_const EAST shift_const WEST diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm index 18e40437e..b752b66e8 100644 --- a/constants/map_object_constants.asm +++ b/constants/map_object_constants.asm @@ -35,7 +35,7 @@ const OBJECT_RANGE ; 20 ; 21-27 are not used OBJECT_STRUCT_LENGTH EQU 40 -NUM_OBJECT_STRUCTS EQU 13 ; see ObjectStructs +NUM_OBJECT_STRUCTS EQU 13 ; see wObjectStructs ; object_struct OBJECT_FACING values OW_DOWN EQU DOWN << 2 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 66a273eaa..35985d565 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -1,29 +1,29 @@ ; base data struct members (see data/pokemon/base_stats/*.asm) -BASE_DEX_NO EQUS "(BaseDexNo - CurBaseData)" -BASE_STATS EQUS "(BaseStats - CurBaseData)" -BASE_HP EQUS "(BaseHP - CurBaseData)" -BASE_ATK EQUS "(BaseAttack - CurBaseData)" -BASE_SPD EQUS "(BaseSpeed - CurBaseData)" -BASE_SAT EQUS "(BaseSpecialAttack - CurBaseData)" -BASE_SDF EQUS "(BaseSpecialDefense - CurBaseData)" -BASE_TYPES EQUS "(BaseType - CurBaseData)" -BASE_TYPE_1 EQUS "(BaseType1 - CurBaseData)" -BASE_TYPE_2 EQUS "(BaseType2 - CurBaseData)" -BASE_CATCH_RATE EQUS "(BaseCatchRate - CurBaseData)" -BASE_EXP EQUS "(BaseExp - CurBaseData)" -BASE_ITEMS EQUS "(BaseItems - CurBaseData)" -BASE_ITEM_1 EQUS "(BaseItem1 - CurBaseData)" -BASE_ITEM_2 EQUS "(BaseItem2 - CurBaseData)" -BASE_GENDER EQUS "(BaseGender - CurBaseData)" -BASE_UNKNOWN_1 EQUS "(BaseUnknown1 - CurBaseData)" -BASE_EGG_STEPS EQUS "(BaseEggSteps - CurBaseData)" -BASE_UNKNOWN_2 EQUS "(BaseUnknown2 - CurBaseData)" -BASE_PIC_SIZE EQUS "(BasePicSize - CurBaseData)" -BASE_PADDING EQUS "(BasePadding - CurBaseData)" -BASE_GROWTH_RATE EQUS "(BaseGrowthRate - CurBaseData)" -BASE_EGG_GROUPS EQUS "(BaseEggGroups - CurBaseData)" -BASE_TMHM EQUS "(BaseTMHM - CurBaseData)" -BASE_DATA_SIZE EQUS "(CurBaseDataEnd - CurBaseData)" +BASE_DEX_NO EQUS "(wBaseDexNo - wCurBaseData)" +BASE_STATS EQUS "(wBaseStats - wCurBaseData)" +BASE_HP EQUS "(wBaseHP - wCurBaseData)" +BASE_ATK EQUS "(wBaseAttack - wCurBaseData)" +BASE_SPD EQUS "(wBaseSpeed - wCurBaseData)" +BASE_SAT EQUS "(wBaseSpecialAttack - wCurBaseData)" +BASE_SDF EQUS "(wBaseSpecialDefense - wCurBaseData)" +BASE_TYPES EQUS "(wBaseType - wCurBaseData)" +BASE_TYPE_1 EQUS "(wBaseType1 - wCurBaseData)" +BASE_TYPE_2 EQUS "(wBaseType2 - wCurBaseData)" +BASE_CATCH_RATE EQUS "(wBaseCatchRate - wCurBaseData)" +BASE_EXP EQUS "(wBaseExp - wCurBaseData)" +BASE_ITEMS EQUS "(wBaseItems - wCurBaseData)" +BASE_ITEM_1 EQUS "(wBaseItem1 - wCurBaseData)" +BASE_ITEM_2 EQUS "(wBaseItem2 - wCurBaseData)" +BASE_GENDER EQUS "(wBaseGender - wCurBaseData)" +BASE_UNKNOWN_1 EQUS "(wBaseUnknown1 - wCurBaseData)" +BASE_EGG_STEPS EQUS "(wBaseEggSteps - wCurBaseData)" +BASE_UNKNOWN_2 EQUS "(wBaseUnknown2 - wCurBaseData)" +BASE_PIC_SIZE EQUS "(wBasePicSize - wCurBaseData)" +BASE_PADDING EQUS "(wBasePadding - wCurBaseData)" +BASE_GROWTH_RATE EQUS "(wBaseGrowthRate - wCurBaseData)" +BASE_EGG_GROUPS EQUS "(wBaseEggGroups - wCurBaseData)" +BASE_TMHM EQUS "(wBaseTMHM - wCurBaseData)" +BASE_DATA_SIZE EQUS "(wCurBaseDataEnd - wCurBaseData)" ; gender ratio constants GENDER_F0 EQU 0 percent @@ -34,7 +34,7 @@ GENDER_F75 EQU 75 percent GENDER_F100 EQU 100 percent - 1 GENDERLESS EQU -1 -; BaseGrowthRate values +; wBaseGrowthRate values ; GrowthRates indexes (see data/growth_rates.asm) const_def const GROWTH_MEDIUM_FAST @@ -44,7 +44,7 @@ GENDERLESS EQU -1 const GROWTH_FAST const GROWTH_SLOW -; BaseEggGroups values +; wBaseEggGroups values const_def 1 const EGG_MONSTER ; 1 const EGG_WATER_1 ; 2 @@ -68,37 +68,37 @@ NUM_DEX_ENTRY_BANKS EQU 4 ; party_struct members (see macros/wram.asm) -MON_SPECIES EQUS "(PartyMon1Species - PartyMon1)" -MON_ITEM EQUS "(PartyMon1Item - PartyMon1)" -MON_MOVES EQUS "(PartyMon1Moves - PartyMon1)" -MON_ID EQUS "(PartyMon1ID - PartyMon1)" -MON_EXP EQUS "(PartyMon1Exp - PartyMon1)" -MON_STAT_EXP EQUS "(PartyMon1StatExp - PartyMon1)" -MON_HP_EXP EQUS "(PartyMon1HPExp - PartyMon1)" -MON_ATK_EXP EQUS "(PartyMon1AtkExp - PartyMon1)" -MON_DEF_EXP EQUS "(PartyMon1DefExp - PartyMon1)" -MON_SPD_EXP EQUS "(PartyMon1SpdExp - PartyMon1)" -MON_SPC_EXP EQUS "(PartyMon1SpcExp - PartyMon1)" -MON_DVS EQUS "(PartyMon1DVs - PartyMon1)" -MON_PP EQUS "(PartyMon1PP - PartyMon1)" -MON_HAPPINESS EQUS "(PartyMon1Happiness - PartyMon1)" -MON_PKRUS EQUS "(PartyMon1PokerusStatus - PartyMon1)" -MON_CAUGHTDATA EQUS "(PartyMon1CaughtData - PartyMon1)" -MON_CAUGHTLEVEL EQUS "(PartyMon1CaughtLevel - PartyMon1)" -MON_CAUGHTTIME EQUS "(PartyMon1CaughtTime - PartyMon1)" -MON_CAUGHTGENDER EQUS "(PartyMon1CaughtGender - PartyMon1)" -MON_CAUGHTLOCATION EQUS "(PartyMon1CaughtLocation - PartyMon1)" -MON_LEVEL EQUS "(PartyMon1Level - PartyMon1)" -MON_STATUS EQUS "(PartyMon1Status - PartyMon1)" -MON_HP EQUS "(PartyMon1HP - PartyMon1)" -MON_MAXHP EQUS "(PartyMon1MaxHP - PartyMon1)" -MON_ATK EQUS "(PartyMon1Attack - PartyMon1)" -MON_DEF EQUS "(PartyMon1Defense - PartyMon1)" -MON_SPD EQUS "(PartyMon1Speed - PartyMon1)" -MON_SAT EQUS "(PartyMon1SpclAtk - PartyMon1)" -MON_SDF EQUS "(PartyMon1SpclDef - PartyMon1)" -BOXMON_STRUCT_LENGTH EQUS "(PartyMon1End - PartyMon1)" -PARTYMON_STRUCT_LENGTH EQUS "(PartyMon1StatsEnd - PartyMon1)" +MON_SPECIES EQUS "(wPartyMon1Species - wPartyMon1)" +MON_ITEM EQUS "(wPartyMon1Item - wPartyMon1)" +MON_MOVES EQUS "(wPartyMon1Moves - wPartyMon1)" +MON_ID EQUS "(wPartyMon1ID - wPartyMon1)" +MON_EXP EQUS "(wPartyMon1Exp - wPartyMon1)" +MON_STAT_EXP EQUS "(wPartyMon1StatExp - wPartyMon1)" +MON_HP_EXP EQUS "(wPartyMon1HPExp - wPartyMon1)" +MON_ATK_EXP EQUS "(wPartyMon1AtkExp - wPartyMon1)" +MON_DEF_EXP EQUS "(wPartyMon1DefExp - wPartyMon1)" +MON_SPD_EXP EQUS "(wPartyMon1SpdExp - wPartyMon1)" +MON_SPC_EXP EQUS "(wPartyMon1SpcExp - wPartyMon1)" +MON_DVS EQUS "(wPartyMon1DVs - wPartyMon1)" +MON_PP EQUS "(wPartyMon1PP - wPartyMon1)" +MON_HAPPINESS EQUS "(wPartyMon1Happiness - wPartyMon1)" +MON_PKRUS EQUS "(wPartyMon1PokerusStatus - wPartyMon1)" +MON_CAUGHTDATA EQUS "(wPartyMon1CaughtData - wPartyMon1)" +MON_CAUGHTLEVEL EQUS "(wPartyMon1CaughtLevel - wPartyMon1)" +MON_CAUGHTTIME EQUS "(wPartyMon1CaughtTime - wPartyMon1)" +MON_CAUGHTGENDER EQUS "(wPartyMon1CaughtGender - wPartyMon1)" +MON_CAUGHTLOCATION EQUS "(wPartyMon1CaughtLocation - wPartyMon1)" +MON_LEVEL EQUS "(wPartyMon1Level - wPartyMon1)" +MON_STATUS EQUS "(wPartyMon1Status - wPartyMon1)" +MON_HP EQUS "(wPartyMon1HP - wPartyMon1)" +MON_MAXHP EQUS "(wPartyMon1MaxHP - wPartyMon1)" +MON_ATK EQUS "(wPartyMon1Attack - wPartyMon1)" +MON_DEF EQUS "(wPartyMon1Defense - wPartyMon1)" +MON_SPD EQUS "(wPartyMon1Speed - wPartyMon1)" +MON_SAT EQUS "(wPartyMon1SpclAtk - wPartyMon1)" +MON_SDF EQUS "(wPartyMon1SpclDef - wPartyMon1)" +BOXMON_STRUCT_LENGTH EQUS "(wPartyMon1End - wPartyMon1)" +PARTYMON_STRUCT_LENGTH EQUS "(wPartyMon1StatsEnd - wPartyMon1)" REDMON_STRUCT_LENGTH EQU 44 diff --git a/constants/script_constants.asm b/constants/script_constants.asm index e610c25f6..dd086e6b3 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -5,9 +5,9 @@ LAST_TALKED EQU -2 ; memory constants const_def - const MEM_BUFFER_0 ; use StringBuffer3 - const MEM_BUFFER_1 ; use StringBuffer4 - const MEM_BUFFER_2 ; use StringBuffer5 + const MEM_BUFFER_0 ; use wStringBuffer3 + const MEM_BUFFER_1 ; use wStringBuffer4 + const MEM_BUFFER_2 ; use wStringBuffer5 NUM_MEM_BUFFERS EQU const_value diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index cef3dd486..c23a3b246 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -149,7 +149,7 @@ SPRITE_POKEMON EQU const_value const SPRITE_DAY_CARE_MON_1 ; e0 const SPRITE_DAY_CARE_MON_2 ; e1 -; VariableSprites indexes (see wram.asm) +; wVariableSprites indexes (see wram.asm) const_def $f0 SPRITE_VARS EQU const_value const SPRITE_CONSOLE ; f0 diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 65af255be..f1c0c8b76 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -1,4 +1,4 @@ -; InputType:: ; c2c7 +; wInputType:: ; c2c7 AUTO_INPUT EQU $ff ; wCurrentDexMode:: ; c7d4 @@ -8,7 +8,7 @@ AUTO_INPUT EQU $ff const DEXMODE_ABC const DEXMODE_UNOWN -; MonType:: ; cf5f +; wMonType:: ; cf5f const_def const PARTYMON ; 0 const OTPARTYMON ; 1 @@ -20,18 +20,19 @@ AUTO_INPUT EQU $ff GAMETIMERPAUSE_TIMER_PAUSED_F EQU 0 GAMETIMERPAUSE_MOBILE_7_F EQU 7 -; Options:: ; cfcc +; wOptions:: (bits 4-7) ; cfcc const_def 4 const NO_TEXT_SCROLL ; 4 const STEREO ; 5 const BATTLE_SHIFT ; 6 const BATTLE_SCENE ; 7 +; wOptions:: (bits 0-2) ; cfcc TEXT_DELAY_FAST EQU 1 TEXT_DELAY_MED EQU 3 TEXT_DELAY_SLOW EQU 5 -; TextBoxFrame:: ; cfce +; wTextBoxFrame:: ; cfce const_def const FRAME_1 ; 0 const FRAME_2 ; 1 @@ -43,23 +44,23 @@ TEXT_DELAY_SLOW EQU 5 const FRAME_8 ; 7 NUM_FRAMES EQU const_value -; TextBoxFlags:: ; cfcf +; wTextBoxFlags:: ; cfcf const_def const FAST_TEXT_DELAY_F ; 0 const NO_TEXT_DELAY_F ; 1 -; GBPrinter:: ; cfd0 +; wGBPrinter:: ; cfd0 GBPRINTER_LIGHTEST EQU $00 GBPRINTER_LIGHTER EQU $20 GBPRINTER_NORMAL EQU $40 GBPRINTER_DARKER EQU $60 GBPRINTER_DARKEST EQU $7f -; Options2:: ; cfd1 +; wOptions2:: ; cfd1 const_def const MENU_ACCOUNT ; 0 -; WalkingDirection:: ; d043 +; wWalkingDirection:: ; d043 const_def -1 const STANDING ; -1 const DOWN ; 0 @@ -73,7 +74,7 @@ UP_MASK EQU 1 << UP LEFT_MASK EQU 1 << LEFT RIGHT_MASK EQU 1 << RIGHT -; FacingDirection:: ; d044 +; wFacingDirection:: ; d044 FACE_CURRENT EQU 0 FACE_DOWN EQU 8 FACE_UP EQU 4 @@ -93,7 +94,7 @@ INIT_OTHER_ITEM_LIST EQU 3 INIT_PLAYEROT_LIST EQU 4 INIT_MON_LIST EQU 5 -; TimeOfDay:: ; d269 +; wTimeOfDay:: ; d269 const_def const MORN_F ; 0 const DAY_F ; 1 @@ -118,10 +119,10 @@ PLAYERSPRITESETUP_RESET_ACTION_F EQU 7 ; wPlayerGender:: ; d472 PLAYERGENDER_FEMALE_F EQU 0 -; ScriptFlags:: ; d434 +; wScriptFlags:: ; d434 SCRIPT_RUNNING EQU 2 -; ScriptMode:: ; d437 +; wScriptMode:: ; d437 SCRIPT_OFF EQU 0 SCRIPT_READ EQU 1 SCRIPT_WAIT_MOVEMENT EQU 2 @@ -131,7 +132,7 @@ SCRIPT_WAIT EQU 3 SPAWN_LANCE EQU 1 SPAWN_RED EQU 2 -; CurDay:: ; d4cb +; wCurDay:: ; d4cb const_def const SUNDAY ; 0 const MONDAY ; 1 @@ -141,7 +142,7 @@ SPAWN_RED EQU 2 const FRIDAY ; 5 const SATURDAY ; 6 -; MapObjects:: ; d71e +; wMapObjects:: ; d71e PLAYER_OBJECT EQU 0 NUM_OBJECTS EQU $10 @@ -209,11 +210,11 @@ NUM_BADGES EQU NUM_JOHTO_BADGES + NUM_KANTO_BADGES POKEGEAR_OBTAINED_F EQU 7 -; WhichRegisteredItem:: ; d95b +; wWhichRegisteredItem:: ; d95b REGISTERED_POCKET EQU %11000000 REGISTERED_NUMBER EQU %00111111 -; PlayerState:: ; d95d +; wPlayerState:: ; d95d PLAYER_NORMAL EQU 0 PLAYER_BIKE EQU 1 PLAYER_SKATE EQU 2 |