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 |
|
luckytyphlosion
|
a1951cefc0
|
Prefix wram labels with w, part 2.
|
2018-01-23 17:39:09 -05:00 |
|
Rangi
|
c5cc23a35f
|
wGameTimerPause bit flag constants
|
2018-01-23 12:40:29 -05:00 |
|
Adelaide Walter
|
9d0ba6bfd3
|
Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary).
|
2018-01-03 19:12:45 -05:00 |
|
xCrystal
|
9457679af8
|
Prefix engine_flags wram addresses with w
|
2017-12-28 13:15:46 +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 |
|
pikalaxalt
|
e95d42e0af
|
All functions in main.asm have non-generic names
|
2016-05-08 14:11:24 -04:00 |
|
IIMarckus
|
4d532beee6
|
Remove trailing newlines.
|
2015-06-23 12:24:51 -06:00 |
|
yenatch
|
c07ed74a5d
|
Blind wram labels part 4.
|
2015-02-10 15:14:41 -08:00 |
|
yenatch
|
cf2acc1001
|
Use :: to export labels between objects.
This fixes the build.
|
2014-02-01 20:26:39 -05:00 |
|
yenatch
|
84a9b3907b
|
rename common/ to home/
|
2013-09-09 22:44:48 -04:00 |