diff options
| author | Macrepeh <63179588+Macrepeh@users.noreply.github.com> | 2020-07-14 17:28:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-14 17:28:41 -0400 |
| commit | 9ee00ce656cf97507a51313e997064b15600aaa1 (patch) | |
| tree | 809e6905cd950005c659561fcc693cadc23b24d6 /data | |
| parent | d649701eb8cf9b2261871fe0864f57db820850d4 (diff) | |
| parent | ed5c6d08dd012b1f5cd7c441b8b52169bb3ba6df (diff) | |
Merge pull request #2 from zeldaret/master
mnerge
Diffstat (limited to 'data')
| -rw-r--r-- | data/data_080B2A70.s | 5 | ||||
| -rw-r--r-- | data/playerItemFunctions.s | 61 |
2 files changed, 62 insertions, 4 deletions
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..b0d09e36 --- /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 Item11 +/*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 Item11 +.4byte sub_080700E8 +.4byte sub_080ACF14 +.4byte sub_0805FBD0 +.4byte sub_080A306C +.4byte SwordBeam +.4byte NulledItem +.4byte CellOverwriteSet +*/
\ No newline at end of file |