Commit Graph

75 Commits

Author SHA1 Message Date
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
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
JoshDuMan
348d12c4e3
Match some more Libultra (#639) 2022-02-08 14:05:20 +00:00
Ethan Roseman
d2da25dc10
GCC 2.7.2 support (#633)
* name big_smoke_puff

* 0-5

* 6 -> land

* more effect stuff

* flower effects

* name fix

* cloud_puff

* flower splash

* cloud_trail

* 2 more

* more

* a bunch more

* -2F

* more

* the rest

* cleanup and the rest

* attack_result_text

* PR stuffs

* numbaz

* Attempt to get 2.7.2 support working

* Update Jenkinsfile

* try

* fix

* fix issues

* remove KMC_ASM remnants

* NON_EQUIVALENT for the effect gfx func

* We don't need wine
2022-01-29 10:01:26 +09:00
Ethan Roseman
9fa9639575
The Great Effect Naming (#632)
* name big_smoke_puff

* 0-5

* 6 -> land

* more effect stuff

* flower effects

* name fix

* cloud_puff

* flower splash

* cloud_trail

* 2 more

* more

* a bunch more

* -2F

* more

* the rest

* cleanup and the rest

* PR stuffs
2022-01-25 01:58:33 +09:00
Alexander Faßbender
4ef25a394d
Decompile and dedupe dead funcs (#621)
* decompile several dead functions and dedupe some alive counterparts

* .

* dedupe UnkNpcAIFunc46

* resolve issues

* Fix warnings

* .

* PR comments

* clean

* anim IDs

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-01-21 14:54:46 +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
JoshDuMan
36e5315fdc
Disassemble Various Data Files (#616)
* Disassemble IWA Battle Map

* Disassemble SBK Battle Map

* Disassemble Quake Hammer

* Disassemble jump.c

* Disassemble Hammer Action Command

* Some Labelling

* Fix symbol_addrs

* Disassemble ISK Part 1 Battle Map

* Restore symbol_addrs
2022-01-13 15:26:42 +09:00
JoshDuMan
79bcd008f9
Battle Map and Move Disassembly (#614) 2022-01-11 02:06:43 -05: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
Alex Bates
2f86b35b63
Fix KMC_ASM configure flag (#608)
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-01-07 15:02:56 +00: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
JoshDuMan
de651a7efb
D_80000000 -> 0x80000000 (#599) 2022-01-02 04:07:25 -08:00
Ethan Roseman
3f946f9f72
The Great Deduplication (50%) (#590)
* UnkNpcAIFunc37

* UnkNpcAIFunc38

* UnkNpcAIFunc39

* UnkNpcAIMainFunc2

* PR comments
2021-12-30 20:54:26 +09: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
JoshDuMan
69e1a012bd
Partner Script Disassembly (#577)
* frogress

* kooper data

* More Work

* Bombette, Sushi, Parakarry Scripts

* Finish wPartners work.

* Partner BSS
2021-12-28 21:44:31 +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
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
Ethan Roseman
9e1d4db698
First overlay's BSS symbols moved to C (#551)
* 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

* BSS migrated to C for the first overlay

* rename

* PR comments
2021-12-16 17:33:47 +09: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
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
Ethan Roseman
34254d102e
appendGfx_message (#520)
* work on appendGfx_message

* :OK:

* indentation

* message window states

* PR comments

* ran formatter

* change some types

* debuggin

* undebuggin

Co-authored-by: Alex Bates <hi@imalex.xyz>
2021-11-12 21:23:43 +09:00
Lightning
4733902ec8
Match _heap_free (#522)
* Committing _heap_free match

* More renames and fixes from PR

* Ver without goto's from Josh

* Accidently left pointers in

* More variable fixes based on calls to _heap_*

* Remove unneeded comments, fix function variable name in header

* Missing a space

* Revert to while loop

* Sneaking in an additional comment about heap_malloc_tail for clarity

* Missed whitespace

* Reduced some comments
2021-11-08 01:58:57 +09:00
Ethan Roseman
068b8a5b08
B4580 and d0a70_len_4fe0 (#502)
* func_80133A94

* animator stuff

* add_anim_node and animator_node_update_model_transform

* a bunch more

* more

* .

* temp

* create_mesh_animator

* 2 mo

* d0a70 funcs

* more d0a70

* 2 mo

* 1 + cleanup

* 2 mo

* cleanup

* revert change to verbosity for splat

* PR comments
2021-10-30 02:57:15 +09:00
Alexander Faßbender
b9bc4b8af8
Assign dead maps to alive counterparts (#496)
* add information about dead maps

* link the names of dead maps to their alive counterparts

* Update EB1170.c

* remove redundant function declaration

* resolve issues
2021-10-27 11:24:52 +02:00
Alexander Faßbender
beeb5627e6
Deduplicate various dead functions (#494)
* what is dead may never die

* resolve issues

* fixing dead_gPartnerActionStatus2

* .

* resolve issues

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-10-25 16:32:44 +02:00
Ethan Roseman
33c9dda3a5
KMC GCC, effects, cleanup, map funcs (#476)
* warnings, cleanup, 2 npc ai funcs

* kmcgcc stuff

* effect_75

* effect_9.c done

* cleanup, work on kmc gcc

* start on fx_73

* guOrtho/guOrthoF

* more libultra/cleanup

* more libultra

* add wine for darwin

* effect_73 done

* UnkQuizFunc

* effect func naming

* name appendGfx funcs

* fix fx_66

* Add KMC wrapper to Jenkinsfile

* mac fixes

* fix macro usage

* oopz

* 3 fixes

* blah

* KMC_ASM

* config changes
2021-10-22 23:01:27 +09:00
Rainchus
d84eda49dd
Decomp some functions from watt overworld file (#462)
* 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

* cleanup

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2021-10-11 15:42:26 +09:00
Ethan Roseman
59050ec3e9
Effects & misc (#458)
* fx_6_appendGfx

* update_effects

* effect_6 done

* Update diff.py

* update configure for new splat

* git subrepo pull --force tools/splat

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

* nu stuff / undefined_syms org

* Actor struct refactor to match AddActorVar (thanks Josh)

* various cleanup, matched an obfuscation func

* fx_7 work

* is_block_on_ground

* state_*

* create_entity_shadow, update asm macro to fix diff.py

* set_standard_shadow_scale

* set_npc_shadow_scale and set_peach_shadow_scale

* create_shadow_type

* revert macro.inc

* clear_model_data (thanks Josh)

* cleanup

* mdl_get_next_texture_address

* mdl_set_all_fog_mode

* load_model_textures

* fx_7_appendGfx (effect_7 done)

* fx_8_main

* fx_8_render

* fx_8_update

* func_E0010000

* func_E0010104

* effect_8 done

* effect_8 done

* warnings

* cleanup

* try to fix some warnings

* warnings + change Bowser Slug behavior
2021-10-04 00:44:16 +09:00
Ethan Roseman
4c787f68c1
Effect_6 done, splat, diff updates (#451)
* fx_6_appendGfx

* update_effects

* effect_6 done

* Update diff.py

* update configure for new splat

* git subrepo pull --force tools/splat

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

* nu stuff / undefined_syms org
2021-09-30 18:48:03 +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
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
Ethan Roseman
e04a2e8330
Set up IDO and match osFlash.c (#424)
* set up IDO, created osFlash, fix newlines in libultra headers

* osFlash OK

* Try to fix Jenkinsfile
2021-09-25 16:31:44 +09:00
Alexander Faßbender
9a50c4cbe1
Decompile dead functions (#429)
* decompile several duplicated dead funcs

* decompile several dead functions

* decompile dead functions

* resolve issue with UnkNpcAIFunc31
2021-09-25 08:06:34 +09:00
Alexander Faßbender
c66590758e
Decompile dead functions (#426)
* decompile several dead functions and add more dead counterparts to existing functions to dead.h

* .

* Update EF2680.c
2021-09-23 10:55:12 +02: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
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
b198250cde
Rename every function that is a part of evt_funcs.h to have the evt_ prefix (#408)
* rename every function that is part of evt_funcs.h to have the evtt_ prefix.

* remove old .s files

* fix symbol_addrs error

* add evt_ 'prefix' to the dead functions in dead-h
2021-08-29 18:51:56 +02: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