pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 12:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,056 Commits 4 Branches 0 Tags 205 MiB
a7caa90d28
Commit Graph

233 Commits

Author SHA1 Message Date
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