Rangi
|
32ed487a47
|
Merge branch 'master' of https://github.com/pret/pokecrystal
# 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
|
2018-02-03 19:42:56 -05:00 |
|
Rangi
|
50f6007cc2
|
No need for ==== lines
|
2018-01-31 10:36:27 -05:00 |
|
Rangi
|
9ac2cea1f7
|
Align columns
|
2018-01-31 00:46:03 -05:00 |
|
Rangi
|
96ae7a7ee3
|
More compact trainer data
|
2018-01-31 00:37:03 -05:00 |
|
Rangi
|
d260b5f185
|
Compact trainer data
|
2018-01-31 00:07:11 -05:00 |
|
luckytyphlosion
|
a1951cefc0
|
Prefix wram labels with w, part 2.
|
2018-01-23 17:39:09 -05:00 |
|
Rangi
|
7cef012335
|
wUnlockedUnowns engine flag constants
Use local labels for "End"ings
|
2018-01-22 13:00:35 -05:00 |
|
Remy Oukaour
|
0082dcdd62
|
Missing comment
|
2018-01-18 22:38:20 -05:00 |
|
Remy Oukaour
|
a9f8aeb94e
|
Remove trailing whitespace
|
2018-01-18 21:48:52 -05:00 |
|
Remy Oukaour
|
0a3b251dcb
|
Arrays end with -1, not $ff
|
2018-01-10 22:53:42 -05:00 |
|
Remy Oukaour
|
a849c3557b
|
More comments
Fix some constants
|
2018-01-09 15:39:48 -05:00 |
|
Remy Oukaour
|
a3242b4ad4
|
Simpler comments
|
2018-01-09 15:23:03 -05:00 |
|
Remy Oukaour
|
cb92b7bbf0
|
Indent with tabs
|
2018-01-09 15:20:21 -05:00 |
|
Remy Oukaour
|
5a73a62d9b
|
Move battle engine data into data/
IsJohtoGymLeader → IsGymLeader
|
2018-01-09 15:12:49 -05:00 |
|
Remy Oukaour
|
bdd3a55333
|
Organize mobile/battle_tower_*.asm data and code
|
2018-01-06 18:53:30 -05:00 |
|
Remy Oukaour
|
7a4d641251
|
Remove redundant data/ filename prefixes
|
2017-12-27 01:29:15 -05:00 |
|
Remy Oukaour
|
35a3a19fda
|
Use "battle_anims" and "sprite_anims" for clarity, not just "anims"
|
2017-12-26 18:45:04 -05:00 |
|
Remy Oukaour
|
253c09949b
|
Move data/audio/ back into audio/
Keep trainer data together
|
2017-12-15 12:38:59 -05:00 |
|
Remy Oukaour
|
6ab1d028bb
|
Split items/ and trainers/ into their data/ and engine/ components
Move some data into a pokemon/ subdirectory
|
2017-12-14 23:00:54 -05:00 |
|