summaryrefslogtreecommitdiff
path: root/maps
AgeCommit message (Collapse)Author
2018-02-27"; unused" commentsRangi
2018-02-27Replace "Map<MapName>Signpost<#>Script" labelsRangi
2018-02-26Address @SatoMew's comment re: #491Rangi
2018-02-25Mention unused Battle Tower-related text (resolves #491)Rangi
2018-02-25ENGINE_BUG_CONTEST_ON -> ENGINE_MAIN_MENU_MOBILE_CHOICES (resolves #490)Rangi
Went with CHOICES instead of HIDDEN since setting the flag would presumably have shown the items, not hidden them
2018-02-25Pokecom Center Admin Room -> OfficeRangi
2018-02-25Merge branch 'master' of https://github.com/pret/pokecrystalRangi
# Conflicts: # constants/map_constants.asm # constants/wram_constants.asm # data/radio/oaks_pkmn_talk_routes.asm # data/radio/pnp_hidden_places.asm # engine/battle/core.asm # engine/breeding.asm # engine/phone/phone_scripts.asm # engine/radio.asm # maps/BattleTower1F.asm # maps/OlivineLighthouse2F.asm # maps/OlivineLighthouse6F.asm # maps/PokemonFanClub.asm # maps/RadioTower1F.asm # maps/RadioTower2F.asm # maps/Route30BerryHouse.asm # maps/Route34IlexForestGate.asm # maps/Route36NationalParkGate.asm # maps/RuinsOfAlphKabutoChamber.asm # maps/RuinsOfAlphResearchCenter.asm # maps/VermilionPort.asm # maps/VictoryRoad.asm
2018-02-25Merge pull request #477 from mid-kid/masteryenatch
Medium-sized cleanups
2018-02-25Default macro parameters use recursion; avoids repeating internal structureRangi
2018-02-25Merge pull request #486 from surskitty/masteryenatch
Another batch of label names
2018-02-25* loadmenuheader -> loadmenu (ead103d)Rangi
* objectface -> turnobject (c834bda)
2018-02-22Pkmn -> Monmid-kid
Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-04Fix more w-izing edge cases.luckytyphlosion
2018-02-03Labelling, once again.surskitty
2018-02-03Merge branch 'master' of github.com:pret/pokecrystalsurskitty
2018-02-03Merge branch 'master' of https://github.com/pret/pokecrystalRangi
# Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03Merge pull request #480 from luckytyphlosion/masteryenatch
[Ready to merge] Prefix wram labels with w.
2018-02-02spriteface → objectface, consistent with the other script commandsRangi
2018-02-02Remove checkmorn/checkday/checknite macrosRangi
2018-02-02Script commands don't have underscoresRangi
2018-02-02Route 30 Berry Speech House labelssurskitty
2018-02-02Labels, labels, labelssurskitty
2018-02-02Local jumps, once again.surskitty
2018-02-02Ruins of Alph partial labelssurskitty
2018-02-02Radio Card local jumpssurskitty
2018-02-02Jasmine and Amphy labelssurskitty
2018-02-02Sailor Huey labelssurskitty
2018-02-02Labelling the Victory Road rival scriptsurskitty
2018-02-01Labelling Buena's subroutines.surskitty
2018-02-01Missed some SCENE constantsRangi
2018-02-01Incomplete labellingsurskitty
2018-02-01Align map event coordinate columnsRangi
2018-02-01warp_event x, y, map, warp_idRangi
2018-02-01SCENE_DEFAULT=0 and SCENE_FINISHED=1 (generic constants for a common scene ↵Rangi
pattern)
2018-02-01Meaningful scene constant namesRangi
(Two common patterns: 0=default event and 1=nothing; and 0=nothing and 1=some event)
2018-01-31MobileTradeRoom matches MobileBattleRoomRangi
2018-01-31Add scene ID constants (TODO: meaningful names)Rangi
2018-01-31NPC trade constants don't all just start with TRADE_Rangi
2018-01-31const_def NRangi
2018-01-31Forgot the person→object renameRangi
2018-01-31Comment the person constants sections, like the othersRangi
2018-01-30SPRITEMOVEDATA_LAPRAS → SPRITEMOVEDATA_SWIM_WANDERRangi
(more precise, and encourages hacks to add more SWIM movements)
2018-01-30Clarify big doll-related constants (Snorlax and Lapras are symmetrical, Onix ↵Rangi
is not)
2018-01-30SPRITEMOVEDATA_ITEM_TREE → SPRITEMOVEDATA_STILL (it's used for other ↵Rangi
things like Azalea's Slowpokes, not just items and trees)
2018-01-30Merge branch 'master' of https://github.com/pret/pokecrystalRangi
# Conflicts: # maps/Route25.asm # maps/Route27.asm # maps/Route35.asm # maps/Route39.asm # maps/Route42.asm # maps/Route43.asm # maps/Route43MahoganyGate.asm # maps/Route45.asm # maps/Route5CleanseTagHouse.asm # maps/Route6SaffronGate.asm # maps/Route7SaffronGate.asm # maps/ViridianCity.asm
2018-01-30Comment values of special pointers, same as predefsRangi
2018-01-30Remove unreferenced map script heading labelsRangi
2018-01-28grep -rl warp_def . | xargs sed -i s/warp_def/warp_event/gRangi
2018-01-24data/text/X_text.asm is redundantRangi
2018-01-24Remove Special_ prefix from special routines (close #478)Rangi