HailSanta
4fce6037a1
misc battle cleanup ( #943 )
...
* peach NPC flags and missing ANIM_LIST_END
* ANIMS
* auto smash
* misc battle cleanup
* misc battle doc 2
* more battle
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-15 03:18:27 -05:00
HailSanta
8c688c82d7
all map data complete ( #941 )
...
* just 10 left
* six left
* split dead flo_19
* merged texture pan includes
* cooking
* bedroom
* study
* one left
* kkj_25 ok
* kkj_25 cleanup I
* enemy include reorg
* NO_DROPS cleanup
* revised NO_DROP
* dead_flo_19 splits
* StaticNpc -> NpcData
* removed tabs
* canonical npcdata fields ordering
* ANIM_LIST_END for ExtraAnims
* npcdata field reordering
* DISPOSE_LOCATION
* kkj_25 done
* marked unused area bytes
* adjusted function temp defines
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-14 09:46:48 +09:00
HailSanta
768e88f20d
area jan ( #937 )
...
* couple jan
* pipe includes cleanup
* jan_13 checkpoint
* Rafael checkpoint
* jan_05 ok
* jan_0X done
* fix spear guy name
* all jan ok
* jan done
* no halves
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-10 17:00:28 +09:00
HailSanta
6c606383e8
nok and pra done ( #936 )
...
* nok_04 ok
* thread done
* push block doc
* nok done
* almost done pra
* pra done
* cleanup pra_31 mtx names
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "3bbc02af68"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "3bbc02af68"
git-subrepo:
version: "0.4.5"
origin: "???"
commit: "???"
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-08 09:47:26 +09:00
Unnunu
354ebdfe20
last audio function and more documentation ( #934 )
...
* documented voice
* sfx_player
* sfx
* ambient sounds
* fix
* fix name
* au -> snd
2023-02-06 20:21:55 +09:00
HailSanta
713883c750
world script data ( #933 )
...
* nok_01 ok
* nok_01 cleanup
* nok_02 ok
* nok_02 cleanup pt 1
* nok_02 cleanup pt 2
* nok_02 cleanup pt 3
* map api data
* rooms api
* rooms cleanup
* rooms cleanup
* done rooms cleanup
* fix mixed up enemy/npc flags
* tabs
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-05 19:13:45 -05:00
HailSanta
18befa1ec6
area sam ( #931 )
...
* sam_02
* sam_11 ok
* sam_11 done
* jan progress
* jan_03
* fix
* small
* oops
* spaceman
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-03 15:16:32 +09:00
HailSanta
2d3a608ce7
area hos ( #928 )
...
* hos_06 ok
* hos_06
* hos_01
* hos_01
* hos_04
* hos 10/20
* hos_05 builds
* hos_05 data ok
* hos_05 ok
* hos_05 cleanup pt1
* hos_05 cleanup done
* small fix
* a couple more
* fix little thing
* finish sam_01
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-01 11:31:09 +09:00
Ethan Roseman
dfff7bce1a
squirt effect done, 0 warnings, undefined_syms cleanup, wip ( #922 )
...
* warnings & WIP
* 0 warnings
* squirt_appendGfx && gfx data (squirt effect dun)
* undefined_syms cleanup
* clean
* don't die when no warnings
2023-01-25 23:06:57 +09:00
HailSanta
a03510d8a6
area_omo ( #921 )
...
* omo_09
* omo_11
* part of omo
* 08/10/13
* more
* train toad rename
* hmm
* guard ai
* omo_02
* fix partner anim enum
* omo_15
* omo_12
* last omo
* pra_15
* reflections
* under 100 maps left
* cleanup floats
* horse
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-25 11:33:20 +09:00
HailSanta
858eb4c19e
fix map warnings ( #916 )
...
* omo_17
* sam_06
* sam_06
* hos_02
* hos_03
* shops
* star kid name fix
* shop dialogue
* nok_11
* nok 14/15
* small fixes
* ready
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-21 17:14:46 +09:00
Ethan Roseman
0cee144b18
func_802401A0_DDC9D0 & save/load tattle flags ( #915 )
...
* func_802401A0_DDC9D0
* func_802428C8_A2CB08
* cleanup
* wip
* warning
* save/load_tattle_flags
* PR comments
* idnex
2023-01-19 10:33:52 +09:00
HailSanta
935fd14530
misc battle cleanup III ( #911 )
...
* misc
* fix one type
* yeah
* misc
* all substates
* almost done
* renames
* comments
* a couple maps
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-15 18:22:41 +09:00
Unnunu
2f79b35772
model functions ( #910 )
...
* matched appendGfx_model
* 3 more
* fog modes
* cleaning
* fix
* fixed macro name
* FogModes enum
* extra tile enum renamed
2023-01-13 16:56:28 +09:00
HailSanta
eb7ed118a6
flags -> flag ( #909 )
...
* flagsnt
* not this one
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-12 11:09:13 +09:00
HailSanta
efa45a5668
misc battle cleanup II ( #908 )
...
* flags and fixes
* move category start
* first strike and battle messages
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-11 17:38:04 +09:00
HailSanta
cc3a146066
battle substates cleanup I ( #906 )
...
* cleanup in progress
* celebrate done
* progress
* etc
* substate enums done
* flag fixup
* brevity
* msg name fix
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-10 15:33:09 +09:00
Unnunu
2514e13635
btl_state_update_player_menu ( #902 )
2023-01-05 19:43:31 +00:00
HailSanta
1c470c92e5
area osr ( #903 )
...
* 0/1
* ~2
* 2
* 4
* done
* ws
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-05 02:04:03 -05:00
HailSanta
0e54cd9b30
area kmr ( #898 )
...
* kmr_02 ok
* some cleanup
* foliage EVS
* quiz cleanup
* partners
* cleanup pass ?
* kmr_02 done
* kmr_20 ok
* begin kmr_20 cleanup
* enough kmr_20
* kpa_90+
* more kpa
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-02 10:58:39 +09:00
Unnunu
e6de400efa
Draw box ( #897 )
...
* wip
* matched draw_box
* cleaning up
* renamed file
* fixed warning
* PR comments
2022-12-29 14:08:13 +09:00
Unnunu
207f4400b6
matched 4 obk functions ( #896 )
2022-12-28 14:30:30 +00:00
HailSanta
cbdce77daf
area_spooky ( #894 )
...
* obk_01
* obk_02
* obk_03
* obk_06
* obk_05
* checkpoint
* chandelier documentation
* obk_04
* obk_09
* obk_07
* obk done
* tabs
* kmr_22
* kmr_11
* last thing
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-12-25 14:10:23 +09:00
Ethan Roseman
10c94b1cb3
a match for the clover ( #886 )
...
* warning
* func_80240098_BBD238
2022-12-13 18:18:15 +09:00
HailSanta
e4283f3ea1
area_mac ( #884 )
...
* mac_00 match
* mac_00 cleanup pass
* enough mac_00 cleanup
* mac_01 match
* cleanup pass 1
* first pass done
* more
* unkfoldfunc dedupe
* quick
* mockup
* new splat segment
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "b2d7b86185"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "b2d7b86185"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* fix custom segment
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "0f66e7552a"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "0f66e7552a"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* common vtx
* victory
* checkpoint
* remove map-specific subaligns
* enough
* quick fixes
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-12-12 21:31:29 +09:00
Ethan Roseman
29c3ffa2e0
Misc decomp 3: Oh baby a triple ( #882 )
...
* clean
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "901241040d"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "901241040d"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* splat update
* more matches after nop hack
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "715ee0ad55"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "715ee0ad55"
git-subrepo:
version: "0.4.5"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "aa416e4"
* Renames, match boot_idle
* one mo
* wips
* fish func
Co-authored-by: @JaThePlayer
* sushie dun
* warnings
* clean
* match a nok func
* nok_02 stuff
* nok_04 party image
* func_802BD5D8_3174F8
* LoadPartyImage & stuff
* warnings
2022-12-11 16:43:29 +09:00
HailSanta
703896a7f1
isk+ ( #878 )
...
* isk_01/2/3
* machi
* mac_05
* mac_04 matched
* mac_04
* mac_02 match
* mostly cookin
* mac_02 cleanup
* tayce t cleanup done
* most of isk
* almost done isk
* isk done
* mapconfig 1C
* jump to goal
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-12-06 08:29:22 +09:00
Devon R
25e4f67adb
Renames for documentation purposes ( #864 )
...
* Renames for documentation purposes
* Change wording (CANT_CHANGE_PARTNER => PARTNER_CHANGE_DISABLED)
* Renaming (behaviour => behavior) and TRUE/FALSE
* Remove unnecessary false comparison
* Address review comments
2022-11-26 00:16:13 +09:00
Ethan Roseman
78c30637f2
Misc matches & cleanup ( #868 )
...
* yaml updates
* 2 funcs & cleanup
* anotha 1
* re-org
* PR & cleanup
2022-11-24 03:33:39 +09:00
HailSanta
c776b32bc6
generic_entity -> worker ( #865 )
...
* workers
* broke out worker flags
* quick fix
* player sprite sets
* enum ws
* default -> world
* fix long line
* virtual entity split and minor cleanup
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-11-21 23:12:28 -05:00
Unnunu
eff23cecb6
matched 5 functions ( #862 )
...
* matched one
* btl_draw_upgrade_windows
* 2 sprite funcs
* rename
* func_80242FE0
2022-11-20 02:24:16 +09:00
Unnunu
0f4f12a1dd
btl_state_update_partner_menu ( #860 )
...
* btl_state_update_partner_menu
* cleaning
* enums in btl_state_draw_partner_menu
* PR comments
2022-11-16 18:46:50 +09:00
Ethan Roseman
f56df3d9f7
sprite_shading_profiles & obk_07 ( #859 )
...
* obk_07 funcs
* 2 mo
* sprite_shading_profiles
* tiny clean
* PR comments
2022-11-15 23:55:59 +09:00
Unnunu
17e4bff020
star beam and few others ( #857 )
...
* peach/star beam
* 3 more
* func_802A5290 wip
* PR comments
2022-11-14 20:00:29 +09:00
Ethan Roseman
a880543beb
ItemChoice_SaveSelected + hos funcs ( #854 )
...
* cleanup
* a bunch of ItemChoice_SaveSelected
* the last few
* a bit more
* some position -> pos
* warnings
* 2 snibblets
* 2 snibblets
* one more
* weird
* mo
* more hos_05
* hos5
* 3 mo
* comment
* cleen
2022-11-10 11:00:56 +09:00
Unnunu
294602ec98
battle partners ( #852 )
...
* goompa and goombario
* kooper
* bombette
* parakarry
* watt
* sushie
* lakilester
* bow
* twink
* fix warning
* fix messed fields
* CalculateArcsinDeg
* updated splat entries
2022-11-05 16:06:28 +09:00
Unnunu
cf4eeecc13
msg stuff ( #847 )
...
* matched several msg functions
* added images and set flags
* fix merge issue
* warning
* Update src/msg_data.c
Co-authored-by: Alex Bates <16batesa@gmail.com>
Co-authored-by: Alex Bates <16batesa@gmail.com>
2022-11-02 21:30:07 +09:00
Unnunu
8fd2613bd8
encounters and static npc flags ( #843 )
...
* matched update_encounters_neutral
* matched encounter funcs
* replaced NPC flags with ENEMY flags
* cleaning up
* warnings
2022-11-01 12:27:10 +00:00
Unnunu
76254641e5
non-world data migration ( #841 )
...
* migrated 54360
* partially migrated 1AF2D0
* level up screen
* 1AF2D0 fully migrated
* cleaned up
* matched one audio function
* fixed warning
* PR comments
2022-10-31 00:41:22 +09:00
HailSanta
b656ab90b4
area_flo ( #839 )
...
* some reorg
* minor stuff
* flo_03
* flo_08
* flo_09
* flo_00
* flo_11/12
* flo_10
* flo 24/25
* flo 22/23
* flo 21
* flo_19
* flo 17/23
* flo 16
* flo 15
* flo_14
* flo_13
* area flo
* tik_06
* couple missed things
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-10-31 00:23:13 +09:00
Ethan Roseman
b64886fa8c
A couple map funcs ( #835 )
...
* find_similar_areas improvement
* func_sizes in find_similar_areas
* 4 funqz
* another
* clean
* sams
* more sams
* osr, pra
* omo
* some obk
* cleanup + funcz
* wip
* warnings
* more
* 3 mo
* 7 more
* render_models (thanks Unnunu\!)
* cleanup
* PR comments
2022-10-25 19:04:54 +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
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
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
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
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
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
Unnunu
48588557a4
flo/flo2/tik battle maps ( #805 )
...
* area_flo
* area_flo2
* area_tik
2022-10-05 19:14:18 -04: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
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
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
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
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
HailSanta
9ef69b66cf
needed more DEG_TO_RAD ( #773 )
...
* sneaky
* first batch
* DEG_TO_RAD
* some mac_04 funcs
* parasol done
* unk playerstatus fields
* sprite learnin
* new sprite stuff
* yay
* fix a warning
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-15 09:39:16 -10:00
HailSanta
81c2817b09
PLAYER_STATUS_FLAGS begone ( #772 )
...
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-13 15:36:06 +09:00
HailSanta
f7e39c0802
player anim + collider surface types ( #769 )
...
* player anim + collider surface types
* added default surface type
* remove unused flags and define surface mask
* revised action table
* checkpoint
* player sprite stuff
* remove currentAnim union
* more actions
* enough
* discharged
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-13 02:26:57 -04:00
HailSanta
70d3b7b3a8
msg names and more map data prep ( #768 )
...
* minor NPC fixup
* most var type renames
* rest of var names
* remove deprecated
* var types cleanup
* fixed -> float 1
* fixed -> float 2
* fixed -> float 3
* fixed -> float 4
* evt fixed removed
* localvar shorthand
* missing byte names
* missing flag names
* evt var cleanup
* local var shorthand redux
* minor cleanup
* mario anim name
* item ranges cleanup
* player anim names
* all message names
* renames for existing
* remove unused enum
* squash msg ids
* again
* all message refs replaced
* area headers
* idk
* also merged
* remove superfluous parens
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-12 01:23:47 +09:00
Ethan Roseman
408c49cb75
one for the books ( #765 )
...
* func_802A1518_78BB18
* btl_state_update_select_target
* wip
* btl_state_draw_select_target and WIP
* cleanup
* render_shaded_sprite and wip
* WIP/cleanup
* wip
* reset_player_status
* btl_state_update_player_move and cleanup
* func_802A2C84
* func_80242FE0 wip
* btl_state_update_normal_start and cleanup
* WIP
* btl_state_update_end_turn
* btl_state_update_enemy_striking_first
* cleanup
* cleanup & wip
* item_entity_update & cleanup
* update_item_entity_temp
* appendGfx_item_entity
* E21870
* mdl_create_mode
* cleanup
* func_802A9310_42D220
* area_flo2 battle funcs dun
* b_area_isk_part_1_ChompChainUpdate
* wip and rip
* clean
* partner_move_to_goal
* partner_get_out
* wip
* cleanup
* func_802BD1AC_31CD1C
* func_802BD754_31D2C4
* Cleanin
* fix func def
* UnkShadowFunc001
* a bunch of kpa funcs
* comment
2022-09-08 21:21:07 +09:00
HailSanta
c108f11cab
EVT mass renames ( #763 )
...
* mapconfig -> mapsettings
* Map/Area -> MapConfig/AreaConfig
* old EVT names
* kmr names
* game byte names
* EVT_SAVE_FLAG names
* removed EVT_WAIT_FRAMES
* including the to_rename files in case they need to be reused
* more npc AI
* battle and stage names
* fixed enum value
* territory substruct refactor
* refactored enemy drops substruct
* refactor NpcGroupList
* adjusted NPC_GROUP for passive NPCs
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-08 21:12:26 +09:00
HailSanta
0df93d5b2b
prep for map dumping ( #760 )
...
* prep for map dumping
* s p a c i n g
* advanced door + world statics
* sneaky tabs
* more world
* one more
* saved for later
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-06 11:26:53 -04:00
mrshigure
2ad8779ea7
Matched some world/area_kkj functions ( #754 )
...
* Matched some world/area_kkj functions
* Deleted matched functions
* Partially addressed comments
* Addressed comments
2022-08-31 15:33:56 +09:00
HailSanta
51d02cfbf5
actor decor stuff ( #750 )
...
* big func
* this and that
* checkpoint
* more funcs
* enough
* formatting
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-08-26 19:13:57 +09:00
Ethan Roseman
7467b148d1
A few funcs ( #751 )
...
* update_item_entity_collectable
* cleanup
* snibblets and bits
* CancelablePlayerRunToGoal and PlayerRunToGoal
* nonmatch
* PR comments and peach_star_beam effect
* PR stuffs
2022-08-25 19:18:04 +09:00
Ethan Roseman
9d47d968f9
small and large boys ( #749 )
...
* func_802DE780
* EnterPlayerPostPipe
* UnkFoldFunc
* smores
* func_802403C0_800C40
* 3 mo
* filemenu_draw_char
* btl_state_update_enemy_move
* prepz
* fix func thing
* btl_state_update_partner_striking_first
* PR comments
* PR comment
* warning
2022-08-17 10:15:54 +09:00
HailSanta
d11054b41a
several actor funcs ( #748 )
...
* no sun :(
* livin in the sunshine
* misc
* small fix
* splat fix
* comments + sparkles enum
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-08-17 10:04:23 +09:00
HailSanta
f4efd09c80
isk + misc ( #746 )
...
* isk + warning patrol
* minor reorg
* effect data union
* structs sorted and dummy structs added
* effect data cleanup + some end funcs
* two more PAL_PTR*
* temp
* flower fx
* pal_inc_c
* remove tabs
* isk_05
* blur union
* more isk
* isk funcs done
* sun stuff
* delete sun_main
* sun comments
* extra stuff
* actor decorations
2022-08-10 14:36:38 +01:00
HailSanta
ba183f35b5
effect organization ( #745 )
...
* isk + warning patrol
* minor reorg
* effect data union
* structs sorted and dummy structs added
* effect data cleanup + some end funcs
* two more PAL_PTR*
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-08-07 21:42:54 +09:00
HailSanta
1ce49b1ba9
audio odyssey ( #744 )
...
* first pass
* seq cmd args retyping
* some SEF commands
* etc
* couple more SND commands
* more functions
* checkpoint
* five more
* another one
* more funcs + cleanup
* reverted unnecessary unions
* all SEF commands done
* a bunch more
* more!
* morrrrrrre
* almost done for now
* 99%
* 100
* few names and types
* reorg
* minor chnages
* miscmiscmisc
* yet more
* another day another func
* eth wip func_8004EC68
* some sym names
* retyping sound mgr fields
* minor renames
* D_80078400
* bigger func
* retypings
* enhanced drum info
* the evil is defeated
* merged
* prelim ambient sound func names
* audio frame
* checkpoint
* renames
* learnin bout sounds
* latest
* fix snd_load_BK_to_bank
* func_80056FA4
* warnings
* cosmetics
* func_800522A8
* struct reorg
* figured some stuff out
* much more info
* fx params
* cleanin up
* revert accidental changes to jp
* more accidental jp changes reverted
* misc names
* small stuff
* migrated all audio data
* checkpoint
* header reorg begins
* audio public/private headers
* fixed headers
* fixin warnins
* oops
* 51 fixed
* formatted binary data in 30450
* workwork
* cleanup
* misc
* flip macro arg order
* more names
* audio event triggers
* various
* sfx player cleanup
* start bgm player cleanup
* names names names
* priorities
* merlow
* misc enum vals
* rocking chair
* kmr_00 funcs
* enough
* restore delete jp file
* func_80055EB4
* fix func name
* addressed comments
* demoted a couple variables from global
* couple hidden panel things
* credits mostly
* credits dedupe in progress
* jump table repair
* 'finished' end dedupe
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-08-06 21:14:04 +09:00
Unnunu
ae64b1b5cc
entities ( #741 )
...
* matched execute_render_tasks
* step_entity_command_list
* partially migrated entity data
* entity blueprints migrated
* matched create_entity
* matched entity functions
* SaveBlock
* SaveBlock and Switch
* switch model done
* matched shattering block functions
* shattering block models
* matched block funcs
* block models
* finish Block.c
* ItemBlock
* HeartBlock
* SuperBlock
* SimpleSpring
* HiddenPanel wip
* HiddenPanel
* Chest
* WoodenCrate
* BlueWarpPipe
* SignPost
* Padlock
* Boarded floor and padlocks
* BombableRock
* Tweester
* StarBoxLauncher
* wip
* ArrowSign
* BellbellPlant
* TrumpetPlant
* munchlesia wip
* Munchlesia
* UnusedBlock
* cleaning
* fix warnings
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "fd9cbc3a1"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "fd9cbc3a1"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* PR suggestions
* created vtx splat segments
2022-07-17 17:38:19 +01:00
Ethan Roseman
ec0ae12540
Partner, map, engine funcs ( #736 )
...
* phys_should_player_be_sliding
* functions from brotenko
* UnkTrigFunc001
* trd_05
* IsPartnerXXX funcs
* nok funcs
2022-06-26 11:21:38 +01:00
Ethan Roseman
0785fc6f93
Tiny funcs & cleanup & entity ( #735 )
...
* baby funcs for ethy
* progress on pause_stats_draw_contents
* a5dd0 work + cleanup
* almost create_entity
* cleanup
* some funcz
* btl_show_message_popup (thanks Unnunu\!)
* more
* more cleen
* PR comments
2022-06-17 18:21:13 +09:00
Unnunu
e324092e0a
entity models and some gfx functions ( #731 )
...
* decomp 7 functions
* match func_80138E54
* matched render_transition_stencil
* renames
* fix warnings
* fix two warnings
2022-06-13 02:22:06 +09:00
Unnunu
763b320bfb
b_area_omo2 ( #729 )
2022-06-12 15:44:36 +01:00
HailSanta
a335b73d0a
misc-functions ( #728 )
...
* misc stuff
* ShowEmote
* finish fx_api + replacing sound enum values
* load_path_data
* requested fixes
* vertex data extracted
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-06-11 03:06:12 +09:00
HailSanta
611a083ae9
hud-script-disasm ( #726 )
...
* pause hud scripts
* script name prefixes
* missing sparkle script item entity fields
* revert incorrect hypothesis
* global hud scripts + sparkle script macros
* remove tabs
* hs_op_15
* split battle images
* battle hud scripts
* fix warnings
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-06-10 04:03:11 +09:00
Unnunu
accf5a60f6
Animations ( #727 )
...
* decomp 5 animator functions
* animation script disasm
* cleaning up
* improvements in animation disasm
* TODO
2022-06-09 22:49:57 +09:00
Unnunu
59119c0949
item entity functions and a few others ( #725 )
...
* matched 4 functions
* matched 2 item entity funcs and migrated data
* removed default case and fixed lights def
2022-06-09 00:36:32 +01:00
Unnunu
76187e5c3b
3 more battle maps ( #724 )
...
* area_pra2
* finish
* sound enum
* renamed enum member
* fixed alignment
* area_pra3
* area_sam
* area_sam2
2022-06-06 21:34:45 +09:00
Unnunu
d8837960b1
pra2 battle map ( #720 )
...
* area_pra2
* finish
* sound enum
* renamed enum member
* fixed alignment
2022-05-31 03:39:42 +09:00
Ethan Roseman
021592d219
Misc decomp 70 ( #716 )
...
* aura_appendGfx
* 3 more action commands
* fire_shell
* hammer, hurricane
* spiny_surge
* data stuff, cleanup, whirlwind
* warnings
* water_block data and func
* water_block
* effect stuff cleanup
* big_snowflakes effect
* data cleanup, fpr abi regs
* 2 battle item funcs + data
* 2 mo
* shooting_star func
* 3 16F740 funcs
* btl_state_update_end_battle
* map funcs
* more dedupe
* cleanin
* draw_entity_model_C/D
* effect butterflies, btl state funcs
* it is done
* it is done
* PR comments, some cleanup
2022-05-27 22:03:19 +09:00
HailSanta
1e91e60cb6
rest of 5B320 ( #713 )
...
* rest of 5B320
* whitespace
* fix warnings
* split 5B320.c with includes
* ICON_anim_heart_piece_palette
* requested changes
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-05-21 13:56:54 +09:00
HailSanta
5b7f18a2ca
start chest inc + misc cleanup ( #711 )
...
* start chest inc + misc cleanup
* popups
* 5b320 OK
* finish HudScript retyping
* item hud scripts
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-05-18 16:53:28 +09:00
Unnunu
52b9d1b11c
battle camera ( #710 )
...
* match func_80248DE4
* BattleCam_TargetActor
* renamed functions
* Update src/16F740.c
Co-authored-by: alex <16batesa@gmail.com>
Co-authored-by: alex <16batesa@gmail.com>
2022-05-16 15:18:18 -04:00
Ethan Roseman
179998098c
Misc decomp 53 ( #703 )
...
* some btl_state work
* msg_draw_speech_bubble
* cleaners
* btl_state_stuff
* btl_state_update_next_enemy wip
* btl_state stuff
* disable_x fx + cleanup
* wip
* fxstuff
* path funcs & cleanup
* clean
* model_api funcs
* two action commands
* action_cmd progress
* UnkFunc001
* air raid func
* cleanup, data migration, goodies
* remove data file
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "a847090eac"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "a847090eac"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* fix build
* more cleanup
* clean
* PR comments
2022-05-05 23:08:16 +09:00
HailSanta
aee5626e5b
world AI ( #701 )
...
* monty mole AI pt 1
* monty mole AI #2
* enum values for evt priority and flags
* enemy ai flags
* done monty mole + partner enums
* removed union for partner action state
* missed parter action states + cam move flags + entity collision bit
* basic ai
* piranha plant stuff
* attack ahead
* consistent hitbox names
* idk
* organized piranha plant
* delete matches
* start fuzzy
* naming
* bzzap pt 1
* bzzap 2
* bzzap names done
* rename bzzap to flyingAI
* complete flying names
* done for today
* file reorganizing
* world AI
* starting clubba dedupe
* suggested changes
* bullet bills
* sentinel start
* dedupe sentinel complete
* sentinel AI done
* melee ai organization
* piranha plant dedupe
* resolved some bad dead syms
* patrol start
* patrol AI almost done
* enough
* more ai work
* clean up clubba ai enum
* dedupe all clubbae
* started cleft extraction
* ready to dedupe cleft
* dedupe one cleft
* iwa_04
* iwa_01
* iwa_02
* ai state file reorganization
* enemy anim enum
* extracted shy guy
* dedupe shy guy ai
* shy guy patrol ai
* done shy guy ai dedupe
* added NON_MATCHING wrap
* ai etc
* more dead ai
* most dead ai merged with living
* lakitu etc
* paratroopas
* fix warnings
* fix other warning
* ParatroopaAI
* lakituAI parameter fix
* dead_flo_13 debug strings
* misc map matches
* flying magikoopa start
* name npc field
* lungeAI renamed to tackleAI
* magikoopa ai foothold
* extrated one magikoopa
* starting clubba dedupe
* addressed PR comments
* consolidated magikoopa helper funcs
* misc map stuff
* flying magikoopa dedupe
* zipline funcs
* delete matched
* grind out another 0.05%
* started letter delivery dedupe
* more delivery dedupe
* special delivery
* rest of letter delivery
* slight delivery reorg
* delivery func names
* cleft doc start
* name enemy field
* more renamins
* unk_28.f
* changed field names to facilitate renaming
* done cleft cleanup
* hopping ai
* cleanup some ai
* name field + patrol reorg
* filled out NpcAISettings fields
* assembling ai includes
* elimated state files
* remove X32 for alertOffsetDist
* removed other NpcAISettings union
* new NpcAISettings for UnkAI_4
* stationary AI cleanup
* smalls
* 0 new warnings
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-29 13:32:16 +09:00
ThreeMustyFears
80f5e18fc9
Match calc player damage enemy ( #698 )
...
* match calc_player_damage_enemy
* run coverage
* changes
Co-authored-by: ThreeMustyFears <>
2022-04-19 03:03:12 -04:00
ThreeMustyFears
41108b78b5
Match calc partner damage enemy ( #695 )
...
* match calc_partner_damage_enemy
* run coverage
* some var name changes
* remove typedef from enum
* fix warning
* remove casts
* saw a target flag in a comment
* Assert and script enums
Co-authored-by: ThreeMustyFears <>
2022-04-18 17:56:44 +09:00
HailSanta
cfe089af10
monty mole AI + various enums ( #694 )
...
* monty mole AI pt 1
* monty mole AI #2
* enum values for evt priority and flags
* enemy ai flags
* done monty mole + partner enums
* removed union for partner action state
* missed parter action states + cam move flags + entity collision bit
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-04-18 00:36:37 +09:00
HailSanta
0ef8c71bdb
combining various AI and item check imports ( #692 )
...
* aggregating AI includes
* workin on AI funcs
* fix
* misc
* ongoing lock dedupe
* item choices
* so many item choices
* dead item choices
* deleted matches
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-15 12:28:49 +09:00
ThreeMustyFears
02a6b226a4
Match a couple of Parakarry battle funcs ( #690 )
...
* match two Parakarry battle funcs
* run coverage
* cleanup
* more cleaning
* changes
* changed loops
* missed another parenthesis
Co-authored-by: ThreeMustyFears <>
2022-04-13 07:57:39 +09:00
