335c2699f0
Merge branch 'master' of https://github.com/pret/pokecrystal
...
# 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-25 20:39:54 -05:00
10173f2a62
Default macro parameters use recursion; avoids repeating internal structure
2018-02-25 20:12:58 -05:00
f964d04a87
* loadmenuheader -> loadmenu ( ead103d)
...
* objectface -> turnobject (c834bda
2018-02-25 20:05:37 -05:00
e8bc86d1fe
Pkmn -> Mon
...
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-22 17:39:06 +01:00
73ea7c6326
Macro factors out sine code, just like sine data, since it's used 5 times
2018-02-03 21:11:55 -05:00
32ed487a47
Merge branch 'master' of https://github.com/pret/pokecrystal
...
# 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-03 19:42:56 -05:00
6ff2cb20e6
map → map_id; map_def → map; map_data → map_attributes
2018-02-03 17:11:55 -05:00
b0d84c64a6
Use fixed-point DIV function for a generalized sine_wave table macro
2018-02-03 13:26:34 -05:00
d11cac9e83
can't achieve this with rgbds 0.3.5
2018-02-03 01:55:22 -05:00
e32e5212af
use "x + -1" not "x +- 1"
...
(TODO: use "x - 1" once rgbds allows it)
2018-02-02 22:55:38 -05:00
45373ec601
sine_wave macro parameterizes table size, not frequency ("amplitude" was an incorrect comment)
2018-02-02 22:45:42 -05:00
f258ff8a41
oops
2018-02-02 22:28:29 -05:00
07fddb1803
Legacy support macros
2018-02-02 22:24:50 -05:00
c834bdadf2
spriteface → objectface, consistent with the other script commands
2018-02-02 21:50:43 -05:00
aa8db1632c
Remove checkmorn/checkday/checknite macros
2018-02-02 21:20:13 -05:00
2a53d75807
Similar formatting for similar WRAM areas
2018-02-02 21:15:15 -05:00
68d855c213
Script commands don't have underscores
2018-02-02 21:09:17 -05:00
3088a77a21
warp_event x, y, map, warp_id
2018-02-01 21:54:00 -05:00
323ef81286
More comments and macros
2018-02-01 15:19:27 -05:00
b04f41da98
enum_start like const_def
2018-01-31 12:21:36 -05:00
08891da822
const_def N
2018-01-31 11:38:45 -05:00
477adc72af
grep -rl warp_def . | xargs sed -i s/warp_def/warp_event/g
2018-01-28 13:20:04 -05:00
a1951cefc0
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
f2ae74079f
Prefix wram labels with w, part 1.
...
Handle edge cases first.
2018-01-23 16:45:34 -05:00
ead103d2c6
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440 )
2018-01-23 16:08:43 -05:00
8f2878c37e
trainers put the class and id first: `trainer YOUNGSTER, JOEY1, ...`
2018-01-23 13:08:48 -05:00
dea26c6639
hiddenitem, like itemball and object_event, puts the item first and the event last
2018-01-23 12:59:21 -05:00
682548493b
Struct macros should have their main label outside the macro
2018-01-23 11:40:32 -05:00
14ef9d3066
PALETTE_SIZE
2018-01-22 19:57:35 -05:00
a73c532738
tile+color macros in gfx.asm
2018-01-22 19:40:17 -05:00
05382d3e3c
PARTY_LENGTH; MON_NAME; sgb_border.bin
2018-01-20 12:25:55 -05:00
105ef872dd
Better TX_SOUND_* names
2018-01-18 22:06:51 -05:00
2acaa96cf1
More charmap and home/text.asm documentation for JP chars
2018-01-18 18:34:20 -05:00
7b3de85a06
Avoid "+- 1" at every maskbits
2018-01-16 17:27:50 -05:00
6c7e88513a
Long lists of db/dw series with struct-defining macros belong in data/
2018-01-15 14:11:11 -05:00
5c28d05bb4
Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #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-14 22:56:36 -05:00
2ab60fa8a4
menu_coords macro for (x1, y1, x2, y2) order (see issue #440 )
2018-01-13 16:38:14 -05:00
5a3822fe86
Introduce callback, hiddenitem, conditional_event, and cmdqueue macros for map scripts
2018-01-13 00:47:38 -05:00
d83aefb30a
Use more constants in scripts
2018-01-12 02:27:42 -05:00
e0088adb3f
Other files belong in data/battle/
2018-01-10 17:49:19 -05:00
417937cffc
Resolve #461
2018-01-10 13:47:57 -05:00
cc95d1208d
Use maskbits more, and clarify its usage
2018-01-10 11:57:28 -05:00
8aa58dca9e
Specialized macros go with their data/code
2018-01-10 00:08:05 -05:00
6c20ff9e20
Reorganize some macros
...
* tileset data macros go atop their related files, like all the ones in data/
* charmaps are not macros
2018-01-07 13:11:29 -05:00
01d994b8a3
dsprite always has 6 arguments
2018-01-02 18:06:56 -05:00
aa9a0a900d
No more mobile EQUS ret (replace with Stubbed_ + ret)
2018-01-02 20:00:14 +01:00
8c3905c4cd
Merge pull request #451 from yenatch/document-battle-anim-macros
...
Fix and document some battle animation macros
2018-01-01 12:47:28 -05:00
4ce75e8dfc
Document some more battle animation commands
2018-01-01 04:40:15 -05:00
92fba8821c
Merge pull request #450 from roukaour/master
...
Constants for TextBoxFlags
2017-12-30 21:32:45 -05:00
f01434f2c0
bgrows → * BG_MAP_WIDTH
...
No dims macro
2017-12-29 18:59:50 -05:00
Rangi