Skip to content

Commit

Permalink
Nerf Kenchukuo, disable Contest Moves
Browse files Browse the repository at this point in the history
  • Loading branch information
Pseurae committed Oct 7, 2024
1 parent ce29789 commit b30a301
Show file tree
Hide file tree
Showing 5 changed files with 92 additions and 1 deletion.
3 changes: 3 additions & 0 deletions config.asm
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@
; Adds new moves to complement the P/S Split.
.definelabel NEW_MOVES, 1

; Made changes to the Pokemon evolution data.
.definelabel EVOLUTION_CHANGES, 1

; Bugfixes
; --------

Expand Down
1 change: 1 addition & 0 deletions main.asm
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
.include "scripts/colored_field_moves.asm"
.include "scripts/colored_stats.asm"
.include "scripts/emerald_save_prompt.asm"
.include "scripts/evolution_changes.asm"
.include "scripts/exp_on_capture.asm"
.include "scripts/hm_system.asm"
.include "scripts/more_exp.asm"
Expand Down
23 changes: 23 additions & 0 deletions scripts/evolution_changes.asm
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
.expfunc @get_evolution_offset(_species, _n), (0x8203b68 + 8 * ((_species * 5) + _n))

.macro @set_evolution_method, _species, _n, _method
.org @get_evolution_offset(_species, _n)
.halfword _method
.endmacro

.macro @set_evolution_param, _species, _n, _param
.org @get_evolution_offset(_species, _n) + 2
.halfword _param
.endmacro

.macro @set_evolution_target, _species, _n, _target
.org @get_evolution_offset(_species, _n) + 4
.halfword _target
.endmacro

.if EVOLUTION_CHANGES

@set_evolution_param SPECIES_KOFFING, 0, 24
@set_evolution_param SPECIES_BALTOY, 0, 24

.endif
32 changes: 31 additions & 1 deletion scripts/new_moves.asm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.macro set_learnset, _species, _learnset
.macro @set_learnset, _species, _learnset
.org 0x8207bc8 + 4 * _species
.word _learnset
.endmacro
Expand Down Expand Up @@ -196,4 +196,34 @@
.org 0x8120DF4
.fill 6, 0x0

; Move Contest Moves section altogether
.org 0x809D948
mov r0, #2

.org 0x809D972
mov r0, #2

.org 0x809D9A0
mov r2, #2

.org 0x809D9C6
mov r0, #2

.org 0x809D9B0
set_function_hook r7, @SelectMoves_HeaderFix

.autoregion
.align 4
@SelectMoves_HeaderFix:
mov r2, #3
strb r2, [r0]
add r0, #1
strb r3, [r0]
sub r0, #6

ldr r7, =(0x809D9B8 | 1)
bx r7
.pool
.endautoregion

.endif
34 changes: 34 additions & 0 deletions scripts/pokemon_stat_changes.asm
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
0x081fec18

.expfunc @get_stat_offset(_species), (0x081fec18 + _species * 28)

.macro @set_pokestat_hp, _species, _hp
.org @get_stat_offset(_species)
.byte _hp

.macro @set_pokestat_atk, _species, _atk
.org @get_stat_offset(_species) + 1
.byte _atk

.macro @set_pokestat_def, _species, _def
.org @get_stat_offset(_species) + 2
.byte _def

.macro @set_pokestat_spd, _species, _spd
.org @get_stat_offset(_species) + 3
.byte _spd

.macro @set_pokestat_spatk, _species, _spdef
.org @get_stat_offset(_species) + 4
.byte _spdef

.macro @set_pokestat_spdef, _species, _spatk
.org @get_stat_offset(_species) + 5
.byte _spatk

@set_pokestat_hp SPECIES_KENCHUKUO, 85
@set_pokestat_atk SPECIES_KENCHUKUO, 120
@set_pokestat_def SPECIES_KENCHUKUO, 85
@set_pokestat_spatk SPECIES_KENCHUKUO, 85
@set_pokestat_spdef SPECIES_KENCHUKUO, 85
@set_pokestat_spd SPECIES_KENCHUKUO, 100

0 comments on commit b30a301

Please sign in to comment.