pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity
4,788 Commits 1 Branch 0 Tags 52 MiB
ea426a8879
Commit Graph

291 Commits

Author SHA1 Message Date
Rangi
45373ec601 sine_wave macro parameterizes table size, not frequency ("amplitude" was an incorrect comment) 2018-02-02 22:45:42 -05:00
Rangi
f258ff8a41 oops 2018-02-02 22:28:29 -05:00
Rangi
07fddb1803 Legacy support macros 2018-02-02 22:24:50 -05:00
Rangi
c834bdadf2 spriteface → objectface, consistent with the other script commands 2018-02-02 21:50:43 -05:00
Rangi
aa8db1632c Remove checkmorn/checkday/checknite macros 2018-02-02 21:20:13 -05:00
Rangi
2a53d75807 Similar formatting for similar WRAM areas 2018-02-02 21:15:15 -05:00
Rangi
68d855c213 Script commands don't have underscores 2018-02-02 21:09:17 -05:00
Rangi
3088a77a21 warp_event x, y, map, warp_id 2018-02-01 21:54:00 -05:00
Rangi
323ef81286 More comments and macros 2018-02-01 15:19:27 -05:00
Rangi
b04f41da98 enum_start like const_def 2018-01-31 12:21:36 -05:00
Rangi
08891da822 const_def N 2018-01-31 11:38:45 -05:00
Rangi
477adc72af grep -rl warp_def . | xargs sed -i s/warp_def/warp_event/g 2018-01-28 13:20:04 -05:00
luckytyphlosion
a1951cefc0 Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
luckytyphlosion
f2ae74079f Prefix wram labels with w, part 1. 
Handle edge cases first.
 2018-01-23 16:45:34 -05:00
Rangi
ead103d2c6 MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440) 2018-01-23 16:08:43 -05:00
Rangi
8f2878c37e trainers put the class and id first: trainer YOUNGSTER, JOEY1, ... 2018-01-23 13:08:48 -05:00
Rangi
dea26c6639 hiddenitem, like itemball and object_event, puts the item first and the event last 2018-01-23 12:59:21 -05:00
Rangi
682548493b Struct macros should have their main label outside the macro 2018-01-23 11:40:32 -05:00
Rangi
14ef9d3066 PALETTE_SIZE 2018-01-22 19:57:35 -05:00
Rangi
a73c532738 tile+color macros in gfx.asm 2018-01-22 19:40:17 -05:00
Remy Oukaour
05382d3e3c PARTY_LENGTH; MON_NAME; sgb_border.bin 2018-01-20 12:25:55 -05:00
Remy Oukaour
105ef872dd Better TX_SOUND_* names 2018-01-18 22:06:51 -05:00
Remy Oukaour
2acaa96cf1 More charmap and home/text.asm documentation for JP chars 2018-01-18 18:34:20 -05:00
Remy Oukaour
7b3de85a06 Avoid "+- 1" at every maskbits 2018-01-16 17:27:50 -05:00
Remy Oukaour
6c7e88513a Long lists of db/dw series with struct-defining macros belong in data/ 2018-01-15 14:11:11 -05:00
Remy Oukaour
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
Remy Oukaour
2ab60fa8a4 menu_coords macro for (x1, y1, x2, y2) order (see issue #440) 2018-01-13 16:38:14 -05:00
Remy Oukaour
5a3822fe86 Introduce callback, hiddenitem, conditional_event, and cmdqueue macros for map scripts 2018-01-13 00:47:38 -05:00
Remy Oukaour
d83aefb30a Use more constants in scripts 2018-01-12 02:27:42 -05:00
Remy Oukaour
e0088adb3f Other files belong in data/battle/ 2018-01-10 17:49:19 -05:00
Remy Oukaour
417937cffc Resolve #461 2018-01-10 13:47:57 -05:00
Remy Oukaour
cc95d1208d Use maskbits more, and clarify its usage 2018-01-10 11:57:28 -05:00
Remy Oukaour
8aa58dca9e Specialized macros go with their data/code 2018-01-10 00:08:05 -05:00
Remy Oukaour
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
Remy Oukaour
01d994b8a3 dsprite always has 6 arguments 2018-01-02 18:06:56 -05:00
xCrystal
aa9a0a900d No more mobile EQUS ret (replace with Stubbed_ + ret) 2018-01-02 20:00:14 +01:00
yenatch
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
yenatch
4ce75e8dfc Document some more battle animation commands 2018-01-01 04:40:15 -05:00
yenatch
92fba8821c
Merge pull request #450 from roukaour/master 
Constants for TextBoxFlags
 2017-12-30 21:32:45 -05:00
Remy Oukaour
f01434f2c0 bgrows → * BG_MAP_WIDTH 
No dims macro
 2017-12-29 18:59:50 -05:00
Remy Oukaour
1321a70029 hldims, bcdims, dedims 2017-12-29 16:15:34 -05:00
Remy Oukaour
145a1c3441 Define ld_dims for in-order (width, height) pairs 2017-12-29 16:14:02 -05:00
Remy Oukaour
2acc7f378a Coordinate macros all have similar structure 2017-12-29 16:05:33 -05:00
yenatch
cc5aeb8b87 Fix anim_obj x/y values 
- negative values have no meaning
- left in optional tile x/y for backwards compatibility
 2017-12-29 13:43:17 -05:00
xCrystal
ee5bf71640 Consistently name unknown fields in macros/wram as Fieldxx 2017-12-29 16:19:51 +01:00
Remy Oukaour
b9a68fec25 Consistent if/else/endc (matches rept/endr) and DEF (matches BANK/HIGH/LOW) 2017-12-28 22:13:39 -05:00
Remy Oukaour
4c35f3ac85 Merge branch 'master' of https://github.com/pret/pokecrystal 
# Conflicts:
#	macros/scripts/maps.asm
 2017-12-28 20:56:21 -05:00
xCrystal
50fc9c3389 endm -> ENDM 2017-12-28 22:31:16 +01:00
Remy Oukaour
84e22eb578 Consistent (x, y) coordinate formatting in map scripts 2017-12-28 14:31:25 -05:00
xCrystal
d6507e3882 More constants and documentation in slot machines 2017-12-28 19:38:15 +01:00
xCrystal
333524f0be Lowercase v for VRAM addresses 2017-12-28 13:32:33 +01:00
xCrystal
7beb497d3a Uppercase MACRO and EQU(S) according to the style guide 2017-12-28 13:23:44 +01:00
Remy Oukaour
7a4d641251 Remove redundant data/ filename prefixes 2017-12-27 01:29:15 -05:00
Remy Oukaour
35a3a19fda Use "battle_anims" and "sprite_anims" for clarity, not just "anims" 2017-12-26 18:45:04 -05:00
Remy Oukaour
b5417fafec Split battle/ into data/ and engine/ components 2017-12-26 17:47:05 -05:00
Remy Oukaour
8983c0c809 dwb → dab 2017-12-26 14:39:16 -05:00
Remy Oukaour
24f0e7d045 Rename: emote_headers, sprite_headers, cry_headers, gfx_headers, tileset_headers 2017-12-26 12:50:32 -05:00
Remy Oukaour
e34e68095d Resolve #428: Use HIGH(X) and LOW(X) instead of X / $100 and X % $100 or X >> 8 and X & $ff 2017-12-25 14:23:16 -05:00
Remy Oukaour
3e7f3bbeb6 s/number/scene/, and correct some documentation 2017-12-24 17:35:33 -05:00
Remy Oukaour
c05b7f41dd Renaming: (fix #412) 
- MapTriggers / maptrigger → SceneScripts / scene_script
- XYTriggers / xy_trigger → CoordEvents / coord_event
- Signposts / signpost → BGEvents / bg_event
- PersonEvents / person_event → ObjectEvents / object_event
 2017-12-24 14:33:17 -05:00
Remy Oukaour
10a1e6c860 Support old one-argument sound_duty macro, similar to callab/callba legacy support 2017-12-24 12:52:05 -05:00
Remy Oukaour
c66d195089 callba/callab → farcall/callfar 2017-12-24 12:47:30 -05:00
Remy Oukaour
2f9f2317a3 Document the meaning of hour and daytime values for person_events 2017-12-23 01:19:34 -05:00
Remy Oukaour
e44640b008 Move more main.asm code into individual files 2017-12-15 21:22:26 -05:00
Remy Oukaour
606817f18b Add a map_connection_struct macro 2017-12-15 18:25:32 -05:00
Remy Oukaour
dc76bf804f Move all misc/ and unknown/ files to meaningful directories 2017-12-15 13:21:47 -05:00
Remy Oukaour
d334a331fa Correct endturn value 2017-12-15 00:54:45 -05:00
Remy Oukaour
d6dc9351e9 Start documenting effect commands 2017-12-15 00:48:59 -05:00
Remy Oukaour
fecc5c339a More comments for macros 2017-12-15 00:38:52 -05:00
Remy Oukaour
6ab1d028bb Split items/ and trainers/ into their data/ and engine/ components 
Move some data into a pokemon/ subdirectory
 2017-12-14 23:00:54 -05:00
Remy Oukaour
2ff7f50584 Clarify which gfx anim commands are for oam 2017-12-14 00:38:08 -05:00
Remy Oukaour
e48a401290 Reorganize macros 2017-12-14 00:36:24 -05:00
Remy Oukaour
e4a61cf1ae Use constants for asm collision data 2017-12-12 16:27:09 -05:00
Remy Oukaour
047c8e4bc0 xy_trigger handles $0 padding, so map scripts are simpler 2017-12-12 14:11:23 -05:00
Remy Oukaour
0b34c997d6 Add basic documentation for text commands. 2017-12-12 13:51:07 -05:00
Remy Oukaour
5b13a7a13b Identify more sprite-related constants 
Start more documentation
 2017-12-12 13:22:19 -05:00
Remy Oukaour
720cdc72b2 Comments distinguish "move effects" and "effect commands" 
Effect command enums are used like constants, not macros
 2017-12-11 17:41:18 -05:00
Remy Oukaour
31cce83e9b Move lots of data tables into individual data/ files 
(This is not expected to be their final location, but it makes them easier to relocate when necessary, and easier for users to edit until the whole project's file structure is finalized.)
 2017-12-11 14:23:18 -05:00
Remy Oukaour
41acb0667a Document macros/map.asm 
Rename MORN/DAY/NITE to MORN_F/DAY_F/NITE_F; use MORN/DAY/NITE for shifted values (cleaner for person_events)
Prefix FLOOR to the `elevfloor` constants
 2017-12-11 01:02:28 -05:00
Remy Oukaour
b4261d27d8 Use new palette constants 2017-12-10 20:50:08 -05:00
Remy Oukaour
32ea595c47 Move some gfx/unknown/ files into meaningful directories 2017-12-09 23:37:08 -05:00
Remy Oukaour
cd2a748128 More WRAM cleanup 2017-12-09 22:00:36 -05:00
Remy Oukaour
0b7d8d44ad More constants 2017-12-09 13:28:23 -05:00
Remy Oukaour
6a41d4f63e Define more charmap characters and use them in place of hard-coded numbers 2017-12-09 12:57:23 -05:00
yenatch
afe67ba1b4 Remove contents.asm 2017-09-24 03:15:01 -04:00
PikalaxALT
0257d4178e Movement macro enums are now relative 2016-07-29 10:48:27 -04:00
PikalaxALT
d84ebd2124 pitchoffset macro to replace forceoctave 2016-07-29 10:40:54 -04:00
pikalaxalt
1fa6aecbfc Unify directional movement macros 2016-05-14 13:46:14 -04:00
pikalaxalt
3108c9fa6a Unify step_sleep macro 2016-05-14 12:28:00 -04:00
pikalaxalt
c72912337e Refine labels in engine/trade/animation.asm 2016-05-13 23:23:26 -04:00
pikalaxalt
76819398a9 reinterpret sound_duty macro 2016-05-10 16:46:46 -04:00
pikalaxalt
ebf6ed8a14 No more unknownmusic 2016-05-10 16:38:40 -04:00
pikalaxalt
f8c14d97e5 Pitch wheel 2016-05-10 14:33:24 -04:00
pikalaxalt
8c26547645 Mobile and more battle anims 2016-05-05 15:07:37 -04:00
pikalaxalt
82f1534925 Copycat labels; macro for the Crystal-only Unown chamber unlock words 2016-04-30 21:20:12 -04:00
pikalaxalt
bf73772a56 Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style 2016-04-10 14:42:14 -04:00
pikalaxalt
46ead9b849 Alan's script pointers are now local references; movement_tree_shake for sudowoodo on route 36 2016-04-10 13:47:24 -04:00
pikalaxalt
08e6009e61 Merge branch 'master' of https://github.com/pret/pokecrystal 2016-03-08 19:54:13 -05:00
yenatch
016c2baae2 Use the dakuten characters. 2016-03-03 00:07:17 -05:00
PikalaxALT
599e6e8d16 Battle animation annotations 2016-03-01 22:31:21 -05:00
PikalaxALT
33506f382a Add missing file macros/pals.asm 2016-01-28 09:40:01 -05:00
PikalaxALT
8360a1a2e8 Pokegear functions and RAM labels 2016-01-09 23:41:03 -05:00
PikalaxALT
f7ee74c3b8 Finish labels in engine/namingscreen.asm 2016-01-09 19:34:14 -05:00
PikalaxALT
6d1b7f28c8 Split base stats 2016-01-09 16:52:34 -05:00
PikalaxALT
61c4cfe7d7 wram macros moved to new file 2016-01-07 18:45:32 -05:00
PikalaxALT
80aba7fc13 maptrigger macro 2016-01-05 08:46:37 -05:00
PikalaxALT
c087d44c42 more gfx-related labels 2016-01-04 08:43:55 -05:00
PikalaxALT
9bbb65166e More movement stuff 2015-12-29 13:15:58 -05:00
PikalaxALT
2bd45ca574 Move effects; no more reloadmapmusic, returnafterbattle 2015-12-26 19:22:27 -05:00
PikalaxALT
7683b78fb4 Labels relating to odd egg 2015-12-25 23:34:33 -05:00
PikalaxALT
a5e928eb98 writebackup --> closewindow; game corner prize vendors; others 2015-12-24 22:58:42 -05:00
PikalaxALT
1df28a6beb Merge branch 'master' of github.com:pret/pokecrystal into scriptmacrorenaming 2015-12-24 14:30:32 -05:00
PikalaxALT
c4e3e980b1 More labels related to battle anims 2015-12-23 22:51:50 -05:00
PikalaxALT
8152ab612c Battle anims 2015-12-23 17:10:50 -05:00
PikalaxALT
efee40447e Mobile trade animations, pokepic animations 2015-12-17 13:49:26 -05:00
PikalaxALT
77ef8404a1 Menu 2015-12-15 18:59:49 -05:00
PikalaxALT
efe3462f9a Replaced SignpostItem with Hidden(ItemName) 2015-12-15 11:21:58 -05:00
PikalaxALT
bb2aba7da1 No more ItemFragment 2015-12-15 10:55:56 -05:00
PikalaxALT
a5a8364c35 opentext and breeding 2015-12-09 18:25:44 -05:00
PikalaxALT
0c4bf512d0 itemfragment 2015-12-09 11:57:08 -05:00
PikalaxALT
7f68db68ad underground switches, town map 2015-12-09 11:39:35 -05:00
PikalaxALT
5b7fc7b0fa More battle tower shenanigans 2015-12-08 16:06:13 -05:00
PikalaxALT
0549e3413f audio flag constants 2015-12-07 18:33:04 -05:00
PikalaxALT
7d8cb98c76 cry constants 2015-12-07 15:22:55 -05:00
PikalaxALT
159d3efc8f new and updated music macros 2015-12-07 11:28:58 -05:00
PikalaxALT
02d05255fe A stab at audio engine. 2015-12-06 22:36:09 -05:00
PikalaxALT
92a8c491c3 Break up engine/sprites.asm; address yenatch's comments 2015-12-01 21:54:11 -05:00
PikalaxALT
0eb0c40ba7 buttonsound 2015-11-29 22:29:45 -05:00
PikalaxALT
01792e00d2 Rename several script commands 2015-11-25 10:16:29 -05:00
PikalaxALT
f3c8f75209 bug contest judgint labels 2015-11-23 21:19:53 -05:00
PikalaxALT
0dc5ae04b8 more trade animation labels 2015-11-23 02:08:08 -05:00
PikalaxALT
58020fb5f6 trade animation 2015-11-23 00:21:21 -05:00
PikalaxALT
812976cee6 bgcoord 2015-11-20 11:47:52 -05:00
PikalaxALT
4b5424368f Little cleanup on engine/scripting.asm 2015-11-16 12:49:42 -05:00
PikalaxALT
fb88b2ccf8 Movement constants, script stack 2015-11-16 11:53:26 -05:00
PikalaxALT
aba038a4a4 Fix some movement macro/function names 2015-11-15 21:28:15 -05:00
PikalaxALT
cc8c36ee14 Creation of constants for OBJECT_09 indices 2015-11-13 18:59:49 -05:00
PikalaxALT
2ffcb4b490 More splits; map setup labels 2015-11-11 23:38:57 -05:00
PikalaxALT
91068077f0 Further split bank 4 2015-11-11 16:15:06 -05:00
PikalaxALT
d13fb46d40 enum macros/move_anim.asm, resolve battle/anims.asm function labels 2015-11-10 16:53:37 -05:00
PikalaxALT
ba05bfeafe Move some gfx files around, also clock reset fn 2015-11-10 11:05:26 -05:00
PikalaxALT
93ab6985d2 Some work on battle animations 2015-11-09 16:41:09 -05:00
PikalaxALT
e044580669 battle/ai/switch.asm and more battle/effect_commands.asm 2015-11-07 08:05:57 -05:00
PikalaxALT
929d0aa081 Still more battle command labels 2015-11-06 22:36:06 -05:00
PikalaxALT
d8aa438644 More battle command labels 2015-11-06 20:55:16 -05:00
PikalaxALT
ae2970d73b Sprite movement function labels 2015-11-06 16:42:38 -05:00
PikalaxALT
3cadc7b012 give/takeitem *, 1: the 1 is optional 2015-11-04 20:20:14 -05:00
PikalaxALT
14e0da5116 Status screen edits 2015-11-04 08:43:46 -05:00
PikalaxALT
91ea4a2f9b Battle Tower trainer text 2015-11-03 22:35:36 -05:00
PikalaxALT
d495087026 Removed \2\@ from map_header_2 2015-11-02 15:06:09 -05:00