Remy Oukaour
|
14c8cf5b48
|
Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)
# Conflicts:
# data/player_names.asm
# engine/battle/menu.asm
# engine/billspc.asm
# engine/billspctop.asm
# engine/buy_sell_toss.asm
# engine/decorations.asm
# engine/delete_save_change_clock.asm
# engine/events/buena.asm
# engine/events/elevator.asm
# engine/events/kurt.asm
# engine/events/mom.asm
# engine/events/move_tutor.asm
# engine/events/pokecenter_pc.asm
# engine/events/pokepic.asm
# engine/events/std_scripts.asm
# engine/events/unown_walls.asm
# engine/init_gender.asm
# engine/intro_menu.asm
# engine/mail.asm
# engine/main_menu.asm
# engine/mart.asm
# engine/menu_2.asm
# engine/mon_menu.asm
# engine/pack.asm
# engine/slot_machine.asm
# engine/start_menu.asm
# home/menu.asm
# maps/CeladonDeptStore6F.asm
# maps/CeladonGameCornerPrizeRoom.asm
# maps/DragonShrine.asm
# maps/EarlsPokemonAcademy.asm
# maps/GoldenrodCity.asm
# maps/GoldenrodDeptStore6F.asm
# maps/GoldenrodGameCorner.asm
# maps/GoldenrodPokeComCenter2FMobile.asm
# mobile/mobile_12.asm
# mobile/mobile_12_2.asm
# mobile/mobile_22.asm
# mobile/mobile_22_2.asm
# mobile/mobile_40.asm
# mobile/mobile_45.asm
# mobile/mobile_45_sprite_engine.asm
# mobile/mobile_46.asm
# mobile/mobile_5c.asm
# mobile/mobile_5f.asm
# mobile/mobile_menu.asm
|
2018-01-14 23:43:51 -05:00 |
|
Remy Oukaour
|
5c28d05bb4
|
Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)
# Conflicts:
# data/items/descriptions.asm
# data/sprite_anims/framesets.asm
# engine/crystal_colors.asm
# engine/events/kurt.asm
# engine/events/special.asm
# engine/events/std_scripts.asm
# engine/events_3.asm
# engine/item_effects.asm
# engine/namingscreen.asm
# engine/scripting.asm
# engine/stats_screen.asm
# engine/trade_animation.asm
# home/audio.asm
# main.asm
# maps/BattleTower1F.asm
# maps/BattleTowerBattleRoom.asm
# maps/BurnedTowerB1F.asm
# maps/ElmsLab.asm
# maps/GoldenrodDeptStore5F.asm
# maps/GoldenrodUnderground.asm
# maps/HallOfFame.asm
# maps/MahoganyTown.asm
# maps/ManiasHouse.asm
# maps/MobileBattleRoom.asm
# maps/MobileTradeRoomMobile.asm
# maps/RadioTower2F.asm
# maps/Route35NationalParkGate.asm
# maps/Route36NationalParkGate.asm
# maps/Route39Farmhouse.asm
# tilesets/palette_maps.asm
|
2018-01-14 22:56:36 -05:00 |
|
mid-kid
|
11d67567d2
|
Use constants for menu flags
Added a bunch of constants for the bitflags of each kind of menu. Some
are slightly vague or too long, but I'm not sure how to else name them.
|
2018-01-14 11:59:56 +01:00 |
|
Remy Oukaour
|
2ab60fa8a4
|
menu_coords macro for (x1, y1, x2, y2) order (see issue #440)
|
2018-01-13 16:38:14 -05:00 |
|
xCrystal
|
6f0b81504d
|
More unreferenced labels cleanup
|
2018-01-02 16:04:21 +01:00 |
|
xCrystal
|
def3b60493
|
Clean up .Jumptable: spaces
|
2017-12-29 13:52:42 +01:00 |
|
xCrystal
|
9457679af8
|
Prefix engine_flags wram addresses with w
|
2017-12-28 13:15:46 +01:00 |
|
Remy Oukaour
|
c66d195089
|
callba/callab → farcall/callfar
|
2017-12-24 12:47:30 -05:00 |
|
pikalaxalt
|
d7a01e92e9
|
Remaining layout constants
|
2016-06-06 18:23:00 -04:00 |
|
pikalaxalt
|
8c26547645
|
Mobile and more battle anims
|
2016-05-05 15:07:37 -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
|
599e6e8d16
|
Battle animation annotations
|
2016-03-01 22:31:21 -05:00 |
|
PikalaxALT
|
f030315b1f
|
jumptable macro repurposed
|
2015-12-26 21:59:03 -05:00 |
|
PikalaxALT
|
a5e928eb98
|
writebackup --> closewindow; game corner prize vendors; others
|
2015-12-24 22:58:42 -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
|
d644406f61
|
More menu stuff
|
2015-12-17 22:31:16 -05:00 |
|
PikalaxALT
|
7203e9d2cc
|
Map script and color shenanigans
|
2015-12-16 21:57:42 -05:00 |
|
PikalaxALT
|
77ef8404a1
|
Menu
|
2015-12-15 18:59:49 -05:00 |
|
PikalaxALT
|
6e257bc7cd
|
mystery gift, credits
|
2015-12-14 20:06:41 -05:00 |
|
PikalaxALT
|
acd92eee94
|
Pack
|
2015-12-13 14:15:16 -05:00 |
|
PikalaxALT
|
ecd277204a
|
Card Flip
|
2015-12-11 16:59:40 -05:00 |
|
PikalaxALT
|
58020fb5f6
|
trade animation
|
2015-11-23 00:21:21 -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
|
0b8fe4bac3
|
More specials; bank 12 mobile
|
2015-11-16 22:29:54 -05:00 |
|