Unnunu
9a876d74f7
matched some gfx and model functions ( #830 )
...
* matched 3 functions
* two iwa functions
* matched 4 model functions
* alpha decimal
* PR suggestions
2022-10-18 07:58:52 +09:00
Ethan Roseman
77ee6c819b
More libultra and appendGfx_player_actor ( #829 )
...
* libultra stuff
* vi stuff
* initialize.c
* bss stuff
* appendGfx_player_actor
2022-10-17 18:51:58 +09:00
HailSanta
342887a94c
kmr + revisions ( #828 )
...
* kmr_07
* more kmr
* kzn cleanup 1-9
* kzn cleanup II
* arn/mgm/gv/end revision
* iwa I
* bubulb spelling
* rest of iwa
* more kmr
* enough kmr_23 for now
* quick fix
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-10-17 16:46:24 +09:00
Unnunu
64763ae586
3 more gfx functions ( #827 )
...
* matched draw_tiled_image
* render_item_entities
* draw_adjustable_tiled_image
* draw_image_with_clipping unfinished
* cleaning up
* keep MSG_* and WINDOW_ID_*
2022-10-16 13:02:11 -04:00
Ethan Roseman
46decfa258
Warning Fixies ( #826 )
...
* warnings
* morenings
* more
* morz
* mor3
* PR
2022-10-16 23:22:18 +09:00
Ethan Roseman
c700116f41
BSS And Libultra ( #823 )
...
* BSS refactor (the Wiseguy method)
* controller.c
* ldiv.c
* motor.c
* cartrominit.c
* more libultra matching + standardization
* more libultra stuff
* more
* clean
* warnings
2022-10-16 07:24:05 +09:00
HailSanta
fab07c1c8c
area_dro ( #821 )
...
* dro work
* nok varstash dupes
* p1
* rest
* documentin
* fixes
* imports sorted
* dro_01 cleaned up
* dro done
* kmr_06
* cleanup
* mergin
* warnings
* really fix warnings
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "ebadd64f07"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "ebadd64f07"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* dead map reorg I
* dead reorg II
* dead reorg III
* dead reorg IV
* got a func
* part of area_kmr
* oops
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-10-15 12:04:53 -04:00
Lightning
c1c1dfd533
Fix z64 building in debug mode ( #822 )
2022-10-15 07:50:43 +09:00
Ethan Roseman
f12e57b7c4
Partner Funcs + Splupdate ( #820 )
...
* progz
* fixies
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "6c228fc53a"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "6c228fc53a"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* 3
* func_80238000_703AF0
* Force upgrades of requirements in Jenkinsfile
* --amend
* main_loop finished
* PR comments
2022-10-15 07:21:50 +09:00
Unnunu
b93928a013
two background gfx functions ( #819 )
...
* matched tattle_cam_pre_render
* matched appendGfx_background_texture
* cleaning up
* fix one warning
* made ARRAY_COUNT and removed unnecessary cast
2022-10-13 10:16:49 +09:00
Spencer Vaughn
fec4a513ac
Matched effects funcs ( #818 )
...
* thunderbolt_ring: Matched update and main
* snowfall_main: Matched
* shiny_flare_main: Matched
* shiny_flare_update: Matched
* thunderbolt_ring_update: clean up
* rising_bubble_main: matched
* ring_blast: Matched main and update
* quizmo_stage: Matched main and update
* ring_blast_main: Fixed warning message
* PR_818: PR clean up
2022-10-12 21:39:03 +09:00
mrshigure
5df977a353
[Effects] Migrating data + a couple of functions ( #817 )
...
* [Effects] Migrating data + a couple of functions
* Addressed PR comments
2022-10-12 09:28:15 +09:00
HailSanta
37e138402f
sbk done ( #815 )
...
* sbk_02
* tex panner enum everywhere
* sbk_02 done
* choice cleanup
* todo imports
* ai reorg
* more reorg
* all sbk done
* all sbk
* reduce warnings
* really fix one
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-10-12 06:19:39 +09:00
Ethan Roseman
f394da14cb
Floaters ( #816 )
...
* progrz
* 3 big boys
* play_movement_dust_effects
* clean
2022-10-12 06:13:08 +09:00
HailSanta
2e8a4efa30
area_mim ( #813 )
...
* area_mim
* fixes
* mim is FINISHED, you hear me? FINISHED
* slight improvement
* and this
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-10-10 18:02:54 -04:00
Unnunu
f918be9c7e
matched 3 npc functions ( #814 )
...
* 3 npc functions
* fixed warnings
* added padding
* code improvements
2022-10-11 06:57:21 +09:00
Unnunu
cc6f4d9a66
all battle maps done ( #812 )
...
* make BS flags enum everywhere
* area_kpa
* fix merge conflicts
* area_kpa2
* fix merge conflicts
* area_kpa3
* area_kpa4
* matched all battle map functions and some others
* fix warnings
2022-10-10 12:26:32 +01:00
Ethan Roseman
57c0421151
Map funcs ( #811 )
...
* Many duplicate funcs, still around 41 left :P
* 19 duplicate funcs left
* Finished matching some duplicate funcs in world/area
* wipperz
* hos_01 funcs
* more funx
* 3 hos_04 funcs
* hos_04 funcs
* more hos
* tik_25 func
* mores
* progress
* clean
* mo
* meep
* PRs
Co-authored-by: Nasina7 <nasina987@gmail.com>
2022-10-09 18:09:41 +09:00
HailSanta
7481bed65b
area_arn ( #810 )
...
* area_arn
* iwa
* iwa cleanup
* run coverage
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-10-09 01:55:27 -04:00
mrshigure
9a644e30d6
Effect gfx data + some light funcs ( #809 )
2022-10-08 11:07:10 +01:00
Unnunu
41f5781a1d
tik2/tik3/kzn2/kkj battle maps ( #808 )
...
* area_tik2
* area_tik3
* area_kzn2
* area_kkj
* added area refs
2022-10-08 11:06:15 +01:00
HailSanta
f96542f52a
area_trd ( #807 )
...
* EVT_PLAY_EFFECT
* area_trd data
* forgot a flag name
* fix bobomb spelling
* todo note
* fix macros
* fixed a couple more
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-10-07 14:45:58 -04:00
Spencer Vaughn
5afce0b883
Matched effects main funcs ( #806 )
...
* hieroglyphs_main: Initial c
* hieroglyphs_update: Compiled c
* hieroglyphs_main: Matched
* huff_puff_breath_main: Matched
* smoke_burst_main: Matched
* sweat_main: Matched
* PR_806: Updated init signatures
* huff_puff_breath_main: removed unused temp
* smoke_burst_main: Updated fx struct with rgba
2022-10-07 16:31:45 +09:00
Ethan Roseman
59217b8cf8
A few battle/partner funcs ( #804 )
...
* 5 battle partner funcs
* 3 battle funcs
* rodata fix for the fish
* PR comments
2022-10-06 09:06:09 +09:00
mrshigure
b7d0ec9921
[Effects] Gfx data + stars_burst ( #803 )
...
* [Effects] Gfx data + stars_burst
* Addressed PR comments
2022-10-06 08:26:03 +09:00
Unnunu
48588557a4
flo/flo2/tik battle maps ( #805 )
...
* area_flo
* area_flo2
* area_tik
2022-10-05 19:14:18 -04:00
HailSanta
43c9a7c91d
sbk map data ( #802 )
...
* jan_00 ok
* whale cleanup
* sbk
* format cleanup
* fixes, revisions, and some trd
* stop warnings
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-10-06 05:11:24 +09:00
Ethan Roseman
73af4eb5a0
Tables & Chairs (sorry no chairs actually) ( #800 )
...
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "ec7bd4868e"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "ec7bd4868e"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* wips
* more
* wipperz
* it workz
* mdl_make_local_vertex_copy
* sleep_bubble finished + gfx
* fire_breath gfx
* func_800F0490
* func_800EFE2C
* 8a860 funcs
* cleanup + dead cod
* dead clean
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "a1730f38ad"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "a1730f38ad"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* cleanup + splat prep
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "4e5fca24a5"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "4e5fca24a5"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* bits
* clean
* bss c -> asm
* btl_update_starpoints_display
* is_debug + cleanup
* load_script / 190B20 data
* all the symz
* clean
* cleanup + stuff
2022-10-04 23:09:23 +09:00
Unnunu
f62c83607e
omo3/pra/dig battle maps ( #799 )
...
* area_pra wip
* temp
* finish area_pra
* omo3 map
* area_dig
* cleaning up
* fixed sprite include
* removed script
2022-10-04 10:10:23 +09:00
HailSanta
cba14cc73d
end/mgm/tst maps ( #798 )
...
* mgm_00
* mgm_03
* mgm_01 OK
* several btl_kzn2
* reflection cleanup
* more maps
* ok for now
* tst_10
* area tst
* pre mgm
* mgm_02 ok
* mgm_02 cleanup
* added IDs
* end_01 almost compiles
* end_01 OK
* end_01 partially done
* end_01 almost done
* end_01 done
* end_00 OK
* credits include cleanup
* end_00 initial cleanup
* new splits 1
* done end_00 cleanup
* areas mgm, end, tst
* whale stuff
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-10-03 20:56:24 -04:00
Spencer Vaughn
794618569d
Match 3 effects ( #797 )
...
* func_80240BD4_EA96B4: Initial c
* func_80240BD4_EA96B4: compiles
* func_80240BD4_EA96B4: Match
* func_8024199C_ECB69C: Initial c
* func_8024199C_ECB69C: Compiled c
* func_8024199C_ECB69C: Non matching
* func_80242260_EE8810: Initial c
* func_80242260_EE8810: Compiled c
* func_80242260_EE8810: Non matching
* smoke_burst_update: Initial c
* smoke_burst_update: Compiled c
* smoke_burst_update: updated SmokeBurstFXData
* smoke_burst_update: Matched
* removed asm match
* Fixed warnings
* PR_796: Comment clean up
* PR_796: Added new line after temp declaration
* hieroglyphs_update: Initial c
* hieroglyphs_update: Compiled c
* hieroglyphs_update: Matched
* huff_puff_breath_update: Initial c
* huff_puff_breath_update: Compiled c
* huff_puff_breath_update: Matched
* hieroglyphs_update: Updated effects.h
* hieroglyphs_update: Updated effects.h
* PR_796: Clean up 3
* PR_796: Updated commented struct sizes and updated bools
* PR_796: Updated bools in EA8AE0
* sweat_update: Initial c
* sweat_update: Complied c
* sweat_update: Matched
* sweat_update: Matched clean up
* huff_puff_breath_update: Updated effects struct size
* hieroglyphs_update: Update effects struct size offset
* hieroglyphs_update: Matched clean up
* huff_puff_breath_update: Matched clean up
* PR_797: Updated struct member names
Co-authored-by: Spencer Vaughn <spencer.vaughn@dws.la>
2022-10-04 03:12:44 +09:00
Spencer Vaughn
c976e6e6fe
First effects match + 3 random functions ( #796 )
...
* func_80240BD4_EA96B4: Initial c
* func_80240BD4_EA96B4: compiles
* func_80240BD4_EA96B4: Match
* func_8024199C_ECB69C: Initial c
* func_8024199C_ECB69C: Compiled c
* func_8024199C_ECB69C: Non matching
* func_80242260_EE8810: Initial c
* func_80242260_EE8810: Compiled c
* func_80242260_EE8810: Non matching
* smoke_burst_update: Initial c
* smoke_burst_update: Compiled c
* smoke_burst_update: updated SmokeBurstFXData
* smoke_burst_update: Matched
* removed asm match
* Fixed warnings
* PR_796: Comment clean up
* PR_796: Added new line after temp declaration
* PR_796: Clean up 3
* PR_796: Updated commented struct sizes and updated bools
* PR_796: Updated bools in EA8AE0
Co-authored-by: Spencer Vaughn <spencer.vaughn@dws.la>
2022-10-03 08:05:04 +09:00
Unnunu
036115e97d
matched several world functions ( #794 )
...
* matched 11 functions
* fix warning
2022-10-01 20:34:49 +09:00
HailSanta
7b24d78503
area KZN and others ( #795 )
...
* kzn_01
* cleanup
* kzn_05
* sound name
* missed evt_ptr
* splat change
* broken :(
* pan params for other maps
* works, but not great
* some kzn funcs
* documentin
* minor
* kzn_07 funcs
* more matches
* kzn_08
* kzn_06 fixup
* kzn_01_fix
* kzn 5
* kzn_07
* surprisingly OK
* some matches
* letter choice
* refactor
* more maps
* check
* first area done!
* now with extra bonus map
* kzn23
* some camera stuff
* entrances adjustment
* kzn_22 OK
* kzn_22 cleanup
* kzn_20 ok
* kzn_20 cleanup
* kzn_18 ok
* kzn_18 cleanup
* kgr_01
* area kgr done
* kgr_02 renames
* kzn_11
* kzn_17 ok
* kzn_17 cleanup
* kzn_04 done
* kzn_03 ok
* kzn_19
* bad kzn_19
* funcs idk
* figured a thing out
* kzn_19 ok
* some matches
* kzn_19 cleanup
* all kzn funcs
* merg'd
* some kzn btl matches
* vine field renames
* kzn cleanup 1
* kzn cleanup 2
* tab patrol
* trailing space patrol
* piranha anims split
* actor type sounds
* example
* requests + remove hardcoded dma entries
* split vine image
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-09-30 21:44:48 -04:00
Unnunu
a293e4e120
two partner functions ( #793 )
...
* matched partner_walking_follow_player
* clean stuff
2022-09-30 23:00:33 +09:00
Ethan Roseman
473bfa0692
dead_sqrtf, data migration, etc ( #790 )
...
* more goods
* move dead map data to dir
* data migration / splatification
* new splat
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "d93b6550c4"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "d93b6550c4"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* splat fix
* dead_sqrtf bye bye
* fix
* Clover comments
* comment
2022-09-29 05:52:12 +09:00
Unnunu
50ab50f669
filemenu ( #791 )
...
* migrated filemenu data
* matched filemenu_get_menu_message
* matched the rest of filemenu
* cleaning up
* fix
2022-09-29 02:09:11 +09:00
mrshigure
70590f890e
[Effects] Matched 29 functions ( #789 )
...
* [Effects] Matched 29 functions
* Fixing a warning
* Addressed PR feedback
2022-09-28 03:10:05 +09:00
Alex Bates
dda4b25e35
Match func_80240000_BB59E0 from src/world/area_mim/mim_10/BB59E0.c ( #788 )
...
* Match func_80240000_BB59E0 (src/world/area_mim/mim_10/BB59E0.c)
Co-authored by: Matt Kempster <>
* pr
2022-09-26 07:48:26 +09:00
HailSanta
3a8ba482e4
collision stuff ( #785 )
...
* flag fixes
* enum vals
* npc flags
* ai flags
* collision stuff
* ok
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-25 05:01:49 +09:00
HailSanta
b6ab97c066
enum cleanup ( #784 )
...
* flag fixes
* enum vals
* npc flags
* ai flags
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-25 04:34:16 +09:00
Ethan Roseman
87179cdf3f
Shiftability work + splat update ( #783 )
...
* evt bss + shiftability work
* entity BSS
* more BSS
* another follows_vram
* more shift goodz
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "9af40c5265"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "9af40c5265"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
2022-09-24 11:21:54 -04:00
HailSanta
3706178f3a
sprite names ( #782 )
...
* initial variation support
* checkpoint
* pass 1
* second pass
* first few
* more
* change anim < 16 format
* next batch
* goomba anims
* more npcs
* safety
* success
* checkpoint
* last of dro
* a few
* checkpoint
* penguins
* conventions
* flowers A
* Flowers B
* partner animation support
* parter stuff
* id cleanup
* laki
* more laki
* laki done
* sushie
* goompa
* watt + bow
* bombette + parakarry
* goombario
* kooper
* goomba family
* spike jr troopa
* jr troopa
* world partners
* goombas
* lee
* chan
* the master
* toads
* mostly toads
* so many toads
* penguins
* nok npcs
* ch 2+3
* rest of chapters
* parade
* green mario harharhar
* battle bowser
* world bowser
* goomba king
* enough sprites for now
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-24 18:04:13 +09:00
mrshigure
79babd7154
Matching more effects ( #780 )
...
* Matching more effects
* Deleted matched functions
* Addressed PR comments
* PR comments and remove goto
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-09-21 16:09:22 +09:00
HailSanta
2e37730dd0
much faster ( #781 )
...
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-19 06:07:31 -10:00
Spencer Vaughn
68d77e7f9d
func_80240DA4_EA9884: Match ( #779 )
...
* func_80240DA4_EA9884: Match
* Update src/EA8AE0.c
Co-authored-by: Brotenko <31699028+Brotenko@users.noreply.github.com>
Co-authored-by: Brotenko <31699028+Brotenko@users.noreply.github.com>
2022-09-17 16:02:51 -04:00
Ethan Roseman
2b40121739
Shiftability work ( #778 )
...
* move data includes
* splat yaml comments
* 8a160 data + funcs
* naming things
* 801b0 funcs
* data stuff
* BSS temp removal + new splat accommodations
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "e1abb4ece0"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "e1abb4ece0"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* splat accommodations
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "20bffc4ffc"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "20bffc4ffc"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* set vram for seg
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "c95002b315"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "c95002b315"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* more goods
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "470c358834"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "470c358834"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "df424333da"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "df424333da"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "18eb9cb2e6"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "18eb9cb2e6"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "285a549bc6"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "285a549bc6"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "c523ce1a3a"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "c523ce1a3a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* hawaii push
* shiftability work
* DEG_TO_RAD
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "6c02ec5ecd"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "6c02ec5ecd"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
2022-09-17 15:10:37 -04:00
Alex Bates
1ad0f7b149
Fix 'badly punctuated parameter list in define' issues ( #777 )
...
* remove defines of old SCRIPT macro
* get rid of uses of unnamed ...
2022-09-16 08:27:35 -10:00
Alex Bates
37021b1464
suggest vscode-star-rod instead of vscode-papermario ( #776 )
2022-09-16 06:45:37 -10:00
Alex Bates
4fa83c8ae6
Match src/battle/area_kzn2/59F420.c (petit piranha funcs) ( #774 )
...
* Match func_80218D90_59F470 (src/battle/area_kzn2/59F420.c)
* clean up
* Match func_80218D40_59F420
* name funcs
* fix warnings
* remove double newline
2022-09-16 06:45:16 -10:00