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 |
|
Remy Oukaour
|
59c95abf83
|
Trim whitespace
|
2018-01-12 17:09:32 -05:00 |
|
Remy Oukaour
|
d83aefb30a
|
Use more constants in scripts
|
2018-01-12 02:27:42 -05:00 |
|
Remy Oukaour
|
2f0973f3e0
|
Clean up some hex values in map scripts
|
2018-01-09 18:45:25 -05:00 |
|
xCrystal
|
f1ea15bbfe
|
Consolidate Special function names
|
2018-01-02 17:13:57 +01:00 |
|
Remy Oukaour
|
84e22eb578
|
Consistent (x, y) coordinate formatting in map scripts
|
2017-12-28 14:31:25 -05:00 |
|
Remy Oukaour
|
c05b7f41dd
|
Renaming: (fix #412)
- MapTriggers / maptrigger → SceneScripts / scene_script
- XYTriggers / xy_trigger → CoordEvents / coord_event
- Signposts / signpost → BGEvents / bg_event
- PersonEvents / person_event → ObjectEvents / object_event
|
2017-12-24 14:33:17 -05:00 |
|
Remy Oukaour
|
3ed016f9e0
|
Auto-label more map scripts
|
2017-12-17 20:17:30 -05:00 |
|
Remy Oukaour
|
b4261d27d8
|
Use new palette constants
|
2017-12-10 20:50:08 -05: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
|
a5e928eb98
|
writebackup --> closewindow; game corner prize vendors; others
|
2015-12-24 22:58:42 -05:00 |
|
PikalaxALT
|
d644406f61
|
More menu stuff
|
2015-12-17 22:31:16 -05:00 |
|
PikalaxALT
|
77ef8404a1
|
Menu
|
2015-12-15 18:59:49 -05:00 |
|
PikalaxALT
|
a5a8364c35
|
opentext and breeding
|
2015-12-09 18:25:44 -05:00 |
|
PikalaxALT
|
0eb0c40ba7
|
buttonsound
|
2015-11-29 22:29:45 -05:00 |
|
PikalaxALT
|
0d944f5915
|
Person event constants for each map
|
2015-11-27 00:22:14 -05:00 |
|
PikalaxALT
|
01792e00d2
|
Rename several script commands
|
2015-11-25 10:16:29 -05:00 |
|
PikalaxALT
|
0b8fe4bac3
|
More specials; bank 12 mobile
|
2015-11-16 22:29:54 -05:00 |
|
PikalaxALT
|
36470537e0
|
Globally introduce PERSONTYPE constants
|
2015-11-15 15:07:20 -05:00 |
|
PikalaxALT
|
3cadc7b012
|
give/takeitem *, 1: the 1 is optional
|
2015-11-04 20:20:14 -05:00 |
|
PikalaxALT
|
739bb3c136
|
Replace party struct relative values with EQUS constants
|
2015-11-04 11:31:00 -05:00 |
|
PikalaxALT
|
fda1f7c01a
|
SPRITEMOVEDATA
|
2015-10-31 21:05:02 -04:00 |
|