Commit Graph

1879 Commits

Author SHA1 Message Date
alex
d2875030a3
Name files and avoid use of X32 type for functionTemp (#314)
* name entity files

* name encounter_api

* abolish X32
2021-07-16 21:22:21 +09:00
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
alex
7cf8bf0b88
Split charsets, matching load_font and load_font_data (#312)
Also use snake_case for splat_ext types
2021-07-16 10:28:37 +01:00
Ethan Roseman
f02743e1cb
Tidying and msg.c work (#311)
* undefined syms cleanup

* moving all remaining undefined funcs to dead_syms (as they're dead)

* Rename and update MessagePrintState

* msg wip

* B9D60 -> msg

* msg stuff

* .

* PR stuff
2021-07-13 22:43:14 +09:00
alex
a854c70a5c
Match dma_load_string (#310)
* match dma_load_string

* fix dma_load_string warnings
2021-07-13 21:45:01 +09:00
alex
31b0c3f685
Merge 4DF30 into battle/battle (#309)
* merge 4DF30 into battle/battle

* nomatching load_battle

* oops
2021-07-13 21:33:29 +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
6db3503055
Linker section labels (#306)
* properly use section start/end labels for overlay structs

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "cc58f64954"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "cc58f64954"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
2021-07-12 20:07:34 +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
6484e4883d
Work towards fixing alignment issues (#304) 2021-07-09 15:34:12 +01:00
alex
9dce90da41
Move D_80077908 to state_logos.c (#303)
* rm f270_len_1190.c

* state_logos data
2021-07-09 22:00:35 +09:00
alex
6da5c0e41b
Name many files (#302)
* get_spirits_rescued: use enum StoryProgress

* rename 6240_len_c00 to fio

* rename 1b40_len_20b0 to main_loop

* rename 3bf0_len_6f0 to input

* rename 42e0_len_1f60 to rumble

* rename 6e40_len_500 to curtains

* rename 7340_len_b00 crash

* match func_8002C890

* intro_logos and state_battle split

* rename e940_len_290 to state_startup

* split state_logos and state_pause

* state_file_select

* state_world, state_intro

* state_title_screen

* state_demo

* split game_modes and camera
2021-07-09 01:50:23 +09:00
Ethan Roseman
03eccf598f
Misc decomp 534 (#301)
* splat disasm update

* a little

* splat jtbl robustness

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

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

* some rodata stuff

* git subrepo pull tools/splat

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

* progress

* All area rodata migrated

* UnkDistFunc

* SwitchToPartner

* UnkNpcAIFunc23

* UnkNpcAIFunc24

* UnkNpcAIFunc25

* cleanup & symbol_addrs

* disasm update

* work on fio.c (6240)

* data 'n' tst_04 funcz

* more tst_

* misc & PlayFX3D

* two end_01 funcs

* more shtuff

* fix

* fix2
2021-07-09 00:53:00 +09:00
Ethan Roseman
425dc5df56
Lots of area func deduplication (#300)
* splat disasm update

* a little

* splat jtbl robustness

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

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

* some rodata stuff

* git subrepo pull tools/splat

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

* progress

* All area rodata migrated

* UnkDistFunc

* SwitchToPartner

* UnkNpcAIFunc23

* UnkNpcAIFunc24

* UnkNpcAIFunc25

* cleanup & symbol_addrs

* disasm update
2021-07-04 17:09:40 +09:00
Ethan Roseman
41417f4d70
All area rodata migrated (#299)
* splat disasm update

* a little

* splat jtbl robustness

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

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

* some rodata stuff

* git subrepo pull tools/splat

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

* progress

* All area rodata migrated
2021-07-03 20:22:53 +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
Ethan Roseman
8c690d23d1
Assorted Morsels (#297)
* bss

* 3 audios

* d5a50 stuff

* some icon funcs

* get_icon_render_pos

* PlayerLandJump

* func_80248170

* cleanup

* splat update prep

* git subrepo pull --force tools/splat

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

* git subrepo pull tools/splat

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

* git subrepo pull tools/splat

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

* fix loop in PaperMarioNpcSprites

* git subrepo pull tools/splat

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

* add sha1 to yaml

* git subrepo pull tools/splat

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

* varTable -> union :( + player_api funcs

* 6 more

* 4 more

* 5 mo

* 1 mo

* 1 mo 2

* 5 mo

* player_jump

* 3 mo

* some 18F340

* 6 more

* 6 mo

* nm

* 1

* 1 more

* some PR feedback

* symbol addr update

* UnsetCamera0Flag1000

* SetPlayerSpriteSet2

* action 18

* encounter + a smol hammer

* git subrepo pull (merge) tools/splat

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

* 3 and cleanup

* undo yucky union

* PR comments

* get_enemy_safe

* cleanup

* move VirtualEntity

* attempt to fix doxygen

* 3, cleanup

* broken

* fixed!

* progress

* 2

* 3 and cleanup

* 6 map_api funcs

* 3 map api

* CreateNpc

* BringPartnerOut & NpcFlyTo

* npc_api complete

* update_scripts

* 4 si bois inc si_execute_next_command

* update symbol_addrs

* 2 more and cleanup

* camera struct & do_camera_type_0

* PR feedback

* small tidying
2021-06-21 13:30:57 +09:00
Ethan Roseman
e9176cb08f
Most of player_api and 18F340 (#296)
* bss

* 3 audios

* d5a50 stuff

* some icon funcs

* get_icon_render_pos

* PlayerLandJump

* func_80248170

* cleanup

* splat update prep

* git subrepo pull --force tools/splat

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

* git subrepo pull tools/splat

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

* git subrepo pull tools/splat

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

* fix loop in PaperMarioNpcSprites

* git subrepo pull tools/splat

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

* add sha1 to yaml

* git subrepo pull tools/splat

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

* varTable -> union :( + player_api funcs

* 6 more

* 4 more

* 5 mo

* 1 mo

* 1 mo 2

* 5 mo

* player_jump

* 3 mo

* some 18F340

* 6 more

* 6 mo

* nm

* 1

* 1 more

* some PR feedback

* symbol addr update

* UnsetCamera0Flag1000

* SetPlayerSpriteSet2

* action 18

* encounter + a smol hammer

* git subrepo pull (merge) tools/splat

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

* 3 and cleanup

* undo yucky union

* PR comments

* get_enemy_safe

* cleanup

* move VirtualEntity

* attempt to fix doxygen
2021-06-16 18:52:15 +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
Ethan Roseman
6ec6aab984
Mostly hud stuff (#294)
* bss

* 3 audios

* d5a50 stuff

* some icon funcs

* get_icon_render_pos

* PlayerLandJump

* func_80248170

* cleanup
2021-06-07 10:15:48 -04:00
alex
39029a810e
split and pack title_data (#293) 2021-05-08 15:54:34 +09:00
Ethan Roseman
08aad50545
50% Functions Decompiled (#292)
* part 2 dun

* DivActorLevel4

* Dist3D

* SetBackgroundAlpha & FreeIcon

* update symbol_addrs

* UnkBackgroundFunc3

* anudder

* UnkFogFunc2

* Disasm most remaining data

* model stuff and renames

* update symbol_addrs

* bss

* a5dd0 data migration

* entity funcs

* render_entities

* render_shadows

* entity_get_collision_flags

* 2 map api

* 2 mo

* progress

* fix 2 non-matchings

* clean

* pause_draw_menu_label

* another

* progs

* 50% function count

* remove commented funcs

* symbol_addrs

* PR comments
2021-05-08 14:34:57 +09:00
chansuke
18b9a58860
disable_actor_blur (#291)
* disable_actor_blur

* Fix `part->idleAnimations != 0` to `part->idleAnimations != NULL`
2021-05-02 23:55:11 -04:00
Ethan Roseman
161bcb2576
Mac fixes (#290)
* BSS alignment issues

* mac-fixes
2021-05-02 07:45:49 -04:00
Ethan Roseman
ad80f13149
Battle Area + Effect Data (#289)
* part 2 dun

* DivActorLevel4

* Dist3D

* SetBackgroundAlpha & FreeIcon

* update symbol_addrs

* UnkBackgroundFunc3

* anudder

* UnkFogFunc2

* Disasm most remaining data

* model stuff and renames

* update symbol_addrs
2021-05-02 04:03:42 +09:00
Ethan Roseman
b2cc576bda
Shops and Battle Areas (#287)
* fix BSS bs

* more shop stuff

* gamestatus stuff

* name and some nonmatchings

* cleanup

* clean

* battle area data

* DeadUnkFloatFuncAbs

* symz

* removing stuff

* Battle Area Deduplication

* UnkFogFunc
2021-04-30 02:38:02 +09:00
Maide
24db21f97c
Some 43F0 funcs (#286)
* Some 43F0 funcs

* Small cleanup

* PR

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-04-30 02:31: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
alex
d530ca24cd
Various script cleanup (#284)
* update star_rod_idx_to_c for battles

* name spiked_goomba and paragoomba animations

* name cleft animations

* finish battle struct disasm

* fix for kmr part 3

* name jr troopa animations

Co-authored by: T00nbink <martyntoby@gmail.com>

* ignore star rod crash.xml

* foliage.inc.c

* foliage data

* script: =f -> = (float)

* script: add (int) cast
2021-04-28 17:58:21 +09:00
Ethan Roseman
ac3797ea56
Splat update to 0.7.3 (#283)
* change splat branch to master

* git subrepo pull --force tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "924414a51d"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "924414a51d"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
2021-04-27 21:36:33 +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
Alto1772
df646f1d30
correct some paths (#279)
* rename files to correct src paths

* remove npc/func_8003E338.s
2021-04-25 00:38:15 +09:00
Ethan Roseman
011a957985
Compiler's Worst Nightmare (#278)
* 25.00%

* remove __naked__ and name printContext->unk_4E8

* change rodata strings to []

* actually remove

* fix headers

* git subrepo pull --force tools/splat

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

* progress

* .

* .

* some stuff

* git subrepo pull --force tools/splat

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

* :OK:

* 2 graphics funcs!

* woo

* more

* match func_802A15A0_733670 (#276)

* .

* gfx_draw_frame, other fixes

* macros begone!

Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
2021-04-23 20:55:30 +09:00
Alex Bates
b786f3860b
remove temp print() in img/build.py 2021-04-22 09:26:16 +01:00
alex
df3ef58ba1
Crystal Palace reflection include & name some segments (#274)
* src/evt section

* evt data

* entity

* update entity func names

* names

* reflection wip

* lol

* ~pra_01

* nabbed em

* match func_80240500_D4D540

* match func_802402F0_D4D330

* last pra include func git add -A

* gCurrentCamID

* reflection.inc.c for pra_01

* reflection.inc.c

* rm

* match a few in tst_11

* use npc flags

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-04-21 23:19:31 -04:00
alex
9900e9a2b8
More image splits (#272)
* A number of new image splits

* Address comments.

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

subrepo:
  subdir:   "tools/splat"
  merged:   "9caaa45df9"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "imgflip"
  commit:   "9caaa45df9"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* use flip_y over flip

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

subrepo:
  subdir:   "tools/splat"
  merged:   "ef663ec0d5"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "imgflip"
  commit:   "ef663ec0d5"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* use flip_y

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

subrepo:
  subdir:   "tools/splat"
  merged:   "3144dc17f6"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "imgflip"
  commit:   "3144dc17f6"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

Co-authored-by: JoshDuMan <Joshua.Shoup.1996@gmail.com>
2021-04-22 01:01:00 +09:00
alex
a3e4140101
Sprite stuff (#270)
* root-level configure script

* fix configure on macos?

* fix macos again maybe

* fix messages, add asset stack

* generate map headers from xml maps

* fix sprite_dir asset

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

subrepo:
  subdir:   "tools/splat"
  merged:   "5e36c45558"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "5e36c45558"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* name sprite.c

* almost match func_802DD8F8

* match func_802DD8F8

* crusade against unsigned integers

* name some sprite data

* add pylibyaml to requirements.txt
2021-04-19 00:01:59 -04:00
Maide
52ca40f632
DenSinH's PR (#269) 2021-04-19 02:30:54 +09:00
Ethan Roseman
8e4df57de7
25.00% (#268)
* 25.00%

* remove __naked__ and name printContext->unk_4E8

* change rodata strings to []
2021-04-19 02:25:32 +09:00
alex
060486c85e
Configure updates for modding (#262)
* root-level configure script

* fix configure on macos?

* fix macos again maybe

* fix messages, add asset stack

* generate map headers from xml maps

* fix sprite_dir asset

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

subrepo:
  subdir:   "tools/splat"
  merged:   "5e36c45558"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "5e36c45558"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
2021-04-18 22:26:00 +09:00
Ethan Roseman
3976b4d614
Fixing the mac build (#263) 2021-04-17 22:31:33 -04:00
alex
a557e4cd96
Fix configure on macOS (#261)
* root-level configure script

* fix configure on macos?
2021-04-17 20:53:34 +09:00
Ethan Roseman
f822f04c07
3 down in 7B440 and 77480 (#260)
* delete dgb data

* 2

* 1 mo

* removing macro

* removing comment

* meowp
2021-04-17 20:46:17 +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
Ethan Roseman
8422d41f35
sorry bombette (#258) 2021-04-13 18:15:46 +09:00
Ethan Roseman
3315d6010f
Splat refactor (#257)
* all non-world rodata migrated

* data disasm

* kinda working

* updated yaml

* bloop

* linker header

* configure 2.0

* bin

* mass rename to remove code_

* pause rename

* battle partner stuff

* whew

* more renames

* more renames

* more renaming

* it builds!

* updates

* remove main prefix

* one more thing

* crc, yay0

* .data, .rodata, .bss

* img

* dead_atan2

* it buildsgit add -A

* split battle/partner/6FAD10

* rm &s on sleepy_sheep syms

* sha1sum ninja rule description

* OK but commented out PaperMarioMapFS and PaperMarioNpcSprites

* uncomment

* fix mapfs

* match func_8003CFB4

* .

* clean up and name npc_iter_no_op

* npc.c

* enable cc warnings

* name npc_find_near

* use singular options.asset_path

* smores

* cc_dsl only when needed

* kinda fix configure for splat refactor2

* ok!

* new msg format

* remove old msg format docs

* slight bug fixes, splat adjustment

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

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

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

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

* Update symbol addrs

* git subrepo pull tools/splat

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

Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-04-13 16:47:52 +09:00
pixel-stuck
3fd09d2a7c
Decompile most of code_b72b0_len_15ed0.c (#256) 2021-04-13 01:07:05 +01: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