thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 23:55:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small edits

Browse source 
- Attempted to fix the Mt. Moon J&J encounter (did not work, will look at the script file)

- Fixed a few bugged warps relating to Mt. Moon Square/Crater

- Fixed the credits text layout (just need to figure out how to decrease the delay between them, so it still matches the music...)

- Added the Crater guard back

- Changed the silhouettes in the credits to be more prominent Pokemon (Leader and E4 aces, plus some postgame teasers in Omega for the Chief fight, and the legendary wings)
This commit is contained in:
MementoMartha 2023-05-25 23:54:19 +01:00
parent 4997045bae
commit 6d4b0f7a4e
13 changed files with 209 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

3
constants/event_constants.asm
View file

@ -595,13 +595,14 @@
const EVENT_BEAT_MT_MOON_1_TRAINER_4
const EVENT_BEAT_MT_MOON_1_TRAINER_5
const EVENT_BEAT_MT_MOON_1_TRAINER_6
const EVENT_GOT_DOME_FOSSIL
const_skip
const EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD
const EVENT_BEAT_MT_MOON_3_TRAINER_0
const EVENT_BEAT_MT_MOON_3_TRAINER_1
const EVENT_BEAT_MT_MOON_3_TRAINER_2
const EVENT_BEAT_MT_MOON_3_TRAINER_3
const EVENT_57E ; Jessie & James related.
const EVENT_GOT_DOME_FOSSIL
const EVENT_GOT_HELIX_FOSSIL
; S.S. Anne events

281
constants/hide_show_constants.asm
View file

@ -124,148 +124,147 @@ DEF SHOW EQU $15
const HS_MT_MOON_1F_ITEM_4 ; 70 X
const HS_MT_MOON_1F_ITEM_5 ; 71 X
const HS_MT_MOON_1F_ITEM_6 ; 72 X
const HS_MT_MOON_B2F_JESSIE ; UHH 6D
const HS_MT_MOON_B2F_JAMES ; uhhh 6E
const HS_MT_MOON_B2F_FOSSIL_1 ; 73
const HS_MT_MOON_B2F_FOSSIL_2 ; 74
const HS_MT_MOON_B2F_ITEM_1 ; 75 X
const HS_MT_MOON_B2F_ITEM_2 ; 76 X
const HS_SS_ANNE_2F_RIVAL ; 78
const HS_SS_ANNE_1F_ROOMS_ITEM ; 79 X
const HS_SS_ANNE_2F_ROOMS_ITEM_1 ; 7A X
const HS_SS_ANNE_2F_ROOMS_ITEM_2 ; 7B X
const HS_SS_ANNE_B1F_ROOMS_ITEM_1 ; 7C X
const HS_SS_ANNE_B1F_ROOMS_ITEM_2 ; 7D X
const HS_SS_ANNE_B1F_ROOMS_ITEM_3 ; 7E X
const HS_WUGTRIO ; 7F X
const HS_VICTORY_ROAD_3F_ITEM_1 ; 80 X
const HS_VICTORY_ROAD_3F_ITEM_2 ; 81 X
const HS_VICTORY_ROAD_3F_BOULDER ; 82
const HS_ROCKET_HIDEOUT_B1F_ITEM_1 ; 83 X
const HS_ROCKET_HIDEOUT_B1F_ITEM_2 ; 84 X
const HS_ROCKET_HIDEOUT_B2F_ITEM_1 ; 85 X
const HS_ROCKET_HIDEOUT_B2F_ITEM_2 ; 86 X
const HS_ROCKET_HIDEOUT_B2F_ITEM_3 ; 87 X
const HS_ROCKET_HIDEOUT_B2F_ITEM_4 ; 88 X
const HS_ROCKET_HIDEOUT_B3F_ITEM_1 ; 89 X
const HS_ROCKET_HIDEOUT_B3F_ITEM_2 ; 8A X
const HS_ROCKET_HIDEOUT_B4F_GIOVANNI ; 8B
const HS_ROCKET_HIDEOUT_B4F_JAMES ; 8C
const HS_ROCKET_HIDEOUT_B4F_JESSIE ; 8D
const HS_ROCKET_HIDEOUT_B4F_ITEM_1 ; 8E X
const HS_ROCKET_HIDEOUT_B4F_ITEM_2 ; 8F X
const HS_ROCKET_HIDEOUT_B4F_ITEM_3 ; 90 X
const HS_ROCKET_HIDEOUT_B4F_ITEM_4 ; 91
const HS_ROCKET_HIDEOUT_B4F_ITEM_5 ; 92
const HS_GARNET_ARTICUNO_G ; 93
const HS_SILPH_CO_3F_1 ; 94
const HS_SILPH_CO_3F_2 ; 95
const HS_SILPH_CO_3F_ITEM ; 96 X
const HS_SILPH_CO_4F_1 ; 97
const HS_SILPH_CO_4F_2 ; 98
const HS_SILPH_CO_4F_3 ; 99
const HS_SILPH_CO_4F_ITEM_1 ; 9A X
const HS_SILPH_CO_4F_ITEM_2 ; 9B X
const HS_SILPH_CO_4F_ITEM_3 ; 9C X
const HS_SILPH_CO_5F_1 ; 9D
const HS_SILPH_CO_5F_2 ; 9E
const HS_SILPH_CO_5F_3 ; 9F
const HS_SILPH_CO_5F_4 ; A0
const HS_SILPH_CO_5F_ITEM_1 ; A1 X
const HS_SILPH_CO_5F_ITEM_2 ; A2 X
const HS_SILPH_CO_5F_ITEM_3 ; A3 X
const HS_SILPH_CO_6F_1 ; A4
const HS_SILPH_CO_6F_2 ; A5
const HS_SILPH_CO_6F_3 ; A6
const HS_SILPH_CO_6F_ITEM_1 ; A7 X
const HS_SILPH_CO_6F_ITEM_2 ; A8 X
const HS_SILPH_CO_7F_1 ; A9
const HS_SILPH_CO_7F_2 ; AA
const HS_SILPH_CO_7F_3 ; AB
const HS_SILPH_CO_7F_4 ; AC
const HS_SILPH_CO_7F_RIVAL ; AD
const HS_SILPH_CO_7F_ITEM_1 ; AE X
const HS_SILPH_CO_7F_ITEM_2 ; AF X
const HS_SILPH_CO_7F_8 ; B0 XXX sprite doesn't exist
const HS_SILPH_CO_8F_1 ; B1
const HS_SILPH_CO_8F_2 ; B2
const HS_SILPH_CO_8F_3 ; B3
const HS_SILPH_CO_10F_1 ; B4
const HS_SILPH_CO_10F_2 ; B5
const HS_SILPH_CO_10F_3 ; B6 XXX never (de)activated?
const HS_SILPH_CO_10F_ITEM_1 ; B7 X
const HS_SILPH_CO_10F_ITEM_2 ; B8 X
const HS_SILPH_CO_10F_ITEM_3 ; B9 X
const HS_SILPH_CO_11F_1 ; BA
const HS_SILPH_CO_11F_2 ; BB
const HS_SILPH_CO_11F_3 ; BC
const HS_OMEGA ; BD
const HS_DRAGONITE ; BE
const HS_MOLTRES ; BF
const HS_POKEMON_MANSION_2F_ITEM ; C0 X
const HS_POKEMON_MANSION_3F_ITEM_1 ; C1 X
const HS_POKEMON_MANSION_3F_ITEM_2 ; C2 X
const HS_POKEMON_MANSION_B1F_ITEM_1 ; C3 X
const HS_POKEMON_MANSION_B1F_ITEM_2 ; C4 X
const HS_POKEMON_MANSION_B1F_ITEM_3 ; C5 X
const HS_POKEMON_MANSION_B1F_ITEM_4 ; C6 X
const HS_POKEMON_MANSION_B1F_ITEM_5 ; C7 X
const HS_MANSION_GUARD ; C8
const HS_SAFARI_ZONE_EAST_ITEM_1 ; C9 X
const HS_SAFARI_ZONE_EAST_ITEM_2 ; CA X
const HS_SAFARI_ZONE_EAST_ITEM_3 ; CB X
const HS_SAFARI_ZONE_EAST_ITEM_4 ; CC X
const HS_SAFARI_ZONE_NORTH_ITEM_1 ; CD X
const HS_SAFARI_ZONE_NORTH_ITEM_2 ; CE X
const HS_SAFARI_ZONE_WEST_ITEM_1 ; CF X
const HS_SAFARI_ZONE_WEST_ITEM_2 ; D0 X
const HS_SAFARI_ZONE_WEST_ITEM_3 ; D1 X
const HS_SAFARI_ZONE_WEST_ITEM_4 ; D2 X
const HS_SAFARI_ZONE_CENTER_ITEM ; D3 X
const HS_CERULEAN_CAVE_2F_ITEM_1 ; D4 X
const HS_CERULEAN_CAVE_2F_ITEM_2 ; D5 X
const HS_CERULEAN_CAVE_2F_ITEM_3 ; D6 X
const HS_MEWTWO ; D7 X
const HS_CERULEAN_CAVE_B1F_ITEM_1 ; D8 X
const HS_CERULEAN_CAVE_B1F_ITEM_2 ; D9 X
const HS_VICTORY_ROAD_1F_ITEM_1 ; DA X
const HS_VICTORY_ROAD_1F_ITEM_2 ; DB X
const HS_CHAMPIONS_ROOM_OAK ; DC
const HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ; DD
const HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ; DE
const HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ; DF
const HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ; E0
const HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ; E1
const HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ; E2
const HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 ; E3
const HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 ; E4
const HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 ; E5
const HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 ; E6
const HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ; E7
const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; E8
const HS_ARTICUNO ; E9
const HS_OLD_SEA_MAP ; EA
const HS_MEW ; EB
const HS_POKEMON_MANSION_B2F_ITEM_1 ; EC
const HS_POKEMON_MANSION_B2F_ITEM_2 ; ED
const HS_ROUTE_1_OAK ; EE
const HS_YUJIROU ; EF
const HS_YUJIROU_REMATCH ; F0
const HS_MT_MOON_CRATER_ITEM_1 ; F1
const HS_MT_MOON_CRATER_ITEM_2 ; F2
const HS_MT_MOON_CRATER_ITEM_3 ; F3
const HS_MT_MOON_CRATER_ITEM_4 ; F4
const HS_MT_MOON_CRATER_ITEM_5 ; F5
const HS_MT_MOON_CRATER_ITEM_6 ; F6
const HS_MT_MOON_CRATER_ITEM_7 ; F7
const HS_MT_MOON_CRATER_ITEM_8 ; F8
const HS_MT_MOON_CRATER_ITEM_9 ; F9
const HS_MT_MOON_CRATER_ITEM_10 ; FA
const HS_MT_MOON_CRATER_ITEM_11 ; FB
const HS_MT_MOON_B2F_JESSIE ; 73
const HS_MT_MOON_B2F_JAMES ; 74
const HS_MT_MOON_B2F_FOSSIL_1 ; 75
const HS_MT_MOON_B2F_FOSSIL_2 ; 76
const HS_MT_MOON_B2F_ITEM_1 ; 77 X
const HS_MT_MOON_B2F_ITEM_2 ; 78 X
const HS_MT_MOON_CRATER_GUARD ; 79
const HS_SS_ANNE_2F_RIVAL ; 7A
const HS_SS_ANNE_1F_ROOMS_ITEM ; 7B X
const HS_SS_ANNE_2F_ROOMS_ITEM_1 ; 7C X
const HS_SS_ANNE_2F_ROOMS_ITEM_2 ; 7D X
const HS_SS_ANNE_B1F_ROOMS_ITEM_1 ; 7E X
const HS_SS_ANNE_B1F_ROOMS_ITEM_2 ; 7F X
const HS_SS_ANNE_B1F_ROOMS_ITEM_3 ; 80 X
const HS_WUGTRIO ; 81 X
const HS_VICTORY_ROAD_3F_ITEM_1 ; 82 X
const HS_VICTORY_ROAD_3F_ITEM_2 ; 83 X
const HS_VICTORY_ROAD_3F_BOULDER ; 84
const HS_ROCKET_HIDEOUT_B1F_ITEM_1 ; 85 X
const HS_ROCKET_HIDEOUT_B1F_ITEM_2 ; 86 X
const HS_ROCKET_HIDEOUT_B2F_ITEM_1 ; 87 X
const HS_ROCKET_HIDEOUT_B2F_ITEM_2 ; 88 X
const HS_ROCKET_HIDEOUT_B2F_ITEM_3 ; 89 X
const HS_ROCKET_HIDEOUT_B2F_ITEM_4 ; 8A X
const HS_ROCKET_HIDEOUT_B3F_ITEM_1 ; 8B X
const HS_ROCKET_HIDEOUT_B3F_ITEM_2 ; 8C X
const HS_ROCKET_HIDEOUT_B4F_GIOVANNI ; 8D
const HS_ROCKET_HIDEOUT_B4F_JAMES ; 8E
const HS_ROCKET_HIDEOUT_B4F_JESSIE ; 8F
const HS_ROCKET_HIDEOUT_B4F_ITEM_1 ; 90 X
const HS_ROCKET_HIDEOUT_B4F_ITEM_2 ; 91 X
const HS_ROCKET_HIDEOUT_B4F_ITEM_3 ; 92 X
const HS_ROCKET_HIDEOUT_B4F_ITEM_4 ; 93
const HS_ROCKET_HIDEOUT_B4F_ITEM_5 ; 94
const HS_GARNET_ARTICUNO_G ; 95
const HS_SILPH_CO_3F_1 ; 96
const HS_SILPH_CO_3F_2 ; 97
const HS_SILPH_CO_3F_ITEM ; 98 X
const HS_SILPH_CO_4F_1 ; 99
const HS_SILPH_CO_4F_2 ; 9A
const HS_SILPH_CO_4F_3 ; 9B
const HS_SILPH_CO_4F_ITEM_1 ; 9C X
const HS_SILPH_CO_4F_ITEM_2 ; 9D X
const HS_SILPH_CO_4F_ITEM_3 ; 9E X
const HS_SILPH_CO_5F_1 ; 9F
const HS_SILPH_CO_5F_2 ; A0
const HS_SILPH_CO_5F_3 ; A1
const HS_SILPH_CO_5F_4 ; A2
const HS_SILPH_CO_5F_ITEM_1 ; A3 X
const HS_SILPH_CO_5F_ITEM_2 ; A4 X
const HS_SILPH_CO_5F_ITEM_3 ; A5 X
const HS_SILPH_CO_6F_1 ; A6
const HS_SILPH_CO_6F_2 ; A7
const HS_SILPH_CO_6F_3 ; A8
const HS_SILPH_CO_6F_ITEM_1 ; A9 X
const HS_SILPH_CO_6F_ITEM_2 ; AA X
const HS_SILPH_CO_7F_1 ; AB
const HS_SILPH_CO_7F_2 ; AC
const HS_SILPH_CO_7F_3 ; AD
const HS_SILPH_CO_7F_4 ; AE
const HS_SILPH_CO_7F_RIVAL ; AF
const HS_SILPH_CO_7F_ITEM_1 ; B0 X
const HS_SILPH_CO_7F_ITEM_2 ; B1 X
const HS_SILPH_CO_7F_8 ; B2 XXX sprite doesn't exist
const HS_SILPH_CO_8F_1 ; B3
const HS_SILPH_CO_8F_2 ; B4
const HS_SILPH_CO_8F_3 ; B5
const HS_SILPH_CO_10F_1 ; B6
const HS_SILPH_CO_10F_2 ; B7
const HS_SILPH_CO_10F_3 ; B8 XXX never (de)activated?
const HS_SILPH_CO_10F_ITEM_1 ; B9 X
const HS_SILPH_CO_10F_ITEM_2 ; BA X
const HS_SILPH_CO_10F_ITEM_3 ; BB X
const HS_SILPH_CO_11F_1 ; BC
const HS_SILPH_CO_11F_2 ; BD
const HS_SILPH_CO_11F_3 ; BE
const HS_OMEGA ; BF
const HS_DRAGONITE ; C0
const HS_MOLTRES ; C1
const HS_POKEMON_MANSION_2F_ITEM ; C2 X
const HS_POKEMON_MANSION_3F_ITEM_1 ; C3 X
const HS_POKEMON_MANSION_3F_ITEM_2 ; C4 X
const HS_POKEMON_MANSION_B1F_ITEM_1 ; C5 X
const HS_POKEMON_MANSION_B1F_ITEM_2 ; C6 X
const HS_POKEMON_MANSION_B1F_ITEM_3 ; C7 X
const HS_POKEMON_MANSION_B1F_ITEM_4 ; C8 X
const HS_POKEMON_MANSION_B1F_ITEM_5 ; C9 X
const HS_MANSION_GUARD ; CA
const HS_SAFARI_ZONE_EAST_ITEM_1 ; CB X
const HS_SAFARI_ZONE_EAST_ITEM_2 ; CC X
const HS_SAFARI_ZONE_EAST_ITEM_3 ; CD X
const HS_SAFARI_ZONE_EAST_ITEM_4 ; CE X
const HS_SAFARI_ZONE_NORTH_ITEM_1 ; CF X
const HS_SAFARI_ZONE_NORTH_ITEM_2 ; D0 X
const HS_SAFARI_ZONE_WEST_ITEM_1 ; D1 X
const HS_SAFARI_ZONE_WEST_ITEM_2 ; D2 X
const HS_SAFARI_ZONE_WEST_ITEM_3 ; D3 X
const HS_SAFARI_ZONE_WEST_ITEM_4 ; D4 X
const HS_SAFARI_ZONE_CENTER_ITEM ; D5 X
const HS_CERULEAN_CAVE_2F_ITEM_1 ; D6 X
const HS_CERULEAN_CAVE_2F_ITEM_2 ; D7 X
const HS_CERULEAN_CAVE_2F_ITEM_3 ; D8 X
const HS_MEWTWO ; D9 X
const HS_CERULEAN_CAVE_B1F_ITEM_1 ; DA X
const HS_CERULEAN_CAVE_B1F_ITEM_2 ; DB X
const HS_VICTORY_ROAD_1F_ITEM_1 ; DC X
const HS_VICTORY_ROAD_1F_ITEM_2 ; DD X
const HS_CHAMPIONS_ROOM_OAK ; DE
const HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ; DF
const HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ; E0
const HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ; E1
const HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ; E2
const HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ; E3
const HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ; E4
const HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 ; E5
const HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 ; E6
const HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 ; E7
const HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 ; E8
const HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ; E9
const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; EA
const HS_ARTICUNO ; EB
const HS_OLD_SEA_MAP ; EC (can be removed, we can make the it a hidden item instead)
const HS_MEW ; ED
const HS_POKEMON_MANSION_B2F_ITEM_1 ; EE
const HS_POKEMON_MANSION_B2F_ITEM_2 ; EF
const HS_ROUTE_1_OAK ; F0
const HS_YUJIROU ; F1
const HS_YUJIROU_REMATCH ; F2
const HS_MT_MOON_CRATER_ITEM_1 ; F3
const HS_MT_MOON_CRATER_ITEM_2 ; F4
const HS_MT_MOON_CRATER_ITEM_3 ; F5
const HS_MT_MOON_CRATER_ITEM_4 ; F6
const HS_MT_MOON_CRATER_ITEM_5 ; F7
const HS_MT_MOON_CRATER_ITEM_6 ; F8
const HS_MT_MOON_CRATER_ITEM_7 ; F9
const HS_MT_MOON_CRATER_ITEM_8 ; FA
const HS_MT_MOON_CRATER_ITEM_9 ; FB
const HS_GIOVANNIS_ROOM_ITEM_1 ; FC
const HS_GIOVANNIS_ROOM_ITEM_2 ; FD
const HS_ROCK_TUNNEL_B1F_DOME ; FE
const HS_ROCK_TUNNEL_B1F_HELIX ; FF uh oh
const HS_ROCK_TUNNEL_B1F_AMBER ; $100 seems this still works?
const HS_ROCK_TUNNEL_B1F_WING ; $101
const HS_ROCK_TUNNEL_B1F_HELIX ; FF
const HS_ROCK_TUNNEL_B1F_AMBER ; 100
const HS_ROCK_TUNNEL_B1F_WING ; 101
DEF NUM_HS_OBJECTS EQU const_value