pokecrystal/constants/event_flags.asm, branch master Pokémon Crystal Updates to more closely sync with pokegold 2020-10-30T03:23:57+00:00 Rangi remy.oukaour+rangi42@gmail.com 2020-10-30T03:23:57+00:00 ba5bc304f959d2387b45b9320808797272cf958a

SPRITE_GYM_GUY -> SPRITE_GYM_GUIDE 2020-07-17T17:01:48+00:00 Rangi remy.oukaour+rangi42@gmail.com 2020-07-17T17:01:48+00:00 59d9932255aa01e54dedfd82e9eb6343e9fe7883

Use const_skip and const_next macros for brevity 2020-07-11T00:03:46+00:00 Rangi remy.oukaour+rangi42@gmail.com 2020-07-08T20:20:15+00:00 c086de0c986330b09cd5e9fa384b950107ee4955

[in progress] Harmonize more constant and data files with pokegold 2020-06-16T18:32:57+00:00 Rangi remy.oukaour+rangi42@gmail.com 2020-06-16T18:11:49+00:00 7b2515d1e47198322407081dfe57c7ca49f22c5f

Update some comments 2020-05-10T05:20:06+00:00 Rangi remy.oukaour+rangi42@gmail.com 2020-05-10T00:07:01+00:00 abf3858fc4bc317f8cd43e04b46d5a11d14927de

Add suffixes to some constants to avoid ambiguity 2020-03-21T21:59:26+00:00 Rangi remy.oukaour+rangi42@gmail.com 2020-03-21T21:50:44+00:00 0345e4fb0e3f39a038e9eced72380a5a1ab6694f - `PSYCHIC` → `PSYCHIC_TYPE` (not the trainer `PSYCHIC_T` or the move `PSYCHIC_M`) - `BLACKBELT` → `BLACKBELT_I` (not the trainer `BLACKBELT_T`) - `CURSE_T` → `CURSE_TYPE` (not the move `CURSE`) - `TOWN_MAP_D` → `TOWN_MAP_POSTER` (not the item `TOWN_MAP`) This also uncovered a misidentified event: `EVENT_DECO_PLANT_4` → `EVENT_DECO_POSTER_1`. (There are three plants and four posters.)
- `PSYCHIC` → `PSYCHIC_TYPE` (not the trainer `PSYCHIC_T` or the move `PSYCHIC_M`)
- `BLACKBELT` → `BLACKBELT_I` (not the trainer `BLACKBELT_T`)
- `CURSE_T` → `CURSE_TYPE` (not the move `CURSE`)
- `TOWN_MAP_D` → `TOWN_MAP_POSTER` (not the item `TOWN_MAP`)

This also uncovered a misidentified event: `EVENT_DECO_PLANT_4` → `EVENT_DECO_POSTER_1`. (There are three plants and four posters.)
This event isn't Crystal-exclusive. 2018-10-03T06:53:04+00:00 IIMarckus iimarckus@gmail.com 2018-10-03T06:53:04+00:00 603524b4896f38c2d6163308277a74b44d22be8f

Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-04T00:42:56+00:00 Rangi remy.oukaour+rangi42@gmail.com 2018-02-03T23:21:53+00:00 32ed487a476e01759d3d9dbc818d8566ae2c9cb7 # 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
# 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
EVENT_TEMPORARY_UNTIL_MAP_RELOAD_[1-8] (close issue #481) 2018-01-24T15:46:49+00:00 Rangi remy.oukaour+rangi42@gmail.com 2018-01-24T15:46:49+00:00 505a6595bc32dd687500f2e0561fcf4e9f8fca8c

Prefix wram labels with w, part 2. 2018-01-23T22:39:09+00:00 luckytyphlosion 10688458+luckytyphlosion@users.noreply.github.com 2018-01-23T22:39:09+00:00 a1951cefc09035e11077a433b28ec8c66b3b03db