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,934 Commits 1 Branch 0 Tags 52 MiB
e706b878d9
Commit Graph

310 Commits

Author SHA1 Message Date
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
PikalaxALT
8153737bae Enumerate text constants 2015-10-30 10:34:35 -04:00
PikalaxALT
4d17f6e1f6 Address comments on PR 322 2015-10-24 19:49:19 -04:00
PikalaxALT
119d6b4119 About time I got to these functions 2015-10-24 10:39:52 -04:00
PikalaxALT
f53d65c536 Battle intro animation function 2015-10-17 17:18:52 -04:00
PikalaxALT
4fa6c6daa4 Split up bank 2; other relabelings 2015-10-16 13:35:43 -04:00
IIMarckus
f399315a48 Unicode 2015-10-13 17:50:58 -06:00
PikalaxALT
327faac497 Magikarp functions moved to event/magikarp.asm 2015-10-11 12:26:39 -04:00
PikalaxALT
b68913a782 More radio labels 2015-10-09 23:09:03 -04:00
PikalaxALT
2770cfc354 soft reset 2015-10-04 14:14:51 -04:00
IIMarckus
2e74d969f7 Fix typos in comments. 2015-09-09 15:05:19 -06:00
PikalaxALT
4831b4429e Add radio_constants.asm, update "map" macro 2015-08-17 11:51:09 -04:00
PikalaxALT
aa27080e29 Split fourth-to-last byte of person_event into nybble arguments 2015-07-31 15:16:53 -04:00
PikalaxALT
895e14cd05 Reworked person_event arguments 2015-07-29 18:22:23 -04:00
PikalaxALT
6c3000efd2 Macro update, roam mon annotations 
Updated map and mapgroup macros to get around an rgbds bug.

Legendary beast locale handling annotated and relabeled.

Added a new constant NUM_ENGINE_FLAGS for use in the EngineFlagAction function.  This will make it easier for modders to add or remove engine flags.
 2015-07-25 19:02:36 -04:00
PikalaxALT
432df825d4 Replaced GROUP_, MAP_ references with the map macro 
Updated macros that rely on the GROUP_, MAP_ constants to use the map macro

Added GROUP_NONE and MAP_NONE for the sake of compatibility with this new scheme

Added new macro elevfloor to simplify the definition of elevators under this new scheme
 2015-07-23 12:59:19 -04:00
PikalaxALT
c8960dd2c8 Various annotations 
Annotated the SGB functions in predef/sgb.asm, and some of the map scripts.  Renamed several functions in home.  Renamed six WRAM addresses corresponding to party icon animations, and renamed several others relative to these.
 2015-07-22 15:57:02 -04:00
PikalaxALT
bef792f2d2 More label updates, moved predefs to new file 
Also named most of the engine and event flag constants.
 2015-07-20 03:51:52 -04:00
PikalaxALT
60cd04b023 Trainer data structure and field move functions 
Trainer data in map scripts is now a macro-defined structure.

Field move functions in main.asm are now nearly completely annotated, with local references.

Trailing white space deleted.
 2015-07-18 23:45:39 -04:00
PikalaxALT
e674869018 Updated signpost items and person_event flags 2015-07-18 16:00:53 -04:00
PikalaxALT
894955f9d9 Special script annotation, trainer constant enumeration, person-event structure update 2015-07-16 18:10:10 -04:00
PikalaxALT
39524cdb76 More enumeration of constants, more annotations of scripts. 2015-07-15 15:48:44 -04:00
PikalaxALT
8fa8e29170 - Update variable sprites to use constants rather than fixed values 2015-07-13 02:29:10 -04:00
PikalaxALT
249bad9551 Replace EVENT_ALWAYS_THERE with -1 2015-07-13 00:18:01 -04:00
IIMarckus
6ef52ba676 Split the sixth argument of map_header into separate arguments. 
From PikalaxALT.
 2015-07-09 20:23:32 -06:00
Scott Norton
f74fd6903f - Renamed "Functiond283" to "GetPocketCapacity" and updated the pointers and constants to better reflect their hypothesized purposes. 
- Using yenatch's version of the macro and constant handling, rewrote the tmhm bit array as a macro-defined environment.
 2015-07-03 13:46:38 -04:00
yenatch
e2c2e20f93 Use charmaps for special string codepoints. 
Also fix all the text.
Also fix some unreferenced scripts that were interpreted as text.
 2015-06-27 22:53:38 -07:00
IIMarckus
0ba261a3fd Introduce checkmorn/checkday/checknite to replace checktime. 2015-06-23 12:28:48 -06:00
IIMarckus
4d532beee6 Remove trailing newlines. 2015-06-23 12:24:51 -06:00
Scott Norton
f3b407e04e Fix macro changemap 
Syntax is now `changemap MapBlockDataBank, MapBlockDataPointer`
 2015-06-08 23:52:51 -04:00
yenatch
fc8bf4b9e9 Merge branch 'gfx-tweaks' 2015-05-18 02:23:17 -07:00
yenatch
d4863f3fa5 Enumerate the event script command macros. 
This is ugly, but much better than static values.
 2015-04-13 22:28:28 -07:00
yenatch
ee98f7b489 Enumerate the move effect command macros. 2015-04-13 21:41:32 -07:00
yenatch
e7a3ba0592 Add a macro for enumeration. 
"enum" is like "const" but uses variables instead. This might not be desired.

It has been moved to the top of macros.asm so that included macros can be enumerated.
 2015-04-13 21:41:32 -07:00
yenatch
275780271e Use a macro instead of manually subtracting $36 from pic banks. 2015-03-03 17:19:27 -05:00
yenatch
1480602df7 Move the map_header macro into macros/map.asm. 2015-02-11 23:27:11 -08:00
yenatch
2c5be67604 Move second map header macros into macros/map.asm. 
On second thought, keep the data separate from ugly macros.
 2015-02-11 23:27:11 -08:00
yenatch
b048ea0faf Use labels for script specials instead of constants/static values. 2015-02-11 15:03:42 -08:00
yenatch
5aec11492d Add a "mobile" directive for dummied-out mobile adapter functions. 2015-01-27 15:03:14 -08:00
yenatch
f036cdf13b Move around some more macros. 2015-01-20 14:26:16 -08:00
yenatch
9303752e3f Start moving relevant macros into macros/text.asm. 2015-01-20 14:10:55 -08:00
yenatch
8583cc4724 Stop using the preprocessor. 2015-01-20 00:01:23 -08:00