Commit Graph

49 Commits

Author SHA1 Message Date
Rangi 79ea091ff6 Use and define more WRAM constants 2019-01-24 21:41:14 -05:00
Rangi 31ec3365e9 NUM_OBJECTS EQU $10 → 16 2018-10-23 18:29:14 -04:00
mid-kid 3540b2a2d6 wMonStatusFlags -> wDebugFlags 2018-09-16 02:15:55 +02:00
Rangi ae022e1420 Curr -> Cur 2018-09-09 15:09:51 -04:00
mid-kid f98a95b8ee wWeeklyFlags -> wDailyFlags2
These are by far not always checked each week, and as such shouldn't be
called that.
Since they're almost always used through the `bit` instruction, it's
very inconvenient to just make wDailyFlags a `dw` instead.
2018-08-07 09:46:21 +02:00
Rangi 90b22d602f Use more options constants 2018-07-10 17:18:23 -04:00
Rangi b254a4571d ENGINE_BUG_CONTEST_ON -> ENGINE_MAIN_MENU_MOBILE_CHOICES (resolves #490)
Went with CHOICES instead of HIDDEN since setting the flag would presumably have shown the items, not hidden them
2018-02-25 22:23:20 -05:00
Rangi 335c2699f0 Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
#	constants/map_constants.asm
#	constants/wram_constants.asm
#	data/radio/oaks_pkmn_talk_routes.asm
#	data/radio/pnp_hidden_places.asm
#	engine/battle/core.asm
#	engine/breeding.asm
#	engine/phone/phone_scripts.asm
#	engine/radio.asm
#	maps/BattleTower1F.asm
#	maps/OlivineLighthouse2F.asm
#	maps/OlivineLighthouse6F.asm
#	maps/PokemonFanClub.asm
#	maps/RadioTower1F.asm
#	maps/RadioTower2F.asm
#	maps/Route30BerryHouse.asm
#	maps/Route34IlexForestGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/RuinsOfAlphKabutoChamber.asm
#	maps/RuinsOfAlphResearchCenter.asm
#	maps/VermilionPort.asm
#	maps/VictoryRoad.asm
2018-02-25 20:39:54 -05:00
mid-kid 3d34f5a5a3 Label wPokemonWithdrawDepositParameter of RemoveMonFromPartyOrBox
It takes a clearly different parameter, completely unrelated and
different in function to PC_DEPOSIT and PC_WITHDRAW.
2018-02-22 21:36:14 +01:00
Rangi 32ed487a47 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
2018-02-03 19:42:56 -05:00
Rangi 08891da822 const_def N 2018-01-31 11:38:45 -05:00
Rangi a9334f7468 Correct engine flag constants 2018-01-31 10:55:35 -05:00
luckytyphlosion a1951cefc0 Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
Rangi c5cc23a35f wGameTimerPause bit flag constants 2018-01-23 12:40:29 -05:00
Rangi efe6981a0d Add daily+weekly bit flags (close issue #429) 2018-01-22 15:59:24 -05:00
Rangi 3a7f518de4 wStatusFlags/2 bit constants 2018-01-22 15:40:43 -05:00
Rangi 4d8528f903 More engine flag constants 2018-01-22 14:34:55 -05:00
Rangi 125d51b3b2 More engine bit flag constants 2018-01-22 13:57:44 -05:00
Rangi e135091f09 Day-Care bit flags 2018-01-22 13:18:23 -05:00
Rangi 6ecf18aa52 Engine flag bit constants for wPokegearFlags 2018-01-22 12:03:18 -05:00
Remy Oukaour 2b82338920 Phone data 0/7 are time masks 2018-01-15 22:00:56 -05:00
Remy Oukaour 2085ebcc61 maskbits for NUM_FRAMES 2018-01-11 23:04:50 -05:00
Remy Oukaour 94d6a32721 Use maskbits some more 2018-01-11 14:27:19 -05:00
Remy Oukaour 3fc06b0f9d Use constants 2018-01-02 20:35:57 -05:00
yenatch 92fba8821c
Merge pull request #450 from roukaour/master
Constants for TextBoxFlags
2017-12-30 21:32:45 -05:00
Remy Oukaour ab823e2b54 FAST_TEXT_DELAY_F 2017-12-29 13:29:24 -05:00
Remy Oukaour e1a672e427 Constants for TextBoxFlags 2017-12-29 13:18:17 -05:00
xCrystal 69762a2bfd SET -> set 2017-12-29 17:15:01 +01:00
xCrystal 9457679af8 Prefix engine_flags wram addresses with w 2017-12-28 13:15:46 +01:00
Remy Oukaour 5aac8afae7 PLAYER_SLIP → PLAYER_SKATE (probably used for the beta skateboard; DoPlayerMovement.BikeCheck returns true for it) 2017-12-15 23:29:42 -05:00
Remy Oukaour 5be98bae3c Move more data tables into data/ files. 2017-12-11 15:20:32 -05:00
Remy Oukaour 31cce83e9b Move lots of data tables into individual data/ files
(This is not expected to be their final location, but it makes them easier to relocate when necessary, and easier for users to edit until the whole project's file structure is finalized.)
2017-12-11 14:23:18 -05:00
Remy Oukaour 41acb0667a Document macros/map.asm
Rename MORN/DAY/NITE to MORN_F/DAY_F/NITE_F; use MORN/DAY/NITE for shifted values (cleaner for person_events)
Prefix FLOOR to the `elevfloor` constants
2017-12-11 01:02:28 -05:00
Remy Oukaour 699495bfcb Consistent capitalization for map names, matching their constants 2017-12-10 13:37:15 -05:00
Remy Oukaour 0b7d8d44ad More constants 2017-12-09 13:28:23 -05:00
Remy Oukaour 512863989f Document constants with comments, actual names, and more thorough usage 2017-12-09 02:15:46 -05:00
pikalaxalt af0119ca7e Name all printer functions 2016-05-11 17:16:03 -04:00
PikalaxALT d314bdb4fa Pokedex labels 2015-11-29 21:34:59 -05:00
PikalaxALT 435b0cf686 Options menu, some mobile fns 2015-11-16 16:46:32 -05:00
PikalaxALT c34264ddd8 AI and player items, withdraw/deposit 2015-11-08 10:59:28 -05:00
PikalaxALT 4a16bbe45a sprite_header and emote_header 2015-11-03 09:16:56 -05:00
PikalaxALT edf42a54d5 More labels, including fns responsible for partymon generation 2015-10-07 13:19:41 -04:00
PikalaxALT 895e14cd05 Reworked person_event arguments 2015-07-29 18:22:23 -04:00
PikalaxALT 894955f9d9 Special script annotation, trainer constant enumeration, person-event structure update 2015-07-16 18:10:10 -04:00
PikalaxALT 39524cdb76 More enumeration of constants, more annotations of scripts. 2015-07-15 15:48:44 -04:00
IIMarckus 4d532beee6 Remove trailing newlines. 2015-06-23 12:24:51 -06:00
yenatch 0a53612f69 NO_TEXT_SCROLL flag in Options 2013-12-18 18:04:55 -05:00
yenatch 46d96bc7fd more battle anim labels 2013-12-09 16:20:19 -05:00
yenatch 7b02d57a8c split wram constants out of constants.asm 2013-11-27 14:45:44 -05:00