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
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
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
2ab60fa8a4
menu_coords macro for (x1, y1, x2, y2) order (see issue #440 )
2018-01-13 16:38:14 -05:00
d83aefb30a
Use more constants in scripts
2018-01-12 02:27:42 -05:00
f1ea15bbfe
Consolidate Special function names
2018-01-02 17:13:57 +01:00
e3e64fdf59
Move more decoration data to data/
2017-12-27 11:56:03 -05:00
c66d195089
callba/callab → farcall/callfar
2017-12-24 12:47:30 -05:00
cbde91d7ed
Only engine/decorations.asm uses PadCoords_de
2017-12-15 23:59:24 -05:00
f1f84743f7
Keep table labels in the same files as their contents.
2017-12-11 22:44:25 -05:00
31cce83e9b
Move lots of data tables into individual data/ files
...
(This is not expected to be their final location, but it makes them easier to relocate when necessary, and easier for users to edit until the whole project's file structure is finalized.)
2017-12-11 14:23:18 -05:00
cd2a748128
More WRAM cleanup
2017-12-09 22:00:36 -05:00
73c7ea2b43
Local labels starting with underscores have colons depending on whether the first alphanumeric character is capitalized or not
2016-04-10 15:11:37 -04:00
6be4cd4da9
Local labels starting with lowercase letters are no longer decorated with a trailing colon
2016-04-10 15:01:49 -04:00
2a263629a4
Item effects, post-battle, and decoration flags
2015-12-29 16:44:37 -05:00
f030315b1f
jumptable macro repurposed
2015-12-26 21:59:03 -05:00
3d36f1a837
Events and some WRAM cleanup
2015-12-18 20:07:09 -05:00
d644406f61
More menu stuff
2015-12-17 22:31:16 -05:00
77ef8404a1
Menu
2015-12-15 18:59:49 -05:00
a5a8364c35
opentext and breeding
2015-12-09 18:25:44 -05:00
01792e00d2
Rename several script commands
2015-11-25 10:16:29 -05:00
d972564175
link and seer labels
2015-11-23 16:04:53 -05:00
812976cee6
bgcoord
2015-11-20 11:47:52 -05:00
e88c88ff20
engine/decorations.asm
2015-11-17 16:12:27 -05:00
Remy Oukaour