PikalaxALT 6b2d0ae841 Fix merge conflicts

2015-11-01 18:19:52 -05:00

..

animation_constants.asm

Remove trailing newlines.

2015-06-23 12:24:51 -06:00

battle_constants.asm

Move battle start animation functions to its own file

2015-10-19 10:23:58 -04:00

deco_constants.asm

Happiness and Mystery Gift constants

2015-10-12 12:33:24 -04:00

engine_flags.asm

Macro update, roam mon annotations

2015-07-25 19:02:36 -04:00

event_flags.asm

More label updates, moved predefs to new file

2015-07-20 03:51:52 -04:00

gfx_constants.asm

SPRITEMOVEDATA

2015-10-31 21:05:02 -04:00

item_constants.asm

ITEMMENU_CLOSE is now ITEMMENU_FIELD

2015-10-25 20:43:39 -04:00

landmark_constants.asm

Remove trailing newlines.

2015-06-23 12:24:51 -06:00

map_constants.asm

SPRITEMOVEDATA

2015-10-31 21:05:02 -04:00

map_setup_constants.asm

Address comments on PR 322

2015-10-24 19:49:19 -04:00

misc_constants.asm

Fix merge conflicts

2015-11-01 18:19:52 -05:00

move_constants.asm

Remove trailing newlines.

2015-06-23 12:24:51 -06:00

music_constants.asm

Replace EVENT_ALWAYS_THERE with -1

2015-07-13 00:18:01 -04:00

phone_constants.asm

About time I got to these functions

2015-10-24 10:39:52 -04:00

pokemon_constants.asm

Replaced MON_ constants with aliases

2015-07-20 20:21:46 -04:00

pokemon_data_constants.asm

Wild Pokemon functions and data

2015-07-23 03:51:15 -04:00

radio_constants.asm

More radio labels

2015-10-09 23:09:03 -04:00

script_constants.asm

About time I got to these functions

2015-10-24 10:39:52 -04:00

sfx_constants.asm

Macro update, roam mon annotations

2015-07-25 19:02:36 -04:00

sprite_constants.asm

SPRITEMOVEDATA

2015-10-31 21:05:02 -04:00

std_constants.asm

Replace EVENT_ALWAYS_THERE with -1

2015-07-13 00:18:01 -04:00

tilemap_constants.asm

Restructured functions in main.asm to resemble the home functions they clone

2015-10-17 13:00:34 -04:00

trainer_constants.asm

Address comments on PR 322

2015-10-24 19:49:19 -04:00

type_constants.asm

Recomment type names.

2014-07-09 12:50:33 -07:00

wram_constants.asm

More labels, including fns responsible for partymon generation

2015-10-07 13:19:41 -04:00