summaryrefslogtreecommitdiff
path: root/maps
AgeCommit message (Collapse)Author
2018-01-14Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR ↵Remy Oukaour
#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-14More Battle Tower map script constants, fewer raw hex valuesRemy Oukaour
2018-01-14Use constants for menu flagsmid-kid
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-13menu_coords macro for (x1, y1, x2, y2) order (see issue #440)Remy Oukaour
2018-01-13Label Dragon ShrineRemy Oukaour
2018-01-13Consistent stonetable cmdqueuesRemy Oukaour
2018-01-13Introduce callback, hiddenitem, conditional_event, and cmdqueue macros for ↵Remy Oukaour
map scripts
2018-01-12Trim whitespaceRemy Oukaour
2018-01-12SaffronMagnetTrainStationRemy Oukaour
2018-01-12Use more constants in scriptsRemy Oukaour
2018-01-11Use constants and data for Unown chamber eventsRemy Oukaour
2018-01-10Arrays end with -1, not $ffRemy Oukaour
2018-01-09Clean up some hex values in map scriptsRemy Oukaour
2018-01-09Move text/ into data/Remy Oukaour
2018-01-03Special_MapCallbackSprites_LoadUsedSpritesGFX -> Special_LoadUsedSpritesGFXxCrystal
2018-01-02No more mobile EQUS ret (replace with Stubbed_ + ret)xCrystal
2018-01-02More unreferenced labels and unused textxCrystal
2018-01-02Consistent predef function namesxCrystal
2018-01-02Finish consistent Special function namesxCrystal
2018-01-02Consolidate Special function namesxCrystal
2018-01-02More unreferenced labels cleanupxCrystal
2018-01-01Route 17-18 Gate and Route 29-46 GateRemy Oukaour
2018-01-01Consistent map naming ("Town" and "City" are left out in houses and gates)Remy Oukaour
2017-12-28Merge branch 'master' of https://github.com/pret/pokecrystalRemy Oukaour
# Conflicts: # macros/scripts/maps.asm
2017-12-28endm -> ENDMxCrystal
2017-12-28Consistent (x, y) coordinate formatting in map scriptsRemy Oukaour
2017-12-28Uppercase MACRO and EQU(S) according to the style guidexCrystal
2017-12-27benny → BennyRemy Oukaour
2017-12-26Fix #432: Bird_keeper → BirdKeeper, Bug_catcher → BugCatcherRemy Oukaour
2017-12-26Use "battle_anims" and "sprite_anims" for clarity, not just "anims"Remy Oukaour
2017-12-25I'm stopping for the day. Too many silly oversights.surskitty
2017-12-25Now all labelled SlowpokeWellB1F.surskitty
2017-12-25Shhh no one saw that.surskitty
2017-12-25Disambiguating granddaughter + grandpa #426surskitty
2017-12-25Renaming Slowpoke.surskitty
2017-12-25The pokemon is a nidoran, not a growlithe.surskitty
2017-12-25Changing Kimono_girl to KimonoGirl #432surskitty
2017-12-25Mt Moon gift shop NPCs are only there in the morning and day.surskitty
2017-12-25Renaming the Captain #426surskitty
2017-12-25Ecruteak Dance Theater labels #426surskitty
2017-12-25SS Aqua Captain's cabin #426surskitty
2017-12-25Labelling the Itemfinder guy's house. #426surskitty
2017-12-24Add more constants for some maximum valuesRemy Oukaour
2017-12-24Rename maps:Remy Oukaour
- Underground -> UndergroundPath - Route5UndergroundEntrance -> Route5UndergroundPathEntrance - Route6UndergroundEntrance -> Route6UndergroundPathEntrance - WarehouseEntrance -> GoldenrodUnderground - UndergroundWarehouse -> GoldenrodUndergroundWarehouse - UndergroundPathSwitchRoomEntrances -> GoldenrodUndergroundSwitchRoomEntrances
2017-12-24Use PSYCHIC_M for the Psychic TM.yenatch
Fixes #385
2017-12-24Renaming: (fix #412)Remy Oukaour
- MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
2017-12-24Rename "map permissions" to "map environment" (fix #396)Remy Oukaour
2017-12-23Document the meaning of hour and daytime values for person_eventsRemy Oukaour
2017-12-17Auto-label more map scriptsRemy Oukaour
2017-12-17Auto-label more map scriptsRemy Oukaour