thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix overflow & brunswick

Browse source 
Added a unique bank for evos_moves, which includes tradeback move tutor data.

Also, fixed brunswick's map parameters.
This commit is contained in:
Llinos Evans 2023-04-24 00:58:56 +01:00
parent f73117d893
commit 4ca269c429
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants/map_constants.asm
View file

@ -193,7 +193,7 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const CINNABAR_LAB_FOSSIL_ROOM, 4, 4 ; $AB map_const CINNABAR_LAB_FOSSIL_ROOM, 4, 4 ; $AB
map_const CINNABAR_POKECENTER, 7, 4 ; $AC map_const CINNABAR_POKECENTER, 7, 4 ; $AC
map_const CINNABAR_MART, 4, 4 ; $AD map_const CINNABAR_MART, 4, 4 ; $AD
map_const BRUNSWICK_TRAIL, 30, 9 ; $AE - was unused Cinnabar Mart copy map_const BRUNSWICK_TRAIL, 31, 12 ; $AE - was unused Cinnabar Mart copy
map_const INDIGO_PLATEAU_LOBBY, 8, 6 ; $AF map_const INDIGO_PLATEAU_LOBBY, 8, 6 ; $AF
map_const COPYCATS_HOUSE_1F, 4, 4 ; $B0 map_const COPYCATS_HOUSE_1F, 4, 4 ; $B0
map_const COPYCATS_HOUSE_2F, 4, 4 ; $B1 map_const COPYCATS_HOUSE_2F, 4, 4 ; $B1

2
data/maps/headers/BrunswickTrail.asm
View file

@ -1,2 +1,2 @@
map_header BrunswickTrail, BRUNSWICK_TRAIL, CELESTE, 0 map_header BrunswickTrail, BRUNSWICK_TRAIL, CITRINE, 0
end_map_header end_map_header

6
data/pokemon/tradeback_moves.asm
View file

@ -650,7 +650,7 @@ PsyduckTradebackMoves:
db 1, HYPNOSIS db 1, HYPNOSIS
db 1, LIGHT_SCREEN db 1, LIGHT_SCREEN
db 1, PSYBEAM db 1, PSYBEAM
db 1, PSYCHIC db 1, PSYCHIC_M
db 1, PETAL_DANCE db 1, PETAL_DANCE
db 1, TRI_ATTACK db 1, TRI_ATTACK
db 0 db 0
@ -1218,7 +1218,7 @@ WeirduckTradebackMoves:
db 1, HYPNOSIS db 1, HYPNOSIS
db 1, LIGHT_SCREEN db 1, LIGHT_SCREEN
db 1, PSYBEAM db 1, PSYBEAM
db 1, PSYCHIC db 1, PSYCHIC_M
db 1, PETAL_DANCE db 1, PETAL_DANCE
db 1, TRI_ATTACK db 1, TRI_ATTACK
db 0 db 0
@ -1232,7 +1232,7 @@ GolduckTradebackMoves:
db 1, HYPNOSIS db 1, HYPNOSIS
db 1, LIGHT_SCREEN db 1, LIGHT_SCREEN
db 1, PSYBEAM db 1, PSYBEAM
db 1, PSYCHIC db 1, PSYCHIC_M
db 1, PETAL_DANCE db 1, PETAL_DANCE
db 1, TRI_ATTACK db 1, TRI_ATTACK
db 0 db 0

4
main.asm
View file

@ -187,11 +187,13 @@ INCLUDE "data/moves/moves.asm"
INCLUDE "data/pokemon/base_stats.asm" INCLUDE "data/pokemon/base_stats.asm"
INCLUDE "data/pokemon/cries.asm" INCLUDE "data/pokemon/cries.asm"
INCLUDE "engine/battle/unused_stats_functions.asm" INCLUDE "engine/battle/unused_stats_functions.asm"
INCLUDE "engine/pokemon/evos_moves.asm"
INCLUDE "engine/battle/move_effects/heal.asm" INCLUDE "engine/battle/move_effects/heal.asm"
INCLUDE "engine/battle/move_effects/transform.asm" INCLUDE "engine/battle/move_effects/transform.asm"
INCLUDE "engine/battle/move_effects/reflect_light_screen.asm" INCLUDE "engine/battle/move_effects/reflect_light_screen.asm"
SECTION "Evos and Moves", ROMX
INCLUDE "engine/pokemon/evos_moves.asm"
SECTION "Battle Core", ROMX SECTION "Battle Core", ROMX