Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-03-21 17:25:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved WEAK_TYPE_PICKER_MATCHUP_MULTIPLIERS to ASM

Browse Source
This commit is contained in:
AnonymousRandomPerson 2025-09-20 23:36:50 -04:00
parent 189e075747
commit 9837dd4e2e
6 changed files with 72 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/include/overlay_29_rodata_023527C0.inc
View File

@ -1,3 +1 @@
#pragma once
.public ov29_023529C4
.public ov29_023529EC

3
asm/include/overlay_29_rodata_02352894.inc Normal file
View File

@ -0,0 +1,3 @@
#pragma once
.public ov29_023529C4
.public ov29_023529EC

67
asm/overlay_29_rodata_023527C0.s
View File

@ -62,70 +62,3 @@ DAMAGE_FORMULA_MAX_BASE:
.global DAMAGE_FORMULA_MIN_BASE
DAMAGE_FORMULA_MIN_BASE:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00
.global WEAK_TYPE_PICKER_MATCHUP_MULTIPLIERS
WEAK_TYPE_PICKER_MATCHUP_MULTIPLIERS:
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
.global ov29_02352894
ov29_02352894:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.global TYPE_DAMAGE_NEGATING_EXCLUSIVE_ITEM_EFFECTS
TYPE_DAMAGE_NEGATING_EXCLUSIVE_ITEM_EFFECTS:
.byte 0x02, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00
.byte 0x05, 0x00, 0x00, 0x00, 0x69, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x6A, 0x00, 0x00, 0x00
.byte 0x09, 0x00, 0x00, 0x00, 0x6B, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x6C, 0x00, 0x00, 0x00
.byte 0x0B, 0x00, 0x00, 0x00, 0x6D, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x6E, 0x00, 0x00, 0x00
.byte 0x0F, 0x00, 0x00, 0x00, 0x6F, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00
.byte 0x11, 0x00, 0x00, 0x00, 0x71, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x00
.byte 0x05, 0x00, 0x00, 0x00, 0x75, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00
.byte 0x07, 0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00
.byte 0x0A, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x7A, 0x00, 0x00, 0x00
.byte 0x0C, 0x00, 0x00, 0x00, 0x7B, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x7C, 0x00, 0x00, 0x00
.byte 0x0E, 0x00, 0x00, 0x00, 0x7D, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00
.byte 0x10, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00
.byte 0x12, 0x00, 0x00, 0x00, 0x81, 0x00, 0x00, 0x00
.global ov29_02352984
ov29_02352984:
.byte 0x46, 0x4C, 0x56, 0x20, 0x3A, 0x20, 0x25, 0x64
.byte 0x0A, 0x00, 0x00, 0x00
.global ov29_02352990
ov29_02352990:
.byte 0x41, 0x54, 0x20, 0x3A, 0x20, 0x25, 0x64, 0x0A, 0x00, 0x00, 0x00, 0x00
.global ov29_0235299C
ov29_0235299C:
.byte 0x44, 0x45, 0x46, 0x20, 0x3A, 0x20, 0x25, 0x64, 0x0A, 0x00, 0x00, 0x00
.global ov29_023529A8
ov29_023529A8:
.byte 0x0D, 0x00, 0x00, 0x00
.global ov29_023529AC
ov29_023529AC:
.byte 0x00, 0x00, 0x00, 0x00
.global ov29_023529B0
ov29_023529B0:
.byte 0x01, 0x00, 0x02, 0x00, 0x04, 0x00, 0x08, 0x00
.global ov29_023529B8
ov29_023529B8:
.word ov29_023529C4
.word ov29_023529C4
.word ov29_023529EC
.global ov29_023529C4
ov29_023529C4:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00
.byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x01, 0x00, 0x63, 0x00, 0x63, 0x00
.global ov29_023529EC
ov29_023529EC:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00
.byte 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00
.byte 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0xFF, 0xFF, 0x02, 0x00, 0xFE, 0xFF
.byte 0x01, 0x00, 0xFE, 0xFF, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFE, 0xFF, 0xFE, 0xFF
.byte 0xFE, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0x00, 0x00, 0xFE, 0xFF, 0x01, 0x00, 0xFE, 0xFF, 0x02, 0x00
.byte 0xFF, 0xFF, 0x02, 0x00, 0x63, 0x00, 0x63, 0x00
.global ov29_02352A54
ov29_02352A54:
.byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
.byte 0xFF, 0xFF, 0xFF, 0xFF

67
asm/overlay_29_rodata_02352894.s Normal file
View File

@ -0,0 +1,67 @@
.include "asm/macros.inc"
.include "overlay_29_rodata_02352894.inc"
.rodata
.global ov29_02352894
ov29_02352894:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
.global TYPE_DAMAGE_NEGATING_EXCLUSIVE_ITEM_EFFECTS
TYPE_DAMAGE_NEGATING_EXCLUSIVE_ITEM_EFFECTS:
.byte 0x02, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x67, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00
.byte 0x05, 0x00, 0x00, 0x00, 0x69, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x6A, 0x00, 0x00, 0x00
.byte 0x09, 0x00, 0x00, 0x00, 0x6B, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x6C, 0x00, 0x00, 0x00
.byte 0x0B, 0x00, 0x00, 0x00, 0x6D, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x6E, 0x00, 0x00, 0x00
.byte 0x0F, 0x00, 0x00, 0x00, 0x6F, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00
.byte 0x11, 0x00, 0x00, 0x00, 0x71, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x00
.byte 0x03, 0x00, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x00
.byte 0x05, 0x00, 0x00, 0x00, 0x75, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00
.byte 0x07, 0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00
.byte 0x0A, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x7A, 0x00, 0x00, 0x00
.byte 0x0C, 0x00, 0x00, 0x00, 0x7B, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x7C, 0x00, 0x00, 0x00
.byte 0x0E, 0x00, 0x00, 0x00, 0x7D, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x00, 0x00
.byte 0x10, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00
.byte 0x12, 0x00, 0x00, 0x00, 0x81, 0x00, 0x00, 0x00
.global ov29_02352984
ov29_02352984:
.byte 0x46, 0x4C, 0x56, 0x20, 0x3A, 0x20, 0x25, 0x64
.byte 0x0A, 0x00, 0x00, 0x00
.global ov29_02352990
ov29_02352990:
.byte 0x41, 0x54, 0x20, 0x3A, 0x20, 0x25, 0x64, 0x0A, 0x00, 0x00, 0x00, 0x00
.global ov29_0235299C
ov29_0235299C:
.byte 0x44, 0x45, 0x46, 0x20, 0x3A, 0x20, 0x25, 0x64, 0x0A, 0x00, 0x00, 0x00
.global ov29_023529A8
ov29_023529A8:
.byte 0x0D, 0x00, 0x00, 0x00
.global ov29_023529AC
ov29_023529AC:
.byte 0x00, 0x00, 0x00, 0x00
.global ov29_023529B0
ov29_023529B0:
.byte 0x01, 0x00, 0x02, 0x00, 0x04, 0x00, 0x08, 0x00
.global ov29_023529B8
ov29_023529B8:
.word ov29_023529C4
.word ov29_023529C4
.word ov29_023529EC
.global ov29_023529C4
ov29_023529C4:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00
.byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF
.byte 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x01, 0x00, 0x63, 0x00, 0x63, 0x00
.global ov29_023529EC
ov29_023529EC:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00
.byte 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x00
.byte 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0xFF, 0xFF, 0x02, 0x00, 0xFE, 0xFF
.byte 0x01, 0x00, 0xFE, 0xFF, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFE, 0xFF, 0xFE, 0xFF
.byte 0xFE, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0x00, 0x00, 0xFE, 0xFF, 0x01, 0x00, 0xFE, 0xFF, 0x02, 0x00
.byte 0xFF, 0xFF, 0x02, 0x00, 0x63, 0x00, 0x63, 0x00
.global ov29_02352A54
ov29_02352A54:
.byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
.byte 0xFF, 0xFF, 0xFF, 0xFF

1
main.lsf
View File

@ -475,6 +475,7 @@ Overlay OVY_29
Object src/overlay_29_0230A9DC.o
Object asm/overlay_29_0230AA0C.o
Object src/dungeon_damage.o
Object asm/overlay_29_rodata_02352894.o
Object asm/overlay_29_0230BBAC.o
Object src/overlay_29_0230E578.o
Object asm/overlay_29_0230E5A8.o

2
src/dungeon_damage.c
View File

@ -151,7 +151,7 @@ s32 WeightWeakTypePicker(struct entity *user, struct entity *target, enum type_i
return weight + 2;
}
#else
extern u32 WEAK_TYPE_PICKER_MATCHUP_MULTIPLIERS[NUM_EFFECTIVENESS];
const u32 WEAK_TYPE_PICKER_MATCHUP_MULTIPLIERS[NUM_EFFECTIVENESS] = {0, 1, 2, 4};
asm s32 WeightWeakTypePicker(struct entity *user, struct entity *target, enum type_id move_type)
{