Remy Oukaour
5c28d05bb4
Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459 )
...
# Conflicts:
# data/items/descriptions.asm
# data/sprite_anims/framesets.asm
# engine/crystal_colors.asm
# engine/events/kurt.asm
# engine/events/special.asm
# engine/events/std_scripts.asm
# engine/events_3.asm
# engine/item_effects.asm
# engine/namingscreen.asm
# engine/scripting.asm
# engine/stats_screen.asm
# engine/trade_animation.asm
# home/audio.asm
# main.asm
# maps/BattleTower1F.asm
# maps/BattleTowerBattleRoom.asm
# maps/BurnedTowerB1F.asm
# maps/ElmsLab.asm
# maps/GoldenrodDeptStore5F.asm
# maps/GoldenrodUnderground.asm
# maps/HallOfFame.asm
# maps/MahoganyTown.asm
# maps/ManiasHouse.asm
# maps/MobileBattleRoom.asm
# maps/MobileTradeRoomMobile.asm
# maps/RadioTower2F.asm
# maps/Route35NationalParkGate.asm
# maps/Route36NationalParkGate.asm
# maps/Route39Farmhouse.asm
# tilesets/palette_maps.asm
2018-01-14 22:56:36 -05:00
Remy Oukaour
94d6a32721
Use maskbits some more
2018-01-11 14:27:19 -05:00
xCrystal
f1ea15bbfe
Consolidate Special function names
2018-01-02 17:13:57 +01:00
xCrystal
9457679af8
Prefix engine_flags wram addresses with w
2017-12-28 13:15:46 +01:00
Remy Oukaour
c66d195089
callba/callab → farcall/callfar
2017-12-24 12:47:30 -05:00
surskitty
1116180e3c
Renaming RandomPhoneRareWildMon to RandomRareWildMon.
2017-12-13 23:39:47 -05:00
surskitty
8e54adc22f
Labels, including a comment explaining RandomPhoneRareWildMon.
2017-12-13 23:35:07 -05:00
Remy Oukaour
213dcc70d7
More consistent data tables
2017-12-11 22:59:30 -05:00
Remy Oukaour
31cce83e9b
Move lots of data tables into individual data/ files
...
(This is not expected to be their final location, but it makes them easier to relocate when necessary, and easier for users to edit until the whole project's file structure is finalized.)
2017-12-11 14:23:18 -05:00
Remy Oukaour
512863989f
Document constants with comments, actual names, and more thorough usage
2017-12-09 02:15:46 -05:00
pikalaxalt
ae36ef2c7f
Labeled every function in ROM0 that's referenced in the source
2016-05-10 12:31:49 -04:00
pikalaxalt
3713b71d9e
More splitting of main.asm; remove unneeded rept 2
2016-05-04 11:46:23 -04:00
pikalaxalt
bf73772a56
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 14:42:14 -04:00
PikalaxALT
c087d44c42
more gfx-related labels
2016-01-04 08:43:55 -05:00
PikalaxALT
7f68db68ad
underground switches, town map
2015-12-09 11:39:35 -05:00
PikalaxALT
435b0cf686
Options menu, some mobile fns
2015-11-16 16:46:32 -05:00
