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
JoshDuMan
b87012a0da
Match two functions in 23680.c ( #624 )
...
* Match 2 func's
* Delete func_800496B8.s
* Delete func_800490B4.s
* unk_AC
* Change func_800490B4 type
* comments
2022-01-16 22:32:17 +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
HailSanta
41c304137d
hud and item script names ( #617 )
...
* hud script names 1
* more hud elements!
* battle hud scripts
* names for some item globals
* hud elem scripts for items
* item entity names
* cleanup and missing struct in partners
* more partner cleanup
* battle stuff
* fix some warnings?
* resolve stuff
* fix symbol_addrs
* minor fixes
* splat pause_icon_table.data.s
* glabel -> dlabel
* rom addrs
* fix splat stuff
* data splits, warnings
* split more hud scripts
* added symbols for battle menu
* finished hud scripts fot 415D90
* entity documentation
* entity documentation
* more consistent name
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-01-15 03:54:45 +09:00
Unnunu
5f05525446
match raycast functions ( #620 )
...
* npc_raycast_down
* npc_raycast_down_ahead
* npc_raycast_down_sides
* npc_raycast_up
* npc_raycast_up_corner
* npc_raycast_up_corners
* npc_test_move_complex_with_slipping
* player_raycast_down
* player_raycast_up_corners
* decomp 3 funcs
* player_test_move_without_slipping
* player_test_move_with_slipping
* match player_test_move_with_slipping
* clean up code
* fix param names
* remove space
Co-authored-by: Alex Bates <hi@imalex.xyz>
Co-authored-by: Alex Bates <hi@imalex.xyz>
2022-01-15 03:09:45 +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
Ethan Roseman
e60e5fccd1
BSS round 2, hud_element.c funcs ( #613 )
...
* an end func
* 2nd segment bss file added
* hud_element work
* some renaming, set_hud_element_scale
* 2 hud_element funcz
* remove more unneeded undefined_syms
* bss 3, PR comments
2022-01-11 03:25:06 +09:00
Unnunu
486dbfda39
Match status_icons ( #612 )
2022-01-10 15:55:26 +00:00
Unnunu
559007d861
Match collision functions ( #609 )
...
* match allocate_hit_tables
* load_collision
* load_hit_data
* parent_collider_to_model
* update_collider_transform
* test_up_ray_collider
* test_ray_triangle_general
* test_down_ray_triangle
* test_up_ray_triangle
* test_ray_colliders
* test_ray_zones
* test_ray_entities
* func_8005DB00
* rename everything
* follow codyng style
* fix
* PR suggestions
* remove p prefix
Co-authored-by: Sergey Zorkin <szorkins@gmail.com>
2022-01-08 19:11:20 +09: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
Alex Bates
64c0b7de02
Avoid _VA_LIST_ in EVT_CALL ( #611 )
...
Fixes a weird compile error on precomp
2022-01-07 23:01:22 +00:00
JoshDuMan
03c60ee7c5
Improve disasm_script.py and do some sample scripts ( #606 )
2022-01-06 11:32:57 -05:00
Ethan Roseman
ccd3b17322
World Decomp & Dedupe ( #604 )
...
* two new funcs
* UnkFunc53
* more cleanup & dedupe
* UnkEffect0FFuncs
* tst funcs
* anotha one
* UnkNpcAIFunc42
* UnkNpcAIFunc43
* UnkNpcAIFunc44
* UnkNpcAIFunc45
* UnkNpcAIMainFunc4
* UnkNpcAIMainFunc5
* UnkNpcAIMainFunc6
* warnings
2022-01-06 22:40:01 +09:00
HailSanta
acf6b92313
more fields and name consistency ( #603 )
...
* npc fields
* npc and actor naming
* missing hit sounds + naming consistenct
* added partner syms and player spin struct
* requested changes
* organized Vec structs
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-01-05 20:05:49 +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
55228bd3a7
Fix a few warnings ( #601 )
...
* .
* Externs
* Fix a few warnings
* __osGetCause
* Comment
* Ethan
2022-01-04 02:36:01 +09:00
HailSanta
13a2f40f2a
Update GameStatus fields ( #595 )
...
* renamed a few fields in game status
* created constant for MAX_GAME_TIME
* names for rumble funcs
* suggested changes
* created sound out enum
* function naming test
* actorClass consistent name
* water block effect field
* battle_status fields
Co-authored-by: Clover <cloverhax@gmail.com>
2022-01-03 18:56:30 +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
Ethan Roseman
5cb9183779
Effects, includes ( #589 )
...
* effect_13
* effect_14
* most of effect_15
* clean, standardize effects
* fx_16 wip
* UnkNpcAIFunc35
* includes
* UnkPosFunc2
* UnkNpcAIFunc36
* PR comments
2021-12-30 14:14:55 +09:00
JoshDuMan
bd56f6060f
Decomp Some Libultra ( #588 )
...
* Work on KMC Libultra
* libultra decomp
* fix
2021-12-29 15:14:20 -05:00
JoshDuMan
7f1c1351f2
Match actor_api.c ( #585 )
...
* Decomp 3 197F40 functions
* 2 more
* oops
* 3 more
* Match the last of actor_api.c
* comments
2021-12-29 21:22:01 +09:00
Rainchus
2f7a1c72af
Decomp some player render functions ( #581 )
...
* decomp appendGfx_player, fix warnings in 77480.c file
* small style fixes
* fix action state enum and make use of enum
* merge master
* decomp some mario rendering functions
* run coverage.py
* review changes
* use decimal in func arg
2021-12-29 13:09:19 +09: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
70c2c679a4
Introduce SPRITE_PIXEL_SCALE ( #580 )
2021-12-28 12:52:32 +00:00
JoshDuMan
69e1a012bd
Partner Script Disassembly ( #577 )
...
* frogress
* kooper data
* More Work
* Bombette, Sushi, Parakarry Scripts
* Finish wPartners work.
* Partner BSS
2021-12-28 21:44:31 +09:00
Ethan Roseman
15b6cb398c
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
2021-12-28 20:43:24 +09:00
Rainchus
33457751e2
decomp appendGfx_player, fix warnings in 77480.c file ( #572 )
...
* decomp appendGfx_player, fix warnings in 77480.c file
* small style fixes
* fix action state enum and make use of enum
2021-12-27 22:00:13 -05:00
JoshDuMan
fe374e5fb1
Match func_802552EC ( #573 )
...
* Match func_802552EC
* Delete func_802552EC.s
* Clean-up
* actor
* Update functions.h
* oops
* Match update_actor_shadow
2021-12-27 21:55:35 -05:00
JoshDuMan
2f23f46775
Match func_802549F4 ( #571 )
...
* Match func_802549F4.
* Delete func_802549F4.s
* Match func_80254C50
* s8
* Delete func_80254C50.s
* Update functions.h
* s8 again
* Trying out github.dev
* Fix build?
* Match func_802550BC
2021-12-26 20:29:29 +09:00
Rainchus
095680b006
Duplighost battle functions ( #556 )
...
* decomp some functions in 1AC760.c
* broken data migration
* data nearly migrated, rodata in laki file is null
* fix building and laki data migration
* data migration for kpa3 WIP
* add missing data
* decomp duplighost functions and duplicates
* fix some warnings
* resolve issues
* fix warnings
Co-authored-by: Brotenko <brotenko@gmail.com>
2021-12-25 10:34:55 +09:00
Alexander Faßbender
3428ae1941
Convert DSL scripts into macro syntax ( #570 )
...
* convert half the workload of DSL scripts into macro syntax
* convert more DSL scripts to macro syntax
2021-12-25 02:09:06 +09:00
Alex Bates
585c0dc428
Name and document btl_init_menu_* funcs ( #567 )
...
* btl_init_menu_*
* https://c.tenor.com/D0mk5R5x1G8AAAAC/cat-fat-cat.gif
2021-12-24 23:21:03 +09:00
JoshDuMan
f940e6188c
Match enable_actor_blur ( #566 )
...
* Match enable_actor_blur
* Delete enable_actor_blur.s
* resolve issues
Co-authored-by: Brotenko <brotenko@gmail.com>
2021-12-24 23:09:03 +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
JoshDuMan
6e062b19d8
Disassemble and format DGB data. ( #558 )
...
* Dissamble data.
* Fix warnings and format data
2021-12-22 23:59:52 +09:00
Alexander Faßbender
dbde606a86
calc_item_damage_enemy ( #549 )
...
* setup function
* cleanup parts of calc_item_damage_enemy
* .
* .
* .
* resolve issues
* set function as NON_MATCHING
* npc flags
* resolve issues
* .
* Update include/enums.h
Co-authored-by: Alex Bates <hi@imalex.xyz>
* Update 17FEB0.c
Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-12-21 23:12:59 +01:00
JoshDuMan
a5340e8dce
Fix many warnings. ( #557 )
...
* Fix many warnings.
* Fix more warnings.
* More warnings
* Some more warnings
* Last fixes and address comments
* ehtan
2021-12-21 00:59:25 +09:00
JoshDuMan
0b4d9252c1
Many func's in 20ec0_len_5040.c ( #554 )
...
* Start working matching 20ec0_len_5040.c
* Update 20ec0_len_5040.c
* Delete enable_status_1.s
* Delete enable_status_2.s
* Delete enable_status_3.s
* Delete enable_status_4.s
* Delete enable_status_icon_boost_hammer.s
* Delete enable_status_icon_boost_jump.s
* Delete enable_status_icon_boost_partner.s
* Delete enable_status_icon_danger.s
* Delete enable_status_icon_peril.s
* Delete enable_status_icon_surprise.s
* Match remove_status_ func's (#9 )
* Fix build (#10 )
* Match 6 more (#11 )
* create_status_icon_boost_hammer
* Comments
* StatusIconFlag
2021-12-17 23:09:33 -05:00
JoshDuMan
2b6323a6b2
Match check_for_interactables ( #553 )
...
* Match check_for_interactables
* Delete check_for_interactables.s
* Update enums.h
* unk_C8 -> Npc*
* Update 77480.c
* Update 77480.c
* Update 77480.c
* Update 77480.c
* Update 77480.c (#7 )
* Update functions.h
* Merge branch 'master' of https://github.com/pmret/papermario into arn
* Fix build.
* Update src/77480.c
Co-authored-by: Alex Bates <hi@imalex.xyz>
* Comments
Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-12-17 23:04:54 -05:00
Ethan Roseman
9e1d4db698
First overlay's BSS symbols moved to C ( #551 )
...
* 2 fold funcs
* func_8013B1B0
* cleanup & naming
* more formatting
* cleanup
* progress & filemenu stuff
* 2
* func_8013CFA8
* fold_load_gfx (thanks Wiseguy)
* update_encounters_pre_battle
* 3 mdl funcs
* more model funcs
* cd180 funcs
* progrezz
* 3 cam funcs
* more
* 1 more
* eob30 progress
* sfx_play_sound_at_position & sound enum cleanup
* cleanup
* cleanup2
* PR comments
* BSS migrated to C for the first overlay
* rename
* PR comments
2021-12-16 17:33:47 +09:00
Alexander Faßbender
967427ba97
Decomp misc funcs ( #546 )
...
* decomp misc funcs
* cleanup on MakeShop and initial work on ShowShopOwnerDialog
* match ShowShopOwnerDialog
* decomp misc funcs
* cleanup on MakeShop and initial work on ShowShopOwnerDialog
* match ShowShopOwnerDialog
* resolve issues
* resolve warnings
* Update src/world/script_api/7E0E80.c
Co-authored-by: Alex Bates <hi@imalex.xyz>
Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-12-15 20:12:43 +01:00
Ethan Roseman
7230c62545
Appetizer sampler ( #547 )
...
* 2 fold funcs
* func_8013B1B0
* cleanup & naming
* more formatting
* cleanup
* progress & filemenu stuff
* 2
* func_8013CFA8
* fold_load_gfx (thanks Wiseguy)
* update_encounters_pre_battle
* 3 mdl funcs
* more model funcs
* cd180 funcs
* progrezz
* 3 cam funcs
* more
* 1 more
* eob30 progress
* sfx_play_sound_at_position & sound enum cleanup
* cleanup
* cleanup2
* PR comments
2021-12-13 18:27:28 +09:00
Alexander Faßbender
c719faf847
Create simple data "migration" script ( #548 )
...
* setup function
* cleanup parts of calc_item_damage_enemy
* init data2c
* clean up data2c.py
* .
* rename and update script to have additional functionality
* .
2021-12-12 22:53:19 +09:00
Rainchus
d9c72e432b
Match more overworld partner functions ( #541 )
...
* decomp watt overworld functions
* fix struct that was wrongly changed
* run coverage.py
* requested changes for watt.c and decomp a function from sbk_02
* run coverage.py
* more style changes
* decomp all functions in 92A2B0.c
* run coverage.py
* use map_var instead of hex constant, other style changes
* pull sbk_02.h changes
* ...actually merge master correctly
* decomp most functions in nok_04
* decomp most of 9EDBF0.C, fix warnings in UnkFunc41.inc.c and warnings/decomp in lakilester.c
* run coverage.py
* code review changes + few extra functions
* decomp lakilester functions and fix style in other files
* decomp more laki overworld functions
* add close match for func_802BDDD8_321928
* requested changes
* more requested style changes
* style changes
* last of review changes
* another small style fix
* ...accidentally deleted the f on a float immediate
* decomp world sushie/watt files
* run coverage.py
* small style fixes
* fix 2 warnings in watt.c
* decomp kooper world functions
* requested style changes
* couple more style changes
* decomp kooper world functions
* last style changes
* decomp more kooper world functions
* match world kooper file except 2 non_equivalent
* non matching of last world bow function
* migrate data.s file to bombette.c, also decomp various overoworld partner functions
* match more overworld partner functions
* style changes
* update variable names
* some requested changes done
* add enums and other cleanup to overworld partner files
* run coverage.py
* add a space to watt file
* remove raw pointers from partner files plus other requested changes
* remove goompa raw pointer
Co-authored-by: root <root@DESKTOP-HK751F2.localdomain>
Co-authored-by: Rainchus <Rainchus@github.com>
2021-12-06 21:25:43 +09:00
JoshDuMan
cf8f817af2
Match check_for_ispy and check_for_pulse_stone ( #544 )
...
* Match check_for_ispy
* Delete check_for_ispy.s
* Match check_for_pulse_stone
* Delete check_for_pulse_stone.s
* Update 77480.c
* Update 77480.c
* Update variables.h
* Update variables.h
2021-12-04 23:23:12 +09:00
JoshDuMan
72b2e593f6
Match func_8026EBF8, LoadFreeItemScript, and LoadItemScript ( #543 )
...
* Match func_8026EBF8
* Delete func_8026EBF8.s
* Match LoadItemScript
* Delete LoadItemScript.s
* Document more of DecorationTable
* Fix warning.
* Comments
* Comments
* Match LoadFreeItemScript
* Delete LoadFreeItemScript.s
* doublke
* Alex GOAT
Co-authored-by: Alex Bates <hi@imalex.xyz>
Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-12-04 13:34:49 +09:00
Alexander Faßbender
d2ce4dd89e
Match all FX render functions ( #540 )
...
* match most fx_XX_render functions
* match the rest of the fx render functions
* resolve data migration issues
* resolve issues
* Update effect_117.c
2021-11-26 10:25:50 +09:00
