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
|
09ff04dbfc
|
wMenuData3 → w2DMenuData
|
2018-01-23 16:38:52 -05:00 |
|
Remy Oukaour
|
05382d3e3c
|
PARTY_LENGTH; MON_NAME; sgb_border.bin
|
2018-01-20 12:25:55 -05:00 |
|
Remy Oukaour
|
8048082114
|
Remove Predef_ prefix from routines listed in PredefPointers
|
2018-01-16 14:39:28 -05:00 |
|
xCrystal
|
d7970f749a
|
Consistent predef function names
|
2018-01-02 18:49:25 +01: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
|
9bbb65166e
|
More movement stuff
|
2015-12-29 13:15:58 -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
|
987ed1fafb
|
More work on slots; WRAM cleanup, Move Deleter
|
2015-12-19 14:48:30 -05:00 |
|
PikalaxALT
|
3d36f1a837
|
Events and some WRAM cleanup
|
2015-12-18 20:07:09 -05:00 |
|
PikalaxALT
|
77ef8404a1
|
Menu
|
2015-12-15 18:59:49 -05:00 |
|
PikalaxALT
|
5b94d54a6c
|
More work on animations
|
2015-12-04 08:46:11 -05:00 |
|
PikalaxALT
|
be082943ed
|
More work interpreting the sprite engine
|
2015-12-02 13:24:18 -05:00 |
|
PikalaxALT
|
8612a4a531
|
Renaming sections, further dissolving main.asm
|
2015-11-28 15:13:40 -05:00 |
|