pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-10 04:52:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,411 Commits 5 Branches 0 Tags 206 MiB
efa45a5668
Commit Graph

241 Commits

Author SHA1 Message Date
HailSanta
efa45a5668
misc battle cleanup II (#908) 
* flags and fixes

* move category start

* first strike and battle messages

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-11 17:38:04 +09:00
HailSanta
403f796246
area_dgb (#904) 
* a couple maps

* almost done

* ok

* cleanup

* ok

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-05 17:02:12 -05:00
HailSanta
1c470c92e5
area osr (#903) 
* 0/1

* ~2

* 2

* 4

* done

* ws

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-05 02:04:03 -05:00
HailSanta
a2e96ae3ae
area kpa (#901) 
* kpa 1/3/4/5

* more!

* just one left

* done

* stray cleanup

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-03 19:46:15 +09:00
HailSanta
0e54cd9b30
area kmr (#898) 
* kmr_02 ok

* some cleanup

* foliage EVS

* quiz cleanup

* partners

* cleanup pass ?

* kmr_02 done

* kmr_20 ok

* begin kmr_20 cleanup

* enough kmr_20

* kpa_90+

* more kpa

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-02 10:58:39 +09:00
HailSanta
cbdce77daf
area_spooky (#894) 
* obk_01

* obk_02

* obk_03

* obk_06

* obk_05

* checkpoint

* chandelier documentation

* obk_04

* obk_09

* obk_07

* obk done

* tabs

* kmr_22

* kmr_11

* last thing

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-12-25 14:10:23 +09:00
Ethan Roseman
1452474409
More cleanup, bss, undefined_syms (#892) 
* tons more BSS, undefined_syms, cleanup abound

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "741a0d030d"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "741a0d030d"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* one more

* fix progress.py
 2022-12-18 02:08:52 +09:00
Ethan Roseman
03c7e0d80d
BSS, undefined_syms (#891) 2022-12-17 12:20:37 +09:00
Ethan Roseman
63072fe0c1
fire vine plant hot (#889) 2022-12-16 10:31:51 +09:00
Ethan Roseman
6ea08f8257
Map funcs and update_input (#888) 
* warning

* func_80240098_BBD238

* hos/kkj stuff

* update_input is deated (thanks arienain on decomp.me\!)

* 4 mo
 2022-12-15 10:56:16 +09:00
HailSanta
e4283f3ea1
area_mac (#884) 
* mac_00 match

* mac_00 cleanup pass

* enough mac_00 cleanup

* mac_01 match

* cleanup pass 1

* first pass done

* more

* unkfoldfunc dedupe

* quick

* mockup

* new splat segment

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "b2d7b86185"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "b2d7b86185"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* fix custom segment

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "0f66e7552a"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "0f66e7552a"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* common vtx

* victory

* checkpoint

* remove map-specific subaligns

* enough

* quick fixes

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2022-12-12 21:31:29 +09:00
Ethan Roseman
29c3ffa2e0
Misc decomp 3: Oh baby a triple (#882) 
* clean

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "901241040d"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "901241040d"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* splat update

* more matches after nop hack

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "715ee0ad55"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "715ee0ad55"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* Renames, match boot_idle

* one mo

* wips

* fish func

Co-authored-by: @JaThePlayer

* sushie dun

* warnings

* clean

* match a nok func

* nok_02 stuff

* nok_04 party image

* func_802BD5D8_3174F8

* LoadPartyImage & stuff

* warnings
 2022-12-11 16:43:29 +09:00
Ethan Roseman
5b63159eaf
Effect, map decomp (#877) 
* snaking_static_appendGfx, gfx migration, cleanup

* more decomp + data stuff

* fix for Light

* map funcs

* 2 obk_07

* 4 mor

* fixes

* message IDs
 2022-12-06 08:53:46 +09:00
HailSanta
703896a7f1
isk+ (#878) 
* isk_01/2/3

* machi

* mac_05

* mac_04 matched

* mac_04

* mac_02 match

* mostly cookin

* mac_02 cleanup

* tayce t cleanup done

* most of isk

* almost done isk

* isk done

* mapconfig 1C

* jump to goal

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-12-06 08:29:22 +09:00
Ethan Roseman
d2b436287f
Effect work (#875) 
* quizmo_audience effect

* explosion_main

* tidying

* wip shtuff

* fixules

* partner_buff dun

* shockwave

* remove script
 2022-12-04 11:05:33 +09:00
HailSanta
2561914d1a
area_tik+ (#874) 
* koopa

* para troopa

* some fuzzy

* tik_05

* tik_02

* tik_01

* tik_03

* tik_03b

* tik_04

* tik_07

* tik_08

* tik_09

* tik_10/12

* tik_14

* tik_15

* tik_17/18

* more tiks

* area_tik

* mac_03

* cleanup

* oink names

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-11-30 16:39:42 +09:00
Ethan Roseman
2adca590f6
Effect work (#872) 
* this effect is awful

* ice_pillar effect

* radial_shimmer done, some data migration

* snowfalls

* data & snowfall

* wip
 2022-11-28 05:38:13 +09:00
Unnunu
30f8879ddc
dead maps (#871) 
* dead flo_00

* dead flo_03

* dead flo_07

* dead flo_08

* dead flo_09

* dead flo_10

* dead flo_11

* dead flo_12

* dead flo_13

* dead flo_14 flo_15

* dead flo_16

* dead flo_17 flo_18

* dead flo_19 unused

* kzn maps and PR comments
 2022-11-26 22:14:03 +09:00
Ethan Roseman
ea15a5b0d0
Warnings & 10 map funcs (#861) 
* 7 pra, 3 sam

* warnings

* PR
 2022-11-17 02:03:04 +09:00
Ethan Roseman
f56df3d9f7
sprite_shading_profiles & obk_07 (#859) 
* obk_07 funcs

* 2 mo

* sprite_shading_profiles

* tiny clean

* PR comments
 2022-11-15 23:55:59 +09:00
Ethan Roseman
8d429c8b07
Map Funcs (#855) 
* 2 mo hossz

* jan_00 2 funcs

* a jan_03

* dupes & stuff

* 2 mo

* 4 macs

* mac_01/8017D0

* cleanup + matching

* 3 obks

* wip

* clean
 2022-11-12 04:34:36 +09:00
Ethan Roseman
a880543beb
ItemChoice_SaveSelected + hos funcs (#854) 
* cleanup

* a bunch of ItemChoice_SaveSelected

* the last few

* a bit more

* some position -> pos

* warnings

* 2 snibblets

* 2 snibblets

* one more

* weird

* mo

* more hos_05

* hos5

* 3 mo

* comment

* cleen
 2022-11-10 11:00:56 +09:00
Unnunu
b9502a1ac4
action commands (#853) 
* reorg done

* warning

* PR comments
 2022-11-08 22:01:42 +09:00
Ethan Roseman
922a953691
4 effect funcs (#851) 
* tattle_window

* cleanup

* music_note_appendGfx

* motion_blur_flame_update

* Gfx bin, PR comments

* undefined_syms cleanup

* undefined_syms cleanup
 2022-11-06 00:31:01 +09:00
Unnunu
294602ec98
battle partners (#852) 
* goompa and goombario

* kooper

* bombette

* parakarry

* watt

* sushie

* lakilester

* bow

* twink

* fix warning

* fix messed fields

* CalculateArcsinDeg

* updated splat entries
 2022-11-05 16:06:28 +09:00
mrshigure
9da8f0a56a
[Effects] A few functions (#850) 
* [Effects] A few functions

* Addressing PR comments
 2022-11-05 09:43:44 +09:00
Ethan Roseman
3f08935b05
Dead cod (#848) 
* 2 sams

* dead cod

* little more

* wip

* fix comments
 2022-11-03 01:01:00 +09:00
mrshigure
7a56814010
Some effect functions (#846) 2022-11-02 12:51:32 +00:00
Unnunu
cf4eeecc13
msg stuff (#847) 
* matched several msg functions

* added images and set flags

* fix merge issue

* warning

* Update src/msg_data.c

Co-authored-by: Alex Bates <16batesa@gmail.com>

Co-authored-by: Alex Bates <16batesa@gmail.com>
 2022-11-02 21:30:07 +09:00
Ethan Roseman
5a668faf5d
Cleanup + misc decomp (#844) 
* hos funcs

* more hos funcs

* 4 more

* little clean

* 4 more

* find_similar_areas min, max params

* calc_partner_test_enemy

* nothing of substance

* battle_state_update_begin/end_player_turn

* fix

* warnings

* 2 omos

* 2 mo omo

* PR comments

* 3 mo omo
 2022-11-01 16:41:14 +09:00
Unnunu
76254641e5
non-world data migration (#841) 
* migrated 54360

* partially migrated 1AF2D0

* level up screen

* 1AF2D0 fully migrated

* cleaned up

* matched one audio function

* fixed warning

* PR comments
 2022-10-31 00:41:22 +09:00
HailSanta
b656ab90b4
area_flo (#839) 
* some reorg

* minor stuff

* flo_03

* flo_08

* flo_09

* flo_00

* flo_11/12

* flo_10

* flo 24/25

* flo 22/23

* flo 21

* flo_19

* flo 17/23

* flo 16

* flo 15

* flo_14

* flo_13

* area flo

* tik_06

* couple missed things

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-10-31 00:23:13 +09:00
mrshigure
1124ab3382
[Effects] More functions (#838) 2022-10-30 09:22:40 +09:00
Ethan Roseman
b64886fa8c
A couple map funcs (#835) 
* find_similar_areas improvement

* func_sizes in find_similar_areas

* 4 funqz

* another

* clean

* sams

* more sams

* osr, pra

* omo

* some obk

* cleanup + funcz

* wip

* warnings

* more

* 3 mo

* 7 more

* render_models (thanks Unnunu\!)

* cleanup

* PR comments
 2022-10-25 19:04:54 +09:00
mrshigure
ec25f51281
[Effects] Matching a couple of functions (#834) 
* [Effects] Matching a couple of functions

* Addressed comments
 2022-10-25 18:49:05 +09:00
mrshigure
b0afefafe0
[Effects] Matching 23 effect functions (#831) 
* [Effects] Matching 23 effect functions

* Addressed PR comments
 2022-10-18 19:07:21 +09:00
Unnunu
9a876d74f7
matched some gfx and model functions (#830) 
* matched 3 functions

* two iwa functions

* matched 4 model functions

* alpha decimal

* PR suggestions
 2022-10-18 07:58:52 +09:00
Ethan Roseman
77ee6c819b
More libultra and appendGfx_player_actor (#829) 
* libultra stuff

* vi stuff

* initialize.c

* bss stuff

* appendGfx_player_actor
 2022-10-17 18:51:58 +09:00
HailSanta
342887a94c
kmr + revisions (#828) 
* kmr_07

* more kmr

* kzn cleanup 1-9

* kzn cleanup II

* arn/mgm/gv/end revision

* iwa I

* bubulb spelling

* rest of iwa

* more kmr

* enough kmr_23 for now

* quick fix

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-10-17 16:46:24 +09:00
Ethan Roseman
c700116f41
BSS And Libultra (#823) 
* BSS refactor (the Wiseguy method)

* controller.c

* ldiv.c

* motor.c

* cartrominit.c

* more libultra matching + standardization

* more libultra stuff

* more

* clean

* warnings
 2022-10-16 07:24:05 +09:00
HailSanta
fab07c1c8c
area_dro (#821) 
* dro work

* nok varstash dupes

* p1

* rest

* documentin

* fixes

* imports sorted

* dro_01 cleaned up

* dro done

* kmr_06

* cleanup

* mergin

* warnings

* really fix warnings

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "ebadd64f07"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "ebadd64f07"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"

* dead map reorg I

* dead reorg II

* dead reorg III

* dead reorg IV

* got a func

* part of area_kmr

* oops

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2022-10-15 12:04:53 -04:00
mrshigure
5df977a353
[Effects] Migrating data + a couple of functions (#817) 
* [Effects] Migrating data + a couple of functions

* Addressed PR comments
 2022-10-12 09:28:15 +09:00
HailSanta
37e138402f
sbk done (#815) 
* sbk_02

* tex panner enum everywhere

* sbk_02 done

* choice cleanup

* todo imports

* ai reorg

* more reorg

* all sbk done

* all sbk

* reduce warnings

* really fix one

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-10-12 06:19:39 +09:00
HailSanta
2e8a4efa30
area_mim (#813) 
* area_mim

* fixes

* mim is FINISHED, you hear me? FINISHED

* slight improvement

* and this

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-10-10 18:02:54 -04:00
Unnunu
cc6f4d9a66
all battle maps done (#812) 
* make BS flags enum everywhere

* area_kpa

* fix merge conflicts

* area_kpa2

* fix merge conflicts

* area_kpa3

* area_kpa4

* matched all battle map functions and some others

* fix warnings
 2022-10-10 12:26:32 +01:00
Ethan Roseman
57c0421151
Map funcs (#811) 
* Many duplicate funcs, still around 41 left :P

* 19 duplicate funcs left

* Finished matching some duplicate funcs in world/area

* wipperz

* hos_01 funcs

* more funx

* 3 hos_04 funcs

* hos_04 funcs

* more hos

* tik_25 func

* mores

* progress

* clean

* mo

* meep

* PRs

Co-authored-by: Nasina7 <nasina987@gmail.com>
 2022-10-09 18:09:41 +09:00
HailSanta
7481bed65b
area_arn (#810) 
* area_arn

* iwa

* iwa cleanup

* run coverage

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-10-09 01:55:27 -04:00
Unnunu
41f5781a1d
tik2/tik3/kzn2/kkj battle maps (#808) 
* area_tik2

* area_tik3

* area_kzn2

* area_kkj

* added area refs
 2022-10-08 11:06:15 +01:00
HailSanta
f96542f52a
area_trd (#807) 
* EVT_PLAY_EFFECT

* area_trd data

* forgot a flag name

* fix bobomb spelling

* todo note

* fix macros

* fixed a couple more

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-10-07 14:45:58 -04:00
Ethan Roseman
59217b8cf8
A few battle/partner funcs (#804) 
* 5 battle partner funcs

* 3 battle funcs

* rodata fix for the fish

* PR comments
 2022-10-06 09:06:09 +09:00