Commit Graph

65 Commits

Author SHA1 Message Date
ShinyTillDawn
6eb79dac33
New trainerbattle macros (#162)
* Configured the macroes.

* Added comments to the macros.

They seem all jumbled up.

* Added corresponding cmds. for trainerbattle 0−8.

Testing needs to be done to make sure they work atm.

* Updated trainerbattle 09 & 0C.

though trainerbattle 09 will need another change.

* Added trainerbattle 09 types based on a bit field.

Right-most bit: Whether or not the player can lose

Second-right-most bit: Tutorial battle w/ Professor Oak

Based on the combinations of bits, I added more variants to FRLG's `trainerbattle 09` command.

* LocalIDs are correctly filled in as 1/2-words now.

My bad

---------

Co-authored-by: haven1433 <haven1433@gmail.com>
2023-06-05 22:22:34 -05:00
ShinyTillDawn
d1e50a10b1
Added a macro for multichoice's allowCancel field. (#157)
* Added a macro for multichoice's allowCancel field.

0 = the game does not ignore B presses (OK to cancel out)
1 = the game ignores B presses (forbid canceling out)

* Clarified by adding "Cancel" to each option.
2023-06-03 10:30:45 -05:00
ShinyTillDawn
b2ecec72e5
Added a "movenpc" command macro. (#159)
* Added "movenpc" command.

The exact things will be subj to change.

* Fixed "move.npc" and added "move.player."

I'll need to test these soon.

* Switched the order of 2 command macroes.

Switched the order of move.player and move.npc.

* Fixed the move.player command macro.

I can't specify base-10 numbers to hard code, apparently.

* Added the "move.camera" macro.

* Each new movement macro has 2 lines of flavor text
2023-06-02 22:14:10 -05:00
ShinyTillDawn
aa9563afaa
Updated reference info in "scriptReference.txt". (#154) 2023-05-07 10:17:26 -05:00
haven1433
3c6930b527 small fixes
* fadescreen should use screenfades list
* map object graphics should use overworld sprites enum (allows finding events from the overworld sprites table)
* change field name from 'unused' to 'padding' for final part of object event data
2023-05-06 16:33:37 -05:00
TheDiamondMiner
564b298fc2
Updated Scriptreference.txt for the new macros (#137)
* Updated scriptreference

* Amended changes
2023-03-30 09:55:56 -05:00
haven1433
fc05cd58e6 add comments explaining base commands for macros 2023-03-20 22:10:00 -05:00
ShinyTillDawn
aacd573bf6
More scriptReference.txt changes (#131)
* Correctly fixed the domains of script commands.

According to the 3 decomps' "script_cmd_table.inc" file, Ruby/Sapphire's last command is at index C5 while FireRed/LeafGreen's last command is at index D4. Thus, I updated the file so that valid commands would only show up if you're editing a game with which said commands would be valid.
ex. preparemsg3 no longer shows up as a valid command in FR/LG.

* Found out the parameter for fadescreen3.

Thank you decomps!

I'm not sure if the "mode.screenfades" parameter is the same for the "fadescreen" command.

* Updated "trainerbattle" & other scripts' comments.

Added some comments to clarify some unknowns in commands 5E, 5F, and 65.

I also fixed some comments and unknown pointers in the trainer battle commands.

* More minor comment fixes.

I mean the word "not" in the comments for commands 4D & 4E. The commands are technically not "nop"s in the code, but the edit to 0x800D is commented out.

* Clarified warp descriptions & other commands.

- Warp commands have more descriptive comments.
- Changed FRLG's description for "nop2C."
- Added another way to fill in the "condition" parameter for "gotostdif" and "callstdif" to make it more in line with "if1" and "if2."
2023-03-16 20:55:30 -05:00
ShinyTillDawn
49d207985a
Fixed preparemsg isotopes; added a desc to warp8 (#123)
Somehow, I did not catch these before the new version came out.
2023-03-11 19:39:02 -06:00
ShinyTillDawn
543a57ec25
Updated more scriptReference.txt parameters (#120)
I primarily focused on D2 setcatchlocation so that its location parameter allowed the user to type in map names. I found more commands that needed similar treatments.
2023-03-09 21:57:52 -06:00
ShinyTillDawn
c36d89e0f2
Updated the move field for 2 commands (#118)
You can use move names for the move field in both 'bufferattack' and 'checkattack' now.
2023-03-08 22:33:02 -06:00
ShinyTillDawn
2b4866b9f5
Another scriptReference edit (#114)
* Another scriptReference edit

Updated some incorrect/missing commands in script reference, adjusted the Address width, and implemented the directions macro for the spriteface command.

* Marked lines 270 and 273 as [BPEE].
2023-03-07 16:08:36 -06:00
ShinyTillDawn
a31ec6b0a8
Update scriptReference.txt (#112) 2023-03-05 22:31:03 -06:00
haven1433
dd9cf7070d improve if macros / trainer flags
* replace cleartrainerflag/settrainerflag with defeatedtrainer/readytrainer
* update `if` macros to include both goto and call forms, and both positive checks and negative checks for trainers/flags
2023-03-02 19:48:52 -06:00
haven1433
7e6dc34302 use decorations instead of mart for pokemart2
And fix name to decorationmart
2023-03-02 19:48:30 -06:00
haven1433
a679a006db setfarbyte uses RAM addresses 2023-03-01 22:25:34 -06:00
haven1433
4a3cbe15e2 loadbytefrompointer uses RAM addresses 2023-03-01 22:25:23 -06:00
haven1433
acb3629541 copybyte should use 4-byte hex, not pointers 2023-03-01 22:05:14 -06:00
haven1433
198cc42859 fix writebyteoffset parameters 2023-02-11 22:44:21 -06:00
haven1433
820173f3f1 settrainerflag needs to use trainer names 2023-02-02 07:44:46 -06:00
haven1433
9205f7b360 give.item is better than take.item
* take.item may be confusing, making the user think an item is being removed
* give.item is closer to the XSE name
2023-02-01 21:35:10 -06:00
haven1433
649a4f5f6d replace give.item with take.item and npc.item
npc's also want to give items, but without making the NPC disappear.
2023-02-01 21:26:38 -06:00
haven1433
44d841ad6c checktrainerflag / cleartrainerflag argument update 2023-01-30 23:09:23 -06:00
haven1433
6ac5c89dfb add if.flagset macro 2023-01-24 20:16:37 -06:00
haven1433
1d4749b41f misc feature updates from pins
* add anchor for misc animations
* flags should be seen as hex in the script editor
* various table updates
* update text in empty block selection case
2023-01-15 23:03:48 -06:00
haven1433
3e16f8ee20 add stream content recursively for scripts
This should make <auto> able to work even when there are scripts that point to scripts, as the content will appear after the last attached script.
2022-12-20 22:34:26 -06:00
haven1433
6874768ffc additional macros
support for out-of-order macro commands
also allows for arguments to be applied multiple times
2022-12-15 08:06:26 -06:00
haven1433
0285808eb0 bufferPokemon species should allow pokemon names as input 2022-12-06 21:40:08 -06:00
haven1433
7d8ae74a00 script bugfixes
add enum types for fanfare / bufferitem
allow script constants to contain underscores
allow autocomplete for constants that are the last argument
allow 'find usages -> scripts' to find usages from macros (and fix crash)
2022-12-04 22:38:04 -06:00
haven1433
4a5f351d6f final fixes for 0.5
givePokemon, use item constants
fix crashes/errors in hover-tip logic for trainerbattle commands
* tested that macros and array args still work right
2022-12-03 22:50:33 -06:00
haven1433
bf1d30fe7d more macros
also clear constant cache when refreshing ViewPort
2022-12-02 23:28:56 -06:00
haven1433
d6d6a6c54f initial macro support 2022-12-02 22:41:39 -06:00
haven1433
a44841290f first pass at updating script pointer logic
instead of the script line itself knowing that it points to something,
pull it down to the argument level, so that each argument knows
if it points to something.

This will allow a single script line to point to multiple things (like trainers pointing to multiple text or scripts)
2022-12-02 08:38:21 -06:00
haven1433
a7b1734404 add data.items.stats format for item-related script commands 2022-11-28 20:22:55 -06:00
haven1433
4c2089196b usability feedback
label stuff
center new connections
berry shortcuts
fix goto shortcuts
2022-11-24 11:24:56 -06:00
haven1433
e285eaaf7b add 'scripts' option to 'show uses' button
Unlike the other ones, this one doesn't pre-calculate, and may end up being empty when you click on it.
2022-11-23 08:26:46 -06:00
haven1433
7d0022d6a3 template progress 2022-11-08 22:29:37 -06:00
haven1433
9fcbb6a89d remove expired warning 2022-11-02 00:04:15 -05:00
haven1433
10579058b3 add song names for playsong command 2022-10-29 22:52:58 -05:00
haven1433
7a6ce76b23 serialize null list items as numbers
also fix width on script tooltip
2022-09-22 07:36:26 -05:00
Haven1433
b25a480f52 wild editing
also improve goto menu
* hide shortcuts when using the buttons, to make more room
* remember text when switching tabs
2022-09-15 19:45:11 -05:00
Haven1433
d24e150eff add names for specials in FR/LG 2022-09-04 22:21:34 -05:00
Haven1433
be3b053d12 Merge branch 'master' of https://github.com/haven1433/HexManiacAdvance 2022-09-04 21:26:06 -05:00
TheDiamondMiner
7f86f06817
Updated description for setmaptile command (#97)
* Added list varmacros on the defaut .toml and updates script reference as per shiny's request

* changed description

* Made your changes
2022-09-04 19:01:59 -05:00
Haven1433
ed5a9eb47c fix D5 in scripts for R/S/E
R/S don't seem to have this commmand. Emerald does. In FR it's a nop.
2022-09-03 20:12:48 -05:00
Haven1433
587dada550 update script commands 2022-09-01 07:24:44 -05:00
Haven1433
810f8c7a65 ScriptParser needs to know which game it is.
The 'showmoney' and 'updatemoney' commands are different from game to game. It has 2 parameters in R/S, but 3 parameters in FR/LG/E.

Update the scriptReference to specify that these commands have different versions for the different games.

Update ScriptParser to be able to read this new addition to the script reference format.

Add tests to show that the new commands are read correctly between games.
2022-08-25 06:51:51 -05:00
Haven1433
de7554f307 fix script reference typo 2022-05-27 23:33:49 -05:00
TheDiamondMiner
53446ff917
Added gender-ratio values for presets & improved a name in toml (#88)
* added 10 values for gender ratio presets.

* Fixed an error made by me
2022-05-14 15:43:50 -05:00
Haven1433
cd904b27f5 XSE was wrong, command 0x7B is for setting moves, not setting pp 2022-03-05 22:46:13 -06:00