Commit Graph

279 Commits

Author SHA1 Message Date
Dalrik
c3c790527d
Decomp pause_sort_item_list and pause_draw_rect (#453)
* WIP pause_sort_item_list

* Decomp pause_draw_rect and pause_sort_item_list

The match on pause_sort_item_list is very sketchy, there's probably a much simpler way to write the function that I can't find

* Review for 135EE0
2021-10-01 20:14:54 +09:00
fig02
5779f5de0e
crash_screen OK (#449)
* crash screen done

* cleanup

* done i think

* crash -> crash_screen

* fix warnings

* size comment

* review
2021-09-30 08:01:31 +09:00
Ian
cedfcbbb89
Decomp most of the pause badge menu (#447)
* Define gMoveTable

* pause_get_total_equipped_bp_cost

* pause_badges_draw_bp_orbs

* pause_badges_cleanup

* pause_badges_init

* pause_badges_try_remove

* pause_badges_handle_input

* pause_badges_try_equip

* WIP on pause_badges_load_badges, almost perfect match

* Full match on pause_badges_load_badges

* Review changes for pause badges

* A few more pause badge review changes, missing some spaces around add/subtract operators

* More small pause badges fixes

* Pause badges review: remove enum typedefs, add names for ranges in ItemID
2021-09-28 16:47:55 +09:00
eperdew
61467570c8
Decompile func_80218808_5B1CB8, area_arn/4550D0.c, and area_dig/6DE1F0.c. (#446)
* Decompile area_arn/4550D0.c and area_dig/6DE1F0.c.

* Remove covered assembly files for battle/area_arn and battle/area_dig.

* Decompile func_80218808_5B1CB8.

* Address @ethteck's feedback on PR#446, sans the switch on actorType.

* Deduplicate UnkFunc52, and add a switch-based matching decomp.

* Turn ACTOR_TYPE_XXX defines into an ActorType macro.

* Remove erroneously added src/world/common/spiked_goomba.c.
2021-09-28 16:28:01 +09:00
Ethan Roseman
555f0ea15b
Effects (#442)
* effect shim names

* fx_1_main and data migration

* fx_1_renderWorld

* header reorg

* remove stale comment

* effect_1

* cleanup

* fx_6 stuff

* most of effect_6, misc changes

* cleanup

* PR stuff

* warningz
2021-09-27 08:19:58 +09:00
Alexander Faßbender
205103bf2e
Decompile dead functions (#432)
* decompile several dead functions

* .

* resolve issues and deduplicate StarSpiritEffect structs

* .

* resolve the requested change
2021-09-26 16:52:25 -04:00
eperdew
560f5a873e
Decompile E225B0.c. (#434)
* Decompile E225B0.c.

* Decompile EB5130.c.

* Fix an off-by-one error that did not affect codegen.

The struct declared in EB5130.c was missing a byte in a char array
for no good reason.

* Address ethteck's feedback for PR#434.

- Move struct8015A578 to common_structs.h.
- Add new unknown sound SOUND_UNKNOWN_17B.
- Address various nits.

* Update PR based on @nanaian's feedback.

- Change first argument of mem_clear to be a void* (matching bzero).
2021-09-26 21:04:12 +09:00
JaThePlayer
bb6e9303dc
Decomp some Evt, fio, ItemEntity & other functions (#433)
* Decomp some evt, fio and item entity functions

* run coverage.py

* Remove redundant comment

* Make ItemEntity.type s8, MAX_ITEM_ENTITIES, style changes
2021-09-26 07:13:36 +09:00
JaThePlayer
8e48172c1e
Decompile PopupMenu functions + more (#430)
* cleanup create_popup_menu
* fix some warnings
* decomp parts of 18C790.c
* rename PopupMessage.unk_04 to updateFunc
2021-09-25 13:14:28 +01:00
eldexterr
cb1bc0c312
BattleStatus (0x436) added (from common_structs.h) (#427)
* Update common_structs.h

This ones are actually flags used by Power Rush and Mega Rush, I dunno if they're used for something else tho.

But if you enter in Danger State (2-5HP) and you have equipped Power Rush dangerFlags will be 0x02 not 0x01.

* BattleStatus(0x172-0x177)

Added missing notes from BattleStatus(0x172) & (0x174)

* Update common_structs.h

0x174 declaration is fixed, and now uses currentTurnEnemy instead of currentTurnActor

* BattleStatus  (0x436) added (common_structs.h)

This is defined every time an actor is created with ~Func:create_actor (802653A4, 193C84), at ~Func:create_actor(0x908)

It retrieves the ID two lines before by using function 80047608 and will get the next available index.

* hudElementDataIndex fixed, and I renamed some status functions

HudElementDataIndex now uses the proper name and it has the name change on all files.

Also I changed the names for the following functions to:

remove_status_1 > remove_status_debuff
remove_status_2 > remove_status_static
remove_status_3 > remove_status_transparent

remove_status_4 seems to still be a mystery, maybe is for a unused status?
2021-09-25 08:15:45 +09:00
eldexterr
f0da0b568e
Added some missing notes to common_structs.h (#423)
* Update common_structs.h

This ones are actually flags used by Power Rush and Mega Rush, I dunno if they're used for something else tho.

But if you enter in Danger State (2-5HP) and you have equipped Power Rush dangerFlags will be 0x02 not 0x01.

* BattleStatus(0x172-0x177)

Added missing notes from BattleStatus(0x172) & (0x174)

* Update common_structs.h

0x174 declaration is fixed, and now uses currentTurnEnemy instead of currentTurnActor
2021-09-23 12:26:43 +09:00
ThreeMustyFears
a9179ce7fb
Match use_tweester, and munchlesia + misc partners (#422)
* update common_structs and enums

* match tweester and munchlesia

* update undefined_syms

* same function in different partners

* run coverage

* some changes

* other spaces

* attempt at deduplicating

* Revert "attempt at deduplicating"

This reverts commit 6393e85703.

Co-authored-by: ThreeMustyFears <>
2021-09-23 11:06:57 +09:00
Ethan Roseman
db578d9788
a5dd0 (model file) + filemenu decomp (#420)
* remove some warnings, improve build speed on master

* update Camera

* update_camera_zone_interp not matching but close :/

* cleanup

* configure fix

* cleanup, better gbi macros

* decomp and syms

* a couple more

* 2 more and stuff

* more naming

* 3

* syms

* mdl_get_child_count

* more stuff

* get_model_list_index_from_tree_index

* 5 more

* header org

* update_entity_shadow_position

* fog color funcs

* more color stuff

* display lists

* create_shadow_from_data

* 4 evt shtuffsh

* func_80117D00

* func_80111790

* some BSS

* entity_raycast_down

* MakeEntity and almost step_entity_commandList

* step_current_game_mode

* filemenu stuff

* lots more filemenu stuff

* cleanup

* formatting

* fixes

* 1 more

* more fixes
2021-09-22 20:17:46 +09:00
ThreeMustyFears
b127733cfa
Match spinning flower and slide (#419)
* match use_spinning_flower.c
* match slide.c
* some partners.c matches
2021-09-16 13:19:12 +01:00
eldexterr
f95eb165f3
Update common_structs.h (#418)
This ones are actually flags used by Power Rush and Mega Rush, I dunno if they're used for something else tho.

But if you enter in Danger State (2-5HP) and you have equipped Power Rush dangerFlags will be 0x02 not 0x01.
2021-09-14 21:33:44 +09:00
ThreeMustyFears
b5eb88b9f3
Match super boots (#415)
* update common_structs.h

* match super boots

* run coverage.py

* missed a couple things

* Update functions.h

* removing a warning

* requested changes

Co-authored-by: ThreeMustyFears <>
2021-09-08 07:02:00 +09:00
Alexander Faßbender
ed8f1a9593
Rename string to msg (#414)
* change all occurences of  to  unless they are a chaar-array

* resolve pr review
2021-09-02 17:46:27 +02:00
Ethan Roseman
1b163a0c4a
Decomp some pause screen map functions (#412)
* decomp pause screen map functions

* pull upstream and merge

* change get_variable calls to evt_get_variable

* style fixes for map pause screen

* close match on pause_map_init and style in map pause functions

* small pause_map_cleanup change

* Matches (thanks Josh), structs, symbols, cleanup

* cleanup

* Symbol / struct refresh

* further cleanup

* data/rodata disasm, rodata migration, cleanup

* PR comments

* map message ids

Co-authored-by: Rain <rainmachus@gmail.com>
2021-09-02 20:17:40 +09:00
JaThePlayer
2a8b55c9e1
Battle Popup Decomp (#411)
* 17D6A0.c decomp

* cleanup

* fix func_8024F84C return type

* BattlePopups renamed to battlePopups

* Rename BattlePopup to PopupMessage and move it to common_structs.h

* Remove unnecessary extern

* Move local declarations inside for loops
2021-09-02 07:37:46 +09:00
Alexander Faßbender
afab424519
Rename all si_funcs to evt_funcs (#403)
* resolve #397

* fix libultra

* Match func_80144E4C (#406)

* Update hud_element.c

* Update hud_element.h

* Update hud_element.h

* Delete func_80144E4C.s

* Trigger funcs (#405)

* remove old tools, fix warnings

* almost match si_handle_print_debug_var

* si_goto_end_loop and warnings

* is_trigger_bound and create_trigger

* Cleanup + matching 2 non-matchings

* update_triggers (trigger.c complete)

* fix warnings

* PR comments, m2ctx.py fix

* combine PR #398 with #403

* More entity decomp (#402)

* More entity decomp

* cleanup

* Vec3f instead of 3 floats in structE307C0

* resolve #397

* fix libultra

* combine PR #398 with #403

* decompile evt_goto_end_loop

Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com>
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
Co-authored-by: JaThePlayer <50085307+JaThePlayer@users.noreply.github.com>
2021-08-29 23:34:42 +09:00
Ethan Roseman
a865cbdf17
Trigger funcs (#405)
* remove old tools, fix warnings

* almost match si_handle_print_debug_var

* si_goto_end_loop and warnings

* is_trigger_bound and create_trigger

* Cleanup + matching 2 non-matchings

* update_triggers (trigger.c complete)

* fix warnings

* PR comments, m2ctx.py fix
2021-08-29 22:44:17 +09:00
Muskellunge
c58b4098f5
decomped AC function (#401)
* rename func_80242178_7ECE88

* matched tiny function

* decomp AC func

* renamed some vars

* made requested changes

* named temp_s0
2021-08-27 01:44:37 -04:00
JaThePlayer
0bdf15542e
Chest & Heart Block entities (#393) 2021-08-25 22:29:43 +01:00
Muskellunge
9103d9b35a
decompiled func_80242178_7ECE88 (#387)
* decompiled func_80242178_7ECE88

* Delete Paper Mario (U) [!].z64:Zone.Identifier

* update pr
2021-08-25 19:05:22 +09:00
Ethan Roseman
f5a6d26ca8
Full GCC Compiler (#378)
* fx table work

* fx data

* blah

* render_effects_UI

* split out effects.c

* initial testing of full gcc compiler

* don't touch undefined syms/funcs auto

* git subrepo pull --force tools/splat

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

* 4 npc funcs

* nine sef commands

* test

* test2

* run undefined_syms through cpp, remove bss and dead syms files

* nuContQueryRead

* update compiler

* configure fixes

* Update compiler binaries with latest build

* permuter_settings

* xgcc -> gcc

* change permissions

* .

* fix permuter stuff

* gcc is the bane of my existence

* non-dumb mac cpp

* build .cpp files with g++

* ccache

* hide stdout/stderr from ccache check

* fix #374

* tar something and other

* ok!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

* lol

* fix linux install

* 👍

* 👍👍

* Make cousin J happy

* always 👍

* git subrepo pull (merge) tools/splat

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

Co-authored-by: alex <16batesa@gmail.com>
2021-08-23 06:55:26 +09:00
alex
de800e9c9f
mass script to evt type rename (#377)
* add process_scripts.py

* mass evt rename
2021-08-23 06:50:10 +09:00
Ethan Roseman
2c0cb43181
Tidying (#375)
* don't touch undefined syms/funcs auto

* git subrepo pull --force tools/splat

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

* 4 npc funcs

* nine sef commands

* test

* test2

* run undefined_syms through cpp, remove bss and dead syms files

* nuContQueryRead

* Remove unnecessary flags

* oops

* oops2
2021-08-22 22:10:06 +09:00
ThreeMustyFears
ca1adbcb60
Match ultra boots (#372)
* match ultra boots

* update PlayerStatus struct

* add func

* update func prototype

* missed something

* coverage.py

* unnessary return

* requested changes

I changed gSpinHistoryPosY, and gSpinHistoryPosAngle to arrays based off of the declarations in 7E9D0.c

Co-authored-by: ThreeMustyFears <>
2021-08-20 19:31:00 +09:00
alex
49bee8512b
hud_element.c (#371)
* generate permuter_settings.toml
* remove -Wshadow (#366)

Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
2021-08-18 17:28:32 +01:00
JaThePlayer
af6416de0e
Major Action Command Decomp (#365)
* Decomp jump and most of tidal wave action commands

* More action commands

* stop_leech.c fully decomped.

* flee.c decomped

* cleanup and function name convention fixes

* slight cleanup

* Move ActionCommand enum to enums.h, style changes

* Changed some numbers to decimal

* That one missing newline

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-08-17 03:31:45 +09:00
Ethan Roseman
c7a7567d68
FX data/funcs, camera funcs, state funcs (#364)
* fx table work

* fx data

* blah

* render_effects_UI

* split out effects.c

* battle state menu functions

* render_frame

* clean

* clean

* 4 camera funcs

* state_step_end_battle & symbol names

* state_file_select done

* 111f0 done

* .

* PR comments
2021-08-17 03:14:58 +09:00
Ethan Roseman
3c887e6ac3
curtains.c data work, assorted funcs, new file, etc and cleanup: misc decomp (#360)
* PlayEffect progress, two insane funcs

* PartnerActionStatus struct and some cleanup

* file split

* physics funcs

* data migration, some decomp

* curtains data, etc

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

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

* git subrepo pull tools/splat

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

* PR comments
2021-08-14 02:27:57 +09:00
JaThePlayer
18a2781cf1
add ActionCommandStatus, random decomp (#358) 2021-08-06 12:00:15 +01:00
Rainchus
18f0888e91
decomp functions in d5a50 and fix type for widthScale and heightScale (#357) 2021-08-05 09:16:57 +01:00
ThreeMustyFears
f23045e775
Match world/action/jump funcs (#352)
* Match all funcs

* Update common_structs.h

func_802B6000_E24040 was attempting to assign an f32 to a char[], so I updated these

* Added a couple of flags

* Some requested changes

I couldn't figure out how to get Kelebek1's suggestions for the suggest_player_anim_clearUnkFlag to work, but I managed to do it for sfx_play_sound_at_player

* Update enums.h

Removed unnecessary flag that I previously added

* Update functions.h

* Update 7bb60_len_41b0.c

There were some conflicting declarations so I changed them

* Delete ver/us/asm/nonmatchings/world/action/jump directory

* Update jump.c
2021-08-04 18:20:16 +09:00
Alexander Faßbender
0fb0b32d0c
Decompile several dead and duplicated functions (#353) 2021-08-02 19:03:51 +01:00
alex
b48eb150d2
battle/action_cmd (#348)
* compile

* improve match

* improve

* ~check_block_input

* match LoadActionCommand

* cleanup

* match SetupMashMeter

* check_block_input much closer

* name action_cmd segments

* make better for great good

* improve again

* revert removing blah

* close

* improve

* match func_80268224

* match func_80268284 wrappers

* improvements

* work on func_80268938

* maide changes to check_block_input

* check_block_input :OK: - thanks Maide!

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-08-01 01:50:10 +09:00
Ethan Roseman
5d69c3454f
effect shims and more battle matches (#347) 2021-07-31 15:32:19 +01:00
Ethan Roseman
ed9727a34e
Various decomp, use of SCREEN_WIDTH and SCREEN_HEIGHT, etc (#340)
* Update symbol_addrs

* effects.h and cleanup

* effect code generation!

* func_80024A784

* state_step_demo

* meh

* work on gfx_task_main and cleanup

* state_step_intro

* set_custom_gfx
2021-07-23 03:48:30 +09:00
Ethan Roseman
53b5004d6e
New images + more (#332)
* no foliage warnings

* new images

* 4 funcs in 16F740

* update symbol addrs

* no more UnkStarFuncs.inc.c

* clean
2021-07-21 20:43:13 +09:00
Alexander Faßbender
83be3c1ea8
Miscellaneous battle/area functions (#330)
* match last bow fumction

* decomp more partner functions

* :)

* :)

* resolve merge conflict and style conflicts

* fix

* decomp :)

* :(

* :(((

* :)

* :(

* :)

* :)))))

* :(

* :/

* idk

* :/

* What

* Done.

* PR comments

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-07-21 20:22:42 +09:00
Ethan Roseman
ed2665a934
Various funcs in 77480, 1A5830, 1776B0 (#328)
* 2 funcs in 77480
* SetPartSize
* 2 funcs in 1A5830
* 34 funcs in 1776B0
2021-07-20 11:51:11 +01:00
Ethan Roseman
ab96e98acf
Miscellaneoush Decomp 323 (#323)
* more images

* new data file

* 2 undefined syms

* func_80048E34

* Shorten BattleStatus

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

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

* chop away 0x460-onward in BattleState

* battle.c complete!

* .
2021-07-19 20:49:30 +09:00
Alexander Faßbender
2a4966887c
match battle partner/move functions (#319) 2021-07-18 16:21:37 +01:00
alex
0538a9220b
match update_cameras (#321)
* near-match func_800279B4

* fix lakilester split

* match func_8023A1B0_70DEC0

* match func_800271FC

* further work on func_800279B4

* match update_cameras

* add CAM_FLAGs

* remove CAM macro
2021-07-18 02:04:14 +09:00
Ethan Roseman
1beee32dc6
Message work (#315)
* msg wip

* var name restoration

* rodata padding

* New compiler that supports .bss section attribute!

* -fno-common & cleanup

* clean

* extern bss for now

* msg work

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

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

* msg_draw_prim_rect

* draw_message_window

* render_messages

* draw_string progress

* remove dumb file

* images, data
2021-07-17 03:27:27 +09:00
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
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
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
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