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
|
dfcca93b45
|
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
# Conflicts:
# engine/battle/core.asm
# engine/save.asm
|
2018-01-14 23:00:22 -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 |
|
Remy Oukaour
|
eb3102200f
|
More Battle Tower map script constants, fewer raw hex values
|
2018-01-14 19:26:55 -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 |
|
Adelaide Walter
|
501ec9b283
|
Fix macro formatting.
|
2018-01-03 11:57:34 -05:00 |
|
Adelaide Walter
|
fb825a800e
|
Label MobileCrashCheckPointer and consolidate relevant functions.
|
2018-01-02 23:16:56 -05:00 |
|
Adelaide Walter
|
0caea0f820
|
Use BANK for all hardcoded banks with BANK in comments.
|
2018-01-02 16:46:40 -05:00 |
|
xCrystal
|
d7970f749a
|
Consistent predef function names
|
2018-01-02 18:49:25 +01:00 |
|
xCrystal
|
b4a49351c1
|
Finish consistent Special function names
|
2018-01-02 17:47:58 +01:00 |
|
xCrystal
|
6f0b81504d
|
More unreferenced labels cleanup
|
2018-01-02 16:04:21 +01:00 |
|
xCrystal
|
37369d1ae0
|
Rename Pals labels in WRAM bank 5
|
2018-01-01 20:09:53 +01:00 |
|
xCrystal
|
6e12a51503
|
Use more palette(s) constants
|
2018-01-01 20:09:53 +01:00 |
|
xCrystal
|
333524f0be
|
Lowercase v for VRAM addresses
|
2017-12-28 13:32:33 +01: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
|
c66d195089
|
callba/callab → farcall/callfar
|
2017-12-24 12:47:30 -05:00 |
|
Remy Oukaour
|
25a3960646
|
Move some more main.asm routines into individual files
|
2017-12-16 19:00:50 -05:00 |
|
Remy Oukaour
|
ebf3bfb6b2
|
Move some misc/ files into meaningful directories
|
2017-12-15 12:53:33 -05:00 |
|