diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle/critical_hit_chances.asm | 14 | ||||
| -rw-r--r-- | data/events/happiness_probabilities.asm | 14 | ||||
| -rw-r--r-- | data/maps/sgb_roof_pal_inds.asm | 2 | ||||
| -rw-r--r-- | data/moves/magnitude_power.asm | 14 | ||||
| -rw-r--r-- | data/moves/present_power.asm | 6 | ||||
| -rw-r--r-- | data/pokemon/evos_attacks.asm | 1 | ||||
| -rw-r--r-- | data/pokemon/unown_words.asm | 2 | ||||
| -rw-r--r-- | data/predef_pointers.asm | 2 |
8 files changed, 28 insertions, 27 deletions
diff --git a/data/battle/critical_hit_chances.asm b/data/battle/critical_hit_chances.asm index 0128f1a1e..bb1ce9ab4 100644 --- a/data/battle/critical_hit_chances.asm +++ b/data/battle/critical_hit_chances.asm @@ -1,8 +1,8 @@ CriticalHitChances: - db 7 percent ; 0 - db 12 percent + 2 ; +1 - db 25 percent + 1 ; +2 - db 33 percent + 1 ; +3 - db 50 percent + 1 ; +4 - db 50 percent + 1 ; +5 - db 50 percent + 1 ; +6 + db 1 out_of 15 ; 0 + db 1 out_of 8 ; +1 + db 1 out_of 4 ; +2 + db 1 out_of 3 ; +3 + db 1 out_of 2 ; +4 + db 1 out_of 2 ; +5 + db 1 out_of 2 ; +6 diff --git a/data/events/happiness_probabilities.asm b/data/events/happiness_probabilities.asm index 7a80f989e..f67db07f3 100644 --- a/data/events/happiness_probabilities.asm +++ b/data/events/happiness_probabilities.asm @@ -1,12 +1,12 @@ HappinessData_OlderHaircutBrother: - db $4c, 2, HAPPINESS_OLDERCUT1 ; 30% chance - db $80, 3, HAPPINESS_OLDERCUT2 ; 20% chance - db $ff, 4, HAPPINESS_OLDERCUT3 ; 50% chance + db 30 percent, 2, HAPPINESS_OLDERCUT1 ; 30% chance + db 50 percent + 1, 3, HAPPINESS_OLDERCUT2 ; 50% chance + db 100 percent, 4, HAPPINESS_OLDERCUT3 ; 20% chance HappinessData_YoungerHaircutBrother: - db $9a, 2, HAPPINESS_YOUNGCUT1 ; 60% chance - db $4c, 3, HAPPINESS_YOUNGCUT2 ; 10% chance - db $ff, 4, HAPPINESS_YOUNGCUT3 ; 30% chance + db 60 percent + 1, 2, HAPPINESS_YOUNGCUT1 ; 60% chance + db 30 percent, 3, HAPPINESS_YOUNGCUT2 ; 30% chance + db 100 percent, 4, HAPPINESS_YOUNGCUT3 ; 10% chance HappinessData_DaisysGrooming: - db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance + db 100 percent, 2, HAPPINESS_GROOMING ; 99.6% chance diff --git a/data/maps/sgb_roof_pal_inds.asm b/data/maps/sgb_roof_pal_inds.asm index 4b117fe67..a2620e194 100644 --- a/data/maps/sgb_roof_pal_inds.asm +++ b/data/maps/sgb_roof_pal_inds.asm @@ -2,7 +2,7 @@ MapGroupRoofSGBPalInds: ; entries correspond to map groups - db PREDEFPAL_00 + db PREDEFPAL_ROUTES db PREDEFPAL_OLIVINE db PREDEFPAL_MAHOGANY db PREDEFPAL_DUNGEONS diff --git a/data/moves/magnitude_power.asm b/data/moves/magnitude_power.asm index 7359bdb10..632a0c030 100644 --- a/data/moves/magnitude_power.asm +++ b/data/moves/magnitude_power.asm @@ -1,9 +1,9 @@ MagnitudePower: ; chance, power, magnitude # - db 13, 10, 4 - db 38, 30, 5 - db 89, 50, 6 - db 166, 70, 7 - db 217, 90, 8 - db 242, 110, 9 - db 255, 150, 10 + db 5 percent + 1, 10, 4 ; 5% + db 15 percent, 30, 5 ; 10% + db 35 percent, 50, 6 ; 20% + db 65 percent + 1, 70, 7 ; 30% + db 85 percent + 1, 90, 8 ; 20% + db 95 percent, 110, 9 ; 10% + db 100 percent, 150, 10 ; 5% diff --git a/data/moves/present_power.asm b/data/moves/present_power.asm index 885e9c692..9f85b8a6b 100644 --- a/data/moves/present_power.asm +++ b/data/moves/present_power.asm @@ -1,6 +1,6 @@ PresentPower: ; chance, power - db 40 percent, 40 ; 40% - db 70 percent + 1, 80 ; 30% - db 80 percent, 120 ; 10% + db 40 percent, 40 ; 40% chance + db 70 percent + 1, 80 ; 30% chance + db 80 percent, 120 ; 10% chance db -1 ; 20% chance to heal instead diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm index 86df03733..eb6cb8a22 100644 --- a/data/pokemon/evos_attacks.asm +++ b/data/pokemon/evos_attacks.asm @@ -1198,6 +1198,7 @@ GrimerEvosAttacks: MukEvosAttacks: db 0 ; no more evolutions + ; moves are not sorted by level db 1, POISON_GAS db 1, POUND db 1, HARDEN diff --git a/data/pokemon/unown_words.asm b/data/pokemon/unown_words.asm index 5b54b84ed..6ddd0f466 100644 --- a/data/pokemon/unown_words.asm +++ b/data/pokemon/unown_words.asm @@ -1,7 +1,7 @@ unownword: MACRO x = 1 rept STRLEN(\1) - db STRSUB(\1, x, 1) - $40 + db STRSUB(\1, x, 1) - "A" + FIRST_UNOWN_CHAR x = x + 1 endr db -1 diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm index 1693f22aa..a35a380b8 100644 --- a/data/predef_pointers.asm +++ b/data/predef_pointers.asm @@ -24,7 +24,7 @@ PredefPointers:: add_predef CanLearnTMHMMove add_predef GetTMHMMove add_predef LinkTextboxAtHL ; $ 10 - add_predef PrintMoveDesc + add_predef PrintMoveDescription add_predef UpdatePlayerHUD add_predef PlaceGraphic add_predef CheckPlayerPartyForFitMon |