pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity
5,016 Commits 1 Branch 0 Tags 52 MiB
ef9b9bb437
Commit Graph

507 Commits

Author SHA1 Message Date
IIMarckus
c3c7c7e658 Fix typo: Recptionist → Receptionist 2015-07-28 23:29:44 -06:00
PikalaxALT
594253eb30 Merge yenatch:map-objects 2015-07-25 20:18:59 -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
yenatch
ec10d9dd6f Add constants for common map object ids. 2015-07-21 23:49:18 -07:00
PikalaxALT
5631bdc0d7 Added labels to different parts of the map script and event headers 2015-07-21 00:02:21 -04:00
PikalaxALT
471492b775 Reverted ld_hl_pointer macro 2015-07-20 22:18:18 -04:00
PikalaxALT
06673cbee7 Named more specials, fixed a missing EOL 2015-07-20 18:59:26 -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
94129b6b45 Finished the decoration attributes table 
Interpretation of the Decoration Attributes table is complete.

Other changes include some more event flag and function naming, as well as a minor tweak to the person_events of every map.
 2015-07-19 04:58:31 -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
0fcef5fc08 More annotations and interpretations of functions and scripts 2015-07-17 17:17:10 -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
PikalaxALT
d282fe4799 Event and engine constant enumeration; replace static flag numbers with their constant names 2015-07-12 02:00:17 -04:00
IIMarckus
63cc4daae2 prefix wram varables with w. 2015-07-10 14:04:00 -06:00
IIMarckus
388336353d Fix mislabeled engine flags. 2015-07-10 06:12:28 -06:00
IIMarckus
07a12b37b6 Add more event flags. 2015-07-10 06:08:03 -06:00
IIMarckus
86c13acf84 Add more event flags and fight counters for phone scripts. 2015-07-10 04:31:08 -06:00
IIMarckus
d1fbc077a7 Label fight counters for phone call rematches. 2015-07-10 03:37:34 -06:00
IIMarckus
e118dfe727 checkcode $11 is how much time is left in the Bug Catching Contest. 2015-07-10 03:04:41 -06:00
IIMarckus
a711b45404 checkcode $1a is Kenji's break schedule. 2015-07-10 03:03:08 -06:00
IIMarckus
f6546ad535 Mark maps with permission constants. 2015-07-10 03:00:46 -06:00
IIMarckus
63079fa1fe Trim address comments from maps. 2015-07-10 02:45:35 -06:00
IIMarckus
718c2260e9 Use constants for overworld phone script flags. 2015-07-10 02:36:57 -06:00
IIMarckus
2c98c694e3 Fill out trainer event flags. 2015-07-10 02:20:21 -06:00
IIMarckus
ac88c43b14 Clean up gym leader scripts. 2015-07-10 01:00:27 -06:00
IIMarckus
9f1bba2f3a Use decimal for Pokédex count. 2015-07-10 00:30:30 -06:00
IIMarckus
6ef52ba676 Split the sixth argument of map_header into separate arguments. 
From PikalaxALT.
 2015-07-09 20:23:32 -06:00
IIMarckus
6f3b2d6de8 Add constants for checkcodes. 
From PikalaxALT.
 2015-07-09 20:23:23 -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
yenatch
c00949dddf Labels for the heal machine; spriteface constants. 2015-06-26 23:24:55 -07:00
IIMarckus
89073da581 Label flypoint callbacks. 2015-06-25 23:30:16 -06:00
IIMarckus
ded477e69e Delete unused file. 2015-06-25 22:35:06 -06:00
IIMarckus
e57e1ba63b Improve some signpost labels. 2015-06-25 22:01:08 -06:00
IIMarckus
bd022e179e Clean up labels for gym statues. 2015-06-24 21:51:36 -06:00
IIMarckus
f16d60e3f9 Update some event flags. 2015-06-24 21:20:04 -06:00
IIMarckus
fdfbeb7e5f More std enums. 2015-06-24 19:26:24 -06:00
IIMarckus
5d48bc96fd More std_scripts enums. 2015-06-23 15:02:58 -06:00
IIMarckus
7ac6aa2d22 Begin enumerating std_scripts constants. 2015-06-23 14:21:54 -06:00
IIMarckus
205000fa9a Better labels in Charcoal Kiln. 2015-06-23 13:59:07 -06: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
IIMarckus
91e474b19f Improve labels for some stuff in Kris's house. 2015-06-23 11:34:13 -06: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
48b05947b7 Use connection macros instead of guessed values in second map headers. 
Some of the under-the-hood connection values are offset by an arbitrary amount. This could be because of a graphical connection editor allowing a shift in the strip destination pointer, as well as the standard alignment value. There is no visible difference, so it can be confusing when two unique sets of values can produce the same result.

Reversing this invisible offset was a major sticking point back when connections were dumped, but it was straightforward this time around. Much thanks to huderlem for articulating this quirk in pokered's connection macros.
 2015-02-11 23:27:01 -08:00
yenatch
b048ea0faf Use labels for script specials instead of constants/static values. 2015-02-11 15:03:42 -08:00
yenatch
b097617f9f Blind wram in maps. 2015-02-10 15:43:34 -08:00
yenatch
8583cc4724 Stop using the preprocessor. 2015-01-20 00:01:23 -08:00
IIMarckus
464d89c59e Labels for day of week siblings. 2014-10-26 19:37:15 -06:00
yenatch
52c5047a53 Remove the last incbin in map events. 
Since it's unused there's no way of knowing for sure,
but movement data typically comes after scripts and
before text, and the commands make sense.
 2014-07-19 13:12:43 -07:00
yenatch
0c7ef5e2d8 Use macros for both types of map headers. 
This should make map headers much easier to edit than before.

Rather than occasionally being able to reuse blockdata semantically,
create a label for each map and attach it to some blockdata include.
This improves readability and reduces overhead when adding new maps.

The macro argument length bug doesn't seem to crop up here...
It looks like it only happens when an argument is over 16 characters
long and references a symbol that exists before the macro is invoked.
 2014-07-18 10:31:51 -07:00
yenatch
091e55bfa6 Add labels for maps that reuse blockdata. 2014-07-18 10:31:50 -07:00
yenatch
49ef0121dc Remove excessive whitespace in map headers. 
Use the "map" macro instead of using GROUP_* and MAP_* constants.
Also remove redundant "(bank then label)" comments.
 2014-06-24 09:01:29 -07:00
yenatch
c2dba43188 Contest battle type and comment the battle menu. 2014-06-17 11:58:11 -07:00
yenatch
e23f341258 Battle type constants in the wild. 
Also add constants for trap and Celebi event battles.
 2014-06-13 22:53:20 -07:00
yenatch
b7e3762187 A couple Buena's Password specials. 2014-05-01 02:23:51 -04:00
yenatch
ce59c9a84f Music and sound effect constants in map events. 2014-04-30 06:04:35 -04:00
yenatch
5708cf7569 Fix some static addresses in maps. 2014-04-30 05:40:22 -04:00
yenatch
bd30cc084d Unused Wooster script in Azalea Town. 2014-04-17 22:06:53 -04:00
yenatch
e703b5ef48 Text macros in maps/. 
Looks fine at a glance.
 2014-03-06 00:29:44 -05:00
yenatch
cf2acc1001 Use :: to export labels between objects. 
This fixes the build.
 2014-02-01 20:26:39 -05:00
yenatch
4d1091f8d9 poke seer special 2013-12-22 17:17:33 -05:00
yenatch
3de254f7a2 more 3pt macro labels; shorten 3pt macros to take just a label 
static addresses should be avoided anyway
 2013-12-02 14:18:03 -05:00
yenatch
400ced34f0 landmark constants in map headers 2013-11-28 04:51:39 -05:00
yenatch
0ccfccf4bf move map groups into maps/map_headers.asm 2013-11-22 05:05:25 -05:00
yenatch
e5b5e1238d script command unknown0xa8 is wait 2013-10-01 01:03:08 -04:00
yenatch
ad3293595d script commands if_greater_than and if_less_than were swapped 2013-09-26 18:40:20 -04:00
yenatch
73bd376cfd rename bit2 script commands to flag 2013-09-24 03:51:42 -04:00
yenatch
3134b26f7b rename bit1 script commands to event 2013-09-24 03:48:58 -04:00
yenatch
1323008f6f first round of event flag constants in map events 
this is a little over half.. 610 to go
 2013-09-05 05:19:35 -04:00
yenatch
3010731347 split out blockdata includes from main into maps/ 2013-09-01 14:41:21 -04:00
yenatch
0ee006a145 more item effects 2013-08-03 16:25:38 -04:00
yenatch
4ac88d6cdc sprite constants in map events 2013-07-12 17:06:11 -04:00
yenatch
f4db6f6029 music constants in map headers 2013-05-22 16:36:51 -04:00
yenatch
f4e9dc2d33 label banks in map headers 2013-05-22 15:09:37 -04:00
yenatch
4b4445138d fix map group label numbering 2013-05-12 10:50:15 -04:00
yenatch
e46e8a3023 fix parsing errors in RuinsofAlphOutside 2013-05-01 13:52:44 -04:00
yenatch
d4fe2c9953 remove incbins in BattleTower 2013-05-01 13:29:45 -04:00
yenatch
92863b3446 remove incbins in GoldenrodPokeComCenter2FMobile 2013-05-01 06:19:11 -04:00
yenatch
eb971e37ad remove incbins in GoldenrodDeptStore6F 2013-05-01 05:27:54 -04:00
yenatch
8218520bef remove incbins in EarlsPokemonAcademy 2013-05-01 05:22:24 -04:00
yenatch
8a316097e1 remove incbins in DragonsDenB1F 2013-05-01 03:37:05 -04:00
yenatch
4307a2bb45 remove incbins in CeladonGameCornerPrizeRoom 2013-05-01 02:53:33 -04:00
yenatch
a6b034dc41 remove incbins in DragonShrine 2013-05-01 02:38:24 -04:00
yenatch
f98359fd1b remove incbins in GoldenrodGameCorner 2013-05-01 02:38:19 -04:00
yenatch
3ce221ae09 remove incbins in CeladonDeptStore6F 2013-05-01 02:24:05 -04:00
yenatch
fc0b5601af remove incbins in CeladonDeptStoreElevator 2013-05-01 02:07:06 -04:00
yenatch
1678e02258 remove incbins in GoldenrodDeptStoreElevator 2013-05-01 02:00:21 -04:00
yenatch
c1acb04707 remove incbins in GoldenrodCity 2013-05-01 01:00:32 -04:00
yenatch
9004b6a3d7 remove incbins in KrissHouse2F 2013-04-30 23:10:21 -04:00
yenatch
590d000d24 remove incbins in BlackthornGym2F 2013-04-30 23:05:52 -04:00
yenatch
40876d2800 remove incbins in IcePathB1F 2013-04-30 22:32:03 -04:00
yenatch
ec1f8e1f94 dump and include beta maps 2013-04-25 15:44:40 -04:00
yenatch
736275ae0a pokedex entries got caught in the map header move 2013-04-12 17:24:16 -04:00
yenatch
48f5e7dfb8 Shuckle special 2013-04-08 13:12:58 -04:00
yenatch
a7c260f4f4 Script commands 0xb2 and 0xcc don't exist 2013-03-01 16:22:35 -05:00
yenatch
48dbfc6333 Split map scripts, text, events from main.asm 
The commit we deserve
 2013-02-17 01:59:06 -05:00
yenatch
860d7447f9 Point to map groups instead of their first header 2013-02-15 23:25:29 -05:00
yenatch
b52aa98325 Split map headers and second map headers from main.asm 2013-02-15 22:02:15 -05:00
Bryan Bishop
e44916761b oops forgot the maps 2012-05-21 02:43:52 -05:00