pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,831 Commits 5 Branches 0 Tags 205 MiB
3fd09d2a7c
Commit Graph

35 Commits

Author SHA1 Message Date
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
alex
498694158a
Enum cleanup (#247) 
* various cleanup

* item cleanup

* enums

* enum flags

* NO

* treat didAreaChange as bool in ifs
 2021-04-02 01:50:38 -04: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
alex
c8da41b5e4
Some of code_a5dd0_len_114e0.c (#240) 
* match load_area_specific_entity_data

* wFog

* fix func_8011D72C type

* func_8011BAE8

* clone_model

* clean D_801512E0

* ~set_next_game_mode

* _set_game_mode

* gamemode funcs

* ~step_current_game_mode

* name funcs

* match queue_render_task

* tex panner funcs

* get_entity_type

* Entity::aabb

* GameMode::renderAux

* set_game_mode_slot

* game mode syms
 2021-03-29 03:31:15 +09: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
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
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
Alex Bates
7d34a06136 match load_partner_npc 2021-02-09 15:03:21 +00:00
Alex Bates
cf745c85cb clean up coconut 2021-02-06 05:26:27 +00:00
Ethan Roseman
aeecb59fc2 decomp 2021-02-06 03:47:47 +09:00
Alex Bates
0a18a59a9d clean up coconut.c main 2021-02-05 14:56:42 +00:00
dark-samus
8d533d5615 stuff 2021-01-15 12:01:44 -05:00
Ethan Roseman
89b5336bea 6 more 2021-01-03 18:02:50 +09:00
Alex Bates
fb1bb896a5 use partners.h 2020-12-22 16:19:06 +00:00
Ethan Roseman
03349746a4 Status->Debuff 2020-11-26 15:34:10 -05:00
Ethan Roseman
4400966849 Merge branch 'master' into cornucopia 2020-11-22 10:07:20 -05:00
Ethan Roseman
3a2f17b91d a few more 2020-11-19 19:41:49 -05:00
Alex Bates
e0daee1bb8 generate sprite animation headers 2020-11-11 16:33:55 +00:00
Alex Bates
db1ee14d8f
match get_song_variation_override_for_cur_map 
This was previously called get_default_variation_for_song, but its more of an override than a default.
 2020-10-29 22:41:43 +00:00
Ethan Roseman
59d30300f5 GetItemName 2020-10-20 20:59:17 -04:00
Alex Bates
23f8d8ee35
add structs/macros for matching map data 2020-10-20 04:11:07 +01:00
Alex Bates
f9a667bc7d
begin script disassembly 2020-10-19 22:58:57 +01:00
Ethan Roseman
011231df41 Many more functions decomped 2020-10-08 15:03:58 -04:00
Ethan Roseman
5794cdf6fc Some more 2020-10-03 16:04:49 -04:00
Alex Bates
cfe3a40880
move ActionState comment 2020-08-24 14:22:44 +01:00
Alex Bates
21d4a26913
Merge master into physics 2020-08-24 13:49:18 +01:00
Jdog
efe89e4486 Added gPlayerActionState, gPlayerAnimation, gPlayerNpc. Modifed PlayerStatus->actionState from u8 to s8. Defined ActionState enum as s8 type. A handful more script functions matched. 2020-08-22 16:24:51 -07:00
Alex Bates
e54bb887d7
match move_player 2020-08-20 19:26:34 +01:00
Alex Bates
46c2016bf1
rename enums 2020-08-16 05:24:20 +01:00
Alex Bates
a25b53a8a1 name and match resolve_npc 2020-08-15 05:25:36 +01:00
Alex Bates
4724a110a5 generate enums.h 2020-08-14 23:53:01 +01:00