Fighting Dojo script revamp

This restructures the Fighting Dojo to match the new map, as well as add a few more features and safety mechanisms.
- Koichi, the Karate Master, now plays the Gym Leader theme when fought.
- Hitmontop is now an optional reward.
- Post-Game Rematch is available in addition to the gym scaling to be consistent with other Gym Leaders.
- A safety lock is on the Poke Balls prior to defeating the Karate Master, as the new structure now demands it. Indeed, this is why the reward area in vanilla is like that.
- Architecturally, there is now only one EVENT_GOT_HITMON constant, which is all that was actually needed in the vanilla game. Extreme microoptimisation, as event constants appear to be 16-bit.
This commit is contained in:
Llinos Evans 2023-06-27 21:09:38 +01:00
parent 18dd9715d0
commit 262c862a76
8 changed files with 161 additions and 22 deletions

View file

@ -257,9 +257,8 @@
const EVENT_BEAT_FIGHTING_DOJO_TRAINER_1
const EVENT_BEAT_FIGHTING_DOJO_TRAINER_2
const EVENT_BEAT_FIGHTING_DOJO_TRAINER_3
const EVENT_GOT_HITMONLEE
const EVENT_GOT_HITMONCHAN
const_skip 8
const EVENT_GOT_HITMON
const_skip 9
const EVENT_GOT_TM46
const EVENT_BEAT_SABRINA
const EVENT_BEAT_SAFFRON_GYM_TRAINER_0

View file

@ -88,6 +88,7 @@ DEF SHOW EQU $15
const HS_POKEMON_MANSION_1F_ITEM_2 ; 4E X
const HS_FIGHTING_DOJO_GIFT_1 ; 4F
const HS_FIGHTING_DOJO_GIFT_2 ; 50
const HS_FIGHTING_DOJO_GIFT_3
const HS_SILPH_CO_1F_RECEPTIONIST ; 51
const HS_VOLTORB_1 ; 52 X
const HS_VOLTORB_2 ; 53 X