Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
346a93c00f68c573fcd95784e21b7ed77517b714
pokecrystal/data
History
Remy Oukaour 14c8cf5b48 Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452) 
# Conflicts:
#	data/player_names.asm
#	engine/battle/menu.asm
#	engine/billspc.asm
#	engine/billspctop.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/delete_save_change_clock.asm
#	engine/events/buena.asm
#	engine/events/elevator.asm
#	engine/events/kurt.asm
#	engine/events/mom.asm
#	engine/events/move_tutor.asm
#	engine/events/pokecenter_pc.asm
#	engine/events/pokepic.asm
#	engine/events/std_scripts.asm
#	engine/events/unown_walls.asm
#	engine/init_gender.asm
#	engine/intro_menu.asm
#	engine/mail.asm
#	engine/main_menu.asm
#	engine/mart.asm
#	engine/menu_2.asm
#	engine/mon_menu.asm
#	engine/pack.asm
#	engine/slot_machine.asm
#	engine/start_menu.asm
#	home/menu.asm
#	maps/CeladonDeptStore6F.asm
#	maps/CeladonGameCornerPrizeRoom.asm
#	maps/DragonShrine.asm
#	maps/EarlsPokemonAcademy.asm
#	maps/GoldenrodCity.asm
#	maps/GoldenrodDeptStore6F.asm
#	maps/GoldenrodGameCorner.asm
#	maps/GoldenrodPokeComCenter2FMobile.asm
#	mobile/mobile_12.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_22.asm
#	mobile/mobile_22_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_45.asm
#	mobile/mobile_45_sprite_engine.asm
#	mobile/mobile_46.asm
#	mobile/mobile_5c.asm
#	mobile/mobile_5f.asm
#	mobile/mobile_menu.asm
2018-01-14 23:43:51 -05:00
..
battle
Other files belong in data/battle/
2018-01-10 17:49:19 -05:00
battle_anims
Label more ANIM_OBJ_* constants
2018-01-12 13:47:04 -05:00
battle_tower
Constant swap explains this Battle Tower bug
2018-01-10 02:55:44 -05:00
common_text
includes.asm → constants.asm
2018-01-09 00:36:15 -05:00
decorations
Group item and deco data more
2018-01-11 01:54:49 -05:00
items
Move code out of data/
2018-01-12 03:15:58 -05:00
maps
Easier to find palette data
2018-01-12 03:07:48 -05:00
mobile
Odds and ends in bank 45 (and more ascii incbins).
2015-02-06 00:19:36 -08:00
moves
Label more ANIM_OBJ_* constants
2018-01-12 13:47:04 -05:00
phone
More constants and data tables
2018-01-11 01:45:27 -05:00
pokemon
Egg palette works like other Pokémon
2018-01-12 15:06:25 -05:00
radio
Move radio channel data into data/
2018-01-10 11:30:12 -05:00
sprite_anims
Merge branch 'patch' of https://github.com/mid-kid/pokecrystal
2018-01-12 17:23:50 -05:00
sprites
Group some mutually edited files in data/sprites/
2018-01-10 18:10:01 -05:00
tilesets
Split tilesets/ into gfx/tilesets and data/tilesets/
2018-01-09 23:53:58 -05:00
trainers
Arrays end with -1, not $ff
2018-01-10 22:53:42 -05:00
types
More constants and data tables
2018-01-11 01:45:27 -05:00
unused_text
Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)
2018-01-14 22:56:36 -05:00
wild
Battle data goes in data/battle/
2018-01-10 17:30:27 -05:00
bug_contest_flags.asm
Use maskbits some more
2018-01-11 14:27:19 -05:00
bug_contest_winners.asm
Use maskbits some more
2018-01-11 14:27:19 -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_options.asm
Scrub WRAM addresses from comments & use WRAM1_Begin where appropriate.
2018-01-03 00:19:54 -05:00
elevator_floors.asm
More constants and data tables
2018-01-11 01:45:27 -05:00
engine_flags.asm
Prefix engine_flags wram addresses with w
2017-12-28 13:15:46 +01: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
name_input_chars.asm
Move more data tables into data/ files.
2017-12-11 15:20:32 -05:00
npc_trades.asm
Use maskbits some more
2018-01-11 14:27:19 -05:00
odd_eggs.asm
endm -> ENDM
2017-12-28 22:31:16 +01:00
party_menu_qualities.asm
Move party menu qualities to data/
2018-01-11 02:54:07 -05:00
player_names.asm
Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)
2018-01-14 23:43:51 -05:00
std_text.asm
Move text/ into data/
2018-01-09 00:23:48 -05:00
text_buffers.asm
Move some more main.asm routines into individual files
2017-12-16 19:00:50 -05:00
tilesets.asm
gfx/*.asm files have INCBINs
2018-01-10 02:38:45 -05:00
unknown_table.asm
Clean up leftover code from main.asm
2018-01-02 16:25:40 +01:00
unown_walls.asm
Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)
2018-01-14 23:43:51 -05:00
unown_words.asm
endm -> ENDM
2017-12-28 22:31:16 +01:00