Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Match itgamewatchpanic #1393

Merged
merged 5 commits into from
Jul 8, 2024
Merged

Match itgamewatchpanic #1393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a7692b
match all funcs
thefoxcam Jul 2, 2024
f9434c0
Merge branch 'master' into itgamewatchpanic2
ribbanya Jul 8, 2024
278310a
clean up definitions and types
thefoxcam Jul 8, 2024
f61783a
mark as matching
thefoxcam Jul 8, 2024
b6dbc76
add item state table
thefoxcam Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
243 changes: 0 additions & 243 deletions asm/melee/it/items/itgamewatchpanic.s
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion config/GALE01/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15859,7 +15859,7 @@ it_802C7E94 = .text:0x802C7E94; // type:function size:0x4C scope:global
it_802C7EE0 = .text:0x802C7EE0; // type:function size:0x20 scope:global
it_802C7F00 = .text:0x802C7F00; // type:function size:0x20 scope:global
it_802C7F20 = .text:0x802C7F20; // type:function size:0x8C scope:global
it_802C7FAC = .text:0x802C7FAC; // type:function size:0x6C scope:global
it_802C7FAC = .text:0x802C7FAC; // type:function size:0x6C scope:local
it_802C8018 = .text:0x802C8018; // type:function size:0x20 scope:global
it_802C8038 = .text:0x802C8038; // type:function size:0x120 scope:global
it_802C8158 = .text:0x802C8158; // type:function size:0x70 scope:global
Expand Down
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -985,7 +985,7 @@ def RuntimeLib(lib_name: str, objects: Objects) -> LibDict:
Object(NonMatching, "melee/it/items/itgamewatchbreath.c"),
Object(NonMatching, "melee/it/items/itkirbygamewatchchefpan.c"),
Object(NonMatching, "melee/it/items/itgamewatchjudge.c"),
Object(NonMatching, "melee/it/items/itgamewatchpanic.c"),
Object(Matching, "melee/it/items/itgamewatchpanic.c"),
Object(NonMatching, "melee/it/items/itgamewatchrescue.c"),
Object(NonMatching, "melee/it/items/itgamewatchchef.c"),
Object(NonMatching, "melee/it/items/itclinkmilk.c"),
Expand Down
2 changes: 1 addition & 1 deletion obj_files.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ TEXT_O_FILES +=\
$(BUILD_DIR)/asm/melee/it/items/itgamewatchbreath.s.o\
$(BUILD_DIR)/asm/melee/it/items/itkirbygamewatchchefpan.s.o\
$(BUILD_DIR)/asm/melee/it/items/itgamewatchjudge.s.o\
$(BUILD_DIR)/asm/melee/it/items/itgamewatchpanic.s.o\
$(BUILD_DIR)/src/melee/it/items/itgamewatchpanic.c.o\
$(BUILD_DIR)/asm/melee/it/items/itgamewatchrescue.s.o\
$(BUILD_DIR)/asm/melee/it/items/itgamewatchchef.s.o\
$(BUILD_DIR)/asm/melee/it/items/itclinkmilk.s.o\
Expand Down
2 changes: 1 addition & 1 deletion src/melee/ft/chara/ftGameWatch/ftGw_SpecialLw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "ft/ftcommon.h"
#include "ft/ftparts.h"
#include "ft/types.h"
#include "it/items/it_27CF.h"
#include "it/items/itgamewatchpanic.h"
#include "lb/lb_00B0.h"

#include <common_structs.h>
Expand Down
1 change: 1 addition & 0 deletions src/melee/it/it_2725.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
/* 27C8B0 */ void it_8027C8B0(Item_GObj*);
/* 27CBFC */ f32 it_8027CBFC(Item_GObj*);
/* 27CE44 */ void it_8027CE44(Item_GObj*);
/* 27CE64 */ void it_8027CE64(Item_GObj*, Item_GObj*, s32);
/* 3F14C4 */ extern struct ItemLogicTable it_803F14C4[43];
/* 3F23CC */ extern struct ItemLogicTable it_803F23CC[];
/* 3F3100 */ extern struct ItemLogicTable it_803F3100[118];
Expand Down
4 changes: 0 additions & 4 deletions src/melee/it/items/it_27CF.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,6 @@
/* 2C7A84 */ void it_802C7A84(Item_GObj*);
/* 2C7AD0 */ void it_802C7AD0(Item_GObj*);
/* 2C7AF0 */ void it_802C7AF0(Item_GObj*);
/* 2C7D60 */ HSD_GObj* it_802C7D60(Item_GObj*, Vec3*, s32, float);
/* 2C7E94 */ void it_802C7E94(Item_GObj*);
/* 2C7EE0 */ void it_802C7EE0(Item_GObj*);
/* 2C7F00 */ void it_802C7F00(Item_GObj*);
/* 2C8038 */ HSD_GObj* it_802C8038(Item_GObj*, Vec3*, s32, s32, float, float);
/* 2C8158 */ void it_802C8158(Item_GObj*);
/* 2C81C8 */ void it_802C81C8(Item_GObj*);
Expand Down
Loading
Loading