Ethan Roseman
8f0f0bd941
oopth
2023-06-28 09:52:27 +09:00
Alex Bates
6257881b44
fix configure macOS cpp finding ( #1070 )
2023-06-27 08:00:58 +09:00
Alex Bates
80aa54dd53
fix SPRITE_ROM_START in --shift ( #1071 )
2023-06-27 08:00:12 +09:00
Ethan Roseman
8837fbdf65
Player sprites & more ( #1055 )
...
* WIP work on sprites (sprite_stuff.py)
* cleanup of various stuff
* separate compiler installation into separate script
* wipz
* more
* renames, bugfixes
* more
* very grood
* cleanin
* goods and services
* oopth
* oopth2
* Parse palette data from xml
* more work
* more wipperz
* more
* it working
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "e72a868f9f"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "e72a868f9f"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* fix symbol_addrs for new splat
* upd8s
* Use generated header, other versions, fixes
* fixes & formatting
* wip fusing npc + player extraction & cleanup
* remove npc_files
* buildin
* fix some bugs
* Cleanup, yay0s separately
* cleen
* cleanup
* Respect stack during build
* jp spritz
* dun
* fix c files
---------
Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
2023-06-26 19:27:37 +09:00
Marlon Pohl
f0a9274c01
Implemented kkj_19_5_baking_GetItemNameRaw for pal ( #1066 )
...
* Implemented kkj_19_5_baking_GetItemNameRaw for pal
* Usage of decimals instead of hexadecimals
* Implemented mgm_01_2_npc SetMsgVars_BlocksRemaining
* Implemented mgm_02_0_header.c
* Removed .s file
I'm such an idiot for forgetting this
* removed implemented methods
* optimized decomp
* found the value for the hex number
thanks to @marijnvdwerf and @Brotenko
* Fixed args indexing
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
* Added empty line after definitions
* Apply suggestions from code review
Co-authored-by: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
* adjusted format (fixed compiler warning)
* made review changes
* removed duplicated code
* namespaced pal_var
---------
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
Co-authored-by: Marijn van der Werf <marijn.vanderwerf@gmail.com>
2023-06-22 09:44:51 +09:00
Lincoln-LM
d65dce43df
Document Probability Distribution of Calls to rand_int ( #1063 )
...
* document probability of the majority of conditional calls to rand_int
* update positions of else/elseif comments
* remove unneeded documentation
2023-06-16 10:22:26 +09:00
HailSanta
c3690e380e
battles organization ( #1065 )
...
* sbk
* pokey
* bandit
* check
* missing part ID refs
* nok progress
* area headers
* actors moved to common
* dedupe all stages
* couple missing actors and simplified includes
* separated stages by world area
* stage cleanup I
* stage cleanup II
* done stage cleanup
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-06-05 17:16:46 +09:00
HailSanta
edd9111b63
battle area trd 1/2/3 ( #1062 )
...
* check
* flips
* trailing ,
* koopa bros
* more koopa bros
* fake bowser
* progress
* progress
* koopa bros done
* koopa bros anims
* reverted overly specific name
* wayward stages
* areas use headers
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-05-23 21:57:34 +09:00
0xfedfedfe
9457e315a8
Name is_debug_panic and fix ASSERT/PANIC macros ( #1061 )
...
* Name is_debug_panic and revamp ASSERT/PANIC macros
* Update src/is_debug.c
Co-authored-by: Alex Bates <16batesa@gmail.com>
2023-05-22 15:38:20 +01:00
Lincoln-LM
f770d12db4
Document PRNG Related Functions ( #1060 )
...
* document gfx_rand
* document global LCG
* rename func_80029994
* clarify rand_int_internal comment
* gfx_rand -> gfx_rand_int
* remove unneeded parens
* gfx_rand_int -> effect_rand_int
* gfx_prng_seed -> effect_prng_seed
* fix local variable case
2023-05-22 15:37:25 +01:00
HailSanta
2e926567e3
various cleanup ( #1057 )
...
* checkpoint
* battle doc
* items 2
* actor palette stuff
* minor adjustment
* the booool
* comments, flags, and todos
* oops
* chain chomp
* quick fix
* stone chomp as well
* partIDs
* hm
* status turn mod
* status_key
* status table alignments
* TURN_DONE - > INACTIVE
* idle anims alignment
* defense table alignment
* STATUS_END
* actor part IDs
* lee
* lee again
* standardizing names
* BattlePositions
* actor macros
* standardize battle and stage macros
* check
* the rest
* red/blue goomba names
* trd_part_1
* rest of trd 1
* pal fix
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-05-21 02:26:11 +09:00
X4X5
7b37ff9230
Add Fedora to install.sh ( #1049 )
...
* Update install.sh
* Update install.sh
I'll work on this when I don't feel like I'm losing braincells
* Update install.sh
Get `--extra` up for Fedora
* Update install.sh
* Update install.sh
Imagine typos
* Update install.sh
Finished!
2023-05-09 13:27:53 +09:00
Rainchus
ec6f2ef428
fix configure.py to find correct split.py ( #1048 )
...
* fix configure.py to find correct split.py
* name func_802667F0 to DisplayActionRating and use enum
* use enum in DisplayActionRating
* Change DisplayActionRating to show_action_rating
2023-05-09 12:48:11 +09:00
HailSanta
ee0bd3c304
effect flags ( #1052 )
...
* damage intensity
* standardized battle script names
* few more
* effect flags
* slight name change
* renderUI = NULL
* rm space
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-05-09 12:46:47 +09:00
Marijn van der Werf
5511e18133
Clean executable files ( #1047 )
...
* Mark headers as non-executable
* Update shebangs
2023-05-04 18:03:02 +09:00
Alex Bates
4680a74e0b
Introduce clang-format ( #1004 )
...
* add basic .clang-format
* configure vscode clang-format modified lines on save
* update clang-format to only run on C files
* add ci action to print clang-format diff
* use GITHUB_BASE_REF
* --binary
* clang-format-14
* move workflow to pr.yaml
* oops
* checkout fetch-depth 0
* use cpp-linter-action
* test
* fail if step fails
* log depth
* fetch main
* set fetch-depth
* limit diff and run clang-format
* use versioned clang-format
* untiy actual code
* fix argument order
* colorize output
* Clean up #989
* move cpp lint job to lint.yaml
* disable vscode autoformat
* add git hook to make sure assets/$version has been gitignored (#1006 )
* add git hook to make sure assets/ hasn't been gitignored
* echo to stderr
* quiet git check-ignore
* add .v64 and .n64 to gitignore
* Changed some variable names in state_title_screen (#1003 )
* Changed some variable names in state_title_screen.c
* resolving pull request items
* changed TitleData to TitleScreenGfxData across sys
* replace gbi names with understandable ones
* accidentally switched logo and pressStart
* changed GfxData to ImgList
* Renaming and b32
* Doing this but more
* pause menu cleanup (#1008 )
* minor pause cleanup
* macro
* comments
* second macro
* delete macros
* hm
* pause message names
* unused tutorial messages
* oops
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
* fold doc 1 (#1009 )
* minor fold cleanup
* fold doc I
* enough
* rename
* last
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
* appendGfx_shading_palette (#1010 )
* cleanup & warnings for modern gcc
* clean
* stuff
* diff.py update
* Fix offset problem in struct
* Fix texture issue in chapter_change
* appendGfx_shading_palette
* Convert tabs to spaces (#1012 )
* Add .git-blame-ignore-revs (#1014 )
# 1213a4adf0aa515d0c7c7e37db396363914fda2egit-blame
* func_E02000AC (#1013 )
* draw_image_with_clipping (#1016 )
* draw_image_with_clipping
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
* tiny fix
---------
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
* npc_do_player_collision (#1017 )
* appendGfx_animator_node (#1018 )
* appendGfx_animator_node
Co-authored-by: Mr-Wiseguy <68165316+Mr-Wiseguy@users.noreply.github.com>
* find_similar_areas improvements
* oopz
---------
Co-authored-by: Mr-Wiseguy <68165316+Mr-Wiseguy@users.noreply.github.com>
* lol 100% (#1019 )
Co-authored-by: Rainchus <rainmachus@gmail.com>
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
* image fx (#1015 )
* more fold
* fold render modes
* fold rename 1
* fold rename 2
* fold rename 3
* imgfx struct reorg
* post merge
* the rest
* extras
* forgot these
* done
* ImgFx
* ImgFX
* check
* misc cam stuff
* ws
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
* Pal pause (#1011 )
* PAL pause segment
* PAL pause_gfx_en segment
* Apply name changes
* Merge gPauseBadgesElements
* Rename ITEM_TYPE_FLAG_ENTITY_COLLECTIBLE
* Split PAL and monolingual arrays
* Nix support (#1020 )
Very hacky
Will be maintained by @NotNite
* use ARRAY_COUNT(ExtraDoubleRecipes) (#1023 )
* Replace python-githooks with manual command (#1027 )
* ui_images (#1021 )
* ui_images
* Move French assets to their own folder
* imgfx data (#1029 )
* various cleanup (#1030 )
* more fold
* fold render modes
* fold rename 1
* fold rename 2
* fold rename 3
* imgfx struct reorg
* post merge
* the rest
* extras
* forgot these
* done
* ImgFx
* ImgFX
* check
* misc cam stuff
* ws
* misc
* btl msg
* 3 combine modes
* 3 more
* many more
* screen overlays
* stencil types
* all screen transitions
* jp build fix
* another jp fix
* iq fix
* mystery battle enum added oOoOoOoOooo
* DMG_SRC
* starting battle cam presets
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
* btl cam modes (#1035 )
* some btl cam
* couple things
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
* Add version option to diff.py (#1037 )
* Clean trailing whitespace (#1038 )
* Add missing newlines
* Remove trailing whitepace
* split em (#1040 )
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
* Update .git-blame-ignore-revs (#1039 )
* standardized battle script names (#1043 )
* damage intensity
* standardized battle script names
* few more
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
* Dump PAL filemenu section (#1036 )
* Dump PAL filemenu section
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
* Clean up numbers
* Use more constants
* Find more constants
* Clean up a bit
* eth cleanup
* Clean up
* Fix brace style
* rename new file & funcs
---------
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
* revert test change
* update clang-format config
* indent case labels
---------
Co-authored-by: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Co-authored-by: CreateSource <72283721+abnormalhare@users.noreply.github.com>
Co-authored-by: HailSanta <53960937+HailSanta@users.noreply.github.com>
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
Co-authored-by: Mr-Wiseguy <68165316+Mr-Wiseguy@users.noreply.github.com>
Co-authored-by: Rainchus <rainmachus@gmail.com>
Co-authored-by: Julian <hi@notnite.com>
Co-authored-by: Devon R <Gorialis@users.noreply.github.com>
2023-05-02 05:07:31 +09:00
Jacob Butler
31c98cc94c
Albino Dino sprite/animation names ( #1042 )
...
* Look at this
* Animation ordering fix
* Animation Naming Ordering Fix 2
---------
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2023-05-02 04:55:25 +09:00
Ethan Roseman
b39f8de7cd
Hotfix for imgfx data splitting bug ( fixes #1033 )
2023-05-02 03:55:03 +09:00
Ethan Roseman
635fa40288
title_screen_draw_copyright (iQue) ( #1044 )
...
* title_screen_draw_copyright (iQue)
* fixies
2023-05-02 02:51:52 +09:00
Marijn van der Werf
aa08abd4da
Dump PAL filemenu section ( #1036 )
...
* Dump PAL filemenu section
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
* Clean up numbers
* Use more constants
* Find more constants
* Clean up a bit
* eth cleanup
* Clean up
* Fix brace style
* rename new file & funcs
---------
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2023-05-01 16:40:57 +09:00
HailSanta
94cc139227
standardized battle script names ( #1043 )
...
* damage intensity
* standardized battle script names
* few more
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-05-01 16:22:52 +09:00
Marijn van der Werf
6327c84e8e
Update .git-blame-ignore-revs ( #1039 )
2023-04-30 03:56:50 +09:00
HailSanta
884140f419
split em ( #1040 )
...
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-04-30 03:33:56 +09:00
Marijn van der Werf
30aa49d4a8
Clean trailing whitespace ( #1038 )
...
* Add missing newlines
* Remove trailing whitepace
2023-04-29 15:28:06 +02:00
Marijn van der Werf
a1918c3328
Add version option to diff.py ( #1037 )
2023-04-29 21:48:27 +09:00
HailSanta
c8548d5002
btl cam modes ( #1035 )
...
* some btl cam
* couple things
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-04-29 03:19:30 -04:00
HailSanta
7a9df943ad
various cleanup ( #1030 )
...
* more fold
* fold render modes
* fold rename 1
* fold rename 2
* fold rename 3
* imgfx struct reorg
* post merge
* the rest
* extras
* forgot these
* done
* ImgFx
* ImgFX
* check
* misc cam stuff
* ws
* misc
* btl msg
* 3 combine modes
* 3 more
* many more
* screen overlays
* stencil types
* all screen transitions
* jp build fix
* another jp fix
* iq fix
* mystery battle enum added oOoOoOoOooo
* DMG_SRC
* starting battle cam presets
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-04-26 00:33:17 +01:00
Ethan Roseman
e0cfd078da
imgfx data ( #1029 )
2023-04-25 13:55:14 +09:00
Marijn van der Werf
44d1b29590
ui_images ( #1021 )
...
* ui_images
* Move French assets to their own folder
2023-04-25 02:31:19 +09:00
Devon R
cd130dfe8d
Replace python-githooks with manual command ( #1027 )
2023-04-24 15:02:57 +09:00
Alex Bates
90656fea19
use ARRAY_COUNT(ExtraDoubleRecipes) ( #1023 )
2023-04-23 18:57:39 +09:00
Julian
0e9626913a
Nix support ( #1020 )
...
Very hacky
Will be maintained by @NotNite
2023-04-22 14:47:03 +01:00
Marijn van der Werf
aa29eb5553
Pal pause ( #1011 )
...
* PAL pause segment
* PAL pause_gfx_en segment
* Apply name changes
* Merge gPauseBadgesElements
* Rename ITEM_TYPE_FLAG_ENTITY_COLLECTIBLE
* Split PAL and monolingual arrays
2023-04-21 17:33:49 +09:00
HailSanta
e41923e55d
image fx ( #1015 )
...
* more fold
* fold render modes
* fold rename 1
* fold rename 2
* fold rename 3
* imgfx struct reorg
* post merge
* the rest
* extras
* forgot these
* done
* ImgFx
* ImgFX
* check
* misc cam stuff
* ws
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-04-20 17:15:58 +09:00
Ethan Roseman
12a30b4ee8
lol 100% ( #1019 )
...
Co-authored-by: Rainchus <rainmachus@gmail.com>
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
2023-04-20 04:03:42 +09:00
Ethan Roseman
dec110160c
appendGfx_animator_node ( #1018 )
...
* appendGfx_animator_node
Co-authored-by: Mr-Wiseguy <68165316+Mr-Wiseguy@users.noreply.github.com>
* find_similar_areas improvements
* oopz
---------
Co-authored-by: Mr-Wiseguy <68165316+Mr-Wiseguy@users.noreply.github.com>
2023-04-18 04:51:16 +09:00
Unnunu
771113de21
npc_do_player_collision ( #1017 )
2023-04-16 10:21:08 +09:00
Ethan Roseman
7873b05520
draw_image_with_clipping ( #1016 )
...
* draw_image_with_clipping
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
* tiny fix
---------
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
2023-04-13 02:54:50 +09:00
Ethan Roseman
92af8493a0
func_E02000AC ( #1013 )
2023-04-11 03:18:49 +09:00
Marijn van der Werf
4380c32b8d
Add .git-blame-ignore-revs ( #1014 )
...
# 1213a4adf0aa515d0c7c7e37db396363914fda2egit-blame
2023-04-11 03:16:19 +09:00
Marijn van der Werf
1213a4adf0
Convert tabs to spaces ( #1012 )
2023-04-11 03:06:19 +09:00
Ethan Roseman
3e3558a37f
appendGfx_shading_palette ( #1010 )
...
* cleanup & warnings for modern gcc
* clean
* stuff
* diff.py update
* Fix offset problem in struct
* Fix texture issue in chapter_change
* appendGfx_shading_palette
2023-04-08 23:04:45 +09:00
HailSanta
93ed912319
fold doc 1 ( #1009 )
...
* minor fold cleanup
* fold doc I
* enough
* rename
* last
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-04-08 02:18:12 +09:00
HailSanta
314c4ef423
pause menu cleanup ( #1008 )
...
* minor pause cleanup
* macro
* comments
* second macro
* delete macros
* hm
* pause message names
* unused tutorial messages
* oops
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-03-28 16:10:01 +09:00
CreateSource
86cfc280d5
Changed some variable names in state_title_screen ( #1003 )
...
* Changed some variable names in state_title_screen.c
* resolving pull request items
* changed TitleData to TitleScreenGfxData across sys
* replace gbi names with understandable ones
* accidentally switched logo and pressStart
* changed GfxData to ImgList
* Renaming and b32
* Doing this but more
2023-03-28 14:42:44 +09:00
Alex Bates
e599c2e773
add git hook to make sure assets/$version has been gitignored ( #1006 )
...
* add git hook to make sure assets/ hasn't been gitignored
* echo to stderr
* quiet git check-ignore
* add .v64 and .n64 to gitignore
2023-03-28 13:32:20 +09:00
Marijn van der Werf
2c7b849152
Clean up #989 ( #1005 )
2023-03-27 18:57:36 +09:00
Marijn van der Werf
595f142b27
Pal battle ( #989 )
...
* world partners
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
* battle partners
* battle items
* Update src/battle/common/move/ItemRefund.inc.c
Co-authored-by: Alex Bates <16batesa@gmail.com>
* add LANGUAGE enum
* Move extern variable declarations
* Remove temp var
* Update scripts
* remove post
* Fix n64img version
This reverts commit f5a2c592bd
2023-03-27 02:03:19 +09:00
Marijn van der Werf
0c741974a6
fix image building to work with new n64img output ( #1001 )
2023-03-27 00:43:00 +09:00
Ethan Roseman
accdc4a7f6
test_item_player_collision ( #999 )
...
Co-authored-by: Unnunu <serge_zorkin@mail.ru>
Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>
2023-03-26 17:02:47 +09:00
