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

..

battle

Pkmn -> Mon

2018-02-22 17:39:06 +01:00

battle_anims

Label more ANIM_OBJ_* constants

2018-01-12 13:47:04 -05:00

battle_tower

More Unicode

2018-01-19 02:30:19 -05:00

decorations

EVENT_TEMPORARY_UNTIL_MAP_RELOAD_[1-8] (close issue #481)

2018-01-24 10:46:49 -05:00

events

"chances" → "probabilities", since other files use that term and "changes" exists right next to it

2018-02-04 11:46:53 -05:00

items

No redundant item effect labels

2018-02-05 13:03:05 -05:00

maps

Add ROOF_ constants

2018-02-04 21:39:46 -05:00

mobile

Odds and ends in bank 45 (and more ascii incbins).

2015-02-06 00:19:36 -08:00

moves

Clarify TM/HM move/enum correspondence

2018-01-28 01:20:49 -05:00

phone

Merge branch 'master' of https://github.com/pret/pokecrystal

2018-02-03 19:42:56 -05:00

pokemon

* Remove rept 4 (fa3192e)

2018-02-25 19:23:01 -05:00

radio

Merge branch 'master' of https://github.com/pret/pokecrystal

2018-02-25 20:39:54 -05:00

sprite_anims

wiggle → wobble

2018-01-19 00:16:08 -05:00

sprites

Format map object attributes like trainer attributes, in preparation for bit flag constants

2018-02-25 16:49:03 -05:00

text

Merge branch 'master' of https://github.com/pret/pokecrystal

2018-02-25 20:39:54 -05:00

tilesets

Fix off-by-one error

2018-01-26 20:57:55 -05:00

trainers

NO_ITEM == 0

2018-02-25 16:48:31 -05:00

types

Badge type boosts make sense in data/types/

2018-01-28 01:17:32 -05:00

wild

map → map_id; map_def → map; map_data → map_attributes

2018-02-03 17:11:55 -05:00

collision_permissions.asm

Define constants for collision types

2017-12-12 16:15:58 -05:00

credits_script.asm

Copy pokered's organization some more, with further constant and data files

2017-12-15 17:22:52 -05:00

credits_strings.asm

Japanese characters in Japanese text (e.g. "ォ" not "," for $f4)

2018-01-19 21:49:16 -05:00

default_options.asm

Prefix wram labels with w, part 2.

2018-01-23 17:39:09 -05:00

engine_flags.asm

Correct engine flag constants

2018-01-31 10:55:35 -05:00

growth_rates.asm

Official egg group names

2018-01-31 12:03:43 -05:00

icon_pointers.asm

Use "battle_anims" and "sprite_anims" for clarity, not just "anims"

2017-12-26 18:45:04 -05:00

mon_menu.asm

const_def N

2018-01-31 11:38:45 -05:00

party_menu_qualities.asm

Move party menu qualities to data/

2018-01-11 02:54:07 -05:00

player_names.asm

MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440)

2018-01-23 16:08:43 -05:00

predef_pointers.asm

Pkmn -> Mon

2018-02-22 17:39:06 +01:00

sgb_ctrl_packets.asm

Remove trailing whitespace

2018-01-18 21:48:52 -05:00

special_pointers.asm

* Remove rept 4 (fa3192e)

2018-02-25 19:23:01 -05:00

text_buffers.asm

Prefix wram labels with w, part 2.

2018-01-23 17:39:09 -05:00

tilesets.asm

Make tileset palette maps easier to edit

2018-02-09 13:50:20 -05:00

unused_53d84.asm

Add data/text/

2018-01-22 17:33:52 -05:00