pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-13 22:43:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,428 Commits 5 Branches 0 Tags 205 MiB
99ddd82d60
Commit Graph

527 Commits

Author SHA1 Message Date
Ethan Roseman
99ddd82d60
Shiftability / symbol fixes (#925) 
* shiftability / symbol fixes

* temp fix to hos_05
 2023-01-28 19:47:26 +09:00
Unnunu
bb1d0ad1e5
Dispatch damage event partner (#923) 
* matched dispatch_damage_event_partner

* cleaning up
 2023-01-27 19:26:30 -05:00
HailSanta
b5052b5bd0
most of pra (#924) 
* halfway

* five more

* mergin

* standardize foliage model lists

* alignment

* cleanup

* include reorg

* additional reorg

* more pra

* pra_19

* misc sprite

* missed sprite stuff

* enum value names

* FoldTypes

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-28 07:26:26 +09:00
Ethan Roseman
dfff7bce1a
squirt effect done, 0 warnings, undefined_syms cleanup, wip (#922) 
* warnings & WIP

* 0 warnings

* squirt_appendGfx && gfx data (squirt effect dun)

* undefined_syms cleanup

* clean

* don't die when no warnings
 2023-01-25 23:06:57 +09:00
HailSanta
a03510d8a6
area_omo (#921) 
* omo_09

* omo_11

* part of omo

* 08/10/13

* more

* train toad rename

* hmm

* guard ai

* omo_02

* fix partner anim enum

* omo_15

* omo_12

* last omo

* pra_15

* reflections

* under 100 maps left

* cleanup floats

* horse

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-25 11:33:20 +09:00
Ethan Roseman
8b27ed01ef
3unks (#920) 
* chomp_drop_appendGfx

* stars_shimmer_main & stars_shimmer_update

* clean
 2023-01-24 12:33:04 +09:00
MS-DOS1999
ebe5fbd0f6
match update_camera_mode_4/6 (#919) 2023-01-23 23:46:51 +00:00
Ethan Roseman
bfbb7d1f98
Twuncs (#917) 
* wip

* func_80240000_D2BD30

* npc_find_standing_on_entity

* wip

* cleanup

* warning

* close

* anotha one

* spr_allocate_components

* func_80243FC4_A2E204

* func_80240B4C_B2108C

* clean
 2023-01-23 00:35:43 +09:00
Unnunu
9c183ae48e
two audio functions (#918) 
* 2 audio functions

* cleaning up

* PR comments
 2023-01-23 00:35:15 +09:00
HailSanta
858eb4c19e
fix map warnings (#916) 
* omo_17

* sam_06

* sam_06

* hos_02

* hos_03

* shops

* star kid name fix

* shop dialogue

* nok_11

* nok 14/15

* small fixes

* ready

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-21 17:14:46 +09:00
Ethan Roseman
0cee144b18
func_802401A0_DDC9D0 & save/load tattle flags (#915) 
* func_802401A0_DDC9D0

* func_802428C8_A2CB08

* cleanup

* wip

* warning

* save/load_tattle_flags

* PR comments

* idnex
 2023-01-19 10:33:52 +09:00
Unnunu
0e2d3b96d4
matched 2 functions (#914) 
* matched 2 functions

* PR comment
 2023-01-18 15:58:17 +09:00
Ethan Roseman
a773da8c2d
The World (#913) 
* wip & cleanup

* progress

* two omo funcs

* cleanup

* func_80243F10_9DAF30

* func_80244078_9DB098

* the rest of ItemChoice_WaitForSelection

* more work

* func_80241DAC_D3C37C
 2023-01-17 11:58:57 +09:00
pixel-stuck
ddebe5eb64
Big steps toward ROM shiftability (#912) 
* shiftability work

* Cleanup

* fix build

* Fix sprite shading profile when shifted

* fix overworld items icons, message icons, and corrupted bowser graphics on the title screen

* add shift flag to configure.py

* restoring ifdef stuff

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2023-01-16 23:03:23 +00:00
HailSanta
935fd14530
misc battle cleanup III (#911) 
* misc

* fix one type

* yeah

* misc

* all substates

* almost done

* renames

* comments

* a couple maps

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-15 18:22:41 +09:00
Unnunu
2f79b35772
model functions (#910) 
* matched appendGfx_model

* 3 more

* fog modes

* cleaning

* fix

* fixed macro name

* FogModes enum

* extra tile enum renamed
 2023-01-13 16:56:28 +09:00
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
MS-DOS1999
18f522c075
Matched func_802BD758_3184A8 and Matched func_801363A0 (#905) 
* func_802BD758_3184A8 Matched

* Matched func_801363A0

* clean

* clean style 1

* clean style 2

* clean style 3

* clean style 4

* small parens

* more clean

* more clean 2
 2023-01-10 23:11:40 +09:00
HailSanta
cc3a146066
battle substates cleanup I (#906) 
* cleanup in progress

* celebrate done

* progress

* etc

* substate enums done

* flag fixup

* brevity

* msg name fix

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2023-01-10 15:33:09 +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
Unnunu
2514e13635
btl_state_update_player_menu (#902) 2023-01-05 19:43:31 +00: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
Unnunu
1cea652202
sprites and effects (#900) 
* firework_rocket

* confetti_main

* 5 sprite funcs

* cleaning up

* minBlurAlpha

* everything is right
 2023-01-04 00:57:48 +09: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
Ethan Roseman
cfb36ee36e
5uncs (#895) 
* 2 dogs

* pause_stats_draw_contents

* Cleanup

* is_ability_active :confetti:

* WIP

* spawn_drops

* PR
 2022-12-29 14:48:27 +09:00
Unnunu
e6de400efa
Draw box (#897) 
* wip

* matched draw_box

* cleaning up

* renamed file

* fixed warning

* PR comments
 2022-12-29 14:08:13 +09:00
Unnunu
207f4400b6
matched 4 obk functions (#896) 2022-12-28 14:30:30 +00: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
cf2099772d
10 functions (#893) 
* fixins

* 2 dogs

* a few funcs + progress

* 3 more

* clean & PR comments
 2022-12-21 17:15:21 +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
Unnunu
c081feb766
96% (#890) 
* matched func_802B7450_E20560

* libultra done

* 2 more

* 2 funcs

* fix

* moved macro to c file
 2022-12-17 23:19: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
Unnunu
debdd6c4e6
matched 2 model functions (#887) 2022-12-14 13:03:51 +00:00
Ethan Roseman
10c94b1cb3
a match for the clover (#886) 
* warning

* func_80240098_BBD238
 2022-12-13 18:18:15 +09:00
Unnunu
a85b573617
3 effect functions (#885) 
* 3 funcs

* cleaning up
 2022-12-13 12:11:53 +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
pixel-stuck
ff3835672d
water block effect matched (#883) 
* more effects

* delete asm

* PR comments

* More PR comments

* fully match water block effect

* cleanup for PR

* PR comments

* define for components
 2022-12-12 15:13:49 +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
Unnunu
abd49f653a
matched status_menu_draw_stat (#880) 
* status_menu_draw_stat

* fix warning
 2022-12-08 01:12:25 +09:00
Ethan Roseman
5b5b8c579f
95% (#881) 
* fixes

* 2 nusys funcs

* warnings

* appendGfx_npc_blur

* clean

* cleanup, standardize button macro
 2022-12-07 17:39:22 +09:00
HailSanta
46add495eb
move actor (#879) 
Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-12-06 19:19:01 +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
Spencer Vaughn
40c2b9be4d
snaking_static effect (#876) 
* snaking_static_main: Matched

* snaking_static_update: Matched

* snaking_static: PR cleanup
 2022-12-04 11:39:46 +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
Jacco Potters
3e0e550eb3
decomp some effect funcs in hos_05 (#873) 2022-11-28 06:06:33 +00:00