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
d719d318e8
Remove Special_ prefix from special routines ( close #478 )
2018-01-24 11:17:05 -05:00
Rangi
132fe46925
Rename some routines to avoid conflicts when removing "Special_" prefixes
2018-01-24 11:12:02 -05:00
luckytyphlosion
a1951cefc0
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
Rangi
ead103d2c6
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440 )
2018-01-23 16:08:43 -05:00
Remy Oukaour
a8eb44b6e3
Separate new_game graphics
2018-01-21 13:58:16 -05:00
Remy Oukaour
163f3e0c3f
Local UI tiles don't belong in charmap
...
Separate 1bpp font tiles from gfx/mobile/phone_tiles.png
2018-01-11 22:49:45 -05:00
xCrystal
333524f0be
Lowercase v for VRAM addresses
2017-12-28 13:32:33 +01:00
Remy Oukaour
e34e68095d
Resolve #428 : Use HIGH(X) and LOW(X) instead of X / $100 and X % $100 or X >> 8 and X & $ff
2017-12-25 14:23:16 -05:00
Remy Oukaour
c66d195089
callba/callab → farcall/callfar
2017-12-24 12:47:30 -05:00
Remy Oukaour
1d2df3bba1
Some more WRAM cleanup
2017-12-23 11:34:55 -05:00
Remy Oukaour
c2ad79c4f2
Add constants for time-of-day boundaries
...
Split off more misc constants into proper files
2017-12-11 12:20:01 -05:00
Remy Oukaour
41acb0667a
Document macros/map.asm
...
Rename MORN/DAY/NITE to MORN_F/DAY_F/NITE_F; use MORN/DAY/NITE for shifted values (cleaner for person_events)
Prefix FLOOR to the `elevfloor` constants
2017-12-11 01:02:28 -05:00
Remy Oukaour
32ea595c47
Move some gfx/unknown/ files into meaningful directories
2017-12-09 23:37:08 -05:00
Remy Oukaour
16c6696dd5
Start organizing WRAM
...
- Use db and dw when they're more meaningful than ds 1/2
- Use unions to group related labels
2017-12-09 13:58:49 -05:00
yenatch
803c5154f4
pngs in gfx/unknown
2017-06-24 16:27:52 -04:00
pikalaxalt
d7a01e92e9
Remaining layout constants
2016-06-06 18:23:00 -04:00
pikalaxalt
ae36ef2c7f
Labeled every function in ROM0 that's referenced in the source
2016-05-10 12:31:49 -04:00
pikalaxalt
e95d42e0af
All functions in main.asm have non-generic names
2016-05-08 14:11:24 -04:00
pikalaxalt
3713b71d9e
More splitting of main.asm; remove unneeded rept 2
2016-05-04 11:46:23 -04:00
pikalaxalt
6be4cd4da9
Local labels starting with lowercase letters are no longer decorated with a trailing colon
2016-04-10 15:01:49 -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
9bbb65166e
More movement stuff
2015-12-29 13:15:58 -05:00
PikalaxALT
3d36f1a837
Events and some WRAM cleanup
2015-12-18 20:07:09 -05:00
PikalaxALT
01792e00d2
Rename several script commands
2015-11-25 10:16:29 -05:00
PikalaxALT
812976cee6
bgcoord
2015-11-20 11:47:52 -05:00
PikalaxALT
042fc4bfe5
Split up some more banks in main.asm
2015-11-16 21:46:36 -05:00
