diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-03 18:21:53 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-03 19:42:56 -0500 |
| commit | 32ed487a476e01759d3d9dbc818d8566ae2c9cb7 (patch) | |
| tree | 669e90b56d36f17efff5f673235193f5298c0ceb /constants/wram_constants.asm | |
| parent | 6ff2cb20e67db2054486fc5dc48eb9263298d4ad (diff) | |
| parent | b35eb72290b964b98844afbe741bb7ede34b9ef3 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# audio/engine.asm
# constants/gfx_constants.asm
# constants/map_data_constants.asm
# constants/pokemon_data_constants.asm
# constants/sprite_constants.asm
# constants/wram_constants.asm
# data/maps/data.asm
# engine/battle/ai/scoring.asm
# engine/battle/core.asm
# engine/battle/effect_commands.asm
# engine/battle/misc.asm
# engine/battle_anims/getpokeballwobble.asm
# engine/breeding.asm
# engine/buy_sell_toss.asm
# engine/decorations.asm
# engine/events/battle_tower/battle_tower.asm
# engine/events/battle_tower/rules.asm
# engine/events/buena.asm
# engine/events/bug_contest/contest_2.asm
# engine/events/daycare.asm
# engine/events/dratini.asm
# engine/events/halloffame.asm
# engine/events/happiness_egg.asm
# engine/events/kurt.asm
# engine/events/lucky_number.asm
# engine/events/magnet_train.asm
# engine/events/overworld.asm
# engine/events/pokerus/pokerus.asm
# engine/events/print_unown.asm
# engine/events/print_unown_2.asm
# engine/events/unown_walls.asm
# engine/item_effects.asm
# engine/link.asm
# engine/mon_menu.asm
# engine/player_object.asm
# engine/routines/playslowcry.asm
# engine/scripting.asm
# engine/search.asm
# engine/search2.asm
# engine/specials.asm
# engine/start_menu.asm
# engine/timeset.asm
# home/battle_vars.asm
# home/map.asm
# maps/GoldenrodUndergroundSwitchRoomEntrances.asm
# maps/IlexForest.asm
# maps/KrissHouse2F.asm
# maps/Route39Barn.asm
# mobile/mobile_12_2.asm
# mobile/mobile_40.asm
# mobile/mobile_5f.asm
# wram.asm
Diffstat (limited to 'constants/wram_constants.asm')
| -rw-r--r-- | constants/wram_constants.asm | 33 |
1 files changed, 17 insertions, 16 deletions
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 |