summaryrefslogtreecommitdiff
path: root/macros
AgeCommit message (Collapse)Author
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-25Default macro parameters use recursion; avoids repeating internal structureRangi
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-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-03Use fixed-point DIV function for a generalized sine_wave table macroRangi
2018-02-03can't achieve this with rgbds 0.3.5Rangi
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-02oopsRangi
2018-02-02Legacy support macrosRangi
2018-02-02spriteface → objectface, consistent with the other script commandsRangi
2018-02-02Remove checkmorn/checkday/checknite macrosRangi
2018-02-02Similar formatting for similar WRAM areasRangi
2018-02-02Script commands don't have underscoresRangi
2018-02-01warp_event x, y, map, warp_idRangi
2018-02-01More comments and macrosRangi
2018-01-31enum_start like const_defRangi
2018-01-31const_def NRangi
2018-01-28grep -rl warp_def . | xargs sed -i s/warp_def/warp_event/gRangi
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-23trainers put the class and id first: `trainer YOUNGSTER, JOEY1, ...`Rangi
2018-01-23hiddenitem, like itemball and object_event, puts the item first and the ↵Rangi
event last
2018-01-23Struct macros should have their main label outside the macroRangi
2018-01-22PALETTE_SIZERangi
2018-01-22tile+color macros in gfx.asmRangi
2018-01-20PARTY_LENGTH; MON_NAME; sgb_border.binRemy Oukaour
2018-01-18Better TX_SOUND_* namesRemy Oukaour
2018-01-18More charmap and home/text.asm documentation for JP charsRemy Oukaour
2018-01-16Avoid "+- 1" at every maskbitsRemy Oukaour
2018-01-15Long lists of db/dw series with struct-defining macros belong in data/Remy Oukaour
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-13menu_coords macro for (x1, y1, x2, y2) order (see issue #440)Remy Oukaour
2018-01-13Introduce callback, hiddenitem, conditional_event, and cmdqueue macros for ↵Remy Oukaour
map scripts
2018-01-12Use more constants in scriptsRemy Oukaour
2018-01-10Other files belong in data/battle/Remy Oukaour
2018-01-10Resolve #461Remy Oukaour
2018-01-10Use maskbits more, and clarify its usageRemy Oukaour
2018-01-10Specialized macros go with their data/codeRemy Oukaour
2018-01-07Reorganize some macrosRemy Oukaour
* tileset data macros go atop their related files, like all the ones in data/ * charmaps are not macros
2018-01-02dsprite always has 6 argumentsRemy Oukaour
2018-01-02No more mobile EQUS ret (replace with Stubbed_ + ret)xCrystal
2018-01-01Merge pull request #451 from yenatch/document-battle-anim-macrosyenatch
Fix and document some battle animation macros
2018-01-01Document some more battle animation commandsyenatch
2017-12-30Merge pull request #450 from roukaour/masteryenatch
Constants for TextBoxFlags
2017-12-29bgrows → * BG_MAP_WIDTHRemy Oukaour
No dims macro