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
|
ead103d2c6
|
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440)
|
2018-01-23 16:08:43 -05:00 |
|
xCrystal
|
6f0b81504d
|
More unreferenced labels cleanup
|
2018-01-02 16:04:21 +01:00 |
|
Remy Oukaour
|
b40181db41
|
Use input constants
|
2017-12-30 12:35:50 -05: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
|
599e6e8d16
|
Battle animation annotations
|
2016-03-01 22:31:21 -05:00 |
|
PikalaxALT
|
630d789c70
|
More link trade shenanigans
|
2015-12-21 14:10:16 -05:00 |
|
PikalaxALT
|
047effba94
|
Menu joy flags; started with link address space
|
2015-12-20 12:54:08 -05:00 |
|
PikalaxALT
|
d644406f61
|
More menu stuff
|
2015-12-17 22:31:16 -05:00 |
|