summaryrefslogtreecommitdiff
path: root/engine/battle/core.asm
AgeCommit message (Collapse)Author
2018-10-21Identify BATTLEACTION_D and _E (thanks, ax6)Rangi
2018-09-16wMonStatusFlags -> wDebugFlagsmid-kid
2018-08-26; fallthroughRangi
2018-08-26spaces->tab, and remove redundant commentRangi
2018-08-26hQuotient is a four-byte buffer (fixes #558)Rangi
2018-08-25Use labels instead of constants for HRAMRangi
Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-07-29Make reviewed fixes; standardize on " + "Rangi
2018-07-29Add meaningful aliases for wd265Rangi
Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
2018-07-24MON_STAT_EXP - 1 → MON_EXP + 2Rangi
2018-07-23StringCmp → CompareBytes; CompareLong → CompareBytesLongRangi
hStringCmpString[1/2] → h[EnemyMon/PartyMon1]Speed
2018-07-22ANIM_MON_UNUSED → ANIM_MON_HOFRangi
2018-07-18Fix misnamed character codesmid-kid
Some character codes were erroneously named after their text command counterparts. This has caused a lot of confusion with naming their functions and with other things. I've also removed the `dict2` macro and expanded the `dict` macro. This really isn't something we should be doing for macros but I can't deny it looks a lot neater than repeated code.
2018-07-16Fewer uses of 'Thing2 - Thing1' for sizeof(Thing)Rangi
2018-07-11Replace more hex values with constants or decimalRangi
2018-06-25No space between labels and bodiesRangi
2018-06-24Fix triple newlines left over from removing address commentsRangi
2018-06-25Remove even more address commentsmid-kid
That should be all of them this time
2018-06-24Remove all address commentsmid-kid
2018-06-12Note which labels are only needed for locating banks (relevant to issue #485)Rangi
2018-05-05fix-various-little-thingsmid-kid
A compilation of suggestions from the discord that don't deserve separate commits and are not questionable at all™.
2018-04-09Merge pull request #503 from Rangi42/masteryenatch
Factor wMisc into meaningful parts; move most code out of home.asm
2018-04-05Use constants for bit/set/res moreRangi
2018-04-05HanleDefrost -> HandleDefrostmid-kid
2018-04-05Fix some uses of EFFECTIVEmid-kid
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-25Meaningful $ff valuesRangi
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-04Consistent "X percent [+/- Y]" orderRangi
2018-02-04Sync code with wikiRangi
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-01-30Fix wVirtualOAM labels, part 2.luckytyphlosion
2018-01-30Fix comment/style issues caused from w-izing.luckytyphlosion
2018-01-25More battle data in data/battle/Rangi
2018-01-24Rename some routines to avoid conflicts when removing "Special_" prefixesRangi
2018-01-23Prefix wram labels with w, part 2.luckytyphlosion
2018-01-23Prefix wram labels with w, part 1.luckytyphlosion
Handle edge cases first.
2018-01-23MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue ↵Rangi
#440)
2018-01-22More engine flag constantsRangi
2018-01-22More engine bit flag constantsRangi
2018-01-22wUnlockedUnowns engine flag constantsRangi
Use local labels for "End"ings
2018-01-20PARTY_LENGTH; MON_NAME; sgb_border.binRemy Oukaour
2018-01-19Use hSerialConnectionStatus constants elsewhereRemy Oukaour
2018-01-19Resolve #471 (although link code still needs more cleanup, like its WRAM labels)Remy Oukaour
2018-01-18Comment on RIVAL1 itemRemy Oukaour
2018-01-16Avoid "+- 1" at every maskbitsRemy Oukaour
2018-01-16Remove Predef_ prefix from routines listed in PredefPointersRemy Oukaour
2018-01-14Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal ↵Remy Oukaour
(resolve PR #460) # Conflicts: # engine/battle/core.asm # engine/save.asm
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-11Use maskbits some moreRemy Oukaour
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 16:44:14 +0000