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 |
|