From f9e9fe0141a39997ae85a9b45b6b1b0151fec5b5 Mon Sep 17 00:00:00 2001 From: theo3 Date: Tue, 7 Jul 2020 15:32:27 -0700 Subject: dampe.c OK --- data/data_080B2A70.s | 5 +--- data/playerItemFunctions.s | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 4 deletions(-) create mode 100644 data/playerItemFunctions.s (limited to 'data') diff --git a/data/data_080B2A70.s b/data/data_080B2A70.s index c89057be..bee9d349 100644 --- a/data/data_080B2A70.s +++ b/data/data_080B2A70.s @@ -8,7 +8,4 @@ gUnk_080B2A70:: @ 080B2A70 .incbin "baserom.gba", 0x0B2A70, 0x0000268 gUnk_080B2CD8:: @ 080B2CD8 - .incbin "baserom.gba", 0x0B2CD8, 0x0000010 - -gUnk_080B2CE8:: @ 080B2CE8 - .incbin "baserom.gba", 0x0B2CE8, 0x0000064 + .incbin "baserom.gba", 0x0B2CD8, 0x0000010 \ No newline at end of file diff --git a/data/playerItemFunctions.s b/data/playerItemFunctions.s new file mode 100644 index 00000000..82723b78 --- /dev/null +++ b/data/playerItemFunctions.s @@ -0,0 +1,61 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + + gPlayerItemFunctions:: @ gPlayerItemFunctions +@ replacing .incbin "baserom.gba", 0x000b2ce8, 0x64 +/*0x00*/ .4byte DeleteEntity +/*0x01*/ .4byte sub_080A7544 +/*0x02*/ .4byte sub_0801B188 +/*0x03*/ .4byte sub_0801B45C +/*0x04*/ .4byte sub_08018FCC +/*0x05*/ .4byte sub_080A2D74 +/*0x06*/ .4byte sub_08054A40 +/*0x07*/ .4byte sub_08056330 +/*0x08*/ .4byte sub_080ADA30 +/*0x09*/ .4byte sub_080704BC +/*0x0a*/ .4byte DeleteEntity +/*0x0b*/ .4byte DeleteEntity +/*0x0c*/ .4byte sub_0801B898 +/*0x0d*/ .4byte CellOverwriteSet +/*0x0e*/ .4byte SwordSpin +/*0x0f*/ .4byte SwordBeam +/*0x10*/ .4byte sub_080ACBCC +/*0x11*/ .4byte sub_08018C88 +/*0x12*/ .4byte sub_080700E8 +/*0x13*/ .4byte sub_080ACF14 +/*0x14*/ .4byte sub_0805FBD0 +/*0x15*/ .4byte sub_080A306C +/*0x16*/ .4byte SwordBeam +/*0x17*/ .4byte NulledItem +/*0x18*/ .4byte CellOverwriteSet + +/* +.4byte DeleteEntity +.4byte sub_080A7544 +.4byte sub_0801B188 +.4byte sub_0801B45C +.4byte sub_08018FCC +.4byte sub_080A2D74 +.4byte sub_08054A40 +.4byte sub_08056330 +.4byte sub_080ADA30 +.4byte sub_080704BC +.4byte DeleteEntity +.4byte DeleteEntity +.4byte sub_0801B898 +.4byte CellOverwriteSet +.4byte SwordSpin +.4byte SwordBeam +.4byte sub_080ACBCC +.4byte sub_08018C88 +.4byte sub_080700E8 +.4byte sub_080ACF14 +.4byte sub_0805FBD0 +.4byte sub_080A306C +.4byte SwordBeam +.4byte NulledItem +.4byte CellOverwriteSet +*/ \ No newline at end of file -- cgit v1.2.3 From 03a8e052af277c60fae370df488a22c036263b7a Mon Sep 17 00:00:00 2001 From: theo3 Date: Thu, 9 Jul 2020 01:39:40 -0700 Subject: commented offsets in entity, linkState --- data/playerItemFunctions.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/playerItemFunctions.s b/data/playerItemFunctions.s index 82723b78..b0d09e36 100644 --- a/data/playerItemFunctions.s +++ b/data/playerItemFunctions.s @@ -23,7 +23,7 @@ /*0x0e*/ .4byte SwordSpin /*0x0f*/ .4byte SwordBeam /*0x10*/ .4byte sub_080ACBCC -/*0x11*/ .4byte sub_08018C88 +/*0x11*/ .4byte Item11 /*0x12*/ .4byte sub_080700E8 /*0x13*/ .4byte sub_080ACF14 /*0x14*/ .4byte sub_0805FBD0 @@ -50,7 +50,7 @@ .4byte SwordSpin .4byte SwordBeam .4byte sub_080ACBCC -.4byte sub_08018C88 +.4byte Item11 .4byte sub_080700E8 .4byte sub_080ACF14 .4byte sub_0805FBD0 -- cgit v1.2.3