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
|
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 |
|
Remy Oukaour
|
c66d195089
|
callba/callab → farcall/callfar
|
2017-12-24 12:47:30 -05:00 |
|
Remy Oukaour
|
e48a401290
|
Reorganize macros
|
2017-12-14 00:36:24 -05:00 |
|
pikalaxalt
|
87b733994b
|
SPRITE_ANIM_FRAME_IDX constants
|
2016-05-15 22:00:17 -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
|
3d36f1a837
|
Events and some WRAM cleanup
|
2015-12-18 20:07:09 -05:00 |
|
PikalaxALT
|
812976cee6
|
bgcoord
|
2015-11-20 11:47:52 -05:00 |
|
PikalaxALT
|
bc1870e3f4
|
Save, Bill's PC
|
2015-11-17 23:29:14 -05:00 |
|
PikalaxALT
|
ba05bfeafe
|
Move some gfx files around, also clock reset fn
|
2015-11-10 11:05:26 -05:00 |
|
PikalaxALT
|
119d6b4119
|
About time I got to these functions
|
2015-10-24 10:39:52 -04:00 |
|
yenatch
|
a129ba7b43
|
Nail down the rest of SRAM banks 0 and 1.
|
2015-08-20 23:03:05 -07: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
|
72ff6fd0b0
|
home/time.asm: fix a label def
|
2013-11-29 02:29:48 -05:00 |
|
Mr Wint
|
c666d1014a
|
* make jumps and calls use labels
|
2013-10-02 06:53:35 +02:00 |
|
Mr Wint
|
eb5a7afe2b
|
* more callab/callba macros
|
2013-10-02 02:47:54 +02:00 |
|
Mr Wint
|
255135d187
|
* extracted and added a bunch of assembly
|
2013-10-01 23:23:21 +02:00 |
|
yenatch
|
84a9b3907b
|
rename common/ to home/
|
2013-09-09 22:44:48 -04:00 |
|