Remy Oukaour 4c35f3ac85 Merge branch 'master' of https://github.com/pret/pokecrystal ...

# Conflicts:
#	macros/scripts/maps.asm

2017-12-28 20:56:21 -05:00

..

battle_anims

endm -> ENDM

2017-12-28 22:31:16 +01:00

decorations

Move more decoration data to data/

2017-12-27 11:56:03 -05:00

items

Uppercase MACRO and EQU(S) according to the style guide

2017-12-28 13:23:44 +01:00

maps

Consistent (x, y) coordinate formatting in map scripts

2017-12-28 14:31:25 -05:00

mobile

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

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

moves

Remove redundant data/ filename prefixes

2017-12-27 01:29:15 -05:00

palettes

endm -> ENDM

2017-12-28 22:31:16 +01:00

pokemon

Remove redundant data/ filename prefixes

2017-12-27 01:29:15 -05:00

sprite_anims

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

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

time_capsule

More consistent data tables

2017-12-11 22:59:30 -05:00

trainers

Remove redundant data/ filename prefixes

2017-12-27 01:29:15 -05:00

wild

endm -> ENDM

2017-12-28 22:31:16 +01:00

battle_command_pointers.asm

Remove redundant data/ filename prefixes

2017-12-27 01:29:15 -05:00

battle_tower_2.asm

Rename several script commands

2015-11-25 10:16:29 -05:00

battle_tower.asm

Move all misc/ and unknown/ files to meaningful directories

2017-12-15 13:21:47 -05:00

bug_contest_winners.asm

Move more data tables into data/ files.

2017-12-11 15:20:32 -05:00

collision_permissions.asm

Define constants for collision types

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

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

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

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

default_names.asm

event/ → events/, and move some appropriate engine/ files there

2017-12-26 21:55:57 -05:00

default_options.asm

Keep table labels in the same files as their contents.

2017-12-11 22:44:25 -05:00

emotes.asm

Lowercase v for VRAM addresses

2017-12-28 13:32:33 +01:00

engine_flags.asm

Prefix engine_flags wram addresses with w

2017-12-28 13:15:46 +01:00

facings.asm

Move lots of data tables into individual data/ files

2017-12-11 14:23:18 -05:00

field_move_blocks.asm

Better file name

2017-12-11 17:13:38 -05:00

growth_rates.asm

Move pic animation documentation to docs/

2017-12-11 23:44:29 -05:00

happiness_changes.asm

Keep table labels in the same files as their contents.

2017-12-11 22:44:25 -05:00

icon_pointers.asm

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

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

mail_input_chars.asm

Keep table labels in the same files as their contents.

2017-12-11 22:44:25 -05:00

map_objects.asm

endm -> ENDM

2017-12-28 22:31:16 +01:00

mystery_gift_decos.asm

Split battle/ into data/ and engine/ components

2017-12-26 17:47:05 -05:00

mystery_gift_items.asm

Split battle/ into data/ and engine/ components

2017-12-26 17:47:05 -05:00

name_input_chars.asm

Move more data tables into data/ files.

2017-12-11 15:20:32 -05:00

npc_trades.asm

Keep table labels in the same files as their contents.

2017-12-11 22:44:25 -05:00

odd_eggs.asm

endm -> ENDM

2017-12-28 22:31:16 +01:00

phone_contacts.asm

endm -> ENDM

2017-12-28 22:31:16 +01:00

phone_special.asm

endm -> ENDM

2017-12-28 22:31:16 +01:00

sgb_border_map.asm

Clean up color/palette code

2017-12-25 12:41:31 -05:00

sprite_mons.asm

Keep table labels in the same files as their contents.

2017-12-11 22:44:25 -05:00

sprites.asm

Rename: emote_headers, sprite_headers, cry_headers, gfx_headers, tileset_headers

2017-12-26 12:50:32 -05:00

text_buffers.asm

Move some more main.asm routines into individual files

2017-12-16 19:00:50 -05:00

type_matchups.asm

Various cleanup

2017-12-26 20:33:41 -05:00

type_names.asm

Split battle/ into data/ and engine/ components

2017-12-26 17:47:05 -05:00

unown_words.asm

endm -> ENDM

2017-12-28 22:31:16 +01:00