summaryrefslogtreecommitdiff
path: root/engine/events
AgeCommit message (Collapse)Author
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-14Label some daycare-related functionsmid-kid
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-03Macro factors out sine code, just like sine data, since it's used 5 timesRangi
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-03map → map_id; map_def → map; map_data → map_attributesRangi
2018-02-02use "x + -1" not "x +- 1"Rangi
(TODO: use "x - 1" once rgbds allows it)
2018-02-02sine_wave macro parameterizes table size, not frequency ("amplitude" was an ↵Rangi
incorrect comment)
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-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-31Add scene ID constants (TODO: meaningful names)Rangi
2018-01-31NPC trade constants don't all just start with TRADE_Rangi
2018-01-30Comment values of special pointers, same as predefsRangi
2018-01-30wSpritesEnd -> wVirtualOAMEnd.luckytyphlosion
2018-01-30Fix wVirtualOAM labels, part 2.luckytyphlosion
2018-01-26Sync documentation with codeRangi
2018-01-25Move event data to data/events/Rangi
2018-01-24Remove "UnusedSpecial_" prefixes tooRangi
2018-01-24Remove Special_ prefix from special routines (close #478)Rangi
2018-01-24Rename some routines to avoid conflicts when removing "Special_" prefixesRangi
2018-01-24EVENT_TEMPORARY_UNTIL_MAP_RELOAD_[1-8] (close issue #481)Rangi
2018-01-23Prefix wram labels with w, part 2.luckytyphlosion
2018-01-23MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue ↵Rangi
#440)
2018-01-23x is the standard temp variableRangi
2018-01-23Daisy offers "grooming", not "massage"Rangi
2018-01-22KrissHouse → PlayersHouseRangi
2018-01-22Add daily+weekly bit flags (close issue #429)Rangi
2018-01-22wStatusFlags/2 bit constantsRangi
2018-01-22More engine flag constantsRangi
2018-01-22More engine bit flag constantsRangi
2018-01-22Day-Care bit flagsRangi
2018-01-22wUnlockedUnowns engine flag constantsRangi
Use local labels for "End"ings
2018-01-20PARTY_LENGTH; MON_NAME; sgb_border.binRemy Oukaour
2018-01-20Rename BATTLETOWER_NROF constantsRemy Oukaour
2018-01-18Use Japanese charmap definitions in stringsRemy Oukaour
2018-01-18Heal machine jumptable index constantsRemy Oukaour
2018-01-16"CryHeader" → "Cry"; "Cry" → "MonCry"Remy Oukaour
2018-01-16map_header → map_def; map_header_2 → map_dataRemy Oukaour
2018-01-16Avoid "+- 1" at every maskbitsRemy Oukaour
2018-01-16Remove Predef_ prefix from routines listed in PredefPointersRemy Oukaour
2018-01-15Move code out of gfx/ (close #474)Remy Oukaour
2018-01-15_Special_BugContestJudging → _BugContestJudging; ↵Remy Oukaour
HOF_Predef_AnimateFrontpic → Predef_HOF_AnimateFrontpic (close #473)
2018-01-14Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR ↵Remy Oukaour
#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-14Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal ↵Remy Oukaour
(resolve PR #460) # Conflicts: # engine/battle/core.asm # engine/save.asm