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
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
lshamis
ae66312d8c
Add Python linter to github actions ( #1100 )
...
* Add Python linter to github actions
* wip
* Add back splat_ext
* Format files
* C++ -> C
* format 2 files
* split workflow into separate file, line length 120, fix excludes
* -l 120 in ci
* update black locally and apply formatting changes
* pyproject.toject
---------
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2023-07-30 02:03:17 +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
Marijn van der Werf
5511e18133
Clean executable files ( #1047 )
...
* Mark headers as non-executable
* Update shebangs
2023-05-04 18:03:02 +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
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
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
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
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
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
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
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
03c60ee7c5
Improve disasm_script.py and do some sample scripts ( #606 )
2022-01-06 11:32:57 -05: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
3c2bd694e5
update star_rod_idx_to_c.py for battle formations
2021-12-30 14:22:44 +00: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
Alexander Faßbender
f82f699188
DSL Script conversion ( #562 )
...
* start converting scritps to new syntax
* convert old DSL scripts to new format
* update disasm_script and disasm more DSL scripts
* .
* .
* resolve issues
* add EVT_PTR() to GotoMap calls
2021-12-24 14:29:05 +01:00
Alexander Faßbender
6667a4288f
update disasm_script to use current ( #561 )
2021-12-23 13:16:12 +01:00
Ethan Roseman
731d270014
Fuse symbol_info with disasm_script so you can give it symbols ( #552 )
2021-12-15 19:27:26 -05:00
Alex Bates
ae00fea170
Add new EVT macros ( #482 )
...
* add tools and new macros
* change EVT_OP enum names
* first file
* convert some files
* stuff
* EVT_PTR
* src/battle/item
* src/battle
* tool changes
* clouds.inc.c
* src/evt
* foliage.inc.c
* bitwise ops
* staticentitydata vars
* add diff_evt.py
* use evt macros in dro_01
* evt macro docs
* whoops
* fix some warnings
2021-10-25 20:44:55 +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
Ethan Roseman
ed9727a34e
Various decomp, use of SCREEN_WIDTH and SCREEN_HEIGHT, etc ( #340 )
...
* Update symbol_addrs
* effects.h and cleanup
* effect code generation!
* func_80024A784
* state_step_demo
* meh
* work on gfx_task_main and cleanup
* state_step_intro
* set_custom_gfx
2021-07-23 03:48:30 +09:00
alex
cbb656f3c9
add remaining opcode support to script DSL ( #329 )
...
* update dsl caserange and bind syntax
* add bind_padlock
* use dsl buf and arr commands
* clean up foliage.inc.c
* disasm rest of battle/partner/goombario scripts
* fix rest of SI_CMD uses
2021-07-21 02:43:16 +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
Maide
0ec2010b9b
dro and flo ( #285 )
...
* dro_01
* UnkFunc25
* UnkFunc26
* UnkFunc27
* Fixup old UnkFuncs
* a
* UnkFunc28
* UnkFunc29
* UnkFunc30
* dro_02
* UnkFunc30
* UnkFunc31
* UnkFunc33
* UnkFunc34
* UnkFunc35
* UnkFunc36
* Fix splat.yaml and remove asm
* Fixed finally
* a
* flo_00
* update func
* flo_03
* flo_07
* flo_08
* UnkFunc37 & 38
* UnkFunc39
* UnkFunc40
* a
* Some copies
* Func
* flo_09
* Fix linker alignment warnings
* flo_10 (partial)
* flo_11
* flo_12
* flo_13
* UnkFunc41
* Copy funcs
* UnkFunc42
* flo_14
* UnkFunc43
* UnkFunc44
* flo_16
* UnkFunc44
* UnkFunc45
* flo_15
* flo_17
* flo_18
* flo_19
* flo_21
* flo_22
* flo_23
* flo_24
* flo_25
* cya asm
* a
* a
* Finally OK!
* Alter scripts
* Fix food func
* PR1
* PR2
* Add tree structs to disassembly and change names
* tabs to spaces and callback &
* Fix the script too
* PR3
* Fucking newlines
2021-04-30 02:09:30 +09:00
alex
d530ca24cd
Various script cleanup ( #284 )
...
* update star_rod_idx_to_c for battles
* name spiked_goomba and paragoomba animations
* name cleft animations
* finish battle struct disasm
* fix for kmr part 3
* name jr troopa animations
Co-authored by: T00nbink <martyntoby@gmail.com>
* ignore star rod crash.xml
* foliage.inc.c
* foliage data
* script: =f -> = (float)
* script: add (int) cast
2021-04-28 17:58:21 +09:00
alex
df3ef58ba1
Crystal Palace reflection include & name some segments ( #274 )
...
* src/evt section
* evt data
* entity
* update entity func names
* names
* reflection wip
* lol
* ~pra_01
* nabbed em
* match func_80240500_D4D540
* match func_802402F0_D4D330
* last pra include func git add -A
* gCurrentCamID
* reflection.inc.c for pra_01
* reflection.inc.c
* rm
* match a few in tst_11
* use npc flags
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-04-21 23:19:31 -04:00
Maide
8fbdc83055
area_dgb ( #254 )
...
* area_arn/arn_02
* Signed StoryProgress enum
* arn_03
* Update scripts
* arn_04
* fix kmr
* Broken for Ethan
* Commiting before maybe breaking everything
* Fix star rod
* Add funcs
* arn_05
* arn_07
* arn_08/arn_09
* Cleanup prototypes
* arn_11/12/13
* Cleanup
* Cleanup
* Review
* Add npc flag
* Comments
* dgb_01
* dgb_02
* dgb_03
* dgb_04
* Fixup commented functions
* dgb_05
* dgb_06
* dgb_07
* dgb_08
* dgb_09
* dgb_10
* dgb_11
* dgb_12
* dgb_15
* dgb_13
* dgb_14
* dgb_16
* dgb_17
* dgb_18
* Dumb newlines
* Replacing some funcs, scared I'll break everything to commit NOW!
* More
* More
* More
* a
* b
* c
* d
* e
* f
* remove asm
* Move newlines
2021-04-09 02:42:36 +09:00
Maide
5c1eefbdc3
Disassemble area_arn ( #251 )
2021-04-03 18:21:49 +01:00
Maide
986f594d00
Fix disasm script ( #243 )
...
* Enum all the things
* Fix disasm script
2021-03-29 23:39:17 -04:00
Maide
a8e5d9b1d9
world/area_arn/arn_02 ( #236 )
...
* area_arn/arn_02
* Signed StoryProgress enum
2021-03-29 01:05:56 +01:00
Maide
ec2870d218
Update battle item enums ( #225 )
...
* a
* Dizzy Dial
* Dried shroom
* Dusty Hammer
* Egg Missile
* Electro Pop
* Fire Flower
* Food
* Fright Jar
* Hustle Drink
* Insecticide Herb
* Life Shroom
* Mushroom
* Mystery (partial)
* Pebble
* Please Come Back
* POW Block
* Repel Gel
* Shooting Star
* Sleepy Sheep
* Snowman Doll
* Stone Cap
* Stop Watch
* Strange Cake
* Strange Cake fixed
* Stone Cap broked
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "db0b6f0cba"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "db0b6f0cba"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* Static all the things
* Tasty Tonic
* Thunder Bolt
* Thunder Rage
* Ultra Shroom
* Unknown Item
* Volt Shroom
Format & coverage
* Item Ids
* Update enums
* Fix
Co-authored-by: Lavos1 <saintlouisxx@gmail.com>
2021-03-25 02:30:25 +09:00
Maide
f03f08a38f
Battle items ( #222 )
...
* a
* Dizzy Dial
* Dried shroom
* Dusty Hammer
* Egg Missile
* Electro Pop
* Fire Flower
* Food
* Fright Jar
* Hustle Drink
* Insecticide Herb
* Life Shroom
* Mushroom
* Mystery (partial)
* Pebble
* Please Come Back
* POW Block
* Repel Gel
* Shooting Star
* Sleepy Sheep
* Snowman Doll
* Stone Cap
* Stop Watch
* Strange Cake
* Strange Cake fixed
* Stone Cap broked
* git subrepo pull --force tools/splat
subrepo:
subdir: "tools/splat"
merged: "db0b6f0cba"
upstream:
origin: "https://github.com/ethteck/splat.git "
branch: "master"
commit: "db0b6f0cba"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "2f68596"
* Static all the things
* Tasty Tonic
* Thunder Bolt
* Thunder Rage
* Ultra Shroom
* Unknown Item
* Volt Shroom
Format & coverage
* Item Ids
Co-authored-by: Lavos1 <saintlouisxx@gmail.com>
2021-03-24 04:39:43 -04:00
Alex Bates
7f4785cc98
match code_16c8e0, code_190B20 data
2021-02-09 02:09:57 +00:00
Alex Bates
1041c62a7a
disasm_script.py: error if api func not in symbol_addrs.txt
2021-02-04 15:35:34 +00:00
Alex Bates
8a1ba58aac
move coconut data to c
2021-02-03 20:04:37 +00:00
Alex Bates
9855c6202d
dsl: change flag set operator to &
2020-12-29 11:37:19 +00:00
Alex Bates
efee13f686
add data disassembly tool
2020-12-27 17:11:33 +00:00
