pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,878 Commits 4 Branches 0 Tags 206 MiB
fcf84633a7
Commit Graph

43 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Alex Bates
78c2615e58 match create_partner_npc 2021-02-09 13:07:46 +00:00
dark-samus
f1aa2190d9 typedef gets formatted :( 2021-01-15 17:26:03 -05:00
dark-samus
6fa31ae20a Most PR comments 2021-01-15 17:16:41 -05:00
dark-samus
8a2bb470a9 format 2021-01-15 12:18:27 -05:00
dark-samus
dcbb258e45 misc work 2021-01-12 14:45:50 -05:00
Ethan Roseman
1c7a19255b Merge branch 'master' into misc-decomp 2021-01-01 10:20:39 +09:00
Ethan Roseman
c42debe758 M -> N, StartRumbleWithParams dup 2020-12-28 16:09:39 +09:00
Alex Bates
67d0f32c8f match battle/area_kmr_part_1/battles.c 2020-12-27 12:11:14 +00:00
Ethan Roseman
def7b12a2d e0b30 2020-11-27 01:14:28 -05:00
Ethan Roseman
dcd2acf4fe UnkNpcAIFunc11 2020-11-22 15:47:15 -05:00
Ethan Roseman
4400966849 Merge branch 'master' into cornucopia 2020-11-22 10:07:20 -05:00
Ethan Roseman
7d09429fd6 GetEntryPos 2020-11-21 20:31:57 -05:00
Ethan Roseman
7ae4f565f7 UnkNpcDurationFlagFunc 2020-11-20 09:55:56 -05:00
Ethan Roseman
4b8af37c35 UnkNpcAIFunc1 2020-11-19 23:08:05 -05:00
Alex Bates
e0daee1bb8 generate sprite animation headers 2020-11-11 16:33:55 +00:00
JoshDuMan
58e04b19ba Merge https://github.com/ethteck/papermario into stuff 2020-11-02 18:49:38 -05:00
JoshDuMan
ee3c059779 Work on world functions. 2020-11-02 02:07:02 -05:00
Alex Bates
abcda77e2c MapInitialiser -> MapInit 2020-10-31 20:04:33 +00:00
Alex Bates
3d9127a340
match world table .data 2020-10-30 17:43:12 +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
Alex Bates
652c52d3dd
use SCRIPT(...) everywhere 2020-10-23 18:39:38 +01:00
Alex Bates
0ea4d24deb
merge master 2020-10-22 17:34:31 +01:00
alex
191be39a03
document StatDrop (#88) 2020-10-22 06:01:11 +01:00
Alex Bates
1dc8a3583d
declare M in map.h 2020-10-21 14:12:24 +01:00
Alex Bates
26f0cee254
comment goomba_npc movement 2020-10-20 08:14:07 +01:00
Alex Bates
056fbac32c
add FORMATION_ID macro 2020-10-20 07:49:40 +01:00
Alex Bates
ef7ddd6773
MapHeader -> MapConfig 
It ain't a header if it ain't at the top of the data.
 2020-10-20 07:36:05 +01:00
Alex Bates
99ac1cf053
update si types 2020-10-20 07:33:40 +01:00
Alex Bates
9a60b9f311
add NPC_GROUP macro 2020-10-20 04:29:42 +01:00
Alex Bates
23f8d8ee35
add structs/macros for matching map data 2020-10-20 04:11:07 +01:00