HailSanta
1589a30e26
API_CALLABLE + misc minor cleanup ( #1150 )
...
* leftover work
* remaining API_CALLABLE
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2024-01-16 13:56:57 +09:00
HailSanta
ce4ab34def
battle/actor flags and more ( #1119 )
...
* battle documentation
* mostly startup stuff
* battle file names
* minor reorg
* actor rendering
* few extras
* file renames and camera unks
* py fix
* fio cleanup
* sounds progress
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-10-14 15:43:12 -04:00
HailSanta
3293216356
last actors ( #1118 )
...
* omo2
* minor fixes
* actor types extraction
* format py
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-10-02 09:12:53 +09:00
HailSanta
46b2f11a59
more boss actors ( #1117 )
...
* common actors
* tubba and huff
* chapter 2
* fix ruff / tuff puff names
* bloopers
* slight
* everything except omo2
* format py
* fix pal
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-09-23 01:57:29 -04:00
HailSanta
9774b26d93
actors and sounds ( #1112 )
...
* all sorts of things
* various
* more
* various
* sound space names
* more
* alternating sounds done
* check
* partial jr troopa cleanup
* jr troopas
* fixes
* extract actor levels
* actor levels done
* chan
* the master
* standard names
* named actor vars
* ACTION_RESULT enum
* fix evt names
* fix struct names
* ember
* lava bubble
* goomba bros + flipped enum
* fix other enum
* goomba king battle
* tutorial enemies
* separate lee
* half lee
* lee done
* lee + duplighost
* more actors
* stray comment
* shy guy dedupe
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-08-22 03:07:08 +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
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
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
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
HailSanta
4145cccd86
mario anim names ( #951 )
...
* prep
* player anims
* consistency
* extra space
* slight adjustment
* suggest_player_anim func names
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-21 17:24:25 +09:00
HailSanta
5a5d088d83
battle cleanup ( #947 )
...
* item cleanup
* quick
* star power cleanup
* battle cleanup
* battle cleanup
* SetGroupVisibility
* more stage cleanup
* stage clean
* misc
* half of stages
* stagework
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-21 00:22:38 +09:00
HailSanta
e55556ddcb
enemy+npc flags ( #946 )
...
* npc flags 1
* enemy & npc flags
* removed item headers
* minor item cleanup
* coverage
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-18 17:13:07 +09:00
HailSanta
f033bbae6d
all data done ( #945 )
...
* misc fold
* omo cleanup
* projectile target offset
* missing actor part fields
* msg chars
* decimal offsets
* partIndex -> partID
* callables
* EVT_PLAY_EFFECT
* fix out of range offsets
* some renames
* battle_area -> battle/area
* renames
* battle names last
* more power
* hammer moves
* hammer directory
* all moves migrated
* moved items
* moved starpowers
* fixed jp
---------
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-17 16:44:14 +09:00
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
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
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
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
b9502a1ac4
action commands ( #853 )
...
* reorg done
* warning
* PR comments
2022-11-08 22:01:42 +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
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
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
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
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
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
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
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
HailSanta
b7f7e4c96d
Santas workshop (matched area_mgm) ( #673 )
...
* mgm_01 start
* strange issue
* blah
* rodata fix
* done with mgm_01 + misc cleanup
* almost done mgm
* minor issues with last 3 functions
* match help
* mgm code done
* proper msg pal usage
* fix warnings
* fix more warnings
* ive been warned
* requests
* area_kgr
* battle cam symbol names
* msg cleanup work
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-05 18:52:06 +09:00
JoshDuMan
d86d15bfd5
Match a number of functions and introduce anon unions ( #655 )
...
* Match a number of functions and introduce anon unions
* Fix warnings
* Ethan's comments
2022-02-25 00:12:33 +09:00
JoshDuMan
0f67c8c425
Disassemble Various Battle Scripts ( #626 )
...
* Disassemble DGB
* Disasm omo
* Disassemble KGR
* Disassemble Battle Goompa
* Disasm Goombario
* Disasm Jan2
* Disasm JAN Battle Map
* Delete data files
* Disasm Spin Smash
* Partners Disasm
* Disasm KZN Battle Map
* Delete func
* jungle_guy
* Spear Guy
2022-01-19 20:21:19 +09:00
JoshDuMan
44dd710d54
Disassemble 3 Battle Maps ( #622 )
...
* Disassemble ISK Part 2 Battle Map
* Disassemble MIM BTL Map and fix script maps
* Delete mim
* Disasm Script
* Disassemble ARN Battle Map
* Remove files
* Remove struct
* Handle comments and merge conflicts
2022-01-17 02:22:23 +09:00
HailSanta
4e33a016eb
struct renaming and trigger/entity cleanup ( #623 )
...
* rename static structs to blueprint
* evt structs renamed
* renamed HudElementAnim to HudScript, worked on triggers
* fix Trigger/TriggerBP fields and entity cleanup
* entity data cleanup 1
* block
* blue warp pipe
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-01-16 22:28:09 +09:00
JoshDuMan
36e5315fdc
Disassemble Various Data Files ( #616 )
...
* Disassemble IWA Battle Map
* Disassemble SBK Battle Map
* Disassemble Quake Hammer
* Disassemble jump.c
* Disassemble Hammer Action Command
* Some Labelling
* Fix symbol_addrs
* Disassemble ISK Part 1 Battle Map
* Restore symbol_addrs
2022-01-13 15:26:42 +09:00
JoshDuMan
79bcd008f9
Battle Map and Move Disassembly ( #614 )
2022-01-11 02:06:43 -05:00
JoshDuMan
5d5106b39c
Work on Pointers ( #610 )
2022-01-08 14:47:52 +09:00
JoshDuMan
d684991270
Disassemble TRD Part 1 Battle Map ( #607 )
2022-01-08 14:43:11 +09:00
JoshDuMan
4657f3621b
Disassemble mac, hos, and nok Battle Maps ( #602 )
...
* voodoo magic
* Cleanup + match func_802180D0_464560
* work
* Finish mac battle map
* Add to gBattleAreas
* splat
* Disassembled hos and nok battle maps
* Match Kent C Function
* fix build
* Fix
* Work on disasm_script
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-01-05 20:01:44 +09:00
JoshDuMan
f44eb0bb88
Disassemble KMR 3 Battle ( #600 )
...
* Work.
* D_80000000
* The rest of KMR_03
* Comments
2022-01-03 18:54:01 +09:00
JoshDuMan
5962ce37fd
Disassemble KMR 2 Battle ( #597 )
2022-01-01 08:08:04 -05:00
Alex Bates
d22bd18f98
Disassemble Star Power scripts ( #584 )
...
* fix diff_evt.py
* document UW/UF based on @SeekyCt's advice
* fix star_rod_idx_to_c.py
* migrate battle/star/focus data
* use N() where possible
* rm data.s
* update symbol_addrs
* refresh
* lullaby
* star storm
* chill out
* fix float problems (sad)
* smooch
* time out
* up and away
* star beam
* peach beam
* peach focus
* peach dash
* rm old data
* Assorted Decomp Across The Galaxy (#574 )
* popup_menu_update & other
* a bunch of 190B20
* starting load_player_actor
* load_player_actor
* blorp
* load_partner_actor
* fx_11_main
* fx_11 done
* cleanup
* fx_12
* 3 encounter_api funcs
* encounter_api done
* some 20ec0 funcs
* clean
* PR comments, warnings
* name btl_actorHomePositions
* PR comments
* merge
* Introduce SPRITE_PIXEL_SCALE (#580 )
* fix func_80273444 warns
* make end of data explicit in splat.yaml
* lol
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
Co-authored-by: Alexander Faßbender <31699028+Brotenko@users.noreply.github.com>
2021-12-29 02:11:07 +09:00
Alex Bates
a7caa90d28
Add descriptions to all map headers ( #515 )
...
* remove bad create_actor declaraton
* maps.py
* area name
* add doc names for all maps
* rm maps.py
2021-11-01 22:22:40 +09:00
Alexander Faßbender
afab424519
Rename all si_funcs to evt_funcs ( #403 )
...
* resolve #397
* fix libultra
* Match func_80144E4C (#406 )
* Update hud_element.c
* Update hud_element.h
* Update hud_element.h
* Delete func_80144E4C.s
* Trigger funcs (#405 )
* remove old tools, fix warnings
* almost match si_handle_print_debug_var
* si_goto_end_loop and warnings
* is_trigger_bound and create_trigger
* Cleanup + matching 2 non-matchings
* update_triggers (trigger.c complete)
* fix warnings
* PR comments, m2ctx.py fix
* combine PR #398 with #403
* More entity decomp (#402 )
* More entity decomp
* cleanup
* Vec3f instead of 3 floats in structE307C0
* resolve #397
* fix libultra
* combine PR #398 with #403
* decompile evt_goto_end_loop
Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
Co-authored-by: JaThePlayer <50085307+JaThePlayer@users.noreply.github.com>
2021-08-29 23:34:42 +09:00
alex
de800e9c9f
mass script to evt type rename ( #377 )
...
* add process_scripts.py
* mass evt rename
2021-08-23 06:50:10 +09:00
alex
b48eb150d2
battle/action_cmd ( #348 )
...
* compile
* improve match
* improve
* ~check_block_input
* match LoadActionCommand
* cleanup
* match SetupMashMeter
* check_block_input much closer
* name action_cmd segments
* make better for great good
* improve again
* revert removing blah
* close
* improve
* match func_80268224
* match func_80268284 wrappers
* improvements
* work on func_80268938
* maide changes to check_block_input
* check_block_input :OK: - thanks Maide!
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-08-01 01:50:10 +09:00
alex
da6fd773bb
Disassemble battle/partner/goombario.c ( #308 )
...
* name battle/partner/ segments
* name battle_goombario sprites
* battle/partner/goombario data
* update
2021-07-12 22:00:45 +09:00
alex
8decbeb3ff
Disassemble fully battle/area_kmr_part_1 ( #307 )
...
* generate c includes for img segments
* flatten battle/item/dusty_hammer.c
needs custom splat
* use .inc.c for c incbins
* fixy
* new stuff
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "6120d18600"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "6120d18600"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* remove dumb
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "8a179e74ba"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "8a179e74ba"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* yaml cleaning
* Further yaml cleanup & battle item refactor
* remove rawptr
* disasm_script: handle = (const) NPC_ANIM
* disasm_script improvements
* wip
* it compiles!
* battles.c -> area.c
* squish warnings
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "fe30b60b75"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "fe30b60b75"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* all OK except rodata padding
* ok
* ACTOR_SELF
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-07-12 21:06:00 +09:00
Ethan Roseman
7cb1790789
Fix alignment of many data sections ( #305 )
...
* generate c includes for img segments
* flatten battle/item/dusty_hammer.c
needs custom splat
* use .inc.c for c incbins
* fixy
* new stuff
* git subrepo pull (merge) --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "6120d18600"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "6120d18600"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* remove dumb
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "8a179e74ba"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "8a179e74ba"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* yaml cleaning
* Further yaml cleanup & battle item refactor
* remove rawptr
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "fe30b60b75"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "fe30b60b75"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* further cleanup
* Further cleanup & match gfx_draw_background
* clean & wip
Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-07-12 18:15:00 +09:00
Ethan Roseman
647db26552
Mass function rename from Star Rod + a couple funcs ( #298 )
...
* .
* yaml update
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "cd690f725d"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "cd690f725d"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* separate main bss syms
* renames and one match
* SR symbol rename
* fix symbol_addrs
* git subrepo pull tools/splat
subrepo:
subdir: "tools/splat"
merged: "5fa8aa24ca"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "5fa8aa24ca"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* remove old artifacts
2021-06-30 11:27:12 +09:00
Alex Bates
7f4785cc98
match code_16c8e0, code_190B20 data
2021-02-09 02:09:57 +00:00
