pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 12:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,575 Commits 4 Branches 0 Tags 205 MiB
f8d6ccddc4
Commit Graph

450 Commits

Author SHA1 Message Date
HailSanta
c776b32bc6
generic_entity -> worker (#865) 
* workers

* broke out worker flags

* quick fix

* player sprite sets

* enum ws

* default -> world

* fix long line

* virtual entity split and minor cleanup

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-11-21 23:12:28 -05: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
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
Ethan Roseman
3f08935b05
Dead cod (#848) 
* 2 sams

* dead cod

* little more

* wip

* fix comments
 2022-11-03 01:01:00 +09: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
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
Ethan Roseman
46decfa258
Warning Fixies (#826) 
* warnings

* morenings

* more

* morz

* mor3

* PR
 2022-10-16 23:22:18 +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
Unnunu
b93928a013
two background gfx functions (#819) 
* matched tattle_cam_pre_render

* matched appendGfx_background_texture

* cleaning up

* fix one warning

* made ARRAY_COUNT and removed unnecessary cast
 2022-10-13 10:16:49 +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
f918be9c7e
matched 3 npc functions (#814) 
* 3 npc functions

* fixed warnings

* added padding

* code improvements
 2022-10-11 06:57:21 +09: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
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
HailSanta
cba14cc73d
end/mgm/tst maps (#798) 
* mgm_00

* mgm_03

* mgm_01 OK

* several btl_kzn2

* reflection cleanup

* more maps

* ok for now

* tst_10

* area tst

* pre mgm

* mgm_02 ok

* mgm_02 cleanup

* added IDs

* end_01 almost compiles

* end_01 OK

* end_01 partially done

* end_01 almost done

* end_01 done

* end_00 OK

* credits include cleanup

* end_00 initial cleanup

* new splits 1

* done end_00 cleanup

* areas mgm, end, tst

* whale stuff

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-10-03 20:56:24 -04:00
HailSanta
7b24d78503
area KZN and others (#795) 
* kzn_01

* cleanup

* kzn_05

* sound name

* missed evt_ptr

* splat change

* broken :(

* pan params for other maps

* works, but not great

* some kzn funcs

* documentin

* minor

* kzn_07 funcs

* more matches

* kzn_08

* kzn_06 fixup

* kzn_01_fix

* kzn 5

* kzn_07

* surprisingly OK

* some matches

* letter choice

* refactor

* more maps

* check

* first area done!

* now with extra bonus map

* kzn23

* some camera stuff

* entrances adjustment

* kzn_22 OK

* kzn_22 cleanup

* kzn_20 ok

* kzn_20 cleanup

* kzn_18 ok

* kzn_18 cleanup

* kgr_01

* area kgr done

* kgr_02 renames

* kzn_11

* kzn_17 ok

* kzn_17 cleanup

* kzn_04 done

* kzn_03 ok

* kzn_19

* bad kzn_19

* funcs idk

* figured a thing out

* kzn_19 ok

* some matches

* kzn_19 cleanup

* all kzn funcs

* merg'd

* some kzn btl matches

* vine field renames

* kzn cleanup 1

* kzn cleanup 2

* tab patrol

* trailing space patrol

* piranha anims split

* actor type sounds

* example

* requests + remove hardcoded dma entries

* split vine image

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2022-09-30 21:44:48 -04:00
Ethan Roseman
473bfa0692
dead_sqrtf, data migration, etc (#790) 
* more goods

* move dead map data to dir

* data migration / splatification

* new splat

* git subrepo pull --force tools/splat

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

* splat fix

* dead_sqrtf bye bye

* fix

* Clover comments

* comment
 2022-09-29 05:52:12 +09:00
HailSanta
3706178f3a
sprite names (#782) 
* initial variation support

* checkpoint

* pass 1

* second pass

* first few

* more

* change anim < 16 format

* next batch

* goomba anims

* more npcs

* safety

* success

* checkpoint

* last of dro

* a few

* checkpoint

* penguins

* conventions

* flowers A

* Flowers B

* partner animation support

* parter stuff

* id cleanup

* laki

* more laki

* laki done

* sushie

* goompa

* watt + bow

* bombette + parakarry

* goombario

* kooper

* goomba family

* spike jr troopa

* jr troopa

* world partners

* goombas

* lee

* chan

* the master

* toads

* mostly toads

* so many toads

* penguins

* nok npcs

* ch 2+3

* rest of chapters

* parade

* green mario harharhar

* battle bowser

* world bowser

* goomba king

* enough sprites for now

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-09-24 18:04:13 +09:00
HailSanta
9ef69b66cf
needed more DEG_TO_RAD (#773) 
* sneaky

* first batch

* DEG_TO_RAD

* some mac_04 funcs

* parasol done

* unk playerstatus fields

* sprite learnin

* new sprite stuff

* yay

* fix a warning

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-09-15 09:39:16 -10:00
HailSanta
f7e39c0802
player anim + collider surface types (#769) 
* player anim + collider surface types

* added default surface type

* remove unused flags and define surface mask

* revised action table

* checkpoint

* player sprite stuff

* remove currentAnim union

* more actions

* enough

* discharged

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-09-13 02:26:57 -04:00
HailSanta
70d3b7b3a8
msg names and more map data prep (#768) 
* minor NPC fixup

* most var type renames

* rest of var names

* remove deprecated

* var types cleanup

* fixed -> float 1

* fixed -> float 2

* fixed -> float 3

* fixed -> float 4

* evt fixed removed

* localvar shorthand

* missing byte names

* missing flag names

* evt var cleanup

* local var shorthand redux

* minor cleanup

* mario anim name

* item ranges cleanup

* player anim names

* all message names

* renames for existing

* remove unused enum

* squash msg ids

* again

* all message refs replaced

* area headers

* idk

* also merged

* remove superfluous parens

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-09-12 01:23:47 +09:00
Ethan Roseman
408c49cb75
one for the books (#765) 
* func_802A1518_78BB18

* btl_state_update_select_target

* wip

* btl_state_draw_select_target and WIP

* cleanup

* render_shaded_sprite and wip

* WIP/cleanup

* wip

* reset_player_status

* btl_state_update_player_move and cleanup

* func_802A2C84

* func_80242FE0 wip

* btl_state_update_normal_start and cleanup

* WIP

* btl_state_update_end_turn

* btl_state_update_enemy_striking_first

* cleanup

* cleanup & wip

* item_entity_update & cleanup

* update_item_entity_temp

* appendGfx_item_entity

* E21870

* mdl_create_mode

* cleanup

* func_802A9310_42D220

* area_flo2 battle funcs dun

* b_area_isk_part_1_ChompChainUpdate

* wip and rip

* clean

* partner_move_to_goal

* partner_get_out

* wip

* cleanup

* func_802BD1AC_31CD1C

* func_802BD754_31D2C4

* Cleanin

* fix func def

* UnkShadowFunc001

* a bunch of kpa funcs

* comment
 2022-09-08 21:21:07 +09:00
HailSanta
0df93d5b2b
prep for map dumping (#760) 
* prep for map dumping

* s p a c i n g

* advanced door + world statics

* sneaky tabs

* more world

* one more

* saved for later

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-09-06 11:26:53 -04:00
HailSanta
51d02cfbf5
actor decor stuff (#750) 
* big func

* this and that

* checkpoint

* more funcs

* enough

* formatting

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2022-08-26 19:13:57 +09:00
Ethan Roseman
7467b148d1
A few funcs (#751) 
* update_item_entity_collectable

* cleanup

* snibblets and bits

* CancelablePlayerRunToGoal and PlayerRunToGoal

* nonmatch

* PR comments and peach_star_beam effect

* PR stuffs
 2022-08-25 19:18:04 +09:00
Ethan Roseman
9d47d968f9
small and large boys (#749) 
* func_802DE780

* EnterPlayerPostPipe

* UnkFoldFunc

* smores

* func_802403C0_800C40

* 3 mo

* filemenu_draw_char

* btl_state_update_enemy_move

* prepz

* fix func thing

* btl_state_update_partner_striking_first

* PR comments

* PR comment

* warning
 2022-08-17 10:15:54 +09:00
HailSanta
d11054b41a
several actor funcs (#748) 
* no sun :(

* livin in the sunshine

* misc

* small fix

* splat fix

* comments + sparkles enum

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-08-17 10:04:23 +09:00
Ethan Roseman
ded1be2b17
Effect work and rodata migration (#747) 
* bombette_breaking WIP

* bombette_breaking

* migration & stuff

* spr funcs

* btl_state_update_begin_turn

* beginning effect data work

* effect rodata migration

* fix

* fixin

* breaking_junk

* args

* handle gfx

* trim yaml

* yaml cleanup

* gfx stuff

* git subrepo pull --force tools/splat

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

* water_splash gfx

* move decl down

* fix warnings
 2022-08-11 00:29:06 +09:00
HailSanta
f4efd09c80
isk + misc (#746) 
* isk + warning patrol

* minor reorg

* effect data union

* structs sorted and dummy structs added

* effect data cleanup + some end funcs

* two more PAL_PTR*

* temp

* flower fx

* pal_inc_c

* remove tabs

* isk_05

* blur union

* more isk

* isk funcs done

* sun stuff

* delete sun_main

* sun comments

* extra stuff

* actor decorations
 2022-08-10 14:36:38 +01:00
HailSanta
ba183f35b5
effect organization (#745) 
* isk + warning patrol

* minor reorg

* effect data union

* structs sorted and dummy structs added

* effect data cleanup + some end funcs

* two more PAL_PTR*

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-08-07 21:42:54 +09:00
HailSanta
1ce49b1ba9
audio odyssey (#744) 
* first pass

* seq cmd args retyping

* some SEF commands

* etc

* couple more SND commands

* more functions

* checkpoint

* five more

* another one

* more funcs + cleanup

* reverted unnecessary unions

* all SEF commands done

* a bunch more

* more!

* morrrrrrre

* almost done for now

* 99%

* 100

* few names and types

* reorg

* minor chnages

* miscmiscmisc

* yet more

* another day another func

* eth wip func_8004EC68

* some sym names

* retyping sound mgr fields

* minor renames

* D_80078400

* bigger func

* retypings

* enhanced drum info

* the evil is defeated

* merged

* prelim ambient sound func names

* audio frame

* checkpoint

* renames

* learnin bout sounds

* latest

* fix snd_load_BK_to_bank

* func_80056FA4

* warnings

* cosmetics

* func_800522A8

* struct reorg

* figured some stuff out

* much more info

* fx params

* cleanin up

* revert accidental changes to jp

* more accidental jp changes reverted

* misc names

* small stuff

* migrated all audio data

* checkpoint

* header reorg begins

* audio public/private headers

* fixed headers

* fixin warnins

* oops

* 51 fixed

* formatted binary data in 30450

* workwork

* cleanup

* misc

* flip macro arg order

* more names

* audio event triggers

* various

* sfx player cleanup

* start bgm player cleanup

* names names names

* priorities

* merlow

* misc enum vals

* rocking chair

* kmr_00 funcs

* enough

* restore delete jp file

* func_80055EB4

* fix func name

* addressed comments

* demoted a couple variables from global

* couple hidden panel things

* credits mostly

* credits dedupe in progress

* jump table repair

* 'finished' end dedupe

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2022-08-06 21:14:04 +09:00
Unnunu
ae64b1b5cc
entities (#741) 
* matched execute_render_tasks

* step_entity_command_list

* partially migrated entity data

* entity blueprints migrated

* matched create_entity

* matched entity functions

* SaveBlock

* SaveBlock and Switch

* switch model done

* matched shattering block functions

* shattering block models

* matched block funcs

* block models

* finish Block.c

* ItemBlock

* HeartBlock

* SuperBlock

* SimpleSpring

* HiddenPanel wip

* HiddenPanel

* Chest

* WoodenCrate

* BlueWarpPipe

* SignPost

* Padlock

* Boarded floor and padlocks

* BombableRock

* Tweester

* StarBoxLauncher

* wip

* ArrowSign

* BellbellPlant

* TrumpetPlant

* munchlesia wip

* Munchlesia

* UnusedBlock

* cleaning

* fix warnings

* git subrepo pull --force tools/splat

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

* PR suggestions

* created vtx splat segments
 2022-07-17 17:38:19 +01:00
Ethan Roseman
d31e0b8936
Engine cod (#738) 
* a couplez

* func & data cleaning

* sig

* move data and fix nonmatching

* Finish 17D6A0

* Don't use backticks in progress.py

* func_8025995C and clean

* 2 sprite funcs and cleanup

* 3 sprite funcs

* gather_magic_main

* 3 sprite funcs

* more sprite work and cleanup

* sprite funcs

* more clean

* UnkFloatFunc005

* warnings

* cleaning and os stuff

* 2 more funcs + warnings

* yaml work, move map data metadata to separate yml file

* apply_transform_to_children

* cleaningz

* PR comment
 2022-07-08 21:57:08 +09:00
Ethan Roseman
ec0ae12540
Partner, map, engine funcs (#736) 
* phys_should_player_be_sliding
* functions from brotenko
* UnkTrigFunc001
* trd_05
* IsPartnerXXX funcs
* nok funcs
 2022-06-26 11:21:38 +01:00
Ethan Roseman
0785fc6f93
Tiny funcs & cleanup & entity (#735) 
* baby funcs for ethy

* progress on pause_stats_draw_contents

* a5dd0 work + cleanup

* almost create_entity

* cleanup

* some funcz

* btl_show_message_popup (thanks Unnunu\!)

* more

* more cleen

* PR comments
 2022-06-17 18:21:13 +09:00
Ethan Roseman
e39f5874f6
Overlay 2 bss reorg (#733) 
* cleanup + almost done with _use_partner_ability

* _use_partner_ability and bss bonanza

* gCameras fix

* cleanup

* cleanup
 2022-06-14 01:34:22 +09:00
Unnunu
e324092e0a
entity models and some gfx functions (#731) 
* decomp 7 functions

* match func_80138E54

* matched render_transition_stencil

* renames

* fix warnings

* fix two warnings
 2022-06-13 02:22:06 +09:00
Ethan Roseman
bae34c46ed
Upgrade to splat 0.9.0 (#730) 
* changes for splat 0.9.0

* wip

* git subrepo pull --branch=develop --force tools/splat

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

* OK

* big_snowflakes gfx data

* Jenkins?

* cleanup

* debuff effect gfx data

* fix

* more effect gfx data

* dlabel

* git subrepo pull --branch=experiment --force tools/splat

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

* .

* git subrepo pull --branch=experiment --force tools/splat

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

* flower splash/trail gfx

* throw_spiny gfx

* disable_x and butterflies gfx data

* draw_coin_sparkles

* Warnings, cleanup

* cleanin

* attempt at test_item_player_collision

* more gfx + cleanup

* more effect gfx

* func_8002D160

* update update_symbol_addrs and symbol_addrs

* git subrepo pull --branch=develop --force tools/splat

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

* git subrepo pull --branch=master --force tools/splat

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

* fix

* fix regression

* Add rabbitizer to requirements

* warnings

* symbol_addrs fixes
 2022-06-13 00:33:32 +09:00
Unnunu
accf5a60f6
Animations (#727) 
* decomp 5 animator functions

* animation script disasm

* cleaning up

* improvements in animation disasm

* TODO
 2022-06-09 22:49:57 +09:00
Unnunu
59119c0949
item entity functions and a few others (#725) 
* matched 4 functions
* matched 2 item entity funcs and migrated data
* removed default case and fixed lights def
 2022-06-09 00:36:32 +01:00
Unnunu
76187e5c3b
3 more battle maps (#724) 
* area_pra2

* finish

* sound enum

* renamed enum member

* fixed alignment

* area_pra3

* area_sam

* area_sam2
 2022-06-06 21:34:45 +09:00
Unnunu
b4ee2f8a75
intro_state, evt and decoration tables (#718) 
* matched appendGfx_intro_logos

* create 38F00.c

* 3 evt functions

* wip

* match func_80259AAC

* match 8 decoration funcs

* fix warnings

* fix merge issue

* cleaning up

* renamed data file

* PR suggestion
 2022-05-29 00:15:51 +09:00
Ethan Roseman
c0694d26f1
House cleaning (#719) 
* various cleanup

* further cleanup

* some cleanup + matches

* clean
 2022-05-28 20:13:30 +09:00
Ethan Roseman
021592d219
Misc decomp 70 (#716) 
* aura_appendGfx

* 3 more action commands

* fire_shell

* hammer, hurricane

* spiny_surge

* data stuff, cleanup, whirlwind

* warnings

* water_block data and func

* water_block

* effect stuff cleanup

* big_snowflakes effect

* data cleanup, fpr abi regs

* 2 battle item funcs + data

* 2 mo

* shooting_star func

* 3 16F740 funcs

* btl_state_update_end_battle

* map funcs

* more dedupe

* cleanin

* draw_entity_model_C/D

* effect butterflies, btl state funcs

* it is done

* it is done

* PR comments, some cleanup
 2022-05-27 22:03:19 +09:00
Unnunu
6815d6b296
matched some battle movement functions (#714) 
* match 5 functions

* move update_lerp_battle declaration

* PR suggestions
 2022-05-22 16:48:09 +09:00
HailSanta
1e91e60cb6
rest of 5B320 (#713) 
* rest of 5B320

* whitespace

* fix warnings

* split 5B320.c with includes

* ICON_anim_heart_piece_palette

* requested changes

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-05-21 13:56:54 +09:00
HailSanta
5b7f18a2ca
start chest inc + misc cleanup (#711) 
* start chest inc + misc cleanup

* popups

* 5b320 OK

* finish HudScript retyping

* item hud scripts

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-05-18 16:53:28 +09:00
Ethan Roseman
179998098c
Misc decomp 53 (#703) 
* some btl_state work

* msg_draw_speech_bubble

* cleaners

* btl_state_stuff

* btl_state_update_next_enemy wip

* btl_state stuff

* disable_x fx + cleanup

* wip

* fxstuff

* path funcs & cleanup

* clean

* model_api funcs

* two action commands

* action_cmd progress

* UnkFunc001

* air raid func

* cleanup, data migration, goodies

* remove data file

* git subrepo pull --force tools/splat

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

* fix build

* more cleanup

* clean

* PR comments
 2022-05-05 23:08:16 +09:00
HailSanta
aee5626e5b
world AI (#701) 
* monty mole AI pt 1

* monty mole AI #2

* enum values for evt priority and flags

* enemy ai flags

* done monty mole + partner enums

* removed union for partner action state

* missed parter action states + cam move flags + entity collision bit

* basic ai

* piranha plant stuff

* attack ahead

* consistent hitbox names

* idk

* organized piranha plant

* delete matches

* start fuzzy

* naming

* bzzap pt 1

* bzzap 2

* bzzap names done

* rename bzzap to flyingAI

* complete flying names

* done for today

* file reorganizing

* world AI

* starting clubba dedupe

* suggested changes

* bullet bills

* sentinel start

* dedupe sentinel complete

* sentinel AI done

* melee ai organization

* piranha plant dedupe

* resolved some bad dead syms

* patrol start

* patrol AI almost done

* enough

* more ai work

* clean up clubba ai enum

* dedupe all clubbae

* started cleft extraction

* ready to dedupe cleft

* dedupe one cleft

* iwa_04

* iwa_01

* iwa_02

* ai state file reorganization

* enemy anim enum

* extracted shy guy

* dedupe shy guy ai

* shy guy patrol ai

* done shy guy ai dedupe

* added NON_MATCHING wrap

* ai etc

* more dead ai

* most dead ai merged with living

* lakitu etc

* paratroopas

* fix warnings

* fix other warning

* ParatroopaAI

* lakituAI parameter fix

* dead_flo_13 debug strings

* misc map matches

* flying magikoopa start

* name npc field

* lungeAI renamed to tackleAI

* magikoopa ai foothold

* extrated one magikoopa

* starting clubba dedupe

* addressed PR comments

* consolidated magikoopa helper funcs

* misc map stuff

* flying magikoopa dedupe

* zipline funcs

* delete matched

* grind out another 0.05%

* started letter delivery dedupe

* more delivery dedupe

* special delivery

* rest of letter delivery

* slight delivery reorg

* delivery func names

* cleft doc start

* name enemy field

* more renamins

* unk_28.f

* changed field names to facilitate renaming

* done cleft cleanup

* hopping ai

* cleanup some ai

* name field + patrol reorg

* filled out NpcAISettings fields

* assembling ai includes

* elimated state files

* remove X32 for alertOffsetDist

* removed other NpcAISettings union

* new NpcAISettings for UnkAI_4

* stationary AI cleanup

* smalls

* 0 new warnings

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2022-04-29 13:32:16 +09:00
ThreeMustyFears
80f5e18fc9
Match calc player damage enemy (#698) 
* match calc_player_damage_enemy

* run coverage

* changes

Co-authored-by: ThreeMustyFears <>
 2022-04-19 03:03:12 -04:00
Kevin Klions
13cc6f46e5
func_80240790_BBD930 (#697) 
* matched func_80240790_BBD930

* removed unncessary variables

* deleted matched assembly function

* changes from comments

* fixed
 2022-04-19 02:15:33 +09:00
ThreeMustyFears
41108b78b5
Match calc partner damage enemy (#695) 
* match calc_partner_damage_enemy

* run coverage

* some var name changes

* remove typedef from enum

* fix warning

* remove casts

* saw a target flag in a comment

* Assert and script enums

Co-authored-by: ThreeMustyFears <>
 2022-04-18 17:56:44 +09:00
HailSanta
cfe089af10
monty mole AI + various enums (#694) 
* monty mole AI pt 1

* monty mole AI #2

* enum values for evt priority and flags

* enemy ai flags

* done monty mole + partner enums

* removed union for partner action state

* missed parter action states + cam move flags + entity collision bit

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-04-18 00:36:37 +09:00
Ethan Roseman
3a28a3f505
Physics (#682) 
* various

* collision_main_lateral

* phys_adjust_cam_on_landing

* phys_main_collision_below

* 77480.c dun

* 7fd10 funcs

* 7bb60 funcs

* warningz

* map stuff

* PR comments
 2022-04-11 15:34:35 +09:00
HailSanta
5f47e1291f
Santas-workshop -- toad houses and push blocks (#681) 
* toad house

* push blocks

* requested cleanup

* clean

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2022-04-10 17:37:13 +09:00
HailSanta
42355f53c2
Santas Super Blocks (#677) 
* misc msg etc

* super blocks 1

* super blocks 2

* super block dedupe

* super blocks x

* super block isolated

* one dead super block func left

* dead maps fixed

* remove unnecessary funcs

* merged includes for pipes

* pipe data and EVT_GROUP enum

* fixed dead

* fix warnings

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <eroseman@basistech.com>
 2022-04-08 15:10:12 -04:00
Ethan Roseman
29acf47328
_update_message (#676) 2022-04-07 16:51:21 +09:00
Ethan Roseman
02d678b543
Npc funcs, fio.c, and others (#674) 
* filemenu_choose_name_handle_input

* filemenu_choose_name_init

* filemenu_main_handle_input

* update symbol_addrs

* filemenu_draw_contents_copy_arrow

* cleanup

* dusting

* npc funcs

* fio.c finished

* Cleanup

* warnings

* Cleanup + SaveDataHeader struct

* re-add decl
 2022-04-05 21:53:40 +09:00
HailSanta
b7f7e4c96d
Santas workshop (matched area_mgm) (#673) 
* mgm_01 start

* strange issue

* blah

* rodata fix

* done with mgm_01 + misc cleanup

* almost done mgm

* minor issues with last 3 functions

* match help

* mgm code done

* proper msg pal usage

* fix warnings

* fix more warnings

* ive been warned

* requests

* area_kgr

* battle cam symbol names

* msg cleanup work

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2022-04-05 18:52:06 +09:00
Ethan Roseman
d0a7655779
Various dompin (#672) 
* partner funcs

* land.c

* filemenu_update

* 190A10.c

* hammer.c dun

* prog rock

* various funcs

* moving

* update_item_entities

* filemenu_yesno_handle_input

* cleanin

* sweeping

* PR comments
 2022-03-30 21:07:13 +09:00
Unnunu
9e0aab9e6d
camera functions and zone collision data (#671) 
* match 3 functions

* match 4 camera functions

* fixes

* camSettings type enum

* PR suggestions
 2022-03-28 18:29:47 +09:00
HailSanta
7dbd1770ec
Santas workshop (#670) 
* initial name changes

* hud_element function names

* missing player data fields

* entity cleanup

* missed a few things + starting action states

* some world partner cleanup

* idle/walk/hammer + peach cooking stuff

* clean

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2022-03-26 20:47:10 +09:00
Ethan Roseman
3ff0057674
Match-a-palooza (75% functions, 60% bytes) (#666) 
* aura_update

* CompareFloats

* UnkBufferFunc

* SetPlayerStatusPosYaw

* SetNpcPosYaw

* IsAOrBPressed

* UnkEnemyPosFunc

* UnkNpcAIFunc47

* UnkFunc57

* UnkFunc58

* UnkFunc59

* delete unneded data

* UnkFunc60

* UnkFunc61

* UnkNpcAIFunc48

* UnkNpcAIFunc49

* UnkNpcAIMainFunc7

* lee func

* cleanup

* UnkFunc62

* UnkNpcAIMainFunc8

* SixFloatsFunc

* UnkNpcAIMainFunc9 part 1

* UnkNpcAIMainFunc9 part 2

* UnkNpcAIMainFunc10

* warnings
 2022-03-20 19:12:30 +09:00
Unnunu
b922ddd6f3
hud_element.c (#660) 
* ALT_clear_hud_element_cache

* clear_hud_element_cache

* match 3 funcs

* hud_element_update

* draw_rect_hud_element

* func_801413F8

* HudElementFlags

* flag names

* some improvements

* fix warnings

* debuffIcon TODO

* PR suggestions
 2022-03-12 18:49:32 +09:00
Ethan Roseman
9cd911765d
File menu & more (#658) 2022-03-10 09:55:38 +00:00
JoshDuMan
d86d15bfd5
Match a number of functions and introduce anon unions (#655) 
* Match a number of functions and introduce anon unions

* Fix warnings

* Ethan's comments
 2022-02-25 00:12:33 +09:00
Ethan Roseman
48808572d9
debuff effect & 19FAF0 funcs (#653) 
* debuff.c

* 19FAF0 funcs

* clean

* some API stuff

* clean

* PR
 2022-02-22 01:05:36 +09:00
JaThePlayer
b427897581
Decomp RestorePreDefeatState + 2 more, add enum for RushFlags (#651) 
* 3 funcs

* Rename rushesFlags to rushFlags, rename the RushFlags enum values
 2022-02-20 01:46:27 +09:00
Ethan Roseman
e98ea95df4
state_title_screen & camera funcs (#650) 
* state_title_screen funcz

* camz

* line

* PR comments and matches (thanks Unnunu & Wiseguy)

* enumz

* gloop
 2022-02-19 23:39:34 +09:00
Ethan Roseman
d02e72e78f
Item funcs & ctx fixes (#649) 
* stuffs

* func_80136A08

* C50A0

* WIP

* clean

* fix context issues

* clean
 2022-02-18 02:11:27 +09:00
Unnunu
546152b69e
match windows.c and migrate data for draw_box (#646) 
* match 9 functions

* draw_box data

* fix warnings

* fix

* fix warnings again

* PR suggestions

* replace int literals with enum values

* two more ints replaced
 2022-02-13 17:19:59 +09:00
Ethan Roseman
3a578399fb
calc_item_damage_enemy and some others (#641) 
* SFX funcs, configure fix

* the actual rename (oops)

* 3 sprite funcs

* 2 funcz

* calc_item_damage_enemy and cleanup, others

* cleanup

* Warnings

* clean fx_api

* match npc_raycast_general and name npc_collision.c

* PR comment
 2022-02-09 03:33:05 +09:00
Unnunu
650d52d16a
Pause menu (#642) 
* start data migration

* decomp 12 functions

* make initial bss

* pause_tutorial_draw_contents

* pause_init

* decomp 3 functions

* decomp pause_tabs

* pause_badges_draw_contents

* pause_items

* pause_partners

* pause_spirits

* pause_map

* pause_gfx and pause_styles

* fixing warnings

* fixed all warnings

* bss

* rename bss fields

* make static from bss

* renaming global vars

* finish

* small fix

* PR suggestions
 2022-02-09 03:24:51 +09:00
Ethan Roseman
3bd5a9d91e
Goods and Services (misc decomp PR from eth number 335) (#629) 
* an end func

* 2nd segment bss file added

* hud_element work

* some renaming, set_hud_element_scale

* 2 hud_element funcz

* remove more unneeded undefined_syms

* bss 3, PR comments

* fx_134

* func_80200080

* 4 funx

* fix shtuff

* a func

* create_actor

* func_80263064

* initialize_battle, some stuff, and cleanup

* clean

* NL
 2022-01-20 22:08:24 +09:00
JoshDuMan
44dd710d54
Disassemble 3 Battle Maps (#622) 
* Disassemble ISK Part 2 Battle Map

* Disassemble MIM BTL Map and fix script maps

* Delete mim

* Disasm Script

* Disassemble ARN Battle Map

* Remove files

* Remove struct

* Handle comments and merge conflicts
 2022-01-17 02:22:23 +09:00
HailSanta
4e33a016eb
struct renaming and trigger/entity cleanup (#623) 
* rename static structs to blueprint

* evt structs renamed

* renamed HudElementAnim to HudScript, worked on triggers

* fix Trigger/TriggerBP fields and entity cleanup

* entity data cleanup 1

* block

* blue warp pipe

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-01-16 22:28:09 +09:00
HailSanta
41c304137d
hud and item script names (#617) 
* hud script names 1

* more hud elements!

* battle hud scripts

* names for some item globals

* hud elem scripts for items

* item entity names

* cleanup and missing struct in partners

* more partner cleanup

* battle stuff

* fix some warnings?

* resolve stuff

* fix symbol_addrs

* minor fixes

* splat pause_icon_table.data.s

* glabel -> dlabel

* rom addrs

* fix splat stuff

* data splits, warnings

* split more hud scripts

* added symbols for battle menu

* finished hud scripts fot 415D90

* entity documentation

* entity documentation

* more consistent name

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
 2022-01-15 03:54:45 +09:00
Ethan Roseman
e60e5fccd1
BSS round 2, hud_element.c funcs (#613) 
* an end func

* 2nd segment bss file added

* hud_element work

* some renaming, set_hud_element_scale

* 2 hud_element funcz

* remove more unneeded undefined_syms

* bss 3, PR comments
 2022-01-11 03:25:06 +09:00
Unnunu
559007d861
Match collision functions (#609) 
* match allocate_hit_tables

* load_collision

* load_hit_data

* parent_collider_to_model

* update_collider_transform

* test_up_ray_collider

* test_ray_triangle_general

* test_down_ray_triangle

* test_up_ray_triangle

* test_ray_colliders

* test_ray_zones

* test_ray_entities

* func_8005DB00

* rename everything

* follow codyng style

* fix

* PR suggestions

* remove p prefix

Co-authored-by: Sergey Zorkin <szorkins@gmail.com>
 2022-01-08 19:11:20 +09:00
HailSanta
acf6b92313
more fields and name consistency (#603) 
* npc fields

* npc and actor naming

* missing hit sounds + naming consistenct

* added partner syms and player spin struct

* requested changes

* organized Vec structs

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
 2022-01-05 20:05:49 +09:00
JoshDuMan
55228bd3a7
Fix a few warnings (#601) 
* .

* Externs

* Fix a few warnings

* __osGetCause

* Comment

* Ethan
 2022-01-04 02:36:01 +09:00
HailSanta
13a2f40f2a
Update GameStatus fields (#595) 
* renamed a few fields in game status

* created constant for MAX_GAME_TIME

* names for rumble funcs

* suggested changes

* created sound out enum

* function naming test

* actorClass consistent name

* water block effect field

* battle_status fields

Co-authored-by: Clover <cloverhax@gmail.com>
 2022-01-03 18:56:30 +09:00
JoshDuMan
5962ce37fd
Disassemble KMR 2 Battle (#597) 2022-01-01 08:08:04 -05:00
Ethan Roseman
5cb9183779
Effects, includes (#589) 
* effect_13

* effect_14

* most of effect_15

* clean, standardize effects

* fx_16 wip

* UnkNpcAIFunc35

* includes

* UnkPosFunc2

* UnkNpcAIFunc36

* PR comments
 2021-12-30 14:14:55 +09:00
Ethan Roseman
15b6cb398c
Assorted Decomp Across The Galaxy (#574) 
* popup_menu_update & other

* a bunch of 190B20

* starting load_player_actor

* load_player_actor

* blorp

* load_partner_actor

* fx_11_main

* fx_11 done

* cleanup

* fx_12

* 3 encounter_api funcs

* encounter_api done

* some 20ec0 funcs

* clean

* PR comments, warnings

* name btl_actorHomePositions

* PR comments
 2021-12-28 20:43:24 +09:00
Rainchus
33457751e2
decomp appendGfx_player, fix warnings in 77480.c file (#572) 
* decomp appendGfx_player, fix warnings in 77480.c file

* small style fixes

* fix action state enum and make use of enum
 2021-12-27 22:00:13 -05:00
JoshDuMan
2f23f46775
Match func_802549F4 (#571) 
* Match func_802549F4.

* Delete func_802549F4.s

* Match func_80254C50

* s8

* Delete func_80254C50.s

* Update functions.h

* s8 again

* Trying out github.dev

* Fix build?

* Match func_802550BC
 2021-12-26 20:29:29 +09:00
Rainchus
095680b006
Duplighost battle functions (#556) 
* decomp some functions in 1AC760.c

* broken data migration

* data nearly migrated, rodata in laki file is null

* fix building and laki data migration

* data migration for kpa3 WIP

* add missing data

* decomp duplighost functions and duplicates

* fix some warnings

* resolve issues

* fix warnings

Co-authored-by: Brotenko <brotenko@gmail.com>
 2021-12-25 10:34:55 +09:00
Alex Bates
585c0dc428
Name and document btl_init_menu_* funcs (#567) 
* btl_init_menu_*

* https://c.tenor.com/D0mk5R5x1G8AAAAC/cat-fat-cat.gif
 2021-12-24 23:21:03 +09:00
JoshDuMan
f940e6188c
Match enable_actor_blur (#566) 
* Match enable_actor_blur

* Delete enable_actor_blur.s

* resolve issues

Co-authored-by: Brotenko <brotenko@gmail.com>
 2021-12-24 23:09:03 +09:00
JoshDuMan
2b6323a6b2
Match check_for_interactables (#553) 
* Match check_for_interactables

* Delete check_for_interactables.s

* Update enums.h

* unk_C8 -> Npc*

* Update 77480.c

* Update 77480.c

* Update 77480.c

* Update 77480.c

* Update 77480.c (#7)

* Update functions.h

* Merge branch 'master' of https://github.com/pmret/papermario into arn

* Fix build.

* Update src/77480.c

Co-authored-by: Alex Bates <hi@imalex.xyz>

* Comments

Co-authored-by: Alex Bates <hi@imalex.xyz>
 2021-12-17 23:04:54 -05:00
Alexander Faßbender
967427ba97
Decomp misc funcs (#546) 
* decomp misc funcs

* cleanup on MakeShop and initial work on ShowShopOwnerDialog

* match ShowShopOwnerDialog

* decomp misc funcs

* cleanup on MakeShop and initial work on ShowShopOwnerDialog

* match ShowShopOwnerDialog

* resolve issues

* resolve warnings

* Update src/world/script_api/7E0E80.c

Co-authored-by: Alex Bates <hi@imalex.xyz>

Co-authored-by: Alex Bates <hi@imalex.xyz>
 2021-12-15 20:12:43 +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
Rainchus
d9c72e432b
Match more overworld partner functions (#541) 
* decomp watt overworld functions

* fix struct that was wrongly changed

* run coverage.py

* requested changes for watt.c and decomp a function from sbk_02

* run coverage.py

* more style changes

* decomp all functions in 92A2B0.c

* run coverage.py

* use map_var instead of hex constant, other style changes

* pull sbk_02.h changes

* ...actually merge master correctly

* decomp most functions in nok_04

* decomp most of 9EDBF0.C, fix warnings in UnkFunc41.inc.c and warnings/decomp in lakilester.c

* run coverage.py

* code review changes + few extra functions

* decomp lakilester functions and fix style in other files

* decomp more laki overworld functions

* add close match for func_802BDDD8_321928

* requested changes

* more requested style changes

* style changes

* last of review changes

* another small style fix

* ...accidentally deleted the f on a float immediate

* decomp world sushie/watt files

* run coverage.py

* small style fixes

* fix 2 warnings in watt.c

* decomp kooper world functions

* requested style changes

* couple more style changes

* decomp kooper world functions

* last style changes

* decomp more kooper world functions

* match world kooper file except 2 non_equivalent

* non matching of last world bow function

* migrate data.s file to bombette.c, also decomp various overoworld partner functions

* match more overworld partner functions

* style changes

* update variable names

* some requested changes done

* add enums and other cleanup to overworld partner files

* run coverage.py

* add a space to watt file

* remove raw pointers from partner files plus other requested changes

* remove goompa raw pointer

Co-authored-by: root <root@DESKTOP-HK751F2.localdomain>
Co-authored-by: Rainchus <Rainchus@github.com>
 2021-12-06 21:25:43 +09:00
JoshDuMan
72b2e593f6
Match func_8026EBF8, LoadFreeItemScript, and LoadItemScript (#543) 
* Match func_8026EBF8

* Delete func_8026EBF8.s

* Match LoadItemScript

* Delete LoadItemScript.s

* Document more of DecorationTable

* Fix warning.

* Comments

* Comments

* Match LoadFreeItemScript

* Delete LoadFreeItemScript.s

* doublke

* Alex GOAT

Co-authored-by: Alex Bates <hi@imalex.xyz>

Co-authored-by: Alex Bates <hi@imalex.xyz>
 2021-12-04 13:34:49 +09:00
Ethan Roseman
755c83a363
fold_* , effect_10, and other assorted decomp (#535) 
* work on appendGfx_message

* :OK:

* indentation

* message window states

* SetEntityCullMode & some of appendGfx_model

* 9 smalls

* 2 more

* 2 mo

* update_player_actor_shadow

* EffectInstanceData rework

* some shtuff

* effect_10 dun

* wip

* wip

* wipz

* rename

* progz

* remove wip work for appendGfx_model

* PR comments

* Alex comments

* tomorrow for sure

* eventually
 2021-11-19 23:31:28 +09:00