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
3203ad7d50
Fix comment/style issues caused from w-izing.
2018-01-30 14:05:25 -05:00
a1951cefc0
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
ead103d2c6
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440 )
2018-01-23 16:08:43 -05:00
c66d195089
callba/callab → farcall/callfar
2017-12-24 12:47:30 -05:00
6be4cd4da9
Local labels starting with lowercase letters are no longer decorated with a trailing colon
2016-04-10 15:01:49 -04:00
f030315b1f
jumptable macro repurposed
2015-12-26 21:59:03 -05:00
a5e928eb98
writebackup --> closewindow; game corner prize vendors; others
2015-12-24 22:58:42 -05:00
30b37da387
More stats screen shenanigans
2015-12-22 22:19:33 -05:00
77ef8404a1
Menu
2015-12-15 18:59:49 -05:00
01792e00d2
Rename several script commands
2015-11-25 10:16:29 -05:00
d13fb46d40
enum macros/move_anim.asm, resolve battle/anims.asm function labels
2015-11-10 16:53:37 -05:00
cf5d726b7f
Mon submenu, engine/menu.asm
2015-11-04 14:02:11 -05:00
3b4805ee98
Sweepthrough of ClearBox arg conversion to lb
2015-11-01 09:38:48 -05:00
119d6b4119
About time I got to these functions
2015-10-24 10:39:52 -04:00
4fa6c6daa4
Split up bank 2; other relabelings
2015-10-16 13:35:43 -04:00
c8960dd2c8
Various annotations
...
Annotated the SGB functions in predef/sgb.asm, and some of the map scripts. Renamed several functions in home. Renamed six WRAM addresses corresponding to party icon animations, and renamed several others relative to these.
2015-07-22 15:57:02 -04:00
471492b775
Reverted ld_hl_pointer macro
2015-07-20 22:18:18 -04:00
4d532beee6
Remove trailing newlines.
2015-06-23 12:24:51 -06:00
c07ed74a5d
Blind wram labels part 4.
2015-02-10 15:14:41 -08:00
cf2acc1001
Use :: to export labels between objects.
...
This fixes the build.
2014-02-01 20:26:39 -05:00
d2dc732600
split some more and recomment more home asm
2013-11-27 14:45:42 -05:00
Rangi