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
2,410 Commits 5 Branches 0 Tags 205 MiB
fbc054d01c
Commit Graph

80 Commits

Author SHA1 Message Date
Alexander Faßbender
f82f699188
DSL Script conversion (#562) 
* start converting scritps to new syntax

* convert old DSL scripts to new format

* update disasm_script and disasm more DSL scripts

* .

* .

* resolve issues

* add EVT_PTR() to GotoMap calls
 2021-12-24 14:29:05 +01:00
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
Alex Bates
a7caa90d28
Add descriptions to all map headers (#515) 
* remove bad create_actor declaraton

* maps.py

* area name

* add doc names for all maps

* rm maps.py
 2021-11-01 22:22:40 +09:00
Alex Bates
ae00fea170
Add new EVT macros (#482) 
* add tools and new macros

* change EVT_OP enum names

* first file

* convert some files

* stuff

* EVT_PTR

* src/battle/item

* src/battle

* tool changes

* clouds.inc.c

* src/evt

* foliage.inc.c

* bitwise ops

* staticentitydata vars

* add diff_evt.py

* use evt macros in dro_01

* evt macro docs

* whoops

* fix some warnings
 2021-10-25 20:44:55 +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
Alexander Faßbender
afab424519
Rename all si_funcs to evt_funcs (#403) 
* resolve #397

* fix libultra

* Match func_80144E4C (#406)

* Update hud_element.c

* Update hud_element.h

* Update hud_element.h

* Delete func_80144E4C.s

* 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

* combine PR #398 with #403

* More entity decomp (#402)

* More entity decomp

* cleanup

* Vec3f instead of 3 floats in structE307C0

* resolve #397

* fix libultra

* combine PR #398 with #403

* decompile evt_goto_end_loop

Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
Co-authored-by: JaThePlayer <50085307+JaThePlayer@users.noreply.github.com>
 2021-08-29 23:34:42 +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
de800e9c9f
mass script to evt type rename (#377) 
* add process_scripts.py

* mass evt rename
 2021-08-23 06:50:10 +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
alex
da6fd773bb
Disassemble battle/partner/goombario.c (#308) 
* name battle/partner/ segments

* name battle_goombario sprites

* battle/partner/goombario data

* update
 2021-07-12 22:00:45 +09:00
alex
8decbeb3ff
Disassemble fully battle/area_kmr_part_1 (#307) 
* generate c includes for img segments

* flatten battle/item/dusty_hammer.c

needs custom splat

* use .inc.c for c incbins

* fixy

* new stuff

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

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

* remove dumb

* git subrepo pull tools/splat

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

* yaml cleaning

* Further yaml cleanup & battle item refactor

* remove rawptr

* disasm_script: handle = (const) NPC_ANIM

* disasm_script improvements

* wip

* it compiles!

* battles.c -> area.c

* squish warnings

* git subrepo pull tools/splat

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

* all OK except rodata padding

* ok

* ACTOR_SELF

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2021-07-12 21:06:00 +09:00
Ethan Roseman
7cb1790789
Fix alignment of many data sections (#305) 
* generate c includes for img segments

* flatten battle/item/dusty_hammer.c

needs custom splat

* use .inc.c for c incbins

* fixy

* new stuff

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

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

* remove dumb

* git subrepo pull tools/splat

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

* yaml cleaning

* Further yaml cleanup & battle item refactor

* remove rawptr

* git subrepo pull tools/splat

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

* further cleanup

* Further cleanup & match gfx_draw_background

* clean & wip

Co-authored-by: Alex Bates <hi@imalex.xyz>
 2021-07-12 18:15:00 +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
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
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
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
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 Bates
7cb10dce7e Merge branch 'master' of github.com:pmret/papermario into data 2021-02-09 10:25:25 +00:00
Alex Bates
7f4785cc98 match code_16c8e0, code_190B20 data 2021-02-09 02:09:57 +00:00
Alex Bates
e0515e1eed name many funcs 2021-02-06 15:20:35 +00:00
Ethan Roseman
e52cc15d4d Merge branch 'data' of https://github.com/nanaian/papermario into data 2021-02-05 01:16:57 +09:00
Ethan Roseman
0a8b4f3757 goods 2021-02-05 01:16:02 +09:00
Alex Bates
0c8c308133 func_802D3474 2021-02-04 15:41:12 +00:00
Ethan Roseman
4b1f9e0fa5 Some decomp, tons of cleanup 2020-10-24 17:51:27 -04:00
Alex Bates
3cb526273f
typedef Script as zero-size Bytecode array 2020-10-21 17:48:56 +01:00
Alex Bates
99ac1cf053
update si types 2020-10-20 07:33:40 +01:00
Alex Bates
3b3b07c90a
kmr_12: use function pointers for unnamed api funcs 2020-10-20 06:14:50 +01: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