pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-20 00:11:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,449 Commits 4 Branches 0 Tags 202 MiB
5a5d088d83
Commit Graph

351 Commits

Author SHA1 Message Date
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
JoshDuMan
6e062b19d8
Disassemble and format DGB data. (#558) 
* Dissamble data.

* Fix warnings and format data
 2021-12-22 23:59:52 +09: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
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
Ethan Roseman
755c83a363
fold_* , effect_10, and other assorted decomp (#535) 
* work on appendGfx_message

* :OK:

* indentation

* message window states

* SetEntityCullMode & some of appendGfx_model

* 9 smalls

* 2 more

* 2 mo

* update_player_actor_shadow

* EffectInstanceData rework

* some shtuff

* effect_10 dun

* wip

* wip

* wipz

* rename

* progz

* remove wip work for appendGfx_model

* PR comments

* Alex comments

* tomorrow for sure

* eventually
 2021-11-19 23:31:28 +09:00
ThreeMustyFears
7a95f21a17
Match some 16F740 funcs (#532) 
* update enums and functions

* match a couple of funcs

* run coverage.py

* some initial cleanup

* missed something

* requested changes

* remove space

* more changes

* aligned enum

Co-authored-by: ThreeMustyFears <>
 2021-11-17 23:43:50 +09:00
Alexander Faßbender
e9f80f2856
Decompile misc battle map funcs (#528) 
* .

* .

* resolve issues

* Update fx_api.c

* Update fx_api.c
 2021-11-14 21:23:07 +01:00
Alexander Faßbender
75e2c18977
Decompile even more misc battle map funcs (#531) 
* decompile misc battle map funcs

* fix warnings
 2021-11-14 21:16:52 +01:00
Ethan Roseman
34254d102e
appendGfx_message (#520) 
* work on appendGfx_message

* :OK:

* indentation

* message window states

* PR comments

* ran formatter

* change some types

* debuggin

* undebuggin

Co-authored-by: Alex Bates <hi@imalex.xyz>
 2021-11-12 21:23:43 +09:00
Lightning
90c0d29bf9
match _heap_realloc (#524) 
* match _heap_realloc

* Minor code cleanup
 2021-11-11 13:38:52 +09:00
Lightning
4733902ec8
Match _heap_free (#522) 
* Committing _heap_free match

* More renames and fixes from PR

* Ver without goto's from Josh

* Accidently left pointers in

* More variable fixes based on calls to _heap_*

* Remove unneeded comments, fix function variable name in header

* Missing a space

* Revert to while loop

* Sneaking in an additional comment about heap_malloc_tail for clarity

* Missed whitespace

* Reduced some comments
 2021-11-08 01:58:57 +09:00
Lightning
95ea4223d5
Match _heap_malloc and _heap_malloc_tail (#519) 
* Matched _heap_malloc and _heap_malloc_tail

* Move heap_malloc away from using s32 returns

* Remove unmatched files

* Missed a line

* Requested changes

* Add more changes from hidden convos

* Working through entries :)

* Remove extra parens left over from match work

* Removed macro per Ethan's request

* Fix a space
 2021-11-06 23:10:53 -04:00
Technoman
99a81611f6
Match ModifyActorDecoration, func_8026EA7C, get_coin_drop_amount (#516) 
* Match get_coin_drop_amount

* Delete get_coin_drop_amount.s

* Match func_8026EA7C

* Delete func_8026EA7C.s

* extern func_80266D6C

* Match ModifyActorDecoration

* Update DecorationTable

* Update ModifyActorDecoration

* Fixed DecorationTable

* Delete ModifyActorDecoration.s

* Update DecorationTable

* Update DecorationTable

* Fixed DecorationTable, Added DecorationUnk

* Fixed DecorationTable?

* Update func_80266dc, create_part_shadow_by_ref

* Update get_coin_drop_amount

* func_8026EA7C

Co-authored-by: Alexander Faßbender <31699028+Brotenko@users.noreply.github.com>

* Update DecorationTable

* Update get_coin_drop_amount

* Update DecorationUnk

* Update get_coin_drop_amount

* Update get_coin_drop_amount

* Update DecorationUnk

Co-authored-by: Alex Bates <hi@imalex.xyz>

Co-authored-by: Alexander Faßbender <31699028+Brotenko@users.noreply.github.com>
Co-authored-by: Alex Bates <hi@imalex.xyz>
 2021-11-04 02:08:36 -04:00
Alexander Faßbender
fbc901ac49
decompile several map and battle-map related functions (#504) 
* decompile several map and battle-map related functions

* remove unnecessary folder

* resolve issue

* .

* .

* Update 52B6A0.c

* Update 6DBDA0.c
 2021-10-29 20:14:51 +02:00
Ethan Roseman
068b8a5b08
B4580 and d0a70_len_4fe0 (#502) 
* func_80133A94

* animator stuff

* add_anim_node and animator_node_update_model_transform

* a bunch more

* more

* .

* temp

* create_mesh_animator

* 2 mo

* d0a70 funcs

* more d0a70

* 2 mo

* 1 + cleanup

* 2 mo

* cleanup

* revert change to verbosity for splat

* PR comments
 2021-10-30 02:57:15 +09:00
Alex Bates
af880293a3
Add sprite.h (#503) 
* add sprite.h

* fix reflection warnings
 2021-10-30 01:48:20 +09:00
Gota7
9ac9c6b904
Match msg_get_glyph (#497) 
* Match msg_get_glyph

And fix the type definition for draw_msg, that's it really.

* PR fixes

* PR Fix
 2021-10-28 21:19:44 -04:00
Alexander Faßbender
b9bc4b8af8
Assign dead maps to alive counterparts (#496) 
* add information about dead maps

* link the names of dead maps to their alive counterparts

* Update EB1170.c

* remove redundant function declaration

* resolve issues
 2021-10-27 11:24:52 +02:00
Alexander Faßbender
beeb5627e6
Deduplicate various dead functions (#494) 
* what is dead may never die

* resolve issues

* fixing dead_gPartnerActionStatus2

* .

* resolve issues

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2021-10-25 16:32:44 +02:00
JoshDuMan
9631996e76
Fix some warnings. (#495) 
* Fix some warnings.

* Update functions.h
 2021-10-25 20:29:47 +09:00
JoshDuMan
aa6054a1ea
Match calc_enemy_damage_target (#489) 
* Match calc_enemy_damage_target

* Update 1A5830.c

* Delete calc_enemy_damage_target.s

* Update enums.h

* Update 1A5830.c

* Update functions.h

* ;

* eth cleanup

* comments

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2021-10-25 19:28:45 +09:00
Ethan Roseman
33c9dda3a5
KMC GCC, effects, cleanup, map funcs (#476) 
* warnings, cleanup, 2 npc ai funcs

* kmcgcc stuff

* effect_75

* effect_9.c done

* cleanup, work on kmc gcc

* start on fx_73

* guOrtho/guOrthoF

* more libultra/cleanup

* more libultra

* add wine for darwin

* effect_73 done

* UnkQuizFunc

* effect func naming

* name appendGfx funcs

* fix fx_66

* Add KMC wrapper to Jenkinsfile

* mac fixes

* fix macro usage

* oopz

* 3 fixes

* blah

* KMC_ASM

* config changes
 2021-10-22 23:01:27 +09:00
JoshDuMan
ce1c0c715e
Match BoostDefense, VanishActor, ElectrifyActor, and HealActor (#481) 
* Match BoostDefense, VanishActor, ElectrifyActor, and HealActor

* Delete BoostDefense.s

* Delete VanishActor.s

* Delete ElectrifyActor.s

* Delete HealActor.s

* Update 197F40.c

* Add D_8029FBD0

* Add inflict_status

* Address comments.
 2021-10-20 00:15:38 +09:00
JoshDuMan
ae1e2a740d
Match BoostAttack (#477) 2021-10-17 20:34:18 +01:00
Gota7
072a585908
Match some spring, sprite, and pause code (#472) 
* Start Spring Work

Progress.

* More WIP

* Still WIP

Spring isn't ready for this yet.

* Decompile some sprite functions

Making progress.

* Partner stuff

More progress.

* PR fixes

* PR fixes

For commenting.
 2021-10-16 18:53:28 +09:00
JoshDuMan
99da60cace
Match func_802D2520 (#465) 2021-10-07 09:37:11 +01:00
JoshDuMan
ef1928e55d
Match virtual_entity_list_render_UI (#463) 
* Update player_api.c

* Delete virtual_entity_list_render_UI.s

* Fix some warnings

* Fix warnings.

* Match virtual_entity_list_render_world

* Remove asm and fix warnings.

* Delete virtual_entity_list_render_world.s

* Add draw_entity_model_A
 2021-10-06 15:22:42 +09:00
Ethan Roseman
969e28c76c
40% (#459) 
* cleanup
* some of effect_9
* remove 1 warning
* restore Bowser Slug to his former glory (behavior)
 2021-10-03 18:42:38 +01:00
Ethan Roseman
59050ec3e9
Effects & misc (#458) 
* fx_6_appendGfx

* update_effects

* effect_6 done

* Update diff.py

* update configure for new splat

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "0efa552c5d"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "0efa552c5d"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* nu stuff / undefined_syms org

* Actor struct refactor to match AddActorVar (thanks Josh)

* various cleanup, matched an obfuscation func

* fx_7 work

* is_block_on_ground

* state_*

* create_entity_shadow, update asm macro to fix diff.py

* set_standard_shadow_scale

* set_npc_shadow_scale and set_peach_shadow_scale

* create_shadow_type

* revert macro.inc

* clear_model_data (thanks Josh)

* cleanup

* mdl_get_next_texture_address

* mdl_set_all_fog_mode

* load_model_textures

* fx_7_appendGfx (effect_7 done)

* fx_8_main

* fx_8_render

* fx_8_update

* func_E0010000

* func_E0010104

* effect_8 done

* effect_8 done

* warnings

* cleanup

* try to fix some warnings

* warnings + change Bowser Slug behavior
 2021-10-04 00:44:16 +09:00
Dalrik
c3bf1ad8fa
Match pause_stats_init and pause_stats_handle_input (#456) 2021-10-03 00:49:22 +01:00
JoshDuMan
46d4b4483b
Match EndActorSpeech (#454) 
* Match EndActorSpeech

* Delete EndActorSpeech.s

* Address PR comments

* Add missing declarations.

* Fix bad function call?

* Create 181810.c
 2021-10-01 21:54:52 +09:00
JoshDuMan
39dd275427
Match update_effects (#450) 
* Match update_effects

* Delete update_effects.s

* Remove unneeded variable.

* Fix errors.

* Fix general_heap_free typing.

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2021-09-30 18:57:23 +09:00
fig02
5779f5de0e
crash_screen OK (#449) 
* crash screen done

* cleanup

* done i think

* crash -> crash_screen

* fix warnings

* size comment

* review
 2021-09-30 08:01:31 +09:00
Ian
cedfcbbb89
Decomp most of the pause badge menu (#447) 
* Define gMoveTable

* pause_get_total_equipped_bp_cost

* pause_badges_draw_bp_orbs

* pause_badges_cleanup

* pause_badges_init

* pause_badges_try_remove

* pause_badges_handle_input

* pause_badges_try_equip

* WIP on pause_badges_load_badges, almost perfect match

* Full match on pause_badges_load_badges

* Review changes for pause badges

* A few more pause badge review changes, missing some spaces around add/subtract operators

* More small pause badges fixes

* Pause badges review: remove enum typedefs, add names for ranges in ItemID
 2021-09-28 16:47:55 +09:00
JaThePlayer
8e9a2f92b0
Decomp a lot of DF950.c (#440) 
* Decomp a lot of DF950.c

* Rename Sound to SoundInstance

* Rename struct_8014F5A4 to AlternatingSoundSet, and rename the fields.

* Make sure the soundID parameters are typed as SoundID, style changes

* Remove unnecesary empty line
 2021-09-27 22:32:18 +09:00
ThreeMustyFears
c90afde1d8
Match some bow funcs, a laki, and a chest func (#443) 2021-09-27 02:00:51 +01:00
Ethan Roseman
555f0ea15b
Effects (#442) 
* effect shim names

* fx_1_main and data migration

* fx_1_renderWorld

* header reorg

* remove stale comment

* effect_1

* cleanup

* fx_6 stuff

* most of effect_6, misc changes

* cleanup

* PR stuff

* warningz
 2021-09-27 08:19:58 +09:00
JoshDuMan
a8571ab3e7
Match func_802A9634_42A354 (#441) 
* Match func_802A9634_42A354

* Delete func_802A9634_42A354.s

* Update functions.h

* Update squirt.c
 2021-09-26 17:00:26 -04:00
eperdew
560f5a873e
Decompile E225B0.c. (#434) 
* Decompile E225B0.c.

* Decompile EB5130.c.

* Fix an off-by-one error that did not affect codegen.

The struct declared in EB5130.c was missing a byte in a char array
for no good reason.

* Address ethteck's feedback for PR#434.

- Move struct8015A578 to common_structs.h.
- Add new unknown sound SOUND_UNKNOWN_17B.
- Address various nits.

* Update PR based on @nanaian's feedback.

- Change first argument of mem_clear to be a void* (matching bzero).
 2021-09-26 21:04:12 +09:00
JaThePlayer
bb6e9303dc
Decomp some Evt, fio, ItemEntity & other functions (#433) 
* Decomp some evt, fio and item entity functions

* run coverage.py

* Remove redundant comment

* Make ItemEntity.type s8, MAX_ITEM_ENTITIES, style changes
 2021-09-26 07:13:36 +09:00
JaThePlayer
8e48172c1e
Decompile PopupMenu functions + more (#430) 
* cleanup create_popup_menu
* fix some warnings
* decomp parts of 18C790.c
* rename PopupMessage.unk_04 to updateFunc
 2021-09-25 13:14:28 +01:00
Alexander Faßbender
9a50c4cbe1
Decompile dead functions (#429) 
* decompile several duplicated dead funcs

* decompile several dead functions

* decompile dead functions

* resolve issue with UnkNpcAIFunc31
 2021-09-25 08:06:34 +09:00
Ethan Roseman
db578d9788
a5dd0 (model file) + filemenu decomp (#420) 
* remove some warnings, improve build speed on master

* update Camera

* update_camera_zone_interp not matching but close :/

* cleanup

* configure fix

* cleanup, better gbi macros

* decomp and syms

* a couple more

* 2 more and stuff

* more naming

* 3

* syms

* mdl_get_child_count

* more stuff

* get_model_list_index_from_tree_index

* 5 more

* header org

* update_entity_shadow_position

* fog color funcs

* more color stuff

* display lists

* create_shadow_from_data

* 4 evt shtuffsh

* func_80117D00

* func_80111790

* some BSS

* entity_raycast_down

* MakeEntity and almost step_entity_commandList

* step_current_game_mode

* filemenu stuff

* lots more filemenu stuff

* cleanup

* formatting

* fixes

* 1 more

* more fixes
 2021-09-22 20:17:46 +09:00
ThreeMustyFears
b127733cfa
Match spinning flower and slide (#419) 
* match use_spinning_flower.c
* match slide.c
* some partners.c matches
 2021-09-16 13:19:12 +01:00
ThreeMustyFears
b5eb88b9f3
Match super boots (#415) 
* update common_structs.h

* match super boots

* run coverage.py

* missed a couple things

* Update functions.h

* removing a warning

* requested changes

Co-authored-by: ThreeMustyFears <>
 2021-09-08 07:02:00 +09:00
Alexander Faßbender
ed8f1a9593
Rename string to msg (#414) 
* change all occurences of  to  unless they are a chaar-array

* resolve pr review
 2021-09-02 17:46:27 +02:00
Ethan Roseman
1b163a0c4a
Decomp some pause screen map functions (#412) 
* decomp pause screen map functions

* pull upstream and merge

* change get_variable calls to evt_get_variable

* style fixes for map pause screen

* close match on pause_map_init and style in map pause functions

* small pause_map_cleanup change

* Matches (thanks Josh), structs, symbols, cleanup

* cleanup

* Symbol / struct refresh

* further cleanup

* data/rodata disasm, rodata migration, cleanup

* PR comments

* map message ids

Co-authored-by: Rain <rainmachus@gmail.com>
 2021-09-02 20:17:40 +09:00
Alexander Faßbender
b198250cde
Rename every function that is a part of evt_funcs.h to have the evt_ prefix (#408) 
* rename every function that is part of evt_funcs.h to have the evtt_ prefix.

* remove old .s files

* fix symbol_addrs error

* add evt_ 'prefix' to the dead functions in dead-h
 2021-08-29 18:51:56 +02:00
JaThePlayer
4554a46d39
More entity decomp (#402) 
* More entity decomp

* cleanup

* Vec3f instead of 3 floats in structE307C0
 2021-08-29 23:09:41 +09:00
Ethan Roseman
a865cbdf17
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
 2021-08-29 22:44:17 +09:00
ThreeMustyFears
cdbf170061
Match action_cmd/hit_lava (#399) 2021-08-26 22:52:45 +01:00
JaThePlayer
0bdf15542e
Chest & Heart Block entities (#393) 2021-08-25 22:29:43 +01:00
Ethan Roseman
ff2c968335
Getting rid of warnings and removing function decl from INCLUDE_ASM (#396) 
* Fix some fx stuff

* INCLUDE_ASM doesn't emit a function decl anymore
 2021-08-26 05:32:48 +09:00
Alexander Faßbender
4bdb7280a7
Create dead.h and update dead code units (#394) 
* create dead.h and resolve #350

* Update variables.h

* Update dead.h
 2021-08-26 04:29:59 +09:00
alex
d0be37641b
Fix a bunch of warnings (#388) 
* git subrepo pull (merge) --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "5d7a6c0813"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "5d7a6c0813"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* configure: add --no-warn

* clean up hud_element.h

* fix some warnings
 2021-08-25 21:34:03 +09:00
alex
78a729a7a3
NPC animation cleanup (#384) 
* remove BattleID and NpcAnimId typedefs

* change NPC_ANIM generation

* struct for StaticNpc.animations

* ~peach_make_disguise_npc
 2021-08-25 01:42:29 +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
2c0cb43181
Tidying (#375) 
* don't touch undefined syms/funcs auto

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "25b848a230"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "25b848a230"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* 4 npc funcs

* nine sef commands

* test

* test2

* run undefined_syms through cpp, remove bss and dead syms files

* nuContQueryRead

* Remove unnecessary flags

* oops

* oops2
 2021-08-22 22:10:06 +09:00
ThreeMustyFears
ca1adbcb60
Match ultra boots (#372) 
* match ultra boots

* update PlayerStatus struct

* add func

* update func prototype

* missed something

* coverage.py

* unnessary return

* requested changes

I changed gSpinHistoryPosY, and gSpinHistoryPosAngle to arrays based off of the declarations in 7E9D0.c

Co-authored-by: ThreeMustyFears <>
 2021-08-20 19:31:00 +09:00
alex
49bee8512b
hud_element.c (#371) 
* generate permuter_settings.toml
* remove -Wshadow (#366)

Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
 2021-08-18 17:28:32 +01:00
Ethan Roseman
c7a7567d68
FX data/funcs, camera funcs, state funcs (#364) 
* fx table work

* fx data

* blah

* render_effects_UI

* split out effects.c

* battle state menu functions

* render_frame

* clean

* clean

* 4 camera funcs

* state_step_end_battle & symbol names

* state_file_select done

* 111f0 done

* .

* PR comments
 2021-08-17 03:14:58 +09:00
ThreeMustyFears
25dcbe4b92
Match some funcs in world/action/walk (#362) 
* match some walk funcs

* fix D_800F7B40 type

* update functions.h

* update splat.yaml

* remove walk.data.s

* run coverage.py

* remove line at top

* changed brace

* requested changes

Co-authored-by: ThreeMustyFears <>
 2021-08-15 18:28:16 +09:00
Ethan Roseman
3c887e6ac3
curtains.c data work, assorted funcs, new file, etc and cleanup: misc decomp (#360) 
* PlayEffect progress, two insane funcs

* PartnerActionStatus struct and some cleanup

* file split

* physics funcs

* data migration, some decomp

* curtains data, etc

* git subrepo pull (merge) --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "b8bf80cd07"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "b8bf80cd07"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "265b837554"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "265b837554"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* PR comments
 2021-08-14 02:27:57 +09:00
ThreeMustyFears
f23045e775
Match world/action/jump funcs (#352) 
* Match all funcs

* Update common_structs.h

func_802B6000_E24040 was attempting to assign an f32 to a char[], so I updated these

* Added a couple of flags

* Some requested changes

I couldn't figure out how to get Kelebek1's suggestions for the suggest_player_anim_clearUnkFlag to work, but I managed to do it for sfx_play_sound_at_player

* Update enums.h

Removed unnecessary flag that I previously added

* Update functions.h

* Update 7bb60_len_41b0.c

There were some conflicting declarations so I changed them

* Delete ver/us/asm/nonmatchings/world/action/jump directory

* Update jump.c
 2021-08-04 18:20:16 +09:00
Alexander Faßbender
11a6166cd8
Decompile miscellaneous dead funcs and find_duplicates.py (#349) 
* match last bow fumction

* decomp more partner functions

* :)

* :)

* resolve merge conflict and style conflicts

* fix

* decomp :)

* :(

* :(((

* :)

* :(

* :)

* :)))))

* :(

* :/

* idk

* :/

* What

* Done.

* PR comments

* :(

* decompile dead funcs

* find_duplicates.py +x

* rename dead functions and resolve PR

* :)

* .

* .

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2021-08-02 23:04:11 +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
Ethan Roseman
5d69c3454f
effect shims and more battle matches (#347) 2021-07-31 15:32:19 +01: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
Ethan Roseman
24e32f8b48
Effect code generation (#338) 
* Update symbol_addrs

* effects.h and cleanup

* effect code generation!
 2021-07-21 23:46:58 +09:00
Alexander Faßbender
83be3c1ea8
Miscellaneous battle/area functions (#330) 
* match last bow fumction

* decomp more partner functions

* :)

* :)

* resolve merge conflict and style conflicts

* fix

* decomp :)

* :(

* :(((

* :)

* :(

* :)

* :)))))

* :(

* :/

* idk

* :/

* What

* Done.

* PR comments

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2021-07-21 20:22:42 +09:00
Ethan Roseman
ed2665a934
Various funcs in 77480, 1A5830, 1776B0 (#328) 
* 2 funcs in 77480
* SetPartSize
* 2 funcs in 1A5830
* 34 funcs in 1776B0
 2021-07-20 11:51:11 +01:00
Alexander Faßbender
3763936d82
match star spirits (#325) 2021-07-19 19:27:56 +01:00
Ethan Roseman
ab96e98acf
Miscellaneoush Decomp 323 (#323) 
* more images

* new data file

* 2 undefined syms

* func_80048E34

* Shorten BattleStatus

* git subrepo pull (merge) --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "2fbdbb9df8"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "2fbdbb9df8"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* chop away 0x460-onward in BattleState

* battle.c complete!

* .
 2021-07-19 20:49:30 +09:00
Alexander Faßbender
2a4966887c
match battle partner/move functions (#319) 2021-07-18 16:21:37 +01:00
ThreeMustyFears
3d2798422a
Match func_8003DFA0 and func_8003E1D0 (#316) 
* match func_8003DFA0 and func_8003E1D0

* update return types

* Delete func_8003DFA0.s

* Delete func_8003E1D0.s

* made requested changed to npc.c

* moved prototypes and changed return type to void

* Correcting a couple mistakes 

My bad I think void should have been an EffectInstance* which I got from looking at the matching INCLUDE ASM in src/4ac90_len_3910.c and I forgot to modify src/evt/fx_api.c as it has a prototype for these functions in it

* Update fx_api.c

* further cleanup

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2021-07-17 23:45:08 +09:00
Ethan Roseman
1beee32dc6
Message work (#315) 
* msg wip

* var name restoration

* rodata padding

* New compiler that supports .bss section attribute!

* -fno-common & cleanup

* clean

* extern bss for now

* msg work

* git subrepo pull (merge) --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "8588eaae7b"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "8588eaae7b"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* msg_draw_prim_rect

* draw_message_window

* render_messages

* draw_string progress

* remove dumb file

* images, data
 2021-07-17 03:27:27 +09:00
alex
fcf84633a7
Split jp map_data (#313) 
* split jp mapfs

* fix us pm_map_data

* jp title_data

* oops

* avoid placing build files in assets/

* match load_hit_asset

* match load_stage_collision

* name gMapConfig and gMap
 2021-07-16 20:08:22 +09:00
Ethan Roseman
f02743e1cb
Tidying and msg.c work (#311) 
* undefined syms cleanup

* moving all remaining undefined funcs to dead_syms (as they're dead)

* Rename and update MessagePrintState

* msg wip

* B9D60 -> msg

* msg stuff

* .

* PR stuff
 2021-07-13 22:43:14 +09:00
Ethan Roseman
03eccf598f
Misc decomp 534 (#301) 
* splat disasm update

* a little

* splat jtbl robustness

* git subrepo pull (merge) --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "150dcdebfd"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "150dcdebfd"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* some rodata stuff

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "21bf3a381c"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "21bf3a381c"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* progress

* All area rodata migrated

* UnkDistFunc

* SwitchToPartner

* UnkNpcAIFunc23

* UnkNpcAIFunc24

* UnkNpcAIFunc25

* cleanup & symbol_addrs

* disasm update

* work on fio.c (6240)

* data 'n' tst_04 funcz

* more tst_

* misc & PlayFX3D

* two end_01 funcs

* more shtuff

* fix

* fix2
 2021-07-09 00:53:00 +09:00
Ethan Roseman
41417f4d70
All area rodata migrated (#299) 
* splat disasm update

* a little

* splat jtbl robustness

* git subrepo pull (merge) --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "150dcdebfd"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "150dcdebfd"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* some rodata stuff

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "21bf3a381c"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "21bf3a381c"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* progress

* All area rodata migrated
 2021-07-03 20:22:53 +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
Ethan Roseman
8c690d23d1
Assorted Morsels (#297) 
* bss

* 3 audios

* d5a50 stuff

* some icon funcs

* get_icon_render_pos

* PlayerLandJump

* func_80248170

* cleanup

* splat update prep

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "81c4b35b89"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "81c4b35b89"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "9b791a654a"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "9b791a654a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "2cf2a5e5d8"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "2cf2a5e5d8"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* fix loop in PaperMarioNpcSprites

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "2fab217750"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "2fab217750"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* add sha1 to yaml

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "426b08200d"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "426b08200d"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* varTable -> union :( + player_api funcs

* 6 more

* 4 more

* 5 mo

* 1 mo

* 1 mo 2

* 5 mo

* player_jump

* 3 mo

* some 18F340

* 6 more

* 6 mo

* nm

* 1

* 1 more

* some PR feedback

* symbol addr update

* UnsetCamera0Flag1000

* SetPlayerSpriteSet2

* action 18

* encounter + a smol hammer

* git subrepo pull (merge) tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "8cf482fe57"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "4c0a93eaed"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* 3 and cleanup

* undo yucky union

* PR comments

* get_enemy_safe

* cleanup

* move VirtualEntity

* attempt to fix doxygen

* 3, cleanup

* broken

* fixed!

* progress

* 2

* 3 and cleanup

* 6 map_api funcs

* 3 map api

* CreateNpc

* BringPartnerOut & NpcFlyTo

* npc_api complete

* update_scripts

* 4 si bois inc si_execute_next_command

* update symbol_addrs

* 2 more and cleanup

* camera struct & do_camera_type_0

* PR feedback

* small tidying
 2021-06-21 13:30:57 +09:00
Ethan Roseman
e9176cb08f
Most of player_api and 18F340 (#296) 
* bss

* 3 audios

* d5a50 stuff

* some icon funcs

* get_icon_render_pos

* PlayerLandJump

* func_80248170

* cleanup

* splat update prep

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "81c4b35b89"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "81c4b35b89"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "9b791a654a"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "9b791a654a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "2cf2a5e5d8"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "2cf2a5e5d8"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* fix loop in PaperMarioNpcSprites

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "2fab217750"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "2fab217750"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* add sha1 to yaml

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "426b08200d"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "426b08200d"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* varTable -> union :( + player_api funcs

* 6 more

* 4 more

* 5 mo

* 1 mo

* 1 mo 2

* 5 mo

* player_jump

* 3 mo

* some 18F340

* 6 more

* 6 mo

* nm

* 1

* 1 more

* some PR feedback

* symbol addr update

* UnsetCamera0Flag1000

* SetPlayerSpriteSet2

* action 18

* encounter + a smol hammer

* git subrepo pull (merge) tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "8cf482fe57"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "4c0a93eaed"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* 3 and cleanup

* undo yucky union

* PR comments

* get_enemy_safe

* cleanup

* move VirtualEntity

* attempt to fix doxygen
 2021-06-16 18:52:15 +09:00
pixel-stuck
e61e67ea9b
[WIP] Work on npc.c (#295) 
* formatting

* format + misc work

* lots of work on npc.c

* PR comments, asm delet + other misc fixes

* missed one

* temporarily remove cleanup step for testing

* test fix for splat

* test

* o2

* o0

* fix Yay0decompress.c bug

* debug logging

* stuff

* stuff2

* restore stuff

* more PR comments and some general cleanup

* NPC flags + improve match + misc

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2021-06-15 17:05:16 +09:00
Ethan Roseman
6ec6aab984
Mostly hud stuff (#294) 
* bss

* 3 audios

* d5a50 stuff

* some icon funcs

* get_icon_render_pos

* PlayerLandJump

* func_80248170

* cleanup
 2021-06-07 10:15:48 -04:00
Ethan Roseman
08aad50545
50% Functions Decompiled (#292) 
* part 2 dun

* DivActorLevel4

* Dist3D

* SetBackgroundAlpha & FreeIcon

* update symbol_addrs

* UnkBackgroundFunc3

* anudder

* UnkFogFunc2

* Disasm most remaining data

* model stuff and renames

* update symbol_addrs

* bss

* a5dd0 data migration

* entity funcs

* render_entities

* render_shadows

* entity_get_collision_flags

* 2 map api

* 2 mo

* progress

* fix 2 non-matchings

* clean

* pause_draw_menu_label

* another

* progs

* 50% function count

* remove commented funcs

* symbol_addrs

* PR comments
 2021-05-08 14:34:57 +09:00
Ethan Roseman
ad80f13149
Battle Area + Effect Data (#289) 
* part 2 dun

* DivActorLevel4

* Dist3D

* SetBackgroundAlpha & FreeIcon

* update symbol_addrs

* UnkBackgroundFunc3

* anudder

* UnkFogFunc2

* Disasm most remaining data

* model stuff and renames

* update symbol_addrs
 2021-05-02 04:03:42 +09:00
Ethan Roseman
b2cc576bda
Shops and Battle Areas (#287) 
* fix BSS bs

* more shop stuff

* gamestatus stuff

* name and some nonmatchings

* cleanup

* clean

* battle area data

* DeadUnkFloatFuncAbs

* symz

* removing stuff

* Battle Area Deduplication

* UnkFogFunc
 2021-04-30 02:38:02 +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
Ethan Roseman
1c0d26e6c6
Tidying and Shops (#282) 
* render_curtains

* cleanup

* more cleanup

* cleanup

* update symbol addrs

* asm update

* shop progress

* more cleanup

* update symbol_addrs

* asm cleanup

* .

* new data splits

* rename stuff

* .

* .

* PR stuff
 2021-04-27 02:47:38 +09:00
alex
683d0857ff
Fix many compiler & linker warnings (#281) 
* fix ld warnings

* fix NpcSettings warn

* get_screen_coords

* various

* bloop

* update INSTALL.md for versioned baseroms
 2021-04-25 03:56:22 +09:00
Ethan Roseman
011a957985
Compiler's Worst Nightmare (#278) 
* 25.00%

* remove __naked__ and name printContext->unk_4E8

* change rodata strings to []

* actually remove

* fix headers

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "eec8ac0cb8"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "eec8ac0cb8"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* progress

* .

* .

* some stuff

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "4e012eaad6"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "imgflip"
  commit:   "4e012eaad6"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* :OK:

* 2 graphics funcs!

* woo

* more

* match func_802A15A0_733670 (#276)

* .

* gfx_draw_frame, other fixes

* macros begone!

Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
 2021-04-23 20:55:30 +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
Ethan Roseman
8e4df57de7
25.00% (#268) 
* 25.00%

* remove __naked__ and name printContext->unk_4E8

* change rodata strings to []
 2021-04-19 02:25:32 +09:00
alex
8e47263c3f
Action segments (#259) 
* rm debug.i

* match phys_update_action_state

* world/action/idle.c

* ~update_npcs

* document npc_iter_nop

* fix diff.py expected/ location

* struct/naming updates

* update Npc struct via clover

* coverage

* ~world_action_idle_update

* walk, run actions

* jump

* land

* name temp anim

* size for struct

* yucky

* talk

* stuff

* all the action segments

* ~func_802B61E4_E23444

* ~func_802B6000_E287F0

* cleanup

* remove step_entity_updatecmd comment

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2021-04-17 20:16:13 +09:00
pixel-stuck
3fd09d2a7c
Decompile most of code_b72b0_len_15ed0.c (#256) 2021-04-13 01:07:05 +01: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
Ethan Roseman
353ab8d051
f270, world, and more (#246) 
* 415D90 decomp

* code_415D90 rodata migration

* data migration, decomp

* .

* .

* .

* 4 funcs

* non-matching

* audio part 1

* audio work

* end of snd

* update_symbol_addrs

* .

* 🐔

* .

* sfx func names

* bgm

* more audio

* .

* a few audio funcs

* update section length

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "82ff308caf"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "82ff308caf"
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:   "4e9d3cdf85"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "4e9d3cdf85"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* misc-decomp power

* sound

* 4 mo

* more changes

* .

* some f270

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "1c8ff4ec3f"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "1c8ff4ec3f"
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:   "f0633ecdbc"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "f0633ecdbc"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* fix is_logo image size

* .

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "4be92a4786"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "4be92a4786"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* state_step_pause

* almost

* fixing symbol_addrs and disasm

* update symbol_addrs

* .

* fix Matrix4f usages

* .

* .

* update_symbol_addrs

* fixes

* I hate bitfields

* load_map_by_IDs

* cleanup

* state_step_logos

* more cleanup

* .

* splat

* PR comments
 2021-04-02 03:00:29 +09:00
Maide
21917eb3dc
Enum all the things (#241) 2021-03-29 16:34:39 +09:00
Maide
a8e5d9b1d9
world/area_arn/arn_02 (#236) 
* area_arn/arn_02

* Signed StoryProgress enum
 2021-03-29 01:05:56 +01:00
Ethan Roseman
f46f5d16ac
Dead code data+rodata disasm (#228) 
* dead code disasm

* yaml splitting

* rodata almost done

* OK

* some decomp

* DeadUnk1

Co-authored-by: Rain <rainmachus@gmail.com>
 2021-03-26 10:52:37 -04:00
Ethan Roseman
4ace4bb0d9
415D90 and Audio (#229) 
* 415D90 decomp

* code_415D90 rodata migration

* data migration, decomp

* .

* .

* .

* 4 funcs

* non-matching

* audio part 1

* audio work

* end of snd

* update_symbol_addrs

* .

* 🐔

* .

* sfx func names

* bgm

* more audio

* .

* a few audio funcs
 2021-03-26 10:46:45 -04: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
Ethan Roseman
9e06bed2b2
Fixed gGameStatusPtr (#220) 
* fixed gGameStatusPtr

* fixed non-matching

* PR comments
 2021-03-22 22:25:48 -04:00
Ethan Roseman
577b3e3ebe
Misc decomp (#215) 
* Misc early code decomp

* Make expected script

* fix m2ctx

* gOverrideFlags & set/unset macros

* update symbol addrs

* Cleanup and PR comments

* oops
 2021-03-19 19:25:14 +09:00
Ethan Roseman
943f612050
Work on 1b40 (#213) 
* rodata migration

* a5dd0 rodata migration

* e79b0 rodata migration

* more rodata migration

* more migration

* goombario rodata

* SetNpcCollision32

* removing old stuff

* oops

* UnkBackgroundFunc

* removing unnecessary files

* UnkBackgroundFunc2

* UnkStarFuncs

* .

* misc star decomp and AddHP

* oops

* AddFP

* fix offset, update symbol_addrs

* .

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "f602284b3e"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "f602284b3e"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* re-disasm

* fix effect disasm

* oops

* fix lullaby

* fixing rodata

* load_engine_data

* removing undefined syms

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "3a68ae30a7"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "3a68ae30a7"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* Skip exceptasm extraction
 2021-03-15 22:30:09 +09:00
Ethan Roseman
a1f7a21114
Rodata migration + other goodz (#208) 
* rodata migration

* a5dd0 rodata migration

* e79b0 rodata migration

* more rodata migration

* more migration

* goombario rodata

* SetNpcCollision32

* removing old stuff

* oops

* UnkBackgroundFunc

* removing unnecessary files

* UnkBackgroundFunc2

* UnkStarFuncs

* .

* misc star decomp and AddHP

* oops

* AddFP

* fix offset, update symbol_addrs

* .

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "f602284b3e"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "f602284b3e"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* re-disasm

* fix effect disasm

* oops

* fix lullaby
 2021-03-13 00:53:11 +09:00
Ethan Roseman
555102c17c
Misc decomp 3 (#202) 
* data fixes, SoundID rename

* ?

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "36030366ce"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "36030366ce"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
 2021-03-10 14:13:02 +09:00
Ethan Roseman
b7a2673672
Misc decomp and rodata migration (#198) 
* misc decomp...2

* re-run disasm

* more shtuff

* rodata stuff

* more rodata stuff

* more rodata migration

* rodata stuff 🐱

* meowp

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "199d63489a"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "199d63489a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "b0f5ab40a2"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "b0f5ab40a2"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "4e79cc1a4e"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "4e79cc1a4e"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "53370e3217"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "53370e3217"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* OK

* symbol_addrs script update

* PR comments

* fake gross match
 2021-03-07 18:32:24 +00:00
alex
9e6cf181bd
Several partner-related functions (#196) 
* decompile bombette and bow related functions

* decompile bombette and bow related functions

* decompile bombette and bow related functions

* decompile partner function - mainly bombette and bow

* decompile Goombario functions

* OK

* resolve my comments on #190

* rename IsPartnerImmobile funcs

* rm old asm

Co-authored-by: brotenko@gmail.com <brotenko@gmail.com>
 2021-02-27 20:05:02 -05:00
Ethan Roseman
6d66d5fedb
Odds and Ends (#189) 
* fixing segment

* redoing subtree

* git subrepo clone https://github.com/ethteck/splat.git tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "99cf514297"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "99cf514297"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* fix symbol_addrs

* sweet victory

* reformat collision_main_lateral.s

* Lots of matches, fixed diff.py issue, improved coverage.py

* some more

* update symbol_addrs

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "c46026725a"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "c46026725a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* update symbol_addrs

* fix disasm

* 2 mo

* Jenkinsfile

* PR comments

* check_input_status_menu, removing some macros

* a few funcs

* assist updates

* UnkAlphaFunc

* UnkPartnerPosFuncs

* Deleting stuff

* oopz

* dead_syms.txt, UnkNpcAIFunc14

* update symbol_addrs

* cleanup

* symbol_addrs

* cleanup
 2021-02-20 23:41:30 +09:00
Ethan Roseman
ee7f09bb2b
Snibblets, Tidbits, and Morsels (#188) 
* fixing segment

* redoing subtree

* git subrepo clone https://github.com/ethteck/splat.git tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "99cf514297"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "99cf514297"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* fix symbol_addrs

* sweet victory

* reformat collision_main_lateral.s

* Lots of matches, fixed diff.py issue, improved coverage.py

* some more

* update symbol_addrs

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "c46026725a"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "c46026725a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* update symbol_addrs

* fix disasm

* 2 mo

* Jenkinsfile

* PR comments
 2021-02-18 20:54:07 +09:00
Ethan Roseman
8afd8bf1f1
Various meta work and some decomp (#184) 
* some

* DeadUnkTexturePanFunc

* DeadUnkTexturePanFunc2

* move guOrthoF to os

* up

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "ae2cce951d"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "ae2cce951d"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* Updating bin dir

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "5517f520e4"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "5517f520e4"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "fe48dc3b3a"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "fe48dc3b3a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* revert garbage

* :OK:

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "8c86e4b95b"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "8c86e4b95b"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* data migration

* 3

* .rodata migration and a buncha funcs

* 2 mo

* some decomp, a file boundary fix

* cleanup

* UnkNpaAIFunc13s

* Update symbol_addrs

* remove sublist

* deleted asm

* data fix

* fix data

* wtf?!

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "88ce6b44a6"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "88ce6b44a6"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* symbol_addrs update

* blah

* PR comments
 2021-02-16 19:32:34 +09:00
brotenko@gmail.com
44415597e5 decompile repeating move-related functions. 2021-02-14 19:07:39 +01:00
brotenko@gmail.com
e53d5b620f Decompiled dispatch_event_partner 2021-02-12 22:31:22 +01:00
Ethan Roseman
6dcaac6f7b Merge branch 'master' into star-rod-0-4-0 2021-02-09 11:53:48 +09:00
Ethan Roseman
8401f88fd5 undo comment 2021-02-09 10:43:04 +09:00
Ethan Roseman
bbac3d905b match nuContRmbMgr.c 2021-02-09 03:02:14 +09:00
Ethan Roseman
398fa6c695 gfxRetrace_Callback 2021-02-09 00:53:44 +09:00
Alex Bates
e0515e1eed name many funcs 2021-02-06 15:20:35 +00:00
Ethan Roseman
51dbb6e5d7 improve coconut 2021-02-04 20:29:44 +09:00
Ethan Roseman
78411d2270 more decomp and 🍀 symbols 2021-01-21 00:45:03 +09:00
Ethan Roseman
e2e4c86b9c some rodata migration, decomp 2021-01-20 02:27:48 +09:00
Ethan Roseman
b8edd71cd8 42e0 2021-01-20 01:31:43 +09:00
Ethan Roseman
545a655d40 2 funcz 2021-01-17 23:40:02 +09:00
dark-samus
839b9f5508 whitespace 2021-01-16 17:15:27 -05:00
dark-samus
e2c8066302 finish data migration for code_104730 2021-01-16 15:08:08 -05:00
dark-samus
d9083c1927 fix some things 2021-01-16 09:37:13 -05:00
dark-samus
557a9db0e2 more 2021-01-15 15:35:39 -05:00
dark-samus
6f304364c6 merge master 2021-01-07 14:59:49 -05:00
Ethan Roseman
c6c8f3876c a few more 2021-01-06 23:19:41 +09:00
Ethan Roseman
bdbe0c5e65 a few 2021-01-03 18:34:04 +09:00
Ethan Roseman
89b5336bea 6 more 2021-01-03 18:02:50 +09:00
Ethan Roseman
a0d1324d2c UnkNpcAIFunc12 2021-01-02 16:51:14 +09:00
Ethan Roseman
1c7a19255b Merge branch 'master' into misc-decomp 2021-01-01 10:20:39 +09:00
Ethan Roseman
c2e027729c some more digs 2020-12-30 17:18:27 +09:00
Ethan Roseman
1dd75cd0e5 UnkBattleFunc2 2020-12-30 16:03:05 +09:00
dark-samus
cd1ff2ec13 some work 2020-12-29 14:06:06 -05:00
Mark Street
466a31fe4e Matching code_39cb0_len_100.c 2020-12-24 23:39:47 +00:00
Ethan Roseman
696522aafe smores 2020-12-23 15:56:34 +09:00
Ethan Roseman
594d5bd2c7 759b0 funcs 2020-12-22 23:58:31 +09:00
Ethan Roseman
fe82f4be0a clean 2 2020-12-22 22:50:47 +09:00
Ethan Roseman
2754ed84fe cleanup + 1 match 2020-12-22 22:24:49 +09:00
Ethan Roseman
1c52052c12 Merge branch 'master' into audio 2020-12-22 18:13:24 +09:00
Ethan Roseman
b753ff25ed non audio :floshed: 2020-12-20 12:47:09 +09:00