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
|
b4e087167f
|
More unreferenced labels and unused text
|
2018-01-02 19:38:56 +01:00 |
|
Remy Oukaour
|
c66d195089
|
callba/callab → farcall/callfar
|
2017-12-24 12:47:30 -05:00 |
|
Remy Oukaour
|
cd2a748128
|
More WRAM cleanup
|
2017-12-09 22:00:36 -05:00 |
|
pikalaxalt
|
ae36ef2c7f
|
Labeled every function in ROM0 that's referenced in the source
|
2016-05-10 12:31:49 -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
|
3d36f1a837
|
Events and some WRAM cleanup
|
2015-12-18 20:07:09 -05:00 |
|
PikalaxALT
|
91068077f0
|
Further split bank 4
|
2015-11-11 16:15:06 -05:00 |
|
PikalaxALT
|
4b35fa0582
|
Added w3 and w5 labels for misc/mobile_40.asm
|
2015-11-10 23:23:28 -05:00 |
|
PikalaxALT
|
d13fb46d40
|
enum macros/move_anim.asm, resolve battle/anims.asm function labels
|
2015-11-10 16:53:37 -05:00 |
|
PikalaxALT
|
ba05bfeafe
|
Move some gfx files around, also clock reset fn
|
2015-11-10 11:05:26 -05:00 |
|