pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
8d5b066b7d
papermario/include/variables.h

138 lines
3.1 KiB
C
Raw Normal View History

headers, some decomp
2020-07-18 02:47:33 +02:00
#ifndef _VARIABLES_H_
#define _VARIABLES_H_
#include "ultra64.h"
#include "common_structs.h"
match show_coin_counter
2020-08-10 23:35:37 +02:00
#include "types.h"
lots of stuff
2020-10-13 03:28:01 +02:00
#include "macros.h"
#include enums.h in variables.h to make format script happy
2020-08-23 01:39:45 +02:00
#include "enums.h"
headers, some decomp
2020-07-18 02:47:33 +02:00
more
2020-09-22 05:10:53 +02:00
extern PlayerStatus* gPlayerStatusPtr;
Some more
2020-10-03 22:04:49 +02:00
extern CollisionStatus gCollisionStatus;
Fixed gGameStatusPtr (#220) * fixed gGameStatusPtr * fixed non-matching * PR comments
2021-03-23 03:25:48 +01:00
extern GameStatus gGameStatus;
extern GameStatus* gGameStatusPtr;
Document PRNG Related Functions (#1060) * document gfx_rand * document global LCG * rename func_80029994 * clarify rand_int_internal comment * gfx_rand -> gfx_rand_int * remove unneeded parens * gfx_rand_int -> effect_rand_int * gfx_prng_seed -> effect_prng_seed * fix local variable case
2023-05-22 16:37:25 +02:00
extern u32 gRandSeed;
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 09:53:28 +02:00
extern ItemData gItemTable[365];
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 14:28:09 +01:00
extern MoveData gMoveTable[185];
more refinements on script list stuff
2020-08-14 16:25:33 +02:00
:cat:
2020-10-16 22:29:55 +02:00
extern s32 gBattleState;
Sounds and flags
2020-09-22 02:56:17 +02:00
extern BattleStatus gBattleStatus;
misc battle cleanup III (#911) * misc * fix one type * yeah * misc * all substates * almost done * renames * comments * a couple maps Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-15 10:22:41 +01:00
extern s32 gLastDrawBattleState;
battle substates cleanup I (#906) * cleanup in progress * celebrate done * progress * etc * substate enums done * flag fixup * brevity * msg name fix Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-10 07:33:09 +01:00
extern s32 gDefeatedBattleSubstate;
btl_state_update_partner_menu (#860) * btl_state_update_partner_menu * cleaning * enums in btl_state_draw_partner_menu * PR comments
2022-11-16 10:46:50 +01:00
extern s32 gBattleSubState;
battle substates cleanup I (#906) * cleanup in progress * celebrate done * progress * etc * substate enums done * flag fixup * brevity * msg name fix Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-10 07:33:09 +01:00
extern s32 gDefeatedBattleState;
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-22 05:12:28 +01:00
extern s32 gCurrentBattleID;
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 13:49:30 +02:00
extern s32 D_800DC4E0;
misc battle cleanup III (#911) * misc * fix one type * yeah * misc * all substates * almost done * renames * comments * a couple maps Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-15 10:22:41 +01:00
extern struct Battle* gOverrideBattlePtr;
add misc global vars from SR database
2020-08-17 14:40:21 +02:00
Fixing changes for PR: npcPtr to npc, spacing on if, removed else block in EnableNpcShadow that wasn't needed
2020-08-20 00:48:15 +02:00
extern Camera gCameras[4];
Various funcs
2020-09-06 17:53:48 +02:00
extern s32 gCurrentCameraID;
Fixing changes for PR: npcPtr to npc, spacing on if, removed else block in EnableNpcShadow that wasn't needed
2020-08-20 00:48:15 +02:00
Various meta work and some decomp (#184) * some * DeadUnkTexturePanFunc * DeadUnkTexturePanFunc2 * move guOrthoF to os * up * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "ae2cce951d" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "ae2cce951d" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Updating bin dir * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "5517f520e4" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "5517f520e4" 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: "fe48dc3b3a" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "fe48dc3b3a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * revert garbage * :OK: * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "8c86e4b95b" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "8c86e4b95b" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * data migration * 3 * .rodata migration and a buncha funcs * 2 mo * some decomp, a file boundary fix * cleanup * UnkNpaAIFunc13s * Update symbol_addrs * remove sublist * deleted asm * data fix * fix data * wtf?! * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "88ce6b44a6" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "88ce6b44a6" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * symbol_addrs update * blah * PR comments
2021-02-16 11:32:34 +01:00
extern CollisionData gCollisionData;
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 12:47:10 +01:00
extern f32 GravityParamsStartFall[];
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 08:26:57 +02:00
extern s16 FootstepSoundSelector;
model rendering doc (#1128) * all over the place * model roundup * missing reset_tiles for jp/ique splat * fix pal * fix ique --------- Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-11-24 05:06:58 +01:00
extern u8* gBackgroundTintModePtr;
isolated chuck quizmo (#685) * toad house * push blocks * requested cleanup * quizmo 1 * dro_01, dro_02, hos_03, jan_02 * quizmo jan_03 * kmr_02 quizmo * quizmo area_mac * quizmo functions aggregated * remove functions no longer needed * cleanup * cleanclean * quizmo started data * quizmo data half done * nearly done * fix mislabeled data in dgb_01 * fix QuizRequirement struct * isolate give item code * deconflict varstash data name with varTable fields * misc quizmo cleanup * quizmo done * fix file with invalid symbols * PR comments Co-authored-by: HailSanta <Hail2Santa@gmail.com> Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-12 08:01:58 +02:00
extern s32 gEntityHideMode;
match some functions in code_1a1f0_len_5390.c
2020-12-03 09:07:39 +01:00
Snibblets, Tidbits, and Morsels (#188) * fixing segment * redoing subtree * git subrepo clone https://github.com/ethteck/splat.git tools/splat subrepo: subdir: "tools/splat" merged: "99cf514297" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "99cf514297" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * fix symbol_addrs * sweet victory * reformat collision_main_lateral.s * Lots of matches, fixed diff.py issue, improved coverage.py * some more * update symbol_addrs * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "c46026725a" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "c46026725a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * update symbol_addrs * fix disasm * 2 mo * Jenkinsfile * PR comments
2021-02-18 12:54:07 +01:00
extern s32 D_8010C92C;
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 14:08:24 +01:00
extern s32 D_8010C950;
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 14:14:04 +02:00
extern HiddenPanelsData gCurrentHiddenPanels;
File menu & more (#658)
2022-03-10 10:55:38 +01:00
rename types (#20)
2020-08-16 05:19:00 +02:00
extern BackgroundHeader gBackgroundImage;
headers, some decomp
2020-07-18 02:47:33 +02:00
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 14:21:07 +02:00
extern f32 D_800F7B74;
3 down in 7B440 and 77480 (#260) * delete dgb data * 2 * 1 mo * removing macro * removing comment * meowp
2021-04-17 13:46:17 +02:00
camera functions and zone collision data (#671) * match 3 functions * match 4 camera functions * fixes * camSettings type enum * PR suggestions
2022-03-28 11:29:47 +02:00
extern CollisionData gZoneCollisionData;
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 04:27:12 +02:00
SetNpcFlagBits
2020-11-08 05:33:15 +01:00
// Animation related
ASM update and types
2020-11-08 21:40:26 +01:00
SetNpcFlagBits
2020-11-08 05:33:15 +01:00
extern PartnerAnimations gPartnerAnimations[12];
ASM update and types
2020-11-08 21:40:26 +01:00
match SetSpriteShading (#944)
2023-02-17 02:56:57 +01:00
extern SpriteShadingProfile* gSpriteShadingProfile;
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 10:27:28 +01:00
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 13:17:40 +02:00
extern Window gWindows[64];
UI Panels
2020-11-12 19:38:17 +01:00
encounters and static npc flags (#843) * matched update_encounters_neutral * matched encounter funcs * replaced NPC flags with ENEMY flags * cleaning up * warnings
2022-11-01 13:27:10 +01:00
extern s32 gEncounterState;
Misc decomp (#215) * Misc early code decomp * Make expected script * fix m2ctx * gOverrideFlags & set/unset macros * update symbol addrs * Cleanup and PR comments * oops
2021-03-19 11:25:14 +01:00
extern s32 gOverrideFlags;
Shiftable BSS (#1092) * Shiftable BSS * osFlash cleanup * Fix warning * PRomment * fixes * gulp * yummy * more * more * more alignment * oopth * fix budges * Several budges * more * more budges * fix black screen before "today..." * final cleanup
2023-07-21 18:53:09 +02:00
BSS And Libultra (#823) * BSS refactor (the Wiseguy method) * controller.c * ldiv.c * motor.c * cartrominit.c * more libultra matching + standardization * more libultra stuff * more * clean * warnings
2022-10-16 00:24:05 +02:00
extern char wMapTexName[];
Matching some kkj, kpa, pra, and osr area functions (#758) * Matching some kkj, kpa, and osr area functions * Include effects.h in AAC830.c * Addressed PR comments * Separated strings in func_80240000_AAFFF0 * Addressed PR comments continuation * Added Bytecode args in func_80240020_AB2190 * Match func_802401A0_AB6430, func_80240000_AB92B0, func_80240050_AB9300 * Match functions that call start_rumble * Match functions from area_pra * Addressed PR comments * Color hex to dec func_802401A0_AB6430
2022-09-06 17:09:50 +02:00
extern char wMapHitName[];
extern char wMapShapeName[];
isk+ (#878) * isk_01/2/3 * machi * mac_05 * mac_04 matched * mac_04 * mac_02 match * mostly cookin * mac_02 cleanup * tayce t cleanup done * most of isk * almost done isk * isk done * mapconfig 1C * jump to goal Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-12-06 00:29:22 +01:00
extern char wMapBgName[];
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-22 05:19:31 +02:00
extern u8 D_802D9D70; // player alpha1 copy?
extern u8 D_802D9D71; // player alpha2 copy?
Shiftable BSS (#1092) * Shiftable BSS * osFlash cleanup * Fix warning * PRomment * fixes * gulp * yummy * more * more * more alignment * oopth * fix budges * Several budges * more * more budges * fix black screen before "today..." * final cleanup
2023-07-21 18:53:09 +02:00
extern DisplayContext D_80164000[2];
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-22 05:19:31 +02:00
File menu & more (#658)
2022-03-10 10:55:38 +01:00
extern WindowStyle gWindowStyles[];
world script data (#933) * nok_01 ok * nok_01 cleanup * nok_02 ok * nok_02 cleanup pt 1 * nok_02 cleanup pt 2 * nok_02 cleanup pt 3 * map api data * rooms api * rooms cleanup * rooms cleanup * done rooms cleanup * fix mixed up enemy/npc flags * tabs --------- Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-06 01:13:45 +01:00
extern u16 gCurrentDoorSounds;
Shiftable BSS (#1092) * Shiftable BSS * osFlash cleanup * Fix warning * PRomment * fixes * gulp * yummy * more * more * more alignment * oopth * fix budges * Several budges * more * more budges * fix black screen before "today..." * final cleanup
2023-07-21 18:53:09 +02:00
extern u16 gCurrentRoomDoorSounds;
A handful of script functions. Commented out ones that aren't fully matching yet
2020-08-11 23:38:21 +02:00
tex archives (#1072) * extraction * hmm * eth cleanup * tex skeleton * building * OK * pal OK * cleaned texture names * moved tex code to separate file * additional error checking * proposed splits * split a5dd0 * additional cleanup * myoop * wahoo * lru * fixules * fixin agin --------- Co-authored-by: HailSanta <Hail2Santa@gmail.com> Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2023-06-29 14:06:23 +02:00
extern b8 D_8014C248;
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 11:52:15 +02:00
area kmr (#898) * kmr_02 ok * some cleanup * foliage EVS * quiz cleanup * partners * cleanup pass ? * kmr_02 done * kmr_20 ok * begin kmr_20 cleanup * enough kmr_20 * kpa_90+ * more kpa Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-01-02 02:58:39 +01:00
extern UNK_FUN_PTR(TalkNotificationCallback);
partners and notifications (#966) * kooper cleanup * second pass * notifications * goombario * tweesters mostly --------- Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-03-06 08:44:48 +01:00
extern UNK_FUN_PTR(InteractNotificationCallback);
extern UNK_FUN_PTR(ISpyNotificationCallback);
extern UNK_FUN_PTR(PulseStoneNotificationCallback);
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 12:47:10 +01:00
extern Entity* TweesterTouchingPartner;
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 18:38:19 +02:00
extern Entity* TweesterTouchingPlayer;
partners and notifications (#966) * kooper cleanup * second pass * notifications * goombario * tweesters mostly --------- Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-03-06 08:44:48 +01:00
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 08:26:57 +02:00
extern s32 PrevPlayerDirection;
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 21:39:16 +02:00
extern s32 PeachDisguiseNpcIndex;
battle/actor flags and more (#1119) * battle documentation * mostly startup stuff * battle file names * minor reorg * actor rendering * few extras * file renames and camera unks * py fix * fio cleanup * sounds progress --------- Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-10-14 21:43:12 +02:00
extern s32 PlayerRunStateTime;
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 08:26:57 +02:00
extern s32 PrevPlayerCamRelativeYaw;
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 11:52:15 +02:00
extern s32 D_800F7B44;
battle/actor flags and more (#1119) * battle documentation * mostly startup stuff * battle file names * minor reorg * actor rendering * few extras * file renames and camera unks * py fix * fio cleanup * sounds progress --------- Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-10-14 21:43:12 +02:00
extern f32 PlayerNormalYaw;
extern f32 PlayerNormalPitch;
enemy+npc flags (#946) * npc flags 1 * enemy & npc flags * removed item headers * minor item cleanup * coverage --------- Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-02-18 09:13:07 +01:00
extern s32 NpcHitQueryColliderID;
battle/actor flags and more (#1119) * battle documentation * mostly startup stuff * battle file names * minor reorg * actor rendering * few extras * file renames and camera unks * py fix * fio cleanup * sounds progress --------- Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-10-14 21:43:12 +02:00
extern Vec3s StandardActorHomePositions[];
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 11:52:15 +02:00
byte/flag stuff
2020-09-19 17:16:02 +02:00
extern SaveData gCurrentSaveFile;
encounters and static npc flags (#843) * matched update_encounters_neutral * matched encounter funcs * replaced NPC flags with ENEMY flags * cleaning up * warnings
2022-11-01 13:27:10 +01:00
extern s32 gEncounterSubState;
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-22 05:19:31 +02:00
extern s32 timeFreezeMode;
decomp funcs in code_13870_len_6980.c & code_1A1F0_len_5390.c (#245) * decomp funcs in code_13870_len_6980.c & code_1A1F0_len_5390.c * fix pr comments * fix for loops to not be hardcoded
2021-03-30 19:39:44 +02:00
extern s32 D_8009A678;
Some stuff
2020-10-14 03:55:04 +02:00
battle/actor flags and more (#1119) * battle documentation * mostly startup stuff * battle file names * minor reorg * actor rendering * few extras * file renames and camera unks * py fix * fio cleanup * sounds progress --------- Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-10-14 21:43:12 +02:00
extern u8 IntroMessageIdx;
icons archive generation (#1091) * OK * broken * fixed * misnomer * fix names, add other versions * fix stray object file and warnings * .bin.o * incorrect asset_deps * cleanup --------- Co-authored-by: HailSanta <Hail2Santa@gmail.com> Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2023-07-22 19:20:37 +02:00
extern s32 PartnerIDFromMenuIndex[12]; // partner IDs
some funcs in code_105f90
2020-11-21 08:40:54 +01:00
Many more functions decomped
2020-10-08 21:03:58 +02:00
// Scripts
various cleanup (#1057) * checkpoint * battle doc * items 2 * actor palette stuff * minor adjustment * the booool * comments, flags, and todos * oops * chain chomp * quick fix * stone chomp as well * partIDs * hm * status turn mod * status_key * status table alignments * TURN_DONE - > INACTIVE * idle anims alignment * defense table alignment * STATUS_END * actor part IDs * lee * lee again * standardizing names * BattlePositions * actor macros * standardize battle and stage macros * check * the rest * red/blue goomba names * trd_part_1 * rest of trd 1 * pal fix --------- Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-05-20 19:26:11 +02:00
extern EvtScript EVS_NpcDefeat;
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 14:28:09 +01:00
extern EvtScript ShakeCam1;
extern EvtScript ShakeCamX;
Many more functions decomped
2020-10-08 21:03:58 +02:00
Shiftable BSS (#1092) * Shiftable BSS * osFlash cleanup * Fix warning * PRomment * fixes * gulp * yummy * more * more * more alignment * oopth * fix budges * Several budges * more * more budges * fix black screen before "today..." * final cleanup
2023-07-21 18:53:09 +02:00
extern MusicSettings gMusicSettings[2];
Matching code_39cb0_len_100.c
2020-12-25 00:39:47 +01:00
gfx syms (thanks :four_leaf_clover:)
2021-01-11 04:52:08 +01:00
// gfx
extern DisplayContext* gDisplayContext;
Master to main (#970) * step 1 * gMasterGfxPos -> gMainGfxPos * change label name
2023-03-08 17:55:54 +01:00
extern Gfx* gMainGfxPos;
gfx syms (thanks :four_leaf_clover:)
2021-01-11 04:52:08 +01:00
extern u16 gMatrixListPos;
Misc decomp (#215) * Misc early code decomp * Make expected script * fix m2ctx * gOverrideFlags & set/unset macros * update symbol addrs * Cleanup and PR comments * oops
2021-03-19 11:25:14 +01:00
extern s32 gCurrentDisplayContextIndex;
gfx syms (thanks :four_leaf_clover:)
2021-01-11 04:52:08 +01:00
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-22 05:19:31 +02:00
extern s16 gCurrentCamID;
sounds halfway named (#1110) * first few * more * more sounds * for now * visually separate remaining sounds * checkpoint * star power refactor * standard name * fix --------- Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-08-12 23:08:33 +02:00
extern s32 PartnerWishAnims[][5];
match star spirits (#325)
2021-07-19 20:27:56 +02:00
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-07 17:58:57 +01:00
extern HeapNode heap_battleHead;
f270, world, and more (#246) * 415D90 decomp * code_415D90 rodata migration * data migration, decomp * . * . * . * 4 funcs * non-matching * audio part 1 * audio work * end of snd * update_symbol_addrs * . * :chicken: * . * sfx func names * bgm * more audio * . * a few audio funcs * update section length * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "82ff308caf" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "82ff308caf" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "4e9d3cdf85" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "4e9d3cdf85" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * misc-decomp power * sound * 4 mo * more changes * . * some f270 * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "1c8ff4ec3f" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "1c8ff4ec3f" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "f0633ecdbc" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "f0633ecdbc" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * fix is_logo image size * . * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "4be92a4786" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "4be92a4786" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * state_step_pause * almost * fixing symbol_addrs and disasm * update symbol_addrs * . * fix Matrix4f usages * . * . * update_symbol_addrs * fixes * I hate bitfields * load_map_by_IDs * cleanup * state_step_logos * more cleanup * . * splat * PR comments
2021-04-01 20:00:29 +02:00
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-24 16:12:33 +01:00
extern u32 bMarioIdleAnims[];
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 11:52:15 +02:00
extern s32 bMarioDefendAnims[];
extern s32 bPeachIdleAnims[];
other world partners (#981) * watt * half sushie * sushie * laki first pass * checkpoint * ok * PartnerStatus * enough * minor --------- Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-03-16 07:41:26 +01:00
extern PartnerStatus gPartnerStatus;
all sounds named (#1120) * 128 left * all sounds done * most battle flags * battle message states * status bar and shop cleanup --------- Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2023-10-22 14:39:20 +02:00
extern StatusBar gStatusBar;
Overlay 2 bss reorg (#733) * cleanup + almost done with _use_partner_ability * _use_partner_ability and bss bonanza * gCameras fix * cleanup * cleanup
2022-06-13 18:34:22 +02:00
extern PlayerStatus gPlayerStatus;
extern PlayerSpinState gPlayerSpinState;
extern PlayerData gPlayerData;
Pal battle (#989) * world partners Co-authored-by: Unnunu <serge_zorkin@mail.ru> * battle partners * battle items * Update src/battle/common/move/ItemRefund.inc.c Co-authored-by: Alex Bates <16batesa@gmail.com> * add LANGUAGE enum * Move extern variable declarations * Remove temp var * Update scripts * remove post * Fix n64img version This reverts commit f5a2c592bdc3e26dc4e8031c1b77f4217e85570f. * unfix n64img --------- Co-authored-by: Unnunu <serge_zorkin@mail.ru> Co-authored-by: Alex Bates <16batesa@gmail.com>
2023-03-26 19:03:19 +02:00
#if VERSION_PAL
extern s32 gCurrentLanguage;
whoooooweee that is some good ol' fashioned decomp (pal funcs) (#1076) * whoooooweee that is some good ol' fashioned decomp * fixins * PRomment * Fixes #1075 * change ver to pal * another * some more * progress.py formatting * oopth * Promment * Promment2
2023-07-03 11:35:05 +02:00
#else
#define gCurrentLanguage 0
Pal battle (#989) * world partners Co-authored-by: Unnunu <serge_zorkin@mail.ru> * battle partners * battle items * Update src/battle/common/move/ItemRefund.inc.c Co-authored-by: Alex Bates <16batesa@gmail.com> * add LANGUAGE enum * Move extern variable declarations * Remove temp var * Update scripts * remove post * Fix n64img version This reverts commit f5a2c592bdc3e26dc4e8031c1b77f4217e85570f. * unfix n64img --------- Co-authored-by: Unnunu <serge_zorkin@mail.ru> Co-authored-by: Alex Bates <16batesa@gmail.com>
2023-03-26 19:03:19 +02:00
#endif
headers, some decomp
2020-07-18 02:47:33 +02:00
#endif
Reference in New Issue Copy Permalink