diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2021-05-01 17:20:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-01 17:20:15 -0700 |
| commit | f8fa5c423a470d5c8559eab2afa9167369afa484 (patch) | |
| tree | 23930a1d2ec8878e9f9c9d36bc501a18df947c21 /data | |
| parent | 0cfa5a9a066b33f8b4896edfcd29bc13986f0c27 (diff) | |
| parent | edc21b146fc05b7ead84abba00e95e8e3f18c708 (diff) | |
Merge pull request #154 from Henny022p/mazaal
Mazaal
Diffstat (limited to 'data')
| -rw-r--r-- | data/const/enemy/mazaalBracelet.s | 109 | ||||
| -rw-r--r-- | data/const/enemy/mazaalHand.s | 27 | ||||
| -rw-r--r-- | data/const/enemy/mazaalHead.s | 96 | ||||
| -rw-r--r-- | data/const/enemy/mazaalMacro.s | 37 |
4 files changed, 0 insertions, 269 deletions
diff --git a/data/const/enemy/mazaalBracelet.s b/data/const/enemy/mazaalBracelet.s deleted file mode 100644 index 26632bd9..00000000 --- a/data/const/enemy/mazaalBracelet.s +++ /dev/null @@ -1,109 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - - -gUnk_080CFC14:: @ 080CFC14 - .4byte sub_0803A170 - .4byte sub_0803A188 - .4byte sub_08001324 - .4byte sub_0804A7D4 - .4byte sub_08001242 - .4byte nullsub_167 - -gUnk_080CFC2C:: @ 080CFC2C - .4byte sub_0803A254 - .4byte sub_0803A254 - .4byte sub_0803B8F8 - .4byte sub_0803B8F8 - -gUnk_080CFC3C:: @ 080CFC3C - .4byte sub_0803A274 - .4byte sub_0803A364 - .4byte sub_0803A548 - .4byte sub_0803A58C - .4byte sub_0803A5D0 - .4byte sub_0803A60C - .4byte sub_0803A660 - .4byte sub_0803A6E8 - .4byte sub_0803A720 - .4byte sub_0803A740 - .4byte sub_0803A780 - .4byte sub_0803A7AC - .4byte sub_0803A7CC - .4byte sub_0803A814 - .4byte sub_0803A86C - .4byte sub_0803A8B8 - .4byte sub_0803A90C - .4byte sub_0803A978 - .4byte sub_0803AA00 - .4byte sub_0803AA98 - .4byte sub_0803AB10 - .4byte sub_0803AB5C - .4byte sub_0803ABB4 - .4byte sub_0803AC1C - .4byte sub_0803AC60 - .4byte sub_0803ACC0 - .4byte sub_0803ADAC - .4byte sub_0803ADF4 - .4byte sub_0803AE48 - .4byte sub_0803AEC4 - .4byte sub_0803AF18 - .4byte sub_0803AF50 - .4byte sub_0803AF7C - .4byte sub_0803AF9C - .4byte sub_0803AFC8 - .4byte sub_0803AFE0 - .4byte sub_0803B01C - .4byte sub_0803B04C - .4byte sub_0803B074 - .4byte sub_0803B0D4 - .4byte sub_0803B100 - .4byte sub_0803B144 - .4byte sub_0803B17C - .4byte sub_0803B1B8 - .4byte sub_0803B2D0 - .4byte sub_0803B30C - .4byte sub_0803B338 - .4byte sub_0803B35C - .4byte sub_0803B398 - .4byte sub_0803B3F4 - .4byte sub_0803B480 - -gUnk_080CFD08:: @ 080CFD08 - .incbin "baserom.gba", 0x0CFD08, 0x0000002 - -gUnk_080CFD0A:: @ 080CFD0A - .incbin "baserom.gba", 0x0CFD0A, 0x0000002 - -gUnk_080CFD0C:: @ 080CFD0C - .incbin "baserom.gba", 0x0CFD0C, 0x000000D - -gUnk_080CFD19:: @ 080CFD19 - .incbin "baserom.gba", 0x0CFD19, 0x0000002 - -gUnk_080CFD1B:: @ 080CFD1B - .incbin "baserom.gba", 0x0CFD1B, 0x0000002 - -gUnk_080CFD1D:: @ 080CFD1D - .incbin "baserom.gba", 0x0CFD1D, 0x0000003 - -gUnk_080CFD20:: @ 080CFD20 - .4byte sub_0803B910 - .4byte sub_0803B978 - .4byte sub_0803BA6C - .4byte sub_0803BA80 - -gUnk_080CFD30:: @ 080CFD30 - .incbin "baserom.gba", 0x0CFD30, 0x0000014 - -gUnk_080CFD44:: @ 080CFD44 - .incbin "baserom.gba", 0x0CFD44, 0x0000014 - -gUnk_080CFD58:: @ 080CFD58 - .incbin "baserom.gba", 0x0CFD58, 0x0000004 - -gUnk_080CFD5C:: @ 080CFD5C - .incbin "baserom.gba", 0x0CFD5C, 0x0000004 diff --git a/data/const/enemy/mazaalHand.s b/data/const/enemy/mazaalHand.s deleted file mode 100644 index 0d65c322..00000000 --- a/data/const/enemy/mazaalHand.s +++ /dev/null @@ -1,27 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_080CEF34:: @ 080CEF34 - .4byte gUnk_080FD394 - .4byte gUnk_080FD394 - .4byte gUnk_080FD394 - .4byte gUnk_080FD39C - .4byte gUnk_080FD3A4 - .4byte gUnk_080FD3AC - .4byte gUnk_080FD3AC - .4byte gUnk_080FD3AC - .4byte gUnk_080FD3AC - -gUnk_080CEF58:: @ 080CEF58 - .4byte gUnk_080FD3B4 - .4byte gUnk_080FD3B4 - .4byte gUnk_080FD3B4 - .4byte gUnk_080FD3BC - .4byte gUnk_080FD3A4 - .4byte gUnk_080FD3C4 - .4byte gUnk_080FD3C4 - .4byte gUnk_080FD3C4 - .4byte gUnk_080FD3C4 diff --git a/data/const/enemy/mazaalHead.s b/data/const/enemy/mazaalHead.s deleted file mode 100644 index 58b68b47..00000000 --- a/data/const/enemy/mazaalHead.s +++ /dev/null @@ -1,96 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_080CEC88:: @ 080CEC88 - .4byte sub_08033EF0 - .4byte sub_08033F08 - .4byte sub_08001324 - .4byte sub_0804A7D4 - .4byte sub_08001242 - .4byte nullsub_160 - -gUnk_080CECA0:: @ 080CECA0 - .4byte sub_08033F1C - .4byte sub_08034A84 - .4byte sub_08034AC4 - .4byte sub_08034AC4 - .4byte sub_08034BC8 - -gUnk_080CECB4:: @ 080CECB4 - .4byte sub_08033F3C - .4byte sub_08033FFC - .4byte sub_0803414C - .4byte sub_080341B8 - .4byte sub_080341D0 - .4byte sub_080341F4 - .4byte sub_08034210 - .4byte sub_08034240 - .4byte sub_08034274 - .4byte sub_080342A0 - .4byte sub_080342B4 - .4byte sub_080342C8 - .4byte sub_08034348 - .4byte sub_0803438C - -gUnk_080CECEC:: @ 080CECEC - .incbin "baserom.gba", 0x0CECEC, 0x0000008 - -gUnk_080CECF4:: @ 080CECF4 - .incbin "baserom.gba", 0x0CECF4, 0x000000E - -gUnk_080CED02:: @ 080CED02 - .incbin "baserom.gba", 0x0CED02, 0x0000004 - -gUnk_080CED06:: @ 080CED06 - .incbin "baserom.gba", 0x0CED06, 0x0000006 - -gUnk_080CED0C:: @ 080CED0C - .4byte sub_08034578 - .4byte sub_080344E0 - .4byte sub_0803451C - .4byte sub_080344E0 - .4byte sub_08034558 - .4byte sub_080344E0 - .4byte sub_0803451C - .4byte sub_080346A0 - -gUnk_080CED2C:: @ 080CED2C - .4byte sub_08034578 - .4byte sub_080345D0 - .4byte sub_0803451C - .4byte sub_080346A0 - .4byte sub_08034558 - .4byte sub_080345D0 - .4byte sub_08034558 - .4byte sub_080346A0 - -gUnk_080CED4C:: @ 080CED4C - .4byte sub_08034578 - .4byte sub_080345D0 - .4byte sub_080346C8 - .4byte sub_080346A0 - .4byte sub_08034558 - .4byte sub_080346C8 - .4byte sub_080346A0 - .4byte sub_080346C8 - -gUnk_080CED6C:: @ 080CED6C - .incbin "baserom.gba", 0x0CED6C, 0x0000008 - -gUnk_080CED74:: @ 080CED74 - .4byte sub_08034AEC - .4byte sub_08034B0C - .4byte sub_08034B38 - .4byte sub_08034BA0 - -gUnk_080CED84:: @ 080CED84 - .incbin "baserom.gba", 0x0CED84, 0x0000004 - -gUnk_080CED88:: @ 080CED88 - .incbin "baserom.gba", 0x0CED88, 0x0000014 - -gUnk_080CED9C:: @ 080CED9C - .incbin "baserom.gba", 0x0CED9C, 0x0000014 diff --git a/data/const/enemy/mazaalMacro.s b/data/const/enemy/mazaalMacro.s deleted file mode 100644 index 3c64ef30..00000000 --- a/data/const/enemy/mazaalMacro.s +++ /dev/null @@ -1,37 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_080CEE90:: @ 080CEE90 - .4byte sub_08034C7C - .4byte sub_08034CA4 - .4byte sub_08001324 - .4byte sub_08034CBC - .4byte sub_08001242 - -gUnk_080CEEA4:: @ 080CEEA4 - .4byte sub_08034CC4 - .4byte sub_08034D4C - .4byte sub_08034DC8 - -gUnk_080CEEB0:: @ 080CEEB0 - .4byte sub_08034E30 - .4byte sub_08034E68 - .4byte sub_08034EC0 - .4byte sub_08034ED8 - .4byte sub_08034EE4 - .4byte sub_08034F58 - -gUnk_080CEEC8:: @ 080CEEC8 - .incbin "baserom.gba", 0x0CEEC8, 0x0000004 - -gUnk_080CEECC:: @ 080CEECC - .incbin "baserom.gba", 0x0CEECC, 0x000000C - -gUnk_080CEED8:: @ 080CEED8 - .incbin "baserom.gba", 0x0CEED8, 0x0000004 - -gUnk_080CEEDC:: @ 080CEEDC - .incbin "baserom.gba", 0x0CEEDC, 0x000002C |
