summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-02-25"HUMANSHAPE, aka Humanshape"Rangi
2018-02-25Mention unused Battle Tower-related text (resolves #491)Rangi
2018-02-25Mention "HAUNTED HOUSE" (resolves #492)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-25Comment Stadium 2 alternative egg group namesRangi
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-25Meaningful $ff valuesRangi
2018-02-25* Remove rept 4 (fa3192e)Rangi
* FindGreaterThanThatLevel -> FindAboveLevel (132fe46) * More meaningful egg group names (0eeb00d)
2018-02-25Format map object attributes like trainer attributes, in preparation for bit ↵Rangi
flag constants
2018-02-25NO_ITEM == 0Rangi
2018-02-25Sprite data values match GetSpriteLength return values and are not limited ↵Rangi
to multiples of 4
2018-02-22Label wPokemonWithdrawDepositParameter of RemoveMonFromPartyOrBoxmid-kid
It takes a clearly different parameter, completely unrelated and different in function to PC_DEPOSIT and PC_WITHDRAW.
2018-02-22Fix TRUE/FALSE constants for CalcMonStatsmid-kid
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-20Use maskbits NUM_TYPESRangi
2018-02-15Merge branch 'master' of https://github.com/pret/pokecrystalRangi
# Conflicts: # maps/KrissHouse2F.asm
2018-02-15Merge pull request #487 from luckytyphlosion/masteryenatch
Fix more w-izing edge cases.
2018-02-14mapconst H, W -> map_const W, Hmid-kid
We've been fixing all of the conventions to be X/Y and W/H, so we should fix this one as well.
2018-02-14Label some daycare-related functionsmid-kid
2018-02-13Fix use of one constantmid-kid
2018-02-12CalcwBufferMonStats -> CalcBufferMonStatsmid-kid
The 'w' was probably added in some mass-replacement. It's completely irrelevant to the function itself and doesn't fit the PascalCase model.
2018-02-09Comment GeneratePartyMonStatsmid-kid
2018-02-09Make tileset palette maps easier to editRangi
2018-02-08Don't let the Makefile pick up .tilemap filesmid-kid
We don't generate any tilemap file with rgbgfx yet, because they won't match anyway. This should be re-added when we can do it properly.
2018-02-08Remove EXIF metadata from imagesmid-kid
This is just a pet-peeve of mine, but if you're going to have half of the repo filled with clean PNGs, and only have some with this metadata, might as well clean it all right up.
2018-02-07questionmark is not a pokemon picRangi
2018-02-05Remove commented G/S roaming Suicune codeRangi
2018-02-05Terser name for the does-nothing effectRangi
2018-02-05Off by oneRangi
2018-02-05No redundant item effect labelsRangi
2018-02-04Fix more w-izing edge cases.luckytyphlosion
2018-02-04Add ROOF_ constantsRangi
2018-02-04Consistent "X percent [+/- Y]" orderRangi
2018-02-04Sync code with wikiRangi
2018-02-04Keep specials files togetherRangi
2018-02-04"chances" → "probabilities", since other files use that term and "changes" ↵Rangi
exists right next to it
2018-02-03Sync _Rangi
2018-02-03Labelling, once again.surskitty
2018-02-03Merge branch 'master' of github.com:pret/pokecrystalsurskitty
2018-02-03db/dw, and keep unused space away from labelsRangi
2018-02-03Macro factors out sine code, just like sine data, since it's used 5 timesRangi
2018-02-03Keep documentation in sync with new WRAM labelsRangi
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-03map → map_id; map_def → map; map_data → map_attributesRangi