Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-08-06 02:32:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

correct tm items to orb items

Browse Source
This commit is contained in:
DizzyEggg 2025-06-20 09:24:11 +02:00
parent f0210d3164
commit e63bcb8f28
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/constants/item.h
View File

@ -174,14 +174,14 @@
#define ITEM_TM_BULK_UP 132
#define ITEM_TM_BULLET_SEED 133
#define ITEM_TM_HIDDEN_POWER 134
#define ITEM_TM_SUNNY_DAY 135
#define ITEM_SUNNY_ORB 135
#define ITEM_TM_TAUNT 136
#define ITEM_TM_ICE_BEAM 137
#define ITEM_TM_BLIZZARD 138
#define ITEM_TM_HYPER_BEAM 139
#define ITEM_TM_LIGHT_SCREEN 140
#define ITEM_TM_PROTECT 141
#define ITEM_TM_RAIN_DANCE 142
#define ITEM_RAINY_ORB 142
#define ITEM_TM_GIGA_DRAIN 143
#define ITEM_TM_SAFEGUARD 144
#define ITEM_TM_FRUSTRATION 145
@ -200,9 +200,9 @@
#define ITEM_TM_SHOCK_WAVE 158
#define ITEM_TM_FLAMETHROWER 159
#define ITEM_TM_SLUDGE_BOMB 160
#define ITEM_TM_SANDSTORM 161
#define ITEM_SANDY_ORB 161
#define ITEM_TM_FIRE_BLAST 162
#define ITEM_TM_ROCK_TOMB 163
#define ITEM_ROCKY_ORB 163
#define ITEM_TM_AERIAL_ACE 164
#define ITEM_TM_TORMENT 165
#define ITEM_TM_FACADE 166
@ -212,7 +212,7 @@
#define ITEM_TM_THIEF 170
#define ITEM_TM_STEEL_WING 171
#define ITEM_TM_SKILL_SWAP 172
#define ITEM_TM_SNATCH 173
#define ITEM_SNATCH_ORB 173
#define ITEM_TM_OVERHEAT 174
#define ITEM_TM_WIDE_SLASH 175
#define ITEM_TM_EXCAVATE 176

44
src/dungeon_info.c
View File

@ -1886,9 +1886,9 @@ static const u16 sRandomItemsSetKecleonWares2[] = {
NEXT_CHANCE (ITEM_EVASION_ORB, ODDS(6.25)),
NEXT_CHANCE (ITEM_TM_REFLECT, ODDS(57.14)),
NEXT_CHANCE (ITEM_TM_SHOCK_WAVE, ODDS(60.71)),
SKIP (ITEM_TM_SHOCK_WAVE, ITEM_TM_ROCK_TOMB),
NEXT_CHANCE (ITEM_TM_ROCK_TOMB, ODDS(12.50)),
SKIP (ITEM_TM_ROCK_TOMB, ITEM_TM_TORMENT),
SKIP (ITEM_TM_SHOCK_WAVE, ITEM_ROCKY_ORB),
NEXT_CHANCE (ITEM_ROCKY_ORB, ODDS(12.50)),
SKIP (ITEM_ROCKY_ORB, ITEM_TM_TORMENT),
NEXT_CHANCE (ITEM_TM_TORMENT, ODDS(67.86)),
NEXT_CHANCE (ITEM_TM_FACADE, ODDS(75.00)),
NEXT_CHANCE (ITEM_TM_SECRET_POWER, ODDS(82.14)),
@ -1976,9 +1976,9 @@ static const u16 sRandomItemsSetKecleonWares3[] = {
NEXT_CHANCE (ITEM_TM_REFLECT, ODDS(55.17)),
NEXT_CHANCE (ITEM_TM_SHOCK_WAVE, ODDS(58.62)),
NEXT_CHANCE (ITEM_TM_FLAMETHROWER, ODDS(62.07)),
SKIP (ITEM_TM_FLAMETHROWER, ITEM_TM_ROCK_TOMB),
NEXT_CHANCE (ITEM_TM_ROCK_TOMB, ODDS(12.50)),
SKIP (ITEM_TM_ROCK_TOMB, ITEM_TM_TORMENT),
SKIP (ITEM_TM_FLAMETHROWER, ITEM_ROCKY_ORB),
NEXT_CHANCE (ITEM_ROCKY_ORB, ODDS(12.50)),
SKIP (ITEM_ROCKY_ORB, ITEM_TM_TORMENT),
NEXT_CHANCE (ITEM_TM_TORMENT, ODDS(68.97)),
NEXT_CHANCE (ITEM_TM_FACADE, ODDS(75.86)),
NEXT_CHANCE (ITEM_TM_SECRET_POWER, ODDS(82.76)),
@ -2061,9 +2061,9 @@ static const u16 sRandomItemsSetKecleonWares4[] = {
NEXT_CHANCE (ITEM_TM_ICE_BEAM, ODDS(31.03)),
SKIP (ITEM_TM_ICE_BEAM, ITEM_TM_LIGHT_SCREEN),
NEXT_CHANCE (ITEM_TM_LIGHT_SCREEN, ODDS(34.48)),
SKIP (ITEM_TM_LIGHT_SCREEN, ITEM_TM_RAIN_DANCE),
NEXT_CHANCE (ITEM_TM_RAIN_DANCE, ODDS(12.50)),
SKIP (ITEM_TM_RAIN_DANCE, ITEM_TM_FRUSTRATION),
SKIP (ITEM_TM_LIGHT_SCREEN, ITEM_RAINY_ORB),
NEXT_CHANCE (ITEM_RAINY_ORB, ODDS(12.50)),
SKIP (ITEM_RAINY_ORB, ITEM_TM_FRUSTRATION),
NEXT_CHANCE (ITEM_TM_FRUSTRATION, ODDS(37.93)),
SKIP (ITEM_TM_FRUSTRATION, ITEM_TM_THUNDERBOLT),
NEXT_CHANCE (ITEM_TM_THUNDERBOLT, ODDS(41.38)),
@ -2076,11 +2076,11 @@ static const u16 sRandomItemsSetKecleonWares4[] = {
NEXT_CHANCE (ITEM_TM_REFLECT, ODDS(55.17)),
NEXT_CHANCE (ITEM_TM_SHOCK_WAVE, ODDS(58.62)),
NEXT_CHANCE (ITEM_TM_FLAMETHROWER, ODDS(62.07)),
SKIP (ITEM_TM_FLAMETHROWER, ITEM_TM_SANDSTORM),
NEXT_CHANCE (ITEM_TM_SANDSTORM, ODDS(20.83)),
SKIP (ITEM_TM_SANDSTORM, ITEM_TM_ROCK_TOMB),
NEXT_CHANCE (ITEM_TM_ROCK_TOMB, ODDS(25.00)),
SKIP (ITEM_TM_ROCK_TOMB, ITEM_TM_TORMENT),
SKIP (ITEM_TM_FLAMETHROWER, ITEM_SANDY_ORB),
NEXT_CHANCE (ITEM_SANDY_ORB, ODDS(20.83)),
SKIP (ITEM_SANDY_ORB, ITEM_ROCKY_ORB),
NEXT_CHANCE (ITEM_ROCKY_ORB, ODDS(25.00)),
SKIP (ITEM_ROCKY_ORB, ITEM_TM_TORMENT),
NEXT_CHANCE (ITEM_TM_TORMENT, ODDS(68.97)),
NEXT_CHANCE (ITEM_TM_FACADE, ODDS(75.86)),
NEXT_CHANCE (ITEM_TM_SECRET_POWER, ODDS(82.76)),
@ -2246,8 +2246,8 @@ static const u16 sRandomItemsSet25[] = {
NEXT_CHANCE (ITEM_TM_ICE_BEAM, ODDS(30.16)),
SKIP (ITEM_TM_ICE_BEAM, ITEM_TM_LIGHT_SCREEN),
NEXT_CHANCE (ITEM_TM_LIGHT_SCREEN, ODDS(33.33)),
SKIP (ITEM_TM_LIGHT_SCREEN, ITEM_TM_RAIN_DANCE),
NEXT_CHANCE (ITEM_TM_RAIN_DANCE, ODDS(5.88)),
SKIP (ITEM_TM_LIGHT_SCREEN, ITEM_RAINY_ORB),
NEXT_CHANCE (ITEM_RAINY_ORB, ODDS(5.88)),
NEXT_CHANCE (ITEM_TM_GIGA_DRAIN, ODDS(34.13)),
NEXT_CHANCE (ITEM_TM_SAFEGUARD, ODDS(34.92)),
NEXT_CHANCE (ITEM_TM_FRUSTRATION, ODDS(38.10)),
@ -2265,10 +2265,10 @@ static const u16 sRandomItemsSet25[] = {
NEXT_CHANCE (ITEM_TM_REFLECT, ODDS(57.14)),
NEXT_CHANCE (ITEM_TM_SHOCK_WAVE, ODDS(60.32)),
NEXT_CHANCE (ITEM_TM_FLAMETHROWER, ODDS(63.49)),
SKIP (ITEM_TM_FLAMETHROWER, ITEM_TM_SANDSTORM),
NEXT_CHANCE (ITEM_TM_SANDSTORM, ODDS(9.80)),
SKIP (ITEM_TM_FLAMETHROWER, ITEM_SANDY_ORB),
NEXT_CHANCE (ITEM_SANDY_ORB, ODDS(9.80)),
NEXT_CHANCE (ITEM_TM_FIRE_BLAST, ODDS(64.29)),
NEXT_CHANCE (ITEM_TM_ROCK_TOMB, ODDS(11.76)),
NEXT_CHANCE (ITEM_ROCKY_ORB, ODDS(11.76)),
NEXT_CHANCE (ITEM_TM_AERIAL_ACE, ODDS(65.08)),
NEXT_CHANCE (ITEM_TM_TORMENT, ODDS(71.43)),
NEXT_CHANCE (ITEM_TM_FACADE, ODDS(77.78)),
@ -2276,9 +2276,9 @@ static const u16 sRandomItemsSet25[] = {
NEXT_CHANCE (ITEM_TM_REST, ODDS(87.30)),
NEXT_CHANCE (ITEM_TM_ATTRACT, ODDS(93.65)),
NEXT_CHANCE (ITEM_TM_THIEF, ODDS(100.00)),
SKIP (ITEM_TM_THIEF, ITEM_TM_SNATCH),
NEXT_CHANCE (ITEM_TM_SNATCH, ODDS(13.73)),
SKIP (ITEM_TM_SNATCH, ITEM_MUG_ORB),
SKIP (ITEM_TM_THIEF, ITEM_SNATCH_ORB),
NEXT_CHANCE (ITEM_SNATCH_ORB, ODDS(13.73)),
SKIP (ITEM_SNATCH_ORB, ITEM_MUG_ORB),
NEXT_CHANCE (ITEM_MUG_ORB, ODDS(15.69)),
NEXT_CHANCE (ITEM_REBOUND_ORB, ODDS(17.65)),
NEXT_CHANCE (ITEM_LOB_ORB, ODDS(19.61)),