diff options
474 files changed, 10743 insertions, 8357 deletions
diff --git a/battle/ai/items.asm b/battle/ai/items.asm index 7c11e70b2..3e7021837 100644 --- a/battle/ai/items.asm +++ b/battle/ai/items.asm @@ -20,7 +20,7 @@ AI_SwitchOrTryItem: ; 38000 and a jr nz, DontSwitch - ld hl, TrainerClassAttributes + 5 + ld hl, TrainerClassAttributes + TRNATTR_AI_ITEM_SWITCH ld a, [InBattleTowerBattle] ; Load always the first TrainerClass for BattleTower-Trainers and a jr nz, .ok diff --git a/battle/ai/move.asm b/battle/ai/move.asm new file mode 100755 index 000000000..5f58bae3e --- /dev/null +++ b/battle/ai/move.asm @@ -0,0 +1,222 @@ +AIChooseMove: ; 440ce +; Score each move in EnemyMonMoves starting from Buffer1. Lower is better. +; Pick the move with the lowest score. + +; Wildmons attack at random. + ld a, [wBattleMode] + dec a + ret z + + ld a, [wLinkMode] + and a + ret nz + +; No use picking a move if there's no choice. + callba CheckSubstatus_RechargeChargedRampageBideRollout + ret nz + + +; The default score is 20. Unusable moves are given a score of 80. + ld a, 20 + ld hl, Buffer1 +rept 3 + ld [hli], a +endr + ld [hl], a + +; Don't pick disabled moves. + ld a, [EnemyDisabledMove] + and a + jr z, .CheckPP + + ld hl, EnemyMonMoves + ld c, 0 +.CheckDisabledMove + cp [hl] + jr z, .ScoreDisabledMove + inc c + inc hl + jr .CheckDisabledMove +.ScoreDisabledMove + ld hl, Buffer1 + ld b, 0 + add hl, bc + ld [hl], 80 + +; Don't pick moves with 0 PP. +.CheckPP + ld hl, Buffer1 - 1 + ld de, EnemyMonPP + ld b, 0 +.CheckMovePP + inc b + ld a, b + cp EnemyMonMovesEnd - EnemyMonMoves + 1 + jr z, .ApplyLayers + inc hl + ld a, [de] + inc de + and $3f + jr nz, .CheckMovePP + ld [hl], 80 + jr .CheckMovePP + + +; Apply AI scoring layers depending on the trainer class. +.ApplyLayers + ld hl, TrainerClassAttributes + TRNATTR_AI_MOVE_WEIGHTS + + ; If we have a battle in BattleTower just load the Attributes of the first TrainerClass (Falkner) + ; so we have always the same AI, regardless of the loaded class of trainer + ld a, [InBattleTowerBattle] + bit 0, a + jr nz, .battle_tower_skip + + ld a, [TrainerClass] + dec a + ld bc, 7 ; Trainer2AI - Trainer1AI + call AddNTimes + +.battle_tower_skip + lb bc, CHECK_FLAG, 0 + push bc + push hl + +.CheckLayer + pop hl + pop bc + + ld a, c + cp 16 ; up to 16 scoring layers + jr z, .DecrementScores + + push bc + ld d, BANK(TrainerClassAttributes) + predef FlagPredef + ld d, c + pop bc + + inc c + push bc + push hl + + ld a, d + and a + jr z, .CheckLayer + + ld hl, AIScoringPointers + dec c + ld b, 0 +rept 2 + add hl, bc +endr + ld a, [hli] + ld h, [hl] + ld l, a + ld a, BANK(AIScoring) + call FarCall_hl + + jr .CheckLayer + +; Decrement the scores of all moves one by one until one reaches 0. +.DecrementScores + ld hl, Buffer1 + ld de, EnemyMonMoves + ld c, EnemyMonMovesEnd - EnemyMonMoves + +.DecrementNextScore + ; If the enemy has no moves, this will infinite. + ld a, [de] + inc de + and a + jr z, .DecrementScores + + ; We are done whenever a score reaches 0 + dec [hl] + jr z, .PickLowestScoreMoves + + ; If we just decremented the fourth move's score, go back to the first move + inc hl + dec c + jr z, .DecrementScores + + jr .DecrementNextScore + +; In order to avoid bias towards the moves located first in memory, increment the scores +; that were decremented one more time than the rest (in case there was a tie). +; This means that the minimum score will be 1. +.PickLowestScoreMoves + ld a, c + +.move_loop + inc [hl] + dec hl + inc a + cp NUM_MOVES + 1 + jr nz, .move_loop + + ld hl, Buffer1 + ld de, EnemyMonMoves + ld c, NUM_MOVES + +; Give a score of 0 to a blank move +.loop2 + ld a, [de] + and a + jr nz, .skip_load + ld [hl], a + +; Disregard the move if its score is not 1 +.skip_load + ld a, [hl] + dec a + jr z, .keep + xor a + ld [hli], a + jr .after_toss + +.keep + ld a, [de] + ld [hli], a +.after_toss + inc de + dec c + jr nz, .loop2 + +; Randomly choose one of the moves with a score of 1 +.ChooseMove + ld hl, Buffer1 + call Random + and 3 + ld c, a + ld b, 0 + add hl, bc + ld a, [hl] + and a + jr z, .ChooseMove + + ld [CurEnemyMove], a + ld a, c + ld [CurEnemyMoveNum], a + ret +; 441af + + +AIScoringPointers: ; 441af + dw AI_Basic + dw AI_Setup + dw AI_Types + dw AI_Offensive + dw AI_Smart + dw AI_Opportunist + dw AI_Aggressive + dw AI_Cautious + dw AI_Status + dw AI_Risky + dw AI_None + dw AI_None + dw AI_None + dw AI_None + dw AI_None + dw AI_None +; 441cf diff --git a/battle/core.asm b/battle/core.asm index bda8e736d..08d3f2d3b 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -1,9 +1,6 @@ -BattleCore: - ; Core components of the battle engine. - - -SendOutFirstMons: ; 3c000 +BattleCore: +DoBattle: ; 3c000 xor a ld [wBattleParticipantsNotFainted], a ld [wc6fc], a @@ -83,8 +80,8 @@ SendOutFirstMons: ; 3c000 ld [CurPartySpecies], a ld [TempBattleMonSpecies], a hlcoord 1, 5 - ld a, $9 - call Function3d490 + ld a, 9 + call SlideBattlePicOut call LoadTileMapToTempTileMap call ResetBattleParticipants call InitBattleMon @@ -113,7 +110,7 @@ SendOutFirstMons: ; 3c000 call SpikesDamage .not_linked_2 - jp Function3c12f + jp BattleTurn .tutorial_debug jp BattleMenu @@ -130,33 +127,33 @@ WildFled_EnemyFled_LinkBattleCanceled: ; 3c0e5 ld a, [wLinkMode] and a ld hl, BattleText_WildFled - jr z, .asm_3c115 + jr z, .print_text ld a, [wBattleResult] and $c0 ld [wBattleResult], a ld hl, BattleText_EnemyFled call CheckMobileBattleError - jr nc, .asm_3c115 + jr nc, .print_text ld hl, wcd2a bit 4, [hl] - jr nz, .asm_3c118 + jr nz, .skip_text ld hl, BattleText_LinkErrorBattleCanceled -.asm_3c115 +.print_text call StdBattleTextBox -.asm_3c118 +.skip_text call StopDangerSound call CheckMobileBattleError - jr c, .asm_3c126 + jr c, .skip_sfx ld de, SFX_RUN call PlaySFX -.asm_3c126 +.skip_sfx call SetPlayerTurn ld a, 1 ld [BattleEnded], a @@ -164,7 +161,7 @@ WildFled_EnemyFled_LinkBattleCanceled: ; 3c0e5 ; 3c12f -Function3c12f: ; 3c12f +BattleTurn: ; 3c12f .loop call MobileFn_3c1bf call CheckContestBattleOver @@ -1433,8 +1430,8 @@ HandleMysteryberry: ; 3c93c ld a, [hBattleTurn] and a jr z, .wild - ld de, wc739 - ld hl, wc735 + ld de, wWildMonPP + ld hl, wWildMonMoves ld a, [wBattleMode] dec a jr z, .wild @@ -2489,8 +2486,8 @@ WinTrainerBattle: ; 3cfa4 bit 0, a jr nz, .battle_tower - call Function3ebd8 - ld c, $28 + call BattleWinSlideInEnemyTrainerFrontpic + ld c, 40 call DelayFrames ld a, [BattleType] cp BATTLETYPE_CANLOSE @@ -2506,7 +2503,7 @@ WinTrainerBattle: ; 3cfa4 jp Function3d02b .mobile - call Function3ebd8 + call BattleWinSlideInEnemyTrainerFrontpic ld c, 40 call DelayFrames ld c, $4 @@ -2514,7 +2511,7 @@ WinTrainerBattle: ; 3cfa4 ret .battle_tower - call Function3ebd8 + call BattleWinSlideInEnemyTrainerFrontpic ld c, 40 call DelayFrames call EmptyBattleTextBox @@ -3111,7 +3108,7 @@ LostBattle: ; 3d38e hlcoord 0, 0 lb bc, 8, 21 call ClearBox - call Function3ebd8 + call BattleWinSlideInEnemyTrainerFrontpic ld c, 40 call DelayFrames @@ -3128,7 +3125,7 @@ LostBattle: ; 3d38e hlcoord 0, 0 lb bc, 8, 21 call ClearBox - call Function3ebd8 + call BattleWinSlideInEnemyTrainerFrontpic ld c, 40 call DelayFrames @@ -3180,7 +3177,7 @@ LostBattle: ; 3d38e hlcoord 0, 0 lb bc, 8, 21 call ClearBox - call Function3ebd8 + call BattleWinSlideInEnemyTrainerFrontpic ld c, 40 call DelayFrames @@ -3260,31 +3257,31 @@ MonFaintedAnimation: ; 3d444 ; 3d490 -Function3d490: ; 3d490 +SlideBattlePicOut: ; 3d490 ld [hMapObjectIndexBuffer], a ld c, a -.asm_3d493 +.loop push bc push hl ld b, $7 -.asm_3d497 +.loop2 push hl - call Function3d4ae + call .DoFrame pop hl ld de, SCREEN_WIDTH add hl, de dec b - jr nz, .asm_3d497 + jr nz, .loop2 ld c, 2 call DelayFrames pop hl pop bc dec c - jr nz, .asm_3d493 + jr nz, .loop ret ; 3d4ae -Function3d4ae: ; 3d4ae +.DoFrame: ; 3d4ae ld a, [hMapObjectIndexBuffer] ld c, a cp $8 @@ -3413,8 +3410,8 @@ ResetEnemyBattleVars: ; 3d557 xor a ld [wPlayerWrapCount], a hlcoord 18, 0 - ld a, $8 - call Function3d490 + ld a, 8 + call SlideBattlePicOut call EmptyBattleTextBox jp LoadStandardMenuDataHeader ; 3d57a @@ -3646,13 +3643,13 @@ LoadEnemyPkmnToSwitchTo: ; 3d6ca ld a, [CurPartySpecies] cp UNOWN jr nz, .skip_unown - ld a, [wdef4] + ld a, [wFirstUnownSeen] and a jr nz, .skip_unown ld hl, EnemyMonDVs predef GetUnownLetter ld a, [UnownLetter] - ld [wdef4], a + ld [wFirstUnownSeen], a .skip_unown ld hl, EnemyMonHP @@ -4478,21 +4475,21 @@ HandleHealingItems: ; 3dcf9 call SetPlayerTurn call HandleHPHealingItem call UseHeldStatusHealingItem - call HandleStatusHealingItem + call UseConfusionHealingItem call SetEnemyTurn call HandleHPHealingItem call UseHeldStatusHealingItem - jp HandleStatusHealingItem + jp UseConfusionHealingItem .player_1 call SetEnemyTurn call HandleHPHealingItem call UseHeldStatusHealingItem - call HandleStatusHealingItem + call UseConfusionHealingItem call SetPlayerTurn call HandleHPHealingItem call UseHeldStatusHealingItem - jp HandleStatusHealingItem + jp UseConfusionHealingItem ; 3dd2f HandleHPHealingItem: ; 3dd2f @@ -4672,7 +4669,7 @@ UseHeldStatusHealingItem: ; 3dde9 ; 3de51 -HandleStatusHealingItem: ; 3de51 +UseConfusionHealingItem: ; 3de51 ld a, BATTLE_VARS_SUBSTATUS3_OPP call GetBattleVar bit SUBSTATUS_CONFUSED, a @@ -4692,7 +4689,7 @@ HandleStatusHealingItem: ; 3de51 res SUBSTATUS_CONFUSED, [hl] call GetItemName call ItemRecoveryAnim - ld hl, BattleText_0x80dab + ld hl, BattleText_ItemHealedConfusion call StdBattleTextBox ld a, [hBattleTurn] and a @@ -6714,7 +6711,7 @@ endr ld bc, PKMN_NAME_LENGTH call CopyBytes -; Caught this mon +; Saw this mon ld a, [TempEnemyMonSpecies] dec a ld c, a @@ -6874,7 +6871,7 @@ Function3ebc7: ; 3ebc7 ret ; 3ebd8 -Function3ebd8: ; 3ebd8 +BattleWinSlideInEnemyTrainerFrontpic: ; 3ebd8 xor a ld [TempEnemyMonSpecies], a call FinishBattleAnim @@ -6883,12 +6880,12 @@ Function3ebd8: ; 3ebd8 ld de, VTiles2 callab GetTrainerPic hlcoord 19, 0 - ld c, $0 + ld c, 0 .outer_loop inc c ld a, c - cp $7 + cp 7 ret z xor a ld [hBGMapMode], a @@ -6898,9 +6895,9 @@ Function3ebd8: ; 3ebd8 push hl .inner_loop - call Function3ec1a + call .CopyColumn inc hl - ld a, $7 + ld a, 7 add d ld d, a dec c @@ -6908,7 +6905,7 @@ Function3ebd8: ; 3ebd8 ld a, $1 ld [hBGMapMode], a - ld c, $4 + ld c, 4 call DelayFrames pop hl pop bc @@ -6916,11 +6913,11 @@ Function3ebd8: ; 3ebd8 jr .outer_loop ; 3ec1a -Function3ec1a: ; 3ec1a +.CopyColumn: ; 3ec1a push hl push de push bc - ld e, $7 + ld e, 7 .loop ld [hl], d @@ -6970,7 +6967,7 @@ ApplyPrzEffectOnSpeed: ; 3ec39 ld [hli], a or b jr nz, .player_ok - ld b, $1 + ld b, $1 ; min speed .player_ok ld [hl], b @@ -6991,7 +6988,7 @@ ApplyPrzEffectOnSpeed: ; 3ec39 ld [hli], a or b jr nz, .enemy_ok - ld b, $1 + ld b, $1 ; min speed .enemy_ok ld [hl], b @@ -7014,7 +7011,7 @@ ApplyBrnEffectOnAttack: ; 3ec76 ld [hli], a or b jr nz, .player_ok - ld b, $1 + ld b, $1 ; min attack .player_ok ld [hl], b @@ -7033,7 +7030,7 @@ ApplyBrnEffectOnAttack: ; 3ec76 ld [hli], a or b jr nz, .enemy_ok - ld b, $1 + ld b, $1 ; min attack .enemy_ok ld [hl], b @@ -7423,6 +7420,7 @@ GiveExperiencePoints: ; 3ee3b and a pop bc jp z, .skip_stats + ld hl, MON_STAT_EXP + 1 add hl, bc ld d, h @@ -7767,35 +7765,37 @@ endr ; 3f0d4 Function3f0d4: ; 3f0d4 +; count number of battle participants ld a, [wBattleParticipantsNotFainted] ld b, a - ld c, $6 - ld d, $0 -.asm_3f0dc + ld c, PARTY_LENGTH + ld d, 0 +.loop xor a srl b adc d ld d, a dec c - jr nz, .asm_3f0dc - cp $2 + jr nz, .loop + cp 2 ret c + ld [wd265], a ld hl, EnemyMonBaseStats - ld c, $7 -.asm_3f0ef + ld c, EnemyMonEnd - EnemyMonBaseStats +.loop2 xor a ld [hDividend + 0], a ld a, [hl] ld [hDividend + 1], a ld a, [wd265] ld [hDivisor], a - ld b, $2 + ld b, 2 call Divide ld a, [hQuotient + 2] ld [hli], a dec c - jr nz, .asm_3f0ef + jr nz, .loop2 ret ; 3f106 @@ -7941,12 +7941,12 @@ endr call PrintPlayerHUD ld hl, BattleMonNick ld de, StringBuffer1 - ld bc, $000b + ld bc, PKMN_NAME_LENGTH call CopyBytes call Function3dfe ld de, SFX_HIT_END_OF_EXP_BAR call PlaySFX - callba Function8e79d + callba AnimateEndOfExpBar call WaitSFX ld hl, BattleText_StringBuffer1GrewToLevel call StdBattleTextBox @@ -8481,7 +8481,7 @@ StartBattle: ; 3f4c1 ld a, [TimeOfDayPal] push af call BattleIntro - call SendOutFirstMons + call DoBattle call ExitBattle pop af ld [TimeOfDayPal], a @@ -8490,9 +8490,9 @@ StartBattle: ; 3f4c1 ; 3f4d9 -_SendOutFirstMons: ; 3f4d9 +_DoBattle: ; 3f4d9 ; unreferenced - call SendOutFirstMons + call DoBattle ret ; 3f4dd @@ -8531,7 +8531,7 @@ BattleIntro: ; 3f4dd call ClearBox call ClearSprites ld a, [wBattleMode] - cp $1 + cp WILD_BATTLE call z, UpdateEnemyHUD ld a, $1 ld [hBGMapMode], a @@ -8560,9 +8560,9 @@ InitEnemy: ; 3f55e BackUpVBGMap2: ; 3f568 ld a, [rSVBK] push af - ld a, $6 ; BANK(w6_d000) + ld a, $6 ; BANK(wBackupTilemap) ld [rSVBK], a - ld hl, w6_d000 + ld hl, wBackupTilemap ld bc, $40 tiles ; VBGMap3 - VBGMap2 ld a, $2 call ByteFill @@ -8570,7 +8570,7 @@ BackUpVBGMap2: ; 3f568 push af ld a, $1 ld [rVBK], a - ld de, w6_d000 + ld de, wBackupTilemap hlbgcoord 0, 0 ; VBGMap2 lb bc, BANK(BackUpVBGMap2), $40 call Request2bpp @@ -8586,7 +8586,7 @@ InitEnemyTrainer: ; 3f594 callba MobileFn_10606a xor a ld [TempEnemyMonSpecies], a - callab Function3957b + callab GetTrainerAttributes callab ReadTrainerParty ld a, [TrainerClass] @@ -8637,16 +8637,16 @@ InitEnemyTrainer: ; 3f594 ; 3f607 InitEnemyWildmon: ; 3f607 - ld a, $1 + ld a, WILD_BATTLE ld [wBattleMode], a callba MobileFn_10605d call LoadEnemyMon ld hl, EnemyMonMoves - ld de, wc735 + ld de, wWildMonMoves ld bc, NUM_MOVES call CopyBytes ld hl, EnemyMonPP - ld de, wc739 + ld de, wWildMonPP ld bc, NUM_MOVES call CopyBytes ld hl, EnemyMonDVs @@ -8654,11 +8654,11 @@ InitEnemyWildmon: ; 3f607 ld a, [CurPartySpecies] cp UNOWN jr nz, .skip_unown - ld a, [wdef4] + ld a, [wFirstUnownSeen] and a jr nz, .skip_unown ld a, [UnownLetter] - ld [wdef4], a + ld [wFirstUnownSeen], a .skip_unown ld de, VTiles2 predef FrontpicPredef @@ -8746,7 +8746,7 @@ Function3f6a5: ; 3f6a5 ret nz call CheckPayDay xor a - ld [wd1e9], a + ld [wForceEvolution], a predef EvolveAfterBattle callba Function2ed44 ret @@ -9427,7 +9427,7 @@ InitBattleDisplay: ; 3fb6c call WaitBGMap xor a ld [hBGMapMode], a - callba SlideBattlePics + callba BattleIntroSlidingPics ld a, $1 ld [hBGMapMode], a ld a, $31 @@ -9456,12 +9456,12 @@ InitBattleDisplay: ; 3fb6c ld a, $6 ld [rSVBK], a - ld hl, w6_d000 - ld bc, w6_d400 - w6_d000 + ld hl, wBackupTilemap + ld bc, wBackupAttrMap - wBackupTilemap ld a, " " call ByteFill - ld de, w6_d000 + ld de, wBackupTilemap hlbgcoord 0, 0 lb bc, BANK(.BlankBGMap), $40 call Request2bpp diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 506dc9746..d5d9a78b9 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -7496,14 +7496,14 @@ endr ld a, BATTLE_VARS_MOVE_EFFECT call GetBattleVar cp EFFECT_CONFUSE_HIT - jr z, .asm_36d99 + jr z, .got_effect cp EFFECT_SNORE - jr z, .asm_36d99 + jr z, .got_effect cp EFFECT_SWAGGER - jr z, .asm_36d99 + jr z, .got_effect call AnimateCurrentMove -.asm_36d99 +.got_effect ld de, ANIM_CONFUSED call PlayOpponentBattleAnim @@ -7513,11 +7513,11 @@ endr call GetOpponentItem ld a, b cp HELD_HEAL_STATUS - jr z, .asm_36db0 + jr z, .heal_confusion cp HELD_HEAL_CONFUSION ret nz -.asm_36db0 - ld hl, HandleStatusHealingItem +.heal_confusion + ld hl, UseConfusionHealingItem jp CallBattleCore ; 36db6 diff --git a/battle/sliding_intro.asm b/battle/sliding_intro.asm index e13e8bd05..e139218a5 100755 --- a/battle/sliding_intro.asm +++ b/battle/sliding_intro.asm @@ -1,4 +1,4 @@ -SlideBattlePics: ; 4e980 +BattleIntroSlidingPics: ; 4e980 ld a, [rSVBK] push af ld a, $5 diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm index 49311f35d..3f368b085 100755 --- a/constants/battle_tower_constants.asm +++ b/constants/battle_tower_constants.asm @@ -1,33 +1,39 @@ const_def - const BATTLE_TOWER_ACTION_00 - const BATTLE_TOWER_ACTION_01 - const BATTLE_TOWER_ACTION_02 - const BATTLE_TOWER_ACTION_03 - const BATTLE_TOWER_ACTION_04 - const BATTLE_TOWER_ACTION_05 - const BATTLE_TOWER_ACTION_06 - const BATTLE_TOWER_ACTION_07 - const BATTLE_TOWER_ACTION_08 - const BATTLE_TOWER_ACTION_09 - const BATTLE_TOWER_ACTION_0A - const BATTLE_TOWER_ACTION_0B - const BATTLE_TOWER_ACTION_0C - const BATTLE_TOWER_ACTION_0D - const BATTLE_TOWER_ACTION_0E - const BATTLE_TOWER_ACTION_0F - const BATTLE_TOWER_ACTION_10 - const BATTLE_TOWER_ACTION_11 - const BATTLE_TOWER_ACTION_12 - const BATTLE_TOWER_ACTION_13 - const BATTLE_TOWER_ACTION_14 - const BATTLE_TOWER_ACTION_15 - const BATTLE_TOWER_ACTION_16 - const BATTLE_TOWER_ACTION_17 - const BATTLE_TOWER_ACTION_18 - const BATTLE_TOWER_ACTION_19 - const BATTLE_TOWER_ACTION_1A - const BATTLE_TOWER_ACTION_1B - const BATTLE_TOWER_ACTION_1C - const BATTLE_TOWER_ACTION_1D - const BATTLE_TOWER_ACTION_1E - const BATTLE_TOWER_ACTION_1F + const BATTLETOWERACTION_00 + const BATTLETOWERACTION_01 + const BATTLETOWERACTION_02 + const BATTLETOWERACTION_03 + const BATTLETOWERACTION_CHALLENGECANCELED + const BATTLETOWERACTION_05 + const BATTLETOWERACTION_06 ; reset stuff in SRAM bank 5 + const BATTLETOWERACTION_SAVELEVELGROUP + const BATTLETOWERACTION_LOADLEVELGROUP + const BATTLETOWERACTION_CHECKSAVEFILEISYOURS + const BATTLETOWERACTION_0A + const BATTLETOWERACTION_CHECKMOBILEEVENT + const BATTLETOWERACTION_0C ; more time stuff in SRAM bank 5 + const BATTLETOWERACTION_0D ; more time stuff in SRAM bank 5 + const BATTLETOWERACTION_0E ; egg ticket + const BATTLETOWERACTION_0F ; check w3_d090 + const BATTLETOWERACTION_10 ; jumptable based on 5:a800 + const BATTLETOWERACTION_11 ; store 0 in 5:aa8d + const BATTLETOWERACTION_12 ; store 1 in 5:aa8d + const BATTLETOWERACTION_13 ; check 5:aa8d + const BATTLETOWERACTION_14 ; if save file is yours: bit 0, [sbe4f] + const BATTLETOWERACTION_15 ; set 0, [sbe4f] + const BATTLETOWERACTION_16 ; update time in SRAM bank 5 + const BATTLETOWERACTION_17 ; check time in SRAM bank 5 + const BATTLETOWERACTION_18 ; level check + const BATTLETOWERACTION_19 ; ubers check + const BATTLETOWERACTION_RESETDATA ; clear data + const BATTLETOWERACTION_1B ; give reward + const BATTLETOWERACTION_1C ; set won challenge + const BATTLETOWERACTION_1D ; set received reward + const BATTLETOWERACTION_1E ; save options + const BATTLETOWERACTION_CHOOSEREWARD + +BATTLETOWER_NO_CHALLENGE EQU 0 +BATTLETOWER_SAVED_AND_LEFT EQU 1 +BATTLETOWER_CHALLENGE_IN_PROGESS EQU 2 +BATTLETOWER_WON_CHALLENGE EQU 3 +BATTLETOWER_RECEIVED_REWARD EQU 4 diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm index 194257996..cc81a15cc 100644 --- a/constants/map_setup_constants.asm +++ b/constants/map_setup_constants.asm @@ -15,50 +15,50 @@ const_value SET $f1 ; Command descriptions from Condensation water's scripting compendium. const_def const_def - const map_lcd_on - const map_lcd_off - const map_sound_off - const map_music - const map_start_music - const map_fade_music - const map_fade - const map_bike_music - const map_music_force - const map_max_volume - const map_load_blocks - const map_connection_blocks - const map_save_screen - const map_buffer_screen - const map_load_graphics - const map_load_tileset_header - const map_time_of_day - const map_palettes - const map_wildmons - const map_sprites - const map_change_callback - const map_start_callback - const map_load_objects - const map_load_spawn - const map_load_connection - const map_load_warp - const map_attributes - const map_attributes_2 - const map_clear_bg_palettes - const map_fade_out_palettes - const map_fade_in_palettes - const map_anchor_screen - const map_warp_face - const map_face_down - const map_spawn_coord - const map_player_coord - const map_prolong_sprites - const map_delay_sprites - const map_update_roam - const map_keep_roam - const map_fade_out_music - const map_animations_on - const map_animations_off - const map_keep_palettes - const map_text_scroll_off - const map_stop_script + const map_lcd_on ; 00 + const map_lcd_off ; 01 + const map_sound_off ; 02 + const map_music ; 03 + const map_start_music ; 04 + const map_fade_music ; 05 + const map_fade ; 06 + const map_bike_music ; 07 + const map_music_force ; 08 + const map_max_volume ; 09 + const map_load_blocks ; 0a + const map_connection_blocks ; 0b + const map_save_screen ; 0c + const map_buffer_screen ; 0d + const map_load_graphics ; 0e + const map_load_tileset_header ; 0f + const map_time_of_day ; 10 + const map_palettes ; 11 + const map_wildmons ; 12 + const map_sprites ; 13 + const map_change_callback ; 14 + const map_start_callback ; 15 + const map_load_objects ; 16 + const map_load_spawn ; 17 + const map_load_connection ; 18 + const map_load_warp ; 19 + const map_attributes ; 1a + const map_attributes_2 ; 1b + const map_clear_bg_palettes ; 1c + const map_fade_out_palettes ; 1d + const map_fade_in_palettes ; 1e + const map_anchor_screen ; 1f + const map_warp_face ; 20 + const map_face_down ; 21 + const map_spawn_coord ; 22 + const map_player_coord ; 23 + const map_prolong_sprites ; 24 + const map_delay_sprites ; 25 + const map_update_roam ; 26 + const map_keep_roam ; 27 + const map_fade_out_music ; 28 + const map_animations_on ; 29 + const map_animations_off ; 2a + const map_keep_palettes ; 2b + const map_text_scroll_off ; 2c + const map_stop_script ; 2d map_end_setup_script EQU -1 diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index cf1e9dfae..07bb0cd10 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -48,6 +48,9 @@ RESET_FLAG EQU 0 SET_FLAG EQU 1 CHECK_FLAG EQU 2 +; Boolean checks +FALSE EQU 0 +TRUE EQU 1 ; joypad diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index e53c201b2..98d6c22c4 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -639,8 +639,8 @@ const_value = 0 const TRNATTR_ITEM1 const TRNATTR_ITEM2 const TRNATTR_BASEMONEY - const TRNATTR_AI1 + const TRNATTR_AI_MOVE_WEIGHTS const TRNATTR_AI2 - const TRNATTR_AI3 + const TRNATTR_AI_ITEM_SWITCH const TRNATTR_AI4 NUM_TRAINER_ATTRIBUTES EQU const_value diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index a8d348e6c..f7486fc83 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -96,3 +96,10 @@ PC_WITHDRAW EQU 0 PC_DEPOSIT EQU 1 DAYCARE_WITHDRAW EQU 2 DAYCARE_DEPOSIT EQU 3 + +; wCurrentDexMode + const_def + const DEXMODE_NEW + const DEXMODE_OLD + const DEXMODE_ABC + const DEXMODE_UNOWN diff --git a/data/battle_tower_2.asm b/data/battle_tower_2.asm index 05e0a7e52..81c9515fb 100755 --- a/data/battle_tower_2.asm +++ b/data/battle_tower_2.asm @@ -1,4 +1,3 @@ - BattleTowerTrainerData:: ; What exactly it is, I don't know ; Size is 70 (Nr of Trainers in BattleTower) * 0x24 (Nr of Bytes that are copied) ; Second argument points to an entry in Unknown_170470, to which the first argument is compared. diff --git a/engine/battle_start.asm b/engine/battle_start.asm index 845af9d2a..4ef26cae3 100644 --- a/engine/battle_start.asm +++ b/engine/battle_start.asm @@ -120,7 +120,7 @@ Function8c2cf: ; 8c2cf ld a, $6 ld [rSVBK], a push hl - ld hl, w6_d000 + ld hl, wBackupTilemap ld bc, $28 * $10 .loop @@ -132,7 +132,7 @@ Function8c2cf: ; 8c2cf jr nz, .loop pop hl - ld de, w6_d000 + ld de, wBackupTilemap ld b, BANK(Function8c2cf) ; BANK(@) ld c, $28 call Request2bpp diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm index ebf5e48d8..6d6141c4f 100755 --- a/engine/breeding/egg.asm +++ b/engine/breeding/egg.asm @@ -194,7 +194,7 @@ OverworldHatchEgg:: ; 16f5e call Function16f70 call ExitAllMenus call RestartMapMusic - jp LoadMoveSprites + jp CloseText ; 16f70 Function16f70: ; 16f70 (5:6f70) @@ -678,7 +678,7 @@ Function1727f: ; 1727f (5:727f) push hl push de push bc - callab Function8cf69 + callab PlaySpriteAnimations call DelayFrame pop bc pop de @@ -789,9 +789,9 @@ Function1736d: ; 1736d (5:736d) ret nc swap a srl a - add $4c + add 9 * 8 + 4 ld d, a - ld e, $58 + ld e, 11 * 8 ld a, SPRITE_ANIM_INDEX_19 call _InitSpriteAnimStruct ld hl, $3 @@ -807,10 +807,10 @@ INCBIN "gfx/unknown/017393.2bpp" Function173b3: ; 173b3 (5:73b3) callba Function8cf53 - ld hl, Unknown_173ef + ld hl, .SpriteData .loop ld a, [hli] - cp $ff + cp -1 jr z, .done ld e, a ld a, [hli] @@ -823,16 +823,16 @@ Function173b3: ; 173b3 (5:73b3) push bc ld a, SPRITE_ANIM_INDEX_1C call _InitSpriteAnimStruct - ld hl, $3 + ld hl, SpriteAnim1TileID - SpriteAnim1 add hl, bc ld [hl], $0 pop de ld a, e - ld hl, $1 + ld hl, SpriteAnim1Sprite01 - SpriteAnim1 add hl, bc add [hl] ld [hl], a - ld hl, $b + ld hl, SpriteAnim1Sprite0b - SpriteAnim1 add hl, bc ld [hl], d pop hl @@ -844,19 +844,19 @@ Function173b3: ; 173b3 (5:73b3) ret ; 173ef (5:73ef) -Unknown_173ef: ; 173ef +.SpriteData: ; 173ef ; Probably OAM. - db $54, $48, $00, $3c - db $5c, $48, $01, $04 - db $54, $50, $00, $30 - db $5c, $50, $01, $10 - db $54, $58, $02, $24 - db $5c, $58, $03, $1c - db $50, $4c, $00, $36 - db $60, $4c, $01, $0a - db $50, $54, $02, $2a - db $60, $54, $03, $16 - db $ff + dsprite 10, 4, 9, 0, $00, $3c + dsprite 11, 4, 9, 0, $01, $04 + dsprite 10, 4, 10, 0, $00, $30 + dsprite 11, 4, 10, 0, $01, $10 + dsprite 10, 4, 11, 0, $02, $24 + dsprite 11, 4, 11, 0, $03, $1c + dsprite 10, 0, 9, 4, $00, $36 + dsprite 12, 0, 9, 4, $01, $0a + dsprite 10, 0, 10, 4, $02, $2a + dsprite 12, 0, 10, 4, $03, $16 + db -1 ; 17418 Function17418: ; 17418 (5:7418) diff --git a/engine/credits.asm b/engine/credits.asm index 6e2bef12d..41ee36920 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -118,7 +118,7 @@ const_value SET -7 const CREDITS_END -Function109847:: ; 109847 +Credits:: ; 109847 bit 6, b ld a, $0 jr z, .asm_10984f diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm index 69a068ff9..beada9f84 100755 --- a/engine/crystal_intro.asm +++ b/engine/crystal_intro.asm @@ -52,7 +52,7 @@ Functione4579: ; e4579 bit 7, a jr nz, .finish call PlaceGameFreakPresents - callba Function8cf69 + callba PlaySpriteAnimations call DelayFrame jr .joy_loop @@ -79,17 +79,17 @@ Functione45e8: ; e45e8 ld [rSVBK], a ld hl, IntroLogoGFX - ld de, w6_d000 + ld de, wBackupTilemap ld a, BANK(IntroLogoGFX) call FarDecompress ld hl, VTiles0 - ld de, w6_d000 + ld de, wBackupTilemap lb bc, 1, 8 tiles call Request2bpp ld hl, VTiles1 - ld de, w6_d000 + $80 tiles + ld de, wBackupTilemap + $80 tiles lb bc, 1, 8 tiles call Request2bpp @@ -406,7 +406,7 @@ CrystalIntro: ; e48ac bit 7, a jr nz, .done call IntroSceneJumper - callba Function8cf69 + callba PlaySpriteAnimations call DelayFrame jp .loop @@ -1886,7 +1886,7 @@ Functione541b: ; e541b (39:541b) push af ld a, $6 ld [rSVBK], a - ld hl, w6_d000 + ld hl, wBackupTilemap decoord 0, 0 ld b, SCREEN_HEIGHT .asm_e542a @@ -2000,10 +2000,10 @@ Functione54c2: ; e54c2 (39:54c2) ld a, $6 ld [rSVBK], a push de - ld de, w6_d000 + ld de, wBackupTilemap call Decompress pop hl - ld de, w6_d000 + ld de, wBackupTilemap ld bc, $180 call Request2bpp pop af @@ -2016,10 +2016,10 @@ Functione54de: ; e54de (39:54de) ld a, $6 ld [rSVBK], a push de - ld de, w6_d000 + ld de, wBackupTilemap call Decompress pop hl - ld de, w6_d000 + ld de, wBackupTilemap ld bc, $1ff call Request2bpp pop af @@ -2032,10 +2032,10 @@ Functione54fa: ; e54fa (39:54fa) ld a, $6 ld [rSVBK], a push de - ld de, w6_d000 + ld de, wBackupTilemap call Decompress pop hl - ld de, w6_d000 + ld de, wBackupTilemap ld bc, $140 call Request2bpp pop af diff --git a/engine/debug.asm b/engine/debug.asm index 0d2720990..1e00ae4f5 100755 --- a/engine/debug.asm +++ b/engine/debug.asm @@ -425,7 +425,7 @@ Function81adb: ; 81adb .asm_81b7a ld a, [wd265] ld [TrainerClass], a - callab Function3957b + callab GetTrainerAttributes ld de, StringBuffer1 hlcoord 4, 1 call PlaceString diff --git a/engine/decorations.asm b/engine/decorations.asm index 1fa5cac7e..2da9fa48a 100755 --- a/engine/decorations.asm +++ b/engine/decorations.asm @@ -1246,9 +1246,9 @@ DecorationDesc_PosterPointers: ; 26f84 DecorationDesc_TownMapPoster: ; 0x26f91 loadfont writetext .TownMapText - closetext + waitbutton special Special_TownMap - loadmovesprites + closetext end ; 0x26f9b diff --git a/engine/dummy_game.asm b/engine/dummy_game.asm index 4e8dad1a3..756486ff8 100755 --- a/engine/dummy_game.asm +++ b/engine/dummy_game.asm @@ -47,7 +47,7 @@ Functione1ebb: ; e1ebb (38:5ebb) bit 7, a jr nz, .asm_e1ed0 call Functione1ed2 - callab Function8cf69 + callab PlaySpriteAnimations call DelayFrame and a ret @@ -89,7 +89,7 @@ Functione1ef3: ; e1ef3 ; e1efb Functione1efb: ; e1efb - call Functione00ed + call ret_e00ed jr nc, .asm_e1f06 ld hl, wJumptableIndex set 7, [hl] @@ -251,7 +251,7 @@ Functione1fcc: ; e1fcc inc [hl] Functione2000: ; e2000 - call Functione00ed + call ret_e00ed jr nc, .asm_e200b ld hl, wJumptableIndex set 7, [hl] diff --git a/engine/events.asm b/engine/events.asm index 40e863cdc..d78a0a333 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -491,11 +491,11 @@ endr bit 3, [hl] jr z, .nope - ld hl, ScriptDelay + 2 + ld hl, wPriorityScriptAddr ld a, [hli] ld h, [hl] ld l, a - ld a, [ScriptDelay + 1] + ld a, [wPriorityScriptBank] call CallScript scf ret diff --git a/engine/events_2.asm b/engine/events_2.asm index c9b673e81..5be1d4226 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -142,7 +142,7 @@ RandomEncounter:: ; 97cc0 ; 97cf9 WildBattleScript: ; 97cf9 - battlecheck + setup_random_encounter startbattle returnafterbattle end diff --git a/engine/evolution_animation.asm b/engine/evolution_animation.asm index 835db8b52..5cf655980 100755 --- a/engine/evolution_animation.asm +++ b/engine/evolution_animation.asm @@ -21,7 +21,7 @@ EvolutionAnimation: ; 4e5e1 pop de pop hl - ld a, [wd1ed] + ld a, [Buffer4] and a ret z @@ -99,7 +99,7 @@ _EvolutionAnimation: ; 4e607 call .ReplaceFrontpic xor a - ld [wd1ed], a + ld [Buffer4], a ld a, [Buffer2] ld [PlayerHPPal], a @@ -136,7 +136,7 @@ _EvolutionAnimation: ; 4e607 .cancel_evo ld a, $1 - ld [wd1ed], a + ld [Buffer4], a ld a, [Buffer1] ld [PlayerHPPal], a @@ -252,7 +252,7 @@ endr ret .pressed_b - ld a, [wd1e9] + ld a, [wForceEvolution] and a jr nz, .loop3 scf @@ -270,7 +270,7 @@ Function4e794: ; 4e794 ; 4e7a6 Function4e7a6: ; 4e7a6 - ld a, [wd1ed] + ld a, [Buffer4] and a ret nz ld de, SFX_EVOLVED @@ -286,7 +286,7 @@ Function4e7a6: ; 4e7a6 jr .loop .done - ld c, $20 + ld c, 32 .loop2 call Function4e80c dec c @@ -299,7 +299,7 @@ Function4e7a6: ; 4e7a6 Function4e7cf: ; 4e7cf ld hl, wJumptableIndex ld a, [hl] - cp $20 + cp 32 ret nc ld d, a inc [hl] @@ -317,8 +317,8 @@ Function4e7cf: ; 4e7cf Function4e7e8: ; 4e7e8 push de - lb de, $48, $58 - ld a, $13 + depixel 9, 11 + ld a, SPRITE_ANIM_INDEX_13 call _InitSpriteAnimStruct ld hl, $b add hl, bc @@ -339,7 +339,7 @@ Function4e7e8: ; 4e7e8 Function4e80c: ; 4e80c push bc - callab Function8cf69 + callab PlaySpriteAnimations ; a = (([hVBlankCounter] + 4) / 2) % NUM_PALETTES ld a, [hVBlankCounter] and $e @@ -369,88 +369,3 @@ endr EvolutionGFX: INCBIN "gfx/evo/bubble_large.2bpp" INCBIN "gfx/evo/bubble.2bpp" - -Function4e881: ; 4e881 - call ClearBGPalettes - call ClearTileMap - call ClearSprites - call DisableLCD - call LoadStandardFont - call LoadFontsBattleExtra - hlbgcoord 0, 0 - ld bc, VBGMap1 - VBGMap0 - ld a, " " - call ByteFill - hlcoord 0, 0, AttrMap - ld bc, SCREEN_WIDTH * SCREEN_HEIGHT - xor a - call ByteFill - xor a - ld [hSCY], a - ld [hSCX], a - call EnableLCD - ld hl, UnknownText_0x4e8bd - call PrintText - call Function3200 - call SetPalettes - ret -; 4e8bd - -UnknownText_0x4e8bd: ; 0x4e8bd - ; SAVING RECORD… DON'T TURN OFF! - text_jump UnknownText_0x1bd39e - db "@" -; 0x4e8c2 - - -Function4e8c2: ; 4e8c2 - call ClearBGPalettes - call ClearTileMap - call ClearSprites - call DisableLCD - call LoadStandardFont - call LoadFontsBattleExtra - hlbgcoord 0, 0 - ld bc, VBGMap1 - VBGMap0 - ld a, " " - call ByteFill - hlcoord 0, 0, AttrMap - ld bc, SCREEN_WIDTH * SCREEN_HEIGHT - xor a - call ByteFill - ld hl, wd000 - ld c, $40 -.asm_4e8ee - ld a, -1 - ld [hli], a - ld a, " " - ld [hli], a - dec c - jr nz, .asm_4e8ee - xor a - ld [hSCY], a - ld [hSCX], a - call EnableLCD - call Function3200 - call SetPalettes - ret -; 4e906 - -Function4e906: ; 4e906 - ld a, [rSVBK] - push af - ld a, $6 - ld [rSVBK], a - ld hl, w6_d000 - ld bc, w6_d400 - w6_d000 - ld a, " " - call ByteFill - hlbgcoord 0, 0 - ld de, w6_d000 - ld b, $0 - ld c, $40 - call Request2bpp - pop af - ld [rSVBK], a - ret -; 4e929 diff --git a/engine/evolve.asm b/engine/evolve.asm index 6772db932..2ea3ee0a9 100755 --- a/engine/evolve.asm +++ b/engine/evolve.asm @@ -78,7 +78,7 @@ endr cp EVOLVE_ITEM jp z, .item - ld a, [wd1e9] + ld a, [wForceEvolution] and a jp nz, .dont_evolve_2 @@ -179,7 +179,7 @@ endr cp b jp nz, .dont_evolve_3 - ld a, [wd1e9] + ld a, [wForceEvolution] and a jp z, .dont_evolve_3 ld a, [wLinkMode] diff --git a/engine/fruit_trees.asm b/engine/fruit_trees.asm index 28e6e8cec..e6f7de9d1 100644 --- a/engine/fruit_trees.asm +++ b/engine/fruit_trees.asm @@ -9,7 +9,7 @@ FruitTreeScript:: ; 44000 callasm CheckFruitTree iffalse .fruit writetext NothingHereText - closetext + waitbutton jump .end .fruit @@ -27,10 +27,10 @@ FruitTreeScript:: ; 44000 .packisfull keeptextopen writetext FruitPackIsFullText - closetext + waitbutton .end - loadmovesprites + closetext end ; 44041 diff --git a/engine/learn.asm b/engine/learn.asm new file mode 100755 index 000000000..cafbe6f43 --- /dev/null +++ b/engine/learn.asm @@ -0,0 +1,257 @@ +LearnMove: ; 6508 + call LoadTileMapToTempTileMap + ld a, [CurPartyMon] + ld hl, PartyMonNicknames + call GetNick + ld hl, StringBuffer1 + ld de, wd050_MonNick + ld bc, PKMN_NAME_LENGTH + call CopyBytes + +.loop + ld hl, PartyMon1Moves + ld bc, PARTYMON_STRUCT_LENGTH + ld a, [CurPartyMon] + call AddNTimes + ld d, h + ld e, l + ld b, NUM_MOVES +; Get the first empty move slot. This routine also serves to +; determine whether the Pokemon learning the moves already has +; all four slots occupied, in which case one would need to be +; deleted. +.next + ld a, [hl] + and a + jr z, .learn + inc hl + dec b + jr nz, .next +; If we're here, we enter the routine for forgetting a move +; to make room for the new move we're trying to learn. + push de + call ForgetMove + pop de + jp c, .cancel + + push hl + push de + ld [wd265], a + + ld b, a + ld a, [wBattleMode] + and a + jr z, .not_disabled + ld a, [DisabledMove] + cp b + jr nz, .not_disabled + xor a + ld [DisabledMove], a + ld [PlayerDisableCount], a +.not_disabled + + call GetMoveName + ld hl, UnknownText_0x6684 ; 1, 2 and… + call PrintText + pop de + pop hl + +.learn + ld a, [wd262] + ld [hl], a + ld bc, MON_PP - MON_MOVES + add hl, bc + + push hl + push de + dec a + ld hl, Moves + MOVE_PP + ld bc, MOVE_LENGTH + call AddNTimes + ld a, BANK(Moves) + call GetFarByte + pop de + pop hl + + ld [hl], a + + ld a, [wBattleMode] + and a + jp z, .learned + + ld a, [CurPartyMon] + ld b, a + ld a, [CurBattleMon] + cp b + jp nz, .learned + + ld a, [PlayerSubStatus5] + bit SUBSTATUS_TRANSFORMED, a + jp nz, .learned + + ld h, d + ld l, e + ld de, BattleMonMoves + ld bc, NUM_MOVES + call CopyBytes + ld bc, PartyMon1PP - (PartyMon1Moves + NUM_MOVES) + add hl, bc + ld de, BattleMonPP + ld bc, NUM_MOVES + call CopyBytes + jp .learned + +.cancel + ld hl, UnknownText_0x6675 ; Stop learning <MOVE>? + call PrintText + call YesNoBox + jp c, .loop + + ld hl, UnknownText_0x667a ; <MON> did not learn <MOVE>. + call PrintText + ld b, 0 + ret + +.learned + ld hl, UnknownText_0x666b ; <MON> learned <MOVE>! + call PrintText + ld b, 1 + ret +; 65d3 + +ForgetMove: ; 65d3 + push hl + ld hl, UnknownText_0x667f + call PrintText + call YesNoBox + pop hl + ret c + ld bc, -NUM_MOVES + add hl, bc + push hl + ld de, wListMoves_MoveIndicesBuffer + ld bc, NUM_MOVES + call CopyBytes + pop hl +.loop + push hl + ld hl, UnknownText_0x6670 + call PrintText + hlcoord 5, 2 + ld b, NUM_MOVES * 2 + ld c, MOVE_NAME_LENGTH + call TextBox + hlcoord 5 + 2, 2 + 2 + ld a, SCREEN_WIDTH * 2 + ld [Buffer1], a + predef ListMoves + ; wMenuData3 + ld a, $4 + ld [wcfa1], a + ld a, $6 + ld [wcfa2], a + ld a, [wd0eb] + inc a + ld [wcfa3], a + ld a, $1 + ld [wcfa4], a + ld [MenuSelection2], a + ld [wcfaa], a + ld a, $3 + ld [wcfa8], a + ld a, $20 + ld [wcfa5], a + xor a + ld [wcfa6], a + ld a, $20 + ld [wcfa7], a + call Function1bc9 + push af + call Call_LoadTempTileMapToTileMap + pop af + pop hl + bit 1, a + jr nz, .cancel + push hl + ld a, [MenuSelection2] + dec a + ld c, a + ld b, 0 + add hl, bc + ld a, [hl] + push af + push bc + call IsHMMove + pop bc + pop de + ld a, d + jr c, .hmmove + pop hl + add hl, bc + and a + ret + +.hmmove + ld hl, UnknownText_0x669a + call PrintText + pop hl + jr .loop + +.cancel + scf + ret +; 666b + +UnknownText_0x666b: ; 666b +; <MON> learned <MOVE>! + text_jump UnknownText_0x1c5660 + db "@" +; 6670 + +UnknownText_0x6670: ; 6670 +; Which move should be forgotten? + text_jump UnknownText_0x1c5678 + db "@" +; 6675 + +UnknownText_0x6675: ; 6675 +; Stop learning <MOVE>? + text_jump UnknownText_0x1c5699 + db "@" +; 667a + +UnknownText_0x667a: ; 667a +; <MON> did not learn <MOVE>. + text_jump UnknownText_0x1c56af + db "@" +; 667f + +UnknownText_0x667f: ; 667f +; <MON> is trying to learn <MOVE>. But <MON> can't learn more than +; four moves. Delete an older move to make room for <MOVE>? + text_jump UnknownText_0x1c56c9 + db "@" +; 6684 + +UnknownText_0x6684: ; 6684 + text_jump UnknownText_0x1c5740 ; 1, 2 and… + start_asm + push de + ld de, SFX_SWITCH_POKEMON + call PlaySFX + pop de + ld hl, UnknownText_0x6695 + ret +; 6695 + +UnknownText_0x6695: ; 6695 +; Poof! <MON> forgot <MOVE>. And… + text_jump UnknownText_0x1c574e + db "@" +; 669a + +UnknownText_0x669a: ; 669a +; HM moves can't be forgotten now. + text_jump UnknownText_0x1c5772 + db "@" +; 669f diff --git a/engine/link.asm b/engine/link.asm index 8ba1702e9..619cc1375 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -1891,7 +1891,7 @@ Function28b87: ; 28b87 dec a ld [CurPartyMon], a ld a, $1 - ld [wd1e9], a + ld [wForceEvolution], a ld a, [wd003] push af ld hl, OTPartySpecies diff --git a/engine/math.asm b/engine/math.asm new file mode 100755 index 000000000..0cd6b0b47 --- /dev/null +++ b/engine/math.asm @@ -0,0 +1,196 @@ +_Multiply:: ; 66de + +; hMultiplier is one byte. + ld a, 8 + ld b, a + + xor a + ld [hProduct], a + ld [hMathBuffer + 1], a + ld [hMathBuffer + 2], a + ld [hMathBuffer + 3], a + ld [hMathBuffer + 4], a + + +.loop + ld a, [hMultiplier] + srl a + ld [hMultiplier], a + jr nc, .next + + ld a, [hMathBuffer + 4] + ld c, a + ld a, [hMultiplicand + 2] + add c + ld [hMathBuffer + 4], a + + ld a, [hMathBuffer + 3] + ld c, a + ld a, [hMultiplicand + 1] + adc c + ld [hMathBuffer + 3], a + + ld a, [hMathBuffer + 2] + ld c, a + ld a, [hMultiplicand + 0] + adc c + ld [hMathBuffer + 2], a + + ld a, [hMathBuffer + 1] + ld c, a + ld a, [hProduct] + adc c + ld [hMathBuffer + 1], a + +.next + dec b + jr z, .done + + +; hMultiplicand <<= 1 + + ld a, [hMultiplicand + 2] + add a + ld [hMultiplicand + 2], a + + ld a, [hMultiplicand + 1] + rla + ld [hMultiplicand + 1], a + + ld a, [hMultiplicand + 0] + rla + ld [hMultiplicand + 0], a + + ld a, [hProduct] + rla + ld [hProduct], a + + jr .loop + + +.done + ld a, [hMathBuffer + 4] + ld [hProduct + 3], a + + ld a, [hMathBuffer + 3] + ld [hProduct + 2], a + + ld a, [hMathBuffer + 2] + ld [hProduct + 1], a + + ld a, [hMathBuffer + 1] + ld [hProduct + 0], a + + ret +; 673e + + +_Divide:: ; 673e + xor a + ld [hMathBuffer + 0], a + ld [hMathBuffer + 1], a + ld [hMathBuffer + 2], a + ld [hMathBuffer + 3], a + ld [hMathBuffer + 4], a + + ld a, 9 + ld e, a + +.loop + ld a, [hMathBuffer + 0] + ld c, a + ld a, [hDividend + 1] + sub c + ld d, a + + ld a, [hDivisor] + ld c, a + ld a, [hDividend + 0] + sbc c + jr c, .next + + ld [hDividend + 0], a + + ld a, d + ld [hDividend + 1], a + + ld a, [hMathBuffer + 4] + inc a + ld [hMathBuffer + 4], a + + jr .loop + +.next + ld a, b + cp 1 + jr z, .done + + ld a, [hMathBuffer + 4] + add a + ld [hMathBuffer + 4], a + + ld a, [hMathBuffer + 3] + rla + ld [hMathBuffer + 3], a + + ld a, [hMathBuffer + 2] + rla + ld [hMathBuffer + 2], a + + ld a, [hMathBuffer + 1] + rla + ld [hMathBuffer + 1], a + + dec e + jr nz, .next2 + + ld e, 8 + ld a, [hMathBuffer + 0] + ld [hDivisor], a + xor a + ld [hMathBuffer + 0], a + + ld a, [hDividend + 1] + ld [hDividend + 0], a + + ld a, [hDividend + 2] + ld [hDividend + 1], a + + ld a, [hDividend + 3] + ld [hDividend + 2], a + +.next2 + ld a, e + cp 1 + jr nz, .okay + dec b + +.okay + ld a, [hDivisor] + srl a + ld [hDivisor], a + + ld a, [hMathBuffer + 0] + rr a + ld [hMathBuffer + 0], a + + jr .loop + +.done + ld a, [hDividend + 1] + ld [hDivisor], a + + ld a, [hMathBuffer + 4] + ld [hDividend + 3], a + + ld a, [hMathBuffer + 3] + ld [hDividend + 2], a + + ld a, [hMathBuffer + 2] + ld [hDividend + 1], a + + ld a, [hMathBuffer + 1] + ld [hDividend + 0], a + + ret +; 67c1 diff --git a/engine/party_menu.asm b/engine/party_menu.asm index 06b774064..1c2c70eee 100644 --- a/engine/party_menu.asm +++ b/engine/party_menu.asm @@ -670,7 +670,7 @@ InitPartyMenuGFX: ; 503e0 pop bc dec c jr nz, .loop - callab Function8cf69 + callab PlaySpriteAnimations ret ; 50405 diff --git a/engine/phone.asm b/engine/phone.asm index ab0ecb84a..672ca6042 100644 --- a/engine/phone.asm +++ b/engine/phone.asm @@ -443,9 +443,9 @@ Script_ReceivePhoneCall: ; 0x90241 refreshscreen $0 callasm RingTwice_StartCall ptcall wd048 - closetext + waitbutton callasm HangUp - loadmovesprites + closetext callasm InitCallReceiveDelay end ; 0x90255 diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 5d0795766..0ce4f017b 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -188,7 +188,7 @@ BillPhoneScript1: ; 0xbcfc5 BillPhoneScript2: ; 0xbd007 farwritetext BillPhoneNewlyFullText - closetext + waitbutton end ; Elm diff --git a/engine/pokedex.asm b/engine/pokedex.asm index d150ee471..25111dea1 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -31,7 +31,7 @@ Pokedex: ; 40000 ld a, [wJumptableIndex] bit 7, a jr nz, .exit - call Function4010b + call Pokedex_Main call DelayFrame jr .main @@ -40,8 +40,8 @@ Pokedex: ; 40000 call PlaySFX call WaitSFX call ClearSprites - ld a, [wc7d4] - ld [wd959], a + ld a, [wCurrentDexMode] + ld [wLastDexMode], a pop af ld [hInMenu], a @@ -63,7 +63,7 @@ InitPokedex: ; 40063 call ClearBGPalettes call ClearSprites call ClearTileMap - call Function414b7 + call Pokedex_LoadGFX ld hl, wPokedexDataStart ld bc, wPokedexDataEnd - wPokedexDataStart @@ -76,78 +76,78 @@ InitPokedex: ; 40063 ld [wcf65], a ld [wcf66], a - call Function400a2 + call Pokedex_CheckUnlockedUnownMode - ld a, [wd959] - ld [wc7d4], a + ld a, [wLastDexMode] + ld [wCurrentDexMode], a - call Function40bdc - call Function400b4 - call Function400ed + call Pokedex_ChangeMode + call Pokedex_InitCursorPosition + call Pokedex_GetLandmark callba Function1de247 - call Function41af7 + call Pokedex_ResetBGMapMode ret ; 400a2 -Function400a2: ; 400a2 +Pokedex_CheckUnlockedUnownMode: ; 400a2 ld a, [StatusFlags] bit 1, a - jr nz, .asm_400ae + jr nz, .unlocked xor a - ld [wc7dc], a + ld [wUnlockedUnownMode], a ret -.asm_400ae - ld a, 1 - ld [wc7dc], a +.unlocked + ld a, TRUE + ld [wUnlockedUnownMode], a ret ; 400b4 -Function400b4: ; 400b4 - ld hl, wc6d0 - ld a, [wc2d6] +Pokedex_InitCursorPosition: ; 400b4 + ld hl, wPokedexDataStart + ld a, [wLastDexEntry] and a - jr z, .asm_400ec - cp $fc - jr nc, .asm_400ec + jr z, .done + cp NUM_POKEMON + 1 + jr nc, .done ld b, a - ld a, [wc7d2] + ld a, [wDexListingEnd] cp $8 - jr c, .asm_400db + jr c, .only_one_page sub $7 ld c, a -.asm_400cc +.loop1 ld a, b cp [hl] - jr z, .asm_400ec + jr z, .done inc hl - ld a, [wc7d0] + ld a, [wDexListingPage] inc a - ld [wc7d0], a + ld [wDexListingPage], a dec c - jr nz, .asm_400cc + jr nz, .loop1 -.asm_400db +.only_one_page ld c, $7 -.asm_400dd +.loop2 ld a, b cp [hl] - jr z, .asm_400ec + jr z, .done inc hl - ld a, [wc7d1] + ld a, [wDexListingCursor] inc a - ld [wc7d1], a + ld [wDexListingCursor], a dec c - jr nz, .asm_400dd + jr nz, .loop2 -.asm_400ec +.done ret ; 400ed -Function400ed: ; 400ed +Pokedex_GetLandmark: ; 400ed ld a, [MapGroup] ld b, a ld a, [MapNumber] @@ -155,7 +155,7 @@ Function400ed: ; 400ed call GetWorldMapLocation cp SPECIAL_MAP - jr nz, .asm_40107 + jr nz, .load ld a, [BackupMapGroup] ld b, a @@ -163,20 +163,20 @@ Function400ed: ; 400ed ld c, a call GetWorldMapLocation -.asm_40107 - ld [wc7e4], a +.load + ld [wDexCurrentLocation], a ret ; 4010b -Function4010b: ; 4010b +Pokedex_Main: ; 4010b ld a, [wJumptableIndex] - ld hl, Jumptable_40115 - call Function41432 + ld hl, .Jumptable + call Pokedex_LoadPointer jp [hl] ; 40115 -Jumptable_40115: ; 40115 (10:4115) +.Jumptable: ; 40115 (10:4115) dw Function4013c dw Function401ae dw Function40217 @@ -188,17 +188,17 @@ Jumptable_40115: ; 40115 (10:4115) dw Function403be dw Function4050a dw Function40562 - dw Function405bd + dw Pokedex_UnownMode ; Unown Dex dw Function405df - dw Function40136 + dw Pokedex_CloseDex ; Exit -Function40131: ; 40131 (10:4131) +Pokedex_IncrementDexPointer: ; 40131 (10:4131) ld hl, wJumptableIndex inc [hl] ret -Function40136: ; 40136 (10:4136) +Pokedex_CloseDex: ; 40136 (10:4136) ld hl, wJumptableIndex set 7, [hl] ret @@ -209,45 +209,46 @@ Function4013c: ; 4013c (10:413c) call ClearSprites xor a hlcoord 0, 0, AttrMap - ld bc, $168 + ld bc, SCREEN_HEIGHT * SCREEN_WIDTH call ByteFill - callba Function1de171 + callba DrawPokedexListWindow hlcoord 0, 17 ld de, String_START_SEARCH - call Function40acd + call Pokedex_PlaceString ld a, $7 ld [wc7d3], a call Function40b0f - call Function41aeb - call Function41af7 + call Pokedex_SetBGMapMode_3ifDMG_4ifCGB + call Pokedex_ResetBGMapMode call Function4074c ld a, $5 ld [hSCX], a - ld a, [wc7d4] - cp $1 + + ld a, [wCurrentDexMode] + cp DEXMODE_OLD ld a, $4a - jr z, .asm_4017b + jr z, .okay ld a, $47 - -.asm_4017b +.okay ld [hWX], a xor a ld [hWY], a call WaitBGMap - call Function41af7 - ld a, $ff + + call Pokedex_ResetBGMapMode + ld a, -1 ld [CurPartySpecies], a ld a, $4 call Function41423 call Function41148 - callba Function1de171 + callba DrawPokedexListWindow hlcoord 0, 17 ld de, String_START_SEARCH - call Function40acd + call Pokedex_PlaceString ld a, $7 ld [wc7d3], a call Function40b0f - call Function40131 + call Pokedex_IncrementDexPointer ret Function401ae: ; 401ae (10:41ae) @@ -270,13 +271,13 @@ Function401ae: ; 401ae (10:41ae) xor a ld [hBGMapMode], a call Function40b0f - call Function41ad7 - call Function41af7 + call Pokedex_SetBGMapMode3 + call Pokedex_ResetBGMapMode ret .a - call Function40bb1 - call Function40bd0 + call Pokedex_GetMonAtCursorPosition + call Pokedex_CheckSeen ret z ld a, $2 ld [wJumptableIndex], a @@ -318,23 +319,23 @@ Function40217: ; 40217 (10:4217) xor a ld [hBGMapMode], a call ClearSprites - call Function41478 + call Pokedex_LoadCurrentFootprint call Function407fd call Function4134f - call Function40bb1 - ld [wc2d6], a - callba Function4424d - call Function40ba0 + call Pokedex_GetMonAtCursorPosition + ld [wLastDexEntry], a + callba DisplayDexEntry + call Pokedex_DrawFootprint call WaitBGMap ld a, $a7 ld [hWX], a - call Function40bb1 + call Pokedex_GetMonAtCursorPosition ld [CurPartySpecies], a ld a, $4 call Function41423 ld a, [CurPartySpecies] call PlayCry - call Function40131 + call Pokedex_IncrementDexPointer ret Function40258: ; 40258 (10:4258) @@ -347,25 +348,25 @@ Function40258: ; 40258 (10:4258) ld a, [hl] and A_BUTTON jr nz, .a - call Function4066c + call Pokedex_NextOrPreviousDexEntry ret nc - call Function40131 + call Pokedex_IncrementDexPointer ret .a ld a, [wc7d8] ld hl, Jumptable_402f2 - call Function41432 + call Pokedex_LoadPointer jp [hl] .b ld a, [LastVolume] and a - jr z, .asm_40288 + jr z, .max_volume ld a, $77 ld [LastVolume], a -.asm_40288 +.max_volume call MaxVolume ld a, [wcf64] ld [wJumptableIndex], a @@ -376,9 +377,9 @@ Function40292: ; 40292 ld a, [wPokedexStatus] xor $1 ld [wPokedexStatus], a - call Function40bb1 - ld [wc2d6], a - callba Function4424d + call Pokedex_GetMonAtCursorPosition + ld [wLastDexEntry], a + callba DisplayDexEntry call WaitBGMap ret ; 402aa @@ -391,14 +392,14 @@ Function402aa: ; 402aa (10:42aa) ld [hBGMapMode], a call Function407fd call Function4134f - call Function41478 - call Function40bb1 - ld [wc2d6], a - callba Function4424d - call Function40ba0 + call Pokedex_LoadCurrentFootprint + call Pokedex_GetMonAtCursorPosition + ld [wLastDexEntry], a + callba DisplayDexEntry + call Pokedex_DrawFootprint call Function4143b call WaitBGMap - call Function40bb1 + call Pokedex_GetMonAtCursorPosition ld [CurPartySpecies], a ld a, $4 call Function41423 @@ -410,11 +411,12 @@ Function402aa: ; 402aa (10:42aa) ; 402e8 (10:42e8) Unknown_402e8: ; 402e8 - dw $0430 + db D_RIGHT | D_LEFT, 4 dwcoord 1, 17 dwcoord 6, 17 dwcoord 11, 17 dwcoord 15, 17 + ; 402f2 Jumptable_402f2: ; 402f2 @@ -433,8 +435,8 @@ Function402fa: ; 402fa ld [hWX], a ld a, $90 ld [hWY], a - call Function40bb1 - ld a, [wc7e4] + call Pokedex_GetMonAtCursorPosition + ld a, [wDexCurrentLocation] ld e, a predef Function91d11 call Function41401 @@ -449,7 +451,7 @@ Function402fa: ; 402fa call Function4038d call Function4143b call WaitBGMap - call Function40bb1 + call Pokedex_GetMonAtCursorPosition ld [CurPartySpecies], a ld a, $4 call Function41423 @@ -457,7 +459,7 @@ Function402fa: ; 402fa ; 40340 Function40340: ; 40340 - call Function40bb1 + call Pokedex_GetMonAtCursorPosition ld a, [wd265] call GetCryIndex ld e, c @@ -485,7 +487,7 @@ Function4034f: ; 4034f ld [wcf65], a call ClearBGPalettes call DisableLCD - call Function414fb + call Pokedex_LoadInvertedFont call Function4038d call EnableLCD call WaitBGMap @@ -497,9 +499,9 @@ Function4034f: ; 4034f Function4038d: ; 4038d call Function407fd - call Function40bb1 - callba Function4424d - call Function40ba0 + call Pokedex_GetMonAtCursorPosition + callba DisplayDexEntry + call Pokedex_DrawFootprint ret ; 4039d @@ -509,17 +511,17 @@ Function4039d: ; 4039d (10:439d) call ClearSprites call Function4087c call Function4134f - ld a, [wc7d4] + ld a, [wCurrentDexMode] ld [wc7d8], a call Function40e5b call WaitBGMap ld a, $10 call Function41423 - call Function40131 + call Pokedex_IncrementDexPointer ret Function403be: ; 403be (10:43be) - ld a, [wc7dc] + ld a, [wUnlockedUnownMode] and a jr nz, .asm_403c9 ld de, Unknown_403f3 @@ -542,7 +544,7 @@ Function403be: ; 403be (10:43be) .asm_403e0 ld a, [wc7d8] ld hl, Jumptable_40405 - call Function41432 + call Pokedex_LoadPointer jp [hl] .asm_403ea @@ -553,17 +555,17 @@ Function403be: ; 403be (10:43be) ; 403f3 (10:43f3) Unknown_403f3: ; 403f3 - dw $03c0 - dwcoord 2, 4 - dwcoord 2, 6 - dwcoord 2, 8 + db D_UP | D_DOWN, 3 + dwcoord 2, 4 + dwcoord 2, 6 + dwcoord 2, 8 ; 403fb Unknown_403fb: ; 403fb - dw $04c0 - dwcoord 2, 4 - dwcoord 2, 6 - dwcoord 2, 8 + db D_UP | D_DOWN, 4 + dwcoord 2, 4 + dwcoord 2, 6 + dwcoord 2, 8 dwcoord 2, 10 ; 40405 @@ -585,17 +587,17 @@ Function40411: ; 40411 (10:4411) Function40415: ; 40415 (10:4415) ld b, $2 Function40417: ; 40417 (10:4417) - ld a, [wc7d4] + ld a, [wCurrentDexMode] cp b jr z, .asm_40431 ld a, b - ld [wc7d4], a - call Function40bdc + ld [wCurrentDexMode], a + call Pokedex_ChangeMode call Function40f08 xor a - ld [wc7d0], a - ld [wc7d1], a - call Function400b4 + ld [wDexListingPage], a + ld [wDexListingCursor], a + call Pokedex_InitCursorPosition .asm_40431 call Function41401 @@ -621,12 +623,12 @@ Function40443: ; 40443 (10:4443) ld [wc7d6], a call Function40fa8 xor a - ld [wc7db], a - callba Function44207 + ld [wDexSearchSlowpokeFrame], a + callba DoDexSearchSlowpokeFrame call WaitBGMap ld a, $10 call Function41423 - call Function40131 + call Pokedex_IncrementDexPointer ret Function40471: ; 40471 (10:4471) @@ -646,7 +648,7 @@ Function40471: ; 40471 (10:4471) .asm_4048b ld a, [wc7d8] ld hl, Jumptable_404a8 - call Function41432 + call Pokedex_LoadPointer jp [hl] .asm_40495 @@ -657,7 +659,7 @@ Function40471: ; 40471 (10:4471) ; 4049e (10:449e) Unknown_4049e: ; 4049e - dw $04c0 + db D_UP | D_DOWN, 4 dwcoord 2, 4 dwcoord 2, 6 dwcoord 2, 13 @@ -679,11 +681,11 @@ Function404b0: ; 404b0 Function404b7: ; 404b7 call Function41086 - callba Function441cf + callba AnimateDexSearchSlowpoke ld a, [wc7d7] and a jr nz, .asm_404dc - call Function40bdc + call Pokedex_ChangeMode call Function41107 xor a ld [hBGMapMode], a @@ -694,16 +696,16 @@ Function404b7: ; 404b7 ret .asm_404dc - ld [wc7d2], a - ld a, [wc7d0] + ld [wDexListingEnd], a + ld a, [wDexListingPage] ld [wc7e0], a - ld a, [wc7d1] + ld a, [wDexListingCursor] ld [wc7e1], a - ld a, [wc2d6] + ld a, [wLastDexEntry] ld [wcf65], a xor a - ld [wc7d0], a - ld [wc7d1], a + ld [wDexListingPage], a + ld [wDexListingCursor], a call Function41401 ld a, $9 ld [wJumptableIndex], a @@ -722,17 +724,17 @@ Function4050a: ; 4050a (10:450a) ld [hBGMapMode], a xor a hlcoord 0, 0, AttrMap - ld bc, $168 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill - call Function41ae1 - call Function41af7 - callba Function1de1d1 + call Pokedex_SetBGMapMode4 + call Pokedex_ResetBGMapMode + callba DrawPokedexSearchResultsWindow call Function409cf ld a, $4 ld [wc7d3], a call Function40b0f - call Function41ad7 - call Function41af7 + call Pokedex_SetBGMapMode3 + call Pokedex_ResetBGMapMode call Function40962 ld a, $5 ld [hSCX], a @@ -741,15 +743,15 @@ Function4050a: ; 4050a (10:450a) xor a ld [hWY], a call WaitBGMap - call Function41af7 - callba Function1de1d1 + call Pokedex_ResetBGMapMode + callba DrawPokedexSearchResultsWindow call Function409cf call Function41281 ld a, $ff ld [CurPartySpecies], a ld a, $4 call Function41423 - call Function40131 + call Pokedex_IncrementDexPointer ret Function40562: ; 40562 (10:4562) @@ -766,13 +768,13 @@ Function40562: ; 40562 (10:4562) xor a ld [hBGMapMode], a call Function40b0f - call Function41ad7 - call Function41af7 + call Pokedex_SetBGMapMode3 + call Pokedex_ResetBGMapMode ret .asm_40583 - call Function40bb1 - call Function40bd0 + call Pokedex_GetMonAtCursorPosition + call Pokedex_CheckSeen ret z ld a, $2 ld [wJumptableIndex], a @@ -782,14 +784,14 @@ Function40562: ; 40562 (10:4562) .asm_40595 ld a, [wc7e0] - ld [wc7d0], a + ld [wDexListingPage], a ld a, [wc7e1] - ld [wc7d1], a + ld [wDexListingCursor], a ld a, [wcf65] - ld [wc2d6], a + ld [wLastDexEntry], a call Function41401 call ClearSprites - call Function40bdc + call Pokedex_ChangeMode ld a, $5 ld [wJumptableIndex], a xor a @@ -798,45 +800,45 @@ Function40562: ; 40562 (10:4562) ld [hWX], a ret -Function405bd: ; 405bd (10:45bd) - call Function41a2c +Pokedex_UnownMode: ; 405bd (10:45bd) + call Pokedex_LoadUnownFont call Function409f1 xor a ld [wc7dd], a call Function41a58 call Function40658 - callba Functionfba2e + callba PrintUnownWord call WaitBGMap ld a, $16 call Function41423 - call Function40131 + call Pokedex_IncrementDexPointer ret Function405df: ; 405df (10:45df) ld hl, hJoyPressed ; $ffa7 ld a, [hl] and A_BUTTON | B_BUTTON - jr nz, .asm_405eb + jr nz, .a_b call Function40610 ret -.asm_405eb +.a_b call Function41401 ld a, $7 ld [wJumptableIndex], a call DelayFrame - call Function41a24 - jr nz, .asm_40603 + call Pokedex_CheckSGB + jr nz, .decompress callba Function1ddf26 - jr .asm_4060f + jr .done -.asm_40603 +.decompress ld hl, PokedexLZ ld de, VTiles2 tile $31 lb bc, BANK(PokedexLZ), $3a call DecompressRequest2bpp -.asm_4060f +.done ret Function40610: ; 40610 (10:4610) @@ -859,7 +861,7 @@ Function40610: ; 40610 (10:4610) ret nc ld a, [hl] inc [hl] - jr .asm_40635 + jr .update .left ld hl, wc7dd @@ -869,7 +871,7 @@ Function40610: ; 40610 (10:4610) ld a, [hl] dec [hl] -.asm_40635 +.update push af xor a ld [hBGMapMode], a @@ -877,7 +879,7 @@ Function40610: ; 40610 (10:4610) call Function40654 call Function41a58 call Function40658 - callba Functionfba2e + callba PrintUnownWord ld a, $1 ld [hBGMapMode], a call DelayFrame @@ -904,11 +906,11 @@ endr ld [hl], c ret -Function4066c: ; 4066c (10:466c) - ld a, [wc7d1] - ld [wc7e2], a - ld a, [wc7d0] - ld [wc7e3], a +Pokedex_NextOrPreviousDexEntry: ; 4066c (10:466c) + ld a, [wDexListingCursor] + ld [wBackupDexListingCursor], a + ld a, [wDexListingPage] + ld [wBackupDexListingPage], a ld hl, hJoyLast ld a, [hl] and D_UP @@ -922,43 +924,43 @@ Function4066c: ; 4066c (10:466c) .up ld a, [wc7d3] ld d, a - ld a, [wc7d2] + ld a, [wDexListingEnd] ld e, a call Function406ea - jr nc, .asm_406b7 - call Function40bb1 - call Function40bd0 - jr nz, .asm_406b5 + jr nc, .nope + call Pokedex_GetMonAtCursorPosition + call Pokedex_CheckSeen + jr nz, .yep jr .up .down ld a, [wc7d3] ld d, a - ld a, [wc7d2] + ld a, [wDexListingEnd] ld e, a call Function406fe - jr nc, .asm_406b7 - call Function40bb1 - call Function40bd0 - jr nz, .asm_406b5 + jr nc, .nope + call Pokedex_GetMonAtCursorPosition + call Pokedex_CheckSeen + jr nz, .yep jr .down -.asm_406b5 +.yep scf ret -.asm_406b7 - ld a, [wc7e2] - ld [wc7d1], a - ld a, [wc7e3] - ld [wc7d0], a +.nope + ld a, [wBackupDexListingCursor] + ld [wDexListingCursor], a + ld a, [wBackupDexListingPage] + ld [wDexListingPage], a and a ret Function406c5: ; 406c5 (10:46c5) ld a, [wc7d3] ld d, a - ld a, [wc7d2] + ld a, [wDexListingEnd] ld e, a ld hl, hJoyLast ld a, [hl] @@ -979,14 +981,14 @@ Function406c5: ; 406c5 (10:46c5) jr asm_4073d Function406ea: ; 406ea (10:46ea) - ld hl, wc7d1 + ld hl, wDexListingCursor ld a, [hl] and a jr z, .asm_406f4 dec [hl] jr asm_4073f .asm_406f4 - ld hl, wc7d0 + ld hl, wDexListingPage ld a, [hl] and a jr z, asm_4073d @@ -994,7 +996,7 @@ Function406ea: ; 406ea (10:46ea) jr asm_4073f Function406fe: ; 406fe (10:46fe) - ld hl, wc7d1 + ld hl, wDexListingCursor ld a, [hl] inc a cp e @@ -1004,14 +1006,14 @@ Function406fe: ; 406fe (10:46fe) inc [hl] jr asm_4073f .asm_4070c - ld hl, wc7d0 + ld hl, wDexListingPage add [hl] cp e jr nc, asm_4073d inc [hl] jr asm_4073f asm_40716: ; 40716 (10:4716) - ld hl, wc7d0 + ld hl, wDexListingPage ld a, [hl] and a jr z, asm_4073d @@ -1025,7 +1027,7 @@ asm_40716: ; 40716 (10:4716) ld [hl], a jr asm_4073f asm_40728: ; 40728 (10:4728) - ld hl, wc7d0 + ld hl, wDexListingPage ld a, d add a add [hl] @@ -1065,20 +1067,20 @@ Function40741: ; 40741 Function4074c: ; 4074c (10:474c) hlcoord 0, 17 ld de, String_START_SEARCH - call Function40acd + call Pokedex_PlaceString ld a, $32 hlcoord 0, 0 - ld bc, $168 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill hlcoord 0, 0 lb bc, 7, 7 - call Function40ad5 + call Pokedex_PlaceBorder hlcoord 0, 9 ld bc, $607 - call Function40ad5 + call Pokedex_PlaceBorder hlcoord 1, 11 ld de, String_SEEN - call Function40acd + call Pokedex_PlaceString ld hl, PokedexSeen ; wdeb9 (aliases: EndPokedexSeen) ld b, EndPokedexSeen - PokedexSeen call CountSetBits @@ -1088,7 +1090,7 @@ Function4074c: ; 4074c (10:474c) call PrintNum hlcoord 1, 14 ld de, String_OWN - call Function40acd + call Pokedex_PlaceString ld hl, PokedexCaught ld b, EndPokedexCaught - PokedexCaught call CountSetBits @@ -1098,7 +1100,7 @@ Function4074c: ; 4074c (10:474c) call PrintNum hlcoord 1, 17 ld de, String_SELECT_OPTION - call Function40acd + call Pokedex_PlaceString hlcoord 8, 1 ld b, $7 ld a, $5a @@ -1115,7 +1117,7 @@ Function4074c: ; 4074c (10:474c) ld [hl], $54 hlcoord 8, 16 ld [hl], $5b - call Function40ab2 + call Pokedex_PlaceFrontpicTopLeftCorner ret ; 407e1 (10:47e1) @@ -1130,10 +1132,10 @@ String_START_SEARCH: ; 407f2 ; 407fd Function407fd: ; 407fd - call Function40aa6 + call Pokedex_FillBackgroundColor2 hlcoord 0, 0 ld bc, $0f12 - call Function40ad5 + call Pokedex_PlaceBorder hlcoord 19, 0 ld [hl], $34 hlcoord 19, 1 @@ -1151,14 +1153,14 @@ Function407fd: ; 407fd call ByteFill hlcoord 9, 7 ld de, Unknown_40852 - call Function40acd + call Pokedex_PlaceString hlcoord 9, 9 ld de, Unknown_4085c - call Function40acd + call Pokedex_PlaceString hlcoord 0, 17 ld de, Unknown_40867 - call Function40acd - call Function40ab2 + call Pokedex_PlaceString + call Pokedex_PlaceFrontpicTopLeftCorner ret ; 4084f @@ -1173,20 +1175,20 @@ Unknown_40867: ; 40867 ; 4087c Function4087c: ; 4087c (10:487c) - call Function40aa6 + call Pokedex_FillBackgroundColor2 hlcoord 0, 2 lb bc, 8, 18 - call Function40ad5 + call Pokedex_PlaceBorder hlcoord 0, 12 lb bc, 4, 18 - call Function40ad5 + call Pokedex_PlaceBorder hlcoord 0, 1 ld de, Unknown_408b2 - call Function40acd + call Pokedex_PlaceString hlcoord 3, 4 ld de, String_408bd call PlaceString - ld a, [wc7dc] + ld a, [wUnlockedUnownMode] and a ret z hlcoord 3, 10 @@ -1211,19 +1213,19 @@ String_408e5: ; 408e5 ; 408f0 Function408f0: ; 408f0 (10:48f0) - call Function40aa6 + call Pokedex_FillBackgroundColor2 hlcoord 0, 2 lb bc, 14, 18 - call Function40ad5 + call Pokedex_PlaceBorder hlcoord 0, 1 ld de, Unknown_4092a - call Function40acd + call Pokedex_PlaceString hlcoord 8, 4 ld de, Unknown_40935 - call Function40acd + call Pokedex_PlaceString hlcoord 8, 6 ld de, Unknown_40935 - call Function40acd + call Pokedex_PlaceString hlcoord 3, 4 ld de, String_40940 call PlaceString @@ -1254,13 +1256,13 @@ String_4094c: ; 4094c ; 40962 Function40962: ; 40962 (10:4962) - call Function40aa6 + call Pokedex_FillBackgroundColor2 hlcoord 0, 0 lb bc, 7, 7 - call Function40ad5 + call Pokedex_PlaceBorder hlcoord 0, 11 lb bc, 5, 18 - call Function40ad5 + call Pokedex_PlaceBorder hlcoord 1, 12 ld de, String_409ae call PlaceString @@ -1280,7 +1282,7 @@ Function40962: ; 40962 (10:4962) ld [hl], $69 hlcoord 8, 10 ld [hl], $6a - call Function40ab2 + call Pokedex_PlaceFrontpicTopLeftCorner ret ; 409ae (10:49ae) @@ -1310,28 +1312,28 @@ Function409cf: ; 409cf (10:49cf) ret Function409f1: ; 409f1 (10:49f1) - call Function40aa6 + call Pokedex_FillBackgroundColor2 hlcoord 2, 1 lb bc, 10, 13 - call Function40ad5 + call Pokedex_PlaceBorder hlcoord 2, 14 lb bc, 1, 13 - call Function40ad5 + call Pokedex_PlaceBorder hlcoord 2, 15 ld [hl], $3d hlcoord 16, 15 ld [hl], $3e hlcoord 6, 5 - call Function40ab5 + call Pokedex_PlaceFrontpicAtHL ld de, 0 ld b, 0 ld c, 26 -.asm_40a1d +.loop ld hl, UnownDex add hl, de ld a, [hl] and a - jr z, .asm_40a39 + jr z, .done push af ld hl, Unknown_40a3e rept 4 @@ -1341,19 +1343,20 @@ endr ld h, [hl] ld l, a pop af - add $3f + add $40 - 1 ; Unown A ld [hl], a inc de inc b dec c - jr nz, .asm_40a1d -.asm_40a39 + jr nz, .loop +.done ld a, b ld [wc7de], a ret ; 40a3e (10:4a3e) Unknown_40a3e: ; 40a3e +; letter, cursor dwcoord 4,11, 3,11 dwcoord 4,10, 3,10 dwcoord 4, 9, 3, 9 @@ -1382,7 +1385,7 @@ Unknown_40a3e: ; 40a3e dwcoord 14,10, 15,10 ; 40aa6 -Function40aa6: ; 40aa6 +Pokedex_FillBackgroundColor2: ; 40aa6 hlcoord 0, 0 ld a, $32 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT @@ -1390,113 +1393,118 @@ Function40aa6: ; 40aa6 ret ; 40ab2 -Function40ab2: ; 40ab2 +Pokedex_PlaceFrontpicTopLeftCorner: ; 40ab2 hlcoord 1, 1 -Function40ab5: ; 40ab5 +Pokedex_PlaceFrontpicAtHL: ; 40ab5 xor a ld b, $7 -.asm_40ab8 +.row ld c, $7 push af push hl -.asm_40abc +.col ld [hli], a add $7 dec c - jr nz, .asm_40abc + jr nz, .col pop hl - ld de, $0014 + ld de, SCREEN_WIDTH add hl, de pop af inc a dec b - jr nz, .asm_40ab8 + jr nz, .row ret ; 40acd -Function40acd: ; 40acd -.asm_40acd +Pokedex_PlaceString: ; 40acd +.loop ld a, [de] - cp $ff + cp -1 ret z inc de ld [hli], a - jr .asm_40acd + jr .loop ; 40ad5 -Function40ad5: ; 40ad5 +Pokedex_PlaceBorder: ; 40ad5 push hl ld a, $33 ld [hli], a ld d, $34 - call Function40b06 + call .FillRow ld a, $35 ld [hl], a pop hl - ld de, $0014 + ld de, SCREEN_WIDTH add hl, de -.asm_40ae6 +.loop push hl ld a, $36 ld [hli], a ld d, $7f - call Function40b06 + call .FillRow ld a, $37 ld [hl], a pop hl - ld de, $0014 + ld de, SCREEN_WIDTH add hl, de dec b - jr nz, .asm_40ae6 + jr nz, .loop ld a, $38 ld [hli], a ld d, $39 - call Function40b06 + call .FillRow ld a, $3a ld [hl], a ret ; 40b06 -Function40b06: ; 40b06 +.FillRow: ; 40b06 ld e, c -.asm_40b07 +.row_loop ld a, e and a ret z ld a, d ld [hli], a dec e - jr .asm_40b07 + jr .row_loop ; 40b0f Function40b0f: ; 40b0f (10:4b0f) - ld a, [wc7d4] - cp $1 - jr z, .asm_40b1a - ld c, $b - jr .asm_40b1c -.asm_40b1a - ld c, $b -.asm_40b1c +; This check is completely useless. + ld a, [wCurrentDexMode] + cp DEXMODE_OLD + jr z, .okay + ld c, 11 + jr .resume +.okay + ld c, 11 +; End useless check +.resume +; Clear (2 * [wc7d3] + 1) by 11 box starting at 0,1 hlcoord 0, 1 ld a, [wc7d3] add a inc a ld b, a - ld a, $7f - call Function413fe - ld a, [wc7d0] + ld a, " " + call Pokedex_FillBox + +; Load de with wPokedexDataStart + [wDexListingPage] + ld a, [wDexListingPage] ld e, a ld d, $0 - ld hl, wc6d0 + ld hl, wPokedexDataStart add hl, de ld e, l ld d, h hlcoord 0, 2 ld a, [wc7d3] -.asm_40b3c +.loop push af ld a, [de] ld [wd265], a @@ -1504,37 +1512,38 @@ Function40b0f: ; 40b0f (10:4b0f) push hl call Function40b55 pop hl - ld de, $28 + ld de, 2 * SCREEN_WIDTH add hl, de pop de inc de pop af dec a - jr nz, .asm_40b3c + jr nz, .loop call Function4143b ret Function40b55: ; 40b55 (10:4b55) and a ret z - call Function40b6a - call Function40b8d + call Pokedex_PrintNumberIfOldMode + call Pokedex_PlaceDefaultStringIfNotSeen ret c - call Function40b82 + call Pokedex_PlaceCaughtSymbolIfCaught push hl call GetPokemonName pop hl call PlaceString ret -Function40b6a: ; 40b6a (10:4b6a) - ld a, [wc7d4] - cp $1 - jr z, .asm_40b72 +Pokedex_PrintNumberIfOldMode: ; 40b6a (10:4b6a) + ld a, [wCurrentDexMode] + cp DEXMODE_OLD + jr z, .printnum ret -.asm_40b72 + +.printnum push hl - ld de, -20 + ld de, -SCREEN_WIDTH add hl, de ld de, wd265 lb bc, PRINTNUM_LEADINGZEROS | 1, 3 @@ -1542,31 +1551,32 @@ Function40b6a: ; 40b6a (10:4b6a) pop hl ret -Function40b82: ; 40b82 (10:4b82) - call Function40bc4 - jr nz, .asm_40b89 +Pokedex_PlaceCaughtSymbolIfCaught: ; 40b82 (10:4b82) + call Pokedex_CheckCaught + jr nz, .place_caught_symbol inc hl ret -.asm_40b89 + +.place_caught_symbol ld a, $4f ld [hli], a ret -Function40b8d: ; 40b8d (10:4b8d) - call Function40bd0 +Pokedex_PlaceDefaultStringIfNotSeen: ; 40b8d (10:4b8d) + call Pokedex_CheckSeen ret nz inc hl - ld de, String_40b9a + ld de, .NameNotSeen call PlaceString scf ret ; 40b9a (10:4b9a) -String_40b9a: ; 40b9a +.NameNotSeen: ; 40b9a db "-----@" ; 40ba0 -Function40ba0: ; 40ba0 +Pokedex_DrawFootprint: ; 40ba0 hlcoord 18, 1 ld a, $62 ld [hli], a @@ -1581,13 +1591,13 @@ Function40ba0: ; 40ba0 ; 40bb1 -Function40bb1: ; 40bb1 - ld a, [wc7d1] - ld hl, wc7d0 +Pokedex_GetMonAtCursorPosition: ; 40bb1 + ld a, [wDexListingCursor] + ld hl, wDexListingPage add [hl] ld e, a ld d, $0 - ld hl, wc6d0 + ld hl, wPokedexDataStart add hl, de ld a, [hl] ld [wd265], a @@ -1595,7 +1605,7 @@ Function40bb1: ; 40bb1 ; 40bc4 -Function40bc4: ; 40bc4 (10:4bc4) +Pokedex_CheckCaught: ; 40bc4 (10:4bc4) push de push hl ld a, [wd265] @@ -1606,7 +1616,7 @@ Function40bc4: ; 40bc4 (10:4bc4) ret -Function40bd0: ; 40bd0 +Pokedex_CheckSeen: ; 40bd0 push de push hl ld a, [wd265] @@ -1619,100 +1629,100 @@ Function40bd0: ; 40bd0 -Function40bdc: ; 40bdc - ld hl, wc6d0 - ld bc, $100 +Pokedex_ChangeMode: ; 40bdc + ld hl, wPokedexDataStart + ld bc, wPokedexMetadata - wPokedexDataStart xor a call ByteFill - ld a, [wc7d4] - ld hl, Jumptable_40bf0 - call Function41432 + ld a, [wCurrentDexMode] + ld hl, .Jumptable + call Pokedex_LoadPointer jp [hl] ; 40bf0 -Jumptable_40bf0: ; 40bf0 (10:4bf0) - dw Function40bf6 - dw Function40c08 - dw Function40c30 +.Jumptable: ; 40bf0 (10:4bf0) + dw .NewMode + dw .OldMode + dw Pokedex_ABCMode -Function40bf6: ; 40bf6 (10:4bf6) +.NewMode: ; 40bf6 (10:4bf6) ld de, NewPokedexOrder - ld hl, wc6d0 + ld hl, wPokedexDataStart ld c, NUM_POKEMON -.asm_40bfe +.loopnew ld a, [de] inc de ld [hli], a dec c - jr nz, .asm_40bfe - call Function40c18 + jr nz, .loopnew + call .FindLastSeen ret -Function40c08: ; 40c08 (10:4c08) - ld hl, wc6d0 +.OldMode: ; 40c08 (10:4c08) + ld hl, wPokedexDataStart ld a, $1 ld c, NUM_POKEMON -.asm_40c0f +.loopold ld [hli], a inc a dec c - jr nz, .asm_40c0f - call Function40c18 + jr nz, .loopold + call .FindLastSeen ret -Function40c18: ; 40c18 (10:4c18) - ld hl, wc7ca +.FindLastSeen: ; 40c18 (10:4c18) + ld hl, wPokedexDataStart + NUM_POKEMON - 1 ld d, NUM_POKEMON ld e, d -.asm_40c1e +.loopfindend ld a, [hld] ld [wd265], a - call Function40bd0 - jr nz, .asm_40c2b + call Pokedex_CheckSeen + jr nz, .foundend dec d dec e - jr nz, .asm_40c1e -.asm_40c2b + jr nz, .loopfindend +.foundend ld a, d - ld [wc7d2], a + ld [wDexListingEnd], a ret -Function40c30: ; 40c30 +Pokedex_ABCMode: ; 40c30 xor a - ld [wc7d2], a - ld hl, wc6d0 + ld [wDexListingEnd], a + ld hl, wPokedexDataStart ld de, AlphabeticalPokedexOrder ld c, NUM_POKEMON -.asm_40c3c +.loop1abc push bc ld a, [de] ld [wd265], a - call Function40bd0 - jr z, .asm_40c51 + call Pokedex_CheckSeen + jr z, .skipabc ld a, [wd265] ld [hli], a - ld a, [wc7d2] + ld a, [wDexListingEnd] inc a - ld [wc7d2], a + ld [wDexListingEnd], a -.asm_40c51 +.skipabc inc de pop bc dec c - jr nz, .asm_40c3c - ld a, [wc7d2] + jr nz, .loop1abc + ld a, [wDexListingEnd] ld c, 0 -.asm_40c5b +.loop2abc cp NUM_POKEMON - jr z, .asm_40c64 + jr z, .doneabc ld [hl], c inc hl inc a - jr .asm_40c5b + jr .loop2abc -.asm_40c64 +.doneabc ret ; 40c65 @@ -1726,11 +1736,11 @@ Function40e5b: ; 40e5b xor a ld [hBGMapMode], a hlcoord 0, 12 - ld bc, $0412 - call Function40ad5 + lb bc, 4, SCREEN_WIDTH - 2 + call Pokedex_PlaceBorder ld a, [wc7d8] ld hl, Unknown_40e7d - call Function41432 + call Pokedex_LoadPointer ld e, l ld d, h hlcoord 1, 14 @@ -1741,28 +1751,28 @@ Function40e5b: ; 40e5b ; 40e7d Unknown_40e7d: ; 40e7d - dw String_40e85 - dw String_40ea6 - dw String_40ec6 - dw String_40ee4 + dw .NewMode + dw .OldMode + dw .ABCMode + dw .UnownMode ; 40e85 -String_40e85: ; 40e85 - db $e1, $e2, " are listed by" +.NewMode: ; 40e85 + db "<PK><MN> are listed by" next "evolution type.@" ; 40ea6 -String_40ea6: ; 40ea6 - db $e1, $e2, " are listed by" +.OldMode: ; 40ea6 + db "<PK><MN> are listed by" next "official type.@" ; 40ec6 -String_40ec6: ; 40ec6 - db $e1, $e2, " are listed" +.ABCMode: ; 40ec6 + db "<PK><MN> are listed" next "alphabetically.@" ; 40ee4 -String_40ee4: ; 40ee4 +.UnownMode: ; 40ee4 db "UNOWN are listed" next "in catching order.@" ; 40f08 @@ -1771,24 +1781,25 @@ Function40f08: ; 40f08 (10:4f08) xor a ld [hBGMapMode], a hlcoord 0, 12 - ld bc, $412 - call Function40ad5 - ld de, String_40f32 + lb bc, 4, SCREEN_WIDTH - 2 + call Pokedex_PlaceBorder + ld de, String_ChangingModesPleaseWait hlcoord 1, 14 call PlaceString ld a, $1 ld [hBGMapMode], a - ld c, $40 + ld c, 64 call DelayFrames ld de, SFX_CHANGE_DEX_MODE call PlaySFX - ld c, $40 + ld c, 64 call DelayFrames ret ; 40f32 (10:4f32) -String_40f32: ; 40f32 - db "Changing modes.", $4e, "Please wait.@" +String_ChangingModesPleaseWait: ; 40f32 + db "Changing modes." + next "Please wait.@" ; 40f4f Function40f4f: ; 40f4f (10:4f4f) @@ -1861,7 +1872,7 @@ Function40fa8: ; 40fa8 (10:4fa8) hlcoord 9, 3 ld bc, $408 ld a, $7f - call Function413fe + call Pokedex_FillBox ld a, [wc7d5] hlcoord 9, 4 call Function40fcd @@ -1926,8 +1937,8 @@ Function41095: ; 41095 add hl, de ld a, [hl] ld [wc7df], a - ld hl, wc6d0 - ld de, wc6d0 + ld hl, wPokedexDataStart + ld de, wPokedexDataStart ld c, NUM_POKEMON xor a ld [wc7d7], a @@ -1938,7 +1949,7 @@ Function41095: ; 41095 jr z, .asm_410e0 ld [wd265], a ld [CurSpecies], a - call Function40bc4 + call Pokedex_CheckCaught jr z, .asm_410e0 push hl push de @@ -2008,7 +2019,7 @@ Function41107: ; 41107 ld [hBGMapMode], a hlcoord 0, 12 ld bc, $0412 - call Function40ad5 + call Pokedex_PlaceBorder ld de, String_41126 hlcoord 1, 14 call PlaceString @@ -2025,7 +2036,7 @@ String_41126: ; 41126 ; 41148 Function41148: ; 41148 (10:5148) - ld a, [wc7d4] + ld a, [wCurrentDexMode] cp $1 jp z, Function41157 call Function41229 @@ -2034,7 +2045,7 @@ Function41148: ; 41148 (10:5148) Function41157: ; 41157 (10:5157) ld hl, Unknown_41167 - ld a, [wc7d1] + ld a, [wDexListingCursor] or a jr nz, .asm_41163 ld hl, Unknown_411c8 @@ -2133,7 +2144,7 @@ Unknown_41230: ; 41230 ; 41281 Function41281: ; 41281 (10:5281) - ld a, [wc7d4] + ld a, [wCurrentDexMode] cp $1 jp z, Function41157 ld hl, Unknown_41290 @@ -2176,7 +2187,7 @@ Function412f1: ; 412f1 (10:52f1) ld a, [hl] cp $ff ret z - ld a, [wc7d1] + ld a, [wDexListingCursor] and $7 swap a add [hl] @@ -2196,11 +2207,11 @@ Function412f1: ; 412f1 (10:52f1) Function4130e: ; 4130e (10:530e) push de - ld a, [wc7d2] + ld a, [wDexListingEnd] dec a ld e, a - ld a, [wc7d1] - ld hl, wc7d0 + ld a, [wDexListingCursor] + ld hl, wDexListingPage add [hl] cp e jr z, .asm_4133f @@ -2213,7 +2224,7 @@ Function4130e: ; 4130e (10:530e) ld a, d or e jr z, .asm_41341 - ld a, [wc7d2] + ld a, [wDexListingEnd] ld c, a .asm_41333 ld a, e @@ -2247,6 +2258,7 @@ Function4134f: ; 4134f (10:534f) ret Function4135a: ; 4135a (10:535a) +; bc = [de] - 1 ld a, [de] ld b, a inc de @@ -2254,74 +2266,79 @@ Function4135a: ; 4135a (10:535a) dec a ld c, a inc de - call Function413e0 + call Pokedex_BlinkInfoScreenCursor + ld hl, hJoyPressed ; $ffa7 ld a, [hl] and D_LEFT | D_UP and b - jr nz, .asm_4138f + jr nz, .MoveCursorLeft ld a, [hl] and D_RIGHT | D_DOWN and b - jr nz, .asm_413a0 + jr nz, .MoveCursorRight ld a, [hl] and SELECT and b - jr nz, .asm_413c1 - call Function413f5 - jr c, .asm_413bf + jr nz, .Select + call Pokedex_CursorFrameDelay + jr c, .NoAction ld hl, hJoyLast ld a, [hl] and D_LEFT | D_UP and b - jr nz, .asm_4138f + jr nz, .MoveCursorLeft ld a, [hl] and D_RIGHT | D_DOWN and b - jr nz, .asm_413a0 - jr .asm_413bf -.asm_4138f + jr nz, .MoveCursorRight + jr .NoAction + +.MoveCursorLeft ld a, [wc7d8] and a - jr z, .asm_413bf - call Function413d4 - ld [hl], $7f + jr z, .NoAction + call Pokedex_GetCursorPosition + ld [hl], " " ld hl, wc7d8 dec [hl] - jr .asm_413af -.asm_413a0 + jr .UpdateCursorPosition + +.MoveCursorRight ld a, [wc7d8] cp c - jr nc, .asm_413bf - call Function413d4 - ld [hl], $7f + jr nc, .NoAction + call Pokedex_GetCursorPosition + ld [hl], " " ld hl, wc7d8 inc [hl] -.asm_413af - call Function413d4 - ld [hl], $ed +.UpdateCursorPosition + call Pokedex_GetCursorPosition + ld [hl], "▶" ld a, $c ld [wc7d9], a xor a ld [wc7da], a scf ret -.asm_413bf + +.NoAction and a ret -.asm_413c1 - call Function413d4 - ld [hl], $7f + +.Select + call Pokedex_GetCursorPosition + ld [hl], " " ld a, [wc7d8] cp c - jr c, .asm_413ce + jr c, .Update ld a, $ff -.asm_413ce +.Update inc a ld [wc7d8], a - jr .asm_413af + jr .UpdateCursorPosition -Function413d4: ; 413d4 (10:53d4) +Pokedex_GetCursorPosition: ; 413d4 (10:53d4) ld a, [wc7d8] add a ld l, a @@ -2332,30 +2349,32 @@ Function413d4: ; 413d4 (10:53d4) ld l, a ret -Function413e0: ; 413e0 (10:53e0) +Pokedex_BlinkInfoScreenCursor: ; 413e0 (10:53e0) ld hl, wc7da ld a, [hl] inc [hl] and $8 - jr z, .asm_413ef - call Function413d4 - ld [hl], $7f + jr z, .blink_on + call Pokedex_GetCursorPosition + ld [hl], " " ret -.asm_413ef - call Function413d4 - ld [hl], $ed + +.blink_on + call Pokedex_GetCursorPosition + ld [hl], "▶" ret -Function413f5: ; 413f5 (10:53f5) +Pokedex_CursorFrameDelay: ; 413f5 (10:53f5) ld hl, wc7d9 ld a, [hl] and a ret z + dec [hl] scf ret -Function413fe: ; 413fe (10:53fe) +Pokedex_FillBox: ; 413fe (10:53fe) jp FillBoxWithByte Function41401: ; 41401 (10:5401) @@ -2391,7 +2410,7 @@ Function41427: ; 41427 ; 41432 -Function41432: ; 41432 +Pokedex_LoadPointer: ; 41432 ld e, a ld d, 0 rept 2 @@ -2404,10 +2423,10 @@ endr ; 4143b Function4143b: ; 4143b - call Function40bb1 - call Function40bd0 - jr z, .asm_4145b - ld a, [wdef4] + call Pokedex_GetMonAtCursorPosition + call Pokedex_CheckSeen + jr z, .QuestionMark + ld a, [wFirstUnownSeen] ld [UnownLetter], a ld a, [wd265] ld [CurPartySpecies], a @@ -2416,10 +2435,10 @@ Function4143b: ; 4143b predef GetFrontpic ret -.asm_4145b +.QuestionMark ld a, BANK(sScratch) call GetSRAMBank - callba Function1de0d7 + callba LoadQuestionMarkPic ld hl, VTiles2 ld de, sScratch ld c, 7 * 7 @@ -2431,13 +2450,13 @@ Function4143b: ; 4143b ; 41478 -Function41478: ; 41478 (10:5478) - call Function40bb1 +Pokedex_LoadCurrentFootprint: ; 41478 (10:5478) + call Pokedex_GetMonAtCursorPosition -Function4147b: ; 4147b +Pokedex_LoadAnyFootprint: ; 4147b ld a, [wd265] dec a - and $f8 + and ($ff ^ $07) ; $f8 ; $1f << 3 srl a srl a srl a @@ -2463,7 +2482,7 @@ Function4147b: ; 4147b ; Whoever was editing footprints forgot to fix their ; tile editor. Now each bottom half is 8 tiles off. - ld de, $80 + ld de, 8 tiles add hl, de ld e, l @@ -2476,28 +2495,28 @@ Function4147b: ; 4147b ; 414b7 -Function414b7: ; 414b7 +Pokedex_LoadGFX: ; 414b7 call DisableLCD ld hl, VTiles2 - ld bc, $0310 + ld bc, $31 tiles xor a call ByteFill - call Function414fb + call Pokedex_LoadInvertedFont call LoadFontsExtra ld hl, VTiles2 tile $60 - ld bc, $0200 - call Function41504 - call Function41a24 - jr nz, .asm_414e0 - callba Function1ddf1c - jr .asm_414e9 - -.asm_414e0 + ld bc, $20 tiles + call Pokedex_InvertTiles + call Pokedex_CheckSGB + jr nz, .LoadPokedexLZ + callba LoadSGBPokedexGFX + jr .LoadPokedexSlowpokeLZ + +.LoadPokedexLZ ld hl, PokedexLZ ld de, VTiles2 tile $31 call Decompress -.asm_414e9 +.LoadPokedexSlowpokeLZ ld hl, PokedexSlowpokeLZ ld de, VTiles0 call Decompress @@ -2506,30 +2525,31 @@ Function414b7: ; 414b7 call EnableLCD ret -Function414fb: ; 414fb +Pokedex_LoadInvertedFont: ; 414fb call LoadStandardFont ld hl, VTiles1 - ld bc, $0800 + ld bc, $80 tiles -Function41504: ; 41504 +Pokedex_InvertTiles: ; 41504 +.loop ld a, [hl] xor $ff ld [hli], a dec bc ld a, b or c - jr nz, Function41504 + jr nz, .loop ret ; 4150e PokedexLZ: ; 4150e -INCBIN "gfx/unknown/04150e.2bpp.lz" +INCBIN "gfx/pokedex/pokedex.2bpp.lz" ; 416b0 PokedexSlowpokeLZ: ; 416b0 INCBIN "gfx/pokedex/slowpoke.2bpp.lz" -Function41a24: ; 41a24 +Pokedex_CheckSGB: ; 41a24 ld a, [hCGB] or a ret nz @@ -2538,26 +2558,25 @@ Function41a24: ; 41a24 ret ; 41a2c -Function41a2c: ; 41a2c +Pokedex_LoadUnownFont: ; 41a2c ld a, BANK(sScratch) call GetSRAMBank ld hl, UnownFont ld de, sScratch + $188 - ld bc, $270 + ld bc, 39 tiles ld a, BANK(UnownFont) call FarCopyBytes ld hl, sScratch + $188 - ld bc, $1b0 - call Function41504 + ld bc, 27 tiles + call Pokedex_InvertTiles ld de, sScratch + $188 ld hl, VTiles2 tile $40 - lb bc, BANK(Function41a2c), $1b + lb bc, BANK(Pokedex_LoadUnownFont), 27 call Request2bpp call CloseSRAM ret ; 41a58 - Function41a58: ; 41a58 (10:5a58) ld a, [UnownLetter] push af @@ -2576,3 +2595,68 @@ Function41a58: ; 41a58 (10:5a58) pop af ld [UnownLetter], a ret +; 41a7f + +_NewPokedexEntry: ; 41a7f + xor a + ld [hBGMapMode], a + callba Function1de247 + call Pokedex_ResetBGMapMode + call DisableLCD + call LoadStandardFont + call LoadFontsExtra + call Pokedex_LoadGFX + call Pokedex_LoadAnyFootprint + ld a, [wd265] + ld [CurPartySpecies], a + call Function407fd + call Pokedex_DrawFootprint + hlcoord 0, 17 + ld [hl], $3b + inc hl + ld bc, 19 + ld a, " " + call ByteFill + callba DisplayDexEntry + call EnableLCD + call WaitBGMap + call GetBaseData + ld de, VTiles2 + predef GetFrontpic + ld a, $4 + call Function41423 + ld a, [CurPartySpecies] + call PlayCry + ret +; 41ad7 + + +Pokedex_SetBGMapMode3: ; 41ad7 (10:5ad7) + ld a, $3 + ld [hBGMapMode], a + ld c, 4 + call DelayFrames + ret + +Pokedex_SetBGMapMode4: ; 41ae1 (10:5ae1) + ld a, $4 + ld [hBGMapMode], a + ld c, 4 + call DelayFrames + ret + +Pokedex_SetBGMapMode_3ifDMG_4ifCGB: ; 41aeb (10:5aeb) + ld a, [hCGB] + and a + jr z, .DMG + call Pokedex_SetBGMapMode4 +.DMG + call Pokedex_SetBGMapMode3 + ret + + +Pokedex_ResetBGMapMode: ; 41af7 + xor a + ld [hBGMapMode], a + ret +; 41afb diff --git a/engine/pokegear.asm b/engine/pokegear.asm index da6006853..a89e48b5e 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -24,7 +24,7 @@ PokeGear: ; 90b8d (24:4b8d) bit 7, a jr nz, .done call Function90f04 - callba Function8cf69 + callba PlaySpriteAnimations call DelayFrame jr .loop @@ -1966,7 +1966,7 @@ _FlyMap: ; 91af3 jr nz, .pressedA call FlyMapScroll call GetMapCursorCoordinates - callba Function8cf69 + callba PlaySpriteAnimations call DelayFrame jr .loop @@ -2901,7 +2901,7 @@ Function92311: ; unreferenced jr nz, .pressedA call Function923b8 call GetMapCursorCoordinates - callba Function8cf69 + callba PlaySpriteAnimations call DelayFrame jr .loop diff --git a/engine/printer.asm b/engine/printer.asm index 5330d6b3c..5db2f9ff2 100755 --- a/engine/printer.asm +++ b/engine/printer.asm @@ -672,7 +672,7 @@ PrintDexEntry: ; 8442c call Function84000 ld a, $10 ld [wcbfa], a - callba Function1dc1b0 + callba PrintPage1 call ClearTileMap ld a, $e4 call DmgToCgbBGPals @@ -694,7 +694,7 @@ PrintDexEntry: ; 8442c call Function84000 ld a, $3 ld [wcbfa], a - callba Function1dc213 + callba PrintPage2 call Function84742 ld a, $4 ld [wcf65], a diff --git a/engine/save.asm b/engine/save.asm index 20f59c042..0feb9fd84 100644 --- a/engine/save.asm +++ b/engine/save.asm @@ -182,7 +182,7 @@ AskOverwriteSaveFile: ; 14b89 ld a, [wSaveFileExists] and a jr z, .erase - call Function14bcb + call CompareLoadedAndSavedPlayerID jr z, .yoursavefile ld hl, UnknownText_0x15297 call SaveTheGame_yesorno @@ -223,7 +223,7 @@ SaveTheGame_yesorno: ; 14baf ret ; 14bcb -Function14bcb: ; 14bcb +CompareLoadedAndSavedPlayerID: ; 14bcb ld a, BANK(sPlayerData) call GetSRAMBank ld hl, sPlayerData + (PlayerID - wPlayerData) @@ -291,7 +291,7 @@ SaveGameData_: ; 14c10 ld a, BANK(sBattleTowerChallengeState) call GetSRAMBank ld a, [sBattleTowerChallengeState] - cp $4 + cp BATTLETOWER_RECEIVED_REWARD jr nz, .ok xor a ld [sBattleTowerChallengeState], a @@ -373,7 +373,7 @@ ErasePreviousSave: ; 14cbb call EraseLinkBattleStats call EraseMysteryGift call SaveData - call Function14d5c + call EraseBattleTowerStatus ld a, BANK(sStackTop) call GetSRAMBank xor a @@ -437,7 +437,7 @@ Unknown_14d2c: ; 14d2c db $11, $0c, $0c, $06, $06, $04 ; 14d5c -Function14d5c: ; 14d5c +EraseBattleTowerStatus: ; 14d5c ld a, BANK(sBattleTowerChallengeState) call GetSRAMBank xor a @@ -486,7 +486,7 @@ Function14d93: ; 14d93 ; 14da0 -Function14da0: ; 14da0 +HallOfFame_InitSaveIfNeeded: ; 14da0 ld a, [wSavedAtLeastOnce] and a ret nz @@ -512,7 +512,7 @@ SaveOptions: ; 14dbb ld bc, OptionsEnd - Options call CopyBytes ld a, [Options] - and $ef + and $ff ^ (1 << NO_TEXT_SCROLL) ld [sOptions], a jp CloseSRAM ; 14dd7 @@ -791,9 +791,9 @@ LoadPlayerData: ; 14fd7 (5:4fd7) ld a, BANK(sBattleTowerChallengeState) call GetSRAMBank ld a, [sBattleTowerChallengeState] - cp $4 + cp BATTLETOWER_RECEIVED_REWARD jr nz, .not_4 - ld a, $3 + ld a, BATTLETOWER_WON_CHALLENGE ld [sBattleTowerChallengeState], a .not_4 call CloseSRAM diff --git a/engine/scripting.asm b/engine/scripting.asm index c80343a4c..698508cf4 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -143,7 +143,7 @@ ScriptCommandTable: ; 96cb1 dw Script_pocketisfull dw Script_loadfont dw Script_refreshscreen - dw Script_loadmovesprites + dw Script_closetext dw Script_loadbytec2cf dw Script_farwritetext dw Script_writetext @@ -156,26 +156,26 @@ IF _CRYSTAL dw Script_farjumptext ENDC dw Script_jumptext - dw Script_closetext + dw Script_waitbutton dw Script_keeptextopen dw Script_pokepic - dw Script_pokepicyesorno + dw Script_closepokepic dw Script_interpretmenu dw Script_interpretmenu2 dw Script_loadpikachudata - dw Script_battlecheck - dw Script_loadtrainerdata - dw Script_loadpokedata - dw Script_loadtrainer + dw Script_setup_random_encounter + dw Script_memtrainerdata + dw Script_scriptedpokedata + dw Script_scriptedtrainerdata dw Script_startbattle dw Script_returnafterbattle dw Script_catchtutorial dw Script_trainertext - dw Script_trainerstatus + dw Script_trainerflagaction dw Script_winlosstext dw Script_scripttalkafter - dw Script_talkaftercancel - dw Script_talkaftercheck + dw Script_end_if_just_battled + dw Script_check_just_battled dw Script_setlasttalked dw Script_applymovement dw Script_applymovement2 @@ -200,13 +200,13 @@ ENDC dw Script_writecmdqueue dw Script_delcmdqueue dw Script_playmusic - dw Script_playrammusic + dw Script_encountermusic dw Script_musicfadeout dw Script_playmapmusic dw Script_reloadmapmusic dw Script_cry dw Script_playsound - dw Script_waitbutton + dw Script_waitsfx dw Script_warpsound dw Script_specialsound dw Script_passtoengine @@ -316,11 +316,11 @@ Script_jumptextfaceplayer: ; 96e45 ; text_pointer (RawTextPointerLabelParam) ld a, [ScriptBank] - ld [wd44e], a + ld [wScriptTextBank], a call GetScriptByte - ld [wd44f], a + ld [wScriptTextAddr], a call GetScriptByte - ld [wd450], a + ld [wScriptTextAddr + 1], a ld b, BANK(JumpTextFacePlayerScript) ld hl, JumpTextFacePlayerScript jp ScriptJump @@ -332,11 +332,11 @@ Script_jumptext: ; 96e5f ; text_pointer (RawTextPointerLabelParam) ld a, [ScriptBank] - ld [wd44e], a + ld [wScriptTextBank], a call GetScriptByte - ld [wd44f], a + ld [wScriptTextAddr], a call GetScriptByte - ld [wd450], a + ld [wScriptTextAddr + 1], a ld b, BANK(JumpTextScript) ld hl, JumpTextScript jp ScriptJump @@ -347,8 +347,8 @@ JumpTextFacePlayerScript: ; 96e79 JumpTextScript: ; 96e7a loadfont repeattext -1, -1 + waitbutton closetext - loadmovesprites end ; 96e81 @@ -361,11 +361,11 @@ Script_farjumptext: ; 96e81 ; text_pointer (PointerLabelBeforeBank) call GetScriptByte - ld [wd44e], a + ld [wScriptTextBank], a call GetScriptByte - ld [wd44f], a + ld [wScriptTextAddr], a call GetScriptByte - ld [wd450], a + ld [wScriptTextAddr + 1], a ld b, BANK(JumpTextScript) ld hl, JumpTextScript jp ScriptJump @@ -419,7 +419,7 @@ Script_repeattext: ; 96ebb ld a, l cp -1 jr nz, .done - ld hl, wd44e + ld hl, wScriptTextBank ld a, [hli] ld b, a ld a, [hli] @@ -427,14 +427,15 @@ Script_repeattext: ; 96ebb ld l, a call MapTextbox ret + .done ret ; 96ed9 -Script_closetext: ; 96ed9 +Script_waitbutton: ; 96ed9 ; script command 0x54 - jp CloseText + jp WaitButton ; 96edc Script_keeptextopen: ; 96edc @@ -455,9 +456,9 @@ Script_yesorno: ; 96eed ; script command 0x4e call YesNoBox - ld a, 0 + ld a, FALSE jr c, .no - ld a, 1 + ld a, TRUE .no ld [ScriptVar], a ret @@ -502,10 +503,10 @@ Script_pokepic: ; 96f16 ret ; 96f29 -Script_pokepicyesorno: ; 96f29 +Script_closepokepic: ; 96f29 ; script command 0x57 - callba PokepicYesOrNo + callba ClosePokepic ret ; 96f30 @@ -575,9 +576,9 @@ GiveItemScript: ; 96f77 callasm ret_96f76 writetext ReceivedItemText iffalse .Full - waitbutton + waitsfx specialsound - closetext + waitbutton itemnotify end @@ -611,7 +612,7 @@ Script_verbosegiveitem2: ; 96f8e ld [wItemQuantityChangeBuffer], a ld hl, NumItems call ReceiveItem - ld a, 1 + ld a, TRUE jr c, .ok2 xor a .ok2 @@ -748,7 +749,7 @@ Script_elevator: ; 9707c ld b, a callba Elevator ret c - ld a, $1 + ld a, TRUE ld [ScriptVar], a ret ; 97099 @@ -885,7 +886,7 @@ Script_scripttalkafter: ; 97125 jp ScriptJump ; 97132 -Script_trainerstatus: ; 97132 +Script_trainerflagaction: ; 97132 ; script command 0x63 ; parameters: ; action (SingleByteParam) @@ -902,7 +903,7 @@ Script_trainerstatus: ; 97132 ld a, c and a ret z - ld a, 1 + ld a, TRUE ld [ScriptVar], a ret ; 9714c @@ -926,7 +927,7 @@ Script_winlosstext: ; 9714c ret ; 97163 -Script_talkaftercancel: ; 97163 +Script_end_if_just_battled: ; 97163 ; script command 0x66 ld a, [wRunningTrainerBattleScript] @@ -935,10 +936,10 @@ Script_talkaftercancel: ; 97163 jp Script_end ; 9716b -Script_talkaftercheck: ; 9716b +Script_check_just_battled: ; 9716b ; script command 0x67 - ld a, 1 + ld a, TRUE ld [ScriptVar], a ld a, [wRunningTrainerBattleScript] and a @@ -948,7 +949,7 @@ Script_talkaftercheck: ; 9716b ret ; 9717a -Script_playrammusic: ; 9717a +Script_encountermusic: ; 9717a ; script command 0x80 ld a, [OtherTrainerClass] @@ -1011,7 +1012,7 @@ Script_playsound: ; 971b7 ret ; 971c3 -Script_waitbutton: ; 971c3 +Script_waitsfx: ; 971c3 ; script command 0x86 call WaitSFX @@ -1481,7 +1482,7 @@ Script_loadpikachudata: ; 973f0 ret ; 973fb -Script_battlecheck: ; 973fb +Script_setup_random_encounter: ; 973fb ; script command 0x5b xor a @@ -1489,7 +1490,7 @@ Script_battlecheck: ; 973fb ret ; 97400 -Script_loadtrainerdata: ; 97400 +Script_memtrainerdata: ; 97400 ; script command 0x5c ld a, (1 << 7) | 1 @@ -1501,7 +1502,7 @@ Script_loadtrainerdata: ; 97400 ret ; 97412 -Script_loadpokedata: ; 97412 +Script_scriptedpokedata: ; 97412 ; script command 0x5d ; parameters: ; pokemon (PokemonParam) @@ -1516,7 +1517,7 @@ Script_loadpokedata: ; 97412 ret ; 97424 -Script_loadtrainer: ; 97424 +Script_scriptedtrainerdata: ; 97424 ; script command 0x5e ; parameters: ; trainer_group (TrainerGroupParam) @@ -1862,11 +1863,11 @@ Script_priorityjump: ; 975aa ; pointer (ScriptPointerLabelParam) ld a, [ScriptBank] - ld [wd44e], a + ld [wPriorityScriptBank], a call GetScriptByte - ld [wd44f], a + ld [wPriorityScriptAddr], a call GetScriptByte - ld [wd450], a + ld [wPriorityScriptAddr + 1], a ld hl, ScriptFlags set 3, [hl] ret @@ -2362,7 +2363,7 @@ Script_giveitem: ; 977ca ld hl, NumItems call ReceiveItem jr nc, .full - ld a, $1 + ld a, TRUE ld [ScriptVar], a ret .full @@ -2388,7 +2389,7 @@ Script_takeitem: ; 977f0 ld hl, NumItems call TossItem ret nc - ld a, $1 + ld a, TRUE ld [ScriptVar], a ret ; 97812 @@ -2405,7 +2406,7 @@ Script_checkitem: ; 97812 ld hl, NumItems call CheckItem ret nc - ld a, 1 + ld a, TRUE ld [ScriptVar], a ret ; 97829 @@ -2534,7 +2535,7 @@ Script_checktime: ; 978ae call GetScriptByte and c ret z - ld a, $1 + ld a, TRUE ld [ScriptVar], a ret ; 978c3 @@ -2551,7 +2552,7 @@ Script_checkpoke: ; 978c3 ld de, 1 call IsInArray ret nc - ld a, 1 + ld a, TRUE ld [ScriptVar], a ret ; 978da @@ -2567,7 +2568,7 @@ Script_addcellnum: ; 978da ld c, a callba AddPhoneNumber ret nc - ld a, $1 + ld a, TRUE ld [ScriptVar], a ret ; 978ef @@ -2583,7 +2584,7 @@ Script_delcellnum: ; 978ef ld c, a callba DelCellNum ret nc - ld a, $1 + ld a, TRUE ld [ScriptVar], a ret ; 97904 @@ -2600,7 +2601,7 @@ Script_checkcellnum: ; 97904 ld c, a callba CheckCellNum ret nc - ld a, $1 + ld a, TRUE ld [ScriptVar], a ret ; 97919 @@ -2624,7 +2625,7 @@ Script_checkphonecall: ; 97926 ld a, [wSpecialPhoneCallID] and a jr z, .ok - ld a, 1 + ld a, TRUE .ok ld [ScriptVar], a ret @@ -2728,7 +2729,7 @@ Script_checkevent: ; 979a4 ld a, c and a jr z, .false - ld a, 1 + ld a, TRUE .false ld [ScriptVar], a ret @@ -2743,7 +2744,7 @@ Script_setflag: ; 979bb ld e, a call GetScriptByte ld d, a - ld b, 1 ; set + ld b, SET_FLAG call _EngineFlagAction ret ; 979c9 @@ -2757,7 +2758,7 @@ Script_clearflag: ; 979c9 ld e, a call GetScriptByte ld d, a - ld b, 0 ; clear + ld b, RESET_FLAG call _EngineFlagAction ret ; 979d7 @@ -2776,7 +2777,7 @@ Script_checkflag: ; 979d7 ld a, c and a jr z, .false - ld a, 1 + ld a, TRUE .false ld [ScriptVar], a ret @@ -3053,15 +3054,15 @@ Script_loadbytec2cf: ; 97b27 ; 97b2e -LoadMoveSpritesScript: ; 97b2e - loadmovesprites +CloseTextScript: ; 97b2e + closetext ; 97b2f -Script_loadmovesprites: ; 97b2f +Script_closetext: ; 97b2f ; script command 0x49 call Function2e20 - call LoadMoveSprites + call CloseText ret ; 97b36 @@ -3217,8 +3218,6 @@ Script_credits: ; 97bf3 ; script command 0xa2 callba RedCredits - ; fallthrough - DisplayCredits: call Script_resetfuncs ld a, $3 diff --git a/engine/selectmenu.asm b/engine/selectmenu.asm index 916e48b3c..9de31192b 100755 --- a/engine/selectmenu.asm +++ b/engine/selectmenu.asm @@ -9,8 +9,8 @@ SelectMenu:: ; 13327 ld b, BANK(ItemMayBeRegisteredText) ld hl, ItemMayBeRegisteredText call MapTextbox - call CloseText - jp LoadMoveSprites + call WaitButton + jp CloseText ; 13340 @@ -141,7 +141,7 @@ UseRegisteredItem: ; 133c3 .NoFunction ; 133df call LoadFont call CantUseItem - call LoadMoveSprites + call CloseText and a ret ; 133ea @@ -149,7 +149,7 @@ UseRegisteredItem: ; 133c3 .Current ; 133ea call LoadFont call DoItemEffect - call LoadMoveSprites + call CloseText and a ret ; 133f5 @@ -159,7 +159,7 @@ UseRegisteredItem: ; 133c3 call FadeToMenu call DoItemEffect call ReturnToCallingMenu - call LoadMoveSprites + call CloseText and a ret ; 13406 @@ -185,7 +185,7 @@ UseRegisteredItem: ; 133c3 ._cantuse call CantUseItem - call LoadMoveSprites + call CloseText and a ret ; 1342d diff --git a/engine/sprites.asm b/engine/sprites.asm index f12ed1de8..77e3b68b7 100755 --- a/engine/sprites.asm +++ b/engine/sprites.asm @@ -12,12 +12,12 @@ Function8cf53: ; 8cf53 ; 8cf62 Function8cf62: ; 8cf62 - call Function8cf69 + call PlaySpriteAnimations call DelayFrame ret ; 8cf69 -Function8cf69: ; 8cf69 +PlaySpriteAnimations: ; 8cf69 push hl push de push bc @@ -35,7 +35,7 @@ Function8cf69: ; 8cf69 ; 8cf7a Function8cf7a: ; 8cf7a - ld hl, wc314 + ld hl, wSpriteAnimationStructs ld e, 10 ; There are 10 structs here. .loop @@ -114,10 +114,10 @@ Function8cfa8: ; 8cfa8 (23:4fa8) ret InitSpriteAnimStruct:: ; 8cfd6 -; Find if there's any room in the wc314 array, which is 10x16 +; Find if there's any room in the wSpriteAnimationStructs array, which is 10x16 push de push af - ld hl, wc314 + ld hl, wSpriteAnimationStructs ld e, 10 .loop ld a, [hl] @@ -221,8 +221,8 @@ Function8d036: ; 8d036 Function8d03d: ; 8d03d (23:503d) -; Clear the index field of every struct in the wc314 array. - ld hl, wc314 +; Clear the index field of every struct in the wSpriteAnimationStructs array. + ld hl, wSpriteAnimationStructs ld bc, $10 ld e, 10 xor a @@ -622,7 +622,7 @@ endr dw .sixteen dw .seventeen dw .eighteen - dw .nineteen + dw .nineteen ; finish egg hatching animation dw .twenty dw .twentyone dw .twentytwo ; flying sprite @@ -761,7 +761,7 @@ endr ld a, [hl] add $3 ld [hl], a - call .asm_8d6de + call .ApplyYOffset ld hl, $7 add hl, bc ld [hl], a @@ -779,7 +779,7 @@ endr inc a ld [hl], a ld d, $2 - call .asm_8d6de + call .ApplyYOffset ld hl, $7 add hl, bc ld [hl], a @@ -818,13 +818,13 @@ endr ld a, [hl] push af push de - call .asm_8d6de + call .ApplyYOffset ld hl, $7 add hl, bc ld [hl], a pop de pop af - call .asm_8d6e2 + call .ApplyXOffset ld hl, $6 add hl, bc ld [hl], a @@ -856,13 +856,13 @@ endr ld a, [hl] push af push de - call .asm_8d6de + call .ApplyYOffset ld hl, $7 add hl, bc ld [hl], a pop de pop af - call .asm_8d6e2 + call .ApplyXOffset ld hl, $6 add hl, bc ld [hl], a @@ -947,14 +947,14 @@ endr .asm_8d462 ld a, e ld d, $20 - call .asm_8d6de + call .ApplyYOffset ld hl, $7 add hl, bc ld [hl], a ret .thirteen: ; 8d46e (23:546e) - callab Functione00ed + callab ret_e00ed ret .fifteen: ; 8d475 (23:5475) @@ -1014,7 +1014,7 @@ endr jr c, .asm_8d4cd dec [hl] ld d, $28 - call .asm_8d6de + call .ApplyYOffset ld hl, $7 add hl, bc ld [hl], a @@ -1049,7 +1049,7 @@ endr ld hl, $c add hl, bc ld a, [hl] - call Function8e72c + call ApplyYOffset ld hl, $7 add hl, bc ld [hl], a @@ -1108,33 +1108,36 @@ endr ret .nineteen: ; 8d54a (23:554a) - ld hl, $c + ld hl, SpriteAnim1Sprite0c - SpriteAnim1 add hl, bc ld a, [hl] cp $80 - jr nc, .asm_8d574 + jr nc, .finish_nineteen ld d, a add $8 ld [hl], a - ld hl, $b + ld hl, SpriteAnim1Sprite0b - SpriteAnim1 add hl, bc ld a, [hl] xor $20 ld [hl], a + push af push de - call .asm_8d6de - ld hl, $7 + call .ApplyYOffset + ld hl, SpriteAnim1YOffset - SpriteAnim1 add hl, bc ld [hl], a + pop de pop af - call .asm_8d6e2 - ld hl, $6 + call .ApplyXOffset + ld hl, SpriteAnim1XOffset - SpriteAnim1 add hl, bc ld [hl], a ret -.asm_8d574 + +.finish_nineteen call Function8d036 ret @@ -1165,13 +1168,13 @@ rept 3 endr push af push de - call .asm_8d6de + call .ApplyYOffset ld hl, $7 add hl, bc ld [hl], a pop de pop af - call .asm_8d6e2 + call .ApplyXOffset ld hl, $6 add hl, bc ld [hl], a @@ -1207,7 +1210,7 @@ endr add hl, bc ld a, [hl] inc [hl] - call .asm_8d6e2 + call .ApplyXOffset ld hl, $6 add hl, bc ld [hl], a @@ -1230,7 +1233,7 @@ endr add hl, bc ld a, [hl] inc [hl] - call .asm_8d6e2 + call .ApplyXOffset ld hl, $6 add hl, bc ld [hl], a @@ -1263,7 +1266,7 @@ endr add hl, bc ld a, [hl] inc [hl] - call .asm_8d6e2 + call .ApplyXOffset ld hl, $6 add hl, bc ld [hl], a @@ -1294,7 +1297,7 @@ endr xor $ff inc a ld d, $20 - call .asm_8d6de + call .ApplyYOffset ld hl, $7 add hl, bc ld [hl], a @@ -1313,7 +1316,7 @@ endr xor $ff inc a ld d, $20 - call .asm_8d6de + call .ApplyYOffset ld hl, $7 add hl, bc ld [hl], a @@ -1332,13 +1335,13 @@ endr ld a, [hl] push af push de - call .asm_8d6de + call .ApplyYOffset ld hl, $7 add hl, bc ld [hl], a pop de pop af - call .asm_8d6e2 + call .ApplyXOffset ld hl, $6 add hl, bc ld [hl], a @@ -1393,12 +1396,12 @@ endr ret ; 8d6de -.asm_8d6de: ; 8d6de (23:56de) - call Function8e72c +.ApplyYOffset: ; 8d6de (23:56de) + call ApplyYOffset ret -.asm_8d6e2: ; 8d6e2 (23:56e2) - call Function8e72a +.ApplyXOffset: ; 8d6e2 (23:56e2) + call ApplyXOffset ret ; 8d6e6 (23:56e6) @@ -2839,17 +2842,17 @@ Unknown_8e706: ; Broken 2bpp pointers dbbw $10, $24, $672a ; 16-tile 2bpp at 24:672a (inside Function926f7) dbbw $10, $21, $672a ; 16-tile 2bpp at 21:672a (inside Function8671c) -Function8e72a: ; 8e72a +ApplyXOffset: ; 8e72a add $10 -Function8e72c: ; 8e72c +ApplyYOffset: ; 8e72c and $3f cp $20 - jr nc, .asm_8e737 + jr nc, .xflip call Function8e741 ld a, h ret -.asm_8e737 +.xflip and $1f call Function8e741 ld a, h @@ -2862,7 +2865,7 @@ Function8e741: ; 8e741 ld e, a ld a, d ld d, 0 - ld hl, Unknown_8e75d + ld hl, .sinewave rept 2 add hl, de endr @@ -2870,54 +2873,54 @@ endr inc hl ld d, [hl] ld hl, 0 -.asm_8e750 +.loop srl a - jr nc, .asm_8e755 + jr nc, .skip_add add hl, de -.asm_8e755 +.skip_add sla e rl d and a - jr nz, .asm_8e750 + jr nz, .loop ret ; 8e75d -Unknown_8e75d: ; 8e75d +.sinewave: ; 8e75d sine_wave $100 -Function8e79d: ; 8e79d +AnimateEndOfExpBar: ; 8e79d ld a, [hSGB] - ld de, GFX_8e7f4 + ld de, EndOfExpBarGFX and a - jr z, .asm_8e7a8 - ld de, GFX_8e804 + jr z, .load + ld de, SGBEndOfExpBarGFX -.asm_8e7a8 - ld hl, VTiles0 - lb bc, BANK(GFX_8e7f4), 1 +.load + ld hl, VTiles0 tile $00 + lb bc, BANK(EndOfExpBarGFX), 1 call Request2bpp ld c, $8 ld d, $0 -.asm_8e7b5 +.loop push bc - call Function8e7c6 + call .AnimateFrame call DelayFrame pop bc rept 2 inc d endr dec c - jr nz, .asm_8e7b5 + jr nz, .loop call ClearSprites ret ; 8e7c6 -Function8e7c6: ; 8e7c6 +.AnimateFrame: ; 8e7c6 ld hl, Sprites ld c, $8 -.asm_8e7cb +.anim_loop ld a, c and a ret z @@ -2927,32 +2930,35 @@ Function8e7c6: ; 8e7c6 sla a sla a push af + push de push hl - call Function8e72c + call ApplyYOffset pop hl pop de - add $68 + add 13 * 8 ld [hli], a + pop af push de push hl - call Function8e72a + call ApplyXOffset pop hl pop de - add $54 + add 10 * 8 + 4 ld [hli], a + ld a, $0 ld [hli], a - ld a, $6 + ld a, $6 ; OBJ 6 ld [hli], a - jr .asm_8e7cb + jr .anim_loop ; 8e7f4 -GFX_8e7f4: ; 8e7f4 -INCBIN "gfx/unknown/08e7f4.2bpp" -GFX_8e804: ; 8e804 -INCBIN "gfx/unknown/08e804.2bpp" +EndOfExpBarGFX: ; 8e7f4 +INCBIN "gfx/battle/expbarend.2bpp" +SGBEndOfExpBarGFX: ; 8e804 +INCBIN "gfx/battle/expbarend_sgb.2bpp" ClearSpriteAnims: ; 8e814 push hl diff --git a/engine/startmenu.asm b/engine/startmenu.asm index a40aa734e..a0b6c5c0e 100755 --- a/engine/startmenu.asm +++ b/engine/startmenu.asm @@ -61,8 +61,8 @@ endr .MenuReturns dw .Reopen dw .Exit - dw .ExitMenuCallFuncLoadMoveSprites - dw .ExitMenuRunScriptLoadMoveSprites + dw .ExitMenuCallFuncCloseText + dw .ExitMenuRunScriptCloseText dw .ExitMenuRunScript dw .ReturnEnd dw .ReturnRedraw @@ -78,7 +78,7 @@ endr .ReturnEnd call ExitMenu .ReturnEnd2 - call LoadMoveSprites + call CloseText call UpdateTimePals ret @@ -115,14 +115,14 @@ endr ret ; 12699 -.ExitMenuRunScriptLoadMoveSprites ; 12699 +.ExitMenuRunScriptCloseText ; 12699 call ExitMenu ld a, HMENURETURN_SCRIPT ld [hMenuReturn], a jr .ReturnEnd2 ; 126a2 -.ExitMenuCallFuncLoadMoveSprites ; 126a2 +.ExitMenuCallFuncCloseText ; 126a2 call ExitMenu ld hl, wQueuedScriptAddr ld a, [hli] diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index a886dbbf3..93a5ec2f5 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -138,8 +138,8 @@ PokeCenterNurseScript: spriteface LAST_TALKED, DOWN pause 10 + waitbutton closetext - loadmovesprites end .pokerus @@ -148,14 +148,14 @@ PokeCenterNurseScript: iftrue .pokerus_comcenter farwritetext UnknownText_0x1b0241 + waitbutton closetext - loadmovesprites jump .pokerus_done .pokerus_comcenter farwritetext UnknownText_0x1b02d6 + waitbutton closetext - loadmovesprites .pokerus_done setflag ENGINE_POKERUS @@ -183,9 +183,9 @@ MerchandiseShelfScript: TownMapScript: loadfont farwritetext TownMapText - closetext + waitbutton special Special_TownMap - loadmovesprites + closetext end WindowScript: @@ -194,8 +194,8 @@ WindowScript: TVScript: loadfont farwritetext TVText + waitbutton closetext - loadmovesprites end HomepageScript: @@ -205,7 +205,7 @@ Radio1Script: loadfont writebyte $0 special MapRadio - loadmovesprites + closetext end Radio2Script: @@ -213,7 +213,7 @@ Radio2Script: loadfont writebyte $4 special MapRadio - loadmovesprites + closetext end TrashCanScript: ; 0xbc1a5 @@ -222,7 +222,7 @@ TrashCanScript: ; 0xbc1a5 PCScript: loadfont special PokemonCenterPC - loadmovesprites + closetext end ElevatorButtonScript: @@ -319,7 +319,7 @@ BugContestResultsScript: clearevent EVENT_CONTEST_OFFICER_HAS_BERRY loadfont farwritetext ContestResults_ReadyToJudgeText - closetext + waitbutton special BugContestJudging RAM2MEM $0 if_equal 1, BugContestResults_FirstPlace @@ -327,7 +327,7 @@ BugContestResultsScript: if_equal 3, BugContestResults_ThirdPlace farwritetext ContestResults_ConsolationPrizeText keeptextopen - waitbutton + waitsfx verbosegiveitem BERRY iffalse BugContestResults_NoRoomForBerry @@ -345,16 +345,16 @@ BugContestResults_FinishUp checkevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER iffalse BugContestResults_DidNotLeaveMons farwritetext ContestResults_ReturnPartyText - closetext + waitbutton special ContestReturnMons BugContestResults_DidNotLeaveMons special CheckPartyFullAfterContest if_equal $0, BugContestResults_CleanUp if_equal $2, BugContestResults_CleanUp farwritetext ContestResults_PartyFullText - closetext + waitbutton BugContestResults_CleanUp - loadmovesprites + closetext dotrigger $0 domaptrigger ROUTE_35_NATIONAL_PARK_GATE, $0 setevent EVENT_BUG_CATCHING_CONTESTANT_1A @@ -386,7 +386,7 @@ BugContestResults_FirstPlace ; 0xbc31e setevent EVENT_GAVE_KURT_APRICORNS itemtotext SUN_STONE, $1 farwritetext ContestResults_PlayerWonAPrizeText - closetext + waitbutton verbosegiveitem SUN_STONE iffalse BugContestResults_NoRoomForSunStone jump BugContestResults_ReturnAfterWinnersPrize @@ -395,7 +395,7 @@ BugContestResults_FirstPlace ; 0xbc31e BugContestResults_SecondPlace ; 0xbc332 itemtotext EVERSTONE, $1 farwritetext ContestResults_PlayerWonAPrizeText - closetext + waitbutton verbosegiveitem EVERSTONE iffalse BugContestResults_NoRoomForEverstone jump BugContestResults_ReturnAfterWinnersPrize @@ -404,7 +404,7 @@ BugContestResults_SecondPlace ; 0xbc332 BugContestResults_ThirdPlace ; 0xbc343 itemtotext GOLD_BERRY, $1 farwritetext ContestResults_PlayerWonAPrizeText - closetext + waitbutton verbosegiveitem GOLD_BERRY iffalse BugContestResults_NoRoomForGoldBerry jump BugContestResults_ReturnAfterWinnersPrize @@ -793,7 +793,7 @@ AskNumber2MScript: RegisteredNumberMScript: farwritetext RegisteredNumber1Text playsound SFX_REGISTER_PHONE_NUMBER - waitbutton + waitsfx keeptextopen end @@ -822,103 +822,103 @@ NumberAcceptedMScript: .Jack farwritetext JackNumberAcceptedText + waitbutton closetext - loadmovesprites end .Huey farwritetext HueyNumberAcceptedText + waitbutton closetext - loadmovesprites end .Gaven farwritetext GavenNumberAcceptedText + waitbutton closetext - loadmovesprites end .Jose farwritetext JoseNumberAcceptedText + waitbutton closetext - loadmovesprites end .Joey farwritetext JoeyNumberAcceptedText + waitbutton closetext - loadmovesprites end .Wade farwritetext WadeNumberAcceptedText + waitbutton closetext - loadmovesprites end .Ralph farwritetext RalphNumberAcceptedText + waitbutton closetext - loadmovesprites end .Anthony farwritetext AnthonyNumberAcceptedText + waitbutton closetext - loadmovesprites end .Todd farwritetext ToddNumberAcceptedText + waitbutton closetext - loadmovesprites end .Irwin farwritetext IrwinNumberAcceptedText + waitbutton closetext - loadmovesprites end .Arnie farwritetext ArnieNumberAcceptedText + waitbutton closetext - loadmovesprites end .Alan farwritetext AlanNumberAcceptedText + waitbutton closetext - loadmovesprites end .Chad farwritetext ChadNumberAcceptedText + waitbutton closetext - loadmovesprites end .Derek farwritetext DerekNumberAcceptedText + waitbutton closetext - loadmovesprites end .Tully farwritetext TullyNumberAcceptedText + waitbutton closetext - loadmovesprites end .Brent farwritetext BrentNumberAcceptedText + waitbutton closetext - loadmovesprites end .Vance farwritetext VanceNumberAcceptedText + waitbutton closetext - loadmovesprites end .Wilton farwritetext WiltonNumberAcceptedText + waitbutton closetext - loadmovesprites end .Kenji farwritetext KenjiNumberAcceptedText + waitbutton closetext - loadmovesprites end .Parry farwritetext ParryNumberAcceptedText + waitbutton closetext - loadmovesprites end NumberDeclinedMScript: @@ -946,103 +946,103 @@ NumberDeclinedMScript: .Jack farwritetext JackNumberDeclinedText + waitbutton closetext - loadmovesprites end .Huey farwritetext HueyNumberDeclinedText + waitbutton closetext - loadmovesprites end .Gaven farwritetext GavenNumberDeclinedText + waitbutton closetext - loadmovesprites end .Jose farwritetext JoseNumberDeclinedText + waitbutton closetext - loadmovesprites end .Joey farwritetext JoeyNumberDeclinedText + waitbutton closetext - loadmovesprites end .Wade farwritetext WadeNumberDeclinedText + waitbutton closetext - loadmovesprites end .Ralph farwritetext RalphNumberDeclinedText + waitbutton closetext - loadmovesprites end .Anthony farwritetext AnthonyNumberDeclinedText + waitbutton closetext - loadmovesprites end .Todd farwritetext ToddNumberDeclinedText + waitbutton closetext - loadmovesprites end .Irwin farwritetext IrwinNumberDeclinedText + waitbutton closetext - loadmovesprites end .Arnie farwritetext ArnieNumberDeclinedText + waitbutton closetext - loadmovesprites end .Alan farwritetext AlanNumberDeclinedText + waitbutton closetext - loadmovesprites end .Chad farwritetext ChadNumberDeclinedText + waitbutton closetext - loadmovesprites end .Derek farwritetext DerekNumberDeclinedText + waitbutton closetext - loadmovesprites end .Tully farwritetext TullyNumberDeclinedText + waitbutton closetext - loadmovesprites end .Brent farwritetext BrentNumberDeclinedText + waitbutton closetext - loadmovesprites end .Vance farwritetext VanceNumberDeclinedText + waitbutton closetext - loadmovesprites end .Wilton farwritetext WiltonNumberDeclinedText + waitbutton closetext - loadmovesprites end .Kenji farwritetext KenjiNumberDeclinedText + waitbutton closetext - loadmovesprites end .Parry farwritetext ParryNumberDeclinedText + waitbutton closetext - loadmovesprites end PhoneFullMScript: @@ -1070,103 +1070,103 @@ PhoneFullMScript: .Jack farwritetext JackPhoneFullText + waitbutton closetext - loadmovesprites end .Huey farwritetext HueyPhoneFullText + waitbutton closetext - loadmovesprites end .Gaven farwritetext GavenPhoneFullText + waitbutton closetext - loadmovesprites end .Jose farwritetext JosePhoneFullText + waitbutton closetext - loadmovesprites end .Joey farwritetext JoeyPhoneFullText + waitbutton closetext - loadmovesprites end .Wade farwritetext WadePhoneFullText + waitbutton closetext - loadmovesprites end .Ralph farwritetext RalphPhoneFullText + waitbutton closetext - loadmovesprites end .Anthony farwritetext AnthonyPhoneFullText + waitbutton closetext - loadmovesprites end .Todd farwritetext ToddPhoneFullText + waitbutton closetext - loadmovesprites end .Irwin farwritetext IrwinPhoneFullText + waitbutton closetext - loadmovesprites end .Arnie farwritetext ArniePhoneFullText + waitbutton closetext - loadmovesprites end .Alan farwritetext AlanPhoneFullText + waitbutton closetext - loadmovesprites end .Chad farwritetext ChadPhoneFullText + waitbutton closetext - loadmovesprites end .Derek farwritetext DerekPhoneFullText + waitbutton closetext - loadmovesprites end .Tully farwritetext TullyPhoneFullText + waitbutton closetext - loadmovesprites end .Brent farwritetext BrentPhoneFullText + waitbutton closetext - loadmovesprites end .Vance farwritetext VancePhoneFullText + waitbutton closetext - loadmovesprites end .Wilton farwritetext WiltonPhoneFullText + waitbutton closetext - loadmovesprites end .Kenji farwritetext KenjiPhoneFullText + waitbutton closetext - loadmovesprites end .Parry farwritetext ParryPhoneFullText + waitbutton closetext - loadmovesprites end RematchMScript: @@ -1191,88 +1191,88 @@ RematchMScript: .Jack farwritetext JackRematchText + waitbutton closetext - loadmovesprites end .Huey farwritetext HueyRematchText + waitbutton closetext - loadmovesprites end .Gaven farwritetext GavenRematchText + waitbutton closetext - loadmovesprites end .Jose farwritetext JoseRematchText + waitbutton closetext - loadmovesprites end .Joey farwritetext JoeyRematchText + waitbutton closetext - loadmovesprites end .Wade farwritetext WadeRematchText + waitbutton closetext - loadmovesprites end .Ralph farwritetext RalphRematchText + waitbutton closetext - loadmovesprites end .Anthony farwritetext AnthonyRematchText + waitbutton closetext - loadmovesprites end .Todd farwritetext ToddRematchText + waitbutton closetext - loadmovesprites end .Arnie farwritetext ArnieRematchText + waitbutton closetext - loadmovesprites end .Alan farwritetext AlanRematchText + waitbutton closetext - loadmovesprites end .Chad farwritetext ChadRematchText + waitbutton closetext - loadmovesprites end .Tully farwritetext TullyRematchText + waitbutton closetext - loadmovesprites end .Brent farwritetext BrentRematchText + waitbutton closetext - loadmovesprites end .Vance farwritetext VanceRematchText + waitbutton closetext - loadmovesprites end .Wilton farwritetext WiltonRematchText + waitbutton closetext - loadmovesprites end .Parry farwritetext ParryRematchText + waitbutton closetext - loadmovesprites end GiftMScript: @@ -1330,58 +1330,58 @@ PackFullMScript: .Huey farwritetext HueyPackFullText + waitbutton closetext - loadmovesprites end .Jose farwritetext JosePackFullText + waitbutton closetext - loadmovesprites end .Joey farwritetext JoeyPackFullText + waitbutton closetext - loadmovesprites end .Wade farwritetext WadePackFullText + waitbutton closetext - loadmovesprites end .Alan farwritetext AlanPackFullText + waitbutton closetext - loadmovesprites end .Derek farwritetext DerekPackFullText + waitbutton closetext - loadmovesprites end .Tully farwritetext TullyPackFullText + waitbutton closetext - loadmovesprites end .Vance farwritetext VancePackFullText + waitbutton closetext - loadmovesprites end .Wilton farwritetext WiltonPackFullText + waitbutton closetext - loadmovesprites end .Kenji farwritetext KenjiPackFullText + waitbutton closetext - loadmovesprites end .Parry farwritetext ParryPackFullText + waitbutton closetext - loadmovesprites end RematchGiftMScript: @@ -1484,7 +1484,7 @@ AskNumber2FScript: RegisteredNumberFScript: farwritetext RegisteredNumber2Text playsound SFX_REGISTER_PHONE_NUMBER - waitbutton + waitsfx keeptextopen end @@ -1501,43 +1501,43 @@ NumberAcceptedFScript: ; 0xbcbd3 .Beverly farwritetext BeverlyNumberAcceptedText + waitbutton closetext - loadmovesprites end .Beth farwritetext BethNumberAcceptedText + waitbutton closetext - loadmovesprites end .Reena farwritetext ReenaNumberAcceptedText + waitbutton closetext - loadmovesprites end .Liz farwritetext LizNumberAcceptedText + waitbutton closetext - loadmovesprites end .Gina farwritetext GinaNumberAcceptedText + waitbutton closetext - loadmovesprites end .Dana farwritetext DanaNumberAcceptedText + waitbutton closetext - loadmovesprites end .Tiffany farwritetext TiffanyNumberAcceptedText + waitbutton closetext - loadmovesprites end .Erin farwritetext ErinNumberAcceptedText + waitbutton closetext - loadmovesprites end NumberDeclinedFScript: @@ -1553,43 +1553,43 @@ NumberDeclinedFScript: .Beverly farwritetext BeverlyNumberDeclinedText + waitbutton closetext - loadmovesprites end .Beth farwritetext BethNumberDeclinedText + waitbutton closetext - loadmovesprites end .Reena farwritetext ReenaNumberDeclinedText + waitbutton closetext - loadmovesprites end .Liz farwritetext LizNumberDeclinedText + waitbutton closetext - loadmovesprites end .Gina farwritetext GinaNumberDeclinedText + waitbutton closetext - loadmovesprites end .Dana farwritetext DanaNumberDeclinedText + waitbutton closetext - loadmovesprites end .Tiffany farwritetext TiffanyNumberDeclinedText + waitbutton closetext - loadmovesprites end .Erin farwritetext ErinNumberDeclinedText + waitbutton closetext - loadmovesprites end PhoneFullFScript: @@ -1605,43 +1605,43 @@ PhoneFullFScript: .Beverly farwritetext BeverlyPhoneFullText + waitbutton closetext - loadmovesprites end .Beth farwritetext BethPhoneFullText + waitbutton closetext - loadmovesprites end .Reena farwritetext ReenaPhoneFullText + waitbutton closetext - loadmovesprites end .Liz farwritetext LizPhoneFullText + waitbutton closetext - loadmovesprites end .Gina farwritetext GinaPhoneFullText + waitbutton closetext - loadmovesprites end .Dana farwritetext DanaPhoneFullText + waitbutton closetext - loadmovesprites end .Tiffany farwritetext TiffanyPhoneFullText + waitbutton closetext - loadmovesprites end .Erin farwritetext ErinPhoneFullText + waitbutton closetext - loadmovesprites end RematchFScript: @@ -1656,38 +1656,38 @@ RematchFScript: .Beth farwritetext BethRematchText + waitbutton closetext - loadmovesprites end .Reena farwritetext ReenaRematchText + waitbutton closetext - loadmovesprites end .Liz farwritetext LizRematchText + waitbutton closetext - loadmovesprites end .Gina farwritetext GinaRematchText + waitbutton closetext - loadmovesprites end .Dana farwritetext DanaRematchText + waitbutton closetext - loadmovesprites end .Tiffany farwritetext TiffanyRematchText + waitbutton closetext - loadmovesprites end .Erin farwritetext ErinRematchText + waitbutton closetext - loadmovesprites end GiftFScript: @@ -1724,28 +1724,28 @@ PackFullFScript: .Beverly farwritetext BeverlyPackFullText + waitbutton closetext - loadmovesprites end .Gina farwritetext GinaPackFullText + waitbutton closetext - loadmovesprites end .Dana farwritetext DanaPackFullText + waitbutton closetext - loadmovesprites end .Tiffany farwritetext TiffanyPackFullText + waitbutton closetext - loadmovesprites end .Erin farwritetext ErinPackFullText + waitbutton closetext - loadmovesprites end RematchGiftFScript: @@ -1762,8 +1762,8 @@ GymStatue1Script: mapnametotext $0 loadfont farwritetext GymStatue_CityGymText + waitbutton closetext - loadmovesprites end GymStatue2Script: @@ -1772,23 +1772,23 @@ GymStatue2Script: farwritetext GymStatue_CityGymText keeptextopen farwritetext GymStatue_WinningTrainersText + waitbutton closetext - loadmovesprites end ReceiveItemScript: ; 0xbcdb9 - waitbutton + waitsfx farwritetext ReceivedItemText playsound SFX_ITEM - waitbutton + waitsfx end ; 0xbcdc3 ReceiveTogepiEggScript: ; 0xbcdc3 - waitbutton + waitsfx farwritetext ReceivedItemText playsound SFX_GET_EGG_FROM_DAYCARE_LADY - waitbutton + waitsfx end ; 0xbcdcd @@ -1800,8 +1800,8 @@ GameCornerCoinVendorScript: ; 0xbcdcd checkitem COIN_CASE iftrue CoinVendor_IntroScript farwritetext CoinVendor_NoCoinCaseText + waitbutton closetext - loadmovesprites end ; 0xbcde0 @@ -1825,10 +1825,10 @@ CoinVendor_Buy50CoinsScript: ; 0xbcdf7 if_equal $2, CoinVendor_NotEnoughMoneyScript givecoins 50 takemoney $0, 1000 - waitbutton + waitsfx playsound SFX_TRANSACTION farwritetext CoinVendor_Buy50CoinsText - closetext + waitbutton jump CoinVendor_SellCoinsMenuScript ; 0xbce1b @@ -1839,31 +1839,31 @@ CoinVendor_Buy500CoinsScript: ; 0xbce1b if_equal $2, CoinVendor_NotEnoughMoneyScript givecoins 500 takemoney $0, 10000 - waitbutton + waitsfx playsound SFX_TRANSACTION farwritetext CoinVendor_Buy500CoinsText - closetext + waitbutton jump CoinVendor_SellCoinsMenuScript ; 0xbce3f CoinVendor_NotEnoughMoneyScript: ; 0xbce3f farwritetext CoinVendor_NotEnoughMoneyText + waitbutton closetext - loadmovesprites end ; 0xbce46 CoinVendor_CoinCaseFullScript: ; 0xbce46 farwritetext CoinVendor_CoinCaseFullText + waitbutton closetext - loadmovesprites end ; 0xbce4d CoinVendor_CancelScript: ; 0xbce4d farwritetext CoinVendor_CancelText + waitbutton closetext - loadmovesprites end ; 0xbce54 @@ -1892,20 +1892,20 @@ HappinessCheckScript: if_less_than 50, .Unhappy if_less_than 150, .KindaHappy farwritetext HappinessText3 + waitbutton closetext - loadmovesprites end .KindaHappy farwritetext HappinessText2 + waitbutton closetext - loadmovesprites end .Unhappy farwritetext HappinessText1 + waitbutton closetext - loadmovesprites end Movement_ContestResults_WalkAfterWarp: ; bcea1 diff --git a/engine/time_capsule/conversion.asm b/engine/time_capsule/conversion.asm index 10f7ab5f3..cd2d68da1 100755 --- a/engine/time_capsule/conversion.asm +++ b/engine/time_capsule/conversion.asm @@ -355,18 +355,18 @@ NewPokedexEntry: ; fb877 ld [hSCX], a xor a ld [wPokedexStatus], a - callba Function41a7f + callba _NewPokedexEntry call WaitPressAorB_BlinkCursor ld a, $1 ld [wPokedexStatus], a - callba Function4424d + callba DisplayDexEntry call WaitPressAorB_BlinkCursor pop af ld [wPokedexStatus], a call MaxVolume call RotateThreePalettesRight ld a, [hSCX] - add $fb + add -5 ; 251 ; NUM_POKEMON ld [hSCX], a call Functionfb8c8 pop af @@ -378,7 +378,7 @@ Functionfb8c8: ; fb8c8 call ClearTileMap call LoadFontsExtra call LoadStandardFont - callba Function40ab2 + callba Pokedex_PlaceFrontpicTopLeftCorner call Function3200 callba GetEnemyMonDVs ld a, [hli] diff --git a/engine/town_map.asm b/engine/town_map.asm index c821e793a..e9a3a5001 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -92,7 +92,7 @@ Function919b0: ; 919b0 jr nz, .pressed_down .loop2 push de - callba Function8cf69 + callba PlaySpriteAnimations pop de call DelayFrame jr .loop diff --git a/engine/trade/animation.asm b/engine/trade/animation.asm index 0aaf0cb8b..ec02fc667 100755 --- a/engine/trade/animation.asm +++ b/engine/trade/animation.asm @@ -206,7 +206,7 @@ DoTradeAnimation: ; 29082 bit 7, a jr nz, .finished call .DoTradeAnimCommand - callab Function8cf69 + callab PlaySpriteAnimations ld hl, wcf65 inc [hl] call DelayFrame diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm new file mode 100755 index 000000000..e9a38257d --- /dev/null +++ b/engine/warp_connection.asm @@ -0,0 +1,440 @@ + +RunCallback_05_03: ; 1045b0 + call Clearwc7e8 + call ResetMapBufferEventFlags + call ResetFlashIfOutOfCave + call GetCurrentMapTrigger + call ResetBikeFlags + ld a, $5 + call RunMapCallback + +RunCallback_03: ; 1045c4 + callba ClearCmdQueue + ld a, $3 + call RunMapCallback + call GetMapHeaderTimeOfDayNybble + ld [wc2d0], a + ret + + +EnterMapConnection: ; 1045d6 +; Return carry if a connection has been entered. + ld a, [wPlayerStepDirection] + and a + jp z, EnterSouthConnection + cp 1 + jp z, EnterNorthConnection + cp 2 + jp z, EnterWestConnection + cp 3 + jp z, EnterEastConnection + ret +; 1045ed + + +EnterWestConnection: ; 1045ed + ld a, [WestConnectedMapGroup] + ld [MapGroup], a + ld a, [WestConnectedMapNumber] + ld [MapNumber], a + ld a, [WestConnectionStripXOffset] + ld [XCoord], a + ld a, [WestConnectionStripYOffset] + ld hl, YCoord + add [hl] + ld [hl], a + ld c, a + ld hl, WestConnectionWindow + ld a, [hli] + ld h, [hl] + ld l, a + srl c + jr z, .skip_to_load + ld a, [WestConnectedMapWidth] + add 6 + ld e, a + ld d, 0 + +.loop + add hl, de + dec c + jr nz, .loop + +.skip_to_load + ld a, l + ld [wd194], a + ld a, h + ld [wd194 + 1], a + jp EnteredConnection +; 104629 + + +EnterEastConnection: ; 104629 + ld a, [EastConnectedMapGroup] + ld [MapGroup], a + ld a, [EastConnectedMapNumber] + ld [MapNumber], a + ld a, [EastConnectionStripXOffset] + ld [XCoord], a + ld a, [EastConnectionStripYOffset] + ld hl, YCoord + add [hl] + ld [hl], a + ld c, a + ld hl, EastConnectionWindow + ld a, [hli] + ld h, [hl] + ld l, a + srl c + jr z, .skip_to_load + ld a, [EastConnectedMapWidth] + add 6 + ld e, a + ld d, 0 + +.loop + add hl, de + dec c + jr nz, .loop + +.skip_to_load + ld a, l + ld [wd194], a + ld a, h + ld [wd194 + 1], a + jp EnteredConnection +; 104665 + + +EnterNorthConnection: ; 104665 + ld a, [NorthConnectedMapGroup] + ld [MapGroup], a + ld a, [NorthConnectedMapNumber] + ld [MapNumber], a + ld a, [NorthConnectionStripYOffset] + ld [YCoord], a + ld a, [NorthConnectionStripXOffset] + ld hl, XCoord + add [hl] + ld [hl], a + ld c, a + ld hl, NorthConnectionWindow + ld a, [hli] + ld h, [hl] + ld l, a + ld b, 0 + srl c + add hl, bc + ld a, l + ld [wd194], a + ld a, h + ld [wd194 + 1], a + jp EnteredConnection +; 104696 + + +EnterSouthConnection: ; 104696 + ld a, [SouthConnectedMapGroup] + ld [MapGroup], a + ld a, [SouthConnectedMapNumber] + ld [MapNumber], a + ld a, [SouthConnectionStripYOffset] + ld [YCoord], a + ld a, [SouthConnectionStripXOffset] + ld hl, XCoord + add [hl] + ld [hl], a + ld c, a + ld hl, SouthConnectionWindow + ld a, [hli] + ld h, [hl] + ld l, a + ld b, 0 + srl c + add hl, bc + ld a, l + ld [wd194], a + ld a, h + ld [wd194 + 1], a + ; fallthrough +; 1046c4 + +EnteredConnection: ; 1046c4 + scf + ret +; 1046c6 + +LoadWarpData: ; 1046c6 + call .SaveDigWarp + call .SetSpawn + ld a, [wNextWarp] + ld [WarpNumber], a + ld a, [wNextMapGroup] + ld [MapGroup], a + ld a, [wNextMapNumber] + ld [MapNumber], a + ret + +.SaveDigWarp: ; 1046df (41:46df) + call GetMapPermission + call CheckOutdoorMap + ret nz + ld a, [wNextMapGroup] + ld b, a + ld a, [wNextMapNumber] + ld c, a + call GetAnyMapPermission + call CheckIndoorMap + ret nz + ld a, [wPrevMapGroup] + cp GROUP_MOUNT_MOON_SQUARE + jr nz, .not_mt_moon_or_tin_tower + ld a, [wPrevMapNumber] + cp MAP_MOUNT_MOON_SQUARE + ret z + cp MAP_TIN_TOWER_ROOF + ret z +.not_mt_moon_or_tin_tower + ld a, [wPrevWarp] + ld [wDigWarp], a + ld a, [wPrevMapGroup] + ld [wDigMapGroup], a + ld a, [wPrevMapNumber] + ld [wDigMapNumber], a + ret + +.SetSpawn: ; 104718 (41:4718) + call GetMapPermission + call CheckOutdoorMap + ret nz + ld a, [wNextMapGroup] + ld b, a + ld a, [wNextMapNumber] + ld c, a + call GetAnyMapPermission + call CheckIndoorMap + ret nz + ld a, [wNextMapGroup] + ld b, a + ld a, [wNextMapNumber] + ld c, a + call GetAnyMapTileset + ld a, c + cp TILESET_POKECENTER + jr z, .pokecenter_pokecom + cp TILESET_POKECOM_CENTER + jr z, .pokecenter_pokecom + ret +.pokecenter_pokecom + ld a, [wPrevMapGroup] + ld [wLastSpawnMapGroup], a + ld a, [wPrevMapNumber] + ld [wLastSpawnMapNumber], a + ret + +LoadMapTimeOfDay: ; 104750 + ld hl, VramState + res 6, [hl] + ld a, $1 + ld [wSpriteUpdatesEnabled], a + callba Function8c0e5 + callba Function8c001 + call OverworldTextModeSwitch + call Function104770 + call Function1047a3 + ret + +Function104770: ; 104770 (41:4770) + ld a, VBGMap0 / $100 + ld [wBGMapAnchor + 1], a + xor a + ld [wBGMapAnchor], a + ld [hSCY], a + ld [hSCX], a + callba Function5958 + ld a, [rVBK] + push af + ld a, $1 + ld [rVBK], a + xor a + lb bc, 4, 0 + hlbgcoord 0, 0 + call ByteFill + pop af + ld [rVBK], a + ld a, $60 + lb bc, 4, 0 + hlbgcoord 0, 0 + call ByteFill + ret + +Function1047a3: ; 1047a3 (41:47a3) + decoord 0, 0 + call .copy + ld a, [hCGB] + and a + ret z + + decoord 0, 0, AttrMap + ld a, $1 + ld [rVBK], a +.copy: + hlbgcoord 0, 0 + ld c, SCREEN_WIDTH + ld b, SCREEN_HEIGHT +.row + push bc +.column + ld a, [de] + inc de + ld [hli], a + dec c + jr nz, .column + ld bc, $20 - SCREEN_WIDTH + add hl, bc + pop bc + dec b + jr nz, .row + ld a, $0 + ld [rVBK], a + ret + +LoadGraphics: ; 1047cf + call LoadTilesetHeader + call LoadTileset + xor a + ld [hMapAnims], a + xor a + ld [hTileAnimFrame], a + callba RefreshSprites + call LoadFontsExtra + callba Function106594 + ret + +LoadMapPalettes: ; 1047eb + ld b, SCGB_09 + jp GetSGBLayout +; 1047f0 + +RefreshMapSprites: ; 1047f0 + call ClearSprites + callba ReturnFromMapSetupScript + call GetMovementPermissions + callba Function579d + callba CheckReplaceKrisSprite + ld hl, wPlayerSpriteSetupFlags + bit 6, [hl] + jr nz, .skip + ld hl, VramState + set 0, [hl] + call Function2e31 +.skip + ld a, [wPlayerSpriteSetupFlags] + and $1c + ld [wPlayerSpriteSetupFlags], a + ret + +CheckMovingOffEdgeOfMap:: ; 104820 (41:4820) + ld a, [wPlayerStepDirection] + cp STANDING + ret z + and a ; DOWN + jr z, .down + cp UP + jr z, .up + cp LEFT + jr z, .left + cp RIGHT + jr z, .right + and a + ret + +.down + ld a, [PlayerNextMapY] + sub 4 + ld b, a + ld a, [MapHeight] + add a + cp b + jr z, .ok + and a + ret + +.up + ld a, [PlayerNextMapY] + sub 4 + cp -1 + jr z, .ok + and a + ret + +.left + ld a, [PlayerNextMapX] + sub $4 + cp -1 + jr z, .ok + and a + ret + +.right + ld a, [PlayerNextMapX] + sub 4 + ld b, a + ld a, [MapWidth] + add a + cp b + jr z, .ok + and a + ret + +.ok + scf + ret + + +GetCoordOfUpperLeftCorner:: ; 10486d + ld hl, OverworldMap + ld a, [XCoord] + bit 0, a + jr nz, .increment_then_halve1 + srl a + add $1 + jr .resume + +.increment_then_halve1 + add $1 + srl a + +.resume + ld c, a + ld b, $0 + add hl, bc + ld a, [MapWidth] + add $6 + ld c, a + ld b, $0 + ld a, [YCoord] + bit 0, a + jr nz, .increment_then_halve2 + srl a + add $1 + jr .resume2 + +.increment_then_halve2 + add $1 + srl a + +.resume2 + call AddNTimes + ld a, l + ld [wd194], a + ld a, h + ld [wd194 + 1], a + ld a, [YCoord] + and $1 + ld [wd196], a + ld a, [XCoord] + and $1 + ld [wd197], a + ret +; 1048ba diff --git a/event/basement_key.asm b/event/basement_key.asm index 605b2af88..2800bac8d 100755 --- a/event/basement_key.asm +++ b/event/basement_key.asm @@ -29,6 +29,6 @@ _BasementKey: ; 507b4 ; 507e1 .BasementKeyScript: ; 0x507e1 - loadmovesprites + closetext farjump BasementDoorScript ; 0x507e6 diff --git a/event/card_key.asm b/event/card_key.asm index b442ba184..dc7393911 100755 --- a/event/card_key.asm +++ b/event/card_key.asm @@ -34,6 +34,6 @@ _CardKey: ; 50779 ; 507af .CardKeyScript: ; 0x507af - loadmovesprites + closetext farjump MapRadioTower3FSignpost2Script ; 0x507b4 diff --git a/event/halloffame.asm b/event/halloffame.asm index d4b86286d..e2c120102 100755 --- a/event/halloffame.asm +++ b/event/halloffame.asm @@ -1,5 +1,5 @@ HallOfFame:: ; 0x8640e - call Function8648e + call HallOfFame_FadeOutMusic ld a, [StatusFlags] push af ld a, 1 @@ -12,7 +12,7 @@ HallOfFame:: ; 0x8640e ld hl, StatusFlags set 6, [hl] ; hall of fame - callba Function14da0 + callba HallOfFame_InitSaveIfNeeded ld hl, wHallOfFameCount ld a, [hl] @@ -26,10 +26,10 @@ HallOfFame:: ; 0x8640e xor a ld [wc2cd], a - call Function864c3 + call AnimateHallOfFame pop af ld b, a - callba Function109847 + callba Credits ret ; 0x86455 @@ -38,7 +38,7 @@ RedCredits:: ; 86455 ld [MusicFadeIDLo], a ld a, MUSIC_NONE / $100 ld [MusicFadeIDHi], a - ld a, $a + ld a, 10 ld [MusicFade], a callba FadeOutPalettes xor a @@ -52,11 +52,11 @@ RedCredits:: ; 86455 ld [wSpawnAfterChampion], a ld a, [StatusFlags] ld b, a - callba Function109847 + callba Credits ret ; 8648e -Function8648e: ; 8648e +HallOfFame_FadeOutMusic: ; 8648e ld a, MUSIC_NONE % $100 ld [MusicFadeIDLo], a ld a, MUSIC_NONE / $100 @@ -72,7 +72,7 @@ Function8648e: ; 8648e jp DelayFrames ; 864b4 -Function864b4: ; 864b4 +HallOfFame_PlayMusicDE: ; 864b4 push de ld de, MUSIC_NONE call PlayMusic @@ -82,29 +82,29 @@ Function864b4: ; 864b4 ret ; 864c3 -Function864c3: ; 864c3 +AnimateHallOfFame: ; 864c3 xor a ld [wJumptableIndex], a - call Function8671c + call LoadHOFTeam jr c, .done - ld de, SCREEN_WIDTH - call Function864b4 + ld de, MUSIC_HALL_OF_FAME + call HallOfFame_PlayMusicDE xor a ld [wcf64], a .loop ld a, [wcf64] - cp 6 + cp PARTY_LENGTH jr nc, .done - ld hl, wc608 + 1 - ld bc, $10 + ld hl, wHallOfFameTempMon1 + ld bc, wHallOfFameTempMon1End - wHallOfFameTempMon1 call AddNTimes ld a, [hl] cp -1 jr z, .done push hl - call Function865b5 + call AnimateHOFMonEntrance pop hl - call Function8650c + call .DisplayNewHallOfFamer jr c, .done ld hl, wcf64 inc [hl] @@ -120,9 +120,9 @@ Function864c3: ; 864c3 ret ; 8650c -Function8650c: ; 8650c - call Function86748 - ld de, String_8652c +.DisplayNewHallOfFamer: ; 8650c + call DisplayHOFMon + ld de, .String_NewHallOfFamer hlcoord 1, 2 call PlaceString call WaitBGMap @@ -135,7 +135,7 @@ Function8650c: ; 8650c ret ; 8652c -String_8652c: +.String_NewHallOfFamer: db "New Hall of Famer!@" ; 8653f @@ -227,7 +227,7 @@ GetHallOfFameParty: ; 8653f ret ; 865b5 -Function865b5: ; 865b5 +AnimateHOFMonEntrance: ; 865b5 push hl call ClearBGPalettes callba Function4e906 @@ -265,7 +265,7 @@ endr ld b, SCGB_1A call GetSGBLayout call SetPalettes - call Function86635 + call HOF_SlideBackpic xor a ld [wc2c6], a hlcoord 0, 0 @@ -278,23 +278,23 @@ endr xor a ld [hBGMapMode], a ld [hSCY], a - call Function86643 + call HOF_SlideFrontpic ret ; 86635 -Function86635: ; 86635 -.loop +HOF_SlideBackpic: +.backpicloop ld a, [hSCX] cp $70 ret z add $4 ld [hSCX], a call DelayFrame - jr .loop + jr .backpicloop ; 86643 -Function86643: ; 86643 -.loop +HOF_SlideFrontpic: +.frontpicloop ld a, [hSCX] and a ret z @@ -303,7 +303,7 @@ rept 2 endr ld [hSCX], a call DelayFrame - jr .loop + jr .frontpicloop ; 86650 _HallOfFamePC: ; 86650 @@ -311,7 +311,7 @@ _HallOfFamePC: ; 86650 xor a ld [wJumptableIndex], a .loop - call Function8671c + call LoadHOFTeam ret c call Function86665 ret c @@ -361,8 +361,8 @@ Function86692: ; 86692 ld a, [wcf64] cp $6 jr nc, .fail - ld hl, wc608 + 1 - ld bc, $10 + ld hl, wHallOfFameTempMon1 + ld bc, wHallOfFameTempMon1End - wHallOfFameTempMon1 call AddNTimes ld a, [hl] cp $ff @@ -376,8 +376,8 @@ Function86692: ; 86692 push hl call ClearBGPalettes pop hl - call Function86748 - ld a, [wc608] + call DisplayHOFMon + ld a, [wHallOfFameTempWinCount] cp 200 + 1 jr c, .print_num_hof ld de, String_866fc @@ -391,7 +391,7 @@ Function86692: ; 86692 hlcoord 1, 2 call PlaceString hlcoord 2, 2 - ld de, wc608 + ld de, wHallOfFameTempWinCount lb bc, 1, 3 call PrintNum hlcoord 11, 2 @@ -423,10 +423,10 @@ String_8670c: ; 8671c -Function8671c: ; 8671c +LoadHOFTeam: ; 8671c ld a, [wJumptableIndex] cp NUM_HOF_TEAMS - jr nc, .full + jr nc, .invalid ld hl, sHallOfFame ld bc, HOF_LENGTH call AddNTimes @@ -434,23 +434,23 @@ Function8671c: ; 8671c call GetSRAMBank ld a, [hl] and a - jr z, .fail - ld de, wc608 + jr z, .absent + ld de, wHallOfFameTemp ld bc, HOF_LENGTH call CopyBytes call CloseSRAM and a ret -.fail +.absent call CloseSRAM -.full +.invalid scf ret ; 86748 -Function86748: ; 86748 +DisplayHOFMon: ; 86748 xor a ld [hBGMapMode], a ld a, [hli] @@ -466,7 +466,7 @@ Function86748: ; 86748 ld a, [hli] ld [TempMonLevel], a ld de, StringBuffer2 - ld bc, 10 + ld bc, PKMN_NAME_LENGTH - 1 call CopyBytes ld a, "@" ld [StringBuffer2 + 10], a @@ -564,7 +564,7 @@ Function86810: ; 86810 ld b, SCGB_1A call GetSGBLayout call SetPalettes - call Function86635 + call HOF_SlideBackpic xor a ld [wc2c6], a hlcoord 0, 0 @@ -583,7 +583,7 @@ Function86810: ; 86810 xor a ld [hBGMapMode], a ld [hSCY], a - call Function86643 + call HOF_SlideFrontpic xor a ld [hBGMapMode], a hlcoord 0, 2 diff --git a/event/itemball.asm b/event/itemball.asm index 0e74cbd27..6c6f503e1 100755 --- a/event/itemball.asm +++ b/event/itemball.asm @@ -7,17 +7,17 @@ FindItemInBallScript:: ; 0x122ce playsound SFX_ITEM pause 60 itemnotify - loadmovesprites + closetext end ; 0x122e3 .no_room: ; 0x122e3 loadfont writetext .text_found - closetext + waitbutton writetext .text_bag_full + waitbutton closetext - loadmovesprites end ; 0x122ee diff --git a/event/itemfinder.asm b/event/itemfinder.asm index 23de57058..1bbec2a4f 100755 --- a/event/itemfinder.asm +++ b/event/itemfinder.asm @@ -33,7 +33,7 @@ ItemFinder: ; 12580 special UpdateTimePals callasm .ItemfinderSound writetext .Text_FoundSomething - loadmovesprites + closetext end ; 0x125ba @@ -41,7 +41,7 @@ ItemFinder: ; 12580 reloadmappart special UpdateTimePals writetext .Text_FoundNothing - loadmovesprites + closetext end ; 0x125c3 diff --git a/event/magnet_train.asm b/event/magnet_train.asm index d9c1a3ae9..dfc12b85a 100755 --- a/event/magnet_train.asm +++ b/event/magnet_train.asm @@ -43,7 +43,7 @@ Special_MagnetTrain: ; 8cc04 jr z, .initialize bit 7, a jr nz, .done - callab Function8cf69 + callab PlaySpriteAnimations call Function8cdf7 call Function8cc99 call Function3b0c @@ -426,7 +426,7 @@ Function8cea2: ; 8cea2 ; 8ceae Function8ceae: ; 8ceae - callba Function8cf69 + callba PlaySpriteAnimations call Function8cdf7 call Function8cc99 call Function3b0c diff --git a/event/photo.asm b/event/photo.asm index 712107ed0..b35b38e04 100755 --- a/event/photo.asm +++ b/event/photo.asm @@ -162,7 +162,7 @@ Function16cff: ; 16cff ld a, BANK(sScratch) call GetSRAMBank - ld de, w6_d000 + ld de, wBackupTilemap ld hl, sScratch ld a, [hROMBank] ld b, a diff --git a/event/poisonstep.asm b/event/poisonstep.asm index 1fafd63a5..29181f6b3 100755 --- a/event/poisonstep.asm +++ b/event/poisonstep.asm @@ -114,7 +114,7 @@ DoPoisonStep:: ; 505da loadfont callasm .CheckWhitedOut iffalse .whiteout - loadmovesprites + closetext end ; 50677 diff --git a/event/sacred_ash.asm b/event/sacred_ash.asm index 00b80bb46..88d49b935 100755 --- a/event/sacred_ash.asm +++ b/event/sacred_ash.asm @@ -58,12 +58,12 @@ SacredAshScript: ; 0x50821 special FadeInPalettes special FadeOutPalettes special FadeInPalettes - waitbutton + waitsfx writetext UnknownText_0x50845 playsound SFX_CAUGHT_MON + waitsfx waitbutton closetext - loadmovesprites end ; 0x50845 diff --git a/event/sweet_scent.asm b/event/sweet_scent.asm index ebe0d4266..5493d8841 100755 --- a/event/sweet_scent.asm +++ b/event/sweet_scent.asm @@ -11,12 +11,12 @@ UnknownScript_0x506c8: ; 0x506c8 special UpdateTimePals callasm GetPartyNick writetext UnknownText_0x50726 - closetext + waitbutton callasm SweetScentEncounter iffalse UnknownScript_0x506e9 checkflag ENGINE_BUG_CONTEST_TIMER iftrue UnknownScript_0x506e5 - battlecheck + setup_random_encounter startbattle returnafterbattle end @@ -28,8 +28,8 @@ UnknownScript_0x506e5: ; 0x506e5 UnknownScript_0x506e9: ; 0x506e9 writetext UnknownText_0x5072b + waitbutton closetext - loadmovesprites end ; 0x506ef diff --git a/event/whiteout.asm b/event/whiteout.asm index 2e8774b8f..01985c1c9 100755 --- a/event/whiteout.asm +++ b/event/whiteout.asm @@ -9,7 +9,7 @@ Script_OverworldWhiteout:: ; 0x124c8 Script_Whiteout: ; 0x124ce writetext .WhitedOutText - closetext + waitbutton special FadeOutPalettes pause 40 special HealParty diff --git a/gfx/unknown/08e7f4.2bpp b/gfx/battle/expbarend.2bpp Binary files differindex 24f32e155..24f32e155 100644 --- a/gfx/unknown/08e7f4.2bpp +++ b/gfx/battle/expbarend.2bpp diff --git a/gfx/unknown/08e804.2bpp b/gfx/battle/expbarend_sgb.2bpp Binary files differindex dbeb3fdee..dbeb3fdee 100644 --- a/gfx/unknown/08e804.2bpp +++ b/gfx/battle/expbarend_sgb.2bpp diff --git a/gfx/unknown/1de0e1.2bpp.lz b/gfx/pics/questionmark/front.2bpp.lz Binary files differindex cd2f7f22e..cd2f7f22e 100644 --- a/gfx/unknown/1de0e1.2bpp.lz +++ b/gfx/pics/questionmark/front.2bpp.lz diff --git a/gfx/unknown/04150e.2bpp.lz b/gfx/pokedex/pokedex.2bpp.lz Binary files differindex 8f7e3aafb..8f7e3aafb 100644 --- a/gfx/unknown/04150e.2bpp.lz +++ b/gfx/pokedex/pokedex.2bpp.lz diff --git a/gfx/unknown/1ddf33.2bpp.lz b/gfx/pokedex/sgb.2bpp.lz Binary files differindex 6ec9c46b2..6ec9c46b2 100644 --- a/gfx/unknown/1ddf33.2bpp.lz +++ b/gfx/pokedex/sgb.2bpp.lz @@ -317,15 +317,15 @@ PrintLetterDelay:: ; 313d ; mid: 3 frames ; slow: 5 frames -; TextBoxFrame + 1[!0] and A or B override text speed with a one-frame delay. -; Options[4] and TextBoxFrame + 1[!1] disable the delay. +; TextBoxFlags[!0] and A or B override text speed with a one-frame delay. +; Options[4] and TextBoxFlags[!1] disable the delay. ld a, [Options] bit NO_TEXT_SCROLL, a ret nz ; non-scrolling text? - ld a, [TextBoxFrame + 1] + ld a, [TextBoxFlags] bit 1, a ret z @@ -342,7 +342,7 @@ PrintLetterDelay:: ; 313d ld [hl], a ; force fast scroll? - ld a, [TextBoxFrame + 1] + ld a, [TextBoxFlags] bit 0, a jr z, .fast @@ -2192,7 +2192,7 @@ Function3f7c:: ; 3f7c ; 3f88 Function3f88:: ; 3f88 - ld hl, w6_d000 + ld hl, wBackupTilemap ld b, $0 .asm_3f8d push bc @@ -2213,7 +2213,7 @@ Function3f88:: ; 3f88 ; 3f9f Function3f9f:: ; 3f9f - ld hl, w6_d000 + ld hl, wBackupTilemap .asm_3fa2 push bc ld c, $8 diff --git a/home/joypad.asm b/home/joypad.asm index 8dccedf6c..13f27e7c3 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -313,7 +313,7 @@ JoyWaitAorB:: ; a36 jr .loop ; a46 -CloseText:: ; a46 +WaitButton:: ; a46 ld a, [hOAMUpdate] push af ld a, 1 diff --git a/home/map.asm b/home/map.asm index e385517a1..bd83c7069 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1425,10 +1425,10 @@ LoadTileset:: ; 2821 ld [rSVBK], a ld a, e - ld de, w6_d000 + ld de, wBackupTilemap call FarDecompress - ld hl, w6_d000 + ld hl, wBackupTilemap ld de, VTiles2 ld bc, $60 tiles call CopyBytes diff --git a/home/menu.asm b/home/menu.asm index 4e7b7772b..8c6be5471 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -548,7 +548,7 @@ PlayClickSFX:: ; 2009 MenuTextBoxWaitButton:: ; 2012 call MenuTextBox - call CloseText + call WaitButton call ExitMenu ret ; 201c diff --git a/home/text.asm b/home/text.asm index 37208af9d..0c0257c83 100644 --- a/home/text.asm +++ b/home/text.asm @@ -723,15 +723,15 @@ PokeFluteTerminatorCharacter:: ; 13e0 PlaceWholeStringInBoxAtOnce:: ; 13e5 - ld a, [TextBoxFrame + 1] + ld a, [TextBoxFlags] push af set 1, a - ld [TextBoxFrame + 1], a + ld [TextBoxFlags], a call DoTextUntilTerminator pop af - ld [TextBoxFrame + 1], a + ld [TextBoxFlags], a ret ; 13f6 diff --git a/home/window.asm b/home/window.asm index bc03e6ce4..a8eba0bb6 100644 --- a/home/window.asm +++ b/home/window.asm @@ -16,7 +16,7 @@ ResetWindow:: ; 2dba ; 2dcf -LoadMoveSprites:: ; 2dcf +CloseText:: ; 2dcf ld a, [hOAMUpdate] push af ld a, $1 diff --git a/items/item_effects.asm b/items/item_effects.asm index ea0c99881..621125a3b 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -1206,7 +1206,7 @@ SunStone: ; ee0f jr z, .NoEffect ld a, $1 - ld [wd1e9], a + ld [wForceEvolution], a callba EvolvePokemon ld a, [wMonTriedToEvolve] @@ -1447,7 +1447,7 @@ RareCandy: ; ef14 predef LearnLevelMoves xor a - ld [wd1e9], a + ld [wForceEvolution], a callba EvolvePokemon jp UseDisposableItem diff --git a/macros.asm b/macros.asm index fcf3eb15f..e7b157a8d 100644 --- a/macros.asm +++ b/macros.asm @@ -234,3 +234,11 @@ hlbgcoord EQUS "bgcoord hl," debgcoord EQUS "bgcoord de," bcbgcoord EQUS "bgcoord bc," bgrows EQUS "* $20" + +palred EQUS "$0400 *" +palgreen EQUS "$0020 *" +palblue EQUS "$0001 *" + +dsprite: MACRO + db \1 * 8 + \2, \3 * 8 + \4, \5, \6 +endm diff --git a/macros/event.asm b/macros/event.asm index 18483abc3..7b3604777 100644 --- a/macros/event.asm +++ b/macros/event.asm @@ -491,9 +491,9 @@ refreshscreen: macro db \1 ; dummy endm - enum loadmovesprites_command -loadmovesprites: macro - db loadmovesprites_command + enum closetext_command +closetext: macro + db closetext_command endm enum loadbytec2cf_command @@ -559,9 +559,9 @@ jumptext: macro dw \1 ; text_pointer endm - enum closetext_command -closetext: macro - db closetext_command + enum waitbutton_command +waitbutton: macro + db waitbutton_command endm enum keeptextopen_command @@ -575,9 +575,9 @@ pokepic: macro db \1 ; pokemon endm - enum pokepicyesorno_command -pokepicyesorno: macro - db pokepicyesorno_command + enum closepokepic_command +closepokepic: macro + db closepokepic_command endm enum interpretmenu_command @@ -595,26 +595,26 @@ loadpikachudata: macro db loadpikachudata_command endm - enum battlecheck_command -battlecheck: macro - db battlecheck_command + enum setup_random_encounter_command +setup_random_encounter: macro + db setup_random_encounter_command endm - enum loadtrainerdata_command -loadtrainerdata: macro - db loadtrainerdata_command + enum memtrainerdata_command +memtrainerdata: macro + db memtrainerdata_command endm - enum loadpokedata_command -loadpokedata: macro - db loadpokedata_command + enum scriptedpokedata_command +scriptedpokedata: macro + db scriptedpokedata_command db \1 ; pokemon db \2 ; level endm - enum loadtrainer_command -loadtrainer: macro - db loadtrainer_command + enum scriptedtrainerdata_command +scriptedtrainerdata: macro + db scriptedtrainerdata_command db \1 ; trainer_group db \2 ; trainer_id endm @@ -641,9 +641,9 @@ trainertext: macro db \1 ; which_text endm - enum trainerstatus_command -trainerstatus: macro - db trainerstatus_command + enum trainerflagaction_command +trainerflagaction: macro + db trainerflagaction_command db \1 ; action endm @@ -659,14 +659,14 @@ scripttalkafter: macro db scripttalkafter_command endm - enum talkaftercancel_command -talkaftercancel: macro - db talkaftercancel_command + enum end_if_just_battled_command +end_if_just_battled: macro + db end_if_just_battled_command endm - enum talkaftercheck_command -talkaftercheck: macro - db talkaftercheck_command + enum check_just_battled_command +check_just_battled: macro + db check_just_battled_command endm enum setlasttalked_command @@ -822,9 +822,9 @@ playmusic: macro dw \1 ; music_pointer endm - enum playrammusic_command -playrammusic: macro - db playrammusic_command + enum encountermusic_command +encountermusic: macro + db encountermusic_command endm enum musicfadeout_command @@ -856,9 +856,9 @@ playsound: macro dw \1 ; sound_pointer endm - enum waitbutton_command -waitbutton: macro - db waitbutton_command + enum waitsfx_command +waitsfx: macro + db waitsfx_command endm enum warpsound_command diff --git a/macros/text.asm b/macros/text.asm index 37ce72d98..974759930 100644 --- a/macros/text.asm +++ b/macros/text.asm @@ -46,7 +46,7 @@ text_low: macro endm enum WAIT_BUTTON -text_waitbutton: macro +text_waitsfx: macro db WAIT_BUTTON endm @@ -45,9 +45,9 @@ LoadPushOAM:: ; 4031 ; 403f PushOAM: ; 403f - ld a, Sprites >> 8 + ld a, Sprites / $100 ld [rDMA], a - ld a, $28 + ld a, 40 .loop dec a jr nz, .loop @@ -149,12 +149,12 @@ Function64db: ; 64db ld [rSVBK], a ld a, $60 - ld hl, w6_d000 + ld hl, wBackupTilemap lb bc, 4, 0 call ByteFill - ld a, w6_d000 / $100 + ld a, wBackupTilemap / $100 ld [rHDMA1], a - ld a, w6_d000 % $100 + ld a, wBackupTilemap % $100 ld [rHDMA2], a ld a, (VBGMap0 % $8000) / $100 ld [rHDMA3], a @@ -169,264 +169,7 @@ Function64db: ; 64db ret ; 6508 -LearnMove: ; 6508 - call LoadTileMapToTempTileMap - ld a, [CurPartyMon] - ld hl, PartyMonNicknames - call GetNick - ld hl, StringBuffer1 - ld de, wd050_MonNick - ld bc, PKMN_NAME_LENGTH - call CopyBytes - -.loop - ld hl, PartyMon1Moves - ld bc, PARTYMON_STRUCT_LENGTH - ld a, [CurPartyMon] - call AddNTimes - ld d, h - ld e, l - ld b, NUM_MOVES -; Get the first empty move slot. This routine also serves to -; determine whether the Pokemon learning the moves already has -; all four slots occupied, in which case one would need to be -; deleted. -.next - ld a, [hl] - and a - jr z, .learn - inc hl - dec b - jr nz, .next -; If we're here, we enter the routine for forgetting a move -; to make room for the new move we're trying to learn. - push de - call ForgetMove - pop de - jp c, .cancel - - push hl - push de - ld [wd265], a - - ld b, a - ld a, [wBattleMode] - and a - jr z, .not_disabled - ld a, [DisabledMove] - cp b - jr nz, .not_disabled - xor a - ld [DisabledMove], a - ld [PlayerDisableCount], a -.not_disabled - - call GetMoveName - ld hl, UnknownText_0x6684 ; 1, 2 and… - call PrintText - pop de - pop hl - -.learn - ld a, [wd262] - ld [hl], a - ld bc, MON_PP - MON_MOVES - add hl, bc - - push hl - push de - dec a - ld hl, Moves + MOVE_PP - ld bc, MOVE_LENGTH - call AddNTimes - ld a, BANK(Moves) - call GetFarByte - pop de - pop hl - - ld [hl], a - - ld a, [wBattleMode] - and a - jp z, .learned - - ld a, [CurPartyMon] - ld b, a - ld a, [CurBattleMon] - cp b - jp nz, .learned - - ld a, [PlayerSubStatus5] - bit SUBSTATUS_TRANSFORMED, a - jp nz, .learned - - ld h, d - ld l, e - ld de, BattleMonMoves - ld bc, NUM_MOVES - call CopyBytes - ld bc, PartyMon1PP - (PartyMon1Moves + NUM_MOVES) - add hl, bc - ld de, BattleMonPP - ld bc, NUM_MOVES - call CopyBytes - jp .learned - -.cancel - ld hl, UnknownText_0x6675 ; Stop learning <MOVE>? - call PrintText - call YesNoBox - jp c, .loop - - ld hl, UnknownText_0x667a ; <MON> did not learn <MOVE>. - call PrintText - ld b, 0 - ret - -.learned - ld hl, UnknownText_0x666b ; <MON> learned <MOVE>! - call PrintText - ld b, 1 - ret -; 65d3 - -ForgetMove: ; 65d3 - push hl - ld hl, UnknownText_0x667f - call PrintText - call YesNoBox - pop hl - ret c - ld bc, -NUM_MOVES - add hl, bc - push hl - ld de, wListMoves_MoveIndicesBuffer - ld bc, NUM_MOVES - call CopyBytes - pop hl -.loop - push hl - ld hl, UnknownText_0x6670 - call PrintText - hlcoord 5, 2 - ld b, NUM_MOVES * 2 - ld c, MOVE_NAME_LENGTH - call TextBox - hlcoord 5 + 2, 2 + 2 - ld a, SCREEN_WIDTH * 2 - ld [Buffer1], a - predef ListMoves - ; wMenuData3 - ld a, $4 - ld [wcfa1], a - ld a, $6 - ld [wcfa2], a - ld a, [wd0eb] - inc a - ld [wcfa3], a - ld a, $1 - ld [wcfa4], a - ld [MenuSelection2], a - ld [wcfaa], a - ld a, $3 - ld [wcfa8], a - ld a, $20 - ld [wcfa5], a - xor a - ld [wcfa6], a - ld a, $20 - ld [wcfa7], a - call Function1bc9 - push af - call Call_LoadTempTileMapToTileMap - pop af - pop hl - bit 1, a - jr nz, .cancel - push hl - ld a, [MenuSelection2] - dec a - ld c, a - ld b, 0 - add hl, bc - ld a, [hl] - push af - push bc - call IsHMMove - pop bc - pop de - ld a, d - jr c, .hmmove - pop hl - add hl, bc - and a - ret - -.hmmove - ld hl, UnknownText_0x669a - call PrintText - pop hl - jr .loop - -.cancel - scf - ret -; 666b - -UnknownText_0x666b: ; 666b -; <MON> learned <MOVE>! - text_jump UnknownText_0x1c5660 - db "@" -; 6670 - -UnknownText_0x6670: ; 6670 -; Which move should be forgotten? - text_jump UnknownText_0x1c5678 - db "@" -; 6675 - -UnknownText_0x6675: ; 6675 -; Stop learning <MOVE>? - text_jump UnknownText_0x1c5699 - db "@" -; 667a - -UnknownText_0x667a: ; 667a -; <MON> did not learn <MOVE>. - text_jump UnknownText_0x1c56af - db "@" -; 667f - -UnknownText_0x667f: ; 667f -; <MON> is trying to learn <MOVE>. But <MON> can't learn more than -; four moves. Delete an older move to make room for <MOVE>? - text_jump UnknownText_0x1c56c9 - db "@" -; 6684 - -UnknownText_0x6684: ; 6684 - text_jump UnknownText_0x1c5740 ; 1, 2 and… - start_asm - push de - ld de, SFX_SWITCH_POKEMON - call PlaySFX - pop de - ld hl, UnknownText_0x6695 - ret -; 6695 - -UnknownText_0x6695: ; 6695 -; Poof! <MON> forgot <MOVE>. And… - text_jump UnknownText_0x1c574e - db "@" -; 669a - -UnknownText_0x669a: ; 669a -; HM moves can't be forgotten now. - text_jump UnknownText_0x1c5772 - db "@" -; 669f - +INCLUDE "engine/learn.asm" CheckNickErrors:: ; 669f ; error-check monster nick before use @@ -494,215 +237,19 @@ CheckNickErrors:: ; 669f .textcommands ; 66cf ; table defining which characters are actually text commands ; format: - ; ≥ < - db $00, $05 - db $14, $19 - db $1d, $26 - db $35, $3a - db $3f, $40 - db $49, $5d - db $5e, $7f - db $ff ; end + ; ≥ < + db "<START>", $04 + 1 + db "<PLAY_G>", $18 + 1 + db $1d, "%" + 1 + db $35, "<GREEN>" + 1 + db "<ENEMY>", "<ENEMY>" + 1 + db $49, "<TM>" + 1 + db "<ROCKET>", "┘" + 1 + db -1 ; end ; 66de -_Multiply:: ; 66de - -; hMultiplier is one byte. - ld a, 8 - ld b, a - - xor a - ld [hMultiplicand - 1], a - ld [hMathBuffer + 1], a - ld [hMathBuffer + 2], a - ld [hMathBuffer + 3], a - ld [hMathBuffer + 4], a - - -.loop - ld a, [hMultiplier] - srl a - ld [hMultiplier], a - jr nc, .next - - ld a, [hMathBuffer + 4] - ld c, a - ld a, [hMultiplicand + 2] - add c - ld [hMathBuffer + 4], a - - ld a, [hMathBuffer + 3] - ld c, a - ld a, [hMultiplicand + 1] - adc c - ld [hMathBuffer + 3], a - - ld a, [hMathBuffer + 2] - ld c, a - ld a, [hMultiplicand + 0] - adc c - ld [hMathBuffer + 2], a - - ld a, [hMathBuffer + 1] - ld c, a - ld a, [hMultiplicand - 1] - adc c - ld [hMathBuffer + 1], a - -.next - dec b - jr z, .done - - -; hMultiplicand <<= 1 - - ld a, [hMultiplicand + 2] - add a - ld [hMultiplicand + 2], a - - ld a, [hMultiplicand + 1] - rla - ld [hMultiplicand + 1], a - - ld a, [hMultiplicand + 0] - rla - ld [hMultiplicand + 0], a - - ld a, [hMultiplicand - 1] - rla - ld [hMultiplicand - 1], a - - jr .loop - - -.done - ld a, [hMathBuffer + 4] - ld [hProduct + 3], a - - ld a, [hMathBuffer + 3] - ld [hProduct + 2], a - - ld a, [hMathBuffer + 2] - ld [hProduct + 1], a - - ld a, [hMathBuffer + 1] - ld [hProduct + 0], a - - ret -; 673e - - -_Divide:: ; 673e - xor a - ld [hMathBuffer + 0], a - ld [hMathBuffer + 1], a - ld [hMathBuffer + 2], a - ld [hMathBuffer + 3], a - ld [hMathBuffer + 4], a - - ld a, 9 - ld e, a - -.loop - ld a, [hMathBuffer + 0] - ld c, a - ld a, [hDividend + 1] - sub c - ld d, a - - ld a, [hDivisor] - ld c, a - ld a, [hDividend + 0] - sbc c - jr c, .asm_6767 - - ld [hDividend + 0], a - - ld a, d - ld [hDividend + 1], a - - ld a, [hMathBuffer + 4] - inc a - ld [hMathBuffer + 4], a - - jr .loop - -.asm_6767 - ld a, b - cp 1 - jr z, .done - - ld a, [hMathBuffer + 4] - add a - ld [hMathBuffer + 4], a - - ld a, [hMathBuffer + 3] - rla - ld [hMathBuffer + 3], a - - ld a, [hMathBuffer + 2] - rla - ld [hMathBuffer + 2], a - - ld a, [hMathBuffer + 1] - rla - ld [hMathBuffer + 1], a - - dec e - jr nz, .asm_6798 - - ld e, 8 - ld a, [hMathBuffer + 0] - ld [hDivisor], a - xor a - ld [hMathBuffer + 0], a - - ld a, [hDividend + 1] - ld [hDividend + 0], a - - ld a, [hDividend + 2] - ld [hDividend + 1], a - - ld a, [hDividend + 3] - ld [hDividend + 2], a - -.asm_6798 - ld a, e - cp 1 - jr nz, .asm_679e - dec b - -.asm_679e - ld a, [hDivisor] - srl a - ld [hDivisor], a - - ld a, [hMathBuffer + 0] - rr a - ld [hMathBuffer + 0], a - - jr .loop - -.done - ld a, [hDividend + 1] - ld [hDivisor], a - - ld a, [hMathBuffer + 4] - ld [hDividend + 3], a - - ld a, [hMathBuffer + 3] - ld [hDividend + 2], a - - ld a, [hMathBuffer + 2] - ld [hDividend + 1], a - - ld a, [hMathBuffer + 1] - ld [hDividend + 0], a - - ret -; 67c1 - +INCLUDE "engine/math.asm" ItemAttributes: ; 67c1 INCLUDE "items/item_attributes.asm" @@ -3410,7 +2957,7 @@ Script_Cut: ; 0xc802 writetext UnknownText_0xc7c4 reloadmappart callasm CutDownTreeOrGrass - loadmovesprites + closetext end ; 0xc810 @@ -3565,7 +3112,7 @@ Script_UseFlash: ; 0xc8e6 special UpdateTimePals writetext UnknownText_0xc8f3 callasm BlindingFlash - loadmovesprites + closetext end ; 0xc8f3 @@ -3662,8 +3209,8 @@ SurfFromMenuScript: ; c983 UsedSurfScript: ; c986 writetext UsedSurfText ; "used SURF!" + waitbutton closetext - loadmovesprites callasm Functionc9a2 ; empty function @@ -3806,7 +3353,7 @@ AskSurfScript: ; ca2c writetext AskSurfText yesorno iftrue UsedSurfScript - loadmovesprites + closetext end ; ca36 @@ -3962,8 +3509,8 @@ Script_WaterfallFromMenu: ; 0xcb1c Script_UsedWaterfall: ; 0xcb20 callasm GetPartyNick writetext UnknownText_0xcb51 + waitbutton closetext - loadmovesprites playsound SFX_BUBBLEBEAM .loop applymovement PLAYER, WaterfallStep @@ -4031,7 +3578,7 @@ Script_AskWaterfall: ; 0xcb86 writetext UnknownText_0xcb90 yesorno iftrue Script_UsedWaterfall - loadmovesprites + closetext end ; 0xcb90 @@ -4069,16 +3616,16 @@ dig_incave .CheckCanDig: ; cbb8 call GetMapPermission - cp $4 + cp CAVE jr z, .incave - cp $7 + cp DUNGEON jr z, .incave .fail ld a, $2 ret .incave - ld hl, wdca9 + ld hl, wDigWarp ld a, [hli] and a jr z, .fail @@ -4093,8 +3640,8 @@ dig_incave ; cbd8 .DoDig: ; cbd8 - ld hl, wdca9 - ld de, wd146 + ld hl, wDigWarp + ld de, wNextWarp ld bc, 3 call CopyBytes call GetPartyNick @@ -4159,8 +3706,8 @@ UsedDigScript: ; 0xcc35 writetext UnknownText_0xcc1c UsedDigOrEscapeRopeScript: ; 0xcc3c + waitbutton closetext - loadmovesprites playsound SFX_WARP_TO applymovement PLAYER, .DigOut farscall Script_AbortBugContest @@ -4208,9 +3755,9 @@ TeleportFunction: ; cc61 jr .nope .CheckIfSpawnPoint - ld a, [wdcb2] + ld a, [wLastSpawnMapGroup] ld d, a - ld a, [wdcb3] + ld a, [wLastSpawnMapNumber] ld e, a callba IsSpawnPoint jr nc, .nope @@ -4257,7 +3804,7 @@ Script_UsedTeleport: ; 0xccbb writetext UnknownText_0xccb1 pause 60 reloadmappart - loadmovesprites + closetext playsound SFX_WARP_TO applymovement PLAYER, .TeleportFrom farscall Script_AbortBugContest @@ -4347,7 +3894,7 @@ Script_UsedStrength: ; 0xcd2d cry 0 pause 3 writetext UnknownText_0xcd46 - loadmovesprites + closetext end ; 0xcd41 @@ -4381,7 +3928,7 @@ AskStrengthScript: writetext UnknownText_0xcd69 yesorno iftrue Script_UsedStrength - loadmovesprites + closetext end ; 0xcd69 @@ -4525,7 +4072,7 @@ Script_UsedWhirlpool: ; 0xce0f writetext UnknownText_0xcdd9 reloadmappart callasm DisappearWhirlpool - loadmovesprites + closetext end ; 0xce1d @@ -4584,7 +4131,7 @@ Script_AskWhirlpoolOW: ; 0xce6e writetext UnknownText_0xce78 yesorno iftrue Script_UsedWhirlpool - loadmovesprites + closetext end ; 0xce78 @@ -4642,16 +4189,16 @@ HeadbuttScript: ; 0xceab callasm TreeMonEncounter iffalse .no_battle - loadmovesprites - battlecheck + closetext + setup_random_encounter startbattle returnafterbattle end .no_battle writetext UnknownText_0xcea2 + waitbutton closetext - loadmovesprites end ; 0xcec9 @@ -4676,7 +4223,7 @@ AskHeadbuttScript: ; 0xcedc writetext UnknownText_0xcee6 yesorno iftrue HeadbuttScript - loadmovesprites + closetext end ; 0xcee6 @@ -4742,7 +4289,7 @@ RockSmashFromMenuScript: ; 0xcf2e RockSmashScript: ; cf32 callasm GetPartyNick writetext UnknownText_0xcf58 - loadmovesprites + closetext special WaitSFX playsound SFX_STRENGTH earthquake 84 @@ -4752,7 +4299,7 @@ RockSmashScript: ; cf32 callasm RockMonEncounter copybytetovar TempWildMonSpecies iffalse .done - battlecheck + setup_random_encounter startbattle returnafterbattle .done @@ -4776,7 +4323,7 @@ AskRockSmashScript: ; 0xcf5d writetext UnknownText_0xcf77 yesorno iftrue RockSmashScript - loadmovesprites + closetext end .no jumptext UnknownText_0xcf72 @@ -4920,7 +4467,7 @@ Script_NotEvenANibble2: ; 0xd027 Script_NotEvenANibble_FallThrough: ; 0xd02d loademote EMOTE_SHADOW callasm PutTheRodAway - loadmovesprites + closetext end ; 0xd035 @@ -4940,8 +4487,8 @@ Script_GotABite: ; 0xd035 applymovement PLAYER, .Movement_RestoreRod writetext UnknownText_0xd0a4 callasm PutTheRodAway - loadmovesprites - battlecheck + closetext + setup_random_encounter startbattle returnafterbattle end @@ -5125,15 +4672,15 @@ Script_GetOnBike: ; 0xd13e special UpdateTimePals writecode VAR_MOVEMENT, PLAYER_BIKE writetext UnknownText_0xd17c + waitbutton closetext - loadmovesprites special ReplaceKrisSprite end ; 0xd14e Script_GetOnBike_Register: ; 0xd14e writecode VAR_MOVEMENT, PLAYER_BIKE - loadmovesprites + closetext special ReplaceKrisSprite end ; 0xd156 @@ -5147,10 +4694,10 @@ Script_GetOffBike: ; 0xd158 special UpdateTimePals writecode VAR_MOVEMENT, PLAYER_NORMAL writetext UnknownText_0xd181 - closetext + waitbutton FinishGettingOffBike: - loadmovesprites + closetext special ReplaceKrisSprite special PlayMapMusic end @@ -5163,8 +4710,8 @@ Script_GetOffBike_Register: ; 0xd16b UnknownScript_0xd171: ; 0xd171 writetext UnknownText_0xd177 + waitbutton closetext - loadmovesprites end ; 0xd177 @@ -5218,7 +4765,7 @@ AskCutScript: ; 0xd1a9 callasm .CheckMap iftrue Script_Cut .script_d1b8 - loadmovesprites + closetext end ; 0xd1ba @@ -7012,11 +6559,11 @@ AddTempmonToParty: ; da96 call AddNTimes predef GetUnownLetter callab UpdateUnownDex - ld a, [wdef4] + ld a, [wFirstUnownSeen] and a jr nz, .done ld a, [UnownLetter] - ld [wdef4], a + ld [wFirstUnownSeen], a .done and a @@ -9044,7 +8591,7 @@ Special_GiveParkBalls: ; 135db BugCatchingContestBattleScript:: ; 0x135eb writecode VAR_BATTLETYPE, BATTLETYPE_CONTEST - battlecheck + setup_random_encounter startbattle returnafterbattle copybytetovar wParkBallsRemaining @@ -9056,7 +8603,7 @@ BugCatchingContestOverScript:: ; 0x135f8 playsound SFX_ELEVATOR_END loadfont writetext UnknownText_0x1360f - closetext + waitbutton jump BugCatchingContestReturnToGateScript ; 0x13603 @@ -9064,10 +8611,10 @@ BugCatchingContestOutOfBallsScript: ; 0x13603 playsound SFX_ELEVATOR_END loadfont writetext UnknownText_0x13614 - closetext + waitbutton BugCatchingContestReturnToGateScript: ; 0x1360b - loadmovesprites + closetext jumpstd bugcontestresultswarp ; 0x1360f @@ -9086,8 +8633,8 @@ UnknownText_0x13614: ; 0x13614 RepelWoreOffScript:: ; 0x13619 loadfont writetext .text + waitbutton closetext - loadmovesprites end ; 0x13620 @@ -9113,10 +8660,10 @@ SignpostItemScript:: ; 0x13625 .bag_full: ; 0x1363e keeptextopen writetext .no_room_text - closetext + waitbutton .finish: ; 13643 - loadmovesprites + closetext end ; 0x13645 @@ -9917,7 +9464,7 @@ UpdateItemDescription: ; 0x244c3 ; 0x244e3 Pokepic:: ; 244e3 - ld hl, MenuDataHeader_0x24547 + ld hl, PokepicMenuDataHeader call CopyMenuDataHeader call MenuBox call UpdateSprites @@ -9946,8 +9493,8 @@ Pokepic:: ; 244e3 ret ; 24528 -PokepicYesOrNo:: ; 24528 - ld hl, MenuDataHeader_0x24547 +ClosePokepic:: ; 24528 + ld hl, PokepicMenuDataHeader call CopyMenuDataHeader call ClearMenuBoxInterior call WaitBGMap @@ -9961,7 +9508,7 @@ PokepicYesOrNo:: ; 24528 ret ; 24547 -MenuDataHeader_0x24547: ; 0x24547 +PokepicMenuDataHeader: ; 0x24547 db $40 ; flags db 04, 06 ; start coords db 13, 14 ; end coords @@ -14291,12 +13838,12 @@ SECTION "Tileset Data 4", ROMX, BANK[TILESETS_4] INCLUDE "tilesets/data_4.asm" -SECTION "bankD", ROMX, BANK[$D] +SECTION "Effect Commands", ROMX, BANK[$D] INCLUDE "battle/effect_commands.asm" -SECTION "bankE", ROMX, BANK[$E] +SECTION "Enemy Trainers", ROMX, BANK[$E] INCLUDE "battle/ai/items.asm" @@ -14326,8 +13873,8 @@ GetTrainerClassName: ; 3952d ret ; 39550 -Function39550: ; 39550 - ld hl, wd26b +GetOTName: ; 39550 + ld hl, OTPlayerName ld a, [wLinkMode] and a jr nz, .ok @@ -14352,13 +13899,13 @@ Function39550: ; 39550 ret ; 3957b -Function3957b: ; 3957b +GetTrainerAttributes: ; 3957b ld a, [TrainerClass] ld c, a - call Function39550 + call GetOTName ld a, [TrainerClass] dec a - ld hl, TrainerClassAttributes + ld hl, TrainerClassAttributes + TRNATTR_ITEM1 ld bc, NUM_TRAINER_ATTRIBUTES call AddNTimes ld de, wEnemyTrainerItem1 @@ -14374,414 +13921,14 @@ Function3957b: ; 3957b INCLUDE "trainers/attributes.asm" - -ReadTrainerParty: ; 39771 - ld a, [InBattleTowerBattle] - bit 0, a - ret nz - - ld a, [wLinkMode] - and a - ret nz - - ld hl, OTPartyCount - xor a - ld [hli], a - dec a - ld [hl], a - - ld hl, OTPartyMons - ld bc, OTPartyMonsEnd - OTPartyMons - xor a - call ByteFill - - ld a, [OtherTrainerClass] - cp CAL - jr nz, .not_cal2 - ld a, [OtherTrainerID] - cp CAL2 - jr z, .cal2 - ld a, [OtherTrainerClass] -.not_cal2 - - dec a - ld c, a - ld b, 0 - ld hl, TrainerGroups -rept 2 - add hl, bc -endr - ld a, [hli] - ld h, [hl] - ld l, a - - ld a, [OtherTrainerID] - ld b, a -.skip_trainer - dec b - jr z, .got_trainer -.loop - ld a, [hli] - cp $ff - jr nz, .loop - jr .skip_trainer -.got_trainer - -.skip_name - ld a, [hli] - cp "@" - jr nz, .skip_name - - ld a, [hli] - ld c, a - ld b, 0 - ld d, h - ld e, l - ld hl, TrainerTypes -rept 2 - add hl, bc -endr - ld a, [hli] - ld h, [hl] - ld l, a - ld bc, .done - push bc - jp [hl] - -.done - jp ComputeTrainerReward - -.cal2 - ld a, BANK(sMysteryGiftTrainer) - call GetSRAMBank - ld de, sMysteryGiftTrainer - call TrainerType2 - call CloseSRAM - jr .done -; 397e3 - -TrainerTypes: ; 397e3 - dw TrainerType1 ; level, species - dw TrainerType2 ; level, species, moves - dw TrainerType3 ; level, species, item - dw TrainerType4 ; level, species, item, moves -; 397eb - -TrainerType1: ; 397eb -; normal (level, species) - ld h, d - ld l, e -.loop - ld a, [hli] - cp $ff - ret z - - ld [CurPartyLevel], a - ld a, [hli] - ld [CurPartySpecies], a - ld a, OTPARTYMON - ld [MonType], a - push hl - predef TryAddMonToParty - pop hl - jr .loop -; 39806 - -TrainerType2: ; 39806 -; moves - ld h, d - ld l, e -.loop - ld a, [hli] - cp $ff - ret z - - ld [CurPartyLevel], a - ld a, [hli] - ld [CurPartySpecies], a - ld a, OTPARTYMON - ld [MonType], a - - push hl - predef TryAddMonToParty - ld a, [OTPartyCount] - dec a - ld hl, OTPartyMon1Moves - ld bc, PARTYMON_STRUCT_LENGTH - call AddNTimes - ld d, h - ld e, l - pop hl - - ld b, NUM_MOVES -.copy_moves - ld a, [hli] - ld [de], a - inc de - dec b - jr nz, .copy_moves - - push hl - - ld a, [OTPartyCount] - dec a - ld hl, OTPartyMon1Species - ld bc, PARTYMON_STRUCT_LENGTH - call AddNTimes - ld d, h - ld e, l - ld hl, MON_PP - add hl, de - push hl - ld hl, MON_MOVES - add hl, de - pop de - - ld b, NUM_MOVES -.copy_pp - ld a, [hli] - and a - jr z, .copied_pp - - push hl - push bc - dec a - ld hl, Moves + MOVE_PP - ld bc, MOVE_LENGTH - call AddNTimes - ld a, BANK(Moves) - call GetFarByte - pop bc - pop hl - - ld [de], a - inc de - dec b - jr nz, .copy_pp -.copied_pp - - pop hl - jr .loop -; 39871 - -TrainerType3: ; 39871 -; item - ld h, d - ld l, e -.loop - ld a, [hli] - cp $ff - ret z - - ld [CurPartyLevel], a - ld a, [hli] - ld [CurPartySpecies], a - ld a, OTPARTYMON - ld [MonType], a - push hl - predef TryAddMonToParty - ld a, [OTPartyCount] - dec a - ld hl, OTPartyMon1Item - ld bc, PARTYMON_STRUCT_LENGTH - call AddNTimes - ld d, h - ld e, l - pop hl - ld a, [hli] - ld [de], a - jr .loop -; 3989d (e:589d) - -TrainerType4: ; 3989d -; item + moves - ld h, d - ld l, e -.loop - ld a, [hli] - cp $ff - ret z - - ld [CurPartyLevel], a - ld a, [hli] - ld [CurPartySpecies], a - - ld a, OTPARTYMON - ld [MonType], a - - push hl - predef TryAddMonToParty - ld a, [OTPartyCount] - dec a - ld hl, OTPartyMon1Item - ld bc, PARTYMON_STRUCT_LENGTH - call AddNTimes - ld d, h - ld e, l - pop hl - - ld a, [hli] - ld [de], a - - push hl - ld a, [OTPartyCount] - dec a - ld hl, OTPartyMon1Moves - ld bc, PARTYMON_STRUCT_LENGTH - call AddNTimes - ld d, h - ld e, l - pop hl - - ld b, NUM_MOVES -.copy_moves - ld a, [hli] - ld [de], a - inc de - dec b - jr nz, .copy_moves - - push hl - - ld a, [OTPartyCount] - dec a - ld hl, OTPartyMon1 - ld bc, PARTYMON_STRUCT_LENGTH - call AddNTimes - ld d, h - ld e, l - ld hl, MON_PP - add hl, de - - push hl - ld hl, MON_MOVES - add hl, de - pop de - - ld b, NUM_MOVES -.copy_pp - ld a, [hli] - and a - jr z, .copied_pp - - push hl - push bc - dec a - ld hl, Moves + MOVE_PP - ld bc, MOVE_LENGTH - call AddNTimes - ld a, BANK(Moves) - call GetFarByte - pop bc - pop hl - - ld [de], a - inc de - dec b - jr nz, .copy_pp -.copied_pp - - pop hl - jr .loop -; 3991b - -ComputeTrainerReward: ; 3991b (e:591b) - ld hl, hProduct - xor a -rept 3 - ld [hli], a -endr - ld a, [wEnemyTrainerBaseReward] - ld [hli], a - ld a, [CurPartyLevel] - ld [hl], a - call Multiply - ld hl, wBattleReward - xor a - ld [hli], a - ld a, [hProduct + 2] - ld [hli], a - ld a, [hProduct + 3] - ld [hl], a - ret - - -Battle_GetTrainerName:: ; 39939 - ld a, [InBattleTowerBattle] - bit 0, a - ld hl, wd26b - jp nz, CopyTrainerName - - ld a, [OtherTrainerID] - ld b, a - ld a, [OtherTrainerClass] - ld c, a - -GetTrainerName:: ; 3994c - ld a, c - cp CAL - jr nz, .not_cal2 - - ld a, BANK(sMysteryGiftTrainerHouseFlag) - call GetSRAMBank - ld a, [sMysteryGiftTrainerHouseFlag] - and a - call CloseSRAM - jr z, .not_cal2 - - ld a, BANK(sMysteryGiftPartnerName) - call GetSRAMBank - ld hl, sMysteryGiftPartnerName - call CopyTrainerName - jp CloseSRAM - -.not_cal2 - dec c - push bc - ld b, 0 - ld hl, TrainerGroups -rept 2 - add hl, bc -endr - ld a, [hli] - ld h, [hl] - ld l, a - pop bc - -.loop - dec b - jr z, CopyTrainerName - -.skip - ld a, [hli] - cp $ff - jr nz, .skip - jr .loop - -CopyTrainerName: ; 39984 - ld de, StringBuffer1 - push de - ld bc, NAME_LENGTH - call CopyBytes - pop de - ret -; 39990 - -Function39990: ; 39990 -; This function is useless. - ld de, StringBuffer1 - push de - ld bc, NAME_LENGTH - pop de - ret -; 39999 +INCLUDE "trainers/read_party.asm" INCLUDE "trainers/trainer_pointers.asm" INCLUDE "trainers/trainers.asm" -SECTION "bankF", ROMX, BANK[$F] +SECTION "Battle Core", ROMX, BANK[$F] INCLUDE "battle/core.asm" @@ -14793,72 +13940,6 @@ SECTION "bank10", ROMX, BANK[$10] INCLUDE "engine/pokedex.asm" - -Function41a7f: ; 41a7f - xor a - ld [hBGMapMode], a - callba Function1de247 - call Function41af7 - call DisableLCD - call LoadStandardFont - call LoadFontsExtra - call Function414b7 - call Function4147b - ld a, [wd265] - ld [CurPartySpecies], a - call Function407fd - call Function40ba0 - hlcoord 0, 17 - ld [hl], $3b - inc hl - ld bc, $13 - ld a, " " - call ByteFill - callba Function4424d - call EnableLCD - call WaitBGMap - call GetBaseData - ld de, VTiles2 - predef GetFrontpic - ld a, $4 - call Function41423 - ld a, [CurPartySpecies] - call PlayCry - ret -; 41ad7 - - -Function41ad7: ; 41ad7 (10:5ad7) - ld a, $3 - ld [hBGMapMode], a - ld c, 4 - call DelayFrames - ret - -Function41ae1: ; 41ae1 (10:5ae1) - ld a, $4 - ld [hBGMapMode], a - ld c, 4 - call DelayFrames - ret - -Function41aeb: ; 41aeb (10:5aeb) - ld a, [hCGB] - and a - jr z, .asm_41af3 - call Function41ae1 -.asm_41af3 - call Function41ad7 - ret - - -Function41af7: ; 41af7 - xor a - ld [hBGMapMode], a - ret -; 41afb - - INCLUDE "battle/moves/moves.asm" INCLUDE "engine/evolve.asm" @@ -14867,233 +13948,10 @@ SECTION "bank11", ROMX, BANK[$11] INCLUDE "engine/fruit_trees.asm" +INCLUDE "battle/ai/move.asm" -AIChooseMove: ; 440ce -; Score each move in EnemyMonMoves starting from Buffer1. Lower is better. -; Pick the move with the lowest score. - -; Wildmons attack at random. - ld a, [wBattleMode] - dec a - ret z - - ld a, [wLinkMode] - and a - ret nz - -; No use picking a move if there's no choice. - callba CheckSubstatus_RechargeChargedRampageBideRollout - ret nz - - -; The default score is 20. Unusable moves are given a score of 80. - ld a, 20 - ld hl, Buffer1 -rept 3 - ld [hli], a -endr - ld [hl], a - -; Don't pick disabled moves. - ld a, [EnemyDisabledMove] - and a - jr z, .CheckPP - - ld hl, EnemyMonMoves - ld c, 0 -.CheckDisabledMove - cp [hl] - jr z, .ScoreDisabledMove - inc c - inc hl - jr .CheckDisabledMove -.ScoreDisabledMove - ld hl, Buffer1 - ld b, 0 - add hl, bc - ld [hl], 80 - -; Don't pick moves with 0 PP. -.CheckPP - ld hl, Buffer1 - 1 - ld de, EnemyMonPP - ld b, 0 -.CheckMovePP - inc b - ld a, b - cp EnemyMonMovesEnd - EnemyMonMoves + 1 - jr z, .ApplyLayers - inc hl - ld a, [de] - inc de - and $3f - jr nz, .CheckMovePP - ld [hl], 80 - jr .CheckMovePP - - -; Apply AI scoring layers depending on the trainer class. -.ApplyLayers - ld hl, TrainerClassAttributes + 3 - - ; If we have a battle in BattleTower just load the Attributes of the first TrainerClass (Falkner) - ; so we have always the same AI, regardless of the loaded class of trainer - ld a, [InBattleTowerBattle] - bit 0, a - jr nz, .battle_tower_skip - - ld a, [TrainerClass] - dec a - ld bc, 7 ; Trainer2AI - Trainer1AI - call AddNTimes - -.battle_tower_skip - lb bc, CHECK_FLAG, 0 - push bc - push hl - -.CheckLayer - pop hl - pop bc - - ld a, c - cp 16 ; up to 16 scoring layers - jr z, .DecrementScores - - push bc - ld d, BANK(TrainerClassAttributes) - predef FlagPredef - ld d, c - pop bc - - inc c - push bc - push hl - - ld a, d - and a - jr z, .CheckLayer - - ld hl, AIScoringPointers - dec c - ld b, 0 -rept 2 - add hl, bc -endr - ld a, [hli] - ld h, [hl] - ld l, a - ld a, BANK(AIScoring) - call FarCall_hl - - jr .CheckLayer - -; Decrement the scores of all moves one by one until one reaches 0. -.DecrementScores - ld hl, Buffer1 - ld de, EnemyMonMoves - ld c, EnemyMonMovesEnd - EnemyMonMoves - -.DecrementNextScore - ; If the enemy has no moves, this will infinite. - ld a, [de] - inc de - and a - jr z, .DecrementScores - - ; We are done whenever a score reaches 0 - dec [hl] - jr z, .PickLowestScoreMoves - - ; If we just decremented the fourth move's score, go back to the first move - inc hl - dec c - jr z, .DecrementScores - - jr .DecrementNextScore - -; In order to avoid bias towards the moves located first in memory, increment the scores -; that were decremented one more time than the rest (in case there was a tie). -; This means that the minimum score will be 1. -.PickLowestScoreMoves - ld a, c - -.move_loop - inc [hl] - dec hl - inc a - cp NUM_MOVES + 1 - jr nz, .move_loop - - ld hl, Buffer1 - ld de, EnemyMonMoves - ld c, NUM_MOVES - -; Give a score of 0 to a blank move -.loop2 - ld a, [de] - and a - jr nz, .skip_load - ld [hl], a - -; Disregard the move if its score is not 1 -.skip_load - ld a, [hl] - dec a - jr z, .keep - xor a - ld [hli], a - jr .after_toss - -.keep - ld a, [de] - ld [hli], a -.after_toss - inc de - dec c - jr nz, .loop2 - -; Randomly choose one of the moves with a score of 1 -.ChooseMove - ld hl, Buffer1 - call Random - and 3 - ld c, a - ld b, 0 - add hl, bc - ld a, [hl] - and a - jr z, .ChooseMove - - ld [CurEnemyMove], a - ld a, c - ld [CurEnemyMoveNum], a - ret -; 441af - - -AIScoringPointers: ; 441af - dw AI_Basic - dw AI_Setup - dw AI_Types - dw AI_Offensive - dw AI_Smart - dw AI_Opportunist - dw AI_Aggressive - dw AI_Cautious - dw AI_Status - dw AI_Risky - dw AI_None - dw AI_None - dw AI_None - dw AI_None - dw AI_None - dw AI_None -; 441cf - - -Function441cf: ; 441cf - ld hl, Unknown_441fc +AnimateDexSearchSlowpoke: ; 441cf + ld hl, .FrameIDs ld b, 25 .loop ld a, [hli] @@ -15101,53 +13959,54 @@ Function441cf: ; 441cf ; Wrap around cp $fe jr nz, .ok - ld hl, Unknown_441fc + ld hl, .FrameIDs ld a, [hli] .ok - ld [wc7db], a + ld [wDexSearchSlowpokeFrame], a ld a, [hli] ld c, a push bc push hl - call Function44207 + call DoDexSearchSlowpokeFrame pop hl pop bc call DelayFrames dec b jr nz, .loop xor a - ld [wc7db], a - call Function44207 + ld [wDexSearchSlowpokeFrame], a + call DoDexSearchSlowpokeFrame ld c, 32 call DelayFrames ret ; 441fc -Unknown_441fc: ; 441fc +.FrameIDs: ; 441fc + ; frame ID, duration db 0, 7 db 1, 7 db 2, 7 db 3, 7 db 4, 7 - db $fe + db -2 ; 44207 -Function44207: ; 44207 - ld a, [wc7db] - ld hl, Unknown_44228 +DoDexSearchSlowpokeFrame: ; 44207 + ld a, [wDexSearchSlowpokeFrame] + ld hl, .SpriteData ld de, Sprites -.asm_44210 +.loop ld a, [hli] - cp $ff + cp -1 ret z ld [de], a inc de ld a, [hli] ld [de], a inc de - ld a, [wc7db] + ld a, [wDexSearchSlowpokeFrame] ld b, a add a add b @@ -15158,50 +14017,53 @@ Function44207: ; 44207 ld a, [hli] ld [de], a inc de - jr .asm_44210 + jr .loop ; 44228 -Unknown_44228: ; 44228 - db $58, $48, $00, $00 - db $58, $50, $01, $00 - db $58, $58, $02, $00 - db $60, $48, $10, $00 - db $60, $50, $11, $00 - db $60, $58, $12, $00 - db $68, $48, $20, $00 - db $68, $50, $21, $00 - db $68, $58, $22, $00 - db $ff +.SpriteData: ; 44228 + dsprite 11, 0, 9, 0, $00, $00 + dsprite 11, 0, 10, 0, $01, $00 + dsprite 11, 0, 11, 0, $02, $00 + dsprite 12, 0, 9, 0, $10, $00 + dsprite 12, 0, 10, 0, $11, $00 + dsprite 12, 0, 11, 0, $12, $00 + dsprite 13, 0, 9, 0, $20, $00 + dsprite 13, 0, 10, 0, $21, $00 + dsprite 13, 0, 11, 0, $22, $00 + db -1 ; 4424d -Function4424d: ; 4424d +DisplayDexEntry: ; 4424d call GetPokemonName hlcoord 9, 3 - call PlaceString + call PlaceString ; mon species ld a, [wd265] ld b, a - call Function44333 + call GetDexEntryPointer ld a, b push af hlcoord 9, 5 - call FarString + call FarString ; dex species ld h, b ld l, c push de +; Print dex number hlcoord 2, 8 - ld a, $5c + ld a, $5c ; No ld [hli], a - ld a, $5d + ld a, $5d ; . ld [hli], a ld de, wd265 lb bc, PRINTNUM_LEADINGZEROS | 1, 3 call PrintNum +; Check to see if we caught it. Get out of here if we haven't. ld a, [wd265] dec a call CheckCaughtMon pop hl pop bc ret z +; Get the height of the Pokemon. ld a, [CurPartySpecies] ld [CurSpecies], a inc hl @@ -15217,7 +14079,7 @@ rept 2 endr ld a, d or e - jr z, .asm_442b0 + jr z, .skip_height push hl push de ld hl, [sp+$0] @@ -15227,11 +14089,11 @@ endr lb bc, 2, 36 call PrintNum hlcoord 14, 7 - ld [hl], "<ROCKET>" + ld [hl], $5e ; ft symbol pop af pop hl -.asm_442b0 +.skip_height pop af push af inc hl @@ -15242,32 +14104,34 @@ endr ld e, h ld a, e or d - jr z, .skip + jr z, .skip_weight push de ld hl, [sp+$0] ld d, h ld e, l hlcoord 11, 9 - lb bc, 2, 69 + lb bc, 2, PRINTNUM_RIGHTALIGN | 5 call PrintNum pop de -.skip +.skip_weight +; Page 1 lb bc, 5, SCREEN_WIDTH - 2 hlcoord 2, 11 call ClearBox hlcoord 1, 10 - ld bc, $13 - ld a, $61 + ld bc, SCREEN_WIDTH - 1 + ld a, $61 ; horizontal divider call ByteFill + ; page number hlcoord 1, 9 - ld [hl], "<CONT>" + ld [hl], $55 inc hl - ld [hl], "<CONT>" + ld [hl], $55 hlcoord 1, 10 - ld [hl], "<......>" + ld [hl], $56 ; P. inc hl - ld [hl], "<DONE>" + ld [hl], $57 ; 1 pop de inc de pop af @@ -15278,23 +14142,26 @@ endr ld a, [wPokedexStatus] or a ret z + +; Page 2 push bc push de lb bc, 5, SCREEN_WIDTH - 2 hlcoord 2, 11 call ClearBox hlcoord 1, 10 - ld bc, $13 + ld bc, SCREEN_WIDTH - 1 ld a, $61 call ByteFill + ; page number hlcoord 1, 9 - ld [hl], "<CONT>" + ld [hl], $55 inc hl - ld [hl], "<CONT>" + ld [hl], $55 hlcoord 1, 10 - ld [hl], "<......>" + ld [hl], $56 ; P. inc hl - ld [hl], "<PROMPT>" + ld [hl], $58 ; 2 pop de inc de pop af @@ -15307,7 +14174,8 @@ String_44331: ; 44331 db "#@" ; 44333 -Function44333: ; 44333 +GetDexEntryPointer: ; 44333 +; return dex entry pointer b:de push hl ld hl, PokedexDataPointerTable ld a, b @@ -15324,7 +14192,7 @@ endr rlca rlca and $3 - ld hl, PokedexEntryBanks + ld hl, .PokedexEntryBanks ld d, 0 ld e, a add hl, de @@ -15334,7 +14202,7 @@ endr ret ; 44351 -PokedexEntryBanks: ; 44351 +.PokedexEntryBanks: ; 44351 GLOBAL PokedexEntries1 GLOBAL PokedexEntries2 @@ -15347,22 +14215,26 @@ GLOBAL PokedexEntries4 db BANK(PokedexEntries4) ; 44355 -Function44355: ; 44355 - call Function44333 +GetDexEntryPagePointer: ; 44355 + call GetDexEntryPointer ; b:de push hl ld h, d ld l, e +; skip species name .loop1 ld a, b call GetFarByte inc hl cp "@" jr nz, .loop1 +; skip height and weight rept 4 inc hl endr +; if c != 1: skip entry dec c jr z, .done +; skip entry .loop2 ld a, b call GetFarByte @@ -17000,7 +15872,7 @@ Function4aad3: ; 4aad3 jr nz, .loop call Function4aa7a - callba Function8cf69 + callba PlaySpriteAnimations ret ; 4aafb @@ -19233,6 +18105,92 @@ endr INCLUDE "engine/evolution_animation.asm" +Function4e881: ; 4e881 + call ClearBGPalettes + call ClearTileMap + call ClearSprites + call DisableLCD + call LoadStandardFont + call LoadFontsBattleExtra + hlbgcoord 0, 0 + ld bc, VBGMap1 - VBGMap0 + ld a, " " + call ByteFill + hlcoord 0, 0, AttrMap + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT + xor a + call ByteFill + xor a + ld [hSCY], a + ld [hSCX], a + call EnableLCD + ld hl, .SavingRecordDontTurnOff + call PrintText + call Function3200 + call SetPalettes + ret +; 4e8bd + +.SavingRecordDontTurnOff: ; 0x4e8bd + ; SAVING RECORD… DON'T TURN OFF! + text_jump UnknownText_0x1bd39e + db "@" +; 0x4e8c2 + + +Function4e8c2: ; 4e8c2 + call ClearBGPalettes + call ClearTileMap + call ClearSprites + call DisableLCD + call LoadStandardFont + call LoadFontsBattleExtra + hlbgcoord 0, 0 + ld bc, VBGMap1 - VBGMap0 + ld a, " " + call ByteFill + hlcoord 0, 0, AttrMap + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT + xor a + call ByteFill + ld hl, wd000 ; UnknBGPals + ld c, 4 * $10 +.load_white_palettes + ld a, (palred 31 + palgreen 31 + palblue 31) % $100 + ld [hli], a + ld a, (palred 31 + palgreen 31 + palblue 31) / $100 + ld [hli], a + dec c + jr nz, .load_white_palettes + xor a + ld [hSCY], a + ld [hSCX], a + call EnableLCD + call Function3200 + call SetPalettes + ret +; 4e906 + +Function4e906: ; 4e906 + ld a, [rSVBK] + push af + ld a, $6 + ld [rSVBK], a + ld hl, wBackupTilemap + ld bc, wBackupAttrMap - wBackupTilemap + ld a, " " + call ByteFill + hlbgcoord 0, 0 + ld de, wBackupTilemap + ld b, $0 + ld c, $40 + call Request2bpp + pop af + ld [rSVBK], a + ret +; 4e929 + + Function4e929: ; mobile function ld h, b ld l, c @@ -20657,15 +19615,15 @@ _GetFrontpic: ; 510a5 ld a, $6 ld [rSVBK], a ld a, b - ld de, w6_d000 + $800 + ld de, wBackupTilemap + $800 call FarDecompress pop bc - ld hl, w6_d000 - ld de, w6_d000 + $800 + ld hl, wBackupTilemap + ld de, wBackupTilemap + $800 call Function512ab pop hl push hl - ld de, w6_d000 + ld de, wBackupTilemap ld c, 7 * 7 ld a, [hROMBank] ld b, a @@ -20708,7 +19666,7 @@ Function51103: ; 51103 ld a, $1 ld [rVBK], a push hl - ld de, w6_d000 + ld de, wBackupTilemap ld c, 7 * 7 ld a, [hROMBank] ld b, a @@ -20739,7 +19697,7 @@ Function51103: ; 51103 call Function5114f pop bc pop hl - ld de, w6_d000 + ld de, wBackupTilemap ld a, [hROMBank] ld b, a call Get2bpp @@ -20749,7 +19707,7 @@ Function51103: ; 51103 ; 5114f Function5114f: ; 5114f - ld hl, w6_d000 + ld hl, wBackupTilemap swap c ld a, c and $f @@ -20808,14 +19766,14 @@ GetBackpic: ; 5116c inc hl ld a, d call GetFarHalfword - ld de, w6_d000 + ld de, wBackupTilemap pop af call FarDecompress - ld hl, w6_d000 + ld hl, wBackupTilemap ld c, 6 * 6 call Function5127c pop hl - ld de, w6_d000 + ld de, wBackupTilemap ld a, [hROMBank] ld b, a call Get2bpp @@ -20914,10 +19872,10 @@ GetTrainerPic: ; 5120d ld a, BANK(TrainerPicPointers) call GetFarHalfword pop af - ld de, w6_d000 + ld de, wBackupTilemap call FarDecompress pop hl - ld de, w6_d000 + ld de, wBackupTilemap ld c, 7 * 7 ld a, [hROMBank] ld b, a @@ -20943,10 +19901,10 @@ DecompressPredef: ; 5125d push de push bc ld a, b - ld de, w6_d000 + ld de, wBackupTilemap call FarDecompress pop bc - ld de, w6_d000 + ld de, wBackupTilemap pop hl ld a, [hROMBank] ld b, a @@ -22686,16 +21644,16 @@ INCLUDE "engine/phone_scripts.asm" TalkToTrainerScript:: ; 0xbe66a faceplayer - trainerstatus CHECK_FLAG + trainerflagaction CHECK_FLAG iftrue AlreadyBeatenTrainerScript - loadtrainerdata - playrammusic + memtrainerdata + encountermusic jump StartBattleWithMapTrainerScript ; 0xbe675 SeenByTrainerScript:: ; 0xbe675 - loadtrainerdata - playrammusic + memtrainerdata + encountermusic showemote EMOTE_SHOCK, LAST_TALKED, 30 callasm TrainerWalkToPlayer applymovement2 MovementBuffer @@ -22707,12 +21665,12 @@ SeenByTrainerScript:: ; 0xbe675 StartBattleWithMapTrainerScript: ; 0xbe68a loadfont trainertext $0 + waitbutton closetext - loadmovesprites - loadtrainerdata + memtrainerdata startbattle returnafterbattle - trainerstatus SET_FLAG + trainerflagaction SET_FLAG loadvar wRunningTrainerBattleScript, -1 AlreadyBeatenTrainerScript: @@ -23094,7 +22052,7 @@ Unknown_e00ed: ; Graphics for an unused Game Corner ; game were meant to be here. -Functione00ed: ; e00ed (38:40ed) +ret_e00ed: ; e00ed (38:40ed) ret ; e00ee (38:40ee) @@ -23138,7 +22096,7 @@ UpdateUnownDex: ; fba18 ; fba2e -Functionfba2e: ; fba2e (3e:7a2e) +PrintUnownWord: ; fba2e (3e:7a2e) hlcoord 4, 15 ld bc, 12 ld a, " " @@ -23159,13 +22117,13 @@ endr ld e, a ld d, [hl] hlcoord 4, 15 -.asm_fba52 +.loop ld a, [de] - cp $ff + cp -1 ret z inc de ld [hli], a - jr .asm_fba52 + jr .loop ; fba5a (3e:7a5a) UnownWords: ; fba5a @@ -23262,18 +22220,18 @@ Function104000:: ; 104000 Function104006: ; 104006 decoord 0, 0, AttrMap - ld hl, w6_d400 + ld hl, wBackupAttrMap call Function104263 decoord 0, 0 - ld hl, w6_d000 + ld hl, wBackupTilemap call Function10425f ld a, $0 ld [rVBK], a - ld hl, w6_d000 + ld hl, wBackupTilemap call Function10419d ld a, $1 ld [rVBK], a - ld hl, w6_d400 + ld hl, wBackupAttrMap call Function10419d ret ; 10402d @@ -23285,11 +22243,11 @@ Function10402d:: ; 10402d Function104033: ; 104033 decoord 0, 0 - ld hl, w6_d000 + ld hl, wBackupTilemap call Function10425f ld a, $0 ld [rVBK], a - ld hl, w6_d000 + ld hl, wBackupTilemap call Function10419d ret ; 104047 @@ -23301,11 +22259,11 @@ Function104047: ; 104047 Function10404d: ; 10404d decoord 0, 0, AttrMap - ld hl, w6_d400 + ld hl, wBackupAttrMap call Function104263 ld a, $1 ld [rVBK], a - ld hl, w6_d400 + ld hl, wBackupAttrMap call Function10419d ret ; 104061 @@ -23317,10 +22275,10 @@ ReloadMapPart:: ; 104061 Function104067: ; 104067 decoord 0, 0, AttrMap - ld hl, w6_d400 + ld hl, wBackupAttrMap call Function104263 decoord 0, 0 - ld hl, w6_d000 + ld hl, wBackupTilemap call Function10425f call DelayFrame di @@ -23328,11 +22286,11 @@ Function104067: ; 104067 push af ld a, $1 ld [rVBK], a - ld hl, w6_d400 + ld hl, wBackupAttrMap call Function1041ad ld a, $0 ld [rVBK], a - ld hl, w6_d000 + ld hl, wBackupTilemap call Function1041ad pop af ld [rVBK], a @@ -23347,10 +22305,10 @@ Function104099: ; 104099 Function1040a2: ; 1040a2 decoord 0, 0, AttrMap - ld hl, w6_d400 + ld hl, wBackupAttrMap call Function104263 decoord 0, 0 - ld hl, w6_d000 + ld hl, wBackupTilemap call Function10425f call DelayFrame di @@ -23358,11 +22316,11 @@ Function1040a2: ; 1040a2 push af ld a, $1 ld [rVBK], a - ld hl, w6_d400 + ld hl, wBackupAttrMap call Function1041c1 ld a, $0 ld [rVBK], a - ld hl, w6_d000 + ld hl, wBackupTilemap call Function1041c1 pop af ld [rVBK], a @@ -23417,10 +22375,10 @@ Function104110:: ; 104110 Function104116: ; 104116 decoord 0, 0, AttrMap - ld hl, w6_d400 + ld hl, wBackupAttrMap call Function104263 decoord 0, 0 - ld hl, w6_d000 + ld hl, wBackupTilemap call Function10425f call DelayFrame di @@ -23428,11 +22386,11 @@ Function104116: ; 104116 push af ld a, $1 ld [rVBK], a - ld hl, w6_d400 + ld hl, wBackupAttrMap call Function1041b7 ld a, $0 ld [rVBK], a - ld hl, w6_d000 + ld hl, wBackupTilemap call Function1041b7 pop af ld [rVBK], a @@ -23447,19 +22405,19 @@ Function104148: ; 104148 (41:4148) Function10414e: ; 10414e decoord 0, 0, AttrMap - ld hl, w6_d400 + ld hl, wBackupAttrMap call Function104263 ld c, $ff decoord 0, 0 - ld hl, w6_d000 + ld hl, wBackupTilemap call Function104265 ld a, $1 ld [rVBK], a - ld hl, w6_d400 + ld hl, wBackupAttrMap call Function1041ad ld a, $0 ld [rVBK], a - ld hl, w6_d000 + ld hl, wBackupTilemap call Function1041ad ret ; 104177 @@ -23478,7 +22436,7 @@ Function104177: ; 104177 ld [rSVBK], a ld a, [rVBK] push af - call Function10419c + call ._hl_ pop af ld [rVBK], a pop af @@ -23490,7 +22448,7 @@ Function104177: ; 104177 ret ; 10419c -Function10419c: ; 10419c +._hl_: ; 10419c jp [hl] ; 10419d @@ -23700,7 +22658,7 @@ _Get2bpp:: ; 104284 push bc push hl - ; Copy c tiles of the 2bpp from b:de to w6_d000 + ; Copy c tiles of the 2bpp from b:de to wBackupTilemap ld a, b ; bank ld l, c ; number of tiles ld h, $0 @@ -23711,7 +22669,7 @@ endr ld c, l ld h, d ; address ld l, e - ld de, w6_d000 + ld de, wBackupTilemap call FarCopyBytes pop hl @@ -23723,7 +22681,7 @@ endr ld d, h ld e, l - ld hl, w6_d000 + ld hl, wBackupTilemap call Function104209 ; restore the previous bank @@ -23778,7 +22736,7 @@ endr ld b, h ld h, d ld l, e - ld de, w6_d000 + ld de, wBackupTilemap call FarCopyBytesDouble_DoubleBankSwitch pop hl @@ -23790,7 +22748,7 @@ endr ld d, h ld e, l - ld hl, w6_d000 + ld hl, wBackupTilemap call Function104209 pop af @@ -23804,22 +22762,22 @@ Function104303: ; 104303 ; 104309 Function104309: - ld hl, w6_d000 + ld hl, wBackupTilemap decoord 0, 0 call Function10433a - ld hl, w6_d000 + $80 + ld hl, wBackupTilemap + $80 decoord 0, 0, AttrMap call Function10433a ld a, $1 ld [rVBK], a ld c, $8 - ld hl, w6_d000 + $80 + ld hl, wBackupTilemap + $80 debgcoord 0, 0, VBGMap1 call Function104209 ld a, $0 ld [rVBK], a ld c, $8 - ld hl, w6_d000 + ld hl, wBackupTilemap debgcoord 0, 0, VBGMap1 call Function104209 ret @@ -23827,7 +22785,7 @@ Function104309: Function10433a: ; 10433a (41:433a) ld b, 4 .outer_loop - ld c, 20 + ld c, SCREEN_WIDTH .inner_loop ld a, [de] ld [hli], a @@ -23835,7 +22793,7 @@ Function10433a: ; 10433a (41:433a) dec c jr nz, .inner_loop ld a, l - add $20 - 20 + add $20 - SCREEN_WIDTH ld l, a ld a, h adc $0 @@ -23858,446 +22816,7 @@ FishingRodGFX2: INCBIN "gfx/misc/fishing2.2bpp" BoulderDustGFX: INCBIN "gfx/misc/boulderdust.2bpp" FishingRodGFX4: INCBIN "gfx/misc/fishing4.2bpp" - -RunCallback_05_03: ; 1045b0 - call Clearwc7e8 - call ResetMapBufferEventFlags - call ResetFlashIfOutOfCave - call GetCurrentMapTrigger - call ResetBikeFlags - ld a, $5 - call RunMapCallback - -RunCallback_03: ; 1045c4 - callba ClearCmdQueue - ld a, $3 - call RunMapCallback - call GetMapHeaderTimeOfDayNybble - ld [wc2d0], a - ret - - -EnterMapConnection: ; 1045d6 -; Return carry if a connection has been entered. - ld a, [wPlayerStepDirection] - and a - jp z, EnterSouthConnection - cp 1 - jp z, EnterNorthConnection - cp 2 - jp z, EnterWestConnection - cp 3 - jp z, EnterEastConnection - ret -; 1045ed - - -EnterWestConnection: ; 1045ed - ld a, [WestConnectedMapGroup] - ld [MapGroup], a - ld a, [WestConnectedMapNumber] - ld [MapNumber], a - ld a, [WestConnectionStripXOffset] - ld [XCoord], a - ld a, [WestConnectionStripYOffset] - ld hl, YCoord - add [hl] - ld [hl], a - ld c, a - ld hl, WestConnectionWindow - ld a, [hli] - ld h, [hl] - ld l, a - srl c - jr z, .skip_to_load - ld a, [WestConnectedMapWidth] - add 6 - ld e, a - ld d, 0 - -.loop - add hl, de - dec c - jr nz, .loop - -.skip_to_load - ld a, l - ld [wd194], a - ld a, h - ld [wd194 + 1], a - jp EnteredConnection -; 104629 - - -EnterEastConnection: ; 104629 - ld a, [EastConnectedMapGroup] - ld [MapGroup], a - ld a, [EastConnectedMapNumber] - ld [MapNumber], a - ld a, [EastConnectionStripXOffset] - ld [XCoord], a - ld a, [EastConnectionStripYOffset] - ld hl, YCoord - add [hl] - ld [hl], a - ld c, a - ld hl, EastConnectionWindow - ld a, [hli] - ld h, [hl] - ld l, a - srl c - jr z, .skip_to_load - ld a, [EastConnectedMapWidth] - add 6 - ld e, a - ld d, 0 - -.loop - add hl, de - dec c - jr nz, .loop - -.skip_to_load - ld a, l - ld [wd194], a - ld a, h - ld [wd194 + 1], a - jp EnteredConnection -; 104665 - - -EnterNorthConnection: ; 104665 - ld a, [NorthConnectedMapGroup] - ld [MapGroup], a - ld a, [NorthConnectedMapNumber] - ld [MapNumber], a - ld a, [NorthConnectionStripYOffset] - ld [YCoord], a - ld a, [NorthConnectionStripXOffset] - ld hl, XCoord - add [hl] - ld [hl], a - ld c, a - ld hl, NorthConnectionWindow - ld a, [hli] - ld h, [hl] - ld l, a - ld b, 0 - srl c - add hl, bc - ld a, l - ld [wd194], a - ld a, h - ld [wd194 + 1], a - jp EnteredConnection -; 104696 - - -EnterSouthConnection: ; 104696 - ld a, [SouthConnectedMapGroup] - ld [MapGroup], a - ld a, [SouthConnectedMapNumber] - ld [MapNumber], a - ld a, [SouthConnectionStripYOffset] - ld [YCoord], a - ld a, [SouthConnectionStripXOffset] - ld hl, XCoord - add [hl] - ld [hl], a - ld c, a - ld hl, SouthConnectionWindow - ld a, [hli] - ld h, [hl] - ld l, a - ld b, 0 - srl c - add hl, bc - ld a, l - ld [wd194], a - ld a, h - ld [wd194 + 1], a - ; fallthrough -; 1046c4 - -EnteredConnection: ; 1046c4 - scf - ret -; 1046c6 - -LoadWarpData: ; 1046c6 - call Function1046df - call Function104718 - ld a, [wd146] - ld [WarpNumber], a - ld a, [wd147] - ld [MapGroup], a - ld a, [wd148] - ld [MapNumber], a - ret - -Function1046df: ; 1046df (41:46df) - call GetMapPermission - call CheckOutdoorMap - ret nz - ld a, [wd147] - ld b, a - ld a, [wd148] - ld c, a - call GetAnyMapPermission - call CheckIndoorMap - ret nz - ld a, [wd14a] - cp $f - jr nz, .asm_104705 - ld a, [wd14b] - cp $a - ret z - cp $c - ret z -.asm_104705 - ld a, [wd149] - ld [wdca9], a - ld a, [wd14a] - ld [wdcaa], a - ld a, [wd14b] - ld [wdcab], a - ret - -Function104718: ; 104718 (41:4718) - call GetMapPermission - call CheckOutdoorMap - ret nz - ld a, [wd147] - ld b, a - ld a, [wd148] - ld c, a - call GetAnyMapPermission - call CheckIndoorMap - ret nz - ld a, [wd147] - ld b, a - ld a, [wd148] - ld c, a - call GetAnyMapTileset - ld a, c - cp $7 - jr z, .asm_104743 - cp $15 - jr z, .asm_104743 - ret -.asm_104743 - ld a, [wd14a] - ld [wdcb2], a - ld a, [wd14b] - ld [wdcb3], a - ret - -LoadMapTimeOfDay: ; 104750 - ld hl, VramState - res 6, [hl] - ld a, $1 - ld [wSpriteUpdatesEnabled], a - callba Function8c0e5 - callba Function8c001 - call OverworldTextModeSwitch - call Function104770 - call Function1047a3 - ret - -Function104770: ; 104770 (41:4770) - ld a, VBGMap0 / $100 - ld [wBGMapAnchor + 1], a - xor a - ld [wBGMapAnchor], a - ld [hSCY], a - ld [hSCX], a - callba Function5958 - ld a, [rVBK] - push af - ld a, $1 - ld [rVBK], a - xor a - lb bc, 4, 0 - hlbgcoord 0, 0 - call ByteFill - pop af - ld [rVBK], a - ld a, $60 - lb bc, 4, 0 - hlbgcoord 0, 0 - call ByteFill - ret - -Function1047a3: ; 1047a3 (41:47a3) - decoord 0, 0 - call .copy - ld a, [hCGB] - and a - ret z - - decoord 0, 0, AttrMap - ld a, $1 - ld [rVBK], a -.copy: - hlbgcoord 0, 0 - ld c, SCREEN_WIDTH - ld b, SCREEN_HEIGHT -.row - push bc -.column - ld a, [de] - inc de - ld [hli], a - dec c - jr nz, .column - ld bc, $20 - SCREEN_WIDTH - add hl, bc - pop bc - dec b - jr nz, .row - ld a, $0 - ld [rVBK], a - ret - -LoadGraphics: ; 1047cf - call LoadTilesetHeader - call LoadTileset - xor a - ld [hMapAnims], a - xor a - ld [hTileAnimFrame], a - callba RefreshSprites - call LoadFontsExtra - callba Function106594 - ret - -LoadMapPalettes: ; 1047eb - ld b, SCGB_09 - jp GetSGBLayout -; 1047f0 - -RefreshMapSprites: ; 1047f0 - call ClearSprites - callba ReturnFromMapSetupScript - call GetMovementPermissions - callba Function579d - callba CheckReplaceKrisSprite - ld hl, wPlayerSpriteSetupFlags - bit 6, [hl] - jr nz, .skip - ld hl, VramState - set 0, [hl] - call Function2e31 -.skip - ld a, [wPlayerSpriteSetupFlags] - and $1c - ld [wPlayerSpriteSetupFlags], a - ret - -CheckMovingOffEdgeOfMap:: ; 104820 (41:4820) - ld a, [wPlayerStepDirection] - cp STANDING - ret z - and a ; DOWN - jr z, .down - cp UP - jr z, .up - cp LEFT - jr z, .left - cp RIGHT - jr z, .right - and a - ret - -.down - ld a, [PlayerNextMapY] - sub 4 - ld b, a - ld a, [MapHeight] - add a - cp b - jr z, .ok - and a - ret - -.up - ld a, [PlayerNextMapY] - sub 4 - cp -1 - jr z, .ok - and a - ret - -.left - ld a, [PlayerNextMapX] - sub $4 - cp -1 - jr z, .ok - and a - ret - -.right - ld a, [PlayerNextMapX] - sub 4 - ld b, a - ld a, [MapWidth] - add a - cp b - jr z, .ok - and a - ret - -.ok - scf - ret - - -GetCoordOfUpperLeftCorner:: ; 10486d - ld hl, OverworldMap - ld a, [XCoord] - bit 0, a - jr nz, .increment_then_halve1 - srl a - add $1 - jr .resume - -.increment_then_halve1 - add $1 - srl a - -.resume - ld c, a - ld b, $0 - add hl, bc - ld a, [MapWidth] - add $6 - ld c, a - ld b, $0 - ld a, [YCoord] - bit 0, a - jr nz, .increment_then_halve2 - srl a - add $1 - jr .resume2 - -.increment_then_halve2 - add $1 - srl a - -.resume2 - call AddNTimes - ld a, l - ld [wd194], a - ld a, h - ld [wd194 + 1], a - ld a, [YCoord] - and $1 - ld [wd196], a - ld a, [XCoord] - and $1 - ld [wd197], a - ret -; 1048ba +INCLUDE "engine/warp_connection.asm" INCLUDE "engine/mysterygift.asm" @@ -24422,7 +22941,7 @@ UnownFont: ; 1dc000 INCBIN "gfx/misc/unown_font.2bpp" ; 1dc1b0 -Function1dc1b0: ; 1dc1b0 +PrintPage1: ; 1dc1b0 hlcoord 0, 0 ld de, wca90 ld bc, 17 * SCREEN_WIDTH @@ -24454,8 +22973,8 @@ Function1dc1b0: ; 1dc1b0 push af ld a, [wd265] ld b, a - ld c, $1 - callba Function44355 + ld c, 1 ; get page 1 + callba GetDexEntryPagePointer pop af ld a, b ld hl, wcb6d @@ -24465,16 +22984,16 @@ Function1dc1b0: ; 1dc1b0 ld de, SCREEN_WIDTH add hl, de ld b, $f -.asm_1dc20a +.column_loop ld [hl], $37 add hl, de dec b - jr nz, .asm_1dc20a + jr nz, .column_loop ld [hl], $3a ret ; 1dc213 -Function1dc213: ; 1dc213 +PrintPage2: ; 1dc213 ld hl, wca90 ld bc, $a0 ld a, " " @@ -24482,11 +23001,11 @@ Function1dc213: ; 1dc213 ld hl, wca90 ld a, $36 ld b, $6 - call Function1dc26a + call .FillColumn ld hl, wcaa3 ld a, $37 ld b, $6 - call Function1dc26a + call .FillColumn ld hl, wcb08 ld [hl], $38 inc hl @@ -24504,8 +23023,8 @@ Function1dc213: ; 1dc213 push af ld a, [wd265] ld b, a - ld c, $2 - callba Function44355 + ld c, 2 ; get page 2 + callba GetDexEntryPagePointer pop af ld hl, wcaa5 ld a, b @@ -24513,14 +23032,14 @@ Function1dc213: ; 1dc213 ret ; 1dc26a -Function1dc26a: ; 1dc26a +.FillColumn: ; 1dc26a push de ld de, SCREEN_WIDTH -.asm_1dc26e +.column_loop ld [hl], a add hl, de dec b - jr nz, .asm_1dc26e + jr nz, .column_loop pop de ret ; 1dc275 @@ -24866,7 +23385,7 @@ String_PM: db "PM@" ; 1dd6ff INCLUDE "engine/diploma.asm" -Function1ddf1c: ; 1ddf1c +LoadSGBPokedexGFX: ; 1ddf1c ld hl, LZ_1ddf33 ld de, VTiles2 tile $31 call Decompress @@ -24882,21 +23401,21 @@ Function1ddf26: ; 1ddf26 (77:5f26) ; 1ddf33 (77:5f33) LZ_1ddf33: ; 1ddf33 -INCBIN "gfx/unknown/1ddf33.2bpp.lz" +INCBIN "gfx/pokedex/sgb.2bpp.lz" ; 1de0d7 -Function1de0d7: ; 1de0d7 - ld hl, LZ_1de0e1 +LoadQuestionMarkPic: ; 1de0d7 + ld hl, .QuestionMarkLZ ld de, sScratch call Decompress ret ; 1de0e1 -LZ_1de0e1: ; 1de0e1 -INCBIN "gfx/unknown/1de0e1.2bpp.lz" +.QuestionMarkLZ: ; 1de0e1 +INCBIN "gfx/pics/questionmark/front.2bpp.lz" ; 1de171 -Function1de171: ; 1de171 (77:6171) +DrawPokedexListWindow: ; 1de171 (77:6171) ld a, $32 hlcoord 0, 17 ld bc, 12 @@ -24906,46 +23425,49 @@ Function1de171: ; 1de171 (77:6171) call ClearBox ld a, $34 hlcoord 0, 0 - ld bc, $b + ld bc, 11 call ByteFill ld a, $39 hlcoord 0, 16 - ld bc, $b + ld bc, 11 call ByteFill hlcoord 5, 0 ld [hl], $3f hlcoord 5, 16 ld [hl], $40 - ld a, [wc7d4] - cp $1 - jr z, .asm_1de1bf + ld a, [wCurrentDexMode] + cp DEXMODE_OLD + jr z, .OldMode +; scroll bar hlcoord 11, 0 ld [hl], $50 ld a, $51 hlcoord 11, 1 ld b, SCREEN_HEIGHT - 3 - call Function1de27f + call Bank77_FillColumn ld [hl], $52 - jr .asm_1de1d0 -.asm_1de1bf + jr .Done + +.OldMode +; no scroll bar hlcoord 11, 0 ld [hl], $66 ld a, $67 hlcoord 11, 1 ld b, SCREEN_HEIGHT - 3 - call Function1de27f + call Bank77_FillColumn ld [hl], $68 -.asm_1de1d0 +.Done ret -Function1de1d1: ; 1de1d1 (77:61d1) +DrawPokedexSearchResultsWindow: ; 1de1d1 (77:61d1) ld a, $34 hlcoord 0, 0 - ld bc, $b + ld bc, 11 call ByteFill ld a, $39 hlcoord 0, 10 - ld bc, $b + ld bc, 11 call ByteFill hlcoord 5, 0 ld [hl], $3f @@ -24956,35 +23478,36 @@ Function1de1d1: ; 1de1d1 (77:61d1) ld a, $67 hlcoord 11, 1 ld b, SCREEN_HEIGHT / 2 - call Function1de27f + call Bank77_FillColumn ld [hl], $68 ld a, $34 hlcoord 0, 11 - ld bc, $b + ld bc, 11 call ByteFill ld a, $39 hlcoord 0, 17 - ld bc, $b + ld bc, 11 call ByteFill hlcoord 11, 11 ld [hl], $66 ld a, $67 hlcoord 11, 12 ld b, 5 - call Function1de27f + call Bank77_FillColumn ld [hl], $68 hlcoord 0, 12 lb bc, 5, 11 call ClearBox - ld de, String_1de23c + ld de, .esults_D hlcoord 0, 12 call PlaceString ret ; 1de23c (77:623c) -String_1de23c: ; 1de23c -; At a glance, this is less coherent in the Japanese charset. +.esults_D: ; 1de23c +; (SEARCH R) db "ESULTS<NEXT>" +; (### FOUN) next "D!@" ; 1de247 @@ -25003,15 +23526,15 @@ Function1de247: ; 1de247 ld [hl], $66 hlcoord 19, 1 ld a, $67 - ld b, SCREEN_HEIGHT - 3 - call Function1de27f + ld b, 15 + call Bank77_FillColumn ld [hl], $68 hlcoord 19, 17 ld [hl], $3c xor a ld b, SCREEN_HEIGHT hlcoord 19, 0, AttrMap - call Function1de27f + call Bank77_FillColumn call Function3200 pop hl ld a, l @@ -25021,7 +23544,7 @@ Function1de247: ; 1de247 ret ; 1de27f -Function1de27f: ; 1de27f +Bank77_FillColumn: ; 1de27f push de ld de, SCREEN_WIDTH .loop diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 82b3d9fe6..aa7756e41 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -1,3 +1,12 @@ +const_value set 2 + const AZALEAGYM_BUGSY + const AZALEAGYM_BUG_CATCHER1 + const AZALEAGYM_BUG_CATCHER2 + const AZALEAGYM_BUG_CATCHER3 + const AZALEAGYM_TWIN1 + const AZALEAGYM_TWIN2 + const AZALEAGYM_GYM_GUY + AzaleaGym_MapScriptHeader: .MapTriggers: db 0 @@ -11,17 +20,17 @@ BugsyScript: checkevent EVENT_BEAT_BUGSY iftrue .FightDone writetext BugsyText_INeverLose + waitbutton closetext - loadmovesprites winlosstext BugsyText_ResearchIncomplete, 0 - loadtrainer BUGSY, 1 + scriptedtrainerdata BUGSY, 1 startbattle returnafterbattle setevent EVENT_BEAT_BUGSY loadfont writetext Text_ReceivedHiveBadge playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_HIVEBADGE checkcode VAR_BADGES scall AzaleaGymTriggerRockets @@ -38,15 +47,15 @@ BugsyScript: iffalse .NoRoomForFuryCutter setevent EVENT_GOT_TM49_FURY_CUTTER writetext BugsyText_FuryCutterSpeech + waitbutton closetext - loadmovesprites end .GotFuryCutter: writetext BugsyText_BugMonsAreDeep - closetext + waitbutton .NoRoomForFuryCutter: - loadmovesprites + closetext end AzaleaGymTriggerRockets: @@ -64,55 +73,55 @@ TrainerTwinsAmyandmay1: trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, 0, .AfterScript .AfterScript: - talkaftercancel + end_if_just_battled loadfont writetext TwinsAmyandmay1AfterBattleText + waitbutton closetext - loadmovesprites end TrainerTwinsAmyandmay2: trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, 0, .AfterScript .AfterScript: - talkaftercancel + end_if_just_battled loadfont writetext TwinsAmyandmay2AfterBattleText + waitbutton closetext - loadmovesprites end TrainerBug_catcherbenny: trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherbennySeenText, Bug_catcherbennyBeatenText, 0, .AfterScript .AfterScript: - talkaftercancel + end_if_just_battled loadfont writetext Bug_catcherbennyAfterBattleText + waitbutton closetext - loadmovesprites end TrainerBug_catcherAl: trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, 0, .AfterScript .AfterScript: - talkaftercancel + end_if_just_battled loadfont writetext Bug_catcherAlAfterBattleText + waitbutton closetext - loadmovesprites end TrainerBug_catcherJosh: trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, 0, .AfterScript .AfterScript: - talkaftercancel + end_if_just_battled loadfont writetext Bug_catcherJoshAfterBattleText + waitbutton closetext - loadmovesprites end AzaleaGymGuyScript: @@ -121,15 +130,15 @@ AzaleaGymGuyScript: iftrue .AzaleaGymGuyWinScript loadfont writetext AzaleaGymGuyText + waitbutton closetext - loadmovesprites end .AzaleaGymGuyWinScript loadfont writetext AzaleaGymGuyWinText + waitbutton closetext - loadmovesprites end AzaleaGymStatue: diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index ab7242564..aca1d0e9c 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const AZALEAMART_CLERK + const AZALEAMART_COOLTRAINER_M + const AZALEAMART_BUG_CATCHER + AzaleaMart_MapScriptHeader: .MapTriggers: db 0 @@ -8,7 +13,7 @@ AzaleaMart_MapScriptHeader: ClerkScript_0x18e040: loadfont pokemart MARTTYPE_STANDARD, MART_AZALEA - loadmovesprites + closetext end CooltrainerMScript_0x18e047: diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokeCenter1F.asm index 77555270c..617db23a4 100644 --- a/maps/AzaleaPokeCenter1F.asm +++ b/maps/AzaleaPokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const AZALEAPOKECENTER1F_NURSE + const AZALEAPOKECENTER1F_GENTLEMAN + const AZALEAPOKECENTER1F_FISHING_GURU + const AZALEAPOKECENTER1F_POKEFAN_F + AzaleaPokeCenter1F_MapScriptHeader: .MapTriggers: db 1 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index ea2168e2a..b001ad221 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -1,3 +1,17 @@ +const_value set 2 + const AZALEATOWN_AZALEA_ROCKET1 + const AZALEATOWN_GRAMPS + const AZALEATOWN_TEACHER + const AZALEATOWN_YOUNGSTER + const AZALEATOWN_SLOWPOKE1 + const AZALEATOWN_SLOWPOKE2 + const AZALEATOWN_SLOWPOKE3 + const AZALEATOWN_SLOWPOKE4 + const AZALEATOWN_FRUIT_TREE + const AZALEATOWN_AZALEA_ROCKET2 + const AZALEATOWN_AZALEA_ROCKET3 + const AZALEATOWN_KURT_OUTSIDE + AzaleaTown_MapScriptHeader: .MapTriggers: db 3 @@ -27,13 +41,13 @@ AzaleaTown_MapScriptHeader: return UnknownScript_0x198018: - moveperson $b, $b, $b + moveperson AZALEATOWN_AZALEA_ROCKET2, $b, $b spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_RotatePalettesRightMusic pause 15 - appear $b - applymovement $b, MovementData_0x198134 + appear AZALEATOWN_AZALEA_ROCKET2 + applymovement AZALEATOWN_AZALEA_ROCKET2, MovementData_0x198134 spriteface PLAYER, DOWN jump UnknownScript_0x198049 @@ -42,15 +56,15 @@ UnknownScript_0x198034: showemote EMOTE_SHOCK, PLAYER, 15 special Special_RotatePalettesRightMusic pause 15 - appear $b - applymovement $b, MovementData_0x19813c + appear AZALEATOWN_AZALEA_ROCKET2 + applymovement AZALEATOWN_AZALEA_ROCKET2, MovementData_0x19813c spriteface PLAYER, UP UnknownScript_0x198049: playmusic MUSIC_RIVAL_ENCOUNTER loadfont writetext UnknownText_0x19814d + waitbutton closetext - loadmovesprites setevent EVENT_RIVAL_AZALEA_TOWN checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x198071 @@ -58,7 +72,7 @@ UnknownScript_0x198049: iftrue UnknownScript_0x198081 winlosstext UnknownText_0x1981e6, UnknownText_0x19835b setlasttalked $b - loadtrainer RIVAL1, RIVAL1_6 + scriptedtrainerdata RIVAL1, RIVAL1_6 startbattle reloadmapmusic returnafterbattle @@ -67,7 +81,7 @@ UnknownScript_0x198049: UnknownScript_0x198071: winlosstext UnknownText_0x1981e6, UnknownText_0x19835b setlasttalked $b - loadtrainer RIVAL1, RIVAL1_4 + scriptedtrainerdata RIVAL1, RIVAL1_4 startbattle reloadmapmusic returnafterbattle @@ -76,7 +90,7 @@ UnknownScript_0x198071: UnknownScript_0x198081: winlosstext UnknownText_0x1981e6, UnknownText_0x19835b setlasttalked $b - loadtrainer RIVAL1, RIVAL1_5 + scriptedtrainerdata RIVAL1, RIVAL1_5 startbattle reloadmapmusic returnafterbattle @@ -86,14 +100,14 @@ UnknownScript_0x198091: playmusic MUSIC_RIVAL_AFTER loadfont writetext UnknownText_0x198233 + waitbutton closetext - loadmovesprites spriteface PLAYER, LEFT - applymovement $b, MovementData_0x198144 + applymovement AZALEATOWN_AZALEA_ROCKET2, MovementData_0x198144 playsound SFX_EXIT_BUILDING - disappear $b + disappear AZALEATOWN_AZALEA_ROCKET2 dotrigger $0 - waitbutton + waitsfx playmapmusic end @@ -109,14 +123,14 @@ GrampsScript_0x1980b1: checkevent EVENT_CLEARED_SLOWPOKE_WELL iftrue UnknownScript_0x1980bf writetext UnknownText_0x19841b + waitbutton closetext - loadmovesprites end UnknownScript_0x1980bf: writetext UnknownText_0x198473 + waitbutton closetext - loadmovesprites end TeacherScript_0x1980c5: @@ -131,8 +145,8 @@ SlowpokeScript_0x1980cb: pause 60 writetext UnknownText_0x1985c3 cry SLOWPOKE + waitbutton closetext - loadmovesprites end WoosterScript: @@ -141,8 +155,8 @@ WoosterScript: loadfont writetext WoosterText cry QUAGSIRE + waitbutton closetext - loadmovesprites end UnknownScript_0x1980e5: @@ -150,27 +164,27 @@ UnknownScript_0x1980e5: loadfont writetext UnknownText_0x1985df keeptextopen - spriteface $d, RIGHT + spriteface AZALEATOWN_KURT_OUTSIDE, RIGHT writetext UnknownText_0x19860b keeptextopen writetext UnknownText_0x198628 - closetext + waitbutton verbosegiveitem GS_BALL - spriteface $d, LEFT + spriteface AZALEATOWN_KURT_OUTSIDE, LEFT setflag ENGINE_HAVE_EXAMINED_GS_BALL clearevent EVENT_ILEX_FOREST_LASS setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS dotrigger $0 - loadmovesprites + closetext end KurtOutsideScript_0x19810c: faceplayer loadfont writetext UnknownText_0x198628 + waitbutton + spriteface AZALEATOWN_KURT_OUTSIDE, LEFT closetext - spriteface $d, LEFT - loadmovesprites end AzaleaTownSign: diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 41f44dd7a..11664ba6a 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const BATTLETOWER1F_RECEPTIONIST + const BATTLETOWER1F_YOUNGSTER + const BATTLETOWER1F_COOLTRAINER_F + const BATTLETOWER1F_BUG_CATCHER + const BATTLETOWER1F_GRANNY + BattleTower1F_MapScriptHeader: .MapTriggers: db 2 @@ -10,27 +17,27 @@ BattleTower1F_MapScriptHeader: db 0 .Trigger0: - writebyte BATTLE_TOWER_ACTION_09 + writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS special BattleTowerAction iffalse .SkipEverything - writebyte BATTLE_TOWER_ACTION_02 + writebyte BATTLETOWERACTION_02 ; copybytetovar sBattleTowerChallengeState special BattleTowerAction if_equal $0, .SkipEverything if_equal $2, .priorityjump1 if_equal $3, .SkipEverything if_equal $4, .SkipEverything loadfont - writetext UnknownText_0x9f037 + writetext Text_WeveBeenWaitingForYou + waitbutton closetext - loadmovesprites - priorityjump UnknownScript_0x9e44e + priorityjump Script_ResumeBattleTowerChallenge end .priorityjump1: priorityjump BattleTower_LeftWithoutSaving - writebyte BATTLE_TOWER_ACTION_04 + writebyte BATTLETOWERACTION_CHALLENGECANCELED special BattleTowerAction - writebyte BATTLE_TOWER_ACTION_06 + writebyte BATTLETOWERACTION_06 special BattleTowerAction .SkipEverything: dotrigger $1 @@ -43,19 +50,19 @@ MapBattleTower1FSignpost0Script: yesorno iffalse UnknownScript_0x9e3e0 writetext Text_BattleTowerRules - closetext + waitbutton UnknownScript_0x9e3e0: - loadmovesprites + closetext end ReceptionistScript_0x9e3e2: - writebyte BATTLE_TOWER_ACTION_02 + writebyte BATTLETOWERACTION_02 ; copybytetovar sBattleTowerChallengeState special BattleTowerAction - if_equal $3, BattleTowerBattleRoomScript_0x9f4e4 ; maps/BattleTowerBattleRoom.asm + if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm loadfont writetext Text_BattleTowerWelcomesYou keeptextopen - writebyte BATTLE_TOWER_ACTION_00 + writebyte BATTLETOWERACTION_00 ; if new save file: bit 1, [sbe4f] special BattleTowerAction if_not_equal $0, Script_Menu_ChallengeExplanationCancel jump Script_BattleTowerIntroductionYesNo @@ -66,13 +73,13 @@ Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc special Special_Menu_ChallengeExplanationCancel if_equal $1, Script_ChoseChallenge if_equal $2, Script_BattleTowerExplanation - jump UnknownScript_0x9e4b0 + jump Script_BattleTowerHopeToServeYouAgain Script_ChoseChallenge: ; 0x9e40f - writebyte BATTLE_TOWER_ACTION_1A ; ResetBattleTowerTrainerSRAM + writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM special BattleTowerAction special SpecialCheckForBattleTowerRules - if_not_equal $0, Script_CloseText + if_not_equal $0, Script_WaitButton writetext Text_SaveBeforeEnteringBattleRoom yesorno iffalse Script_Menu_ChallengeExplanationCancel @@ -80,175 +87,175 @@ Script_ChoseChallenge: ; 0x9e40f special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel dotrigger $1 - writebyte BATTLE_TOWER_ACTION_01 + writebyte BATTLETOWERACTION_01 ; set 1, [sbe4f] special BattleTowerAction special Function1700b0 if_equal $a, Script_Menu_ChallengeExplanationCancel if_not_equal $0, UnknownScript_0x9e550 - writebyte BATTLE_TOWER_ACTION_11 + writebyte BATTLETOWERACTION_11 special BattleTowerAction writetext Text_RightThisWayToYourBattleRoom + waitbutton closetext - loadmovesprites - writebyte BATTLE_TOWER_ACTION_1E + writebyte BATTLETOWERACTION_1E special BattleTowerAction - jump UnknownScript_0x9e454 + jump Script_WalkToBattleTowerElevator -UnknownScript_0x9e44e: - loadmovesprites - writebyte BATTLE_TOWER_ACTION_08 +Script_ResumeBattleTowerChallenge: + closetext + writebyte BATTLETOWERACTION_LOADLEVELGROUP ; load choice of level group special BattleTowerAction -UnknownScript_0x9e454: - musicfadeout MUSIC_NONE, $8 +Script_WalkToBattleTowerElevator: + musicfadeout MUSIC_NONE, 8 domaptrigger BATTLE_TOWER_BATTLE_ROOM, $0 domaptrigger BATTLE_TOWER_ELEVATOR, $0 domaptrigger BATTLE_TOWER_HALLWAY, $0 - follow $2, PLAYER - applymovement $2, MovementData_0x9e571 - writebyte BATTLE_TOWER_ACTION_0A + follow BATTLETOWER1F_RECEPTIONIST, PLAYER + applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator + writebyte BATTLETOWERACTION_0A special BattleTowerAction warpsound - disappear $2 + disappear BATTLETOWER1F_RECEPTIONIST stopfollow - applymovement PLAYER, MovementData_0x9e576 + applymovement PLAYER, MovementData_BattleTowerHallwayPlayerEntersBattleRoom warpcheck end Script_GivePlayerHisPrize: ; 0x9e47a - writebyte BATTLE_TOWER_ACTION_1C + writebyte BATTLETOWERACTION_1C special BattleTowerAction - writebyte BATTLE_TOWER_ACTION_1B + writebyte BATTLETOWERACTION_1B special BattleTowerAction if_equal POTION, Script_YourPackIsStuffedFull itemtotext $0, $1 giveitem ITEM_FROM_MEM, 5 writetext Text_PlayerGotFive - writebyte BATTLE_TOWER_ACTION_1D + writebyte BATTLETOWERACTION_1D special BattleTowerAction - loadmovesprites + closetext end Script_YourPackIsStuffedFull: ; 0x9e498 writetext Text_YourPackIsStuffedFull + waitbutton closetext - loadmovesprites end Script_BattleTowerIntroductionYesNo: ; 0x9e49e writetext Text_WouldYouLikeToHearAboutTheBattleTower yesorno - iffalse UnknownScript_0x9e4a8 + iffalse Script_BattleTowerSkipExplanation Script_BattleTowerExplanation: ; 0x9e4a5 writetext Text_BattleTowerIntroduction_2 -UnknownScript_0x9e4a8: - writebyte BATTLE_TOWER_ACTION_01 +Script_BattleTowerSkipExplanation: + writebyte BATTLETOWERACTION_01 special BattleTowerAction jump Script_Menu_ChallengeExplanationCancel -UnknownScript_0x9e4b0: +Script_BattleTowerHopeToServeYouAgain: writetext Text_WeHopeToServeYouAgain + waitbutton closetext - loadmovesprites end -UnknownScript_0x9e4b6: +UnreferencedScript_0x9e4b6: special Function17f53d - loadmovesprites + closetext end -Script_CloseText: ; 0x9e4bb +Script_WaitButton: ; 0x9e4bb + waitbutton closetext - loadmovesprites end -UnknownScript_0x9e4be: +UnreferencedScript_0x9e4be: writetext Text_SaveBeforeEnteringBattleRoom yesorno iffalse Script_Menu_ChallengeExplanationCancel special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel - writebyte BATTLE_TOWER_ACTION_01 + writebyte BATTLETOWERACTION_01 special BattleTowerAction special Function1700ba if_equal $a, Script_Menu_ChallengeExplanationCancel if_not_equal $0, UnknownScript_0x9e550 writetext Text_ReceivedAListOfLeadersOnTheHonorRoll - spriteface $2, LEFT + spriteface BATTLETOWER1F_RECEPTIONIST, LEFT writetext Text_PleaseConfirmOnThisMonitor + waitbutton + spriteface BATTLETOWER1F_RECEPTIONIST, DOWN closetext - spriteface $2, DOWN - loadmovesprites end -UnknownScript_0x9e4ea: - writebyte BATTLE_TOWER_ACTION_18 +UnreferencedScript_0x9e4ea: + writebyte BATTLETOWERACTION_18 special BattleTowerAction if_not_equal $0, Script_APkmnLevelExceeds - writebyte BATTLE_TOWER_ACTION_19 + writebyte BATTLETOWERACTION_19 special BattleTowerAction if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70 special SpecialCheckForBattleTowerRules - if_not_equal $0, Script_CloseText - writebyte BATTLE_TOWER_ACTION_05 + if_not_equal $0, Script_WaitButton + writebyte BATTLETOWERACTION_05 special BattleTowerAction - if_equal $0, UnknownScript_0x9e512 - writetext UnknownText_0x9ecb0 - jump UnknownScript_0x9e515 + if_equal $0, .zero + writetext Text_CantBeRegistered_PreviousRecordDeleted + jump continue -UnknownScript_0x9e512: - writetext UnknownText_0x9ec6d -UnknownScript_0x9e515: +.zero: + writetext Text_CantBeRegistered +continue: yesorno iffalse Script_Menu_ChallengeExplanationCancel - writetext UnknownText_0x9ef79 + writetext Text_SaveBeforeReentry yesorno iffalse Script_Menu_ChallengeExplanationCancel dotrigger $0 special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel dotrigger $1 - writebyte BATTLE_TOWER_ACTION_06 + writebyte BATTLETOWERACTION_06 special BattleTowerAction - writebyte BATTLE_TOWER_ACTION_12 + writebyte BATTLETOWERACTION_12 special BattleTowerAction writetext Text_RightThisWayToYourBattleRoom - closetext - jump UnknownScript_0x9e44e + waitbutton + jump Script_ResumeBattleTowerChallenge -UnknownScript_0x9e53b: - writetext UnknownText_0x9f076 - closetext - jump UnknownScript_0x9e4b0 +UnreferencedScript_0x9e53b: + writetext Text_FiveDayBattleLimit_Mobile + waitbutton + jump Script_BattleTowerHopeToServeYouAgain Script_APkmnLevelExceeds: ; 0x9e542 writetext Text_APkmnLevelExceeds - closetext + waitbutton jump Script_Menu_ChallengeExplanationCancel Script_MayNotEnterABattleRoomUnderL70: ; 0x9e549 writetext Text_MayNotEnterABattleRoomUnderL70 - closetext + waitbutton jump Script_Menu_ChallengeExplanationCancel UnknownScript_0x9e550: special Function17f53d - loadmovesprites + closetext end BattleTower_LeftWithoutSaving: loadfont writetext Text_BattleTower_LeftWithoutSaving - closetext - jump UnknownScript_0x9e4b0 + waitbutton + jump Script_BattleTowerHopeToServeYouAgain YoungsterScript_0x9e55d: faceplayer loadfont writetext Text_BattleTowerYoungster + waitbutton closetext - loadmovesprites - spriteface $3, RIGHT + spriteface BATTLETOWER1F_YOUNGSTER, RIGHT end CooltrainerFScript_0x9e568: @@ -260,24 +267,24 @@ BugCatcherScript_0x9e56b: GrannyScript_0x9e56e: jumptextfaceplayer Text_BattleTowerGranny -MovementData_0x9e571: +MovementData_BattleTower1FWalkToElevator: step_up step_up step_up step_up step_up -MovementData_0x9e576: +MovementData_BattleTowerHallwayPlayerEntersBattleRoom: step_up step_end -MovementData_0x9e578: +MovementData_BattleTowerElevatorExitElevator: step_down step_end -MovementData_0x9e57a: +MovementData_BattleTowerHallwayWalkTo1020Room: step_right step_right -MovementData_0x9e57c: +MovementData_BattleTowerHallwayWalkTo3040Room: step_right step_right step_up @@ -285,13 +292,13 @@ MovementData_0x9e57c: turn_head_left step_end -MovementData_0x9e582: +MovementData_BattleTowerHallwayWalkTo90100Room: step_left step_left -MovementData_0x9e584: +MovementData_BattleTowerHallwayWalkTo7080Room: step_left step_left -MovementData_0x9e586: +MovementData_BattleTowerHallwayWalkTo5060Room: step_left step_left step_up @@ -299,7 +306,7 @@ MovementData_0x9e586: turn_head_right step_end -MovementData_0x9e58c: +MovementData_BattleTowerBattleRoomPlayerWalksIn: step_up step_up step_up @@ -307,28 +314,28 @@ MovementData_0x9e58c: turn_head_right step_end -MovementData_0x9e592: +MovementData_BattleTowerBattleRoomOpponentWalksIn: slow_step_down slow_step_down slow_step_down turn_head_left step_end -MovementData_0x9e597: +MovementData_BattleTowerBattleRoomOpponentWalksOut: turn_head_up slow_step_up slow_step_up slow_step_up step_end -MovementData_0x9e59c: +MovementData_BattleTowerBattleRoomReceptionistWalksToPlayer: slow_step_right slow_step_right slow_step_up slow_step_up step_end -MovementData_0x9e5a1: +MovementData_BattleTowerBattleRoomReceptionistWalksAway: slow_step_down slow_step_down slow_step_left @@ -336,11 +343,11 @@ MovementData_0x9e5a1: turn_head_right step_end -MovementData_0x9e5a7: +MovementData_BattleTowerBattleRoomPlayerTurnsToFaceReceptionist: turn_head_down step_end -MovementData_0x9e5a9: +MovementData_BattleTowerBattleRoomPlayerTurnsToFaceNextOpponent: turn_head_right step_end @@ -482,7 +489,7 @@ Text_ThanksForVisiting: ; 0x9ea49 line "visiting!" done -UnknownText_0x9ea5f: +Text_BeatenAllTheTrainers_Mobile: text "Congratulations!" para "You've beaten all" @@ -512,7 +519,7 @@ Text_CongratulationsYouveBeatenAllTheTrainers: ; 0x9eaef para "" done -UnknownText_0x9eb45: +Text_AskRegisterRecord_Mobile: text "Would you like to" line "register your" @@ -526,7 +533,7 @@ Text_PlayerGotFive: ; 0x9eb7e text_from_ram StringBuffer4 text "!@" sound_item - text_waitbutton + text_waitsfx db "@" Text_YourPackIsStuffedFull: ; 0x9eb94 @@ -560,7 +567,7 @@ Text_WouldYouLikeToHearAboutTheBattleTower: ; 0x9ec3d cont "BATTLE TOWER?" done -UnknownText_0x9ec6d: +Text_CantBeRegistered: text "Your record from" line "the previous" @@ -568,7 +575,7 @@ UnknownText_0x9ec6d: line "be registered. OK?" done -UnknownText_0x9ecb0: +Text_CantBeRegistered_PreviousRecordDeleted: text "Your record from" line "the previous" @@ -637,7 +644,7 @@ Text_NextUpOpponentNo: ; 0x9eebc text ". Ready?" done -UnknownText_0x9eee0: +Text_SaveBeforeConnecting_Mobile: text "Your session will" line "be SAVED before" @@ -658,7 +665,7 @@ Text_SaveAndEndTheSession: ; 0x9ef5e line "session?" done -UnknownText_0x9ef79: +Text_SaveBeforeReentry: text "Your record will" line "be SAVED before" @@ -671,7 +678,7 @@ Text_CancelYourBattleRoomChallenge: ; 0x9efbf line "ROOM challenge?" done -UnknownText_0x9efe3: +Text_RegisterRecordOnFile_Mobile: text "We have your" line "previous record on" @@ -680,7 +687,7 @@ UnknownText_0x9efe3: cont "it at the CENTER?" done -UnknownText_0x9f037: +Text_WeveBeenWaitingForYou: text "We've been waiting" line "for you. This way" @@ -688,7 +695,7 @@ UnknownText_0x9f037: line "please." done -UnknownText_0x9f076: +Text_FiveDayBattleLimit_Mobile: text "You may enter only" line "five BATTLE ROOMS" cont "each day." @@ -713,7 +720,7 @@ Text_TooMuchTimeElapsedNoRegister: ; 0x9f0c1 done ; a dupe? -UnknownText_0x9f151: +Text_RegisterRecordTimedOut_Mobile: text "Sorry, but it's" line "not possible to" diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 858b51fb0..32389b53e 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -1,50 +1,54 @@ +const_value set 2 + const BATTLETOWERBATTLEROOM_YOUNGSTER + const BATTLETOWERBATTLEROOM_RECEPTIONIST + BattleTowerBattleRoom_MapScriptHeader: .MapTriggers: db 2 ; triggers - dw Script_EnterBattleRoom, 0 - dw UnknownScript_0x9f420, 0 + dw .EnterBattleRoom, 0 + dw .DummyTrigger, 0 .MapCallbacks: db 0 -Script_EnterBattleRoom: ; 0x9f419 - disappear $2 +.EnterBattleRoom: ; 0x9f419 + disappear BATTLETOWERBATTLEROOM_YOUNGSTER priorityjump Script_BattleRoom dotrigger $1 -UnknownScript_0x9f420: +.DummyTrigger: end Script_BattleRoom: ; 0x9f421 - applymovement PLAYER, MovementData_0x9e58c + applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerWalksIn ; beat all 7 opponents in a row Script_BattleRoomLoop: ; 0x9f425 writebyte $2 special Function_LoadOpponentTrainerAndPokemonsWithOTSprite - appear $2 + appear BATTLETOWERBATTLEROOM_YOUNGSTER warpsound - waitbutton - applymovement $2, MovementData_0x9e592 + waitsfx + applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksIn loadfont battletowertext 1 keeptextopen - loadmovesprites + closetext special BattleTowerBattle ; calls predef startbattle special FadeOutPalettes reloadmap if_not_equal $0, Script_FailedBattleTowerChallenge copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64 if_equal BATTLETOWER_NROFTRAINERS, Script_BeatenAllTrainers - applymovement $2, MovementData_0x9e597 + applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksOut warpsound - disappear $2 - applymovement $3, MovementData_0x9e59c - applymovement PLAYER, MovementData_0x9e5a7 + disappear BATTLETOWERBATTLEROOM_YOUNGSTER + applymovement BATTLETOWERBATTLEROOM_RECEPTIONIST, MovementData_BattleTowerBattleRoomReceptionistWalksToPlayer + applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceReceptionist loadfont writetext Text_YourPkmnWillBeHealedToFullHealth + waitbutton closetext - loadmovesprites playmusic MUSIC_HEAL special FadeOutPalettes special LoadMapPalettes @@ -56,83 +60,83 @@ Script_BattleRoomLoop: ; 0x9f425 yesorno iffalse Script_DontBattleNextOpponent Script_ContinueAndBattleNextOpponent: ; 0x9f477 - loadmovesprites - applymovement PLAYER, MovementData_0x9e5a9 - applymovement $3, MovementData_0x9e5a1 + closetext + applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceNextOpponent + applymovement BATTLETOWERBATTLEROOM_RECEPTIONIST, MovementData_BattleTowerBattleRoomReceptionistWalksAway jump Script_BattleRoomLoop Script_DontBattleNextOpponent: ; 0x9f483 writetext Text_SaveAndEndTheSession yesorno iffalse Script_DontSaveAndEndTheSession - writebyte BATTLE_TOWER_ACTION_07 + writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group special BattleTowerAction - writebyte BATTLE_TOWER_ACTION_1F + writebyte BATTLETOWERACTION_CHOOSEREWARD ; choose reward special BattleTowerAction - writebyte BATTLE_TOWER_ACTION_03 + writebyte BATTLETOWERACTION_03 ; quicksave special BattleTowerAction playsound SFX_SAVE - waitbutton + waitsfx special FadeOutPalettes special Reset Script_DontSaveAndEndTheSession: ; 0x9f4a3 writetext Text_CancelYourBattleRoomChallenge yesorno iffalse Script_ContinueAndBattleNextOpponent - writebyte BATTLE_TOWER_ACTION_04 + writebyte BATTLETOWERACTION_CHALLENGECANCELED special BattleTowerAction - writebyte BATTLE_TOWER_ACTION_06 + writebyte BATTLETOWERACTION_06 special BattleTowerAction - loadmovesprites + closetext special FadeOutPalettes warpfacing UP, BATTLE_TOWER_1F, $7, $7 loadfont - jump UnknownScript_0x9e4b0 + jump Script_BattleTowerHopeToServeYouAgain Script_FailedBattleTowerChallenge: pause 60 special Special_BattleTowerFade warpfacing UP, BATTLE_TOWER_1F, $7, $7 - writebyte BATTLE_TOWER_ACTION_04 + writebyte BATTLETOWERACTION_CHALLENGECANCELED special BattleTowerAction loadfont writetext Text_ThanksForVisiting + waitbutton closetext - loadmovesprites end Script_BeatenAllTrainers: ; 0x9f4d9 pause 60 special Special_BattleTowerFade warpfacing UP, BATTLE_TOWER_1F, $7, $7 -BattleTowerBattleRoomScript_0x9f4e4: +Script_BeatenAllTrainers2: loadfont writetext Text_CongratulationsYouveBeatenAllTheTrainers jump Script_GivePlayerHisPrize -UnknownScript_0x9f4eb: - writebyte BATTLE_TOWER_ACTION_04 +UnreferencedScript_0x9f4eb: + writebyte BATTLETOWERACTION_CHALLENGECANCELED special BattleTowerAction loadfont writetext Text_TooMuchTimeElapsedNoRegister + waitbutton closetext - loadmovesprites end -UnknownScript_0x9f4f7: - writebyte BATTLE_TOWER_ACTION_04 +UnreferencedScript_0x9f4f7: + writebyte BATTLETOWERACTION_CHALLENGECANCELED special BattleTowerAction - writebyte BATTLE_TOWER_ACTION_06 + writebyte BATTLETOWERACTION_06 special BattleTowerAction loadfont writetext Text_ThanksForVisiting writetext Text_WeHopeToServeYouAgain + waitbutton closetext - loadmovesprites end -UnknownText_0x9f50b: +Text_ReturnedAfterSave_Mobile: text "You'll be returned" line "after you SAVE." done diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 20ae591bb..9a25e55a4 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -1,45 +1,48 @@ +const_value set 2 + const BATTLETOWERELEVATOR_RECEPTIONIST + BattleTowerElevator_MapScriptHeader: .MapTriggers: db 2 ; triggers - dw UnknownScript_0x9f562, 0 - dw UnknownScript_0x9f567, 0 + dw .Trigger0, 0 + dw .Trigger1, 0 .MapCallbacks: db 0 -UnknownScript_0x9f562: - priorityjump UnknownScript_0x9f568 +.Trigger0: + priorityjump .RideElevator dotrigger $1 -UnknownScript_0x9f567: +.Trigger1: end -UnknownScript_0x9f568: - follow $2, PLAYER - applymovement $2, MovementData_0x9f58f - applymovement PLAYER, MovementData_0x9f592 - writebyte BATTLE_TOWER_ACTION_0A +.RideElevator: + follow BATTLETOWERELEVATOR_RECEPTIONIST, PLAYER + applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn + applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn + writebyte BATTLETOWERACTION_0A special BattleTowerAction playsound SFX_ELEVATOR earthquake 60 - waitbutton - follow $2, PLAYER - applymovement $2, MovementData_0x9e578 + waitsfx + follow BATTLETOWERELEVATOR_RECEPTIONIST, PLAYER + applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorExitElevator stopfollow warpsound - disappear $2 - applymovement PLAYER, MovementData_0x9e578 + disappear BATTLETOWERELEVATOR_RECEPTIONIST + applymovement PLAYER, MovementData_BattleTowerElevatorExitElevator warpcheck end -MovementData_0x9f58f: +MovementData_BattleTowerElevatorReceptionistWalksIn: step_right turn_head_down step_end -MovementData_0x9f592: +MovementData_BattleTowerElevatorPlayerWalksIn: turn_head_down step_end @@ -60,4 +63,4 @@ BattleTowerElevator_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MovementData_0x9f58f, -1 + person_event SPRITE_RECEPTIONIST, 2, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, MovementData_BattleTowerElevatorReceptionistWalksIn, -1 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 52ef201fd..cb075bb0e 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -1,3 +1,6 @@ +const_value set 2 + const BATTLETOWERHALLWAY_RECEPTIONIST + BattleTowerHallway_MapScriptHeader: .MapTriggers: db 2 @@ -16,7 +19,7 @@ BattleTowerHallway_MapScriptHeader: end .ChooseBattleRoom: - follow $2, PLAYER + follow BATTLETOWERHALLWAY_RECEPTIONIST, PLAYER callasm .asm_load_battle_room jump .WalkToChosenBattleRoom @@ -47,33 +50,33 @@ BattleTowerHallway_MapScriptHeader: if_equal 8, .L70L80 if_equal 9, .L90L100 if_equal 10, .L90L100 - applymovement $2, MovementData_0x9e57a + applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo1020Room jump .EnterBattleRoom .L30L40: ; 0x9f603 - applymovement $2, MovementData_0x9e57c + applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo3040Room jump .EnterBattleRoom .L50L60: ; 0x9f60a - applymovement $2, MovementData_0x9e586 + applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo5060Room jump .EnterBattleRoom .L70L80: ; 0x9f611 - applymovement $2, MovementData_0x9e584 + applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo7080Room jump .EnterBattleRoom .L90L100: ; 0x9f618 - applymovement $2, MovementData_0x9e582 + applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo90100Room jump .EnterBattleRoom .EnterBattleRoom: ; 0x9f61f - faceperson PLAYER, $2 + faceperson PLAYER, BATTLETOWERHALLWAY_RECEPTIONIST loadfont writetext Text_PleaseStepThisWay + waitbutton closetext - loadmovesprites stopfollow - applymovement PLAYER, MovementData_0x9e576 + applymovement PLAYER, MovementData_BattleTowerHallwayPlayerEntersBattleRoom warpcheck end diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index a5a198d7d..e0052f701 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -1,3 +1,9 @@ +const_value set 2 + const BATTLETOWEROUTSIDE_STANDING_YOUNGSTER + const BATTLETOWEROUTSIDE_BUENA + const BATTLETOWEROUTSIDE_SAILOR + const BATTLETOWEROUTSIDE_LASS + BattleTowerOutside_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index b2151f512..862cde5ff 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const BILLSHOUSE_GRAMPS + BillsHouse_MapScriptHeader: .MapTriggers: db 0 @@ -121,7 +124,7 @@ UnknownScript_0x18963b: iffalse UnknownScript_0x1896cc setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA setevent EVENT_GAVE_KURT_APRICORNS - loadmovesprites + closetext end UnknownScript_0x189652: @@ -132,7 +135,7 @@ UnknownScript_0x189652: iffalse UnknownScript_0x1896cc setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA setevent EVENT_GAVE_KURT_APRICORNS - loadmovesprites + closetext end UnknownScript_0x189669: @@ -143,7 +146,7 @@ UnknownScript_0x189669: iffalse UnknownScript_0x1896cc setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA setevent EVENT_GAVE_KURT_APRICORNS - loadmovesprites + closetext end UnknownScript_0x189680: @@ -154,7 +157,7 @@ UnknownScript_0x189680: iffalse UnknownScript_0x1896cc setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA setevent EVENT_GAVE_KURT_APRICORNS - loadmovesprites + closetext end UnknownScript_0x189697: @@ -162,7 +165,7 @@ UnknownScript_0x189697: verbosegiveitem THUNDERSTONE iffalse UnknownScript_0x1896cc setevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA - loadmovesprites + closetext end UnknownScript_0x1896a5: @@ -172,8 +175,8 @@ UnknownScript_0x1896a5: UnknownScript_0x1896aa: writetext UnknownText_0x189784 + waitbutton closetext - loadmovesprites end UnknownScript_0x1896b0: @@ -188,24 +191,24 @@ UnknownScript_0x1896b5: UnknownScript_0x1896ba: writetext UnknownText_0x18980e + waitbutton closetext - loadmovesprites end UnknownScript_0x1896c0: writetext UnknownText_0x18982a + waitbutton closetext - loadmovesprites end UnknownScript_0x1896c6: writetext UnknownText_0x189891 + waitbutton closetext - loadmovesprites end UnknownScript_0x1896cc: - loadmovesprites + closetext end UnknownText_0x1896ce: diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index b970499f8..582cc8d38 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -1,3 +1,14 @@ +const_value set 2 + const BLACKTHORNCITY_SUPER_NERD1 + const BLACKTHORNCITY_SUPER_NERD2 + const BLACKTHORNCITY_GRAMPS1 + const BLACKTHORNCITY_GRAMPS2 + const BLACKTHORNCITY_BLACK_BELT + const BLACKTHORNCITY_COOLTRAINER_F1 + const BLACKTHORNCITY_YOUNGSTER1 + const BLACKTHORNCITY_YOUNGSTER2 + const BLACKTHORNCITY_COOLTRAINER_F2 + BlackthornCity_MapScriptHeader: .MapTriggers: db 0 @@ -16,11 +27,11 @@ BlackthornCity_MapScriptHeader: .Santos checkcode VAR_WEEKDAY if_equal SATURDAY, .SantosAppears - disappear $9 + disappear BLACKTHORNCITY_YOUNGSTER2 return .SantosAppears - appear $9 + appear BLACKTHORNCITY_YOUNGSTER2 return SuperNerdScript_0x1a46e8: @@ -31,20 +42,20 @@ SuperNerdScript_0x1a46e8: checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1a46fc writetext UnknownText_0x1a477a + waitbutton closetext - loadmovesprites end UnknownScript_0x1a46fc: writetext UnknownText_0x1a47f3 + waitbutton closetext - loadmovesprites end UnknownScript_0x1a4702: writetext UnknownText_0x1a4865 + waitbutton closetext - loadmovesprites end GrampsScript_0x1a4708: @@ -59,14 +70,14 @@ BlackBeltScript_0x1a470e: checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1a471c writetext UnknownText_0x1a494a + waitbutton closetext - loadmovesprites end UnknownScript_0x1a471c: writetext UnknownText_0x1a4983 + waitbutton closetext - loadmovesprites end CooltrainerFScript_0x1a4722: @@ -97,21 +108,21 @@ SantosScript: iffalse SantosDoneScript setevent EVENT_GOT_SPELL_TAG_FROM_SANTOS writetext SantosGaveGiftText + waitbutton closetext - loadmovesprites end SantosSaturdayScript: writetext SantosSaturdayText - closetext + waitbutton SantosDoneScript: - loadmovesprites + closetext end SantosNotSaturdayScript: writetext SantosNotSaturdayText + waitbutton closetext - loadmovesprites end BlackthornCitySign: diff --git a/maps/BlackthornDodrioTradeHouse.asm b/maps/BlackthornDodrioTradeHouse.asm index 7f84fe8dc..1ea8e89c4 100644 --- a/maps/BlackthornDodrioTradeHouse.asm +++ b/maps/BlackthornDodrioTradeHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const BLACKTHORNDODRIOTRADEHOUSE_LASS + BlackthornDodrioTradeHouse_MapScriptHeader: .MapTriggers: db 0 @@ -9,8 +12,8 @@ Emy: faceplayer loadfont trade $3 + waitbutton closetext - loadmovesprites end EmysHouseBookshelf: diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 04e6554c4..12f5e3e8e 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const BLACKTHORNDRAGONSPEECHHOUSE_GRANNY + const BLACKTHORNDRAGONSPEECHHOUSE_EKANS + BlackthornDragonSpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -12,8 +16,8 @@ EkansScript_0x19594c: loadfont writetext UnknownText_0x1959ee cry DRATINI + waitbutton closetext - loadmovesprites end UnknownScript_0x195956: diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 5fa27432c..83ec85cda 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const BLACKTHORNGYM1F_CLAIR + const BLACKTHORNGYM1F_COOLTRAINER_M1 + const BLACKTHORNGYM1F_COOLTRAINER_M2 + const BLACKTHORNGYM1F_COOLTRAINER_F + const BLACKTHORNGYM1F_GYM_GUY + BlackthornGym1F_MapScriptHeader: .MapTriggers: db 0 @@ -31,17 +38,17 @@ ClairScript_0x194e24: checkevent EVENT_BEAT_CLAIR iftrue .FightDone writetext UnknownText_0x194efa + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x194fd6, 0 - loadtrainer CLAIR, 1 + scriptedtrainerdata CLAIR, 1 startbattle returnafterbattle setevent EVENT_BEAT_CLAIR loadfont writetext UnknownText_0x19500e + waitbutton closetext - loadmovesprites setevent EVENT_BEAT_COOLTRAINERM_PAUL setevent EVENT_BEAT_COOLTRAINERM_CODY setevent EVENT_BEAT_COOLTRAINERM_MIKE @@ -53,8 +60,8 @@ ClairScript_0x194e24: end .FightDone writetext UnknownText_0x195162 + waitbutton closetext - loadmovesprites end UnknownScript_0x194e69: @@ -67,7 +74,7 @@ UnknownScript_0x194e69: itemtotext TM_DRAGONBREATH, $0 writetext UnknownText_0x1951bf playsound SFX_ITEM - waitbutton + waitsfx itemnotify setevent EVENT_GOT_TM24_DRAGONBREATH writetext UnknownText_0x1951d1 @@ -76,47 +83,47 @@ UnknownScript_0x194e69: UnknownScript_0x194e8e: writetext UnknownText_0x19524f + waitbutton closetext - loadmovesprites end UnknownScript_0x194e94: writetext UnknownText_0x195272 + waitbutton closetext - loadmovesprites end TrainerCooltrainermPaul: trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, CooltrainermPaulScript CooltrainermPaulScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1953f1 + waitbutton closetext - loadmovesprites end TrainerCooltrainermMike: trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, CooltrainermMikeScript CooltrainermMikeScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x195467 + waitbutton closetext - loadmovesprites end TrainerCooltrainerfLola: trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, CooltrainerfLolaScript CooltrainerfLolaScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x195516 + waitbutton closetext - loadmovesprites end BlackthornGymGuyScript: @@ -125,14 +132,14 @@ BlackthornGymGuyScript: checkevent EVENT_BEAT_CLAIR iftrue .BlackthornGymGuyWinScript writetext BlackthornGymGuyText + waitbutton closetext - loadmovesprites end .BlackthornGymGuyWinScript writetext BlackthornGymGuyWinText + waitbutton closetext - loadmovesprites end BlackthornGymStatue: diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 48ea2db38..ecadfd73b 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -1,3 +1,13 @@ +const_value set 2 + const BLACKTHORNGYM2F_COOLTRAINER_M + const BLACKTHORNGYM2F_COOLTRAINER_F + const BLACKTHORNGYM2F_BOULDER1 + const BLACKTHORNGYM2F_BOULDER2 + const BLACKTHORNGYM2F_BOULDER3 + const BLACKTHORNGYM2F_BOULDER4 + const BLACKTHORNGYM2F_BOULDER5 + const BLACKTHORNGYM2F_BOULDER6 + BlackthornGym2F_MapScriptHeader: .MapTriggers: db 0 @@ -29,15 +39,15 @@ BlackthornGym2F_MapScriptHeader: db $ff ; end .Disappear4 - disappear 4 + disappear BLACKTHORNGYM2F_BOULDER1 jump .Fall .Disappear5 - disappear 5 + disappear BLACKTHORNGYM2F_BOULDER2 jump .Fall .Disappear6 - disappear 6 + disappear BLACKTHORNGYM2F_BOULDER3 jump .Fall .Fall @@ -45,8 +55,8 @@ BlackthornGym2F_MapScriptHeader: scall .FX loadfont writetext BlackthornGym2FBoulderFellText + waitbutton closetext - loadmovesprites end .FX @@ -62,22 +72,22 @@ TrainerCooltrainermCody: trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, CooltrainermCodyScript CooltrainermCodyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1957d5 + waitbutton closetext - loadmovesprites end TrainerCooltrainerfFran: trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, CooltrainerfFranScript CooltrainerfFranScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x195883 + waitbutton closetext - loadmovesprites end CooltrainermCodySeenText: diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index 317c0a84c..f0432031d 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const BLACKTHORNMART_CLERK + const BLACKTHORNMART_COOLTRAINER_M + const BLACKTHORNMART_BLACK_BELT + BlackthornMart_MapScriptHeader: .MapTriggers: db 0 @@ -8,7 +13,7 @@ BlackthornMart_MapScriptHeader: ClerkScript_0x195a5d: loadfont pokemart MARTTYPE_STANDARD, MART_BLACKTHORN - loadmovesprites + closetext end CooltrainerMScript_0x195a64: diff --git a/maps/BlackthornPokeCenter1F.asm b/maps/BlackthornPokeCenter1F.asm index 5cd378eff..32085c67f 100644 --- a/maps/BlackthornPokeCenter1F.asm +++ b/maps/BlackthornPokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const BLACKTHORNPOKECENTER1F_NURSE + const BLACKTHORNPOKECENTER1F_GENTLEMAN + const BLACKTHORNPOKECENTER1F_TWIN + const BLACKTHORNPOKECENTER1F_COOLTRAINER_M + BlackthornPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 36d06b943..a37cdb837 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const BLUESHOUSE_DAISY + BluesHouse_MapScriptHeader: .MapTriggers: db 0 @@ -11,8 +14,8 @@ DaisyScript_0x19b0d0: checkcode VAR_HOUR if_equal $f, UnknownScript_0x19b0de writetext UnknownText_0x19b130 + waitbutton closetext - loadmovesprites end UnknownScript_0x19b0de: @@ -22,14 +25,14 @@ UnknownScript_0x19b0de: yesorno iffalse UnknownScript_0x19b124 writetext UnknownText_0x19b244 - closetext + waitbutton special Special_DaisyMassage if_equal 0, UnknownScript_0x19b124 if_equal 1, UnknownScript_0x19b12a setflag ENGINE_TEA_IN_BLUES_HOUSE writetext UnknownText_0x19b266 + waitbutton closetext - loadmovesprites special FadeOutPalettes playmusic MUSIC_HEAL pause 60 @@ -40,26 +43,26 @@ UnknownScript_0x19b0de: special PlayCurMonCry keeptextopen writetext UnknownText_0x19b2aa + waitbutton closetext - loadmovesprites end UnknownScript_0x19b11e: writetext UnknownText_0x19b2fa + waitbutton closetext - loadmovesprites end UnknownScript_0x19b124: writetext UnknownText_0x19b334 + waitbutton closetext - loadmovesprites end UnknownScript_0x19b12a: writetext UnknownText_0x19b377 + waitbutton closetext - loadmovesprites end UnknownText_0x19b130: diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index a862137de..9971b0f7c 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -1,3 +1,6 @@ +const_value set 2 + const BRUNOSROOM_BRUNO + BrunosRoom_MapScriptHeader: .MapTriggers: db 2 @@ -38,10 +41,10 @@ UnknownScript_0x1809ad: earthquake 80 changeblock $4, $e, $2a reloadmappart - loadmovesprites + closetext dotrigger $1 setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED - waitbutton + waitsfx end BrunoScript_0x1809c5: @@ -50,29 +53,29 @@ BrunoScript_0x1809c5: checkevent EVENT_BEAT_ELITE_4_BRUNO iftrue UnknownScript_0x1809f3 writetext UnknownText_0x1809fe + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x180b23, 0 - loadtrainer BRUNO, 1 + scriptedtrainerdata BRUNO, 1 startbattle returnafterbattle setevent EVENT_BEAT_ELITE_4_BRUNO loadfont writetext UnknownText_0x180b3c + waitbutton closetext - loadmovesprites playsound SFX_ENTER_DOOR changeblock $4, $2, $16 reloadmappart - loadmovesprites + closetext setevent EVENT_BRUNOS_ROOM_EXIT_OPEN - waitbutton + waitsfx end UnknownScript_0x1809f3: writetext UnknownText_0x180b3c + waitbutton closetext - loadmovesprites end MovementData_0x1809f9: diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 449a730a8..5646ca176 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const BURNEDTOWER1F_ROCK + const BURNEDTOWER1F_SUPER_NERD + const BURNEDTOWER1F_SILVER + const BURNEDTOWER1F_MORTY + const BURNEDTOWER1F_POKE_BALL + BurnedTower1F_MapScriptHeader: .MapTriggers: db 3 @@ -36,37 +43,37 @@ UnknownScript_0x185bf8: return UnknownScript_0x185c0d: - spriteface $3, DOWN - showemote EMOTE_SHOCK, $3, 15 - applymovement $3, MovementData_0x185cd3 + spriteface BURNEDTOWER1F_SUPER_NERD, DOWN + showemote EMOTE_SHOCK, BURNEDTOWER1F_SUPER_NERD, 15 + applymovement BURNEDTOWER1F_SUPER_NERD, MovementData_0x185cd3 loadfont writetext UnknownText_0x185ecc + waitbutton closetext - loadmovesprites - moveperson $3, $9, $e + moveperson BURNEDTOWER1F_SUPER_NERD, $9, $e dotrigger $1 end UnknownScript_0x185c25: - showemote EMOTE_SHOCK, $4, 15 + showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 15 special Special_RotatePalettesRightMusic pause 15 - spriteface $4, RIGHT + spriteface BURNEDTOWER1F_SILVER, RIGHT pause 15 applymovement PLAYER, MovementData_0x185ccd - applymovement $4, MovementData_0x185ccf + applymovement BURNEDTOWER1F_SILVER, MovementData_0x185ccf playmusic MUSIC_RIVAL_ENCOUNTER loadfont writetext UnknownText_0x185cd9 + waitbutton closetext - loadmovesprites checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x185c60 checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x185c70 winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c setlasttalked $4 - loadtrainer RIVAL1, RIVAL1_9 + scriptedtrainerdata RIVAL1, RIVAL1_9 startbattle reloadmapmusic returnafterbattle @@ -75,7 +82,7 @@ UnknownScript_0x185c25: UnknownScript_0x185c60: winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c setlasttalked $4 - loadtrainer RIVAL1, RIVAL1_7 + scriptedtrainerdata RIVAL1, RIVAL1_7 startbattle reloadmapmusic returnafterbattle @@ -84,7 +91,7 @@ UnknownScript_0x185c60: UnknownScript_0x185c70: winlosstext UnknownText_0x185d9b, UnknownText_0x185e2c setlasttalked $4 - loadtrainer RIVAL1, RIVAL1_8 + scriptedtrainerdata RIVAL1, RIVAL1_8 startbattle reloadmapmusic returnafterbattle @@ -94,8 +101,8 @@ UnknownScript_0x185c80: playmusic MUSIC_RIVAL_AFTER loadfont writetext UnknownText_0x185de2 + waitbutton closetext - loadmovesprites dotrigger $2 setevent EVENT_RIVAL_BURNED_TOWER special Special_RotatePalettesRightMusic @@ -103,17 +110,17 @@ UnknownScript_0x185c80: earthquake 50 showemote EMOTE_SHOCK, PLAYER, 15 playsound SFX_ENTER_DOOR - waitbutton + waitsfx changeblock $a, $8, $25 reloadmappart pause 15 applymovement PLAYER, MovementData_0x185cd1 playsound SFX_KINESIS - showemote EMOTE_SHOCK, $4, 20 + showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 20 loadfont writetext UnknownText_0x185e75 + waitbutton closetext - loadmovesprites setevent EVENT_HOLE_IN_BURNED_TOWER pause 15 warpcheck diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 935b94f4f..1b86d73ca 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -1,3 +1,14 @@ +const_value set 2 + const BURNEDTOWERB1F_BOULDER + const BURNEDTOWERB1F_RAIKOU1 + const BURNEDTOWERB1F_ENTEI1 + const BURNEDTOWERB1F_SUICUNE1 + const BURNEDTOWERB1F_RAIKOU2 + const BURNEDTOWERB1F_ENTEI2 + const BURNEDTOWERB1F_SUICUNE2 + const BURNEDTOWERB1F_POKE_BALL + const BURNEDTOWERB1F_SUPER_NERD + BurnedTowerB1F_MapScriptHeader: .MapTriggers: db 2 @@ -29,51 +40,51 @@ UnknownScript_0x18616a: UnknownScript_0x18616b: playmusic MUSIC_NONE pause 30 - appear $3 + appear BURNEDTOWERB1F_RAIKOU1 spriteface PLAYER, UP pause 5 - disappear $6 + disappear BURNEDTOWERB1F_RAIKOU2 pause 15 cry RAIKOU - appear $4 + appear BURNEDTOWERB1F_ENTEI1 spriteface PLAYER, UP pause 5 - disappear $7 + disappear BURNEDTOWERB1F_ENTEI2 pause 15 cry ENTEI - appear $5 + appear BURNEDTOWERB1F_SUICUNE1 spriteface PLAYER, UP pause 5 - disappear $8 + disappear BURNEDTOWERB1F_SUICUNE2 pause 15 cry SUICUNE pause 15 playsound SFX_WARP_FROM spriteface PLAYER, LEFT - applymovement $3, MovementData_0x186236 - disappear $3 - waitbutton + applymovement BURNEDTOWERB1F_RAIKOU1, MovementData_0x186236 + disappear BURNEDTOWERB1F_RAIKOU1 + waitsfx playsound SFX_WARP_FROM spriteface PLAYER, RIGHT - applymovement $4, MovementData_0x18623b - disappear $4 - waitbutton + applymovement BURNEDTOWERB1F_ENTEI1, MovementData_0x18623b + disappear BURNEDTOWERB1F_ENTEI1 + waitsfx pause 15 playsound SFX_WARP_FROM spriteface PLAYER, UP - applymovement $5, MovementData_0x186241 + applymovement BURNEDTOWERB1F_SUICUNE1, MovementData_0x186241 playsound SFX_WARP_FROM spriteface PLAYER, DOWN - applymovement $5, MovementData_0x186248 + applymovement BURNEDTOWERB1F_SUICUNE1, MovementData_0x186248 spriteface PLAYER, UP pause 20 cry SUICUNE pause 30 playsound SFX_WARP_FROM - applymovement $5, MovementData_0x186253 + applymovement BURNEDTOWERB1F_SUICUNE1, MovementData_0x186253 spriteface PLAYER, DOWN - disappear $5 - waitbutton + disappear BURNEDTOWERB1F_SUICUNE1 + waitsfx special RestartMapMusic dotrigger $1 setevent EVENT_RELEASED_THE_BEASTS @@ -85,11 +96,11 @@ UnknownScript_0x18616b: clearevent EVENT_ECRUTEAK_CITY_GRAMPS setevent EVENT_BURNED_TOWER_MORTY setevent EVENT_BURNED_TOWER_1F_EUSINE - appear $a + appear BURNEDTOWERB1F_SUPER_NERD refreshscreen $0 changeblock $6, $e, $1b reloadmappart - loadmovesprites + closetext dotrigger $1 end @@ -97,19 +108,19 @@ SuperNerdScript_0x186212: faceplayer loadfont writetext UnknownText_0x18626a + waitbutton closetext - loadmovesprites checkcode VAR_FACING if_equal $1, UnknownScript_0x186226 - applymovement $a, MovementData_0x186263 + applymovement BURNEDTOWERB1F_SUPER_NERD, MovementData_0x186263 jump UnknownScript_0x18622a UnknownScript_0x186226: - applymovement $a, MovementData_0x18625c + applymovement BURNEDTOWERB1F_SUPER_NERD, MovementData_0x18625c UnknownScript_0x18622a: - disappear $a + disappear BURNEDTOWERB1F_SUPER_NERD playsound SFX_EXIT_BUILDING - waitbutton + waitsfx end ItemFragment_0x186231: diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 35ca2971f..4ede9fb73 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -1,3 +1,10 @@ +const_value set 2 + const CELADONCAFE_SUPER_NERD + const CELADONCAFE_FISHER1 + const CELADONCAFE_FISHER2 + const CELADONCAFE_FISHER3 + const CELADONCAFE_TEACHER + CeladonCafe_MapScriptHeader: .MapTriggers: db 0 @@ -9,47 +16,47 @@ SuperNerdScript_0x73049: faceplayer loadfont writetext UnknownText_0x730de + waitbutton closetext - loadmovesprites end FisherScript_0x73051: loadfont writetext UnknownText_0x73129 + waitbutton closetext - loadmovesprites faceplayer loadfont writetext UnknownText_0x7313a + waitbutton closetext - loadmovesprites - spriteface $3, LEFT + spriteface CELADONCAFE_FISHER1, LEFT end FisherScript_0x73062: loadfont writetext UnknownText_0x7316a + waitbutton closetext - loadmovesprites faceplayer loadfont writetext UnknownText_0x73178 + waitbutton closetext - loadmovesprites - spriteface $4, RIGHT + spriteface CELADONCAFE_FISHER2, RIGHT end FisherScript_0x73073: loadfont writetext UnknownText_0x731ae + waitbutton closetext - loadmovesprites faceplayer loadfont writetext UnknownText_0x731bd + waitbutton closetext - loadmovesprites - spriteface $5, RIGHT + spriteface CELADONCAFE_FISHER3, RIGHT end TeacherScript_0x73084: @@ -57,27 +64,27 @@ TeacherScript_0x73084: iftrue UnknownScript_0x7309a loadfont writetext UnknownText_0x73201 + waitbutton closetext - loadmovesprites faceplayer loadfont writetext UnknownText_0x73212 + waitbutton closetext - loadmovesprites - spriteface $6, LEFT + spriteface CELADONCAFE_TEACHER, LEFT end UnknownScript_0x7309a: loadfont writetext UnknownText_0x73254 + waitbutton closetext - loadmovesprites - spriteface $6, RIGHT + spriteface CELADONCAFE_TEACHER, RIGHT loadfont writetext UnknownText_0x73278 + waitbutton closetext - loadmovesprites - spriteface $6, LEFT + spriteface CELADONCAFE_TEACHER, LEFT end EatathonContestPoster: @@ -92,9 +99,9 @@ CeladonCafeTrashcan: itemtotext LEFTOVERS, $0 writetext FoundLeftoversText playsound SFX_ITEM - waitbutton + waitsfx itemnotify - loadmovesprites + closetext setevent EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE end @@ -104,8 +111,8 @@ CeladonCafeTrashcan: writetext FoundLeftoversText keeptextopen writetext NoRoomForLeftoversText + waitbutton closetext - loadmovesprites end .TrashEmpty diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index d2c29fe1c..7cac82748 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -1,3 +1,14 @@ +const_value set 2 + const CELADONCITY_FISHER + const CELADONCITY_POLIWAG + const CELADONCITY_TEACHER1 + const CELADONCITY_GRAMPS1 + const CELADONCITY_GRAMPS2 + const CELADONCITY_YOUNGSTER1 + const CELADONCITY_YOUNGSTER2 + const CELADONCITY_TEACHER2 + const CELADONCITY_LASS + CeladonCity_MapScriptHeader: .MapTriggers: db 0 @@ -19,8 +30,8 @@ CeladonCityPoliwrath: loadfont writetext CeladonCityPoliwrathText cry POLIWRATH + waitbutton closetext - loadmovesprites end TeacherScript_0x1a9f50: diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 6b307b91c..0abf50524 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const CELADONDEPTSTORE1F_RECEPTIONIST + const CELADONDEPTSTORE1F_GENTLEMAN + const CELADONDEPTSTORE1F_TEACHER + CeladonDeptStore1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index 6ce11883f..67f3fc001 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const CELADONDEPTSTORE2F_CLERK1 + const CELADONDEPTSTORE2F_CLERK2 + const CELADONDEPTSTORE2F_POKEFAN_M + const CELADONDEPTSTORE2F_YOUNGSTER + CeladonDeptStore2F_MapScriptHeader: .MapTriggers: db 0 @@ -9,14 +15,14 @@ ClerkScript_0x70bad: faceplayer loadfont pokemart MARTTYPE_STANDARD, MART_CELADON_2F_1 - loadmovesprites + closetext end ClerkScript_0x70bb5: faceplayer loadfont pokemart MARTTYPE_STANDARD, MART_CELADON_2F_2 - loadmovesprites + closetext end PokefanMScript_0x70bbd: diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 4d0d4dfe0..6aee16254 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const CELADONDEPTSTORE3F_CLERK + const CELADONDEPTSTORE3F_YOUNGSTER + const CELADONDEPTSTORE3F_GAMEBOY_KID1 + const CELADONDEPTSTORE3F_GAMEBOY_KID2 + const CELADONDEPTSTORE3F_SUPER_NERD + CeladonDeptStore3F_MapScriptHeader: .MapTriggers: db 0 @@ -9,7 +16,7 @@ ClerkScript_0x70d29: faceplayer loadfont pokemart MARTTYPE_STANDARD, MART_CELADON_3F - loadmovesprites + closetext end YoungsterScript_0x70d31: @@ -19,18 +26,18 @@ GameboyKidScript_0x70d34: faceplayer loadfont writetext UnknownText_0x70d86 + waitbutton closetext - loadmovesprites - spriteface $4, DOWN + spriteface CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN end GameboyKidScript_0x70d3f: faceplayer loadfont writetext UnknownText_0x70dc7 + waitbutton closetext - loadmovesprites - spriteface $5, DOWN + spriteface CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN end SuperNerdScript_0x70d4a: diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index 27eaa7352..e4b829732 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const CELADONDEPTSTORE4F_CLERK + const CELADONDEPTSTORE4F_SUPER_NERD + const CELADONDEPTSTORE4F_YOUNGSTER + CeladonDeptStore4F_MapScriptHeader: .MapTriggers: db 0 @@ -9,7 +14,7 @@ ClerkScript_0x70f0d: faceplayer loadfont pokemart MARTTYPE_STANDARD, MART_CELADON_4F - loadmovesprites + closetext end SuperNerdScript_0x70f15: diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index fcd7ff7ff..c67a50dd9 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const CELADONDEPTSTORE5F_CLERK1 + const CELADONDEPTSTORE5F_CLERK2 + const CELADONDEPTSTORE5F_GENTLEMAN + const CELADONDEPTSTORE5F_SAILOR + const CELADONDEPTSTORE5F_TEACHER + CeladonDeptStore5F_MapScriptHeader: .MapTriggers: db 0 @@ -9,14 +16,14 @@ ClerkScript_0x71004: faceplayer loadfont pokemart MARTTYPE_STANDARD, MART_CELADON_5F_1 - loadmovesprites + closetext end ClerkScript_0x7100c: faceplayer loadfont pokemart MARTTYPE_STANDARD, MART_CELADON_5F_2 - loadmovesprites + closetext end GentlemanScript_0x71014: diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 25f92be00..8e68a527d 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -1,3 +1,7 @@ +const_value set 2 + const CELADONDEPTSTORE6F_SUPER_NERD + const CELADONDEPTSTORE6F_YOUNGSTER + CeladonDeptStore6F_MapScriptHeader: .MapTriggers: db 0 @@ -30,7 +34,7 @@ CeladonVendingMachine: if_equal $1, .FreshWater if_equal $2, .SodaPop if_equal $3, .Lemonade - loadmovesprites + closetext end .FreshWater @@ -70,12 +74,12 @@ CeladonVendingMachine: .NotEnoughMoney writetext CeladonVendingNoMoneyText - closetext + waitbutton jump .Start .NotEnoughSpace writetext CeladonVendingNoSpaceText - closetext + waitbutton jump .Start .MenuData diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index dd620a13d..bec3bdb9d 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -1,3 +1,5 @@ +const_value set 2 + CeladonDeptStoreElevator_MapScriptHeader: .MapTriggers: db 0 @@ -8,12 +10,12 @@ CeladonDeptStoreElevator_MapScriptHeader: MapCeladonDeptStoreElevatorSignpost0Script: loadfont elevator Elevator_0x713be - loadmovesprites + closetext iffalse UnknownScript_0x713bd pause 5 playsound SFX_ELEVATOR earthquake 60 - waitbutton + waitsfx UnknownScript_0x713bd: end diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index ef644dcd4..895483c34 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -1,3 +1,14 @@ +const_value set 2 + const CELADONGAMECORNER_CLERK + const CELADONGAMECORNER_RECEPTIONIST + const CELADONGAMECORNER_POKEFAN_M + const CELADONGAMECORNER_TEACHER + const CELADONGAMECORNER_FISHING_GURU + const CELADONGAMECORNER_FISHER1 + const CELADONGAMECORNER_FISHER2 + const CELADONGAMECORNER_GYM_GUY + const CELADONGAMECORNER_GRAMPS + CeladonGameCorner_MapScriptHeader: .MapTriggers: db 0 @@ -15,27 +26,27 @@ PokefanMScript_0x72123: faceplayer loadfont writetext UnknownText_0x72215 + waitbutton closetext - loadmovesprites - spriteface $4, LEFT + spriteface CELADONGAMECORNER_POKEFAN_M, LEFT end TeacherScript_0x7212e: faceplayer loadfont writetext UnknownText_0x72242 + waitbutton closetext - loadmovesprites - spriteface $5, RIGHT + spriteface CELADONGAMECORNER_TEACHER, RIGHT end FishingGuruScript_0x72139: faceplayer loadfont writetext UnknownText_0x72295 + waitbutton closetext - loadmovesprites - spriteface $6, RIGHT + spriteface CELADONGAMECORNER_FISHING_GURU, RIGHT end FisherScript_0x72144: @@ -55,8 +66,8 @@ FisherScript_0x72144: setevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON .UnknownScript_0x72169 writetext UnknownText_0x72345 + waitbutton closetext - loadmovesprites spriteface LAST_TALKED, LEFT end @@ -69,15 +80,15 @@ FisherScript_0x72144: UnknownScript_0x7217b: writetext UnknownText_0x7238a + waitbutton closetext - loadmovesprites spriteface LAST_TALKED, LEFT end UnknownScript_0x72184: writetext UnknownText_0x723d9 + waitbutton closetext - loadmovesprites spriteface LAST_TALKED, LEFT end @@ -88,9 +99,9 @@ GrampsScript_0x72190: faceplayer loadfont writetext UnknownText_0x724ad + waitbutton closetext - loadmovesprites - spriteface $a, LEFT + spriteface CELADONGAMECORNER_GRAMPS, LEFT end MapCeladonGameCornerSignpost36Script: @@ -105,20 +116,20 @@ MapCeladonGameCornerSignpost35Script: refreshscreen $0 writebyte $0 special Special_SlotMachine - loadmovesprites + closetext end MapCeladonGameCornerSignpost16Script: refreshscreen $0 writebyte $1 special Special_SlotMachine - loadmovesprites + closetext end MapCeladonGameCornerSignpost11Script: refreshscreen $0 special Special_CardFlip - loadmovesprites + closetext end MapCeladonGameCornerSignpost32Script: @@ -127,9 +138,9 @@ MapCeladonGameCornerSignpost32Script: MapCeladonGameCornerSignpost9Script: loadfont writetext UnknownText_0x72567 - closetext + waitbutton special Special_CardFlip - loadmovesprites + closetext end MovementData_0x721cd: diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 004b60810..603fcec78 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -1,3 +1,7 @@ +const_value set 2 + const CELADONGAMECORNERPRIZEROOM_GENTLEMAN + const CELADONGAMECORNERPRIZEROOM_PHARMACIST + CeladonGameCornerPrizeRoom_MapScriptHeader: .MapTriggers: db 0 @@ -15,7 +19,7 @@ MapCeladonGameCornerPrizeRoomSignpost0Script: faceplayer loadfont writetext UnknownText_0x7293e - closetext + waitbutton checkitem COIN_CASE iffalse CeladonPrizeRoom_NoCoinCase writetext UnknownText_0x72974 @@ -68,34 +72,34 @@ CeladonPrizeRoom_askbuy: end CeladonPrizeRoom_purchased: - waitbutton + waitsfx playsound SFX_TRANSACTION writetext UnknownText_0x729ad - closetext + waitbutton jump CeladonPrizeRoom_tmcounterloop CeladonPrizeRoom_notenoughcoins: writetext UnknownText_0x729bb + waitbutton closetext - loadmovesprites end CeladonPrizeRoom_notenoughroom: writetext UnknownText_0x729d8 + waitbutton closetext - loadmovesprites end CeladonPrizeRoom_cancel: writetext UnknownText_0x729f2 + waitbutton closetext - loadmovesprites end CeladonPrizeRoom_NoCoinCase: writetext UnknownText_0x72a14 + waitbutton closetext - loadmovesprites end @@ -119,7 +123,7 @@ MapCeladonGameCornerPrizeRoomSignpost1Script: faceplayer loadfont writetext UnknownText_0x7293e - closetext + waitbutton checkitem COIN_CASE iffalse CeladonPrizeRoom_NoCoinCase .loop: @@ -141,10 +145,10 @@ MapCeladonGameCornerPrizeRoomSignpost1Script: pokenamemem PIKACHU, $0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel - waitbutton + waitsfx playsound SFX_TRANSACTION writetext UnknownText_0x729ad - closetext + waitbutton writebyte PIKACHU special Special_GameCornerPrizeMonCheckDex givepoke PIKACHU, 25 @@ -159,10 +163,10 @@ MapCeladonGameCornerPrizeRoomSignpost1Script: pokenamemem PORYGON, $0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel - waitbutton + waitsfx playsound SFX_TRANSACTION writetext UnknownText_0x729ad - closetext + waitbutton writebyte PORYGON special Special_GameCornerPrizeMonCheckDex givepoke PORYGON, 15 @@ -177,10 +181,10 @@ MapCeladonGameCornerPrizeRoomSignpost1Script: pokenamemem LARVITAR, $0 scall CeladonPrizeRoom_askbuy iffalse CeladonPrizeRoom_cancel - waitbutton + waitsfx playsound SFX_TRANSACTION writetext UnknownText_0x729ad - closetext + waitbutton writebyte LARVITAR special Special_GameCornerPrizeMonCheckDex givepoke LARVITAR, 40 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 5e17aed09..b14acf60a 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -1,3 +1,11 @@ +const_value set 2 + const CELADONGYM_ERIKA + const CELADONGYM_LASS1 + const CELADONGYM_LASS2 + const CELADONGYM_BUENA + const CELADONGYM_TWIN1 + const CELADONGYM_TWIN2 + CeladonGym_MapScriptHeader: .MapTriggers: db 0 @@ -11,10 +19,10 @@ ErikaScript_0x72a6a: checkflag ENGINE_RAINBOWBADGE iftrue .FightDone writetext UnknownText_0x72b28 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x72c3e, 0 - loadtrainer ERIKA, 1 + scriptedtrainerdata ERIKA, 1 startbattle returnafterbattle setevent EVENT_BEAT_ERIKA @@ -25,7 +33,7 @@ ErikaScript_0x72a6a: loadfont writetext UnknownText_0x72c96 playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_RAINBOWBADGE .FightDone checkevent EVENT_GOT_TM19_GIGA_DRAIN @@ -37,63 +45,63 @@ ErikaScript_0x72a6a: setevent EVENT_GOT_TM19_GIGA_DRAIN UnknownScript_0x72aae: writetext UnknownText_0x72d8f + waitbutton closetext - loadmovesprites end TrainerLassMichelle: trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, LassMichelleScript LassMichelleScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x72e30 + waitbutton closetext - loadmovesprites end TrainerPicnickerTanya: trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, PicnickerTanyaScript PicnickerTanyaScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x72e8e + waitbutton closetext - loadmovesprites end TrainerBeautyJulia: trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, BeautyJuliaScript BeautyJuliaScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x72f01 + waitbutton closetext - loadmovesprites end TrainerTwinsJoandzoe1: trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, TwinsJoandzoe1Script TwinsJoandzoe1Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x72f70 + waitbutton closetext - loadmovesprites end TrainerTwinsJoandzoe2: trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, TwinsJoandzoe2Script TwinsJoandzoe2Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x72fc0 + waitbutton closetext - loadmovesprites end CeladonGymStatue: diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index e90f167bd..f3ccc6b53 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const CELADONMANSION1F_GRANNY + const CELADONMANSION1F_GROWLITHE1 + const CELADONMANSION1F_CLEFAIRY + const CELADONMANSION1F_GROWLITHE2 + CeladonMansion1F_MapScriptHeader: .MapTriggers: db 0 @@ -12,24 +18,24 @@ CeladonMansion1FMeowth: loadfont writetext CeladonMansion1FMeowthText cry MEOWTH + waitbutton closetext - loadmovesprites end CeladonMansion1FClefairy: loadfont writetext CeladonMansion1FClefairyText cry CLEFAIRY + waitbutton closetext - loadmovesprites end CeladonMansion1FNidoranF: loadfont writetext CeladonMansion1FNidoranFText cry NIDORAN_F + waitbutton closetext - loadmovesprites end CeladonMansionManagersSuiteSign: diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index fbe54d617..487295c34 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -1,3 +1,5 @@ +const_value set 2 + CeladonMansion2F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 575137bc6..fae98f99b 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const CELADONMANSION3F_COOLTRAINER_M + const CELADONMANSION3F_GYM_GUY + const CELADONMANSION3F_SUPER_NERD + const CELADONMANSION3F_FISHER + CeladonMansion3F_MapScriptHeader: .MapTriggers: db 0 @@ -11,21 +17,21 @@ CooltrainerMScript_0x71670: writetext UnknownText_0x716ce checkcode VAR_DEXCAUGHT if_greater_than 248, UnknownScript_0x7167e + waitbutton closetext - loadmovesprites end UnknownScript_0x7167e: keeptextopen writetext UnknownText_0x71725 playsound SFX_DEX_FANFARE_230_PLUS - waitbutton + waitsfx writetext UnknownText_0x71760 keeptextopen special Diploma writetext UnknownText_0x71763 + waitbutton closetext - loadmovesprites setevent EVENT_ENABLE_DIPLOMA_PRINTING end @@ -35,8 +41,8 @@ GymGuyScript_0x71696: checkevent EVENT_ENABLE_DIPLOMA_PRINTING iftrue UnknownScript_0x716a4 writetext UnknownText_0x717b4 + waitbutton closetext - loadmovesprites end UnknownScript_0x716a4: @@ -44,19 +50,19 @@ UnknownScript_0x716a4: yesorno iffalse UnknownScript_0x716b0 special PrintDiploma - loadmovesprites + closetext end UnknownScript_0x716b0: writetext UnknownText_0x71830 + waitbutton closetext - loadmovesprites end UnknownScript_0x716b6: writetext UnknownText_0x71863 + waitbutton closetext - loadmovesprites end SuperNerdScript_0x716bc: diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index 748f6012e..3ea8d275b 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -1,3 +1,6 @@ +const_value set 2 + const CELADONMANSIONROOF_FISHER + CeladonMansionRoof_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index c7d453fbb..f1d0bfac6 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const CELADONMANSIONROOFHOUSE_PHARMACIST + CeladonMansionRoofHouse_MapScriptHeader: .MapTriggers: db 0 @@ -15,8 +18,8 @@ PharmacistScript_0x71afd: checknite iftrue UnknownScript_0x71b14 writetext UnknownText_0x71b4a + waitbutton closetext - loadmovesprites end UnknownScript_0x71b14: @@ -27,9 +30,9 @@ UnknownScript_0x71b14: setevent EVENT_GOT_TM03_CURSE UnknownScript_0x71b21: writetext UnknownText_0x71db3 - closetext + waitbutton UnknownScript_0x71b25: - loadmovesprites + closetext end UnknownText_0x71b27: diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokeCenter1F.asm index baf108b09..4197b3925 100644 --- a/maps/CeladonPokeCenter1F.asm +++ b/maps/CeladonPokeCenter1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const CELADONPOKECENTER1F_NURSE + const CELADONPOKECENTER1F_GENTLEMAN + const CELADONPOKECENTER1F_PHARMACIST + const CELADONPOKECENTER1F_COOLTRAINER_F + const CELADONPOKECENTER1F_SUPER_NERD + CeladonPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -28,26 +35,26 @@ SuperNerdScript_0x71e2e: special SpecialBeastsCheck iftrue UnknownScript_0x71e48 writetext UnknownText_0x7201a - closetext + waitbutton UnknownScript_0x71e46: - loadmovesprites + closetext end UnknownScript_0x71e48: writetext UnknownText_0x71f65 + waitbutton closetext - loadmovesprites checkcode VAR_FACING if_equal $1, UnknownScript_0x71e5a - applymovement $6, MovementData_0x71e6b + applymovement CELADONPOKECENTER1F_SUPER_NERD, MovementData_0x71e6b jump UnknownScript_0x71e5e UnknownScript_0x71e5a: - applymovement $6, MovementData_0x71e65 + applymovement CELADONPOKECENTER1F_SUPER_NERD, MovementData_0x71e65 UnknownScript_0x71e5e: - disappear $6 + disappear CELADONPOKECENTER1F_SUPER_NERD playsound SFX_EXIT_BUILDING - waitbutton + waitsfx end MovementData_0x71e65: diff --git a/maps/CeladonPokeCenter2FBeta.asm b/maps/CeladonPokeCenter2FBeta.asm index 9c8d25332..9081ce119 100644 --- a/maps/CeladonPokeCenter2FBeta.asm +++ b/maps/CeladonPokeCenter2FBeta.asm @@ -1,3 +1,5 @@ +const_value set 2 + CeladonPokeCenter2FBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 969f2ca34..7f33b5dee 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -1,3 +1,11 @@ +const_value set 2 + const CERULEANCITY_COOLTRAINER_M + const CERULEANCITY_SUPER_NERD + const CERULEANCITY_SLOWPOKE + const CERULEANCITY_COOLTRAINER_F + const CERULEANCITY_FISHER + const CERULEANCITY_YOUNGSTER + CeruleanCity_MapScriptHeader: .MapTriggers: db 0 @@ -18,14 +26,14 @@ CooltrainerMScript_0x184009: checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x184017 writetext UnknownText_0x1840bc + waitbutton closetext - loadmovesprites end UnknownScript_0x184017: writetext UnknownText_0x184144 + waitbutton closetext - loadmovesprites end SuperNerdScript_0x18401d: @@ -35,30 +43,30 @@ CeruleanCitySlowbro: loadfont writetext CeruleanCitySlowbroText cry SLOWBRO + waitbutton closetext - loadmovesprites end CooltrainerFScript_0x18402a: faceplayer loadfont writetext UnknownText_0x1841fa + waitbutton closetext - loadmovesprites - spriteface $5, LEFT + spriteface CERULEANCITY_COOLTRAINER_F, LEFT loadfont writetext UnknownText_0x184229 + waitbutton closetext - loadmovesprites loadfont writetext CeruleanCitySlowbroText cry SLOWBRO + waitbutton closetext - loadmovesprites loadfont writetext UnknownText_0x18424b + waitbutton closetext - loadmovesprites end FisherScript_0x18404a: @@ -70,50 +78,50 @@ FisherScript_0x18404a: iftrue UnknownScript_0x18405e UnknownScript_0x184058: writetext UnknownText_0x18424e + waitbutton closetext - loadmovesprites end UnknownScript_0x18405e: writetext UnknownText_0x184275 + waitbutton closetext - loadmovesprites end YoungsterScript_0x184064: faceplayer loadfont writetext UnknownText_0x1842a9 + waitbutton closetext - loadmovesprites checkevent EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY iffalse UnknownScript_0x184072 end UnknownScript_0x184072: - waitbutton + waitsfx playsound SFX_SECOND_PART_OF_ITEMFINDER - waitbutton + waitsfx playsound SFX_TRANSACTION - waitbutton + waitsfx playsound SFX_SECOND_PART_OF_ITEMFINDER - waitbutton + waitsfx playsound SFX_TRANSACTION - waitbutton + waitsfx playsound SFX_SECOND_PART_OF_ITEMFINDER - waitbutton + waitsfx playsound SFX_TRANSACTION - waitbutton + waitsfx playsound SFX_SECOND_PART_OF_ITEMFINDER - waitbutton + waitsfx playsound SFX_TRANSACTION - waitbutton - showemote EMOTE_SHOCK, $7, 15 - spriteface $7, LEFT + waitsfx + showemote EMOTE_SHOCK, CERULEANCITY_YOUNGSTER, 15 + spriteface CERULEANCITY_YOUNGSTER, LEFT loadfont writetext UnknownText_0x1842ee + waitbutton closetext - loadmovesprites end CeruleanCitySign: diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index a15eeb496..f08302a71 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -1,3 +1,11 @@ +const_value set 2 + const CERULEANGYM_ROCKET + const CERULEANGYM_MISTY + const CERULEANGYM_SWIMMER_GIRL1 + const CERULEANGYM_SWIMMER_GIRL2 + const CERULEANGYM_SWIMMER_GUY + const CERULEANGYM_GYM_GUY + CeruleanGym_MapScriptHeader: .MapTriggers: db 2 @@ -17,35 +25,35 @@ UnknownScript_0x1883da: end UnknownScript_0x1883de: - applymovement $2, MovementData_0x1884e3 + applymovement CERULEANGYM_ROCKET, MovementData_0x1884e3 playsound SFX_TACKLE - applymovement $2, MovementData_0x1884eb + applymovement CERULEANGYM_ROCKET, MovementData_0x1884eb playmusic MUSIC_ROCKET_ENCOUNTER loadfont writetext UnknownText_0x1884fb + waitbutton closetext - loadmovesprites - showemote EMOTE_SHOCK, $2, 15 - applymovement $2, MovementData_0x1884f7 + showemote EMOTE_SHOCK, CERULEANGYM_ROCKET, 15 + applymovement CERULEANGYM_ROCKET, MovementData_0x1884f7 loadfont writetext UnknownText_0x188574 + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x1884f5 + applymovement CERULEANGYM_ROCKET, MovementData_0x1884f5 loadfont writetext UnknownText_0x1885a5 + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x1884e8 + applymovement CERULEANGYM_ROCKET, MovementData_0x1884e8 playsound SFX_EXIT_BUILDING - disappear $2 + disappear CERULEANGYM_ROCKET setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM clearevent EVENT_ROUTE_24_ROCKET clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND dotrigger $0 domaptrigger ROUTE_25, $1 domaptrigger POWER_PLANT, $0 - waitbutton + waitsfx special RestartMapMusic pause 15 spriteface PLAYER, DOWN @@ -58,10 +66,10 @@ MistyScript_0x188432: checkflag ENGINE_CASCADEBADGE iftrue .FightDone writetext UnknownText_0x188674 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x18870c, 0 - loadtrainer MISTY, 1 + scriptedtrainerdata MISTY, 1 startbattle returnafterbattle setevent EVENT_BEAT_MISTY @@ -71,45 +79,45 @@ MistyScript_0x188432: loadfont writetext UnknownText_0x188768 playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_CASCADEBADGE .FightDone writetext UnknownText_0x188782 + waitbutton closetext - loadmovesprites end TrainerSwimmerfDiana: trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, SwimmerfDianaScript SwimmerfDianaScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x188856 + waitbutton closetext - loadmovesprites end TrainerSwimmerfBriana: trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, SwimmerfBrianaScript SwimmerfBrianaScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1888c0 + waitbutton closetext - loadmovesprites end TrainerSwimmermParker: trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, SwimmermParkerScript SwimmermParkerScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x188943 + waitbutton closetext - loadmovesprites end CeruleanGymGuyScript: @@ -118,14 +126,14 @@ CeruleanGymGuyScript: checkevent EVENT_BEAT_MISTY iftrue .CeruleanGymGuyWinScript writetext CeruleanGymGuyText + waitbutton closetext - loadmovesprites end .CeruleanGymGuyWinScript writetext CeruleanGymGuyWinText + waitbutton closetext - loadmovesprites end MapCeruleanGymSignpostItem0: @@ -137,8 +145,8 @@ CeruleanGymStatue1: iffalse CeruleanGymStatue loadfont writetext CeruleanGymNote1 + waitbutton closetext - loadmovesprites end CeruleanGymStatue2: @@ -146,8 +154,8 @@ CeruleanGymStatue2: iffalse CeruleanGymStatue loadfont writetext CeruleanGymNote2 + waitbutton closetext - loadmovesprites end CeruleanGymStatue: diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index ef5ceb76b..c6cdd60ac 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M + CeruleanGymBadgeSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index b2ec0ad79..37d9a1db6 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const CERULEANMART_CLERK + const CERULEANMART_COOLTRAINER_M + const CERULEANMART_COOLTRAINER_F + CeruleanMart_MapScriptHeader: .MapTriggers: db 0 @@ -8,7 +13,7 @@ CeruleanMart_MapScriptHeader: ClerkScript_0x188ac0: loadfont pokemart MARTTYPE_STANDARD, MART_CERULEAN - loadmovesprites + closetext end CooltrainerMScript_0x188ac7: diff --git a/maps/CeruleanPokeCenter1F.asm b/maps/CeruleanPokeCenter1F.asm index 8a04b43cb..0e3aac84a 100644 --- a/maps/CeruleanPokeCenter1F.asm +++ b/maps/CeruleanPokeCenter1F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const CERULEANPOKECENTER1F_NURSE + const CERULEANPOKECENTER1F_SUPER_NERD + const CERULEANPOKECENTER1F_GYM_GUY + CeruleanPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/CeruleanPokeCenter2FBeta.asm b/maps/CeruleanPokeCenter2FBeta.asm index 4479a484f..8aa260b47 100644 --- a/maps/CeruleanPokeCenter2FBeta.asm +++ b/maps/CeruleanPokeCenter2FBeta.asm @@ -1,3 +1,5 @@ +const_value set 2 + CeruleanPokeCenter2FBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index 4440aa322..cedc9ea74 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -1,3 +1,8 @@ +const_value set 2 + const CERULEANPOLICESTATION_FISHING_GURU + const CERULEANPOLICESTATION_POKEFAN_F + const CERULEANPOLICESTATION_DIGLETT + CeruleanPoliceStation_MapScriptHeader: .MapTriggers: db 0 @@ -15,8 +20,8 @@ DiglettScript_0x188050: loadfont writetext UnknownText_0x1880e7 cry DIGLETT + waitbutton closetext - loadmovesprites end UnknownText_0x18805a: diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 15fdd9320..7124abb64 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -1,3 +1,9 @@ +const_value set 2 + const CERULEANTRADESPEECHHOUSE_GRANNY + const CERULEANTRADESPEECHHOUSE_GRAMPS + const CERULEANTRADESPEECHHOUSE_RHYDON + const CERULEANTRADESPEECHHOUSE_ZUBAT + CeruleanTradeSpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -15,16 +21,16 @@ RhydonScript_0x188139: loadfont writetext UnknownText_0x18819c cry KANGASKHAN + waitbutton closetext - loadmovesprites end ZubatScript_0x188143: loadfont writetext UnknownText_0x1881b5 cry ZUBAT + waitbutton closetext - loadmovesprites end UnknownText_0x18814d: diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 3c4ee42cf..d1561a5c0 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -1,3 +1,8 @@ +const_value set 2 + const CHARCOALKILN_BLACK_BELT + const CHARCOALKILN_YOUNGSTER + const CHARCOALKILN_MOLTRES + CharcoalKiln_MapScriptHeader: .MapTriggers: db 0 @@ -13,20 +18,20 @@ CharcoalKilnBoss: checkevent EVENT_CLEARED_SLOWPOKE_WELL iftrue .SavedSlowpoke writetext CharcoalKilnBossText1 + waitbutton closetext - loadmovesprites end .SavedSlowpoke writetext CharcoalKilnBossText2 + waitbutton closetext - loadmovesprites end .GotCut writetext CharcoalKilnBossText3 + waitbutton closetext - loadmovesprites end CharcoalKilnApprentice: @@ -37,8 +42,8 @@ CharcoalKilnApprentice: checkevent EVENT_GOT_HM01_CUT iftrue .Thanks writetext CharcoalKilnApprenticeText1 + waitbutton closetext - loadmovesprites end .Thanks @@ -47,14 +52,14 @@ CharcoalKilnApprentice: verbosegiveitem CHARCOAL iffalse .Done setevent EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN - loadmovesprites + closetext end .YoureTheCoolest writetext CharcoalKilnApprenticeText3 - closetext + waitbutton .Done - loadmovesprites + closetext end CharcoalKilnFarfetchd: @@ -62,8 +67,8 @@ CharcoalKilnFarfetchd: loadfont writetext FarfetchdText cry FARFETCH_D + waitbutton closetext - loadmovesprites end CharcoalKilnBookshelf: diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 8ae9a329c..4acdb07de 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -1,3 +1,10 @@ +const_value set 2 + const CHERRYGROVECITY_GRAMPS + const CHERRYGROVECITY_SILVER + const CHERRYGROVECITY_TEACHER + const CHERRYGROVECITY_YOUNGSTER + const CHERRYGROVECITY_FISHER + CherrygroveCity_MapScriptHeader: .MapTriggers: db 2 @@ -31,37 +38,37 @@ CherrygroveCityGuideGent: jump .Yes .Yes writetext GuideGentTourText1 + waitbutton closetext - loadmovesprites playmusic MUSIC_SHOW_ME_AROUND - follow $2, PLAYER - applymovement $2, MovementData_0x19c195 + follow CHERRYGROVECITY_GRAMPS, PLAYER + applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c195 loadfont writetext GuideGentPokeCenterText + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x19c19b + applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c19b spriteface PLAYER, UP loadfont writetext GuideGentMartText + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x19c1a3 + applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c1a3 spriteface PLAYER, UP loadfont writetext GuideGentRoute30Text + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x19c1ac + applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c1ac spriteface PLAYER, LEFT loadfont writetext GuideGentSeaText + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x19c1b6 + applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c1b6 spriteface PLAYER, UP pause 60 - spriteface $2, LEFT + spriteface CHERRYGROVECITY_GRAMPS, LEFT spriteface PLAYER, RIGHT loadfont writetext GuideGentGiftText @@ -72,16 +79,16 @@ CherrygroveCityGuideGent: writetext GotMapCardText keeptextopen writetext GuideGentPokegearText + waitbutton closetext - loadmovesprites stopfollow special RestartMapMusic spriteface PLAYER, UP - applymovement $2, MovementData_0x19c1cb + applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c1cb playsound SFX_ENTER_DOOR - disappear $2 + disappear CHERRYGROVECITY_GRAMPS clearevent EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE - waitbutton + waitsfx end .UnknownScript_0x19c097 @@ -93,33 +100,33 @@ CherrygroveCityGuideGent: .No writetext GuideGentNoText + waitbutton closetext - loadmovesprites end UnknownScript_0x19c0aa: - moveperson $3, $27, $7 + moveperson CHERRYGROVECITY_SILVER, $27, $7 UnknownScript_0x19c0ae: spriteface PLAYER, RIGHT showemote EMOTE_SHOCK, PLAYER, 15 special Special_RotatePalettesRightMusic pause 15 - appear $3 - applymovement $3, MovementData_0x19c1ce + appear CHERRYGROVECITY_SILVER + applymovement CHERRYGROVECITY_SILVER, MovementData_0x19c1ce spriteface PLAYER, RIGHT playmusic MUSIC_RIVAL_ENCOUNTER loadfont writetext UnknownText_0x19c4e2 + waitbutton closetext - loadmovesprites checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x19c0ee checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x19c104 winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6 setlasttalked $3 - loadtrainer RIVAL1, RIVAL1_3 + scriptedtrainerdata RIVAL1, RIVAL1_3 writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE startbattle reloadmapmusic @@ -130,7 +137,7 @@ UnknownScript_0x19c0ae: UnknownScript_0x19c0ee: winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6 setlasttalked $3 - loadtrainer RIVAL1, RIVAL1_1 + scriptedtrainerdata RIVAL1, RIVAL1_1 writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE startbattle reloadmapmusic @@ -141,7 +148,7 @@ UnknownScript_0x19c0ee: UnknownScript_0x19c104: winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6 setlasttalked $3 - loadtrainer RIVAL1, RIVAL1_2 + scriptedtrainerdata RIVAL1, RIVAL1_2 writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE startbattle reloadmapmusic @@ -153,22 +160,22 @@ UnknownScript_0x19c11a: playmusic MUSIC_RIVAL_AFTER loadfont writetext UnknownText_0x19c608 + waitbutton closetext - loadmovesprites jump UnknownScript_0x19c12f UnknownScript_0x19c126: playmusic MUSIC_RIVAL_AFTER loadfont writetext UnknownText_0x19c59e + waitbutton closetext - loadmovesprites UnknownScript_0x19c12f: playsound SFX_TACKLE applymovement PLAYER, MovementData_0x19c1d4 spriteface PLAYER, LEFT - applymovement $3, MovementData_0x19c1da - disappear $3 + applymovement CHERRYGROVECITY_SILVER, MovementData_0x19c1da + disappear CHERRYGROVECITY_SILVER dotrigger $0 special HealParty playmapmusic @@ -180,14 +187,14 @@ TeacherScript_0x19c146: checkflag ENGINE_MAP_CARD iftrue UnknownScript_0x19c154 writetext UnknownText_0x19c650 + waitbutton closetext - loadmovesprites end UnknownScript_0x19c154: writetext UnknownText_0x19c6a8 + waitbutton closetext - loadmovesprites end YoungsterScript_0x19c15a: @@ -196,14 +203,14 @@ YoungsterScript_0x19c15a: checkflag ENGINE_POKEDEX iftrue UnknownScript_0x19c168 writetext UnknownText_0x19c6d6 + waitbutton closetext - loadmovesprites end UnknownScript_0x19c168: writetext UnknownText_0x19c701 + waitbutton closetext - loadmovesprites end MysticWaterGuy: @@ -218,9 +225,9 @@ MysticWaterGuy: setevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE UnknownScript_0x19c183: writetext UnknownText_0x19c7c1 - closetext + waitbutton UnknownScript_0x19c187: - loadmovesprites + closetext end CherrygroveCitySign: diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index e2a294d06..5cba6311f 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const CHERRYGROVEEVOLUTIONSPEECHHOUSE_LASS + const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER + CherrygroveEvolutionSpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -8,15 +12,15 @@ CherrygroveEvolutionSpeechHouse_MapScriptHeader: YoungsterScript_0x196cb2: loadfont writetext UnknownText_0x196cc3 + waitbutton closetext - loadmovesprites end LassScript_0x196cb9: loadfont writetext UnknownText_0x196cfc + waitbutton closetext - loadmovesprites end CherrygroveEvolutionSpeechHouseBookshelf: diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index 64c841b7e..c556d8cb7 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const CHERRYGROVEGYMSPEECHHOUSE_POKEFAN_M + const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER + CherrygroveGymSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 02ccb1007..8fa56345a 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const CHERRYGROVEMART_CLERK + const CHERRYGROVEMART_COOLTRAINER_M + const CHERRYGROVEMART_YOUNGSTER + CherrygroveMart_MapScriptHeader: .MapTriggers: db 0 @@ -10,12 +15,12 @@ ClerkScript_0x19680a: checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x196817 pokemart MARTTYPE_STANDARD, MART_CHERRYGROVE - loadmovesprites + closetext end UnknownScript_0x196817: pokemart MARTTYPE_STANDARD, MART_CHERRYGROVE_DEX - loadmovesprites + closetext end CooltrainerMScript_0x19681d: @@ -24,14 +29,14 @@ CooltrainerMScript_0x19681d: checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x19682b writetext UnknownText_0x196834 + waitbutton closetext - loadmovesprites end UnknownScript_0x19682b: writetext UnknownText_0x196873 + waitbutton closetext - loadmovesprites end YoungsterScript_0x196831: diff --git a/maps/CherrygrovePokeCenter1F.asm b/maps/CherrygrovePokeCenter1F.asm index 51b5c74af..7e22774ed 100644 --- a/maps/CherrygrovePokeCenter1F.asm +++ b/maps/CherrygrovePokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const CHERRYGROVEPOKECENTER1F_NURSE + const CHERRYGROVEPOKECENTER1F_FISHER + const CHERRYGROVEPOKECENTER1F_GENTLEMAN + const CHERRYGROVEPOKECENTER1F_TEACHER + CherrygrovePokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -20,14 +26,14 @@ TeacherScript_0x196976: checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x196984 writetext UnknownText_0x1969f1 + waitbutton closetext - loadmovesprites end UnknownScript_0x196984: writetext UnknownText_0x196a46 + waitbutton closetext - loadmovesprites end UnknownText_0x19698a: diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 6bb1daada..e52c7aa58 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -1,3 +1,17 @@ +const_value set 2 + const CIANWOODCITY_STANDING_YOUNGSTER + const CIANWOODCITY_POKEFAN_M + const CIANWOODCITY_LASS + const CIANWOODCITY_ROCK1 + const CIANWOODCITY_ROCK2 + const CIANWOODCITY_ROCK3 + const CIANWOODCITY_ROCK4 + const CIANWOODCITY_ROCK5 + const CIANWOODCITY_ROCK6 + const CIANWOODCITY_POKEFAN_F + const CIANWOODCITY_SUPER_NERD + const CIANWOODCITY_SUICUNE + CianwoodCity_MapScriptHeader: .MapTriggers: db 2 @@ -23,7 +37,7 @@ CianwoodCity_MapScriptHeader: setevent EVENT_EUSINE_IN_BURNED_TOWER checkevent EVENT_FOUGHT_EUSINE iffalse UnknownScript_0x1a001d - disappear $c + disappear CIANWOODCITY_SUPER_NERD UnknownScript_0x1a001d: return @@ -32,12 +46,12 @@ UnknownScript_0x1a001e: showemote EMOTE_SHOCK, PLAYER, 15 pause 15 playsound SFX_WARP_FROM - applymovement $d, MovementData_0x1a00da + applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00da spriteface PLAYER, DOWN pause 15 playsound SFX_WARP_FROM - applymovement $d, MovementData_0x1a00e0 - disappear $d + applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0 + disappear CIANWOODCITY_SUICUNE pause 10 dotrigger $0 clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42 @@ -46,25 +60,25 @@ UnknownScript_0x1a001e: iftrue .Done setevent EVENT_FOUGHT_EUSINE playmusic MUSIC_MYSTICALMAN_ENCOUNTER - appear $c - applymovement $c, MovementData_0x1a00e7 + appear CIANWOODCITY_SUPER_NERD + applymovement CIANWOODCITY_SUPER_NERD, MovementData_0x1a00e7 loadfont writetext UnknownText_0x1a0433 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x1a05a1, 0 setlasttalked $c - loadtrainer MYSTICALMAN, EUSINE + scriptedtrainerdata MYSTICALMAN, EUSINE startbattle reloadmapmusic returnafterbattle playmusic MUSIC_MYSTICALMAN_ENCOUNTER loadfont writetext UnknownText_0x1a05c3 + waitbutton closetext - loadmovesprites - applymovement $c, MovementData_0x1a00ec - disappear $c + applymovement CIANWOODCITY_SUPER_NERD, MovementData_0x1a00ec + disappear CIANWOODCITY_SUPER_NERD pause 20 special Special_RotatePalettesRightMusic playmapmusic @@ -82,8 +96,8 @@ PokefanFScript_0x1a0084: checkevent EVENT_BEAT_CHUCK iftrue UnknownScript_0x1a009c writetext UnknownText_0x1a0163 + waitbutton closetext - loadmovesprites end UnknownScript_0x1a009c: @@ -96,9 +110,9 @@ UnknownScript_0x1a009c: keeptextopen UnknownScript_0x1a00ad: writetext UnknownText_0x1a0277 - closetext + waitbutton UnknownScript_0x1a00b1: - loadmovesprites + closetext end StandingYoungsterScript_0x1a00b3: diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm index 95cba4982..7db8ddb1a 100644 --- a/maps/CianwoodCityPhotoStudio.asm +++ b/maps/CianwoodCityPhotoStudio.asm @@ -1,3 +1,6 @@ +const_value set 2 + const CIANWOODCITYPHOTOSTUDIO_FISHING_GURU + CianwoodCityPhotoStudio_MapScriptHeader: .MapTriggers: db 0 @@ -12,16 +15,16 @@ FishingGuruScript_0x9e0e0: yesorno iffalse UnknownScript_0x9e0f3 writetext UnknownText_0x9e142 - closetext + waitbutton special PhotoStudio + waitbutton closetext - loadmovesprites end UnknownScript_0x9e0f3: writetext UnknownText_0x9e156 + waitbutton closetext - loadmovesprites end UnknownText_0x9e0f9: diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index a081cdcd8..306027712 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -1,3 +1,14 @@ +const_value set 2 + const CIANWOODGYM_CHUCK + const CIANWOODGYM_BLACK_BELT1 + const CIANWOODGYM_BLACK_BELT2 + const CIANWOODGYM_BLACK_BELT3 + const CIANWOODGYM_BLACK_BELT4 + const CIANWOODGYM_BOULDER1 + const CIANWOODGYM_BOULDER2 + const CIANWOODGYM_BOULDER3 + const CIANWOODGYM_BOULDER4 + CianwoodGym_MapScriptHeader: .MapTriggers: db 0 @@ -11,32 +22,32 @@ ChuckScript_0x9d60f: checkevent EVENT_BEAT_CHUCK iftrue .FightDone writetext UnknownText_0x9d6f9 + waitbutton closetext - loadmovesprites - spriteface $2, RIGHT + spriteface CIANWOODGYM_CHUCK, RIGHT loadfont writetext UnknownText_0x9d76f + waitbutton closetext - loadmovesprites - applymovement $7, MovementData_0x9d6f3 + applymovement CIANWOODGYM_BOULDER1, MovementData_0x9d6f3 playsound SFX_STRENGTH earthquake 80 - disappear $7 + disappear CIANWOODGYM_BOULDER1 pause 30 faceplayer loadfont writetext UnknownText_0x9d78a + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x9d7f6, 0 - loadtrainer CHUCK, 1 + scriptedtrainerdata CHUCK, 1 startbattle returnafterbattle setevent EVENT_BEAT_CHUCK loadfont writetext UnknownText_0x9d835 playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_STORMBADGE checkcode VAR_BADGES scall CianwoodGymTriggerRockets @@ -53,15 +64,15 @@ ChuckScript_0x9d60f: iffalse UnknownScript_0x9d67f setevent EVENT_GOT_TM01_DYNAMICPUNCH writetext UnknownText_0x9d8da + waitbutton closetext - loadmovesprites end UnknownScript_0x9d67b: writetext UnknownText_0x9d930 - closetext + waitbutton UnknownScript_0x9d67f: - loadmovesprites + closetext end CianwoodGymTriggerRockets: @@ -79,44 +90,44 @@ TrainerBlackbeltYoshi: trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, BlackbeltYoshiScript BlackbeltYoshiScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x9d9fa + waitbutton closetext - loadmovesprites end TrainerBlackbeltLao: trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, 0, BlackbeltLaoScript BlackbeltLaoScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x9da61 + waitbutton closetext - loadmovesprites end TrainerBlackbeltNob: trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, 0, BlackbeltNobScript BlackbeltNobScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x9dac0 + waitbutton closetext - loadmovesprites end TrainerBlackbeltLung: trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, 0, BlackbeltLungScript BlackbeltLungScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x9db14 + waitbutton closetext - loadmovesprites end CianwoodGymBoulder: diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index ac19a402e..0ab10dd82 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -1,3 +1,8 @@ +const_value set 2 + const CIANWOODLUGIASPEECHHOUSE_TEACHER + const CIANWOODLUGIASPEECHHOUSE_LASS + const CIANWOODLUGIASPEECHHOUSE_TWIN + CianwoodLugiaSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 528789583..b3c5f0eb0 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -1,3 +1,6 @@ +const_value set 2 + const CIANWOODPHARMACY_PHARMACIST + CianwoodPharmacy_MapScriptHeader: .MapTriggers: db 1 @@ -23,17 +26,17 @@ CianwoodPharmacist: giveitem SECRETPOTION writetext ReceivedSecretpotionText playsound SFX_KEY_ITEM - waitbutton + waitsfx itemnotify setevent EVENT_GOT_SECRETPOTION_FROM_PHARMACY writetext PharmacistDescribeSecretpotionText + waitbutton closetext - loadmovesprites end .Mart pokemart MARTTYPE_PHARMACY, MART_CIANWOOD - loadmovesprites + closetext end CianwoodPharmacyBookshelf: diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokeCenter1F.asm index 4969a507a..d685ff8ef 100644 --- a/maps/CianwoodPokeCenter1F.asm +++ b/maps/CianwoodPokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const CIANWOODPOKECENTER1F_NURSE + const CIANWOODPOKECENTER1F_LASS + const CIANWOODPOKECENTER1F_GYM_GUY + const CIANWOODPOKECENTER1F_SUPER_NERD + CianwoodPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -17,15 +23,15 @@ CianwoodGymGuyScript: iftrue .CianwoodGymGuyWinScript loadfont writetext CianwoodGymGuyText + waitbutton closetext - loadmovesprites end .CianwoodGymGuyWinScript loadfont writetext CianwoodGymGuyWinText + waitbutton closetext - loadmovesprites end SuperNerdScript_0x9dbea: diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 77c1ae2f2..8a56d3c7c 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -1,3 +1,6 @@ +const_value set 2 + const CINNABARISLAND_BLUE + CinnabarIsland_MapScriptHeader: .MapTriggers: db 0 @@ -16,11 +19,11 @@ CinnabarIslandBlue: faceplayer loadfont writetext CinnabarIslandBlueText + waitbutton closetext - loadmovesprites playsound SFX_WARP_TO - applymovement $2, CinnabarIslandBlueTeleport - disappear $2 + applymovement CINNABARISLAND_BLUE, CinnabarIslandBlueTeleport + disappear CINNABARISLAND_BLUE clearevent EVENT_VIRIDIAN_GYM_BLUE end diff --git a/maps/CinnabarPokeCenter1F.asm b/maps/CinnabarPokeCenter1F.asm index d42451dc1..a97aae5c6 100644 --- a/maps/CinnabarPokeCenter1F.asm +++ b/maps/CinnabarPokeCenter1F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const CINNABARPOKECENTER1F_NURSE + const CINNABARPOKECENTER1F_COOLTRAINER_F + const CINNABARPOKECENTER1F_FISHER + CinnabarPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/CinnabarPokeCenter2FBeta.asm b/maps/CinnabarPokeCenter2FBeta.asm index fb9d96b7a..7ce32df68 100644 --- a/maps/CinnabarPokeCenter2FBeta.asm +++ b/maps/CinnabarPokeCenter2FBeta.asm @@ -1,3 +1,5 @@ +const_value set 2 + CinnabarPokeCenter2FBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 3c1e597b2..46fee275f 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -1,3 +1,7 @@ +const_value set 2 + const COLOSSEUM_CHRIS1 + const COLOSSEUM_CHRIS2 + Colosseum_MapScriptHeader: .MapTriggers: db 3 @@ -29,13 +33,13 @@ Colosseum_MapScriptHeader: ColosseumScript_SetWhichChris: special Special_CableClubCheckWhichChris iffalse .Chris2 - disappear $3 - appear $2 + disappear COLOSSEUM_CHRIS2 + appear COLOSSEUM_CHRIS1 return .Chris2: - disappear $2 - appear $3 + disappear COLOSSEUM_CHRIS1 + appear COLOSSEUM_CHRIS2 return ColosseumScript_InitializeCB: @@ -55,8 +59,8 @@ MapColosseumSignpost1Script: ChrisScript_0x193499: loadfont writetext .FriendReadyText + waitbutton closetext - loadmovesprites end .FriendReadyText: diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index 34a8dea5b..c4262b315 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const COPYCATSHOUSE1F_POKEFAN_M + const COPYCATSHOUSE1F_POKEFAN_F + const COPYCATSHOUSE1F_CLEFAIRY + CopycatsHouse1F_MapScriptHeader: .MapTriggers: db 0 @@ -14,22 +19,22 @@ PokefanFScript_0x18ad16: checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x18ad24 writetext UnknownText_0x18ad95 + waitbutton closetext - loadmovesprites end UnknownScript_0x18ad24: writetext UnknownText_0x18add3 + waitbutton closetext - loadmovesprites end ClefairyScript_0x18ad2a: loadfont writetext UnknownText_0x18ae4b cry BLISSEY + waitbutton closetext - loadmovesprites end UnknownText_0x18ad34: diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index fe41d7a3d..839cc6694 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -1,3 +1,11 @@ +const_value set 2 + const COPYCATSHOUSE2F_COPYCAT1 + const COPYCATSHOUSE2F_MOLTRES + const COPYCATSHOUSE2F_FAIRY + const COPYCATSHOUSE2F_MONSTER + const COPYCATSHOUSE2F_BIRD + const COPYCATSHOUSE2F_COPYCAT2 + CopycatsHouse2F_MapScriptHeader: .MapTriggers: db 0 @@ -12,12 +20,12 @@ CopycatsHouse2F_MapScriptHeader: CopycatsHouse2FCallback: checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part1 - disappear $7 - appear $2 + disappear COPYCATSHOUSE2F_COPYCAT2 + appear COPYCATSHOUSE2F_COPYCAT1 jump .Done .Part1 - disappear $2 - appear $7 + disappear COPYCATSHOUSE2F_COPYCAT1 + appear COPYCATSHOUSE2F_COPYCAT2 .Done return @@ -31,13 +39,13 @@ Copycat: iftrue .Part12 checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part1 - applymovement $2, MovementData_0x18afd0 + applymovement COPYCATSHOUSE2F_COPYCAT1, MovementData_0x18afd0 faceplayer variablesprite SPRITE_COPYCAT, SPRITE_CHRIS jump .Part2 .Part1 - applymovement $7, MovementData_0x18afd0 + applymovement COPYCATSHOUSE2F_COPYCAT2, MovementData_0x18afd0 faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .Part2 @@ -53,23 +61,23 @@ Copycat: .Part3 writetext UnknownText_0x18b316 .Part4 + waitbutton closetext - loadmovesprites checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part5 - applymovement $2, MovementData_0x18afd0 + applymovement COPYCATSHOUSE2F_COPYCAT1, MovementData_0x18afd0 jump .Part6 .Part5 - applymovement $7, MovementData_0x18afd0 + applymovement COPYCATSHOUSE2F_COPYCAT2, MovementData_0x18afd0 .Part6 faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS special RunCallback_04 loadfont writetext UnknownText_0x18b028 + waitbutton closetext - loadmovesprites end .Part7 @@ -82,23 +90,23 @@ Copycat: .Part8 writetext UnknownText_0x18b366 .Part9 + waitbutton closetext - loadmovesprites checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part10 - applymovement $2, MovementData_0x18afd0 + applymovement COPYCATSHOUSE2F_COPYCAT1, MovementData_0x18afd0 jump .Part11 .Part10 - applymovement $7, MovementData_0x18afd0 + applymovement COPYCATSHOUSE2F_COPYCAT2, MovementData_0x18afd0 .Part11 faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS special RunCallback_04 loadfont writetext UnknownText_0x18b116 + waitbutton closetext - loadmovesprites setevent EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM end @@ -120,20 +128,20 @@ Copycat: iffalse .Part22 setevent EVENT_GOT_PASS_FROM_COPYCAT writetext UnknownText_0x18b214 + waitbutton closetext - loadmovesprites end .Part15 checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part16 - applymovement $2, MovementData_0x18afd0 + applymovement COPYCATSHOUSE2F_COPYCAT1, MovementData_0x18afd0 faceplayer variablesprite SPRITE_COPYCAT, SPRITE_CHRIS jump .Part17 .Part16 - applymovement $7, MovementData_0x18afd0 + applymovement COPYCATSHOUSE2F_COPYCAT2, MovementData_0x18afd0 faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS .Part17 @@ -147,24 +155,24 @@ Copycat: .Part18 writetext UnknownText_0x18b415 .Part19 + waitbutton closetext - loadmovesprites checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part20 - applymovement $2, MovementData_0x18afd0 + applymovement COPYCATSHOUSE2F_COPYCAT1, MovementData_0x18afd0 jump .Part21 .Part20 - applymovement $7, MovementData_0x18afd0 + applymovement COPYCATSHOUSE2F_COPYCAT2, MovementData_0x18afd0 .Part21 faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS special RunCallback_04 loadfont writetext UnknownText_0x18b2f5 - closetext + waitbutton .Part22 - loadmovesprites + closetext end CopycatsDodrio: @@ -173,8 +181,8 @@ CopycatsDodrio: cry DODRIO keeptextopen writetext CopycatsDodrioText2 + waitbutton closetext - loadmovesprites end CopycatsHouse2FDoll: diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index 40b48da85..fc2dbb921 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -1,3 +1,14 @@ +const_value set 2 + const DANCETHEATRE_KIMONO_GIRL1 + const DANCETHEATRE_KIMONO_GIRL2 + const DANCETHEATRE_KIMONO_GIRL3 + const DANCETHEATRE_KIMONO_GIRL4 + const DANCETHEATRE_KIMONO_GIRL5 + const DANCETHEATRE_GENTLEMAN + const DANCETHEATRE_RHYDON + const DANCETHEATRE_COOLTRAINER_M + const DANCETHEATRE_GRANNY + DanceTheatre_MapScriptHeader: .MapTriggers: db 0 @@ -9,55 +20,55 @@ TrainerKimono_girlNaoko2: trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, Kimono_girlNaoko2SeenText, Kimono_girlNaoko2BeatenText, 0, Kimono_girlNaoko2Script Kimono_girlNaoko2Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x99579 + waitbutton closetext - loadmovesprites end TrainerKimono_girlSayo: trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, Kimono_girlSayoSeenText, Kimono_girlSayoBeatenText, 0, Kimono_girlSayoScript Kimono_girlSayoScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x9960b + waitbutton closetext - loadmovesprites end TrainerKimono_girlZuki: trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, Kimono_girlZukiSeenText, Kimono_girlZukiBeatenText, 0, Kimono_girlZukiScript Kimono_girlZukiScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x99688 + waitbutton closetext - loadmovesprites end TrainerKimono_girlKuni: trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, Kimono_girlKuniSeenText, Kimono_girlKuniBeatenText, 0, Kimono_girlKuniScript Kimono_girlKuniScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x99714 + waitbutton closetext - loadmovesprites end TrainerKimono_girlMiki: trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, Kimono_girlMikiSeenText, Kimono_girlMikiBeatenText, 0, Kimono_girlMikiScript Kimono_girlMikiScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x997a8 + waitbutton closetext - loadmovesprites end GentlemanScript_0x994c6: @@ -83,14 +94,14 @@ UnknownScript_0x994f3: checkflag ENGINE_PLAYER_IS_FEMALE iftrue UnknownScript_0x994ff writetext UnknownText_0x99891 + waitbutton closetext - loadmovesprites end UnknownScript_0x994ff: writetext UnknownText_0x998d4 + waitbutton closetext - loadmovesprites end UnknownScript_0x99505: @@ -99,22 +110,22 @@ UnknownScript_0x99505: verbosegiveitem HM_SURF setevent EVENT_GOT_HM03_SURF writetext UnknownText_0x9999b + waitbutton closetext - loadmovesprites end UnknownScript_0x99515: writetext UnknownText_0x999d5 + waitbutton closetext - loadmovesprites end RhydonScript_0x9951b: loadfont writetext UnknownText_0x99a0a cry RHYDON + waitbutton closetext - loadmovesprites end CooltrainerMScript_0x99525: diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index 88fa67028..96ca40235 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -1,3 +1,8 @@ +const_value set 2 + const DARKCAVEBLACKTHORNENTRANCE_PHARMACIST + const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL1 + const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2 + DarkCaveBlackthornEntrance_MapScriptHeader: .MapTriggers: db 0 @@ -17,9 +22,9 @@ PharmacistScript_0x18c720: setevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE UnknownScript_0x18c735: writetext UnknownText_0x18c80c - closetext + waitbutton UnknownScript_0x18c739: - loadmovesprites + closetext end ItemFragment_0x18c73b: diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index c8629f558..2320303ab 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -1,3 +1,13 @@ +const_value set 2 + const DARKCAVEVIOLETENTRANCE_POKE_BALL1 + const DARKCAVEVIOLETENTRANCE_ROCK1 + const DARKCAVEVIOLETENTRANCE_ROCK2 + const DARKCAVEVIOLETENTRANCE_ROCK3 + const DARKCAVEVIOLETENTRANCE_ROCK4 + const DARKCAVEVIOLETENTRANCE_POKE_BALL2 + const DARKCAVEVIOLETENTRANCE_POKE_BALL3 + const DARKCAVEVIOLETENTRANCE_POKE_BALL4 + DarkCaveVioletEntrance_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 5c2ec8c56..1eea599c5 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -1,3 +1,7 @@ +const_value set 2 + const DAYCARE_GRAMPS + const DAYCARE_GRANNY + DayCare_MapScriptHeader: .MapTriggers: db 0 @@ -28,31 +32,31 @@ GrampsScript_0x62f8f: iftrue UnknownScript_0x62fbd writetext UnknownText_0x630ce keeptextopen - loadmovesprites + closetext checkcode VAR_PARTYCOUNT if_equal $6, UnknownScript_0x62fb6 special Function117656 loadfont writetext UnknownText_0x631ae playsound SFX_KEY_ITEM - waitbutton + waitsfx writetext UnknownText_0x631c3 + waitbutton closetext - loadmovesprites setevent EVENT_GOT_ODD_EGG end UnknownScript_0x62fb6: loadfont writetext UnknownText_0x63237 + waitbutton closetext - loadmovesprites end UnknownScript_0x62fbd: special Special_DayCareMan + waitbutton closetext - loadmovesprites end GrannyScript_0x62fc3: @@ -61,14 +65,14 @@ GrannyScript_0x62fc3: checkflag ENGINE_DAYCARE_MONS_ARE_COMPATIBLE iftrue UnknownScript_0x62fd1 special Special_DayCareLady + waitbutton closetext - loadmovesprites end UnknownScript_0x62fd1: writetext UnknownText_0x62fda + waitbutton closetext - loadmovesprites end DayCareBookshelf: diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 222330d3c..a3daf6517 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -1,3 +1,6 @@ +const_value set 2 + const DIGLETTSCAVE_POKEFAN_M + DiglettsCave_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 62fcf4acb..a865486f1 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -1,3 +1,9 @@ +const_value set 2 + const DRAGONSHRINE_ELDER1 + const DRAGONSHRINE_ELDER2 + const DRAGONSHRINE_ELDER3 + const DRAGONSHRINE_CLAIR + DragonShrine_MapScriptHeader: .MapTriggers: db 2 @@ -18,7 +24,7 @@ DragonShrine_MapScriptHeader: DragonShrineTestScript: applymovement PLAYER, MovementData_0x18d2bf - applymovement $2, MovementData_0x18d2c7 + applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2c7 loadfont writetext UnknownText_0x18d2ea keeptextopen @@ -88,17 +94,17 @@ DragonShrineTestScript: checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue .Question2 .WrongAnswer: - loadmovesprites - spriteface $2, LEFT + closetext + spriteface DRAGONSHRINE_ELDER1, LEFT loadfont writetext UnknownText_0x18d7f6 + waitbutton closetext - loadmovesprites - spriteface $2, DOWN + spriteface DRAGONSHRINE_ELDER1, DOWN loadfont writetext UnknownText_0x18d816 + waitbutton closetext - loadmovesprites setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG loadfont checkevent EVENT_DRAGON_SHRINE_QUESTION_5 @@ -113,52 +119,52 @@ DragonShrineTestScript: iftrue .Question1 .PassedTheTest: writetext UnknownText_0x18d47c + waitbutton closetext - loadmovesprites playsound SFX_ENTER_DOOR showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_CLAIR - appear $5 - waitbutton + appear DRAGONSHRINE_CLAIR + waitsfx spriteface PLAYER, DOWN pause 30 - applymovement $5, MovementData_0x18d2d4 - spriteface $5, RIGHT + applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2d4 + spriteface DRAGONSHRINE_CLAIR, RIGHT spriteface PLAYER, LEFT - spriteface $2, LEFT + spriteface DRAGONSHRINE_ELDER1, LEFT loadfont writetext UnknownText_0x18d916 + waitbutton closetext - loadmovesprites special Special_RotatePalettesRightMusic - applymovement $5, MovementData_0x18d2da + applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2da loadfont writetext UnknownText_0x18d974 + waitbutton closetext - loadmovesprites - applymovement $5, MovementData_0x18d2dd + applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2dd loadfont writetext UnknownText_0x18d983 + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x18d2c9 - spriteface $5, UP + applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2c9 + spriteface DRAGONSHRINE_CLAIR, UP loadfont writetext UnknownText_0x18d520 + waitbutton closetext - loadmovesprites - showemote EMOTE_SHOCK, $5, 15 + showemote EMOTE_SHOCK, DRAGONSHRINE_CLAIR, 15 loadfont writetext UnknownText_0x18d9ae + waitbutton closetext - loadmovesprites - applymovement $5, MovementData_0x18d2e0 + applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2e0 loadfont writetext UnknownText_0x18d9bf - closetext + waitbutton setflag ENGINE_RISINGBADGE playsound SFX_GET_BADGE - waitbutton + waitsfx special RestartMapMusic specialphonecall SPECIALCALL_MASTERBALL dotrigger $1 @@ -166,24 +172,24 @@ DragonShrineTestScript: writetext UnknownText_0x18d9f2 keeptextopen writetext UnknownText_0x18da0b + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x18d2ce - spriteface $5, UP - applymovement $2, MovementData_0x18d2d1 + applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2ce + spriteface DRAGONSHRINE_CLAIR, UP + applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2d1 spriteface PLAYER, UP loadfont writetext UnknownText_0x18d5a3 + waitbutton closetext - loadmovesprites loadfont writetext UnknownText_0x18dab4 + waitbutton closetext - loadmovesprites - applymovement $5, MovementData_0x18d2e3 + applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2e3 playsound SFX_ENTER_DOOR - disappear $5 - waitbutton + disappear DRAGONSHRINE_CLAIR + waitsfx setevent EVENT_GAVE_KURT_APRICORNS end @@ -199,66 +205,66 @@ ElderScript_0x18d1a5: checkevent EVENT_BEAT_RIVAL_IN_MT_MOON iftrue .BeatRivalInMtMoon writetext UnknownText_0x18d724 + waitbutton closetext - loadmovesprites end .GiveDratini: writetext UnknownText_0x18d604 - closetext + waitbutton checkcode VAR_PARTYCOUNT if_equal 6, .PartyFull writetext UnknownText_0x18d697 playsound SFX_CAUGHT_MON - waitbutton + waitsfx givepoke DRATINI, 15 checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG special SpecialDratini setevent EVENT_GOT_DRATINI setevent EVENT_JUST_RECEIVED_DRATINI writetext UnknownText_0x18d6ca + waitbutton closetext - loadmovesprites end .PartyFull: writetext UnknownText_0x18d6ac + waitbutton closetext - loadmovesprites end .BeatRivalInMtMoon: writetext UnknownText_0x18d782 + waitbutton closetext - loadmovesprites end .DontGiveDratiniYet: writetext UnknownText_0x18d5e5 + waitbutton closetext - loadmovesprites end .ReceivedDratini: writetext UnknownText_0x18d6ca + waitbutton closetext - loadmovesprites end ElderScript_0x18d205: faceplayer loadfont writetext UnknownText_0x18d840 + waitbutton closetext - loadmovesprites end ElderScript_0x18d20d: faceplayer loadfont writetext UnknownText_0x18d8b1 + waitbutton closetext - loadmovesprites end diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm index aaadae4d4..093b48acf 100644 --- a/maps/DragonsDen1F.asm +++ b/maps/DragonsDen1F.asm @@ -1,3 +1,5 @@ +const_value set 2 + DragonsDen1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index afeb0769a..b9b9ad2db 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -1,3 +1,14 @@ +const_value set 2 + const DRAGONSDENB1F_POKE_BALL1 + const DRAGONSDENB1F_CLAIR + const DRAGONSDENB1F_SILVER + const DRAGONSDENB1F_COOLTRAINER_M + const DRAGONSDENB1F_COOLTRAINER_F + const DRAGONSDENB1F_TWIN1 + const DRAGONSDENB1F_TWIN2 + const DRAGONSDENB1F_POKE_BALL2 + const DRAGONSDENB1F_POKE_BALL3 + DragonsDenB1F_MapScriptHeader: .MapTriggers: db 2 @@ -22,30 +33,30 @@ UnknownScript_0x18c89e: UnknownScript_0x18c89f: checkevent EVENT_BEAT_RIVAL_IN_MT_MOON iftrue UnknownScript_0x18c8a8 - disappear $4 + disappear DRAGONSDENB1F_SILVER return UnknownScript_0x18c8a8: checkcode VAR_WEEKDAY if_equal TUESDAY, UnknownScript_0x18c8b5 if_equal THURSDAY, UnknownScript_0x18c8b5 - disappear $4 + disappear DRAGONSDENB1F_SILVER return UnknownScript_0x18c8b5: - appear $4 + appear DRAGONSDENB1F_SILVER return UnknownScript_0x18c8b8: - appear $3 + appear DRAGONSDENB1F_CLAIR loadfont writetext UnknownText_0x18c9b8 pause 30 - loadmovesprites + closetext showemote EMOTE_SHOCK, PLAYER, 15 spriteface PLAYER, LEFT playmusic MUSIC_CLAIR - applymovement $3, MovementData_0x18c9ae + applymovement DRAGONSDENB1F_CLAIR, MovementData_0x18c9ae loadfont writetext UnknownText_0x18c9bf keeptextopen @@ -54,26 +65,26 @@ UnknownScript_0x18c8b8: itemtotext TM_DRAGONBREATH, $0 writetext UnknownText_0x18c9fb playsound SFX_ITEM - waitbutton + waitsfx itemnotify setevent EVENT_GOT_TM24_DRAGONBREATH writetext UnknownText_0x18ca0d keeptextopen writetext UnknownText_0x18caf1 + waitbutton closetext - loadmovesprites jump UnknownScript_0x18c8f9 UnknownScript_0x18c8f4: writetext UnknownText_0x18ca8b + waitbutton closetext - loadmovesprites UnknownScript_0x18c8f9: - applymovement $3, MovementData_0x18c9b3 + applymovement DRAGONSDENB1F_CLAIR, MovementData_0x18c9b3 special Special_RotatePalettesRightMusic pause 30 special RestartMapMusic - disappear $3 + disappear DRAGONSDENB1F_CLAIR dotrigger $0 end @@ -81,57 +92,57 @@ TrainerCooltrainermDarin: trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, CooltrainermDarinScript CooltrainermDarinScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x18cd82 + waitbutton closetext - loadmovesprites end TrainerCooltrainerfCara: trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, CooltrainerfCaraScript CooltrainerfCaraScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x18ce11 + waitbutton closetext - loadmovesprites end TrainerTwinsLeaandpia1: trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, TwinsLeaandpia1Script TwinsLeaandpia1Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x18ced3 + waitbutton closetext - loadmovesprites end TrainerTwinsLeaandpia2: trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, TwinsLeaandpia2Script TwinsLeaandpia2Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x18cf0f + waitbutton closetext - loadmovesprites end PokeBallScript_0x18c95a: giveitem DRAGON_FANG iffalse UnknownScript_0x18c970 - disappear $2 + disappear DRAGONSDENB1F_POKE_BALL1 loadfont itemtotext DRAGON_FANG, $0 writetext UnknownText_0x18cf41 playsound SFX_ITEM - waitbutton + waitsfx itemnotify - loadmovesprites + closetext end UnknownScript_0x18c970: @@ -140,8 +151,8 @@ UnknownScript_0x18c970: writetext UnknownText_0x18cf41 keeptextopen writetext UnknownText_0x18cf51 + waitbutton closetext - loadmovesprites end SilverScript_0x18c97e: @@ -151,16 +162,16 @@ SilverScript_0x18c97e: checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x18c995 writetext UnknownText_0x18cc83 + waitbutton closetext - loadmovesprites setevent EVENT_GAVE_KURT_APRICORNS special RestartMapMusic end UnknownScript_0x18c995: writetext UnknownText_0x18cd2d + waitbutton closetext - loadmovesprites special RestartMapMusic end diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 64b541994..c77a8afa6 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -1,3 +1,11 @@ +const_value set 2 + const EARLSPOKEMONACADEMY_FISHER + const EARLSPOKEMONACADEMY_YOUNGSTER1 + const EARLSPOKEMONACADEMY_GAMEBOY_KID1 + const EARLSPOKEMONACADEMY_GAMEBOY_KID2 + const EARLSPOKEMONACADEMY_YOUNGSTER2 + const EARLSPOKEMONACADEMY_POKEDEX + EarlsPokemonAcademy_MapScriptHeader: .MapTriggers: db 0 @@ -6,7 +14,7 @@ EarlsPokemonAcademy_MapScriptHeader: db 0 AcademyEarl: - applymovement $2, MovementData_0x68b2d + applymovement EARLSPOKEMONACADEMY_FISHER, MovementData_0x68b2d faceplayer loadfont writetext UnknownText_0x68b3b @@ -20,14 +28,14 @@ AcademyEarl: yesorno iffalse .Done writetext UnknownText_0x68c7b + waitbutton closetext - loadmovesprites end .Done writetext UnknownText_0x68d31 + waitbutton closetext - loadmovesprites end YoungsterScript_0x68a83: @@ -37,18 +45,18 @@ GameboyKidScript_0x68a86: faceplayer loadfont writetext UnknownText_0x68dda + waitbutton closetext - loadmovesprites - spriteface $4, DOWN + spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN end GameboyKidScript_0x68a91: faceplayer loadfont writetext UnknownText_0x68e07 + waitbutton closetext - loadmovesprites - spriteface $5, DOWN + spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN end YoungsterScript_0x68a9c: @@ -66,32 +74,32 @@ AcademyBlackboard: if_equal $3, .Sleep if_equal $4, .Burn if_equal $5, .Freeze - loadmovesprites + closetext end .Poison writetext AcademyPoisonText - closetext + waitbutton jump .Loop .Paralysis writetext AcademyParalysisText - closetext + waitbutton jump .Loop .Sleep writetext AcademySleepText - closetext + waitbutton jump .Loop .Burn writetext AcademyBurnText - closetext + waitbutton jump .Loop .Freeze: writetext AcademyFreezeText - closetext + waitbutton jump .Loop .MenuHeader @@ -128,9 +136,9 @@ AcademyNotebook: yesorno iffalse .Done writetext AcademyNotebookText3 - closetext + waitbutton .Done - loadmovesprites + closetext end AcademyStickerMachine: diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index fc2d407a7..45fc30235 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -1,3 +1,12 @@ +const_value set 2 + const ECRUTEAKCITY_GRAMPS1 + const ECRUTEAKCITY_GRAMPS2 + const ECRUTEAKCITY_LASS1 + const ECRUTEAKCITY_LASS2 + const ECRUTEAKCITY_FISHER + const ECRUTEAKCITY_YOUNGSTER + const ECRUTEAKCITY_GRAMPS3 + EcruteakCity_MapScriptHeader: .MapTriggers: db 0 @@ -30,14 +39,14 @@ LassScript_0x1a4015: checkevent EVENT_RELEASED_THE_BEASTS iftrue UnknownScript_0x1a4023 writetext UnknownText_0x1a421a + waitbutton closetext - loadmovesprites end UnknownScript_0x1a4023: writetext UnknownText_0x1a4269 + waitbutton closetext - loadmovesprites end FisherScript_0x1a4029: @@ -46,14 +55,14 @@ FisherScript_0x1a4029: checkevent EVENT_JASMINE_RETURNED_TO_GYM iftrue UnknownScript_0x1a4037 writetext UnknownText_0x1a42ac + waitbutton closetext - loadmovesprites end UnknownScript_0x1a4037: writetext UnknownText_0x1a4325 + waitbutton closetext - loadmovesprites end YoungsterScript_0x1a403d: diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index f3e136c9d..eef9d753a 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -1,3 +1,12 @@ +const_value set 2 + const ECRUTEAKGYM_MORTY + const ECRUTEAKGYM_SAGE1 + const ECRUTEAKGYM_SAGE2 + const ECRUTEAKGYM_GRANNY1 + const ECRUTEAKGYM_GRANNY2 + const ECRUTEAKGYM_GYM_GUY + const ECRUTEAKGYM_GRAMPS + EcruteakGym_MapScriptHeader: .MapTriggers: db 2 @@ -22,17 +31,17 @@ MortyScript_0x99d58: checkevent EVENT_BEAT_MORTY iftrue .FightDone writetext UnknownText_0x99e65 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x9a00a, 0 - loadtrainer MORTY, 1 + scriptedtrainerdata MORTY, 1 startbattle returnafterbattle setevent EVENT_BEAT_MORTY loadfont writetext UnknownText_0x9a043 playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_FOGBADGE checkcode VAR_BADGES scall EcruteakGymTriggerRockets @@ -52,15 +61,15 @@ MortyScript_0x99d58: iffalse UnknownScript_0x99db5 setevent EVENT_GOT_TM30_SHADOW_BALL writetext UnknownText_0x9a0ec + waitbutton closetext - loadmovesprites end UnknownScript_0x99db1: writetext UnknownText_0x9a145 - closetext + waitbutton UnknownScript_0x99db5: - loadmovesprites + closetext end EcruteakGymTriggerRockets: @@ -76,17 +85,17 @@ EcruteakGymTriggerRockets: UnknownScript_0x99dc6: applymovement PLAYER, MovementData_0x99e5d - applymovement $8, MovementData_0x99e63 + applymovement ECRUTEAKGYM_GRAMPS, MovementData_0x99e63 loadfont writetext UnknownText_0x9a49c + waitbutton closetext - loadmovesprites - follow PLAYER, $8 + follow PLAYER, ECRUTEAKGYM_GRAMPS applymovement PLAYER, MovementData_0x99e5f stopfollow special FadeOutPalettes playsound SFX_ENTER_DOOR - waitbutton + waitsfx warp ECRUTEAK_CITY, $6, $1b end @@ -94,44 +103,44 @@ TrainerSageJeffrey: trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, SageJeffreyScript SageJeffreyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x9a263 + waitbutton closetext - loadmovesprites end TrainerSagePing: trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, 0, SagePingScript SagePingScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x9a2b7 + waitbutton closetext - loadmovesprites end TrainerMediumMartha: trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, MediumMarthaScript MediumMarthaScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x9a318 + waitbutton closetext - loadmovesprites end TrainerMediumGrace: trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, MediumGraceScript MediumGraceScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x9a38a + waitbutton closetext - loadmovesprites end EcruteakGymGuyScript: @@ -140,14 +149,14 @@ EcruteakGymGuyScript: checkevent EVENT_BEAT_MORTY iftrue .EcruteakGymGuyWinScript writetext EcruteakGymGuyText + waitbutton closetext - loadmovesprites end .EcruteakGymGuyWinScript writetext EcruteakGymGuyWinText + waitbutton closetext - loadmovesprites end EcruteakGymStatue: diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 5719e14bc..497eb325c 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -1,3 +1,9 @@ +const_value set 2 + const ECRUTEAKHOUSE_SAGE1 + const ECRUTEAKHOUSE_SAGE2 + const ECRUTEAKHOUSE_SAGE3 + const ECRUTEAKHOUSE_GRAMPS + EcruteakHouse_MapScriptHeader: .MapTriggers: db 2 @@ -45,21 +51,21 @@ EcruteakHouse_MapScriptHeader: EcruteakHouse_XYTrigger1: checkevent EVENT_RANG_CLEAR_BELL_2 iftrue EcruteakHouse_XYTrigger_DontMove - applymovement $3, MovementData_0x980c7 - moveperson $2, $4, $6 - appear $2 + applymovement ECRUTEAKHOUSE_SAGE2, MovementData_0x980c7 + moveperson ECRUTEAKHOUSE_SAGE1, $4, $6 + appear ECRUTEAKHOUSE_SAGE1 pause 5 - disappear $3 + disappear ECRUTEAKHOUSE_SAGE2 end EcruteakHouse_XYTrigger2: checkevent EVENT_RANG_CLEAR_BELL_1 iftrue EcruteakHouse_XYTrigger_DontMove - applymovement $2, MovementData_0x980cc - moveperson $3, $5, $6 - appear $3 + applymovement ECRUTEAKHOUSE_SAGE1, MovementData_0x980cc + moveperson ECRUTEAKHOUSE_SAGE2, $5, $6 + appear ECRUTEAKHOUSE_SAGE2 pause 5 - disappear $2 + disappear ECRUTEAKHOUSE_SAGE1 end EcruteakHouse_XYTrigger_DontMove: @@ -73,14 +79,14 @@ SageScript_0x98062: checkflag ENGINE_FOGBADGE iftrue .BlockPassage_GotFogBadge writetext UnknownText_0x980d1 + waitbutton closetext - loadmovesprites end .BlockPassage_GotFogBadge: writetext UnknownText_0x98131 + waitbutton closetext - loadmovesprites end .CheckForClearBell: @@ -91,14 +97,14 @@ SageScript_0x98062: checkitem CLEAR_BELL iftrue .RingClearBell writetext UnknownText_0x981a4 + waitbutton closetext - loadmovesprites end .RingClearBell: writetext UnknownText_0x98250 + waitbutton closetext - loadmovesprites dotrigger $1 setevent EVENT_RANG_CLEAR_BELL_2 clearevent EVENT_RANG_CLEAR_BELL_1 @@ -107,14 +113,14 @@ SageScript_0x98062: .AllowedThrough: writetext UnknownText_0x9837e + waitbutton closetext - loadmovesprites end .Event000: writetext UnknownText_0x98391 + waitbutton closetext - loadmovesprites end SageScript_0x980b0: @@ -123,14 +129,14 @@ SageScript_0x980b0: checkevent EVENT_GOT_CLEAR_BELL iftrue .GotClearBell writetext UnknownText_0x9840b + waitbutton closetext - loadmovesprites end .GotClearBell: writetext UnknownText_0x9846f + waitbutton closetext - loadmovesprites end GrampsScript_0x980c4: diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index a6e2c872f..1584151d8 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ECRUTEAKITEMFINDERHOUSE_COOLTRAINER_M + const ECRUTEAKITEMFINDERHOUSE_POKEDEX + EcruteakItemfinderHouse_MapScriptHeader: .MapTriggers: db 0 @@ -19,14 +23,14 @@ CooltrainerMScript_0x9a5fb: setevent EVENT_GOT_ITEMFINDER UnknownScript_0x9a614: writetext UnknownText_0x9a70e + waitbutton closetext - loadmovesprites end UnknownScript_0x9a61a: writetext UnknownText_0x9a805 + waitbutton closetext - loadmovesprites end PokedexScript_0x9a620: @@ -34,20 +38,20 @@ PokedexScript_0x9a620: writetext UnknownText_0x9a826 yesorno iftrue UnknownScript_0x9a62a - loadmovesprites + closetext end UnknownScript_0x9a62a: writetext UnknownText_0x9a84c yesorno iftrue UnknownScript_0x9a633 - loadmovesprites + closetext end UnknownScript_0x9a633: writetext UnknownText_0x9a902 + waitbutton closetext - loadmovesprites end ItemFinderHouseRadio: diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index f200a2ed4..4307a19c9 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ECRUTEAKLUGIASPEECHHOUSE_GRAMPS + const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER + EcruteakLugiaSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index d10ee827a..69857bebc 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ECRUTEAKMART_CLERK + const ECRUTEAKMART_SUPER_NERD + const ECRUTEAKMART_GRANNY + EcruteakMart_MapScriptHeader: .MapTriggers: db 0 @@ -8,7 +13,7 @@ EcruteakMart_MapScriptHeader: ClerkScript_0x99c3b: loadfont pokemart MARTTYPE_STANDARD, MART_ECRUTEAK - loadmovesprites + closetext end SuperNerdScript_0x99c42: diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index be51b7764..5ae580950 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const ECRUTEAKPOKECENTER1F_NURSE + const ECRUTEAKPOKECENTER1F_POKEFAN_M + const ECRUTEAKPOKECENTER1F_COOLTRAINER_F + const ECRUTEAKPOKECENTER1F_GYM_GUY + const ECRUTEAKPOKECENTER1F_BILL + EcruteakPokeCenter1F_MapScriptHeader: .MapTriggers: db 2 @@ -19,19 +26,19 @@ UnknownScript_0x98e63: UnknownScript_0x98e64: pause 30 playsound SFX_EXIT_BUILDING - appear $6 - waitbutton - applymovement $6, MovementData_0x98ec5 + appear ECRUTEAKPOKECENTER1F_BILL + waitsfx + applymovement ECRUTEAKPOKECENTER1F_BILL, MovementData_0x98ec5 applymovement PLAYER, MovementData_0x98ed4 - spriteface $2, UP + spriteface ECRUTEAKPOKECENTER1F_NURSE, UP pause 10 - spriteface $2, DOWN + spriteface ECRUTEAKPOKECENTER1F_NURSE, DOWN pause 30 - spriteface $2, UP + spriteface ECRUTEAKPOKECENTER1F_NURSE, UP pause 10 - spriteface $2, DOWN + spriteface ECRUTEAKPOKECENTER1F_NURSE, DOWN pause 20 - spriteface $6, DOWN + spriteface ECRUTEAKPOKECENTER1F_BILL, DOWN pause 10 loadfont writetext UnknownText_0x98ed8 @@ -40,16 +47,16 @@ UnknownScript_0x98e64: UnknownScript_0x98e95: writetext UnknownText_0x98f22 + waitbutton closetext - loadmovesprites spriteface PLAYER, DOWN - applymovement $6, MovementData_0x98ece + applymovement ECRUTEAKPOKECENTER1F_BILL, MovementData_0x98ece playsound SFX_EXIT_BUILDING - disappear $6 + disappear ECRUTEAKPOKECENTER1F_BILL clearevent EVENT_MET_BILL setflag ENGINE_TIME_CAPSULE dotrigger $1 - waitbutton + waitsfx end NurseScript_0x98eb0: diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index 9672611e8..950d7a6f3 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ELMSHOUSE_TEACHER + const ELMSHOUSE_BUG_CATCHER + ElmsHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index af3545944..ffbd6178f 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -1,1416 +1,1424 @@ -ElmsLab_MapScriptHeader: -.MapTriggers: - db 6 - - ; triggers - dw UnknownScript_0x78b7a, 0 - dw UnknownScript_0x78b7e, 0 - dw UnknownScript_0x78b7f, 0 - dw UnknownScript_0x78b80, 0 - dw UnknownScript_0x78b81, 0 - dw UnknownScript_0x78b82, 0 - -.MapCallbacks: - db 1 - - ; callbacks - - dbw 2, ElmsLab_PutElmAtLaptop - -UnknownScript_0x78b7a: - priorityjump ElmsLab_AutowalkUpToElm - end - -UnknownScript_0x78b7e: - end - -UnknownScript_0x78b7f: - end - -UnknownScript_0x78b80: - end - -UnknownScript_0x78b81: - end - -UnknownScript_0x78b82: - end - -ElmsLab_PutElmAtLaptop: - checktriggers - iftrue .Skip - moveperson $2, $3, $4 -.Skip: - return - -ElmsLab_AutowalkUpToElm: - applymovement PLAYER, ElmsLab_WalkUpToElmMovement - showemote EMOTE_SHOCK, $2, 15 - spriteface $2, RIGHT - loadfont - writetext ElmText_Intro -ElmsLab_RefuseLoop: - yesorno - iftrue ElmsLab_ElmGetsEmail - writetext ElmText_Refused - jump ElmsLab_RefuseLoop - -ElmsLab_ElmGetsEmail: - writetext ElmText_Accepted - keeptextopen - writetext ElmText_ResearchAmbitions - closetext - loadmovesprites - playsound SFX_GLASS_TING - pause 30 - showemote EMOTE_SHOCK, $2, 10 - spriteface $2, DOWN - loadfont - writetext ElmText_GotAnEmail - closetext - loadmovesprites - loadfont - spriteface $2, RIGHT - writetext ElmText_MissionFromMrPokemon - closetext - loadmovesprites - applymovement $2, ElmsLab_ElmToDefaultPositionMovement1 - spriteface PLAYER, UP - applymovement $2, ElmsLab_ElmToDefaultPositionMovement2 - spriteface PLAYER, RIGHT - loadfont - writetext ElmText_ChooseAPokemon - closetext - dotrigger $1 - loadmovesprites - end - -ProfElmScript: - faceplayer - loadfont - checkevent EVENT_GOT_SS_TICKET_FROM_ELM - iftrue ElmCheckMasterBall - checkevent EVENT_BEAT_ELITE_FOUR - iftrue ElmGiveTicketScript -ElmCheckMasterBall: - checkevent EVENT_GOT_MASTER_BALL_FROM_ELM - iftrue ElmCheckEverstone - checkflag ENGINE_RISINGBADGE - iftrue ElmGiveMasterBallScript -ElmCheckEverstone: - checkevent EVENT_GOT_EVERSTONE_FROM_ELM - iftrue ElmScript_CallYou - checkevent EVENT_SHOWED_TOGEPI_TO_ELM - iftrue ElmGiveEverstoneScript - checkevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE - iffalse ElmCheckTogepiEgg - writebyte TOGEPI - special Special_FindThatSpeciesYourTrainerID - iftrue ShowElmTogepiScript - writebyte TOGETIC - special Special_FindThatSpeciesYourTrainerID - iftrue ShowElmTogepiScript - writetext UnknownText_0x79a40 - closetext - loadmovesprites - end - -ElmEggHatchedScript: - writebyte TOGEPI - special Special_FindThatSpeciesYourTrainerID - iftrue ShowElmTogepiScript - writebyte TOGETIC - special Special_FindThatSpeciesYourTrainerID - iftrue ShowElmTogepiScript - jump ElmCheckGotEggAgain - -ElmCheckTogepiEgg: - checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE - iffalse ElmCheckGotEggAgain - checkevent EVENT_TOGEPI_HATCHED - iftrue ElmEggHatchedScript -ElmCheckGotEggAgain: - checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE ; why are we checking it again? - iftrue ElmWaitingEggHatchScript - checkflag ENGINE_ZEPHYRBADGE - iftrue ElmAideHasEggScript - checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM - iftrue ElmStudyingEggScript - checkevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON - iftrue ElmAfterTheftScript - checkevent EVENT_GOT_A_POKEMON_FROM_ELM - iftrue ElmDescribesMrPokemonScript - writetext ElmText_LetYourMonBattleIt - closetext - loadmovesprites - end - -LabTryToLeaveScript: - spriteface $2, DOWN - loadfont - writetext LabWhereGoingText - closetext - loadmovesprites - applymovement PLAYER, MovementData_0x78f70 - end - -CyndaquilPokeBallScript: - checkevent EVENT_GOT_A_POKEMON_FROM_ELM - iftrue LookAtElmPokeBallScript - spriteface $2, DOWN - refreshscreen $0 - pokepic CYNDAQUIL - cry CYNDAQUIL - closetext - pokepicyesorno - loadfont - writetext TakeCyndaquilText - yesorno - iffalse DidntChooseStarterScript - disappear $4 - setevent EVENT_GOT_CYNDAQUIL_FROM_ELM - writetext ChoseStarterText - keeptextopen - waitbutton - pokenamemem CYNDAQUIL, $0 - writetext ReceivedStarterText - playsound SFX_CAUGHT_MON - waitbutton - keeptextopen - givepoke CYNDAQUIL, 5, BERRY - loadmovesprites - checkcode VAR_FACING - if_equal $3, ElmDirectionsScript - applymovement PLAYER, AfterCyndaquilMovement - jump ElmDirectionsScript - -TotodilePokeBallScript: - checkevent EVENT_GOT_A_POKEMON_FROM_ELM - iftrue LookAtElmPokeBallScript - spriteface $2, DOWN - refreshscreen $0 - pokepic TOTODILE - cry TOTODILE - closetext - pokepicyesorno - loadfont - writetext TakeTotodileText - yesorno - iffalse DidntChooseStarterScript - disappear $5 - setevent EVENT_GOT_TOTODILE_FROM_ELM - writetext ChoseStarterText - keeptextopen - waitbutton - pokenamemem TOTODILE, $0 - writetext ReceivedStarterText - playsound SFX_CAUGHT_MON - waitbutton - keeptextopen - givepoke TOTODILE, 5, BERRY - loadmovesprites - applymovement PLAYER, AfterTotodileMovement - jump ElmDirectionsScript - -ChikoritaPokeBallScript: - checkevent EVENT_GOT_A_POKEMON_FROM_ELM - iftrue LookAtElmPokeBallScript - spriteface $2, DOWN - refreshscreen $0 - pokepic CHIKORITA - cry CHIKORITA - closetext - pokepicyesorno - loadfont - writetext TakeChikoritaText - yesorno - iffalse DidntChooseStarterScript - disappear $6 - setevent EVENT_GOT_CHIKORITA_FROM_ELM - writetext ChoseStarterText - keeptextopen - waitbutton - pokenamemem CHIKORITA, $0 - writetext ReceivedStarterText - playsound SFX_CAUGHT_MON - waitbutton - keeptextopen - givepoke CHIKORITA, 5, BERRY - loadmovesprites - applymovement PLAYER, AfterChikoritaMovement - jump ElmDirectionsScript - -DidntChooseStarterScript: - writetext DidntChooseStarterText - closetext - loadmovesprites - end - -ElmDirectionsScript: - spriteface PLAYER, UP - loadfont - writetext ElmDirectionsText1 - closetext - loadmovesprites - addcellnum PHONE_ELM - loadfont - writetext GotElmsNumberText - playsound SFX_REGISTER_PHONE_NUMBER - waitbutton - closetext - loadmovesprites - spriteface $2, LEFT - loadfont - writetext ElmDirectionsText2 - closetext - loadmovesprites - spriteface $2, DOWN - loadfont - writetext ElmDirectionsText3 - closetext - loadmovesprites - setevent EVENT_GOT_A_POKEMON_FROM_ELM - setevent EVENT_RIVAL_CHERRYGROVE_CITY - dotrigger $5 - domaptrigger NEW_BARK_TOWN, $1 - end - -ElmDescribesMrPokemonScript: - writetext ElmDescribesMrPokemonText - closetext - loadmovesprites - end - -LookAtElmPokeBallScript: - loadfont - writetext ElmPokeBallText - closetext - loadmovesprites - end - -ElmsLabHealingMachine: - loadfont - checkevent EVENT_GOT_A_POKEMON_FROM_ELM - iftrue .CanHeal - writetext ElmsLabHealingMachineText1 - closetext - loadmovesprites - end - -.CanHeal - writetext ElmsLabHealingMachineText2 - yesorno - iftrue ElmsLabHealingMachine_HealParty - loadmovesprites - end - -ElmsLabHealingMachine_HealParty: - special Mobile_HealParty - special HealParty - playmusic MUSIC_NONE - writebyte 1 ; Machine is in Elm's Lab - special HealMachineAnim - pause 30 - special RestartMapMusic - loadmovesprites - end - -ElmAfterTheftDoneScript: - closetext - loadmovesprites - end - -ElmAfterTheftScript: - writetext ElmAfterTheftText1 - checkitem MYSTERY_EGG - iffalse ElmAfterTheftDoneScript - keeptextopen - writetext ElmAfterTheftText2 - closetext - takeitem MYSTERY_EGG - scall ElmJumpBackScript1 - writetext ElmAfterTheftText3 - closetext - scall ElmJumpBackScript2 - writetext ElmAfterTheftText4 - keeptextopen - writetext ElmAfterTheftText5 - keeptextopen - setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM - setflag ENGINE_BUG_CONTEST_ON - domaptrigger ROUTE_29, $1 - clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY - setevent EVENT_ROUTE_30_BATTLE - writetext ElmAfterTheftText6 - closetext - loadmovesprites - dotrigger $6 - end - -ElmStudyingEggScript: - writetext ElmStudyingEggText - closetext - loadmovesprites - end - -ElmAideHasEggScript: - writetext ElmAideHasEggText - closetext - loadmovesprites - end - -ElmWaitingEggHatchScript: - writetext ElmWaitingEggHatchText - closetext - loadmovesprites - end - -ShowElmTogepiScript: - writetext ShowElmTogepiText1 - closetext - loadmovesprites - showemote EMOTE_SHOCK, $2, 15 - setevent EVENT_SHOWED_TOGEPI_TO_ELM - loadfont - writetext ShowElmTogepiText2 - keeptextopen - writetext ShowElmTogepiText3 - keeptextopen -ElmGiveEverstoneScript: - writetext ElmGiveEverstoneText1 - keeptextopen - verbosegiveitem EVERSTONE - iffalse ElmScript_NoRoomForEverstone - writetext ElmGiveEverstoneText2 - closetext - loadmovesprites - setevent EVENT_GOT_EVERSTONE_FROM_ELM - end - -ElmScript_CallYou: - writetext ElmText_CallYou - closetext -ElmScript_NoRoomForEverstone: - loadmovesprites - end - -ElmGiveMasterBallScript: - writetext ElmGiveMasterBallText1 - keeptextopen - verbosegiveitem MASTER_BALL - iffalse .notdone - setevent EVENT_GOT_MASTER_BALL_FROM_ELM - writetext ElmGiveMasterBallText2 - closetext -.notdone - loadmovesprites - end - -ElmGiveTicketScript: - writetext ElmGiveTicketText1 - keeptextopen - verbosegiveitem S_S_TICKET - setevent EVENT_GOT_SS_TICKET_FROM_ELM - writetext ElmGiveTicketText2 - closetext - loadmovesprites - end - -ElmJumpBackScript1: - loadmovesprites - checkcode VAR_FACING - if_equal DOWN, ElmJumpDownScript - if_equal UP, ElmJumpUpScript - if_equal LEFT, ElmJumpLeftScript - if_equal RIGHT, ElmJumpRightScript - end - -ElmJumpBackScript2: - loadmovesprites - checkcode VAR_FACING - if_equal DOWN, ElmJumpUpScript - if_equal UP, ElmJumpDownScript - if_equal LEFT, ElmJumpRightScript - if_equal RIGHT, ElmJumpLeftScript - end - -ElmJumpUpScript: - applymovement $2, ElmJumpUpMovement - loadfont - end - -ElmJumpDownScript: - applymovement $2, ElmJumpDownMovement - loadfont - end - -ElmJumpLeftScript: - applymovement $2, ElmJumpLeftMovement - loadfont - end - -ElmJumpRightScript: - applymovement $2, ElmJumpRightMovement - loadfont - end - -AideScript_WalkPotions1: - applymovement $3, AideWalksRight1 - spriteface PLAYER, DOWN - scall AideScript_GivePotions - applymovement $3, AideWalksLeft1 - end - -AideScript_WalkPotions2: - applymovement $3, AideWalksRight2 - spriteface PLAYER, DOWN - scall AideScript_GivePotions - applymovement $3, AideWalksLeft2 - end - -AideScript_GivePotions: - loadfont - writetext AideText_GiveYouPotions - keeptextopen - verbosegiveitem POTION - writetext AideText_AlwaysBusy - closetext - loadmovesprites - dotrigger $2 - end - -AideScript_WalkBalls1: - applymovement $3, AideWalksRight1 - spriteface PLAYER, DOWN - scall AideScript_GiveYouBalls - applymovement $3, AideWalksLeft1 - end - -AideScript_WalkBalls2: - applymovement $3, AideWalksRight2 - spriteface PLAYER, DOWN - scall AideScript_GiveYouBalls - applymovement $3, AideWalksLeft2 - end - -AideScript_GiveYouBalls: - loadfont - writetext AideText_GiveYouBalls - keeptextopen - itemtotext POKE_BALL, $1 - scall AideScript_ReceiveTheBalls - giveitem POKE_BALL, 5 - writetext AideText_ExplainBalls - keeptextopen - itemnotify - loadmovesprites - dotrigger $2 - end - -AideScript_ReceiveTheBalls: - jumpstd receiveitem - end - -ElmsAideScript: - faceplayer - loadfont - checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE - iftrue AideScript_AfterTheft - checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM - iftrue AideScript_ExplainBalls - checkevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON - iftrue AideScript_TheftTestimony - writetext AideText_AlwaysBusy - closetext - loadmovesprites - end - -AideScript_TheftTestimony: - writetext AideText_TheftTestimony - closetext - loadmovesprites - end - -AideScript_ExplainBalls: - writetext AideText_ExplainBalls - closetext - loadmovesprites - end - -AideScript_AfterTheft: - writetext AideText_AfterTheft - closetext - loadmovesprites - end - -MeetCopScript2: - applymovement PLAYER, MeetCopScript2_StepLeft - -MeetCopScript: - applymovement PLAYER, MeetCopScript_WalkUp -CopScript: - spriteface $7, LEFT - loadfont - writetext ElmsLabOfficerText1 - keeptextopen - special SpecialNameRival - writetext ElmsLabOfficerText2 - closetext - loadmovesprites - applymovement $7, OfficerLeavesMovement - disappear $7 - dotrigger $2 - end - -ElmsLabWindow: - loadfont - checkflag ENGINE_FLYPOINT_VIOLET - iftrue .Normal - checkevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON - iftrue .BreakIn - jump .Normal - -.BreakIn - writetext ElmsLabWindowText2 - closetext - loadmovesprites - end - -.Normal - writetext ElmsLabWindowText1 - closetext - loadmovesprites - end - -ElmsLabTravelTip1: - jumptext ElmsLabTravelTip1Text - -ElmsLabTravelTip2: - jumptext ElmsLabTravelTip2Text - -ElmsLabTravelTip3: - jumptext ElmsLabTravelTip3Text - -ElmsLabTravelTip4: - jumptext ElmsLabTravelTip4Text - -ElmsLabTrashcan: - jumptext ElmsLabTrashcanText - -ElmsLabPC: - jumptext ElmsLabPCText - -ElmsLabTrashcan2: -; unused - jumpstd trashcan - -ElmsLabBookshelf: - jumpstd difficultbookshelf - -ElmsLab_WalkUpToElmMovement: - step_up - step_up - step_up - step_up - step_up - step_up - step_up - turn_head_left - step_end - -MovementData_0x78f70: - step_up - step_end - -MeetCopScript2_StepLeft: - step_left - step_end - -MeetCopScript_WalkUp: - step_up - step_up - turn_head_right - step_end - -OfficerLeavesMovement: - step_down - step_down - step_down - step_down - step_down - step_end - -AideWalksRight1: - step_right - step_right - turn_head_up - step_end - -AideWalksRight2: - step_right - step_right - step_right - turn_head_up - step_end - -AideWalksLeft1: - step_left - step_left - turn_head_down - step_end - -AideWalksLeft2: - step_left - step_left - step_left - turn_head_down - step_end - -ElmJumpUpMovement: - fix_facing - big_step_up - remove_fixed_facing - step_end - -ElmJumpDownMovement: - fix_facing - big_step_down - remove_fixed_facing - step_end - -ElmJumpLeftMovement: - fix_facing - big_step_left - remove_fixed_facing - step_end - -ElmJumpRightMovement: - fix_facing - big_step_right - remove_fixed_facing - step_end - -ElmsLab_ElmToDefaultPositionMovement1: - step_up - step_end - -ElmsLab_ElmToDefaultPositionMovement2: - step_right - step_right - step_up - turn_head_down - step_end - -AfterCyndaquilMovement: - step_left - step_up - turn_head_up - step_end - -AfterTotodileMovement: - step_left - step_left - step_up - turn_head_up - step_end - -AfterChikoritaMovement: - step_left - step_left - step_left - step_up - turn_head_up - step_end - -ElmText_Intro: - text "ELM: <PLAY_G>!" - line "There you are!" - - para "I needed to ask" - line "you a favor." - - para "I'm conducting new" - line "#MON research" - - para "right now. I was" - line "wondering if you" - - para "could help me with" - line "it, <PLAY_G>." - - para "You see…" - - para "I'm writing a" - line "paper that I want" - - para "to present at a" - line "conference." - - para "But there are some" - line "things I don't" - - para "quite understand" - line "yet." - - para "So!" - - para "I'd like you to" - line "raise a #MON" - - para "that I recently" - line "caught." - done - -ElmText_Accepted: - text "Thanks, <PLAY_G>!" - - para "You're a great" - line "help!" - done - -ElmText_Refused: - text "But… Please, I" - line "need your help!" - done - -ElmText_ResearchAmbitions: - text "When I announce my" - line "findings, I'm sure" - - para "we'll delve a bit" - line "deeper into the" - - para "many mysteries of" - line "#MON." - - para "You can count on" - line "it!" - done - -ElmText_GotAnEmail: - text "Oh, hey! I got an" - line "e-mail!" - - para $56, $56, $56 - line "Hm… Uh-huh…" - - para "Okay…" - done - -ElmText_MissionFromMrPokemon: - text "Hey, listen." - - para "I have an acquain-" - line "tance called MR." - cont "#MON." - - para "He keeps finding" - line "weird things and" - - para "raving about his" - line "discoveries." - - para "Anyway, I just got" - line "an e-mail from him" - - para "saying that this" - line "time it's real." - - para "It is intriguing," - line "but we're busy" - - para "with our #MON" - line "research…" - - para "Wait!" - - para "I know!" - - para "<PLAY_G>, can you" - line "go in our place?" - done - -ElmText_ChooseAPokemon: - text "I want you to" - line "raise one of the" - - para "#MON contained" - line "in these BALLS." - - para "You'll be that" - line "#MON's first" - cont "partner, <PLAY_G>!" - - para "Go on. Pick one!" - done - -ElmText_LetYourMonBattleIt: - text "If a wild #MON" - line "appears, let your" - cont "#MON battle it!" - done - -LabWhereGoingText: - text "ELM: Wait! Where" - line "are you going?" - done - -TakeCyndaquilText: - text "ELM: You'll take" - line "CYNDAQUIL, the" - cont "fire #MON?" - done - -TakeTotodileText: - text "ELM: Do you want" - line "TOTODILE, the" - cont "water #MON?" - done - -TakeChikoritaText: - text "ELM: So, you like" - line "CHIKORITA, the" - cont "grass #MON?" - done - -DidntChooseStarterText: - text "ELM: Think it over" - line "carefully." - - para "Your partner is" - line "important." - done - -ChoseStarterText: - text "ELM: I think" - line "that's a great" - cont "#MON too!" - done - -ReceivedStarterText: - text "<PLAYER> received" - line "@" - text_from_ram StringBuffer3 - text "!" - done - -ElmDirectionsText1: - text "MR.#MON lives a" - line "little bit beyond" - - para "CHERRYGROVE, the" - line "next city over." - - para "It's almost a" - line "direct route" - - para "there, so you" - line "can't miss it." - - para "But just in case," - line "here's my phone" - - para "number. Call me if" - line "anything comes up!" - done - -ElmDirectionsText2: - text "If your #MON is" - line "hurt, you should" - - para "heal it with this" - line "machine." - - para "Feel free to use" - line "it anytime." - done - -ElmDirectionsText3: - text "<PLAY_G>, I'm" - line "counting on you!" - done - -GotElmsNumberText: - text "<PLAYER> got ELM's" - line "phone number." - done - -ElmDescribesMrPokemonText: - text "MR.#MON goes" - line "everywhere and" - cont "finds rarities." - - para "Too bad they're" - line "just rare and" - cont "not very useful…" - done - -ElmPokeBallText: - text "It contains a" - line "#MON caught by" - cont "PROF.ELM." - done - -ElmsLabHealingMachineText1: - text "I wonder what this" - line "does?" - done - -ElmsLabHealingMachineText2: - text "Would you like to" - line "heal your #MON?" - done - -ElmAfterTheftText1: - text "ELM: <PLAY_G>, this" - line "is terrible…" - - para "Oh, yes, what was" - line "MR.#MON's big" - cont "discovery?" - done - -ElmAfterTheftText2: - text "<PLAYER> handed" - line "the MYSTERY EGG to" - cont "PROF.ELM." - done - -ElmAfterTheftText3: - text "ELM: This?" - done - -ElmAfterTheftText4: - text "But… Is it a" - line "#MON EGG?" - - para "If it is, it is a" - line "great discovery!" - done - -ElmAfterTheftText5: - text "ELM: What?!?" - - para "PROF.OAK gave you" - line "a #DEX?" - - para "<PLAY_G>, is that" - line "true? Th-that's" - cont "incredible!" - - para "He is superb at" - line "seeing the poten-" - cont "tial of people as" - cont "trainers." - - para "Wow, <PLAY_G>. You" - line "may have what it" - - para "takes to become" - line "the CHAMPION." - - para "You seem to be" - line "getting on great" - cont "with #MON too." - - para "You should take" - line "the #MON GYM" - cont "challenge." - - para "The closest GYM" - line "would be the one" - cont "in VIOLET CITY." - done - -ElmAfterTheftText6: - text "…<PLAY_G>. The" - line "road to the" - - para "championship will" - line "be a long one." - - para "Before you leave," - line "make sure that you" - cont "talk to your mom." - done - -ElmStudyingEggText: - text "ELM: Don't give" - line "up! I'll call if" - - para "I learn anything" - line "about that EGG!" - done - -ElmAideHasEggText: - text "ELM: <PLAY_G>?" - line "Didn't you meet my" - cont "assistant?" - - para "He should have met" - line "you with the EGG" - - para "at VIOLET CITY's" - line "#MON CENTER." - - para "You must have just" - line "missed him. Try to" - cont "catch him there." - done - -ElmWaitingEggHatchText: - text "ELM: Hey, has that" - line "EGG changed any?" - done - -UnknownText_0x79a40: - text "<PLAY_G>? I thought" - line "the EGG hatched." - - para "Where is the" - line "#MON?" - done - -ShowElmTogepiText1: - text "ELM: <PLAY_G>, you" - line "look great!" - done - -ShowElmTogepiText2: - text "What?" - line "That #MON!?!" - done - -ShowElmTogepiText3: - text "The EGG hatched!" - line "So, #MON are" - cont "born from EGGS…" - - para "No, perhaps not" - line "all #MON are." - - para "Wow, there's still" - line "a lot of research" - cont "to be done." - done - -ElmGiveEverstoneText1: - text "Thanks, <PLAY_G>!" - line "You're helping" - - para "unravel #MON" - line "mysteries for us!" - - para "I want you to have" - line "this as a token of" - cont "our appreciation." - done - -ElmGiveEverstoneText2: - text "That's an" - line "EVERSTONE." - - para "Some species of" - line "#MON evolve" - - para "when they grow to" - line "certain levels." - - para "A #MON holding" - line "the EVERSTONE" - cont "won't evolve." - - para "Give it to a #-" - line "MON you don't want" - cont "to evolve." - done - -ElmText_CallYou: - text "ELM: <PLAY_G>, I'll" - line "call you if any-" - cont "thing comes up." - done - -AideText_AfterTheft: - text "…sigh… That" - line "stolen #MON." - - para "I wonder how it's" - line "doing." - - para "They say a #MON" - line "raised by a bad" - - para "person turns bad" - line "itself." - done - -ElmGiveMasterBallText1: - text "ELM: Hi, <PLAY_G>!" - line "Thanks to you, my" - - para "research is going" - line "great!" - - para "Take this as a" - line "token of my" - cont "appreciation." - done - -ElmGiveMasterBallText2: - text "The MASTER BALL is" - line "the best!" - - para "It's the ultimate" - line "BALL! It'll catch" - - para "any #MON with-" - line "out fail." - - para "It's given only to" - line "recognized #MON" - cont "researchers." - - para "I think you can" - line "make much better" - - para "use of it than I" - line "can, <PLAY_G>!" - done - -ElmGiveTicketText1: - text "ELM: <PLAY_G>!" - line "There you are!" - - para "I called because I" - line "have something for" - cont "you." - - para "See? It's an" - line "S.S.TICKET." - - para "Now you can catch" - line "#MON in KANTO." - done - -ElmGiveTicketText2: - text "The ship departs" - line "from OLIVINE CITY." - - para "But you knew that" - line "already, <PLAY_G>." - - para "After all, you've" - line "traveled all over" - cont "with your #MON." - - para "Give my regards to" - line "PROF.OAK in KANTO!" - done - -ElmsLabSignpostText_Egg: - text "It's the #MON" - line "EGG being studied" - cont "by PROF.ELM." - done - -AideText_GiveYouPotions: - text "<PLAY_G>, I want" - line "you to have this" - cont "for your errand." - done - -AideText_AlwaysBusy: - text "There are only two" - line "of us, so we're" - cont "always busy." - done - -AideText_TheftTestimony: - text "There was a loud" - line "noise outside…" - - para "When we went to" - line "look, someone" - cont "stole a #MON." - - para "It's unbelievable" - line "that anyone would" - cont "do that!" - - para "…sigh… That" - line "stolen #MON." - - para "I wonder how it's" - line "doing." - - para "They say a #MON" - line "raised by a bad" - - para "person turns bad" - line "itself." - done - -AideText_GiveYouBalls: - text "<PLAY_G>!" - - para "Use these on your" - line "#DEX quest!" - done - -AideText_ExplainBalls: - text "To add to your" - line "#DEX, you have" - cont "to catch #MON." - - para "Throw # BALLS" - line "at wild #MON" - cont "to get them." - done - -ElmsLabOfficerText1: - text "I heard a #MON" - line "was stolen here…" - - para "I was just getting" - line "some information" - cont "from PROF.ELM." - - para "Apparently, it was" - line "a young male with" - cont "long, red hair…" - - para "What?" - - para "You battled a" - line "trainer like that?" - - para "Did you happen to" - line "get his name?" - done - -ElmsLabOfficerText2: - text "OK! So <RIVAL>" - line "was his name." - - para "Thanks for helping" - line "my investigation!" - done - -ElmsLabWindowText1: - text "The window's open." - - para "A pleasant breeze" - line "is blowing in." - done - -ElmsLabWindowText2: - text "He broke in" - line "through here!" - done - -ElmsLabTravelTip1Text: - text "<PLAYER> opened a" - line "book." - - para "Travel Tip 1:" - - para "Press START to" - line "open the MENU." - done - -ElmsLabTravelTip2Text: - text "<PLAYER> opened a" - line "book." - - para "Travel Tip 2:" - - para "Record your trip" - line "with SAVE!" - done - -ElmsLabTravelTip3Text: - text "<PLAYER> opened a" - line "book." - - para "Travel Tip 3:" - - para "Open your PACK and" - line "press SELECT to" - cont "move items." - done - -ElmsLabTravelTip4Text: - text "<PLAYER> opened a" - line "book." - - para "Travel Tip 4:" - - para "Check your #MON" - line "moves. Press the" - - para "A Button to switch" - line "moves." - done - -ElmsLabTrashcanText: - text "The wrapper from" - line "the snack PROF.ELM" - cont "ate is in there…" - done - -ElmsLabPCText: - text "OBSERVATIONS ON" - line "#MON EVOLUTION" - - para "…It says on the" - line "screen…" - done - -ElmsLab_MapEventHeader: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def $b, $4, 1, NEW_BARK_TOWN - warp_def $b, $5, 1, NEW_BARK_TOWN - -.XYTriggers: - db 8 - xy_trigger 1, $6, $4, $0, LabTryToLeaveScript, $0, $0 - xy_trigger 1, $6, $5, $0, LabTryToLeaveScript, $0, $0 - xy_trigger 3, $5, $4, $0, MeetCopScript, $0, $0 - xy_trigger 3, $5, $5, $0, MeetCopScript2, $0, $0 - xy_trigger 5, $8, $4, $0, AideScript_WalkPotions1, $0, $0 - xy_trigger 5, $8, $5, $0, AideScript_WalkPotions2, $0, $0 - xy_trigger 6, $8, $4, $0, AideScript_WalkBalls1, $0, $0 - xy_trigger 6, $8, $5, $0, AideScript_WalkBalls2, $0, $0 - -.Signposts: - db 16 - signpost 1, 2, SIGNPOST_READ, ElmsLabHealingMachine - signpost 1, 6, SIGNPOST_READ, ElmsLabBookshelf - signpost 1, 7, SIGNPOST_READ, ElmsLabBookshelf - signpost 1, 8, SIGNPOST_READ, ElmsLabBookshelf - signpost 1, 9, SIGNPOST_READ, ElmsLabBookshelf - signpost 7, 0, SIGNPOST_READ, ElmsLabTravelTip1 - signpost 7, 1, SIGNPOST_READ, ElmsLabTravelTip2 - signpost 7, 2, SIGNPOST_READ, ElmsLabTravelTip3 - signpost 7, 3, SIGNPOST_READ, ElmsLabTravelTip4 - signpost 7, 6, SIGNPOST_READ, ElmsLabBookshelf - signpost 7, 7, SIGNPOST_READ, ElmsLabBookshelf - signpost 7, 8, SIGNPOST_READ, ElmsLabBookshelf - signpost 7, 9, SIGNPOST_READ, ElmsLabBookshelf - signpost 3, 9, SIGNPOST_READ, ElmsLabTrashcan - signpost 0, 5, SIGNPOST_READ, ElmsLabWindow - signpost 5, 3, SIGNPOST_DOWN, ElmsLabPC - -.PersonEvents: - db 6 - person_event SPRITE_ELM, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ProfElmScript, -1 - person_event SPRITE_SCIENTIST, 9, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB - person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB - person_event SPRITE_POKE_BALL, 3, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB - person_event SPRITE_POKE_BALL, 3, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB - person_event SPRITE_OFFICER, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB +const_value set 2
+ const ELMSLAB_ELM
+ const ELMSLAB_SCIENTIST
+ const ELMSLAB_POKE_BALL1
+ const ELMSLAB_POKE_BALL2
+ const ELMSLAB_POKE_BALL3
+ const ELMSLAB_OFFICER
+
+ElmsLab_MapScriptHeader:
+.MapTriggers:
+ db 6
+
+ ; triggers
+ dw .Trigger0, 0
+ dw .Trigger1, 0
+ dw .Trigger2, 0
+ dw .Trigger3, 0
+ dw .Trigger4, 0
+ dw .Trigger5, 0
+
+.MapCallbacks:
+ db 1
+
+ ; callbacks
+
+ dbw 2, .Callback_MoveElm
+
+.Trigger0:
+ priorityjump ElmsLab_AutowalkUpToElm
+ end
+
+.Trigger1:
+ end
+
+.Trigger2:
+ end
+
+.Trigger3:
+ end
+
+.Trigger4:
+ end
+
+.Trigger5:
+ end
+
+.Callback_MoveElm:
+ checktriggers
+ iftrue .Skip
+ moveperson ELMSLAB_ELM, $3, $4
+.Skip:
+ return
+
+ElmsLab_AutowalkUpToElm:
+ applymovement PLAYER, ElmsLab_WalkUpToElmMovement
+ showemote EMOTE_SHOCK, ELMSLAB_ELM, 15
+ spriteface ELMSLAB_ELM, RIGHT
+ loadfont
+ writetext ElmText_Intro
+ElmsLab_RefuseLoop:
+ yesorno
+ iftrue ElmsLab_ElmGetsEmail
+ writetext ElmText_Refused
+ jump ElmsLab_RefuseLoop
+
+ElmsLab_ElmGetsEmail:
+ writetext ElmText_Accepted
+ keeptextopen
+ writetext ElmText_ResearchAmbitions
+ waitbutton
+ closetext
+ playsound SFX_GLASS_TING
+ pause 30
+ showemote EMOTE_SHOCK, ELMSLAB_ELM, 10
+ spriteface ELMSLAB_ELM, DOWN
+ loadfont
+ writetext ElmText_GotAnEmail
+ waitbutton
+ closetext
+ loadfont
+ spriteface ELMSLAB_ELM, RIGHT
+ writetext ElmText_MissionFromMrPokemon
+ waitbutton
+ closetext
+ applymovement ELMSLAB_ELM, ElmsLab_ElmToDefaultPositionMovement1
+ spriteface PLAYER, UP
+ applymovement ELMSLAB_ELM, ElmsLab_ElmToDefaultPositionMovement2
+ spriteface PLAYER, RIGHT
+ loadfont
+ writetext ElmText_ChooseAPokemon
+ waitbutton
+ dotrigger $1
+ closetext
+ end
+
+ProfElmScript:
+ faceplayer
+ loadfont
+ checkevent EVENT_GOT_SS_TICKET_FROM_ELM
+ iftrue ElmCheckMasterBall
+ checkevent EVENT_BEAT_ELITE_FOUR
+ iftrue ElmGiveTicketScript
+ElmCheckMasterBall:
+ checkevent EVENT_GOT_MASTER_BALL_FROM_ELM
+ iftrue ElmCheckEverstone
+ checkflag ENGINE_RISINGBADGE
+ iftrue ElmGiveMasterBallScript
+ElmCheckEverstone:
+ checkevent EVENT_GOT_EVERSTONE_FROM_ELM
+ iftrue ElmScript_CallYou
+ checkevent EVENT_SHOWED_TOGEPI_TO_ELM
+ iftrue ElmGiveEverstoneScript
+ checkevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE
+ iffalse ElmCheckTogepiEgg
+ writebyte TOGEPI
+ special Special_FindThatSpeciesYourTrainerID
+ iftrue ShowElmTogepiScript
+ writebyte TOGETIC
+ special Special_FindThatSpeciesYourTrainerID
+ iftrue ShowElmTogepiScript
+ writetext UnknownText_0x79a40
+ waitbutton
+ closetext
+ end
+
+ElmEggHatchedScript:
+ writebyte TOGEPI
+ special Special_FindThatSpeciesYourTrainerID
+ iftrue ShowElmTogepiScript
+ writebyte TOGETIC
+ special Special_FindThatSpeciesYourTrainerID
+ iftrue ShowElmTogepiScript
+ jump ElmCheckGotEggAgain
+
+ElmCheckTogepiEgg:
+ checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
+ iffalse ElmCheckGotEggAgain
+ checkevent EVENT_TOGEPI_HATCHED
+ iftrue ElmEggHatchedScript
+ElmCheckGotEggAgain:
+ checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE ; why are we checking it again?
+ iftrue ElmWaitingEggHatchScript
+ checkflag ENGINE_ZEPHYRBADGE
+ iftrue ElmAideHasEggScript
+ checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
+ iftrue ElmStudyingEggScript
+ checkevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON
+ iftrue ElmAfterTheftScript
+ checkevent EVENT_GOT_A_POKEMON_FROM_ELM
+ iftrue ElmDescribesMrPokemonScript
+ writetext ElmText_LetYourMonBattleIt
+ waitbutton
+ closetext
+ end
+
+LabTryToLeaveScript:
+ spriteface ELMSLAB_ELM, DOWN
+ loadfont
+ writetext LabWhereGoingText
+ waitbutton
+ closetext
+ applymovement PLAYER, MovementData_0x78f70
+ end
+
+CyndaquilPokeBallScript:
+ checkevent EVENT_GOT_A_POKEMON_FROM_ELM
+ iftrue LookAtElmPokeBallScript
+ spriteface ELMSLAB_ELM, DOWN
+ refreshscreen $0
+ pokepic CYNDAQUIL
+ cry CYNDAQUIL
+ waitbutton
+ closepokepic
+ loadfont
+ writetext TakeCyndaquilText
+ yesorno
+ iffalse DidntChooseStarterScript
+ disappear ELMSLAB_POKE_BALL1
+ setevent EVENT_GOT_CYNDAQUIL_FROM_ELM
+ writetext ChoseStarterText
+ keeptextopen
+ waitsfx
+ pokenamemem CYNDAQUIL, $0
+ writetext ReceivedStarterText
+ playsound SFX_CAUGHT_MON
+ waitsfx
+ keeptextopen
+ givepoke CYNDAQUIL, 5, BERRY
+ closetext
+ checkcode VAR_FACING
+ if_equal RIGHT, ElmDirectionsScript
+ applymovement PLAYER, AfterCyndaquilMovement
+ jump ElmDirectionsScript
+
+TotodilePokeBallScript:
+ checkevent EVENT_GOT_A_POKEMON_FROM_ELM
+ iftrue LookAtElmPokeBallScript
+ spriteface ELMSLAB_ELM, DOWN
+ refreshscreen $0
+ pokepic TOTODILE
+ cry TOTODILE
+ waitbutton
+ closepokepic
+ loadfont
+ writetext TakeTotodileText
+ yesorno
+ iffalse DidntChooseStarterScript
+ disappear ELMSLAB_POKE_BALL2
+ setevent EVENT_GOT_TOTODILE_FROM_ELM
+ writetext ChoseStarterText
+ keeptextopen
+ waitsfx
+ pokenamemem TOTODILE, $0
+ writetext ReceivedStarterText
+ playsound SFX_CAUGHT_MON
+ waitsfx
+ keeptextopen
+ givepoke TOTODILE, 5, BERRY
+ closetext
+ applymovement PLAYER, AfterTotodileMovement
+ jump ElmDirectionsScript
+
+ChikoritaPokeBallScript:
+ checkevent EVENT_GOT_A_POKEMON_FROM_ELM
+ iftrue LookAtElmPokeBallScript
+ spriteface ELMSLAB_ELM, DOWN
+ refreshscreen $0
+ pokepic CHIKORITA
+ cry CHIKORITA
+ waitbutton
+ closepokepic
+ loadfont
+ writetext TakeChikoritaText
+ yesorno
+ iffalse DidntChooseStarterScript
+ disappear ELMSLAB_POKE_BALL3
+ setevent EVENT_GOT_CHIKORITA_FROM_ELM
+ writetext ChoseStarterText
+ keeptextopen
+ waitsfx
+ pokenamemem CHIKORITA, $0
+ writetext ReceivedStarterText
+ playsound SFX_CAUGHT_MON
+ waitsfx
+ keeptextopen
+ givepoke CHIKORITA, 5, BERRY
+ closetext
+ applymovement PLAYER, AfterChikoritaMovement
+ jump ElmDirectionsScript
+
+DidntChooseStarterScript:
+ writetext DidntChooseStarterText
+ waitbutton
+ closetext
+ end
+
+ElmDirectionsScript:
+ spriteface PLAYER, UP
+ loadfont
+ writetext ElmDirectionsText1
+ waitbutton
+ closetext
+ addcellnum PHONE_ELM
+ loadfont
+ writetext GotElmsNumberText
+ playsound SFX_REGISTER_PHONE_NUMBER
+ waitsfx
+ waitbutton
+ closetext
+ spriteface ELMSLAB_ELM, LEFT
+ loadfont
+ writetext ElmDirectionsText2
+ waitbutton
+ closetext
+ spriteface ELMSLAB_ELM, DOWN
+ loadfont
+ writetext ElmDirectionsText3
+ waitbutton
+ closetext
+ setevent EVENT_GOT_A_POKEMON_FROM_ELM
+ setevent EVENT_RIVAL_CHERRYGROVE_CITY
+ dotrigger $5
+ domaptrigger NEW_BARK_TOWN, $1
+ end
+
+ElmDescribesMrPokemonScript:
+ writetext ElmDescribesMrPokemonText
+ waitbutton
+ closetext
+ end
+
+LookAtElmPokeBallScript:
+ loadfont
+ writetext ElmPokeBallText
+ waitbutton
+ closetext
+ end
+
+ElmsLabHealingMachine:
+ loadfont
+ checkevent EVENT_GOT_A_POKEMON_FROM_ELM
+ iftrue .CanHeal
+ writetext ElmsLabHealingMachineText1
+ waitbutton
+ closetext
+ end
+
+.CanHeal
+ writetext ElmsLabHealingMachineText2
+ yesorno
+ iftrue ElmsLabHealingMachine_HealParty
+ closetext
+ end
+
+ElmsLabHealingMachine_HealParty:
+ special Mobile_HealParty
+ special HealParty
+ playmusic MUSIC_NONE
+ writebyte 1 ; Machine is in Elm's Lab
+ special HealMachineAnim
+ pause 30
+ special RestartMapMusic
+ closetext
+ end
+
+ElmAfterTheftDoneScript:
+ waitbutton
+ closetext
+ end
+
+ElmAfterTheftScript:
+ writetext ElmAfterTheftText1
+ checkitem MYSTERY_EGG
+ iffalse ElmAfterTheftDoneScript
+ keeptextopen
+ writetext ElmAfterTheftText2
+ waitbutton
+ takeitem MYSTERY_EGG
+ scall ElmJumpBackScript1
+ writetext ElmAfterTheftText3
+ waitbutton
+ scall ElmJumpBackScript2
+ writetext ElmAfterTheftText4
+ keeptextopen
+ writetext ElmAfterTheftText5
+ keeptextopen
+ setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
+ setflag ENGINE_BUG_CONTEST_ON
+ domaptrigger ROUTE_29, $1
+ clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY
+ setevent EVENT_ROUTE_30_BATTLE
+ writetext ElmAfterTheftText6
+ waitbutton
+ closetext
+ dotrigger $6
+ end
+
+ElmStudyingEggScript:
+ writetext ElmStudyingEggText
+ waitbutton
+ closetext
+ end
+
+ElmAideHasEggScript:
+ writetext ElmAideHasEggText
+ waitbutton
+ closetext
+ end
+
+ElmWaitingEggHatchScript:
+ writetext ElmWaitingEggHatchText
+ waitbutton
+ closetext
+ end
+
+ShowElmTogepiScript:
+ writetext ShowElmTogepiText1
+ waitbutton
+ closetext
+ showemote EMOTE_SHOCK, ELMSLAB_ELM, 15
+ setevent EVENT_SHOWED_TOGEPI_TO_ELM
+ loadfont
+ writetext ShowElmTogepiText2
+ keeptextopen
+ writetext ShowElmTogepiText3
+ keeptextopen
+ElmGiveEverstoneScript:
+ writetext ElmGiveEverstoneText1
+ keeptextopen
+ verbosegiveitem EVERSTONE
+ iffalse ElmScript_NoRoomForEverstone
+ writetext ElmGiveEverstoneText2
+ waitbutton
+ closetext
+ setevent EVENT_GOT_EVERSTONE_FROM_ELM
+ end
+
+ElmScript_CallYou:
+ writetext ElmText_CallYou
+ waitbutton
+ElmScript_NoRoomForEverstone:
+ closetext
+ end
+
+ElmGiveMasterBallScript:
+ writetext ElmGiveMasterBallText1
+ keeptextopen
+ verbosegiveitem MASTER_BALL
+ iffalse .notdone
+ setevent EVENT_GOT_MASTER_BALL_FROM_ELM
+ writetext ElmGiveMasterBallText2
+ waitbutton
+.notdone
+ closetext
+ end
+
+ElmGiveTicketScript:
+ writetext ElmGiveTicketText1
+ keeptextopen
+ verbosegiveitem S_S_TICKET
+ setevent EVENT_GOT_SS_TICKET_FROM_ELM
+ writetext ElmGiveTicketText2
+ waitbutton
+ closetext
+ end
+
+ElmJumpBackScript1:
+ closetext
+ checkcode VAR_FACING
+ if_equal DOWN, ElmJumpDownScript
+ if_equal UP, ElmJumpUpScript
+ if_equal LEFT, ElmJumpLeftScript
+ if_equal RIGHT, ElmJumpRightScript
+ end
+
+ElmJumpBackScript2:
+ closetext
+ checkcode VAR_FACING
+ if_equal DOWN, ElmJumpUpScript
+ if_equal UP, ElmJumpDownScript
+ if_equal LEFT, ElmJumpRightScript
+ if_equal RIGHT, ElmJumpLeftScript
+ end
+
+ElmJumpUpScript:
+ applymovement ELMSLAB_ELM, ElmJumpUpMovement
+ loadfont
+ end
+
+ElmJumpDownScript:
+ applymovement ELMSLAB_ELM, ElmJumpDownMovement
+ loadfont
+ end
+
+ElmJumpLeftScript:
+ applymovement ELMSLAB_ELM, ElmJumpLeftMovement
+ loadfont
+ end
+
+ElmJumpRightScript:
+ applymovement ELMSLAB_ELM, ElmJumpRightMovement
+ loadfont
+ end
+
+AideScript_WalkPotions1:
+ applymovement ELMSLAB_SCIENTIST, AideWalksRight1
+ spriteface PLAYER, DOWN
+ scall AideScript_GivePotions
+ applymovement ELMSLAB_SCIENTIST, AideWalksLeft1
+ end
+
+AideScript_WalkPotions2:
+ applymovement ELMSLAB_SCIENTIST, AideWalksRight2
+ spriteface PLAYER, DOWN
+ scall AideScript_GivePotions
+ applymovement ELMSLAB_SCIENTIST, AideWalksLeft2
+ end
+
+AideScript_GivePotions:
+ loadfont
+ writetext AideText_GiveYouPotions
+ keeptextopen
+ verbosegiveitem POTION
+ writetext AideText_AlwaysBusy
+ waitbutton
+ closetext
+ dotrigger $2
+ end
+
+AideScript_WalkBalls1:
+ applymovement ELMSLAB_SCIENTIST, AideWalksRight1
+ spriteface PLAYER, DOWN
+ scall AideScript_GiveYouBalls
+ applymovement ELMSLAB_SCIENTIST, AideWalksLeft1
+ end
+
+AideScript_WalkBalls2:
+ applymovement ELMSLAB_SCIENTIST, AideWalksRight2
+ spriteface PLAYER, DOWN
+ scall AideScript_GiveYouBalls
+ applymovement ELMSLAB_SCIENTIST, AideWalksLeft2
+ end
+
+AideScript_GiveYouBalls:
+ loadfont
+ writetext AideText_GiveYouBalls
+ keeptextopen
+ itemtotext POKE_BALL, $1
+ scall AideScript_ReceiveTheBalls
+ giveitem POKE_BALL, 5
+ writetext AideText_ExplainBalls
+ keeptextopen
+ itemnotify
+ closetext
+ dotrigger $2
+ end
+
+AideScript_ReceiveTheBalls:
+ jumpstd receiveitem
+ end
+
+ElmsAideScript:
+ faceplayer
+ loadfont
+ checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
+ iftrue AideScript_AfterTheft
+ checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
+ iftrue AideScript_ExplainBalls
+ checkevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON
+ iftrue AideScript_TheftTestimony
+ writetext AideText_AlwaysBusy
+ waitbutton
+ closetext
+ end
+
+AideScript_TheftTestimony:
+ writetext AideText_TheftTestimony
+ waitbutton
+ closetext
+ end
+
+AideScript_ExplainBalls:
+ writetext AideText_ExplainBalls
+ waitbutton
+ closetext
+ end
+
+AideScript_AfterTheft:
+ writetext AideText_AfterTheft
+ waitbutton
+ closetext
+ end
+
+MeetCopScript2:
+ applymovement PLAYER, MeetCopScript2_StepLeft
+
+MeetCopScript:
+ applymovement PLAYER, MeetCopScript_WalkUp
+CopScript:
+ spriteface ELMSLAB_OFFICER, LEFT
+ loadfont
+ writetext ElmsLabOfficerText1
+ keeptextopen
+ special SpecialNameRival
+ writetext ElmsLabOfficerText2
+ waitbutton
+ closetext
+ applymovement ELMSLAB_OFFICER, OfficerLeavesMovement
+ disappear ELMSLAB_OFFICER
+ dotrigger $2
+ end
+
+ElmsLabWindow:
+ loadfont
+ checkflag ENGINE_FLYPOINT_VIOLET
+ iftrue .Normal
+ checkevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON
+ iftrue .BreakIn
+ jump .Normal
+
+.BreakIn
+ writetext ElmsLabWindowText2
+ waitbutton
+ closetext
+ end
+
+.Normal
+ writetext ElmsLabWindowText1
+ waitbutton
+ closetext
+ end
+
+ElmsLabTravelTip1:
+ jumptext ElmsLabTravelTip1Text
+
+ElmsLabTravelTip2:
+ jumptext ElmsLabTravelTip2Text
+
+ElmsLabTravelTip3:
+ jumptext ElmsLabTravelTip3Text
+
+ElmsLabTravelTip4:
+ jumptext ElmsLabTravelTip4Text
+
+ElmsLabTrashcan:
+ jumptext ElmsLabTrashcanText
+
+ElmsLabPC:
+ jumptext ElmsLabPCText
+
+ElmsLabTrashcan2:
+; unused
+ jumpstd trashcan
+
+ElmsLabBookshelf:
+ jumpstd difficultbookshelf
+
+ElmsLab_WalkUpToElmMovement:
+ step_up
+ step_up
+ step_up
+ step_up
+ step_up
+ step_up
+ step_up
+ turn_head_left
+ step_end
+
+MovementData_0x78f70:
+ step_up
+ step_end
+
+MeetCopScript2_StepLeft:
+ step_left
+ step_end
+
+MeetCopScript_WalkUp:
+ step_up
+ step_up
+ turn_head_right
+ step_end
+
+OfficerLeavesMovement:
+ step_down
+ step_down
+ step_down
+ step_down
+ step_down
+ step_end
+
+AideWalksRight1:
+ step_right
+ step_right
+ turn_head_up
+ step_end
+
+AideWalksRight2:
+ step_right
+ step_right
+ step_right
+ turn_head_up
+ step_end
+
+AideWalksLeft1:
+ step_left
+ step_left
+ turn_head_down
+ step_end
+
+AideWalksLeft2:
+ step_left
+ step_left
+ step_left
+ turn_head_down
+ step_end
+
+ElmJumpUpMovement:
+ fix_facing
+ big_step_up
+ remove_fixed_facing
+ step_end
+
+ElmJumpDownMovement:
+ fix_facing
+ big_step_down
+ remove_fixed_facing
+ step_end
+
+ElmJumpLeftMovement:
+ fix_facing
+ big_step_left
+ remove_fixed_facing
+ step_end
+
+ElmJumpRightMovement:
+ fix_facing
+ big_step_right
+ remove_fixed_facing
+ step_end
+
+ElmsLab_ElmToDefaultPositionMovement1:
+ step_up
+ step_end
+
+ElmsLab_ElmToDefaultPositionMovement2:
+ step_right
+ step_right
+ step_up
+ turn_head_down
+ step_end
+
+AfterCyndaquilMovement:
+ step_left
+ step_up
+ turn_head_up
+ step_end
+
+AfterTotodileMovement:
+ step_left
+ step_left
+ step_up
+ turn_head_up
+ step_end
+
+AfterChikoritaMovement:
+ step_left
+ step_left
+ step_left
+ step_up
+ turn_head_up
+ step_end
+
+ElmText_Intro:
+ text "ELM: <PLAY_G>!"
+ line "There you are!"
+
+ para "I needed to ask"
+ line "you a favor."
+
+ para "I'm conducting new"
+ line "#MON research"
+
+ para "right now. I was"
+ line "wondering if you"
+
+ para "could help me with"
+ line "it, <PLAY_G>."
+
+ para "You see…"
+
+ para "I'm writing a"
+ line "paper that I want"
+
+ para "to present at a"
+ line "conference."
+
+ para "But there are some"
+ line "things I don't"
+
+ para "quite understand"
+ line "yet."
+
+ para "So!"
+
+ para "I'd like you to"
+ line "raise a #MON"
+
+ para "that I recently"
+ line "caught."
+ done
+
+ElmText_Accepted:
+ text "Thanks, <PLAY_G>!"
+
+ para "You're a great"
+ line "help!"
+ done
+
+ElmText_Refused:
+ text "But… Please, I"
+ line "need your help!"
+ done
+
+ElmText_ResearchAmbitions:
+ text "When I announce my"
+ line "findings, I'm sure"
+
+ para "we'll delve a bit"
+ line "deeper into the"
+
+ para "many mysteries of"
+ line "#MON."
+
+ para "You can count on"
+ line "it!"
+ done
+
+ElmText_GotAnEmail:
+ text "Oh, hey! I got an"
+ line "e-mail!"
+
+ para $56, $56, $56
+ line "Hm… Uh-huh…"
+
+ para "Okay…"
+ done
+
+ElmText_MissionFromMrPokemon:
+ text "Hey, listen."
+
+ para "I have an acquain-"
+ line "tance called MR."
+ cont "#MON."
+
+ para "He keeps finding"
+ line "weird things and"
+
+ para "raving about his"
+ line "discoveries."
+
+ para "Anyway, I just got"
+ line "an e-mail from him"
+
+ para "saying that this"
+ line "time it's real."
+
+ para "It is intriguing,"
+ line "but we're busy"
+
+ para "with our #MON"
+ line "research…"
+
+ para "Wait!"
+
+ para "I know!"
+
+ para "<PLAY_G>, can you"
+ line "go in our place?"
+ done
+
+ElmText_ChooseAPokemon:
+ text "I want you to"
+ line "raise one of the"
+
+ para "#MON contained"
+ line "in these BALLS."
+
+ para "You'll be that"
+ line "#MON's first"
+ cont "partner, <PLAY_G>!"
+
+ para "Go on. Pick one!"
+ done
+
+ElmText_LetYourMonBattleIt:
+ text "If a wild #MON"
+ line "appears, let your"
+ cont "#MON battle it!"
+ done
+
+LabWhereGoingText:
+ text "ELM: Wait! Where"
+ line "are you going?"
+ done
+
+TakeCyndaquilText:
+ text "ELM: You'll take"
+ line "CYNDAQUIL, the"
+ cont "fire #MON?"
+ done
+
+TakeTotodileText:
+ text "ELM: Do you want"
+ line "TOTODILE, the"
+ cont "water #MON?"
+ done
+
+TakeChikoritaText:
+ text "ELM: So, you like"
+ line "CHIKORITA, the"
+ cont "grass #MON?"
+ done
+
+DidntChooseStarterText:
+ text "ELM: Think it over"
+ line "carefully."
+
+ para "Your partner is"
+ line "important."
+ done
+
+ChoseStarterText:
+ text "ELM: I think"
+ line "that's a great"
+ cont "#MON too!"
+ done
+
+ReceivedStarterText:
+ text "<PLAYER> received"
+ line "@"
+ text_from_ram StringBuffer3
+ text "!"
+ done
+
+ElmDirectionsText1:
+ text "MR.#MON lives a"
+ line "little bit beyond"
+
+ para "CHERRYGROVE, the"
+ line "next city over."
+
+ para "It's almost a"
+ line "direct route"
+
+ para "there, so you"
+ line "can't miss it."
+
+ para "But just in case,"
+ line "here's my phone"
+
+ para "number. Call me if"
+ line "anything comes up!"
+ done
+
+ElmDirectionsText2:
+ text "If your #MON is"
+ line "hurt, you should"
+
+ para "heal it with this"
+ line "machine."
+
+ para "Feel free to use"
+ line "it anytime."
+ done
+
+ElmDirectionsText3:
+ text "<PLAY_G>, I'm"
+ line "counting on you!"
+ done
+
+GotElmsNumberText:
+ text "<PLAYER> got ELM's"
+ line "phone number."
+ done
+
+ElmDescribesMrPokemonText:
+ text "MR.#MON goes"
+ line "everywhere and"
+ cont "finds rarities."
+
+ para "Too bad they're"
+ line "just rare and"
+ cont "not very useful…"
+ done
+
+ElmPokeBallText:
+ text "It contains a"
+ line "#MON caught by"
+ cont "PROF.ELM."
+ done
+
+ElmsLabHealingMachineText1:
+ text "I wonder what this"
+ line "does?"
+ done
+
+ElmsLabHealingMachineText2:
+ text "Would you like to"
+ line "heal your #MON?"
+ done
+
+ElmAfterTheftText1:
+ text "ELM: <PLAY_G>, this"
+ line "is terrible…"
+
+ para "Oh, yes, what was"
+ line "MR.#MON's big"
+ cont "discovery?"
+ done
+
+ElmAfterTheftText2:
+ text "<PLAYER> handed"
+ line "the MYSTERY EGG to"
+ cont "PROF.ELM."
+ done
+
+ElmAfterTheftText3:
+ text "ELM: This?"
+ done
+
+ElmAfterTheftText4:
+ text "But… Is it a"
+ line "#MON EGG?"
+
+ para "If it is, it is a"
+ line "great discovery!"
+ done
+
+ElmAfterTheftText5:
+ text "ELM: What?!?"
+
+ para "PROF.OAK gave you"
+ line "a #DEX?"
+
+ para "<PLAY_G>, is that"
+ line "true? Th-that's"
+ cont "incredible!"
+
+ para "He is superb at"
+ line "seeing the poten-"
+ cont "tial of people as"
+ cont "trainers."
+
+ para "Wow, <PLAY_G>. You"
+ line "may have what it"
+
+ para "takes to become"
+ line "the CHAMPION."
+
+ para "You seem to be"
+ line "getting on great"
+ cont "with #MON too."
+
+ para "You should take"
+ line "the #MON GYM"
+ cont "challenge."
+
+ para "The closest GYM"
+ line "would be the one"
+ cont "in VIOLET CITY."
+ done
+
+ElmAfterTheftText6:
+ text "…<PLAY_G>. The"
+ line "road to the"
+
+ para "championship will"
+ line "be a long one."
+
+ para "Before you leave,"
+ line "make sure that you"
+ cont "talk to your mom."
+ done
+
+ElmStudyingEggText:
+ text "ELM: Don't give"
+ line "up! I'll call if"
+
+ para "I learn anything"
+ line "about that EGG!"
+ done
+
+ElmAideHasEggText:
+ text "ELM: <PLAY_G>?"
+ line "Didn't you meet my"
+ cont "assistant?"
+
+ para "He should have met"
+ line "you with the EGG"
+
+ para "at VIOLET CITY's"
+ line "#MON CENTER."
+
+ para "You must have just"
+ line "missed him. Try to"
+ cont "catch him there."
+ done
+
+ElmWaitingEggHatchText:
+ text "ELM: Hey, has that"
+ line "EGG changed any?"
+ done
+
+UnknownText_0x79a40:
+ text "<PLAY_G>? I thought"
+ line "the EGG hatched."
+
+ para "Where is the"
+ line "#MON?"
+ done
+
+ShowElmTogepiText1:
+ text "ELM: <PLAY_G>, you"
+ line "look great!"
+ done
+
+ShowElmTogepiText2:
+ text "What?"
+ line "That #MON!?!"
+ done
+
+ShowElmTogepiText3:
+ text "The EGG hatched!"
+ line "So, #MON are"
+ cont "born from EGGS…"
+
+ para "No, perhaps not"
+ line "all #MON are."
+
+ para "Wow, there's still"
+ line "a lot of research"
+ cont "to be done."
+ done
+
+ElmGiveEverstoneText1:
+ text "Thanks, <PLAY_G>!"
+ line "You're helping"
+
+ para "unravel #MON"
+ line "mysteries for us!"
+
+ para "I want you to have"
+ line "this as a token of"
+ cont "our appreciation."
+ done
+
+ElmGiveEverstoneText2:
+ text "That's an"
+ line "EVERSTONE."
+
+ para "Some species of"
+ line "#MON evolve"
+
+ para "when they grow to"
+ line "certain levels."
+
+ para "A #MON holding"
+ line "the EVERSTONE"
+ cont "won't evolve."
+
+ para "Give it to a #-"
+ line "MON you don't want"
+ cont "to evolve."
+ done
+
+ElmText_CallYou:
+ text "ELM: <PLAY_G>, I'll"
+ line "call you if any-"
+ cont "thing comes up."
+ done
+
+AideText_AfterTheft:
+ text "…sigh… That"
+ line "stolen #MON."
+
+ para "I wonder how it's"
+ line "doing."
+
+ para "They say a #MON"
+ line "raised by a bad"
+
+ para "person turns bad"
+ line "itself."
+ done
+
+ElmGiveMasterBallText1:
+ text "ELM: Hi, <PLAY_G>!"
+ line "Thanks to you, my"
+
+ para "research is going"
+ line "great!"
+
+ para "Take this as a"
+ line "token of my"
+ cont "appreciation."
+ done
+
+ElmGiveMasterBallText2:
+ text "The MASTER BALL is"
+ line "the best!"
+
+ para "It's the ultimate"
+ line "BALL! It'll catch"
+
+ para "any #MON with-"
+ line "out fail."
+
+ para "It's given only to"
+ line "recognized #MON"
+ cont "researchers."
+
+ para "I think you can"
+ line "make much better"
+
+ para "use of it than I"
+ line "can, <PLAY_G>!"
+ done
+
+ElmGiveTicketText1:
+ text "ELM: <PLAY_G>!"
+ line "There you are!"
+
+ para "I called because I"
+ line "have something for"
+ cont "you."
+
+ para "See? It's an"
+ line "S.S.TICKET."
+
+ para "Now you can catch"
+ line "#MON in KANTO."
+ done
+
+ElmGiveTicketText2:
+ text "The ship departs"
+ line "from OLIVINE CITY."
+
+ para "But you knew that"
+ line "already, <PLAY_G>."
+
+ para "After all, you've"
+ line "traveled all over"
+ cont "with your #MON."
+
+ para "Give my regards to"
+ line "PROF.OAK in KANTO!"
+ done
+
+ElmsLabSignpostText_Egg:
+ text "It's the #MON"
+ line "EGG being studied"
+ cont "by PROF.ELM."
+ done
+
+AideText_GiveYouPotions:
+ text "<PLAY_G>, I want"
+ line "you to have this"
+ cont "for your errand."
+ done
+
+AideText_AlwaysBusy:
+ text "There are only two"
+ line "of us, so we're"
+ cont "always busy."
+ done
+
+AideText_TheftTestimony:
+ text "There was a loud"
+ line "noise outside…"
+
+ para "When we went to"
+ line "look, someone"
+ cont "stole a #MON."
+
+ para "It's unbelievable"
+ line "that anyone would"
+ cont "do that!"
+
+ para "…sigh… That"
+ line "stolen #MON."
+
+ para "I wonder how it's"
+ line "doing."
+
+ para "They say a #MON"
+ line "raised by a bad"
+
+ para "person turns bad"
+ line "itself."
+ done
+
+AideText_GiveYouBalls:
+ text "<PLAY_G>!"
+
+ para "Use these on your"
+ line "#DEX quest!"
+ done
+
+AideText_ExplainBalls:
+ text "To add to your"
+ line "#DEX, you have"
+ cont "to catch #MON."
+
+ para "Throw # BALLS"
+ line "at wild #MON"
+ cont "to get them."
+ done
+
+ElmsLabOfficerText1:
+ text "I heard a #MON"
+ line "was stolen here…"
+
+ para "I was just getting"
+ line "some information"
+ cont "from PROF.ELM."
+
+ para "Apparently, it was"
+ line "a young male with"
+ cont "long, red hair…"
+
+ para "What?"
+
+ para "You battled a"
+ line "trainer like that?"
+
+ para "Did you happen to"
+ line "get his name?"
+ done
+
+ElmsLabOfficerText2:
+ text "OK! So <RIVAL>"
+ line "was his name."
+
+ para "Thanks for helping"
+ line "my investigation!"
+ done
+
+ElmsLabWindowText1:
+ text "The window's open."
+
+ para "A pleasant breeze"
+ line "is blowing in."
+ done
+
+ElmsLabWindowText2:
+ text "He broke in"
+ line "through here!"
+ done
+
+ElmsLabTravelTip1Text:
+ text "<PLAYER> opened a"
+ line "book."
+
+ para "Travel Tip 1:"
+
+ para "Press START to"
+ line "open the MENU."
+ done
+
+ElmsLabTravelTip2Text:
+ text "<PLAYER> opened a"
+ line "book."
+
+ para "Travel Tip 2:"
+
+ para "Record your trip"
+ line "with SAVE!"
+ done
+
+ElmsLabTravelTip3Text:
+ text "<PLAYER> opened a"
+ line "book."
+
+ para "Travel Tip 3:"
+
+ para "Open your PACK and"
+ line "press SELECT to"
+ cont "move items."
+ done
+
+ElmsLabTravelTip4Text:
+ text "<PLAYER> opened a"
+ line "book."
+
+ para "Travel Tip 4:"
+
+ para "Check your #MON"
+ line "moves. Press the"
+
+ para "A Button to switch"
+ line "moves."
+ done
+
+ElmsLabTrashcanText:
+ text "The wrapper from"
+ line "the snack PROF.ELM"
+ cont "ate is in there…"
+ done
+
+ElmsLabPCText:
+ text "OBSERVATIONS ON"
+ line "#MON EVOLUTION"
+
+ para "…It says on the"
+ line "screen…"
+ done
+
+ElmsLab_MapEventHeader:
+ ; filler
+ db 0, 0
+
+.Warps:
+ db 2
+ warp_def $b, $4, 1, NEW_BARK_TOWN
+ warp_def $b, $5, 1, NEW_BARK_TOWN
+
+.XYTriggers:
+ db 8
+ xy_trigger 1, $6, $4, $0, LabTryToLeaveScript, $0, $0
+ xy_trigger 1, $6, $5, $0, LabTryToLeaveScript, $0, $0
+ xy_trigger 3, $5, $4, $0, MeetCopScript, $0, $0
+ xy_trigger 3, $5, $5, $0, MeetCopScript2, $0, $0
+ xy_trigger 5, $8, $4, $0, AideScript_WalkPotions1, $0, $0
+ xy_trigger 5, $8, $5, $0, AideScript_WalkPotions2, $0, $0
+ xy_trigger 6, $8, $4, $0, AideScript_WalkBalls1, $0, $0
+ xy_trigger 6, $8, $5, $0, AideScript_WalkBalls2, $0, $0
+
+.Signposts:
+ db 16
+ signpost 1, 2, SIGNPOST_READ, ElmsLabHealingMachine
+ signpost 1, 6, SIGNPOST_READ, ElmsLabBookshelf
+ signpost 1, 7, SIGNPOST_READ, ElmsLabBookshelf
+ signpost 1, 8, SIGNPOST_READ, ElmsLabBookshelf
+ signpost 1, 9, SIGNPOST_READ, ElmsLabBookshelf
+ signpost 7, 0, SIGNPOST_READ, ElmsLabTravelTip1
+ signpost 7, 1, SIGNPOST_READ, ElmsLabTravelTip2
+ signpost 7, 2, SIGNPOST_READ, ElmsLabTravelTip3
+ signpost 7, 3, SIGNPOST_READ, ElmsLabTravelTip4
+ signpost 7, 6, SIGNPOST_READ, ElmsLabBookshelf
+ signpost 7, 7, SIGNPOST_READ, ElmsLabBookshelf
+ signpost 7, 8, SIGNPOST_READ, ElmsLabBookshelf
+ signpost 7, 9, SIGNPOST_READ, ElmsLabBookshelf
+ signpost 3, 9, SIGNPOST_READ, ElmsLabTrashcan
+ signpost 0, 5, SIGNPOST_READ, ElmsLabWindow
+ signpost 5, 3, SIGNPOST_DOWN, ElmsLabPC
+
+.PersonEvents:
+ db 6
+ person_event SPRITE_ELM, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ProfElmScript, -1
+ person_event SPRITE_SCIENTIST, 9, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB
+ person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB
+ person_event SPRITE_POKE_BALL, 3, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB
+ person_event SPRITE_POKE_BALL, 3, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB
+ person_event SPRITE_OFFICER, 3, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, CopScript, EVENT_COP_IN_ELMS_LAB
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index be1675a1b..d2b687a77 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const FASTSHIP1F_SAILOR1 + const FASTSHIP1F_SAILOR2 + const FASTSHIP1F_SAILOR3 + const FASTSHIP1F_GENTLEMAN + FastShip1F_MapScriptHeader: .MapTriggers: db 3 @@ -21,9 +27,9 @@ FastShip1F_MapScriptHeader: end .PriorityJump2: - applymovement $2, MovementData_0x7520e + applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e applymovement PLAYER, MovementData_0x75217 - applymovement $2, MovementData_0x75211 + applymovement FASTSHIP1F_SAILOR1, MovementData_0x75211 pause 30 playsound SFX_BOAT earthquake 30 @@ -46,26 +52,26 @@ SailorScript_0x75160: checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE iftrue .Olivine writetext UnknownText_0x7523b + waitbutton closetext - loadmovesprites end .Olivine writetext UnknownText_0x7529b + waitbutton closetext - loadmovesprites end .Arrived: checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE iftrue ._Olivine writetext UnknownText_0x754be + waitbutton closetext - loadmovesprites scall .LetThePlayerOut playsound SFX_EXIT_BUILDING special FadeOutPalettes - waitbutton + waitsfx setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY domaptrigger VERMILION_PORT, $1 warp VERMILION_PORT, $7, $11 @@ -73,12 +79,12 @@ SailorScript_0x75160: ._Olivine writetext UnknownText_0x7548d + waitbutton closetext - loadmovesprites scall .LetThePlayerOut playsound SFX_EXIT_BUILDING special FadeOutPalettes - waitbutton + waitsfx setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY domaptrigger OLIVINE_PORT, $1 warp OLIVINE_PORT, $7, $17 @@ -87,12 +93,12 @@ SailorScript_0x75160: .LetThePlayerOut: checkcode VAR_FACING if_equal RIGHT, .YouAreFacingRight - applymovement $2, MovementData_0x7520e + applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e applymovement PLAYER, MovementData_0x75235 end .YouAreFacingRight: - applymovement $2, MovementData_0x75214 + applymovement FASTSHIP1F_SAILOR1, MovementData_0x75214 applymovement PLAYER, MovementData_0x75238 end @@ -102,35 +108,35 @@ SailorScript_0x751d0: checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue .Vermilion writetext UnknownText_0x752f9 + waitbutton closetext - loadmovesprites end .Vermilion: writetext UnknownText_0x7534f + waitbutton closetext - loadmovesprites end SailorScript_0x751e4: jumptextfaceplayer UnknownText_0x753c0 WorriedGrandpaTriggerRight: - moveperson $5, $14, $6 + moveperson FASTSHIP1F_GENTLEMAN, $14, $6 WorriedGrandpaTriggerLeft: - appear $5 - applymovement $5, MovementData_0x7521b + appear FASTSHIP1F_GENTLEMAN + applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x7521b playsound SFX_TACKLE applymovement PLAYER, MovementData_0x7522e - applymovement $5, MovementData_0x75220 + applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75220 loadfont writetext UnknownText_0x75412 + waitbutton closetext - loadmovesprites spriteface PLAYER, RIGHT - applymovement $5, MovementData_0x75222 - disappear $5 + applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75222 + disappear FASTSHIP1F_GENTLEMAN dotrigger $0 end diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 7634bd7f2..d6bf88556 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -1,3 +1,17 @@ +const_value set 2 + const FASTSHIPB1F_SAILOR1 + const FASTSHIPB1F_SAILOR2 + const FASTSHIPB1F_SAILOR3 + const FASTSHIPB1F_LASS + const FASTSHIPB1F_SUPER_NERD + const FASTSHIPB1F_SAILOR4 + const FASTSHIPB1F_FISHER + const FASTSHIPB1F_BLACK_BELT + const FASTSHIPB1F_SAILOR5 + const FASTSHIPB1F_TEACHER + const FASTSHIPB1F_YOUNGSTER1 + const FASTSHIPB1F_YOUNGSTER2 + FastShipB1F_MapScriptHeader: .MapTriggers: db 2 @@ -18,21 +32,21 @@ UnknownScript_0x7673b: UnknownScript_0x7673c: checkevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT iftrue UnknownScript_0x76766 - applymovement $3, MovementData_0x76876 - moveperson $2, $1e, $6 - appear $2 + applymovement FASTSHIPB1F_SAILOR2, MovementData_0x76876 + moveperson FASTSHIPB1F_SAILOR1, $1e, $6 + appear FASTSHIPB1F_SAILOR1 pause 5 - disappear $3 + disappear FASTSHIPB1F_SAILOR2 end UnknownScript_0x76751: checkevent EVENT_FAST_SHIP_B1F_SAILOR_LEFT iftrue UnknownScript_0x76766 - applymovement $2, MovementData_0x76871 - moveperson $3, $1f, $6 - appear $3 + applymovement FASTSHIPB1F_SAILOR1, MovementData_0x76871 + moveperson FASTSHIPB1F_SAILOR2, $1f, $6 + appear FASTSHIPB1F_SAILOR2 pause 5 - disappear $2 + disappear FASTSHIPB1F_SAILOR1 end UnknownScript_0x76766: @@ -48,147 +62,147 @@ SailorScript_0x76767: checkevent EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR iftrue UnknownScript_0x76787 writetext UnknownText_0x7687b + waitbutton closetext - loadmovesprites setevent EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR clearevent EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR end UnknownScript_0x76787: writetext UnknownText_0x76907 + waitbutton closetext - loadmovesprites end UnknownScript_0x7678d: writetext UnknownText_0x7692e checkevent EVENT_FAST_SHIP_FOUND_GIRL iffalse UnknownScript_0x76799 + waitbutton closetext - loadmovesprites end UnknownScript_0x76799: keeptextopen writetext UnknownText_0x7696d + waitbutton closetext - loadmovesprites end UnknownScript_0x767a0: writetext UnknownText_0x7699d + waitbutton closetext - loadmovesprites end TrainerSailorJeff: trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, SailorJeffScript SailorJeffScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x76a38 + waitbutton closetext - loadmovesprites end TrainerPicnickerDebra: trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, PicnickerDebraScript PicnickerDebraScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x76a99 + waitbutton closetext - loadmovesprites end TrainerJugglerFritz: trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, JugglerFritzScript JugglerFritzScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x76b02 + waitbutton closetext - loadmovesprites end TrainerSailorGarrett: trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, SailorGarrettScript SailorGarrettScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x76b7a + waitbutton closetext - loadmovesprites end TrainerFisherJonah: trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, FisherJonahScript FisherJonahScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x76c22 + waitbutton closetext - loadmovesprites end TrainerBlackbeltWai: trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, BlackbeltWaiScript BlackbeltWaiScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x76c9e + waitbutton closetext - loadmovesprites end TrainerSailorKenneth: trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, SailorKennethScript SailorKennethScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x76d5f + waitbutton closetext - loadmovesprites end TrainerTeacherShirley: trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, TeacherShirleyScript TeacherShirleyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x76de1 + waitbutton closetext - loadmovesprites end TrainerSchoolboyNate: trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, SchoolboyNateScript SchoolboyNateScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x76e3d + waitbutton closetext - loadmovesprites end TrainerSchoolboyRicky: trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, SchoolboyRickyScript SchoolboyRickyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x76eb6 + waitbutton closetext - loadmovesprites end FashShipB1FTrashcan: diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index d7f50a3b1..98ad2b235 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -1,3 +1,12 @@ +const_value set 2 + const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_M + const FASTSHIPCABINS_NNW_NNE_NE_COOLTRAINER_F + const FASTSHIPCABINS_NNW_NNE_NE_SUPER_NERD + const FASTSHIPCABINS_NNW_NNE_NE_POKEFAN_M + const FASTSHIPCABINS_NNW_NNE_NE_SAILOR + const FASTSHIPCABINS_NNW_NNE_NE_GENTLEMAN + const FASTSHIPCABINS_NNW_NNE_NE_PHARMACIST + FastShipCabins_NNW_NNE_NE_MapScriptHeader: .MapTriggers: db 0 @@ -9,66 +18,66 @@ TrainerCooltrainermSean: trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, CooltrainermSeanScript CooltrainermSeanScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7567b + waitbutton closetext - loadmovesprites end TrainerCooltrainerfCarol: trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, CooltrainerfCarolScript CooltrainerfCarolScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x756f7 + waitbutton closetext - loadmovesprites end TrainerPokemaniacEthan: trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, PokemaniacEthanScript PokemaniacEthanScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7574b + waitbutton closetext - loadmovesprites end TrainerHikerNoland: trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, HikerNolandScript HikerNolandScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x757d4 + waitbutton closetext - loadmovesprites end TrainerGentlemanEdward: trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, GentlemanEdwardScript GentlemanEdwardScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x75937 + waitbutton closetext - loadmovesprites end TrainerBurglarCorey: trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, BurglarCoreyScript BurglarCoreyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x75996 + waitbutton closetext - loadmovesprites end SailorScript_0x755f1: @@ -76,33 +85,33 @@ SailorScript_0x755f1: faceplayer loadfont writetext UnknownText_0x75812 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x75897, 0 - loadtrainer SAILOR, STANLY + scriptedtrainerdata SAILOR, STANLY startbattle reloadmap special HealParty setevent EVENT_BEAT_SAILOR_STANLY loadfont writetext UnknownText_0x758b1 + waitbutton closetext - loadmovesprites setevent EVENT_FAST_SHIP_LAZY_SAILOR domaptrigger FAST_SHIP_B1F, $1 checkcode VAR_FACING if_equal $3, UnknownScript_0x75629 - applymovement $6, MovementData_0x75637 + applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x75637 playsound SFX_EXIT_BUILDING - disappear $6 - waitbutton + disappear FASTSHIPCABINS_NNW_NNE_NE_SAILOR + waitsfx end UnknownScript_0x75629: - applymovement $6, MovementData_0x7563c + applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, MovementData_0x7563c playsound SFX_EXIT_BUILDING - disappear $6 - waitbutton + disappear FASTSHIPCABINS_NNW_NNE_NE_SAILOR + waitsfx end FastShipCabins_NNW_NNE_NETrashcan: diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 70759c740..7b3cf886b 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -1,3 +1,16 @@ +const_value set 2 + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_CAPTAIN + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1 + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2 + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_POKEFAN_M1 + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN3 + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN4 + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_SUPER_NERD1 + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_POKEFAN_M2 + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_POKEFAN_F + const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_SUPER_NERD2 + FastShipCabins_SE_SSE_CaptainsCabin_MapScriptHeader: .MapTriggers: db 0 @@ -14,56 +27,56 @@ CaptainScript_0x75ea7: checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue UnknownScript_0x75eb5 writetext UnknownText_0x76012 + waitbutton closetext - loadmovesprites end UnknownScript_0x75eb5: writetext UnknownText_0x76064 + waitbutton closetext - loadmovesprites end TwinScript_0x75ebb: - spriteface $5, RIGHT + spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, RIGHT loadfont writetext UnknownText_0x761e0 + waitbutton closetext - loadmovesprites faceplayer loadfont writetext UnknownText_0x7621f + waitbutton closetext - loadmovesprites special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes - disappear $5 + disappear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2 applymovement PLAYER, MovementData_0x76004 - moveperson $4, $3, $13 - appear $4 + moveperson FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, $3, $13 + appear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1 spriteface PLAYER, UP - spriteface $4, UP + spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP special Special_FadeInQuickly - spriteface $3, DOWN - showemote EMOTE_SHOCK, $3, 15 - applymovement $4, MovementData_0x7600c - spriteface $3, RIGHT + spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, DOWN + showemote EMOTE_SHOCK, FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, 15 + applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, MovementData_0x7600c + spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, RIGHT checkflag ENGINE_PLAYER_IS_FEMALE iftrue UnknownScript_0x75f03 loadfont writetext UnknownText_0x76284 + waitbutton closetext - loadmovesprites jump UnknownScript_0x75f09 UnknownScript_0x75f03: loadfont writetext UnknownText_0x762c6 + waitbutton closetext - loadmovesprites UnknownScript_0x75f09: - spriteface $5, DOWN - applymovement $3, MovementData_0x76010 + spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, DOWN + applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, MovementData_0x76010 loadfont writetext UnknownText_0x76143 keeptextopen @@ -79,8 +92,8 @@ GentlemanScript_0x75f1f: checkevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 iftrue UnknownScript_0x75f58 writetext UnknownText_0x760ae + waitbutton closetext - loadmovesprites domaptrigger FAST_SHIP_1F, $0 end @@ -91,16 +104,16 @@ UnknownScript_0x75f37: iffalse UnknownScript_0x75f44 setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA UnknownScript_0x75f44: - loadmovesprites - waitbutton + closetext + waitsfx playsound SFX_ELEVATOR_END pause 30 loadfont writetext UnknownText_0x76645 - closetext + waitbutton setevent EVENT_FAST_SHIP_HAS_ARRIVED setevent EVENT_FAST_SHIP_FOUND_GIRL - loadmovesprites + closetext end UnknownScript_0x75f58: @@ -110,98 +123,98 @@ UnknownScript_0x75f58: iffalse UnknownScript_0x75f65 setevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA UnknownScript_0x75f65: - loadmovesprites + closetext end UnknownScript_0x75f67: writetext UnknownText_0x761be + waitbutton closetext - loadmovesprites end TwinScript_0x75f6d: faceplayer loadfont writetext UnknownText_0x7630d + waitbutton closetext - loadmovesprites end TrainerPokefanmColin: trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, PokefanmColinScript PokefanmColinScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7635b + waitbutton closetext - loadmovesprites end TrainerTwinsMegandpeg1: trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, TwinsMegandpeg1Script TwinsMegandpeg1Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x763c2 + waitbutton closetext - loadmovesprites end TrainerTwinsMegandpeg2: trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, TwinsMegandpeg2Script TwinsMegandpeg2Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x76428 + waitbutton closetext - loadmovesprites end TrainerPsychicRodney: trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, PsychicRodneyScript PsychicRodneyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x76497 + waitbutton closetext - loadmovesprites end TrainerPokefanmJeremy: trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, PokefanmJeremyScript PokefanmJeremyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7651c + waitbutton closetext - loadmovesprites end TrainerPokefanfGeorgia: trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, PokefanfGeorgiaScript PokefanfGeorgiaScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x76596 + waitbutton closetext - loadmovesprites end TrainerSupernerdShawn: trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, SupernerdShawnScript SupernerdShawnScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7660f + waitbutton closetext - loadmovesprites end FastShipCaptainsCabinTrashcan: diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 493ee070e..5118d90d4 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -1,3 +1,9 @@ +const_value set 2 + const FASTSHIPCABINS_SW_SSW_NW_FISHER + const FASTSHIPCABINS_SW_SSW_NW_BUG_CATCHER + const FASTSHIPCABINS_SW_SSW_NW_BUENA + const FASTSHIPCABINS_SW_SSW_NW_ROCKER + FastShipCabins_SW_SSW_NW_MapScriptHeader: .MapTriggers: db 0 @@ -9,60 +15,60 @@ TrainerFirebreatherLyle: trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, FirebreatherLyleScript FirebreatherLyleScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x75b52 + waitbutton closetext - loadmovesprites end TrainerBug_catcherKen: trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, Bug_catcherKenSeenText, Bug_catcherKenBeatenText, 0, Bug_catcherKenScript Bug_catcherKenScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x75bd5 + waitbutton closetext - loadmovesprites end TrainerBeautyCassie: trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, BeautyCassieScript BeautyCassieScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x75c43 + waitbutton closetext - loadmovesprites end TrainerGuitaristClyde: trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, GuitaristClydeScript GuitaristClydeScript: - talkaftercancel + end_if_just_battled special Mobile_DummyReturnFalse iftrue .mobile loadfont writetext UnknownText_0x75d65 + waitbutton closetext - loadmovesprites end .mobile: loadfont writetext UnknownText_0x75cfe + waitbutton closetext - loadmovesprites end FastShipBed: loadfont writetext FastShipBedText1 + waitbutton closetext - loadmovesprites special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes special Mobile_HealParty @@ -73,8 +79,8 @@ FastShipBed: special Special_FadeInQuickly loadfont writetext FastShipBedText2 + waitbutton closetext - loadmovesprites checkevent EVENT_FAST_SHIP_HAS_ARRIVED iftrue UnknownScript_0x75ae1 checkevent EVENT_FAST_SHIP_FOUND_GIRL @@ -91,16 +97,16 @@ UnknownScript_0x75ae2: iftrue UnknownScript_0x75af7 loadfont writetext FastShipArrivedVermilionText + waitbutton closetext - loadmovesprites setevent EVENT_FAST_SHIP_HAS_ARRIVED end UnknownScript_0x75af7: loadfont writetext FastShipArrivedOlivineText + waitbutton closetext - loadmovesprites setevent EVENT_FAST_SHIP_HAS_ARRIVED end diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index cc7f38889..ec2eae82a 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -1,3 +1,7 @@ +const_value set 2 + const FIGHTINGDOJO_BLACK_BELT + const FIGHTINGDOJO_POKE_BALL + FightingDojo_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm index b95469107..7abec5a1e 100644 --- a/maps/FuchsiaBillSpeechHouse.asm +++ b/maps/FuchsiaBillSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const FUCHSIABILLSPEECHHOUSE_POKEFAN_F + const FUCHSIABILLSPEECHHOUSE_YOUNGSTER + FuchsiaBillSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 1d60f9f6f..50f7664fd 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -1,3 +1,9 @@ +const_value set 2 + const FUCHSIACITY_YOUNGSTER + const FUCHSIACITY_POKEFAN_M + const FUCHSIACITY_TEACHER + const FUCHSIACITY_FRUIT_TREE + FuchsiaCity_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index d5a739898..5498fec5e 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -1,3 +1,11 @@ +const_value set 2 + const FUCHSIAGYM_JANINE + const FUCHSIAGYM_FUCHSIA_GYM_1 + const FUCHSIAGYM_FUCHSIA_GYM_2 + const FUCHSIAGYM_FUCHSIA_GYM_3 + const FUCHSIAGYM_FUCHSIA_GYM_4 + const FUCHSIAGYM_GYM_GUY + FuchsiaGym_MapScriptHeader: .MapTriggers: db 0 @@ -8,14 +16,14 @@ FuchsiaGym_MapScriptHeader: JanineScript_0x195db9: checkflag ENGINE_SOULBADGE iftrue .FightDone - applymovement $2, MovementData_0x195f27 + applymovement FUCHSIAGYM_JANINE, MovementData_0x195f27 faceplayer loadfont writetext UnknownText_0x195f35 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x195fa1, 0 - loadtrainer JANINE, 1 + scriptedtrainerdata JANINE, 1 startbattle returnafterbattle setevent EVENT_BEAT_JANINE @@ -31,7 +39,7 @@ JanineScript_0x195db9: loadfont writetext UnknownText_0x195feb playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_SOULBADGE jump UnknownScript_0x195e02 .FightDone @@ -47,14 +55,14 @@ UnknownScript_0x195e02: setevent EVENT_GOT_TM06_TOXIC UnknownScript_0x195e15: writetext UnknownText_0x196074 + waitbutton closetext - loadmovesprites end FuschiaGym1Script_0x195e1b: checkevent EVENT_BEAT_LASS_ALICE iftrue UnknownScript_0x195e2c - applymovement $3, MovementData_0x195f27 + applymovement FUCHSIAGYM_FUCHSIA_GYM_1, MovementData_0x195f27 faceplayer variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS special RunCallback_04 @@ -64,10 +72,10 @@ UnknownScript_0x195e2c: checkevent EVENT_BEAT_LASS_ALICE iftrue UnknownScript_0x195e4f writetext UnknownText_0x1960e6 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x196126, 0 - loadtrainer LASS, ALICE + scriptedtrainerdata LASS, ALICE startbattle iftrue UnknownScript_0x195e4a returnafterbattle @@ -81,14 +89,14 @@ UnknownScript_0x195e4a: UnknownScript_0x195e4f: writetext UnknownText_0x196139 + waitbutton closetext - loadmovesprites end FuschiaGym2Script_0x195e55: checkevent EVENT_BEAT_LASS_LINDA iftrue UnknownScript_0x195e66 - applymovement $4, MovementData_0x195f27 + applymovement FUCHSIAGYM_FUCHSIA_GYM_2, MovementData_0x195f27 faceplayer variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS special RunCallback_04 @@ -98,10 +106,10 @@ UnknownScript_0x195e66: checkevent EVENT_BEAT_LASS_LINDA iftrue UnknownScript_0x195e89 writetext UnknownText_0x196166 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x19617b, 0 - loadtrainer LASS, LINDA + scriptedtrainerdata LASS, LINDA startbattle iftrue UnknownScript_0x195e84 returnafterbattle @@ -115,14 +123,14 @@ UnknownScript_0x195e84: UnknownScript_0x195e89: writetext UnknownText_0x196199 + waitbutton closetext - loadmovesprites end FuschiaGym3Script_0x195e8f: checkevent EVENT_BEAT_PICNICKER_CINDY iftrue UnknownScript_0x195ea0 - applymovement $5, MovementData_0x195f27 + applymovement FUCHSIAGYM_FUCHSIA_GYM_3, MovementData_0x195f27 faceplayer variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS special RunCallback_04 @@ -132,10 +140,10 @@ UnknownScript_0x195ea0: checkevent EVENT_BEAT_PICNICKER_CINDY iftrue UnknownScript_0x195ec3 writetext UnknownText_0x1961bb + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x1961f1, 0 - loadtrainer PICNICKER, CINDY + scriptedtrainerdata PICNICKER, CINDY startbattle iftrue UnknownScript_0x195ebe returnafterbattle @@ -149,14 +157,14 @@ UnknownScript_0x195ebe: UnknownScript_0x195ec3: writetext UnknownText_0x19620c + waitbutton closetext - loadmovesprites end FuschiaGym4Script_0x195ec9: checkevent EVENT_BEAT_CAMPER_BARRY iftrue UnknownScript_0x195eda - applymovement $6, MovementData_0x195f27 + applymovement FUCHSIAGYM_FUCHSIA_GYM_4, MovementData_0x195f27 faceplayer variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER special RunCallback_04 @@ -166,10 +174,10 @@ UnknownScript_0x195eda: checkevent EVENT_BEAT_CAMPER_BARRY iftrue UnknownScript_0x195efd writetext UnknownText_0x196228 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x19624a, 0 - loadtrainer CAMPER, BARRY + scriptedtrainerdata CAMPER, BARRY startbattle iftrue UnknownScript_0x195ef8 returnafterbattle @@ -183,8 +191,8 @@ UnknownScript_0x195ef8: UnknownScript_0x195efd: writetext UnknownText_0x19626b + waitbutton closetext - loadmovesprites end FuchsiaGymGuyScript: @@ -193,14 +201,14 @@ FuchsiaGymGuyScript: checkevent EVENT_BEAT_JANINE iftrue .FuchsiaGymGuyWinScript writetext FuchsiaGymGuyText + waitbutton closetext - loadmovesprites end .FuchsiaGymGuyWinScript writetext FuchsiaGymGuyWinText + waitbutton closetext - loadmovesprites end FuchsiaGymStatue: diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index ee32abccb..6d1b8cac8 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const FUCHSIAMART_CLERK + const FUCHSIAMART_FISHER + const FUCHSIAMART_COOLTRAINER_F + FuchsiaMart_MapScriptHeader: .MapTriggers: db 0 @@ -8,7 +13,7 @@ FuchsiaMart_MapScriptHeader: ClerkScript_0x195ce8: loadfont pokemart MARTTYPE_STANDARD, MART_FUCHSIA - loadmovesprites + closetext end FisherScript_0x195cef: diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm index 8241aefe6..d1cce6712 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const FUCHSIAPOKECENTER1F_NURSE + const FUCHSIAPOKECENTER1F_COOLTRAINER_M + const FUCHSIAPOKECENTER1F_COOLTRAINER_F + const FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR + FuchsiaPokeCenter1F_MapScriptHeader: .MapTriggers: db 1 @@ -24,17 +30,17 @@ JanineImpersonatorScript_0x196462: faceplayer loadfont writetext UnknownText_0x19652e + waitbutton closetext - loadmovesprites - applymovement $5, MovementData_0x196486 + applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE special RunCallback_04 loadfont writetext UnknownText_0x19654e + waitbutton closetext - loadmovesprites - applymovement $5, MovementData_0x196486 + applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486 faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS special RunCallback_04 diff --git a/maps/FuchsiaPokeCenter2FBeta.asm b/maps/FuchsiaPokeCenter2FBeta.asm index 7ba5508a9..0c41ae299 100644 --- a/maps/FuchsiaPokeCenter2FBeta.asm +++ b/maps/FuchsiaPokeCenter2FBeta.asm @@ -1,3 +1,5 @@ +const_value set 2 + FuchsiaPokeCenter2FBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 5f11981e0..503394b77 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -1,3 +1,6 @@ +const_value set 2 + const GOLDENRODBIKESHOP_CLERK + GoldenrodBikeShop_MapScriptHeader: .MapTriggers: db 0 @@ -18,24 +21,24 @@ ClerkScript_0x54750: iffalse UnknownScript_0x5477b writetext UnknownText_0x547f8 keeptextopen - waitbutton + waitsfx giveitem BICYCLE writetext UnknownText_0x54848 playsound SFX_KEY_ITEM - waitbutton + waitsfx itemnotify setflag ENGINE_BIKE_SHOP_CALL_ENABLED setevent EVENT_GOT_BICYCLE UnknownScript_0x54775: writetext UnknownText_0x5485f + waitbutton closetext - loadmovesprites end UnknownScript_0x5477b: writetext UnknownText_0x54898 + waitbutton closetext - loadmovesprites end ; possibly unused diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index 0cf7952c3..77b087403 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -1,3 +1,8 @@ +const_value set 2 + const GOLDENRODBILLSHOUSE_BILL + const GOLDENRODBILLSHOUSE_POKEFAN_F + const GOLDENRODBILLSHOUSE_TWIN + GoldenrodBillsHouse_MapScriptHeader: .MapTriggers: db 0 @@ -15,35 +20,35 @@ BillsHouseBill: iffalse UnknownScript_0x54c19 writetext UnknownText_0x54d3f keeptextopen - waitbutton + waitsfx checkcode VAR_PARTYCOUNT if_equal $6, UnknownScript_0x54c13 writetext UnknownText_0x54dae playsound SFX_CAUGHT_MON - waitbutton + waitsfx givepoke EEVEE, 20 setevent EVENT_GOT_EEVEE writetext UnknownText_0x54dc1 + waitbutton closetext - loadmovesprites end UnknownScript_0x54c13: writetext UnknownText_0x54e02 + waitbutton closetext - loadmovesprites end UnknownScript_0x54c19: writetext UnknownText_0x54e2d + waitbutton closetext - loadmovesprites end UnknownScript_0x54c1f: writetext UnknownText_0x54e42 + waitbutton closetext - loadmovesprites end BillsMom: @@ -52,14 +57,14 @@ BillsMom: checkevent EVENT_MET_BILL iffalse UnknownScript_0x54c33 writetext UnknownText_0x54ea8 + waitbutton closetext - loadmovesprites end UnknownScript_0x54c33: writetext UnknownText_0x54f4e + waitbutton closetext - loadmovesprites end BillsSister: @@ -71,22 +76,22 @@ BillsSister: askforphonenumber PHONE_BILL if_equal $1, UnknownScript_0x54c64 if_equal $2, UnknownScript_0x54c5e - waitbutton + waitsfx addcellnum PHONE_BILL writetext UnknownText_0x54fd9 playsound SFX_REGISTER_PHONE_NUMBER - waitbutton + waitsfx keeptextopen UnknownScript_0x54c58: ;0x54c58 writetext UnknownText_0x55069 + waitbutton closetext - loadmovesprites end UnknownScript_0x54c5e: writetext UnknownText_0x54ff3 + waitbutton closetext - loadmovesprites end UnknownScript_0x54c64: diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index fc711f366..40c0d286b 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -1,3 +1,20 @@ +const_value set 2 + const GOLDENRODCITY_POKEFAN_M1 + const GOLDENRODCITY_YOUNGSTER1 + const GOLDENRODCITY_COOLTRAINER_F1 + const GOLDENRODCITY_COOLTRAINER_F2 + const GOLDENRODCITY_YOUNGSTER2 + const GOLDENRODCITY_LASS + const GOLDENRODCITY_GRAMPS + const GOLDENRODCITY_ROCKET1 + const GOLDENRODCITY_ROCKET2 + const GOLDENRODCITY_ROCKET3 + const GOLDENRODCITY_ROCKET4 + const GOLDENRODCITY_ROCKET5 + const GOLDENRODCITY_ROCKET6 + const GOLDENRODCITY_ROCKET7 + const GOLDENRODCITY_POKEFAN_M2 + GoldenrodCity_MapScriptHeader: .MapTriggers: db 0 @@ -27,13 +44,13 @@ GoldenrodCity_MapScriptHeader: if_equal WEDNESDAY, .MoveTutorAppear if_equal SATURDAY, .MoveTutorAppear .MoveTutorDisappear - disappear $10 + disappear GOLDENRODCITY_POKEFAN_M2 return .MoveTutorAppear checkflag ENGINE_DAILY_MOVE_TUTOR iftrue .MoveTutorDone - appear $10 + appear GOLDENRODCITY_POKEFAN_M2 .MoveTutorDone return @@ -98,51 +115,51 @@ MoveTutor: .Refused: writetext UnknownText_0x1990b4 + waitbutton closetext - loadmovesprites end .Refused2: writetext UnknownText_0x199107 + waitbutton closetext - loadmovesprites end .TeachMove: writetext UnknownText_0x19913a keeptextopen takecoins 4000 - waitbutton + waitsfx playsound SFX_TRANSACTION special Special_DisplayCoinCaseBalance writetext UnknownText_0x19918b + waitbutton closetext - loadmovesprites checkcode VAR_FACING - if_equal $2, .WalkAroundPlayer - applymovement $10, MovementData_0x198a5f + if_equal LEFT, .WalkAroundPlayer + applymovement GOLDENRODCITY_POKEFAN_M2, MovementData_0x198a5f jump .GoInside .WalkAroundPlayer: - applymovement $10, MovementData_0x198a63 + applymovement GOLDENRODCITY_POKEFAN_M2, MovementData_0x198a63 .GoInside: playsound SFX_ENTER_DOOR - disappear $10 + disappear GOLDENRODCITY_POKEFAN_M2 clearevent EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR setflag ENGINE_DAILY_MOVE_TUTOR - waitbutton + waitsfx end .Incompatible: writetext UnknownText_0x1991a4 + waitbutton closetext - loadmovesprites end .NotEnoughMoney: writetext UnknownText_0x1991ac + waitbutton closetext - loadmovesprites end PokefanMScript_0x1989e3: @@ -157,14 +174,14 @@ CooltrainerFScript_0x1989e9: checkevent EVENT_CLEARED_RADIO_TOWER iftrue .ClearedRadioTower writetext UnknownText_0x198ae6 + waitbutton closetext - loadmovesprites end .ClearedRadioTower: writetext UnknownText_0x198b2d + waitbutton closetext - loadmovesprites end CooltrainerFScript_0x1989fd: @@ -173,14 +190,14 @@ CooltrainerFScript_0x1989fd: checkflag ENGINE_RADIO_CARD iftrue .GotRadioCard writetext UnknownText_0x198b73 + waitbutton closetext - loadmovesprites end .GotRadioCard: writetext UnknownText_0x198c14 + waitbutton closetext - loadmovesprites end YoungsterScript_0x198a11: @@ -198,9 +215,9 @@ RocketScript_0x198a1a: keeptextopen faceplayer writetext UnknownText_0x198d2a + waitbutton closetext - loadmovesprites - spriteface $9, UP + spriteface GOLDENRODCITY_ROCKET1, UP end RocketScript_0x198a29: diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index ccc74c28e..455d66b79 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const GOLDENRODDEPTSTORE1F_RECEPTIONIST + const GOLDENRODDEPTSTORE1F_POKEFAN_F + const GOLDENRODDEPTSTORE1F_BUG_CATCHER + const GOLDENRODDEPTSTORE1F_GENTLEMAN + GoldenrodDeptStore1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index 2a39b3fa9..fb1e3314f 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const GOLDENRODDEPTSTORE2F_CLERK1 + const GOLDENRODDEPTSTORE2F_CLERK2 + const GOLDENRODDEPTSTORE2F_YOUNGSTER + const GOLDENRODDEPTSTORE2F_COOLTRAINER_F + const GOLDENRODDEPTSTORE2F_GENTLEMAN + GoldenrodDeptStore2F_MapScriptHeader: .MapTriggers: db 0 @@ -9,14 +16,14 @@ ClerkScript_0x55b5d: faceplayer loadfont pokemart MARTTYPE_STANDARD, MART_GOLDENROD_2F_1 - loadmovesprites + closetext end ClerkScript_0x55b65: faceplayer loadfont pokemart MARTTYPE_STANDARD, MART_GOLDENROD_2F_2 - loadmovesprites + closetext end YoungsterScript_0x55b6d: diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index 5073b0863..5bab013ca 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const GOLDENRODDEPTSTORE3F_CLERK + const GOLDENRODDEPTSTORE3F_SUPER_NERD + const GOLDENRODDEPTSTORE3F_ROCKER + GoldenrodDeptStore3F_MapScriptHeader: .MapTriggers: db 0 @@ -9,7 +14,7 @@ ClerkScript_0x55db8: faceplayer loadfont pokemart MARTTYPE_STANDARD, MART_GOLDENROD_3F - loadmovesprites + closetext end SuperNerdScript_0x55dc0: diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 16a5024bb..bcc4b2a00 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const GOLDENRODDEPTSTORE4F_CLERK + const GOLDENRODDEPTSTORE4F_COOLTRAINER_M + const GOLDENRODDEPTSTORE4F_BUG_CATCHER + const GOLDENRODDEPTSTORE4F_GAMEBOY_KID + GoldenrodDeptStore4F_MapScriptHeader: .MapTriggers: db 0 @@ -9,7 +15,7 @@ ClerkScript_0x55ee9: faceplayer loadfont pokemart MARTTYPE_STANDARD, MART_GOLDENROD_4F - loadmovesprites + closetext end CooltrainerMScript_0x55ef1: @@ -22,9 +28,9 @@ GameboyKidScript_0x55ef7: faceplayer loadfont writetext UnknownText_0x55f74 + waitbutton closetext - loadmovesprites - spriteface $5, DOWN + spriteface GOLDENRODDEPTSTORE4F_GAMEBOY_KID, DOWN end GoldenrodDeptStore4FDirectory: diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 35f055909..4d6c70408 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -1,3 +1,11 @@ +const_value set 2 + const GOLDENRODDEPTSTORE5F_CLERK + const GOLDENRODDEPTSTORE5F_LASS + const GOLDENRODDEPTSTORE5F_COOLTRAINER_M + const GOLDENRODDEPTSTORE5F_POKEFAN_M + const GOLDENRODDEPTSTORE5F_TWIN + const GOLDENRODDEPTSTORE5F_RECEPTIONIST + GoldenrodDeptStore5F_MapScriptHeader: .MapTriggers: db 0 @@ -12,11 +20,11 @@ GoldenrodDeptStore5F_MapScriptHeader: .CheckIfSunday: checkcode VAR_WEEKDAY if_equal SUNDAY, .yes - disappear $7 + disappear GOLDENRODDEPTSTORE5F_RECEPTIONIST return .yes: - appear $7 + appear GOLDENRODDEPTSTORE5F_RECEPTIONIST return ClerkScript_0x5609c: @@ -35,22 +43,22 @@ ClerkScript_0x5609c: .neither: pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_1 - loadmovesprites + closetext end .onlyheadbutt: pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_2 - loadmovesprites + closetext end .onlyrocksmash: pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_3 - loadmovesprites + closetext end .both: pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_4 - loadmovesprites + closetext end ReceptionistScript_0x560ce: @@ -73,13 +81,13 @@ ReceptionistScript_0x560ce: verbosegiveitem TM_RETURN iffalse .Done setflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT - loadmovesprites + closetext end .SomewhatHappy: writetext UnknownText_0x561a6 + waitbutton closetext - loadmovesprites end .NotVeryHappy: @@ -88,14 +96,14 @@ ReceptionistScript_0x560ce: verbosegiveitem TM_FRUSTRATION iffalse .Done setflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT - loadmovesprites + closetext end .EventIsOver: writetext UnknownText_0x56202 - closetext + waitbutton .Done: - loadmovesprites + closetext end TwinScript_0x56118: @@ -104,15 +112,15 @@ TwinScript_0x56118: special SpecialGameboyCheck if_not_equal $2, .NotGBC ; This is a dummy check from Gold and Silver. In normal gameplay, this would not be checked. writetext UnknownText_0x56241 + waitbutton closetext - loadmovesprites special Special_UnlockMysteryGift end .NotGBC: writetext UnknownText_0x56279 + waitbutton closetext - loadmovesprites end LassScript_0x56130: @@ -122,8 +130,8 @@ CooltrainerMScript_0x56133: faceplayer loadfont trade $0 + waitbutton closetext - loadmovesprites end PokefanMScript_0x5613a: diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index a0853ac17..6363558ed 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -1,3 +1,7 @@ +const_value set 2 + const GOLDENRODDEPTSTORE6F_LASS + const GOLDENRODDEPTSTORE6F_SUPER_NERD + GoldenrodDeptStore6F_MapScriptHeader: .MapTriggers: db 0 @@ -16,7 +20,7 @@ GoldenrodVendingMachine: if_equal $1, .FreshWater if_equal $2, .SodaPop if_equal $3, .Lemonade - loadmovesprites + closetext end .FreshWater @@ -56,12 +60,12 @@ GoldenrodVendingMachine: .NotEnoughMoney writetext GoldenrodVendingNoMoneyText - closetext + waitbutton jump .Start .NotEnoughSpace writetext GoldenrodVendingNoSpaceText - closetext + waitbutton jump .Start .MenuData diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index e726755da..8ff2e9f03 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -1,3 +1,13 @@ +const_value set 2 + const GOLDENRODDEPTSTOREB1F_POKE_BALL1 + const GOLDENRODDEPTSTOREB1F_POKE_BALL2 + const GOLDENRODDEPTSTOREB1F_POKE_BALL3 + const GOLDENRODDEPTSTOREB1F_POKE_BALL4 + const GOLDENRODDEPTSTOREB1F_BLACK_BELT1 + const GOLDENRODDEPTSTOREB1F_BLACK_BELT2 + const GOLDENRODDEPTSTOREB1F_BLACK_BELT3 + const GOLDENRODDEPTSTOREB1F_MACHOP + GoldenrodDeptStoreB1F_MapScriptHeader: .MapTriggers: db 0 @@ -53,8 +63,8 @@ MachopScript_0x7d7b9: loadfont writetext UnknownText_0x7d8bb cry MACHOKE + waitbutton closetext - loadmovesprites end ItemFragment_0x7d7c3: diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index a7ca59c89..699349d52 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -1,3 +1,5 @@ +const_value set 2 + GoldenrodDeptStoreElevator_MapScriptHeader: .MapTriggers: db 0 @@ -8,12 +10,12 @@ GoldenrodDeptStoreElevator_MapScriptHeader: MapGoldenrodDeptStoreElevatorSignpost0Script: loadfont elevator Elevator_0x566e0 - loadmovesprites + closetext iffalse .Done pause 5 playsound SFX_ELEVATOR earthquake 60 - waitbutton + waitsfx checkevent EVENT_WAREHOUSE_BLOCKED_OFF iftrue .Done checkevent EVENT_WAREHOUSE_LAYOUT_1 diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index f0ed3e21d..9c281b156 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -1,3 +1,13 @@ +const_value set 2 + const GOLDENRODDEPTSTOREROOF_CLERK + const GOLDENRODDEPTSTOREROOF_POKEFAN_F + const GOLDENRODDEPTSTOREROOF_FISHER + const GOLDENRODDEPTSTOREROOF_TWIN + const GOLDENRODDEPTSTOREROOF_SUPER_NERD + const GOLDENRODDEPTSTOREROOF_POKEFAN_M + const GOLDENRODDEPTSTOREROOF_TEACHER + const GOLDENRODDEPTSTOREROOF_BUG_CATCHER + GoldenrodDeptStoreRoof_MapScriptHeader: .MapTriggers: db 0 @@ -36,7 +46,7 @@ GoldenrodDeptStoreRoof_MapScriptHeader: ClerkScript_0x5673f: loadfont pokemart MARTTYPE_ROOFTOP, 0 - loadmovesprites + closetext end PokefanFScript_0x56746: @@ -46,9 +56,9 @@ FisherScript_0x56749: faceplayer loadfont writetext UnknownText_0x567d2 + waitbutton closetext - loadmovesprites - spriteface $4, UP + spriteface GOLDENRODDEPTSTOREROOF_FISHER, UP end TwinScript_0x56754: @@ -57,14 +67,14 @@ TwinScript_0x56754: SuperNerdScript_0x56757: loadfont writetext UnknownText_0x56867 + waitbutton closetext - loadmovesprites - spriteface $6, UP + spriteface GOLDENRODDEPTSTOREROOF_SUPER_NERD, UP loadfont writetext UnknownText_0x56871 + waitbutton closetext - loadmovesprites - spriteface $6, RIGHT + spriteface GOLDENRODDEPTSTOREROOF_SUPER_NERD, RIGHT end PokefanMScript_0x5676a: diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index d99afb751..f89eee61a 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -1,3 +1,7 @@ +const_value set 2 + const GOLDENRODFLOWERSHOP_TEACHER + const GOLDENRODFLOWERSHOP_LASS + GoldenrodFlowerShop_MapScriptHeader: .MapTriggers: db 0 @@ -22,17 +26,17 @@ FlowerShopTeacherScript: keeptextopen verbosegiveitem SQUIRTBOTTLE setevent EVENT_GOT_SQUIRTBOTTLE - loadmovesprites + closetext setevent EVENT_FLORIA_AT_SUDOWOODO clearevent EVENT_FLORIA_AT_FLOWER_SHOP end .Lalala: - spriteface $2, LEFT + spriteface GOLDENRODFLOWERSHOP_TEACHER, LEFT loadfont writetext UnknownText_0x5552e + waitbutton closetext - loadmovesprites end .GotSquirtbottle: @@ -52,8 +56,8 @@ FlowerShopFloriaScript: checkevent EVENT_GOT_SQUIRTBOTTLE iftrue .GotSquirtbottle writetext UnknownText_0x55561 + waitbutton closetext - loadmovesprites setevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP setevent EVENT_FLORIA_AT_FLOWER_SHOP clearevent EVENT_FLORIA_AT_SUDOWOODO @@ -61,14 +65,14 @@ FlowerShopFloriaScript: .GotSquirtbottle: writetext UnknownText_0x555e6 + waitbutton closetext - loadmovesprites end .FoughtSudowoodo: writetext UnknownText_0x55604 + waitbutton closetext - loadmovesprites end FlowerShopShelf1: diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 88e99f217..2608b09b7 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -1,3 +1,17 @@ +const_value set 2 + const GOLDENRODGAMECORNER_CLERK + const GOLDENRODGAMECORNER_RECEPTIONIST1 + const GOLDENRODGAMECORNER_RECEPTIONIST2 + const GOLDENRODGAMECORNER_PHARMACIST1 + const GOLDENRODGAMECORNER_PHARMACIST2 + const GOLDENRODGAMECORNER_POKEFAN_M1 + const GOLDENRODGAMECORNER_COOLTRAINER_M + const GOLDENRODGAMECORNER_POKEFAN_F + const GOLDENRODGAMECORNER_COOLTRAINER_F + const GOLDENRODGAMECORNER_GENTLEMAN + const GOLDENRODGAMECORNER_POKEFAN_M2 + const GOLDENRODGAMECORNER_POKEFAN_M3 + GoldenrodGameCorner_MapScriptHeader: .MapTriggers: db 0 @@ -18,13 +32,13 @@ UnknownScript_0x56bf9: if_equal WEDNESDAY, UnknownScript_0x56c11 if_equal SATURDAY, UnknownScript_0x56c11 UnknownScript_0x56c0e: - appear $d + appear GOLDENRODGAMECORNER_POKEFAN_M3 return UnknownScript_0x56c11: checkflag ENGINE_DAILY_MOVE_TUTOR iftrue UnknownScript_0x56c19 - disappear $d + disappear GOLDENRODGAMECORNER_POKEFAN_M3 UnknownScript_0x56c19: ;0x56c19 return @@ -32,9 +46,9 @@ PokefanMScript_0x56c1a: faceplayer loadfont writetext UnknownText_0x5718a + waitbutton closetext - loadmovesprites - spriteface $d, RIGHT + spriteface GOLDENRODGAMECORNER_POKEFAN_M3, RIGHT end ClerkScript_0x56c25: @@ -44,7 +58,7 @@ ReceptionistScript_0x56c28: faceplayer loadfont writetext UnknownText_0x56e50 - closetext + waitbutton checkitem COIN_CASE iffalse UnknownScript_0x56cc3 writetext UnknownText_0x56e8b @@ -97,34 +111,34 @@ UnknownScript_0x56ca1: end UnknownScript_0x56ca6: - waitbutton + waitsfx playsound SFX_TRANSACTION writetext UnknownText_0x56ebd - closetext + waitbutton jump UnknownScript_0x56c36 UnknownScript_0x56cb1: writetext UnknownText_0x56ecb + waitbutton closetext - loadmovesprites end UnknownScript_0x56cb7: writetext UnknownText_0x56ee8 + waitbutton closetext - loadmovesprites end UnknownScript_0x56cbd: writetext UnknownText_0x56f09 + waitbutton closetext - loadmovesprites end UnknownScript_0x56cc3: writetext UnknownText_0x56f35 + waitbutton closetext - loadmovesprites end @@ -148,7 +162,7 @@ ReceptionistScript_0x56d01: faceplayer loadfont writetext UnknownText_0x56e50 - closetext + waitbutton checkitem COIN_CASE iffalse UnknownScript_0x56cc3 UnknownScript_0x56d0c: @@ -170,10 +184,10 @@ UnknownScript_0x56d26: pokenamemem ABRA, $0 scall UnknownScript_0x56ca1 iffalse UnknownScript_0x56cbd - waitbutton + waitsfx playsound SFX_TRANSACTION writetext UnknownText_0x56ebd - closetext + waitbutton writebyte ABRA special Special_GameCornerPrizeMonCheckDex givepoke ABRA, 5 @@ -188,10 +202,10 @@ UnknownScript_0x56d54: pokenamemem CUBONE, $0 scall UnknownScript_0x56ca1 iffalse UnknownScript_0x56cbd - waitbutton + waitsfx playsound SFX_TRANSACTION writetext UnknownText_0x56ebd - closetext + waitbutton writebyte CUBONE special Special_GameCornerPrizeMonCheckDex givepoke CUBONE, 15 @@ -206,10 +220,10 @@ UnknownScript_0x56d82: pokenamemem WOBBUFFET, $0 scall UnknownScript_0x56ca1 iffalse UnknownScript_0x56cbd - waitbutton + waitsfx playsound SFX_TRANSACTION writetext UnknownText_0x56ebd - closetext + waitbutton writebyte WOBBUFFET special Special_GameCornerPrizeMonCheckDex givepoke WOBBUFFET, 15 @@ -237,8 +251,8 @@ PharmacistScript_0x56df1: faceplayer loadfont writetext UnknownText_0x56f55 + waitbutton closetext - loadmovesprites spriteface LAST_TALKED, LEFT end @@ -246,27 +260,27 @@ PokefanMScript_0x56dfc: faceplayer loadfont writetext UnknownText_0x56f9e + waitbutton closetext - loadmovesprites - spriteface $7, RIGHT + spriteface GOLDENRODGAMECORNER_POKEFAN_M1, RIGHT end CooltrainerMScript_0x56e07: faceplayer loadfont writetext UnknownText_0x56ff4 + waitbutton closetext - loadmovesprites - spriteface $8, LEFT + spriteface GOLDENRODGAMECORNER_COOLTRAINER_M, LEFT end PokefanFScript_0x56e12: faceplayer loadfont writetext UnknownText_0x5702b + waitbutton closetext - loadmovesprites - spriteface $9, RIGHT + spriteface GOLDENRODGAMECORNER_POKEFAN_F, RIGHT end CooltrainerFScript_0x56e1d: @@ -276,9 +290,9 @@ GentlemanScript_0x56e20: faceplayer loadfont writetext UnknownText_0x570b1 + waitbutton closetext - loadmovesprites - spriteface $b, RIGHT + spriteface GOLDENRODGAMECORNER_GENTLEMAN, RIGHT end PokefanMScript_0x56e2b: @@ -293,20 +307,20 @@ MapGoldenrodGameCornerSignpost17Script: refreshscreen $0 writebyte $0 special Special_SlotMachine - loadmovesprites + closetext end MapGoldenrodGameCornerSignpost7Script: refreshscreen $0 writebyte $1 special Special_SlotMachine - loadmovesprites + closetext end MapGoldenrodGameCornerSignpost29Script: refreshscreen $0 special Special_CardFlip - loadmovesprites + closetext end UnknownText_0x56e50: diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index c2746de68..aba5a08c4 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -1,3 +1,11 @@ +const_value set 2 + const GOLDENRODGYM_WHITNEY + const GOLDENRODGYM_LASS1 + const GOLDENRODGYM_LASS2 + const GOLDENRODGYM_BUENA1 + const GOLDENRODGYM_BUENA2 + const GOLDENRODGYM_GYM_GUY + GoldenrodGym_MapScriptHeader: .MapTriggers: db 2 @@ -21,10 +29,10 @@ WhitneyScript_0x5400c: iftrue .FightDone loadfont writetext UnknownText_0x54122 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x541a5, 0 - loadtrainer WHITNEY, 1 + scriptedtrainerdata WHITNEY, 1 startbattle returnafterbattle setevent EVENT_BEAT_WHITNEY @@ -39,8 +47,8 @@ WhitneyScript_0x5400c: checkevent EVENT_MADE_WHITNEY_CRY iffalse .StoppedCrying writetext UnknownText_0x541f4 + waitbutton closetext - loadmovesprites end .StoppedCrying @@ -50,10 +58,10 @@ WhitneyScript_0x5400c: iftrue UnknownScript_0x54064 writetext UnknownText_0x54222 keeptextopen - waitbutton + waitsfx writetext UnknownText_0x54273 playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_PLAINBADGE checkcode VAR_BADGES scall GoldenrodGymTriggerRockets @@ -64,15 +72,15 @@ UnknownScript_0x54064: iffalse UnknownScript_0x5407b setevent EVENT_GOT_TM45_ATTRACT writetext UnknownText_0x54302 + waitbutton closetext - loadmovesprites end UnknownScript_0x54077: writetext UnknownText_0x54360 - closetext + waitbutton UnknownScript_0x5407b: - loadmovesprites + closetext end GoldenrodGymTriggerRockets: @@ -90,22 +98,22 @@ TrainerLassCarrie: trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, LassCarrieScript LassCarrieScript: - talkaftercancel + end_if_just_battled loadfont writetext LassCarrieOWText + waitbutton closetext - loadmovesprites end WhitneyCriesScript: - showemote EMOTE_SHOCK, $4, 15 - applymovement $4, BridgetWalksUpMovement + showemote EMOTE_SHOCK, GOLDENRODGYM_LASS2, 15 + applymovement GOLDENRODGYM_LASS2, BridgetWalksUpMovement spriteface PLAYER, DOWN loadfont writetext BridgetWhitneyCriesText + waitbutton closetext - loadmovesprites - applymovement $4, BridgetWalksAwayMovement + applymovement GOLDENRODGYM_LASS2, BridgetWalksAwayMovement dotrigger $0 clearevent EVENT_MADE_WHITNEY_CRY end @@ -114,33 +122,33 @@ TrainerLassBridget: trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, LassBridgetScript LassBridgetScript: - talkaftercancel + end_if_just_battled loadfont writetext LassBridgetOWText + waitbutton closetext - loadmovesprites end TrainerBeautyVictoria: trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, BeautyVictoriaScript BeautyVictoriaScript: - talkaftercancel + end_if_just_battled loadfont writetext BeautyVictoriaOWText + waitbutton closetext - loadmovesprites end TrainerBeautySamantha: trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, BeautySamanthaScript BeautySamanthaScript: - talkaftercancel + end_if_just_battled loadfont writetext BeautySamanthaOWText + waitbutton closetext - loadmovesprites end GoldenrodGymGuyScript: @@ -149,15 +157,15 @@ GoldenrodGymGuyScript: iftrue .GoldenrodGymGuyWinScript loadfont writetext GoldenrodGymGuyText + waitbutton closetext - loadmovesprites end .GoldenrodGymGuyWinScript loadfont writetext GoldenrodGymGuyWinText + waitbutton closetext - loadmovesprites end GoldenrodGymStatue: diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 3ef382fa5..ac34965ba 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -1,3 +1,8 @@ +const_value set 2 + const GOLDENRODHAPPINESSRATER_TEACHER + const GOLDENRODHAPPINESSRATER_POKEFAN_M + const GOLDENRODHAPPINESSRATER_TWIN + GoldenrodHappinessRater_MapScriptHeader: .MapTriggers: db 0 @@ -20,38 +25,38 @@ TeacherScript_0x54953: UnknownScript_0x54973: writetext UnknownText_0x549fc + waitbutton closetext - loadmovesprites end UnknownScript_0x54979: writetext UnknownText_0x54a2c + waitbutton closetext - loadmovesprites end UnknownScript_0x5497f: writetext UnknownText_0x54a5a + waitbutton closetext - loadmovesprites end UnknownScript_0x54985: writetext UnknownText_0x54a8e + waitbutton closetext - loadmovesprites end UnknownScript_0x5498b: writetext UnknownText_0x54a9f + waitbutton closetext - loadmovesprites end UnknownScript_0x54991: writetext UnknownText_0x54ad1 + waitbutton closetext - loadmovesprites end PokefanMScript_0x54997: diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 75819cf92..1b49994e0 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -1,3 +1,7 @@ +const_value set 2 + const GOLDENRODMAGNETTRAINSTATION_OFFICER + const GOLDENRODMAGNETTRAINSTATION_GENTLEMAN + GoldenrodMagnetTrainStation_MapScriptHeader: .MapTriggers: db 1 @@ -17,8 +21,8 @@ OfficerScript_0x550ec: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .MagnetTrainToSaffron writetext UnknownText_0x55160 + waitbutton closetext - loadmovesprites end .MagnetTrainToSaffron: @@ -28,9 +32,9 @@ OfficerScript_0x550ec: checkitem PASS iffalse .PassNotInBag writetext UnknownText_0x551ed + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x55146 + applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146 applymovement PLAYER, MovementData_0x5514f writebyte $0 special Special_MagnetTrain @@ -46,24 +50,24 @@ OfficerScript_0x550ec: .PassNotInBag: writetext UnknownText_0x5522c + waitbutton closetext - loadmovesprites end .DecidedNotToRide: writetext UnknownText_0x5524f + waitbutton closetext - loadmovesprites end Script_ArriveFromSaffron: - applymovement $2, MovementData_0x55146 + applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146 applymovement PLAYER, MovementData_0x55158 - applymovement $2, MovementData_0x5514b + applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x5514b loadfont writetext UnknownText_0x5526a + waitbutton closetext - loadmovesprites end GentlemanScript_0x55143: diff --git a/maps/GoldenrodNameRatersHouse.asm b/maps/GoldenrodNameRatersHouse.asm index 4253fe3ef..9fae3eb09 100644 --- a/maps/GoldenrodNameRatersHouse.asm +++ b/maps/GoldenrodNameRatersHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const GOLDENRODNAMERATERSHOUSE_GENTLEMAN + GoldenrodNameRatersHouse_MapScriptHeader: .MapTriggers: db 0 @@ -9,8 +12,8 @@ GentlemanScript_0x5577c: faceplayer loadfont special SpecialNameRater + waitbutton closetext - loadmovesprites end GoldenrodNameRatersHouseBookshelf: diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 0f373281a..710959645 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const GOLDENRODPPSPEECHHOUSE_FISHER + const GOLDENRODPPSPEECHHOUSE_LASS + GoldenrodPPSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index 83fe5e26a..ab59a3111 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const GOLDENRODPOKECENTER1F_NURSE + const GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST + const GOLDENRODPOKECENTER1F_GAMEBOY_KID + const GOLDENRODPOKECENTER1F_LASS + const GOLDENRODPOKECENTER1F_POKEFAN_F + GoldenrodPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -9,7 +16,7 @@ NurseScript_0x60f91: jumpstd pokecenternurse GoldenrodPokeCenter1F_GSBallTriggerLeft: - writebyte BATTLE_TOWER_ACTION_0B + writebyte BATTLETOWERACTION_CHECKMOBILEEVENT special BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball end @@ -18,30 +25,30 @@ GoldenrodPokeCenter1F_GSBallTriggerLeft: checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER iftrue .cancel playsound SFX_EXIT_BUILDING - moveperson $3, $0, $7 - disappear $3 - appear $3 + moveperson GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, $0, $7 + disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST + appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playmusic MUSIC_SHOW_ME_AROUND - applymovement $3, MovementData_0x6105a + applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x6105a spriteface PLAYER, UP loadfont writetext UnknownText_0x622f0 - closetext + waitbutton verbosegiveitem GS_BALL setevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER setevent EVENT_CAN_GIVE_GS_BALL_TO_KURT writetext UnknownText_0x62359 + waitbutton closetext - loadmovesprites - applymovement $3, MovementData_0x61060 + applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x61060 special RestartMapMusic - disappear $3 + disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playsound SFX_EXIT_BUILDING .cancel: end GoldenrodPokeCenter1F_GSBallTriggerRight: - writebyte BATTLE_TOWER_ACTION_0B + writebyte BATTLETOWERACTION_CHECKMOBILEEVENT special BattleTowerAction if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball end @@ -50,24 +57,24 @@ GoldenrodPokeCenter1F_GSBallTriggerRight: checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER iftrue .cancel playsound SFX_EXIT_BUILDING - moveperson $3, $0, $7 - disappear $3 - appear $3 + moveperson GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, $0, $7 + disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST + appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playmusic MUSIC_SHOW_ME_AROUND - applymovement $3, MovementData_0x61065 + applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x61065 spriteface PLAYER, UP loadfont writetext UnknownText_0x622f0 - closetext + waitbutton verbosegiveitem GS_BALL setevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER setevent EVENT_CAN_GIVE_GS_BALL_TO_KURT writetext UnknownText_0x62359 + waitbutton closetext - loadmovesprites - applymovement $3, MovementData_0x6106c + applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x6106c special RestartMapMusic - disappear $3 + disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playsound SFX_EXIT_BUILDING .cancel: end @@ -82,34 +89,34 @@ PokefanFScript_0x61024: faceplayer loadfont writetext UnknownText_0x623fb - closetext + waitbutton writetext UnknownText_0x6248c yesorno iffalse UnknownScript_0x6104b takeitem EON_MAIL iffalse UnknownScript_0x6104b writetext UnknownText_0x62549 - closetext + waitbutton writetext UnknownText_0x624a4 - closetext + waitbutton verbosegiveitem REVIVE iffalse UnknownScript_0x61051 writetext UnknownText_0x624e9 + waitbutton closetext - loadmovesprites end UnknownScript_0x6104b: writetext UnknownText_0x62509 + waitbutton closetext - loadmovesprites end UnknownScript_0x61051: giveitem EON_MAIL writetext UnknownText_0x6252a + waitbutton closetext - loadmovesprites end MovementData_0x6105a: diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index f43e02ee9..c10395ab0 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -1,3 +1,8 @@ +const_value set 2 + const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST1 + const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST2 + const GOLDENRODPOKECOMCENTER2FMOBILE_SCIENTIST3 + GoldenrodPokeComCenter2FMobile_MapScriptHeader: .MapTriggers: db 0 @@ -17,7 +22,7 @@ ScientistScript_0x625d7: MapGoldenrodPokeComCenter2FMobileSignpost0Script: loadfont writetext UnknownText_0x627ee - closetext + waitbutton UnknownScript_0x625df: reloadmappart loadmenudata MenuDataHeader_0x62602 @@ -30,17 +35,17 @@ UnknownScript_0x625df: UnknownScript_0x625f0: loadfont writetext UnknownText_0x62828 - closetext + waitbutton jump UnknownScript_0x625df UnknownScript_0x625f8: loadfont writetext UnknownText_0x628f4 - closetext + waitbutton jump UnknownScript_0x625df UnknownScript_0x62600: - loadmovesprites + closetext end @@ -62,7 +67,7 @@ MenuData2_0x6260a: MapGoldenrodPokeComCenter2FMobileSignpost1Script: loadfont writetext UnknownText_0x62989 - closetext + waitbutton UnknownScript_0x62629: reloadmappart loadmenudata MenuDataHeader_0x6264c @@ -75,17 +80,17 @@ UnknownScript_0x62629: UnknownScript_0x6263a: loadfont writetext UnknownText_0x629ae - closetext + waitbutton jump UnknownScript_0x62629 UnknownScript_0x62642: loadfont writetext UnknownText_0x62a5a - closetext + waitbutton jump UnknownScript_0x62629 UnknownScript_0x6264a: - loadmovesprites + closetext end diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index ecc481750..1b6befa08 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const GUIDEGENTSHOUSE_GRAMPS + GuideGentsHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 35da37630..1b24dca2c 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -1,3 +1,6 @@ +const_value set 2 + const HALLOFFAME_LANCE + HallOfFame_MapScriptHeader: .MapTriggers: db 2 @@ -17,15 +20,15 @@ HallOfFame_MapScriptHeader: end HallOfFameScript: - follow $2, PLAYER - applymovement $2, HallOfFame_WalkUpWithLance + follow HALLOFFAME_LANCE, PLAYER + applymovement HALLOFFAME_LANCE, HallOfFame_WalkUpWithLance stopfollow spriteface PLAYER, RIGHT loadfont writetext HallOfFame_LanceText + waitbutton closetext - loadmovesprites - spriteface $2, UP + spriteface HALLOFFAME_LANCE, UP applymovement PLAYER, HallOfFame_SlowlyApproachMachine dotrigger $1 pause 15 diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index c39fd9a45..6ab88a560 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ICEPATH1F_POKE_BALL1 + const ICEPATH1F_POKE_BALL2 + const ICEPATH1F_POKE_BALL3 + IcePath1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 80d341b03..d86b52870 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const ICEPATHB1F_BOULDER1 + const ICEPATHB1F_BOULDER2 + const ICEPATHB1F_BOULDER3 + const ICEPATHB1F_BOULDER4 + const ICEPATHB1F_POKE_BALL + IcePathB1F_MapScriptHeader: .MapTriggers: db 0 @@ -33,22 +40,22 @@ IcePathB1F_MapScriptHeader: db -1 ; end .Boulder1: - disappear 2 + disappear ICEPATHB1F_BOULDER1 clearevent EVENT_BOULDER_IN_ICE_PATH_1A jump .FinishBoulder .Boulder2: - disappear 3 + disappear ICEPATHB1F_BOULDER2 clearevent EVENT_BOULDER_IN_ICE_PATH_2A jump .FinishBoulder .Boulder3: - disappear 4 + disappear ICEPATHB1F_BOULDER3 clearevent EVENT_BOULDER_IN_ICE_PATH_3A jump .FinishBoulder .Boulder4: - disappear 5 + disappear ICEPATHB1F_BOULDER4 clearevent EVENT_BOULDER_IN_ICE_PATH_4A jump .FinishBoulder @@ -57,8 +64,8 @@ IcePathB1F_MapScriptHeader: scall .BoulderFallsThrough loadfont writetext UnknownText_0x7e512 + waitbutton closetext - loadmovesprites end .BoulderFallsThrough: diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index d229579f8..3b8f2b2d4 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ICEPATHB2FBLACKTHORNSIDE_POKE_BALL + IcePathB2FBlackthornSide_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 77a5ff29a..84d0ab309 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -1,3 +1,11 @@ +const_value set 2 + const ICEPATHB2FMAHOGANYSIDE_BOULDER1 + const ICEPATHB2FMAHOGANYSIDE_BOULDER2 + const ICEPATHB2FMAHOGANYSIDE_BOULDER3 + const ICEPATHB2FMAHOGANYSIDE_BOULDER4 + const ICEPATHB2FMAHOGANYSIDE_POKE_BALL1 + const ICEPATHB2FMAHOGANYSIDE_POKE_BALL2 + IcePathB2FMahoganySide_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index 0fe12cd7d..cf4e867b9 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ICEPATHB3F_POKE_BALL + const ICEPATHB3F_ROCK + IcePathB3F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 851f50399..3e44de8a5 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -1,3 +1,16 @@ +const_value set 2 + const ILEXFOREST_BIRD + const ILEXFOREST_YOUNGSTER1 + const ILEXFOREST_BLACK_BELT + const ILEXFOREST_ROCKER + const ILEXFOREST_POKE_BALL1 + const ILEXFOREST_KURT + const ILEXFOREST_LASS + const ILEXFOREST_YOUNGSTER2 + const ILEXFOREST_POKE_BALL2 + const ILEXFOREST_POKE_BALL3 + const ILEXFOREST_POKE_BALL4 + IlexForest_MapScriptHeader: .MapTriggers: db 0 @@ -7,328 +20,330 @@ IlexForest_MapScriptHeader: ; callbacks - dbw 2, UnknownScript_0x6eb03 + dbw 2, .FarfetchdCallback -UnknownScript_0x6eb03: +.FarfetchdCallback: checkevent EVENT_GOT_HM01_CUT - iftrue UnknownScript_0x6eb34 + iftrue .Static copybytetovar FarfetchdPosition - if_equal $1, UnknownScript_0x6eb35 - if_equal $2, UnknownScript_0x6eb3c - if_equal $3, UnknownScript_0x6eb43 - if_equal $4, UnknownScript_0x6eb4a - if_equal $5, UnknownScript_0x6eb51 - if_equal $6, UnknownScript_0x6eb58 - if_equal $7, UnknownScript_0x6eb5f - if_equal $8, UnknownScript_0x6eb66 - if_equal $9, UnknownScript_0x6eb6d - if_equal $a, UnknownScript_0x6eb74 -UnknownScript_0x6eb34: + if_equal 1, .PositionOne + if_equal 2, .PositionTwo + if_equal 3, .PositionThree + if_equal 4, .PositionFour + if_equal 5, .PositionFive + if_equal 6, .PositionSix + if_equal 7, .PositionSeven + if_equal 8, .PositionEight + if_equal 9, .PositionNine + if_equal 10, .PositionTen +.Static: return -UnknownScript_0x6eb35: - moveperson $2, $e, $1f - appear $2 +.PositionOne: + moveperson ILEXFOREST_BIRD, $e, $1f + appear ILEXFOREST_BIRD return -UnknownScript_0x6eb3c: - moveperson $2, $f, $19 - appear $2 +.PositionTwo: + moveperson ILEXFOREST_BIRD, $f, $19 + appear ILEXFOREST_BIRD return -UnknownScript_0x6eb43: - moveperson $2, $14, $18 - appear $2 +.PositionThree: + moveperson ILEXFOREST_BIRD, $14, $18 + appear ILEXFOREST_BIRD return -UnknownScript_0x6eb4a: - moveperson $2, $1d, $16 - appear $2 +.PositionFour: + moveperson ILEXFOREST_BIRD, $1d, $16 + appear ILEXFOREST_BIRD return -UnknownScript_0x6eb51: - moveperson $2, $1c, $1f - appear $2 +.PositionFive: + moveperson ILEXFOREST_BIRD, $1c, $1f + appear ILEXFOREST_BIRD return -UnknownScript_0x6eb58: - moveperson $2, $18, $23 - appear $2 +.PositionSix: + moveperson ILEXFOREST_BIRD, $18, $23 + appear ILEXFOREST_BIRD return -UnknownScript_0x6eb5f: - moveperson $2, $16, $1f - appear $2 +.PositionSeven: + moveperson ILEXFOREST_BIRD, $16, $1f + appear ILEXFOREST_BIRD return -UnknownScript_0x6eb66: - moveperson $2, $f, $1d - appear $2 +.PositionEight: + moveperson ILEXFOREST_BIRD, $f, $1d + appear ILEXFOREST_BIRD return -UnknownScript_0x6eb6d: - moveperson $2, $a, $23 - appear $2 +.PositionNine: + moveperson ILEXFOREST_BIRD, $a, $23 + appear ILEXFOREST_BIRD return -UnknownScript_0x6eb74: - moveperson $2, $6, $1c - appear $2 +.PositionTen: + moveperson ILEXFOREST_BIRD, $6, $1c + appear ILEXFOREST_BIRD return YoungsterScript_0x6eb7b: faceplayer loadfont checkevent EVENT_HERDED_FARFETCHD - iftrue UnknownScript_0x6eb89 + iftrue .DoneFarfetchd writetext UnknownText_0x6ef5c + waitbutton closetext - loadmovesprites end -UnknownScript_0x6eb89: +.DoneFarfetchd: writetext UnknownText_0x6f019 + waitbutton closetext - loadmovesprites end -BirdScript_0x6eb8f: +IlexForestFarfetchdScript: copybytetovar FarfetchdPosition - if_equal $1, UnknownScript_0x6ebba - if_equal $2, UnknownScript_0x6ebd9 - if_equal $3, UnknownScript_0x6ec02 - if_equal $4, UnknownScript_0x6ec2b - if_equal $5, UnknownScript_0x6ec54 - if_equal $6, UnknownScript_0x6eca7 - if_equal $7, UnknownScript_0x6ecd0 - if_equal $8, UnknownScript_0x6ed0e - if_equal $9, UnknownScript_0x6ed50 - if_equal $a, UnknownScript_0x6ed96 -UnknownScript_0x6ebba: + if_equal 1, .Position1 + if_equal 2, .Position2 + if_equal 3, .Position3 + if_equal 4, .Position4 + if_equal 5, .Position5 + if_equal 6, .Position6 + if_equal 7, .Position7 + if_equal 8, .Position8 + if_equal 9, .Position9 + if_equal 10, .Position10 + +.Position1: faceplayer loadfont - writetext UnknownText_0x6f06f + writetext Text_ItsTheMissingPokemon keeptextopen - writetext UnknownText_0x6f086 + writetext Text_Kwaaaa cry FARFETCH_D + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x6ee8f - moveperson $2, $f, $19 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $2 - end - -UnknownScript_0x6ebd9: - scall UnknownScript_0x6eda1 - if_equal $0, UnknownScript_0x6ebf1 - applymovement $2, MovementData_0x6ee95 - moveperson $2, $14, $18 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $3 - end - -UnknownScript_0x6ebf1: - applymovement $2, MovementData_0x6ee9e - moveperson $2, $f, $1d - disappear $2 - appear $2 - loadvar FarfetchdPosition, $8 - end - -UnknownScript_0x6ec02: - scall UnknownScript_0x6eda1 - if_equal $2, UnknownScript_0x6ec1a - applymovement $2, MovementData_0x6eea4 - moveperson $2, $1d, $16 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $4 - end - -UnknownScript_0x6ec1a: - applymovement $2, MovementData_0x6eeab - moveperson $2, $f, $19 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $2 - end - -UnknownScript_0x6ec2b: - scall UnknownScript_0x6eda1 - if_equal $1, UnknownScript_0x6ec43 - applymovement $2, MovementData_0x6eeb1 - moveperson $2, $1c, $1f - disappear $2 - appear $2 - loadvar FarfetchdPosition, $5 - end - -UnknownScript_0x6ec43: - applymovement $2, MovementData_0x6eeb8 - moveperson $2, $14, $18 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $3 - end - -UnknownScript_0x6ec54: - scall UnknownScript_0x6eda1 - if_equal $1, UnknownScript_0x6ec85 - if_equal $2, UnknownScript_0x6ec74 - if_equal $3, UnknownScript_0x6ec96 - applymovement $2, MovementData_0x6eebd - moveperson $2, $18, $23 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $6 - end - -UnknownScript_0x6ec74: - applymovement $2, MovementData_0x6eec7 - moveperson $2, $16, $1f - disappear $2 - appear $2 - loadvar FarfetchdPosition, $7 - end - -UnknownScript_0x6ec85: - applymovement $2, MovementData_0x6eecc - moveperson $2, $1d, $16 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $4 - end - -UnknownScript_0x6ec96: - applymovement $2, MovementData_0x6eed2 - moveperson $2, $1d, $16 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $4 - end - -UnknownScript_0x6eca7: - scall UnknownScript_0x6eda1 - if_equal $3, UnknownScript_0x6ecbf - applymovement $2, MovementData_0x6eee6 - moveperson $2, $16, $1f - disappear $2 - appear $2 - loadvar FarfetchdPosition, $7 - end - -UnknownScript_0x6ecbf: - applymovement $2, MovementData_0x6eeef - moveperson $2, $1c, $1f - disappear $2 - appear $2 - loadvar FarfetchdPosition, $5 - end - -UnknownScript_0x6ecd0: - scall UnknownScript_0x6eda1 - if_equal $0, UnknownScript_0x6ecfd - if_equal $2, UnknownScript_0x6ecec - applymovement $2, MovementData_0x6eef8 - moveperson $2, $f, $1d - disappear $2 - appear $2 - loadvar FarfetchdPosition, $8 - end - -UnknownScript_0x6ecec: - applymovement $2, MovementData_0x6ef00 - moveperson $2, $18, $23 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $6 - end - -UnknownScript_0x6ecfd: - applymovement $2, MovementData_0x6ef09 - moveperson $2, $1c, $1f - disappear $2 - appear $2 - loadvar FarfetchdPosition, $5 - end - -UnknownScript_0x6ed0e: - scall UnknownScript_0x6eda1 - if_equal $1, UnknownScript_0x6ed3f - if_equal $2, UnknownScript_0x6ed3f - if_equal $3, UnknownScript_0x6ed2e - applymovement $2, MovementData_0x6ef10 - moveperson $2, $a, $23 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $9 - end - -UnknownScript_0x6ed2e: - applymovement $2, MovementData_0x6ef18 - moveperson $2, $16, $1f - disappear $2 - appear $2 - loadvar FarfetchdPosition, $7 - end - -UnknownScript_0x6ed3f: - applymovement $2, MovementData_0x6ef1e - moveperson $2, $f, $19 - disappear $2 - appear $2 - loadvar FarfetchdPosition, $2 - end - -UnknownScript_0x6ed50: - scall UnknownScript_0x6eda1 - if_equal $0, UnknownScript_0x6ed85 - if_equal $3, UnknownScript_0x6ed74 - applymovement $2, MovementData_0x6ef23 - moveperson $2, $6, $1c - disappear $2 - appear $2 - loadvar FarfetchdPosition, $a - appear $4 + applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos1_Pos2 + moveperson ILEXFOREST_BIRD, $f, $19 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 2 + end + +.Position2: + scall .CryAndCheckFacing + if_equal DOWN, .Position2_Down + applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos2_Pos3 + moveperson ILEXFOREST_BIRD, $14, $18 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 3 + end + +.Position2_Down: + applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos2_Pos8 + moveperson ILEXFOREST_BIRD, $f, $1d + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 8 + end + +.Position3: + scall .CryAndCheckFacing + if_equal LEFT, .Position3_Left + applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos3_Pos4 + moveperson ILEXFOREST_BIRD, $1d, $16 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 4 + end + +.Position3_Left: + applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos3_Pos2 + moveperson ILEXFOREST_BIRD, $f, $19 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 2 + end + +.Position4: + scall .CryAndCheckFacing + if_equal UP, .Position4_Up + applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos4_Pos5 + moveperson ILEXFOREST_BIRD, $1c, $1f + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 5 + end + +.Position4_Up: + applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos4_Pos3 + moveperson ILEXFOREST_BIRD, $14, $18 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 3 + end + +.Position5: + scall .CryAndCheckFacing + if_equal UP, .Position5_Up + if_equal LEFT, .Position5_Left + if_equal RIGHT, .Position5_Right + applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos5_Pos6 + moveperson ILEXFOREST_BIRD, $18, $23 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 6 + end + +.Position5_Left: + applymovement ILEXFOREST_BIRD, MovementData_Farfetchd_Pos5_Pos7 + moveperson ILEXFOREST_BIRD, $16, $1f + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 7 + end + +.Position5_Up: + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos5_Pos4_Up + moveperson ILEXFOREST_BIRD, $1d, $16 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 4 + end + +.Position5_Right: + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos5_Pos4_Right + moveperson ILEXFOREST_BIRD, $1d, $16 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 4 + end + +.Position6: + scall .CryAndCheckFacing + if_equal RIGHT, .Position6_Right + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos6_Pos7 + moveperson ILEXFOREST_BIRD, $16, $1f + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 7 + end + +.Position6_Right: + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos6_Pos5 + moveperson ILEXFOREST_BIRD, $1c, $1f + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 5 + end + +.Position7: + scall .CryAndCheckFacing + if_equal DOWN, .Position7_Down + if_equal LEFT, .Position7_Left + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos7_Pos8 + moveperson ILEXFOREST_BIRD, $f, $1d + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 8 + end + +.Position7_Left: + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos7_Pos6 + moveperson ILEXFOREST_BIRD, $18, $23 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 6 + end + +.Position7_Down: + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos7_Pos5 + moveperson ILEXFOREST_BIRD, $1c, $1f + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 5 + end + +.Position8: + scall .CryAndCheckFacing + if_equal UP, .Position8_Up + if_equal LEFT, .Position8_Left + if_equal RIGHT, .Position8_Right + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos8_Pos9 + moveperson ILEXFOREST_BIRD, $a, $23 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 9 + end + +.Position8_Right: + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos8_Pos7 + moveperson ILEXFOREST_BIRD, $16, $1f + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 7 + end + +.Position8_Up: +.Position8_Left: + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos8_Pos2 + moveperson ILEXFOREST_BIRD, $f, $19 + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 2 + end + +.Position9: + scall .CryAndCheckFacing + if_equal DOWN, .Position9_Down + if_equal RIGHT, .Position9_Right + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos9_Pos10 + moveperson ILEXFOREST_BIRD, $6, $1c + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 10 + appear ILEXFOREST_BLACK_BELT setevent EVENT_CHARCOAL_KILN_BOSS setevent EVENT_HERDED_FARFETCHD end -UnknownScript_0x6ed74: - applymovement $2, MovementData_0x6ef33 - moveperson $2, $f, $1d - disappear $2 - appear $2 - loadvar FarfetchdPosition, $8 +.Position9_Right: + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos9_Pos8_Right + moveperson ILEXFOREST_BIRD, $f, $1d + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 8 end -UnknownScript_0x6ed85: - applymovement $2, MovementData_0x6ef3d - moveperson $2, $f, $1d - disappear $2 - appear $2 - loadvar FarfetchdPosition, $8 +.Position9_Down: + applymovement ILEXFOREST_BIRD, MovementData_Farfetched_Pos9_Pos8_Down + moveperson ILEXFOREST_BIRD, $f, $1d + disappear ILEXFOREST_BIRD + appear ILEXFOREST_BIRD + loadvar FarfetchdPosition, 8 end -UnknownScript_0x6ed96: +.Position10: faceplayer loadfont - writetext UnknownText_0x6f086 + writetext Text_Kwaaaa cry FARFETCH_D + waitbutton closetext - loadmovesprites end -UnknownScript_0x6eda1: +.CryAndCheckFacing: faceplayer loadfont - writetext UnknownText_0x6f086 + writetext Text_Kwaaaa cry FARFETCH_D + waitbutton closetext - loadmovesprites checkcode VAR_FACING end @@ -336,14 +351,14 @@ BlackBeltScript_0x6edae: faceplayer loadfont checkevent EVENT_GOT_HM01_CUT - iftrue UnknownScript_0x6edd8 + iftrue .AlreadyGotCut writetext UnknownText_0x6f099 keeptextopen verbosegiveitem HM_CUT setevent EVENT_GOT_HM01_CUT writetext UnknownText_0x6f141 + waitbutton closetext - loadmovesprites setevent EVENT_ILEX_FOREST_FARFETCHD setevent EVENT_ILEX_FOREST_APPRENTICE setevent EVENT_ILEX_FOREST_CHARCOAL_MASTER @@ -352,10 +367,10 @@ BlackBeltScript_0x6edae: clearevent EVENT_CHARCOAL_KILN_BOSS end -UnknownScript_0x6edd8: +.AlreadyGotCut: writetext UnknownText_0x6f1c0 + waitbutton closetext - loadmovesprites end RockerScript_0x6edde: @@ -370,20 +385,20 @@ RockerScript_0x6edde: setevent EVENT_GOT_TM02_HEADBUTT UnknownScript_0x6edf3: writetext UnknownText_0x6f26d - closetext + waitbutton UnknownScript_0x6edf7: - loadmovesprites + closetext end TrainerBug_catcherWayne: trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, Bug_catcherWayneSeenText, Bug_catcherWayneBeatenText, 0, Bug_catcherWayneScript Bug_catcherWayneScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x6f571 + waitbutton closetext - loadmovesprites end LassScript_0x6ee0d: @@ -421,32 +436,32 @@ MapIlexForestSignpost0Script: MapIlexForestSignpost4Script: checkevent EVENT_FOREST_IS_RESTLESS - iftrue UnknownScript_0x6ee30 - jump UnknownScript_0x6ee35 + iftrue .ForestIsRestless + jump .DontDoCelebiEvent -UnknownScript_0x6ee30: +.ForestIsRestless: checkitem GS_BALL - iftrue UnknownScript_0x6ee38 -UnknownScript_0x6ee35: + iftrue .AskCelebiEvent +.DontDoCelebiEvent: jumptext UnknownText_0x6f358 -UnknownScript_0x6ee38: +.AskCelebiEvent: loadfont writetext UnknownText_0x6f394 yesorno - iftrue UnknownScript_0x6ee42 - loadmovesprites + iftrue .CelebiEvent + closetext end -UnknownScript_0x6ee42: +.CelebiEvent: takeitem GS_BALL clearevent EVENT_FOREST_IS_RESTLESS setevent EVENT_AZALEA_TOWN_KURT - disappear $8 + disappear ILEXFOREST_LASS clearevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS writetext UnknownText_0x6f43b + waitbutton closetext - loadmovesprites pause 20 showemote EMOTE_SHOCK, PLAYER, 20 special Special_RotatePalettesRightMusic @@ -456,24 +471,24 @@ UnknownScript_0x6ee42: pause 20 clearflag ENGINE_HAVE_EXAMINED_GS_BALL special Special_CelebiShrineEvent - loadpokedata CELEBI, 30 + scriptedpokedata CELEBI, 30 startbattle returnafterbattle pause 20 special CheckCaughtCelebi - iffalse UnknownScript_0x6ee8e - appear $7 - applymovement $7, MovementData_0x6ef4e + iffalse .DidntCatchCelebi + appear ILEXFOREST_KURT + applymovement ILEXFOREST_KURT, MovementData_0x6ef4e loadfont writetext UnknownText_0x6f452 + waitbutton closetext - loadmovesprites - applymovement $7, MovementData_0x6ef53 - disappear $7 -UnknownScript_0x6ee8e: + applymovement ILEXFOREST_KURT, MovementData_0x6ef53 + disappear ILEXFOREST_KURT +.DidntCatchCelebi: end -MovementData_0x6ee8f: +MovementData_Farfetchd_Pos1_Pos2: big_step_up big_step_up big_step_up @@ -481,7 +496,7 @@ MovementData_0x6ee8f: big_step_up step_end -MovementData_0x6ee95: +MovementData_Farfetchd_Pos2_Pos3: big_step_up big_step_up big_step_right @@ -492,7 +507,7 @@ MovementData_0x6ee95: big_step_down step_end -MovementData_0x6ee9e: +MovementData_Farfetchd_Pos2_Pos8: big_step_down big_step_down big_step_down @@ -500,7 +515,7 @@ MovementData_0x6ee9e: big_step_down step_end -MovementData_0x6eea4: +MovementData_Farfetchd_Pos3_Pos4: big_step_right big_step_right big_step_right @@ -509,7 +524,7 @@ MovementData_0x6eea4: big_step_right step_end -MovementData_0x6eeab: +MovementData_Farfetchd_Pos3_Pos2: big_step_up big_step_left big_step_left @@ -517,7 +532,7 @@ MovementData_0x6eeab: big_step_left step_end -MovementData_0x6eeb1: +MovementData_Farfetchd_Pos4_Pos5: big_step_down big_step_down big_step_down @@ -526,14 +541,14 @@ MovementData_0x6eeb1: big_step_down step_end -MovementData_0x6eeb8: +MovementData_Farfetchd_Pos4_Pos3: big_step_left jump_step_left big_step_left big_step_left step_end -MovementData_0x6eebd: +MovementData_Farfetchd_Pos5_Pos6: big_step_down big_step_down big_step_down @@ -545,14 +560,14 @@ MovementData_0x6eebd: big_step_left step_end -MovementData_0x6eec7: +MovementData_Farfetchd_Pos5_Pos7: big_step_left big_step_left big_step_left big_step_left step_end -MovementData_0x6eecc: +MovementData_Farfetched_Pos5_Pos4_Up: big_step_up big_step_up big_step_up @@ -560,14 +575,14 @@ MovementData_0x6eecc: big_step_up step_end -MovementData_0x6eed2: +MovementData_Farfetched_Pos5_Pos4_Right: big_step_right turn_head_up - db $3e ; movement + step_sleep_1 turn_head_down - db $3e ; movement + step_sleep_1 turn_head_up - db $3e ; movement + step_sleep_1 big_step_down big_step_down fix_facing @@ -582,7 +597,7 @@ MovementData_0x6eed2: big_step_up step_end -MovementData_0x6eee6: +MovementData_Farfetched_Pos6_Pos7: big_step_left big_step_left big_step_left @@ -593,7 +608,7 @@ MovementData_0x6eee6: big_step_up step_end -MovementData_0x6eeef: +MovementData_Farfetched_Pos6_Pos5: big_step_right big_step_right big_step_right @@ -604,7 +619,7 @@ MovementData_0x6eeef: big_step_up step_end -MovementData_0x6eef8: +MovementData_Farfetched_Pos7_Pos8: big_step_up big_step_up big_step_left @@ -614,7 +629,7 @@ MovementData_0x6eef8: big_step_left step_end -MovementData_0x6ef00: +MovementData_Farfetched_Pos7_Pos6: big_step_down big_step_down big_step_left @@ -625,7 +640,7 @@ MovementData_0x6ef00: big_step_right step_end -MovementData_0x6ef09: +MovementData_Farfetched_Pos7_Pos5: big_step_right big_step_right big_step_right @@ -634,7 +649,7 @@ MovementData_0x6ef09: big_step_right step_end -MovementData_0x6ef10: +MovementData_Farfetched_Pos8_Pos9: big_step_down big_step_left big_step_down @@ -644,7 +659,7 @@ MovementData_0x6ef10: big_step_down step_end -MovementData_0x6ef18: +MovementData_Farfetched_Pos8_Pos7: big_step_right big_step_right big_step_right @@ -652,14 +667,14 @@ MovementData_0x6ef18: big_step_right step_end -MovementData_0x6ef1e: +MovementData_Farfetched_Pos8_Pos2: big_step_up big_step_up big_step_up big_step_up step_end -MovementData_0x6ef23: +MovementData_Farfetched_Pos9_Pos10: big_step_left big_step_left fix_facing @@ -677,7 +692,7 @@ MovementData_0x6ef23: big_step_up step_end -MovementData_0x6ef33: +MovementData_Farfetched_Pos9_Pos8_Right: big_step_right big_step_right big_step_right @@ -689,7 +704,7 @@ MovementData_0x6ef33: big_step_up step_end -MovementData_0x6ef3d: +MovementData_Farfetched_Pos9_Pos8_Down: big_step_left big_step_left fix_facing @@ -757,12 +772,12 @@ UnknownText_0x6f019: cont "a BADGE." done -UnknownText_0x6f06f: +Text_ItsTheMissingPokemon: text "It's the missing" line "#MON!" done -UnknownText_0x6f086: +Text_Kwaaaa: text "FARFETCH'D: Kwaa!" done @@ -950,7 +965,7 @@ IlexForest_MapEventHeader: .PersonEvents: db 11 - person_event SPRITE_BIRD, 31, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, BirdScript_0x6eb8f, EVENT_ILEX_FOREST_FARFETCHD + person_event SPRITE_BIRD, 31, 14, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, IlexForestFarfetchdScript, EVENT_ILEX_FOREST_FARFETCHD person_event SPRITE_YOUNGSTER, 28, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x6eb7b, EVENT_ILEX_FOREST_APPRENTICE person_event SPRITE_BLACK_BELT, 28, 5, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x6edae, EVENT_ILEX_FOREST_CHARCOAL_MASTER person_event SPRITE_ROCKER, 14, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RockerScript_0x6edde, -1 diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index 39596b0a2..25ffdfcd0 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ILEXFORESTAZALEAGATE_OFFICER + const ILEXFORESTAZALEAGATE_GRANNY + IlexForestAzaleaGate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 6595cc0a9..5917397d6 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -1,3 +1,11 @@ +const_value set 2 + const INDIGOPLATEAUPOKECENTER1F_NURSE + const INDIGOPLATEAUPOKECENTER1F_CLERK + const INDIGOPLATEAUPOKECENTER1F_COOLTRAINER_M + const INDIGOPLATEAUPOKECENTER1F_SILVER + const INDIGOPLATEAUPOKECENTER1F_GRAMPS + const INDIGOPLATEAUPOKECENTER1F_JYNX + IndigoPlateauPokeCenter1F_MapScriptHeader: .MapTriggers: db 1 @@ -51,13 +59,13 @@ UnknownScript_0x180053: if_equal THURSDAY, UnknownScript_0x18012b if_equal FRIDAY, UnknownScript_0x18012b if_equal SATURDAY, UnknownScript_0x18012b - moveperson $5, $11, $9 - appear $5 + moveperson INDIGOPLATEAUPOKECENTER1F_SILVER, $11, $9 + appear INDIGOPLATEAUPOKECENTER1F_SILVER spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 special Special_RotatePalettesRightMusic pause 15 - applymovement $5, MovementData_0x180164 + applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, MovementData_0x180164 playmusic MUSIC_RIVAL_ENCOUNTER spriteface PLAYER, RIGHT jump UnknownScript_0x1800ce @@ -73,19 +81,19 @@ UnknownScript_0x180094: if_equal THURSDAY, UnknownScript_0x18012b if_equal FRIDAY, UnknownScript_0x18012b if_equal SATURDAY, UnknownScript_0x18012b - appear $5 + appear INDIGOPLATEAUPOKECENTER1F_SILVER spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 special Special_RotatePalettesRightMusic pause 15 - applymovement $5, MovementData_0x18016b + applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, MovementData_0x18016b playmusic MUSIC_RIVAL_ENCOUNTER spriteface PLAYER, LEFT UnknownScript_0x1800ce: loadfont writetext UnknownText_0x1801f5 + waitbutton closetext - loadmovesprites setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x1800f3 @@ -93,7 +101,7 @@ UnknownScript_0x1800ce: iftrue UnknownScript_0x180103 winlosstext UnknownText_0x180295, UnknownText_0x1802fd setlasttalked $5 - loadtrainer RIVAL2, 6 + scriptedtrainerdata RIVAL2, 6 startbattle reloadmapmusic returnafterbattle @@ -102,7 +110,7 @@ UnknownScript_0x1800ce: UnknownScript_0x1800f3: winlosstext UnknownText_0x180295, UnknownText_0x1802fd setlasttalked $5 - loadtrainer RIVAL2, 4 + scriptedtrainerdata RIVAL2, 4 startbattle reloadmapmusic returnafterbattle @@ -111,7 +119,7 @@ UnknownScript_0x1800f3: UnknownScript_0x180103: winlosstext UnknownText_0x180295, UnknownText_0x1802fd setlasttalked $5 - loadtrainer RIVAL2, 5 + scriptedtrainerdata RIVAL2, 5 startbattle reloadmapmusic returnafterbattle @@ -121,11 +129,11 @@ UnknownScript_0x180113: playmusic MUSIC_RIVAL_AFTER loadfont writetext UnknownText_0x1802a4 + waitbutton closetext - loadmovesprites spriteface PLAYER, DOWN - applymovement $5, MovementData_0x180172 - disappear $5 + applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, MovementData_0x180172 + disappear INDIGOPLATEAUPOKECENTER1F_SILVER dotrigger $0 playmapmusic setflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT @@ -138,7 +146,7 @@ NurseScript_0x18012c: ClerkScript_0x18012f: loadfont pokemart MARTTYPE_STANDARD, MART_INDIGO_PLATEAU - loadmovesprites + closetext end CooltrainerMScript_0x180136: @@ -151,26 +159,26 @@ TeleportGuyScript: yesorno iffalse .No writetext TeleportGuyYesText + waitbutton closetext - loadmovesprites playsound SFX_WARP_TO special FadeOutPalettes - waitbutton + waitsfx warp NEW_BARK_TOWN, $d, $6 end .No writetext TeleportGuyNoText + waitbutton closetext - loadmovesprites end AbraScript: loadfont writetext AbraText cry ABRA + waitbutton closetext - loadmovesprites end MovementData_0x180164: diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index 0f32ebebc..35be58a03 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -1,3 +1,6 @@ +const_value set 2 + const KARENSROOM_KAREN + KarensRoom_MapScriptHeader: .MapTriggers: db 2 @@ -38,10 +41,10 @@ UnknownScript_0x180bd6: earthquake 80 changeblock $4, $e, $2a reloadmappart - loadmovesprites + closetext dotrigger $1 setevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED - waitbutton + waitsfx end KarenScript_0x180bee: @@ -50,29 +53,29 @@ KarenScript_0x180bee: checkevent EVENT_BEAT_ELITE_4_KAREN iftrue UnknownScript_0x180c1c writetext UnknownText_0x180c27 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x180cf8, 0 - loadtrainer KAREN, 1 + scriptedtrainerdata KAREN, 1 startbattle returnafterbattle setevent EVENT_BEAT_ELITE_4_KAREN loadfont writetext UnknownText_0x180d29 + waitbutton closetext - loadmovesprites playsound SFX_ENTER_DOOR changeblock $4, $2, $16 reloadmappart - loadmovesprites + closetext setevent EVENT_KARENS_ROOM_EXIT_OPEN - waitbutton + waitsfx end UnknownScript_0x180c1c: writetext UnknownText_0x180d29 + waitbutton closetext - loadmovesprites end MovementData_0x180c22: diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index b822efd9f..6e68d7941 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -1,3 +1,6 @@ +const_value set 2 + const KOGASROOM_KOGA + KogasRoom_MapScriptHeader: .MapTriggers: db 2 @@ -38,10 +41,10 @@ UnknownScript_0x180742: earthquake 80 changeblock $4, $e, $2a reloadmappart - loadmovesprites + closetext dotrigger $1 setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED - waitbutton + waitsfx end KogaScript_0x18075a: @@ -50,29 +53,29 @@ KogaScript_0x18075a: checkevent EVENT_BEAT_ELITE_4_KOGA iftrue UnknownScript_0x180788 writetext UnknownText_0x180793 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x1808a9, 0 - loadtrainer KOGA, 1 + scriptedtrainerdata KOGA, 1 startbattle returnafterbattle setevent EVENT_BEAT_ELITE_4_KOGA loadfont writetext UnknownText_0x1808ca + waitbutton closetext - loadmovesprites playsound SFX_ENTER_DOOR changeblock $4, $2, $16 reloadmappart - loadmovesprites + closetext setevent EVENT_KOGAS_ROOM_EXIT_OPEN - waitbutton + waitsfx end UnknownScript_0x180788: writetext UnknownText_0x1808ca + waitbutton closetext - loadmovesprites end MovementData_0x18078e: diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index a211456c9..18b1b500b 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const KRISSHOUSE1F_MOM1 + const KRISSHOUSE1F_MOM2 + const KRISSHOUSE1F_MOM3 + const KRISSHOUSE1F_MOM4 + const KRISSHOUSE1F_POKEFAN_F + KrissHouse1F_MapScriptHeader: .MapTriggers: db 2 @@ -20,15 +27,15 @@ UnknownScript_0x7a4d8: UnknownScript_0x7a4db: playmusic MUSIC_MOM - showemote EMOTE_SHOCK, $2, 15 + showemote EMOTE_SHOCK, KRISSHOUSE1F_MOM1, 15 spriteface PLAYER, LEFT checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x7a4f2 - applymovement $2, MovementData_0x7a5fc + applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a5fc jump UnknownScript_0x7a4f6 UnknownScript_0x7a4f2: - applymovement $2, MovementData_0x7a5fe + applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a5fe UnknownScript_0x7a4f6: loadfont writetext UnknownText_0x7a604 @@ -75,8 +82,8 @@ UnknownScript_0x7a542: UnknownScript_0x7a549: writetext UnknownText_0x7a850 + waitbutton closetext - loadmovesprites checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x7a55d checkevent EVENT_RECEIVED_BALLS_FROM_KURT @@ -84,16 +91,16 @@ UnknownScript_0x7a549: jump UnknownScript_0x7a56b UnknownScript_0x7a55d: - applymovement $2, MovementData_0x7a600 + applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a600 jump UnknownScript_0x7a56b UnknownScript_0x7a564: - applymovement $2, MovementData_0x7a602 + applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a602 jump UnknownScript_0x7a56b UnknownScript_0x7a56b: special RestartMapMusic - spriteface $2, LEFT + spriteface KRISSHOUSE1F_MOM1, LEFT end UnknownScript_0x7a572: @@ -122,20 +129,20 @@ MomScript_0x7a582: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue UnknownScript_0x7a5a9 writetext UnknownText_0x7a8b5 + waitbutton closetext - loadmovesprites end UnknownScript_0x7a5a9: writetext UnknownText_0x7a8e5 + waitbutton closetext - loadmovesprites end UnknownScript_0x7a5af: writetext UnknownText_0x7a957 + waitbutton closetext - loadmovesprites end UnknownScript_0x7a5b5: @@ -143,8 +150,8 @@ UnknownScript_0x7a5b5: UnknownScript_0x7a5b8: setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST special Special_BankOfMom + waitbutton closetext - loadmovesprites end NeighborScript: @@ -174,9 +181,9 @@ NeighborScript: .Main writetext NeighborText + waitbutton closetext - loadmovesprites - spriteface $6, RIGHT + spriteface KRISSHOUSE1F_POKEFAN_F, RIGHT end TVScript: diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index 4275dd8ee..1ae6a00df 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const KRISSHOUSE2F_CONSOLE + const KRISSHOUSE2F_DOLL_1 + const KRISSHOUSE2F_DOLL_2 + const KRISSHOUSE2F_BIG_DOLL + KrissHouse2F_MapScriptHeader: .MapTriggers: db 0 @@ -67,7 +73,7 @@ KrissHouseRadio: musicfadeout MUSIC_NEW_BARK_TOWN, $10 writetext KrisRadioText4 pause 45 - loadmovesprites + closetext setevent EVENT_LISTENED_TO_INITIAL_RADIO end @@ -78,7 +84,7 @@ KrissHouseRadio: loadfont writetext KrisRadioText4 pause 45 - loadmovesprites + closetext end KrissHouseBookshelf: @@ -88,7 +94,7 @@ KrissHousePC: loadfont special Special_KrissHousePC iftrue .Warp - loadmovesprites + closetext end .Warp warp NONE, $0, $0 diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index 07ec09d72..ca3c00081 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const KRISSNEIGHBORSHOUSE_COOLTRAINER_F + const KRISSNEIGHBORSHOUSE_POKEFAN_F + KrissNeighborsHouse_MapScriptHeader: .MapTriggers: db 0 @@ -30,7 +34,7 @@ KrissNeighborsHouseRadio: musicfadeout MUSIC_NEW_BARK_TOWN, $10 writetext KrisNeighborRadioText4 pause 45 - loadmovesprites + closetext setevent EVENT_LISTENED_TO_INITIAL_RADIO end .NormalRadio @@ -39,7 +43,7 @@ KrissNeighborsHouseRadio: loadfont writetext KrisNeighborRadioText4 pause 45 - loadmovesprites + closetext end KrissNeighborsDaughterText: diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 4a24daf72..82f29c544 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -1,3 +1,10 @@ +const_value set 2 + const KURTSHOUSE_KURT1 + const KURTSHOUSE_TWIN1 + const KURTSHOUSE_SLOWPOKE + const KURTSHOUSE_KURT2 + const KURTSHOUSE_TWIN2 + KurtsHouse_MapScriptHeader: .MapTriggers: db 0 @@ -16,17 +23,17 @@ UnknownScript_0x18e154: iftrue UnknownScript_0x18e177 checkflag ENGINE_KURT_MAKING_BALLS iftrue UnknownScript_0x18e16f - disappear $5 - appear $2 - disappear $6 - appear $3 + disappear KURTSHOUSE_KURT2 + appear KURTSHOUSE_KURT1 + disappear KURTSHOUSE_TWIN2 + appear KURTSHOUSE_TWIN1 return UnknownScript_0x18e16f: - disappear $2 - appear $5 - disappear $3 - appear $6 + disappear KURTSHOUSE_KURT1 + appear KURTSHOUSE_KURT2 + disappear KURTSHOUSE_TWIN1 + appear KURTSHOUSE_TWIN2 UnknownScript_0x18e177: return @@ -38,28 +45,28 @@ KurtScript_0x18e178: checkevent EVENT_CLEARED_SLOWPOKE_WELL iftrue .ClearedSlowpokeWell writetext UnknownText_0x18e473 + waitbutton closetext - loadmovesprites special Special_RotatePalettesRightMusic setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET checkcode VAR_FACING if_equal UP, .RunAround spriteface PLAYER, DOWN playsound SFX_FLY - applymovement $2, MovementData_0x18e466 + applymovement KURTSHOUSE_KURT1, MovementData_0x18e466 playsound SFX_EXIT_BUILDING - disappear $2 - waitbutton + disappear KURTSHOUSE_KURT1 + waitsfx special RestartMapMusic end .RunAround: spriteface PLAYER, DOWN playsound SFX_FLY - applymovement $2, MovementData_0x18e46c + applymovement KURTSHOUSE_KURT1, MovementData_0x18e46c playsound SFX_EXIT_BUILDING - disappear $2 - waitbutton + disappear KURTSHOUSE_KURT1 + waitsfx special RestartMapMusic end @@ -94,7 +101,7 @@ KurtScript_0x18e178: checkevent EVENT_DRAGON_SHRINE_QUESTION_2 iftrue .CheckApricorns writetext UnknownText_0x18e6c9 - closetext + waitbutton .CheckApricorns: checkitem RED_APRICORN iftrue .AskApricorn @@ -114,13 +121,13 @@ KurtScript_0x18e178: iftrue .ThatTurnedOutGreat checkevent EVENT_DRAGON_SHRINE_QUESTION_2 iftrue .IMakeBallsFromApricorns - loadmovesprites + closetext end .IMakeBallsFromApricorns: writetext UnknownText_0x18e6c9 + waitbutton closetext - loadmovesprites end .AskApricorn: @@ -168,23 +175,23 @@ KurtScript_0x18e178: setflag ENGINE_KURT_MAKING_BALLS .WaitForApricorns: writetext UnknownText_0x18e779 + waitbutton closetext - loadmovesprites end .Cancel: writetext UnknownText_0x18e7bc + waitbutton closetext - loadmovesprites end ._ThatTurnedOutGreat: setevent EVENT_RECEIVED_BALLS_FROM_KURT .ThatTurnedOutGreat: writetext UnknownText_0x18e82a - closetext + waitbutton .NoRoomForBall: - loadmovesprites + closetext end .GiveLevelBall: @@ -263,8 +270,8 @@ KurtScript_0x18e178: checkitem GS_BALL iffalse .NoGSBall writetext UnknownText_0x18e8ab + waitbutton closetext - loadmovesprites setevent EVENT_GAVE_GS_BALL_TO_KURT takeitem GS_BALL setflag ENGINE_KURT_MAKING_BALLS @@ -274,38 +281,38 @@ KurtScript_0x18e178: checkflag ENGINE_KURT_MAKING_BALLS iffalse .NotMakingBalls writetext UnknownText_0x18e934 - closetext + waitbutton writetext UnknownText_0x18e949 + waitbutton closetext - loadmovesprites end .NotMakingBalls: writetext UnknownText_0x18e95c + waitbutton closetext - loadmovesprites setevent EVENT_FOREST_IS_RESTLESS clearevent EVENT_CAN_GIVE_GS_BALL_TO_KURT clearevent EVENT_GAVE_GS_BALL_TO_KURT special Special_RotatePalettesRightMusic pause 20 - showemote EMOTE_SHOCK, $2, 30 + showemote EMOTE_SHOCK, KURTSHOUSE_KURT1, 30 checkcode VAR_FACING if_equal UP, .GSBallRunAround spriteface PLAYER, DOWN playsound SFX_FLY - applymovement $2, MovementData_0x18e466 + applymovement KURTSHOUSE_KURT1, MovementData_0x18e466 jump .KurtHasLeftTheBuilding .GSBallRunAround: spriteface PLAYER, DOWN playsound SFX_FLY - applymovement $2, MovementData_0x18e46c + applymovement KURTSHOUSE_KURT1, MovementData_0x18e46c .KurtHasLeftTheBuilding: playsound SFX_EXIT_BUILDING - disappear $2 + disappear KURTSHOUSE_KURT1 clearevent EVENT_AZALEA_TOWN_KURT - waitbutton + waitsfx special RestartMapMusic domaptrigger AZALEA_TOWN, $2 end @@ -319,26 +326,26 @@ KurtMakingBallsScript: checkevent EVENT_BUGGING_KURT_TOO_MUCH iffalse Script_FirstTimeBuggingKurt writetext UnknownText_0x18e7d8 + waitbutton closetext - loadmovesprites - spriteface $5, UP + spriteface KURTSHOUSE_KURT2, UP end Script_FirstTimeBuggingKurt: writetext UnknownText_0x18e863 + waitbutton closetext - loadmovesprites - spriteface $5, UP + spriteface KURTSHOUSE_KURT2, UP setevent EVENT_BUGGING_KURT_TOO_MUCH end KurtScript_ImCheckingItNow: writetext UnknownText_0x18e934 - closetext - spriteface $5, UP + waitbutton + spriteface KURTSHOUSE_KURT2, UP writetext UnknownText_0x18e949 + waitbutton closetext - loadmovesprites end KurtsGranddaughter1: @@ -357,29 +364,29 @@ KurtsGranddaughter1: iftrue .Lonely loadfont writetext KurtsGranddaughterSlowpokeGoneText + waitbutton closetext - loadmovesprites end .SlowpokeBack loadfont writetext KurtsGranddaughterSlowpokeBackText + waitbutton closetext - loadmovesprites end .Lonely loadfont writetext KurtsGranddaughterLonelyText + waitbutton closetext - loadmovesprites end .Dad loadfont writetext KurtsGranddaughterDadText + waitbutton closetext - loadmovesprites end KurtsGranddaughter2: @@ -389,23 +396,23 @@ KurtsGranddaughter2Subscript: checkevent EVENT_GAVE_GS_BALL_TO_KURT iftrue .GSBall writetext KurtsGranddaughterHelpText + waitbutton closetext - loadmovesprites - spriteface $6, RIGHT + spriteface KURTSHOUSE_TWIN2, RIGHT end .GSBall writetext KurtsGranddaughterGSBallText + waitbutton closetext - loadmovesprites - spriteface $6, RIGHT + spriteface KURTSHOUSE_TWIN2, RIGHT end KurtsGranddaughterFunScript: loadfont writetext KurtsGranddaughterFunText + waitbutton closetext - loadmovesprites end KurtsHouseSlowpoke: @@ -413,8 +420,8 @@ KurtsHouseSlowpoke: loadfont writetext KurtsHouseSlowpokeText cry SLOWPOKE + waitbutton closetext - loadmovesprites end KurtsHouseOakPhoto: diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index a31201e5d..761e4da5f 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -1,3 +1,17 @@ +const_value set 2 + const LAKEOFRAGE_LANCE + const LAKEOFRAGE_GRAMPS + const LAKEOFRAGE_SUPER_NERD1 + const LAKEOFRAGE_COOLTRAINER_F1 + const LAKEOFRAGE_FISHER1 + const LAKEOFRAGE_FISHER2 + const LAKEOFRAGE_COOLTRAINER_M + const LAKEOFRAGE_COOLTRAINER_F2 + const LAKEOFRAGE_GYARADOS + const LAKEOFRAGE_SUPER_NERD2 + const LAKEOFRAGE_POKE_BALL1 + const LAKEOFRAGE_POKE_BALL2 + LakeofRage_MapScriptHeader: .MapTriggers: db 2 @@ -27,11 +41,11 @@ LakeofRage_MapScriptHeader: .Wesley checkcode VAR_WEEKDAY if_equal WEDNESDAY, .WesleyAppears - disappear $b + disappear LAKEOFRAGE_SUPER_NERD2 return .WesleyAppears - appear $b + appear LAKEOFRAGE_SUPER_NERD2 return LanceScript_0x70022: @@ -46,11 +60,11 @@ LanceScript_0x70022: iffalse UnknownScript_0x7004e UnknownScript_0x70035: writetext UnknownText_0x702c6 + waitbutton closetext - loadmovesprites playsound SFX_WARP_TO - applymovement $2, MovementData_0x70155 - disappear $2 + applymovement LAKEOFRAGE_LANCE, MovementData_0x70155 + disappear LAKEOFRAGE_LANCE clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE setevent EVENT_DECIDED_TO_HELP_LANCE domaptrigger MAHOGANY_MART_1F, $1 @@ -58,8 +72,8 @@ UnknownScript_0x70035: UnknownScript_0x7004e: writetext UnknownText_0x70371 + waitbutton closetext - loadmovesprites setevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE end @@ -76,24 +90,24 @@ GyaradosScript_0x70063: writetext UnknownText_0x703cb pause 15 cry GYARADOS - loadmovesprites - loadpokedata GYARADOS, 30 + closetext + scriptedpokedata GYARADOS, 30 writecode VAR_BATTLETYPE, BATTLETYPE_SHINY startbattle if_equal $1, UnknownScript_0x7007a - disappear $a + disappear LAKEOFRAGE_GYARADOS UnknownScript_0x7007a: returnafterbattle loadfont giveitem RED_SCALE - waitbutton + waitsfx writetext UnknownText_0x703df playsound SFX_ITEM - waitbutton + waitsfx itemnotify - loadmovesprites + closetext dotrigger $0 - appear $2 + appear LAKEOFRAGE_LANCE end GrampsScript_0x7008e: @@ -102,14 +116,14 @@ GrampsScript_0x7008e: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x7009c writetext UnknownText_0x703f8 + waitbutton closetext - loadmovesprites end UnknownScript_0x7009c: writetext UnknownText_0x70421 + waitbutton closetext - loadmovesprites end SuperNerdScript_0x700a2: @@ -126,58 +140,58 @@ MapLakeofRageSignpost1Script: writetext UnknownText_0x70903 checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x700b8 + waitbutton closetext - loadmovesprites end UnknownScript_0x700b8: keeptextopen special Special_MagikarpHouseSign - loadmovesprites + closetext end TrainerFisherAndre: trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, FisherAndreScript FisherAndreScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7058f + waitbutton closetext - loadmovesprites end TrainerFisherRaymond: trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, FisherRaymondScript FisherRaymondScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x70611 + waitbutton closetext - loadmovesprites end TrainerCooltrainermAaron: trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, CooltrainermAaronScript CooltrainermAaronScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7069c + waitbutton closetext - loadmovesprites end TrainerCooltrainerfLois: trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, CooltrainerfLoisScript CooltrainerfLoisScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x70752 + waitbutton closetext - loadmovesprites end WesleyScript: @@ -199,21 +213,21 @@ WesleyScript: iffalse WesleyDoneScript setevent EVENT_GOT_BLACKBELT_FROM_WESLEY writetext WesleyGaveGiftText + waitbutton closetext - loadmovesprites end WesleyWednesdayScript: writetext WesleyWednesdayText - closetext + waitbutton WesleyDoneScript: - loadmovesprites + closetext end WesleyNotWednesdayScript: writetext WesleyNotWednesdayText + waitbutton closetext - loadmovesprites end ItemFragment_0x70148: diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeofRageHiddenPowerHouse.asm index 2c616d617..a39cd0473 100644 --- a/maps/LakeofRageHiddenPowerHouse.asm +++ b/maps/LakeofRageHiddenPowerHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER + LakeofRageHiddenPowerHouse_MapScriptHeader: .MapTriggers: db 0 @@ -16,14 +19,14 @@ HiddenPowerGuy: iffalse .Done setevent EVENT_GOT_TM10_HIDDEN_POWER writetext HiddenPowerGuyText2 + waitbutton closetext - loadmovesprites end .AlreadyGotItem writetext HiddenPowerGuyText3 - closetext + waitbutton .Done - loadmovesprites + closetext end HiddenPowerHouseBookshelf: diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeofRageMagikarpHouse.asm index 48b563d46..79e1346f9 100644 --- a/maps/LakeofRageMagikarpHouse.asm +++ b/maps/LakeofRageMagikarpHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU + LakeofRageMagikarpHouse_MapScriptHeader: .MapTriggers: db 0 @@ -17,21 +20,21 @@ FishingGuruScript_0x19a6ae: checkevent EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP iftrue UnknownScript_0x19a6d1 writetext UnknownText_0x19a72e + waitbutton closetext - loadmovesprites setevent EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP end UnknownScript_0x19a6d1: writetext UnknownText_0x19a84d + waitbutton closetext - loadmovesprites end UnknownScript_0x19a6d7: writetext UnknownText_0x19a890 + waitbutton closetext - loadmovesprites setevent EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP end @@ -40,7 +43,7 @@ UnknownScript_0x19a6e0: special Special_FindThatSpecies iffalse UnknownScript_0x19a6d7 writetext UnknownText_0x19a93e - closetext + waitbutton special Special_CheckMagikarpLength if_equal $0, UnknownScript_0x19a71c if_equal $1, UnknownScript_0x19a722 @@ -53,32 +56,32 @@ UnknownScript_0x19a6fe: verbosegiveitem ELIXER iffalse UnknownScript_0x19a711 writetext UnknownText_0x19a9c3 + waitbutton closetext - loadmovesprites clearevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY end UnknownScript_0x19a711: - loadmovesprites + closetext setevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY end UnknownScript_0x19a716: writetext UnknownText_0x19aa01 + waitbutton closetext - loadmovesprites end UnknownScript_0x19a71c: writetext UnknownText_0x19aa5c + waitbutton closetext - loadmovesprites end UnknownScript_0x19a722: writetext UnknownText_0x19aa79 + waitbutton closetext - loadmovesprites end UnknownScript_0x19a728: diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 0a89ea3a7..5dca053f8 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -1,3 +1,8 @@ +const_value set 2 + const LANCESROOM_LANCE + const LANCESROOM_TEACHER + const LANCESROOM_OAK + LancesRoom_MapScriptHeader: .MapTriggers: db 2 @@ -38,7 +43,7 @@ UnknownScript_0x180e53: earthquake 80 changeblock $4, $16, $34 reloadmappart - loadmovesprites + closetext dotrigger $1 setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED end @@ -52,79 +57,79 @@ UnknownScript_0x180e74: special Special_RotatePalettesRightMusic applymovement PLAYER, MovementData_0x180f3c LanceScript_0x180e7b: - spriteface $2, LEFT + spriteface LANCESROOM_LANCE, LEFT loadfont writetext UnknownText_0x180f67 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x1810a4, 0 setlasttalked $2 - loadtrainer CHAMPION, LANCE + scriptedtrainerdata CHAMPION, LANCE startbattle reloadmapmusic returnafterbattle setevent EVENT_BEAT_CHAMPION_LANCE loadfont writetext UnknownText_0x181132 + waitbutton closetext - loadmovesprites playsound SFX_ENTER_DOOR changeblock $4, $0, $b reloadmappart - loadmovesprites + closetext setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED musicfadeout MUSIC_BEAUTY_ENCOUNTER, $10 pause 30 - showemote EMOTE_SHOCK, $2, 15 - spriteface $2, DOWN + showemote EMOTE_SHOCK, LANCESROOM_LANCE, 15 + spriteface LANCESROOM_LANCE, DOWN pause 10 spriteface PLAYER, DOWN - appear $3 - applymovement $3, MovementData_0x180f41 + appear LANCESROOM_TEACHER + applymovement LANCESROOM_TEACHER, MovementData_0x180f41 loadfont writetext UnknownText_0x1811dd + waitbutton closetext - loadmovesprites - appear $4 - applymovement $4, MovementData_0x180f46 - follow $3, $4 - applymovement $3, MovementData_0x180f49 + appear LANCESROOM_OAK + applymovement LANCESROOM_OAK, MovementData_0x180f46 + follow LANCESROOM_TEACHER, LANCESROOM_OAK + applymovement LANCESROOM_TEACHER, MovementData_0x180f49 stopfollow - spriteface $4, UP - spriteface $2, LEFT + spriteface LANCESROOM_OAK, UP + spriteface LANCESROOM_LANCE, LEFT loadfont writetext UnknownText_0x18121b + waitbutton closetext - loadmovesprites - applymovement $3, MovementData_0x180f4c + applymovement LANCESROOM_TEACHER, MovementData_0x180f4c spriteface PLAYER, LEFT loadfont writetext UnknownText_0x18134b + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x180f4f + applymovement LANCESROOM_LANCE, MovementData_0x180f4f spriteface PLAYER, UP loadfont writetext UnknownText_0x18137b + waitbutton closetext - loadmovesprites - follow $2, PLAYER - spriteface $3, UP - spriteface $4, UP - applymovement $2, MovementData_0x180f53 + follow LANCESROOM_LANCE, PLAYER + spriteface LANCESROOM_TEACHER, UP + spriteface LANCESROOM_OAK, UP + applymovement LANCESROOM_LANCE, MovementData_0x180f53 stopfollow playsound SFX_EXIT_BUILDING - disappear $2 + disappear LANCESROOM_LANCE applymovement PLAYER, MovementData_0x180f55 playsound SFX_EXIT_BUILDING disappear PLAYER - applymovement $3, MovementData_0x180f57 - showemote EMOTE_SHOCK, $3, 15 + applymovement LANCESROOM_TEACHER, MovementData_0x180f57 + showemote EMOTE_SHOCK, LANCESROOM_TEACHER, 15 loadfont writetext UnknownText_0x1813c5 pause 30 - loadmovesprites - applymovement $3, MovementData_0x180f5b + closetext + applymovement LANCESROOM_TEACHER, MovementData_0x180f5b special FadeOutPalettes pause 15 warpfacing UP, HALL_OF_FAME, $4, $d diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 23bd3c222..88653c662 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const LAVRADIOTOWER1F_RECEPTIONIST + const LAVRADIOTOWER1F_OFFICER + const LAVRADIOTOWER1F_SUPER_NERD1 + const LAVRADIOTOWER1F_GENTLEMAN + const LAVRADIOTOWER1F_SUPER_NERD2 + LavRadioTower1F_MapScriptHeader: .MapTriggers: db 0 @@ -22,8 +29,8 @@ GentlemanScript_0x7ee6c: checkevent EVENT_RETURNED_MACHINE_PART iftrue .UnknownScript_0x7ee80 writetext UnknownText_0x7effb + waitbutton closetext - loadmovesprites end .UnknownScript_0x7ee80: @@ -34,8 +41,8 @@ GentlemanScript_0x7ee6c: setflag ENGINE_EXPN_CARD .UnknownScript_0x7ee8e writetext UnknownText_0x7f141 + waitbutton closetext - loadmovesprites end .UnknownScript_0x7ee94 @@ -51,14 +58,14 @@ SuperNerdScript_0x7eea2: checkflag ENGINE_EXPN_CARD iftrue UnknownScript_0x7eeb0 writetext UnknownText_0x7f193 + waitbutton closetext - loadmovesprites end UnknownScript_0x7eeb0: writetext UnknownText_0x7f248 + waitbutton closetext - loadmovesprites end MapLavRadioTower1FSignpost0Script: diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index 2b1243fd8..0d804e960 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const LAVENDERMART_CLERK + const LAVENDERMART_POKEFAN_M + const LAVENDERMART_ROCKER + LavenderMart_MapScriptHeader: .MapTriggers: db 0 @@ -8,7 +13,7 @@ LavenderMart_MapScriptHeader: ClerkScript_0x7eb1c: loadfont pokemart MARTTYPE_STANDARD, MART_LAVENDER - loadmovesprites + closetext end PokefanMScript_0x7eb23: diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 0bb873e3e..c2b046280 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -1,3 +1,6 @@ +const_value set 2 + const LAVENDERNAMERATER_GENTLEMAN + LavenderNameRater_MapScriptHeader: .MapTriggers: db 1 @@ -15,8 +18,8 @@ LavenderNameRater: faceplayer loadfont special SpecialNameRater + waitbutton closetext - loadmovesprites end LavenderNameRaterBookshelf: diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokeCenter1F.asm index 53cfb6e17..91eb97831 100644 --- a/maps/LavenderPokeCenter1F.asm +++ b/maps/LavenderPokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const LAVENDERPOKECENTER1F_NURSE + const LAVENDERPOKECENTER1F_GENTLEMAN + const LAVENDERPOKECENTER1F_TEACHER + const LAVENDERPOKECENTER1F_YOUNGSTER + LavenderPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -20,14 +26,14 @@ YoungsterScript_0x7e6a9: checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x7e6b7 writetext UnknownText_0x7e779 + waitbutton closetext - loadmovesprites end UnknownScript_0x7e6b7: writetext UnknownText_0x7e7ed + waitbutton closetext - loadmovesprites end UnknownText_0x7e6bd: diff --git a/maps/LavenderPokeCenter2FBeta.asm b/maps/LavenderPokeCenter2FBeta.asm index 9d31d8d4e..cbaff9bae 100644 --- a/maps/LavenderPokeCenter2FBeta.asm +++ b/maps/LavenderPokeCenter2FBeta.asm @@ -1,3 +1,5 @@ +const_value set 2 + LavenderPokeCenter2FBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index c29ad4182..d10cce8d0 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -1,3 +1,9 @@ +const_value set 2 + const LAVENDERTOWN_POKEFAN_M + const LAVENDERTOWN_TEACHER + const LAVENDERTOWN_GRAMPS + const LAVENDERTOWN_YOUNGSTER + LavenderTown_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderTownSpeechHouse.asm index d2f450339..ad4d0e23c 100644 --- a/maps/LavenderTownSpeechHouse.asm +++ b/maps/LavenderTownSpeechHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const LAVENDERTOWNSPEECHHOUSE_POKEFAN_F + LavenderTownSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index eaf72b515..14a6d89fc 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -1,3 +1,12 @@ +const_value set 2 + const MAHOGANYGYM_PRYCE + const MAHOGANYGYM_BUENA1 + const MAHOGANYGYM_ROCKER1 + const MAHOGANYGYM_BUENA2 + const MAHOGANYGYM_ROCKER2 + const MAHOGANYGYM_ROCKER3 + const MAHOGANYGYM_GYM_GUY + MahoganyGym_MapScriptHeader: .MapTriggers: db 0 @@ -11,17 +20,17 @@ PryceScript_0x199a9e: checkevent EVENT_BEAT_PRYCE iftrue .FightDone writetext UnknownText_0x199b8d + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x199cb3, 0 - loadtrainer PRYCE, 1 + scriptedtrainerdata PRYCE, 1 startbattle returnafterbattle setevent EVENT_BEAT_PRYCE loadfont writetext UnknownText_0x199d3b playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_GLACIERBADGE checkcode VAR_BADGES scall MahoganyGymTriggerRockets @@ -39,15 +48,15 @@ PryceScript_0x199a9e: iffalse UnknownScript_0x199af4 setevent EVENT_GOT_TM16_ICY_WIND writetext UnknownText_0x199def + waitbutton closetext - loadmovesprites end UnknownScript_0x199af0: writetext UnknownText_0x199e59 - closetext + waitbutton UnknownScript_0x199af4: - loadmovesprites + closetext end MahoganyGymTriggerRockets: @@ -65,55 +74,55 @@ TrainerSkierRoxanne: trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, SkierRoxanneScript SkierRoxanneScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19a116 + waitbutton closetext - loadmovesprites end TrainerSkierClarissa: trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, SkierClarissaScript SkierClarissaScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19a18f + waitbutton closetext - loadmovesprites end TrainerBoarderRonald: trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, BoarderRonaldScript BoarderRonaldScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x199f2d + waitbutton closetext - loadmovesprites end TrainerBoarderBrad: trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, BoarderBradScript BoarderBradScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x199fdd + waitbutton closetext - loadmovesprites end TrainerBoarderDouglas: trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, BoarderDouglasScript BoarderDouglasScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19a047 + waitbutton closetext - loadmovesprites end MahoganyGymGuyScript: @@ -122,14 +131,14 @@ MahoganyGymGuyScript: checkevent EVENT_BEAT_PRYCE iftrue .MahoganyGymGuyWinScript writetext MahoganyGymGuyText + waitbutton closetext - loadmovesprites end .MahoganyGymGuyWinScript writetext MahoganyGymGuyWinText + waitbutton closetext - loadmovesprites end MahoganyGymStatue: diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 50aa6c407..1f16c0a54 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const MAHOGANYMART1F_PHARMACIST + const MAHOGANYMART1F_BLACK_BELT + const MAHOGANYMART1F_LANCE + const MAHOGANYMART1F_DRAGON + const MAHOGANYMART1F_GRANNY + MahoganyMart1F_MapScriptHeader: .MapTriggers: db 2 @@ -35,13 +42,13 @@ PharmacistScript_0x6c367: checkevent EVENT_DECIDED_TO_HELP_LANCE iftrue UnknownScript_0x6c375 pokemart MARTTYPE_STANDARD, MART_MAHOGANY_1 - loadmovesprites + closetext end UnknownScript_0x6c375: writetext UnknownText_0x6c46b + waitbutton closetext - loadmovesprites end BlackBeltScript_0x6c37b: @@ -50,14 +57,14 @@ BlackBeltScript_0x6c37b: checkevent EVENT_DECIDED_TO_HELP_LANCE iftrue UnknownScript_0x6c389 writetext UnknownText_0x6c494 + waitbutton closetext - loadmovesprites end UnknownScript_0x6c389: writetext UnknownText_0x6c501 + waitbutton closetext - loadmovesprites end UnknownScript_0x6c38f: @@ -65,49 +72,49 @@ UnknownScript_0x6c38f: loadfont writetext UnknownText_0x6c52a pause 15 - loadmovesprites + closetext playsound SFX_TACKLE - applymovement $5, MovementData_0x6c3f6 - applymovement $3, MovementData_0x6c3fb + applymovement MAHOGANYMART1F_DRAGON, MovementData_0x6c3f6 + applymovement MAHOGANYMART1F_BLACK_BELT, MovementData_0x6c3fb pause 15 - disappear $5 + disappear MAHOGANYMART1F_DRAGON pause 15 - applymovement $4, MovementData_0x6c407 + applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c407 loadfont writetext UnknownText_0x6c549 + waitbutton closetext - loadmovesprites - follow $4, PLAYER - applymovement $4, MovementData_0x6c40a - applymovement $2, MovementData_0x6c403 - applymovement $4, MovementData_0x6c40e + follow MAHOGANYMART1F_LANCE, PLAYER + applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c40a + applymovement MAHOGANYMART1F_PHARMACIST, MovementData_0x6c403 + applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c40e stopfollow loadfont writetext UnknownText_0x6c59e - closetext - showemote EMOTE_SHOCK, $2, 10 + waitbutton + showemote EMOTE_SHOCK, MAHOGANYMART1F_PHARMACIST, 10 playsound SFX_FAINT changeblock $6, $2, $1e reloadmappart - loadmovesprites + closetext setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART - spriteface $4, LEFT + spriteface MAHOGANYMART1F_LANCE, LEFT loadfont writetext UnknownText_0x6c5ba + waitbutton closetext - loadmovesprites - applymovement $4, MovementData_0x6c412 + applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c412 playsound SFX_EXIT_BUILDING - disappear $4 + disappear MAHOGANYMART1F_LANCE dotrigger $0 - waitbutton + waitsfx end GrannyScript_0x6c3ee: faceplayer loadfont pokemart MARTTYPE_STANDARD, MART_MAHOGANY_2 - loadmovesprites + closetext end MovementData_0x6c3f6: diff --git a/maps/MahoganyPokeCenter1F.asm b/maps/MahoganyPokeCenter1F.asm index 24e03dd22..eab6b6299 100644 --- a/maps/MahoganyPokeCenter1F.asm +++ b/maps/MahoganyPokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const MAHOGANYPOKECENTER1F_NURSE + const MAHOGANYPOKECENTER1F_POKEFAN_M + const MAHOGANYPOKECENTER1F_YOUNGSTER + const MAHOGANYPOKECENTER1F_COOLTRAINER_F + MahoganyPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 5ae52fe85..a45177db7 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const MAHOGANYREDGYARADOSSPEECHHOUSE_BLACK_BELT + const MAHOGANYREDGYARADOSSPEECHHOUSE_TEACHER + MahoganyRedGyaradosSpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -14,14 +18,14 @@ TeacherScript_0x199982: checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue UnknownScript_0x199990 writetext UnknownText_0x199a0e + waitbutton closetext - loadmovesprites end UnknownScript_0x199990: writetext UnknownText_0x199a3d + waitbutton closetext - loadmovesprites end UnknownScript_0x195996: diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 7700fa518..7a254edf7 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -1,3 +1,9 @@ +const_value set 2 + const MAHOGANYTOWN_POKEFAN_M + const MAHOGANYTOWN_GRAMPS + const MAHOGANYTOWN_FISHER + const MAHOGANYTOWN_LASS + MahoganyTown_MapScriptHeader: .MapTriggers: db 2 @@ -23,14 +29,14 @@ MahoganyTown_MapScriptHeader: return UnknownScript_0x190013: - showemote EMOTE_SHOCK, $2, 15 - applymovement $2, MovementData_0x1900a9 - follow PLAYER, $2 + showemote EMOTE_SHOCK, MAHOGANYTOWN_POKEFAN_M, 15 + applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x1900a9 + follow PLAYER, MAHOGANYTOWN_POKEFAN_M applymovement PLAYER, MovementData_0x1900a7 stopfollow spriteface PLAYER, RIGHT scall UnknownScript_0x19002f - applymovement $2, MovementData_0x1900ad + applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x1900ad end PokefanMScript_0x19002e: @@ -44,8 +50,8 @@ UnknownScript_0x19002f: UnknownScript_0x190039: loadfont writetext UnknownText_0x1901a6 + waitbutton closetext - loadmovesprites end UnknownScript_0x190040: @@ -58,31 +64,31 @@ UnknownScript_0x190040: if_equal $2, UnknownScript_0x19006c giveitem RAGECANDYBAR iffalse UnknownScript_0x190078 - waitbutton + waitsfx playsound SFX_TRANSACTION takemoney $0, 300 special PlaceMoneyTopRightOW writetext UnknownText_0x19014a + waitbutton closetext - loadmovesprites end UnknownScript_0x19006c: writetext UnknownText_0x19015b + waitbutton closetext - loadmovesprites end UnknownScript_0x190072: writetext UnknownText_0x190178 + waitbutton closetext - loadmovesprites end UnknownScript_0x190078: writetext UnknownText_0x190188 + waitbutton closetext - loadmovesprites end GrampsScript_0x19007e: @@ -91,14 +97,14 @@ GrampsScript_0x19007e: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19008c writetext UnknownText_0x1901e5 + waitbutton closetext - loadmovesprites end UnknownScript_0x19008c: writetext UnknownText_0x19021d + waitbutton closetext - loadmovesprites end FisherScript_0x190092: diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index f07170951..fdfec03be 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const MANIASHOUSE_ROCKER + ManiasHouse_MapScriptHeader: .MapTriggers: db 0 @@ -19,11 +22,11 @@ ManiaScript: iffalse .partyfull writetext ManiaText_TakeCareOfShuckle keeptextopen - waitbutton + waitsfx writetext ManiaText_GotShuckle playsound SFX_KEY_ITEM - waitbutton - loadmovesprites + waitsfx + closetext setevent EVENT_GOT_SHUCKIE end @@ -31,20 +34,20 @@ ManiaScript: checkflag ENGINE_SHUCKLE_GIVEN iffalse .returnshuckie writetext ManiaText_TakeCareOfShuckle + waitbutton closetext - loadmovesprites end .partyfull: writetext ManiaText_PartyFull + waitbutton closetext - loadmovesprites end .refusetotakeshuckie: writetext ManiaText_IfHeComesBack + waitbutton closetext - loadmovesprites end .returnshuckie: @@ -57,40 +60,40 @@ ManiaScript: if_equal $3, .superhappy if_equal $4, .default_postevent writetext ManiaText_ThankYou + waitbutton closetext - loadmovesprites setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM end .wrong: writetext ManiaText_ShuckleNotThere + waitbutton closetext - loadmovesprites end .superhappy: writetext ManiaText_ShuckleLikesYou + waitbutton closetext - loadmovesprites setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM end .refused: writetext ManiaText_SameAsBeingRobbed + waitbutton closetext - loadmovesprites end .nothingleft: writetext ManiaText_ShuckleIsYourLastMon + waitbutton closetext - loadmovesprites end .default_postevent: writetext ManiaText_HappinessSpeech + waitbutton closetext - loadmovesprites end UnknownScript_0x9d300: diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index c672c3b69..3a06dd87d 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -1,3 +1,5 @@ +const_value set 2 + MobileBattleRoom_MapScriptHeader: .MapTriggers: db 2 @@ -34,7 +36,7 @@ MapMobileBattleRoomSignpost0Script: .one_: writetext MobileBattleRoom_HealText pause 20 - loadmovesprites + closetext special FadeOutPalettes playmusic MUSIC_HEAL special LoadMapPalettes @@ -50,11 +52,11 @@ MapMobileBattleRoomSignpost0Script: .one: special Function10387b writetext MobileBattleRoom_EstablishingCommsText - closetext + waitbutton reloadmappart special Function101225 .false: - loadmovesprites + closetext end MobileBattleRoom_EstablishingCommsText: diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 5b6ce591e..6e81467b8 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -1,3 +1,5 @@ +const_value set 2 + MobileTradeRoomMobile_MapScriptHeader: .MapTriggers: db 2 @@ -25,10 +27,10 @@ MapMobileTradeRoomMobileSignpost0Script: refreshscreen $0 special Function1037c2 writetext MobileTradeRoomMobile_EstablishingCommsText - closetext + waitbutton reloadmappart special Function101231 - loadmovesprites + closetext end MobileTradeRoomMobile_EstablishingCommsText: diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 7ef6e7022..d3973ab65 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -1,3 +1,6 @@ +const_value set 2 + const MOUNTMOON_SILVER + MountMoon_MapScriptHeader: .MapTriggers: db 2 @@ -21,19 +24,19 @@ UnknownScript_0x7408e: showemote EMOTE_SHOCK, PLAYER, 15 special Special_RotatePalettesRightMusic pause 15 - applymovement $2, MovementData_0x740f9 + applymovement MOUNTMOON_SILVER, MovementData_0x740f9 playmusic MUSIC_RIVAL_ENCOUNTER loadfont writetext UnknownText_0x74105 + waitbutton closetext - loadmovesprites checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x740c3 checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x740d3 winlosstext UnknownText_0x7419d, UnknownText_0x742e0 setlasttalked $2 - loadtrainer RIVAL2, 3 + scriptedtrainerdata RIVAL2, 3 startbattle reloadmapmusic returnafterbattle @@ -42,7 +45,7 @@ UnknownScript_0x7408e: UnknownScript_0x740c3: winlosstext UnknownText_0x7419d, UnknownText_0x742e0 setlasttalked $2 - loadtrainer RIVAL2, 1 + scriptedtrainerdata RIVAL2, 1 startbattle reloadmapmusic returnafterbattle @@ -51,7 +54,7 @@ UnknownScript_0x740c3: UnknownScript_0x740d3: winlosstext UnknownText_0x7419d, UnknownText_0x742e0 setlasttalked $2 - loadtrainer RIVAL2, 2 + scriptedtrainerdata RIVAL2, 2 startbattle reloadmapmusic returnafterbattle @@ -61,10 +64,10 @@ UnknownScript_0x740e3: playmusic MUSIC_RIVAL_AFTER loadfont writetext UnknownText_0x741fa + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x740fd - disappear $2 + applymovement MOUNTMOON_SILVER, MovementData_0x740fd + disappear MOUNTMOON_SILVER dotrigger $1 setevent EVENT_BEAT_RIVAL_IN_MT_MOON playmapmusic diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index 5fa8925e3..3ea62bf3f 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -1,3 +1,9 @@ +const_value set 2 + const MOUNTMOONGIFTSHOP_GRAMPS1 + const MOUNTMOONGIFTSHOP_GRAMPS2 + const MOUNTMOONGIFTSHOP_LASS1 + const MOUNTMOONGIFTSHOP_LASS2 + MountMoonGiftShop_MapScriptHeader: .MapTriggers: db 0 @@ -9,7 +15,7 @@ GrampsScript_0x771a8: faceplayer loadfont pokemart MARTTYPE_STANDARD, MART_MT_MOON - loadmovesprites + closetext end LassScript_0x771b0: diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 299d4eab7..9ec9120c1 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -1,3 +1,8 @@ +const_value set 2 + const MOUNTMOONSQUARE_FAIRY1 + const MOUNTMOONSQUARE_FAIRY2 + const MOUNTMOONSQUARE_ROCK + MountMoonSquare_MapScriptHeader: .MapTriggers: db 1 @@ -22,7 +27,7 @@ UnknownScript_0x77093: return UnknownScript_0x77097: - disappear $4 + disappear MOUNTMOONSQUARE_ROCK return UnknownScript_0x7709a: @@ -32,41 +37,41 @@ UnknownScript_0x7709a: if_not_equal MONDAY, .NoDancing checknite iffalse .NoDancing - appear $2 - appear $3 + appear MOUNTMOONSQUARE_FAIRY1 + appear MOUNTMOONSQUARE_FAIRY2 applymovement PLAYER, MovementData_0x77121 pause 15 - appear $4 - spriteface $2, RIGHT + appear MOUNTMOONSQUARE_ROCK + spriteface MOUNTMOONSQUARE_FAIRY1, RIGHT cry CLEFAIRY - waitbutton + waitsfx pause 30 - follow $2, $3 + follow MOUNTMOONSQUARE_FAIRY1, MOUNTMOONSQUARE_FAIRY2 cry CLEFAIRY - applymovement $2, MovementData_0x77123 + applymovement MOUNTMOONSQUARE_FAIRY1, MovementData_0x77123 cry CLEFAIRY - applymovement $2, MovementData_0x77126 + applymovement MOUNTMOONSQUARE_FAIRY1, MovementData_0x77126 cry CLEFAIRY - applymovement $2, MovementData_0x77128 + applymovement MOUNTMOONSQUARE_FAIRY1, MovementData_0x77128 cry CLEFAIRY - applymovement $2, MovementData_0x7712b + applymovement MOUNTMOONSQUARE_FAIRY1, MovementData_0x7712b cry CLEFAIRY - applymovement $2, MovementData_0x7712d + applymovement MOUNTMOONSQUARE_FAIRY1, MovementData_0x7712d stopfollow - applymovement $3, MovementData_0x77130 - follow $2, $3 - applymovement $2, MovementData_0x77132 + applymovement MOUNTMOONSQUARE_FAIRY2, MovementData_0x77130 + follow MOUNTMOONSQUARE_FAIRY1, MOUNTMOONSQUARE_FAIRY2 + applymovement MOUNTMOONSQUARE_FAIRY1, MovementData_0x77132 stopfollow - spriteface $2, DOWN + spriteface MOUNTMOONSQUARE_FAIRY1, DOWN pause 10 - showemote EMOTE_SHOCK, $2, 15 - spriteface $2, DOWN + showemote EMOTE_SHOCK, MOUNTMOONSQUARE_FAIRY1, 15 + spriteface MOUNTMOONSQUARE_FAIRY1, DOWN cry CLEFAIRY pause 15 - follow $2, $3 - applymovement $2, MovementData_0x77134 - disappear $2 - disappear $3 + follow MOUNTMOONSQUARE_FAIRY1, MOUNTMOONSQUARE_FAIRY2 + applymovement MOUNTMOONSQUARE_FAIRY1, MovementData_0x77134 + disappear MOUNTMOONSQUARE_FAIRY1 + disappear MOUNTMOONSQUARE_FAIRY2 stopfollow clearevent EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE setflag ENGINE_MT_MOON_SQUARE_CLEFAIRY diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 345305172..3ead2c21e 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -1,3 +1,15 @@ +const_value set 2 + const MOUNTMORTAR1FINSIDE_BOULDER + const MOUNTMORTAR1FINSIDE_POKE_BALL1 + const MOUNTMORTAR1FINSIDE_POKE_BALL2 + const MOUNTMORTAR1FINSIDE_POKE_BALL3 + const MOUNTMORTAR1FINSIDE_POKE_BALL4 + const MOUNTMORTAR1FINSIDE_POKE_BALL5 + const MOUNTMORTAR1FINSIDE_SUPER_NERD1 + const MOUNTMORTAR1FINSIDE_SUPER_NERD2 + const MOUNTMORTAR1FINSIDE_POKE_BALL6 + const MOUNTMORTAR1FINSIDE_POKE_BALL7 + MountMortar1FInside_MapScriptHeader: .MapTriggers: db 0 @@ -9,22 +21,22 @@ TrainerPokemaniacMiller: trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, PokemaniacMillerScript PokemaniacMillerScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7debd + waitbutton closetext - loadmovesprites end TrainerSupernerdMarkus: trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, SupernerdMarkusScript SupernerdMarkusScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7df97 + waitbutton closetext - loadmovesprites end MountMortar1FBoulder: diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index b6612d2bf..484f389c9 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -1,3 +1,7 @@ +const_value set 2 + const MOUNTMORTAR1FOUTSIDE_POKE_BALL1 + const MOUNTMORTAR1FOUTSIDE_POKE_BALL2 + MountMortar1FOutside_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index d27f9b082..12ef920d7 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -1,3 +1,12 @@ +const_value set 2 + const MOUNTMORTAR2FINSIDE_POKE_BALL1 + const MOUNTMORTAR2FINSIDE_POKE_BALL2 + const MOUNTMORTAR2FINSIDE_POKE_BALL3 + const MOUNTMORTAR2FINSIDE_POKE_BALL4 + const MOUNTMORTAR2FINSIDE_POKE_BALL5 + const MOUNTMORTAR2FINSIDE_POKE_BALL6 + const MOUNTMORTAR2FINSIDE_SUPER_NERD + MountMortar2FInside_MapScriptHeader: .MapTriggers: db 0 @@ -9,11 +18,11 @@ TrainerSupernerdHugh: trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, SupernerdHughScript SupernerdHughScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7e10e + waitbutton closetext - loadmovesprites end ItemFragment_0x7e0de: diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index b10adf856..ade5f377e 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -1,3 +1,12 @@ +const_value set 2 + const MOUNTMORTARB1F_POKE_BALL1 + const MOUNTMORTARB1F_POKE_BALL2 + const MOUNTMORTARB1F_BOULDER + const MOUNTMORTARB1F_BLACK_BELT + const MOUNTMORTARB1F_POKE_BALL3 + const MOUNTMORTARB1F_POKE_BALL4 + const MOUNTMORTARB1F_POKE_BALL5 + MountMortarB1F_MapScriptHeader: .MapTriggers: db 0 @@ -13,10 +22,10 @@ BlackBeltScript_0x7e1f6: checkevent EVENT_BEAT_BLACKBELT_KIYO iftrue UnknownScript_0x7e217 writetext UnknownText_0x7e24d + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x7e2a9, 0 - loadtrainer BLACKBELT_T, KIYO + scriptedtrainerdata BLACKBELT_T, KIYO startbattle returnafterbattle setevent EVENT_BEAT_BLACKBELT_KIYO @@ -24,24 +33,24 @@ BlackBeltScript_0x7e1f6: UnknownScript_0x7e217: writetext UnknownText_0x7e2c0 keeptextopen - waitbutton + waitsfx checkcode VAR_PARTYCOUNT if_equal $6, UnknownScript_0x7e237 writetext UnknownText_0x7e355 playsound SFX_CAUGHT_MON - waitbutton + waitsfx givepoke TYROGUE, 10 setevent EVENT_GOT_TYROGUE_FROM_KIYO UnknownScript_0x7e231: writetext UnknownText_0x7e36a + waitbutton closetext - loadmovesprites end UnknownScript_0x7e237: writetext UnknownText_0x7e3df + waitbutton closetext - loadmovesprites end MountMortarB1FBoulder: diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 59bf15c35..7cbdfb74c 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const MOVEDELETERSHOUSE_SUPER_NERD + MoveDeletersHouse_MapScriptHeader: .MapTriggers: db 0 @@ -9,8 +12,8 @@ MoveDeleter: faceplayer loadfont special MoveDeletion + waitbutton closetext - loadmovesprites end MoveDeletersHouseBookshelf: diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 2bb05c813..5ff009175 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -1,3 +1,10 @@ +const_value set 2 + const MRFUJISHOUSE_SUPER_NERD + const MRFUJISHOUSE_LASS + const MRFUJISHOUSE_RHYDON + const MRFUJISHOUSE_GROWLITHE + const MRFUJISHOUSE_MOLTRES + MrFujisHouse_MapScriptHeader: .MapTriggers: db 0 @@ -15,24 +22,24 @@ MrFujisPsyduck: loadfont writetext MrFujisPsyduckText cry PSYDUCK + waitbutton closetext - loadmovesprites end MrFujisNidorino: loadfont writetext MrFujisNidorinoText cry NIDORINO + waitbutton closetext - loadmovesprites end MrFujisPidgey: loadfont writetext MrFujisPidgeyText cry PIDGEY + waitbutton closetext - loadmovesprites end MrFujisHouseBookshelf: diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index aeac05928..10a61c1f7 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const MRPOKEMONSHOUSE_GENTLEMAN + const MRPOKEMONSHOUSE_OAK + MrPokemonsHouse_MapScriptHeader: .MapTriggers: db 2 @@ -17,34 +21,34 @@ UnknownScript_0x196e55: end UnknownScript_0x196e56: - showemote EMOTE_SHOCK, $2, 15 - spriteface $2, DOWN + showemote EMOTE_SHOCK, MRPOKEMONSHOUSE_GENTLEMAN, 15 + spriteface MRPOKEMONSHOUSE_GENTLEMAN, DOWN loadfont writetext UnknownText_0x196f66 + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x196f5a loadfont writetext UnknownText_0x196fa8 keeptextopen - waitbutton + waitsfx giveitem MYSTERY_EGG writetext UnknownText_0x196fd2 playsound SFX_KEY_ITEM - waitbutton + waitsfx itemnotify setevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON blackoutmod CHERRYGROVE_CITY writetext UnknownText_0x196feb keeptextopen - spriteface $2, RIGHT + spriteface MRPOKEMONSHOUSE_GENTLEMAN, RIGHT writetext UnknownText_0x197092 keeptextopen - spriteface $2, DOWN - spriteface $3, LEFT + spriteface MRPOKEMONSHOUSE_GENTLEMAN, DOWN + spriteface MRPOKEMONSHOUSE_OAK, LEFT writetext UnknownText_0x1970b7 + waitbutton closetext - loadmovesprites jump UnknownScript_0x196ec9 GentlemanScript_0x196e97: @@ -55,14 +59,14 @@ GentlemanScript_0x196e97: checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x196eaa writetext UnknownText_0x197134 + waitbutton closetext - loadmovesprites end UnknownScript_0x196eaa: writetext UnknownText_0x19714a + waitbutton closetext - loadmovesprites end UnknownScript_0x196eb0: @@ -76,38 +80,38 @@ UnknownScript_0x196eb0: UnknownScript_0x196ec3: writetext UnknownText_0x19750d - closetext + waitbutton UnknownScript_0x196ec7: - loadmovesprites + closetext end UnknownScript_0x196ec9: playmusic MUSIC_PROF_OAK - applymovement $3, MovementData_0x196f5d + applymovement MRPOKEMONSHOUSE_OAK, MovementData_0x196f5d spriteface PLAYER, RIGHT loadfont writetext UnknownText_0x197185 keeptextopen - waitbutton + waitsfx writetext UnknownText_0x1973cc playsound SFX_ITEM - waitbutton + waitsfx setflag ENGINE_POKEDEX writetext UnknownText_0x1973de + waitbutton closetext - loadmovesprites spriteface PLAYER, DOWN - applymovement $3, MovementData_0x196f61 + applymovement MRPOKEMONSHOUSE_OAK, MovementData_0x196f61 playsound SFX_EXIT_BUILDING - disappear $3 - waitbutton + disappear MRPOKEMONSHOUSE_OAK + waitsfx special RestartMapMusic pause 15 spriteface PLAYER, UP loadfont writetext UnknownText_0x1970ed + waitbutton closetext - loadmovesprites special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes playmusic MUSIC_HEAL @@ -118,8 +122,8 @@ UnknownScript_0x196ec9: special RestartMapMusic loadfont writetext UnknownText_0x197134 + waitbutton closetext - loadmovesprites setevent EVENT_RIVAL_NEW_BARK_TOWN setevent EVENT_KRISS_HOUSE_1F_NEIGHBOR clearevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 6fdd2b9f5..7ac4e0769 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const MRPSYCHICSHOUSE_FISHING_GURU + MrPsychicsHouse_MapScriptHeader: .MapTriggers: db 0 @@ -17,9 +20,9 @@ MrPsychic: setevent EVENT_GOT_TM29_PSYCHIC .AlreadyGotItem writetext MrPsychicText2 - closetext + waitbutton .Done - loadmovesprites + closetext end MrPsychicsHouseBookshelf: diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index a689fbca5..12dc44c27 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -1,3 +1,19 @@ +const_value set 2 + const NATIONALPARK_LASS1 + const NATIONALPARK_POKEFAN_F1 + const NATIONALPARK_TEACHER1 + const NATIONALPARK_YOUNGSTER1 + const NATIONALPARK_YOUNGSTER2 + const NATIONALPARK_TEACHER2 + const NATIONALPARK_GROWLITHE + const NATIONALPARK_YOUNGSTER3 + const NATIONALPARK_POKEFAN_F2 + const NATIONALPARK_POKEFAN_M + const NATIONALPARK_LASS2 + const NATIONALPARK_POKE_BALL1 + const NATIONALPARK_GAMEBOY_KID + const NATIONALPARK_POKE_BALL2 + NationalPark_MapScriptHeader: .MapTriggers: db 0 @@ -23,9 +39,9 @@ TeacherScript_0x5c008: setevent EVENT_GOT_QUICK_CLAW UnknownScript_0x5c01d: writetext UnknownText_0x5c30d - closetext + waitbutton UnknownScript_0x5c021: - loadmovesprites + closetext end YoungsterScript_0x5c023: @@ -42,17 +58,17 @@ GrowlitheScript_0x5c02c: loadfont writetext UnknownText_0x5c416 cry PERSIAN + waitbutton closetext - loadmovesprites end GameboyKidScript_0x5c037: faceplayer loadfont writetext UnknownText_0x5c42a + waitbutton closetext - loadmovesprites - spriteface $e, DOWN + spriteface NATIONALPARK_GAMEBOY_KID, DOWN end TrainerSchoolboyJack1: @@ -60,7 +76,7 @@ TrainerSchoolboyJack1: SchoolboyJack1Script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_JACK - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_JACK iftrue UnknownScript_0x5c088 @@ -106,7 +122,7 @@ UnknownScript_0x5c088: checkflag ENGINE_FLYPOINT_OLIVINE iftrue .LoadFight1 .LoadFight0 - loadtrainer SCHOOLBOY, JACK1 + scriptedtrainerdata SCHOOLBOY, JACK1 startbattle returnafterbattle loadvar wJackFightCount, 1 @@ -114,7 +130,7 @@ UnknownScript_0x5c088: end .LoadFight1 - loadtrainer SCHOOLBOY, JACK2 + scriptedtrainerdata SCHOOLBOY, JACK2 startbattle returnafterbattle loadvar wJackFightCount, 2 @@ -122,7 +138,7 @@ UnknownScript_0x5c088: end .LoadFight2 - loadtrainer SCHOOLBOY, JACK3 + scriptedtrainerdata SCHOOLBOY, JACK3 startbattle returnafterbattle loadvar wJackFightCount, 3 @@ -130,7 +146,7 @@ UnknownScript_0x5c088: end .LoadFight3 - loadtrainer SCHOOLBOY, JACK4 + scriptedtrainerdata SCHOOLBOY, JACK4 startbattle returnafterbattle loadvar wJackFightCount, 4 @@ -138,7 +154,7 @@ UnknownScript_0x5c088: end .LoadFight4 - loadtrainer SCHOOLBOY, JACK5 + scriptedtrainerdata SCHOOLBOY, JACK5 startbattle returnafterbattle clearflag ENGINE_JACK @@ -176,11 +192,11 @@ TrainerPokefanmWilliam: trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, PokefanmWilliamScript PokefanmWilliamScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5c645 + waitbutton closetext - loadmovesprites end TrainerPokefanfBeverly1: @@ -188,7 +204,7 @@ TrainerPokefanfBeverly1: PokefanfBeverly1Script: writecode VAR_CALLERID, PHONE_POKEFAN_BEVERLY - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_BEVERLY_HAS_NUGGET iftrue UnknownScript_0x5c177 @@ -226,8 +242,8 @@ UnknownScript_0x5c186: UnknownScript_0x5c189: writetext UnknownText_0x5c68a + waitbutton closetext - loadmovesprites end UnknownScript_0x5c18f: @@ -266,11 +282,11 @@ TrainerLassKrise: trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, 0, LassKriseScript LassKriseScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5c71d + waitbutton closetext - loadmovesprites end MapNationalParkSignpost0Script: diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index c2c4c130e..f74d8f12b 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -1,3 +1,17 @@ +const_value set 2 + const NATIONALPARKBUGCONTEST_YOUNGSTER1 + const NATIONALPARKBUGCONTEST_YOUNGSTER2 + const NATIONALPARKBUGCONTEST_ROCKER + const NATIONALPARKBUGCONTEST_POKEFAN_M + const NATIONALPARKBUGCONTEST_YOUNGSTER3 + const NATIONALPARKBUGCONTEST_YOUNGSTER4 + const NATIONALPARKBUGCONTEST_LASS + const NATIONALPARKBUGCONTEST_YOUNGSTER5 + const NATIONALPARKBUGCONTEST_YOUNGSTER6 + const NATIONALPARKBUGCONTEST_YOUNGSTER7 + const NATIONALPARKBUGCONTEST_POKE_BALL1 + const NATIONALPARKBUGCONTEST_POKE_BALL2 + NationalParkBugContest_MapScriptHeader: .MapTriggers: db 0 @@ -9,80 +23,80 @@ YoungsterScript_0x5c8ec: faceplayer loadfont writetext UnknownText_0x5c94c + waitbutton closetext - loadmovesprites end YoungsterScript_0x5c8f4: faceplayer loadfont writetext UnknownText_0x5c973 + waitbutton closetext - loadmovesprites end RockerScript_0x5c8fc: faceplayer loadfont writetext UnknownText_0x5c9a3 + waitbutton closetext - loadmovesprites end PokefanMScript_0x5c904: faceplayer loadfont writetext UnknownText_0x5c9cc + waitbutton closetext - loadmovesprites end YoungsterScript_0x5c90c: faceplayer loadfont writetext UnknownText_0x5ca15 + waitbutton closetext - loadmovesprites end YoungsterScript_0x5c914: faceplayer loadfont writetext UnknownText_0x5ca52 + waitbutton closetext - loadmovesprites end LassScript_0x5c91c: faceplayer loadfont writetext UnknownText_0x5ca8f + waitbutton closetext - loadmovesprites end YoungsterScript_0x5c924: faceplayer loadfont writetext UnknownText_0x5cac8 + waitbutton closetext - loadmovesprites end YoungsterScript_0x5c92c: faceplayer loadfont writetext UnknownText_0x5cb25 + waitbutton closetext - loadmovesprites end YoungsterScript_0x5c934: faceplayer loadfont writetext UnknownText_0x5cb64 + waitbutton closetext - loadmovesprites end MapNationalParkBugContestSignpost0Script: diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 915da5ff2..3d6aea445 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -1,3 +1,8 @@ +const_value set 2 + const NEWBARKTOWN_TEACHER + const NEWBARKTOWN_FISHER + const NEWBARKTOWN_SILVER + NewBarkTown_MapScriptHeader: .MapTriggers: db 2 @@ -25,48 +30,48 @@ NewBarkTown_MapScriptHeader: UnknownScript_0x1a8016: playmusic MUSIC_MOM - spriteface $2, LEFT + spriteface NEWBARKTOWN_TEACHER, LEFT loadfont writetext UnknownText_0x1a8134 + waitbutton closetext - loadmovesprites spriteface PLAYER, RIGHT - applymovement $2, MovementData_0x1a80d4 + applymovement NEWBARKTOWN_TEACHER, MovementData_0x1a80d4 loadfont writetext UnknownText_0x1a813e + waitbutton closetext - loadmovesprites - follow $2, PLAYER - applymovement $2, MovementData_0x1a80e0 + follow NEWBARKTOWN_TEACHER, PLAYER + applymovement NEWBARKTOWN_TEACHER, MovementData_0x1a80e0 stopfollow loadfont writetext UnknownText_0x1a815e + waitbutton closetext - loadmovesprites special RestartMapMusic end UnknownScript_0x1a8041: playmusic MUSIC_MOM - spriteface $2, LEFT + spriteface NEWBARKTOWN_TEACHER, LEFT loadfont writetext UnknownText_0x1a8134 + waitbutton closetext - loadmovesprites spriteface PLAYER, RIGHT - applymovement $2, MovementData_0x1a80d9 + applymovement NEWBARKTOWN_TEACHER, MovementData_0x1a80d9 spriteface PLAYER, UP loadfont writetext UnknownText_0x1a813e + waitbutton closetext - loadmovesprites - follow $2, PLAYER - applymovement $2, MovementData_0x1a80e6 + follow NEWBARKTOWN_TEACHER, PLAYER + applymovement NEWBARKTOWN_TEACHER, MovementData_0x1a80e6 stopfollow loadfont writetext UnknownText_0x1a815e + waitbutton closetext - loadmovesprites special RestartMapMusic end @@ -80,26 +85,26 @@ TeacherScript_0x1a806f: checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue UnknownScript_0x1a8089 writetext UnknownText_0x1a80f7 + waitbutton closetext - loadmovesprites end UnknownScript_0x1a8089: writetext UnknownText_0x1a81c4 + waitbutton closetext - loadmovesprites end UnknownScript_0x1a808f: writetext UnknownText_0x1a81f2 + waitbutton closetext - loadmovesprites end UnknownScript_0x1a8095: writetext UnknownText_0x1a8236 + waitbutton closetext - loadmovesprites end FisherScript_0x1a809b: @@ -108,22 +113,22 @@ FisherScript_0x1a809b: SilverScript_0x1a809e: loadfont writetext UnknownText_0x1a82a6 + waitbutton closetext - loadmovesprites - spriteface $4, LEFT + spriteface NEWBARKTOWN_SILVER, LEFT loadfont writetext UnknownText_0x1a82cd + waitbutton closetext - loadmovesprites - follow PLAYER, $4 + follow PLAYER, NEWBARKTOWN_SILVER applymovement PLAYER, MovementData_0x1a80ed stopfollow pause 5 - spriteface $4, DOWN + spriteface NEWBARKTOWN_SILVER, DOWN pause 5 playsound SFX_TACKLE applymovement PLAYER, MovementData_0x1a80f0 - applymovement $4, MovementData_0x1a80f5 + applymovement NEWBARKTOWN_SILVER, MovementData_0x1a80f5 end MapNewBarkTownSignpost0Script: diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 7eb650378..8f3961a7e 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -1,3 +1,9 @@ +const_value set 2 + const OAKSLAB_OAK + const OAKSLAB_SCIENTIST1 + const OAKSLAB_SCIENTIST2 + const OAKSLAB_SCIENTIST3 + OaksLab_MapScriptHeader: .MapTriggers: db 0 @@ -26,11 +32,11 @@ Oak: .CheckPokedex writetext OakLabDexCheckText - closetext + waitbutton special ProfOaksPCBoot writetext OakLabGoodbyeText + waitbutton closetext - loadmovesprites end .OpenMtSilver diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 80dc08b3a..55b158dac 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -1,3 +1,8 @@ +const_value set 2 + const OLIVINECAFE_SAILOR1 + const OLIVINECAFE_FISHING_GURU + const OLIVINECAFE_SAILOR2 + OlivineCafe_MapScriptHeader: .MapTriggers: db 0 @@ -16,8 +21,8 @@ SailorScript_0x9c8c1: setevent EVENT_GOT_HM04_STRENGTH UnknownScript_0x9c8d3: writetext UnknownText_0x9c965 + waitbutton closetext - loadmovesprites end FishingGuruScript_0x9c8d9: diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index ed89b3f1f..1a6a5662c 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -1,3 +1,9 @@ +const_value set 2 + const OLIVINECITY_SAILOR1 + const OLIVINECITY_STANDING_YOUNGSTER + const OLIVINECITY_SAILOR2 + const OLIVINECITY_OLIVINE_RIVAL + OlivineCity_MapScriptHeader: .MapTriggers: db 2 @@ -28,19 +34,19 @@ UnknownScript_0x1a8833: special Special_RotatePalettesRightMusic pause 15 playsound SFX_ENTER_DOOR - appear $5 - waitbutton - applymovement $5, MovementData_0x1a88d2 + appear OLIVINECITY_OLIVINE_RIVAL + waitsfx + applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88d2 playmusic MUSIC_RIVAL_ENCOUNTER loadfont writetext UnknownText_0x1a88fa + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x1a88f4 spriteface PLAYER, RIGHT - applymovement $5, MovementData_0x1a88db + applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88db dotrigger $1 - disappear $5 + disappear OLIVINECITY_OLIVINE_RIVAL special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY special RunCallback_04 @@ -52,18 +58,18 @@ UnknownScript_0x1a886b: special Special_RotatePalettesRightMusic pause 15 playsound SFX_ENTER_DOOR - appear $5 - waitbutton - applymovement $5, MovementData_0x1a88d6 + appear OLIVINECITY_OLIVINE_RIVAL + waitsfx + applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88d6 playmusic MUSIC_RIVAL_ENCOUNTER loadfont writetext UnknownText_0x1a88fa + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x1a88f7 spriteface PLAYER, RIGHT - applymovement $5, MovementData_0x1a88e8 - disappear $5 + applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88e8 + disappear OLIVINECITY_OLIVINE_RIVAL dotrigger $1 special RestartMapMusic variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY @@ -79,14 +85,14 @@ StandingYoungsterScript_0x1a88a6: random $2 if_equal $0, UnknownScript_0x1a88b4 writetext UnknownText_0x1a8b04 + waitbutton closetext - loadmovesprites end UnknownScript_0x1a88b4: writetext UnknownText_0x1a8b41 + waitbutton closetext - loadmovesprites end SailorScript_0x1a88ba: diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index c704bc967..bb1f3a078 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const OLIVINEGOODRODHOUSE_FISHING_GURU + OlivineGoodRodHouse_MapScriptHeader: .MapTriggers: db 0 @@ -17,21 +20,21 @@ GoodRodGuru: keeptextopen verbosegiveitem GOOD_ROD writetext GaveGoodRodText + waitbutton closetext - loadmovesprites setevent EVENT_GOT_GOOD_ROD end .DontWantIt writetext DontWantGoodRodText + waitbutton closetext - loadmovesprites end .AlreadyGotItem writetext HaveGoodRodText + waitbutton closetext - loadmovesprites end GoodRodHouseBookshelf: diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index ce45363e7..680b8c1e0 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -1,3 +1,7 @@ +const_value set 2 + const OLIVINEGYM_JASMINE + const OLIVINEGYM_GYM_GUY + OlivineGym_MapScriptHeader: .MapTriggers: db 0 @@ -11,17 +15,17 @@ JasmineScript_0x9c12f: checkevent EVENT_BEAT_JASMINE iftrue .FightDone writetext UnknownText_0x9c1b9 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x9c2bb, 0 - loadtrainer JASMINE, 1 + scriptedtrainerdata JASMINE, 1 startbattle returnafterbattle setevent EVENT_BEAT_JASMINE loadfont writetext UnknownText_0x9c33a playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_MINERALBADGE checkcode VAR_BADGES scall OlivineGymTriggerRockets @@ -34,15 +38,15 @@ JasmineScript_0x9c12f: iffalse UnknownScript_0x9c176 setevent EVENT_GOT_TM23_IRON_TAIL writetext UnknownText_0x9c3a5 + waitbutton closetext - loadmovesprites end UnknownScript_0x9c172: writetext UnknownText_0x9c3d1 - closetext + waitbutton UnknownScript_0x9c176: - loadmovesprites + closetext end OlivineGymTriggerRockets: @@ -64,22 +68,22 @@ OlivineGymGuyScript: iffalse .OlivineGymGuyPreScript loadfont writetext OlivineGymGuyText + waitbutton closetext - loadmovesprites end .OlivineGymGuyWinScript loadfont writetext OlivineGymGuyWinText + waitbutton closetext - loadmovesprites end .OlivineGymGuyPreScript loadfont writetext OlivineGymGuyPreText + waitbutton closetext - loadmovesprites end OlivineGymStatue: diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index 7f7b8d237..f9b6dbc09 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -1,3 +1,7 @@ +const_value set 2 + const OLIVINEHOUSEBETA_TEACHER + const OLIVINEHOUSEBETA_RHYDON + OlivineHouseBeta_MapScriptHeader: .MapTriggers: db 0 @@ -12,8 +16,8 @@ RhydonScript_0x9c592: loadfont writetext UnknownText_0x9c5f0 cry RHYDON + waitbutton closetext - loadmovesprites end OlivineHouseBetaBookshelf1: diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index d5269f1e5..422e86ad2 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -1,3 +1,7 @@ +const_value set 2 + const OLIVINELIGHTHOUSE1F_SAILOR + const OLIVINELIGHTHOUSE1F_POKEFAN_F + OlivineLighthouse1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 50528ea7b..7e568fe6d 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -1,3 +1,7 @@ +const_value set 2 + const OLIVINELIGHTHOUSE2F_SAILOR + const OLIVINELIGHTHOUSE2F_GENTLEMAN + OlivineLighthouse2F_MapScriptHeader: .MapTriggers: db 0 @@ -9,11 +13,11 @@ TrainerGentlemanAlfred: trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, GentlemanAlfredScript GentlemanAlfredScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5b13e + waitbutton closetext - loadmovesprites end TrainerSailorHuey1: @@ -21,7 +25,7 @@ TrainerSailorHuey1: SailorHuey1Script: writecode VAR_CALLERID, PHONE_SAILOR_HUEY - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_HUEY iftrue UnknownScript_0x5afc7 @@ -61,7 +65,7 @@ UnknownScript_0x5afc7: checkevent EVENT_CLEARED_RADIO_TOWER iftrue .LoadFight1 .LoadFight0 - loadtrainer SAILOR, HUEY1 + scriptedtrainerdata SAILOR, HUEY1 startbattle returnafterbattle loadvar wHueyFightCount, 1 @@ -69,7 +73,7 @@ UnknownScript_0x5afc7: end .LoadFight1 - loadtrainer SAILOR, HUEY2 + scriptedtrainerdata SAILOR, HUEY2 startbattle returnafterbattle loadvar wHueyFightCount, 2 @@ -77,7 +81,7 @@ UnknownScript_0x5afc7: end .LoadFight2 - loadtrainer SAILOR, HUEY3 + scriptedtrainerdata SAILOR, HUEY3 startbattle returnafterbattle loadvar wHueyFightCount, 3 @@ -85,7 +89,7 @@ UnknownScript_0x5afc7: end .LoadFight3 - loadtrainer SAILOR, HUEY4 + scriptedtrainerdata SAILOR, HUEY4 startbattle returnafterbattle clearflag ENGINE_HUEY @@ -105,7 +109,7 @@ UnknownScript_0x5b03e: UnknownScript_0x5b03f: loadfont writetext UnknownText_0x5b1b6 - closetext + waitbutton verbosegiveitem PROTEIN iffalse UnknownScript_0x5b06f clearevent EVENT_HUEY_PROTEIN diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 21eb3d72c..82a145f0a 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const OLIVINELIGHTHOUSE3F_SAILOR + const OLIVINELIGHTHOUSE3F_GENTLEMAN + const OLIVINELIGHTHOUSE3F_YOUNGSTER + const OLIVINELIGHTHOUSE3F_POKE_BALL + OlivineLighthouse3F_MapScriptHeader: .MapTriggers: db 0 @@ -9,33 +15,33 @@ TrainerBird_keeperTheo: trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, 0, Bird_keeperTheoScript Bird_keeperTheoScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5b2df + waitbutton closetext - loadmovesprites end TrainerGentlemanPreston: trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, GentlemanPrestonScript GentlemanPrestonScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5b457 + waitbutton closetext - loadmovesprites end TrainerSailorTerrell: trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, SailorTerrellScript SailorTerrellScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5b384 + waitbutton closetext - loadmovesprites end ItemFragment_0x5b279: diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index 9a9f5fc78..b4f54d550 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -1,3 +1,7 @@ +const_value set 2 + const OLIVINELIGHTHOUSE4F_SAILOR + const OLIVINELIGHTHOUSE4F_LASS + OlivineLighthouse4F_MapScriptHeader: .MapTriggers: db 0 @@ -9,22 +13,22 @@ TrainerLassConnie: trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, 0, LassConnie1Script LassConnie1Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5b63c + waitbutton closetext - loadmovesprites end TrainerSailorKent: trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, 0, SailorKentScript SailorKentScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5b584 + waitbutton closetext - loadmovesprites end SailorKentSeenText: diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 3db655189..d8aee5047 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const OLIVINELIGHTHOUSE5F_SAILOR + const OLIVINELIGHTHOUSE5F_YOUNGSTER + const OLIVINELIGHTHOUSE5F_POKE_BALL1 + const OLIVINELIGHTHOUSE5F_POKE_BALL2 + const OLIVINELIGHTHOUSE5F_POKE_BALL3 + OlivineLighthouse5F_MapScriptHeader: .MapTriggers: db 0 @@ -9,22 +16,22 @@ TrainerBird_keeperDenis: trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, Bird_keeperDenisSeenText, Bird_keeperDenisBeatenText, 0, Bird_keeperDenisScript Bird_keeperDenisScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x60ac3 + waitbutton closetext - loadmovesprites end TrainerSailorErnest: trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, SailorErnestScript SailorErnestScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x60a1f + waitbutton closetext - loadmovesprites end ItemFragment_0x609aa: diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index aae5ed42e..82fe43e94 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const OLIVINELIGHTHOUSE6F_JASMINE + const OLIVINELIGHTHOUSE6F_MONSTER + const OLIVINELIGHTHOUSE6F_POKE_BALL + OlivineLighthouse6F_MapScriptHeader: .MapTriggers: db 0 @@ -17,8 +22,8 @@ JasmineScript_0x60b91: setevent EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS UnknownScript_0x60ba5: writetext UnknownText_0x60d64 + waitbutton closetext - loadmovesprites end UnknownScript_0x60bab: @@ -29,17 +34,17 @@ UnknownScript_0x60bab: keeptextopen takeitem SECRETPOTION writetext UnknownText_0x60dea + waitbutton closetext - loadmovesprites - spriteface $2, RIGHT + spriteface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT pause 15 - spriteface $3, LEFT + spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT loadfont playmusic MUSIC_HEAL writetext UnknownText_0x60e44 pause 60 keeptextopen - loadmovesprites + closetext special RestartMapMusic cry AMPHAROS special FadeOutPalettes @@ -47,51 +52,51 @@ UnknownScript_0x60bab: special FadeInPalettes loadfont writetext UnknownText_0x60f3d + waitbutton closetext - loadmovesprites - spriteface $3, RIGHT + spriteface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT pause 10 - spriteface $3, LEFT + spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT pause 10 - spriteface $3, RIGHT + spriteface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT pause 10 - spriteface $3, LEFT + spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT pause 10 faceplayer loadfont writetext UnknownText_0x60e6c + waitbutton closetext - loadmovesprites setevent EVENT_JASMINE_RETURNED_TO_GYM clearevent EVENT_OLIVINE_GYM_JASMINE checkcode VAR_FACING - if_equal $0, UnknownScript_0x60c17 - if_equal $3, UnknownScript_0x60c1e - applymovement $2, MovementData_0x60c68 - disappear $2 + if_equal DOWN, UnknownScript_0x60c17 + if_equal RIGHT, UnknownScript_0x60c1e + applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c68 + disappear OLIVINELIGHTHOUSE6F_JASMINE end UnknownScript_0x60c17: - applymovement $2, MovementData_0x60c70 - disappear $2 + applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c70 + disappear OLIVINELIGHTHOUSE6F_JASMINE end UnknownScript_0x60c1e: - applymovement $2, MovementData_0x60c79 - disappear $2 + applymovement OLIVINELIGHTHOUSE6F_JASMINE, MovementData_0x60c79 + disappear OLIVINELIGHTHOUSE6F_JASMINE end UnknownScript_0x60c25: writetext UnknownText_0x60edf + waitbutton closetext - loadmovesprites - spriteface $2, RIGHT + spriteface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT pause 15 - spriteface $3, LEFT + spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT loadfont writetext UnknownText_0x60ef1 + waitbutton closetext - loadmovesprites end UnknownScript_0x60c39: @@ -107,15 +112,15 @@ MonsterScript_0x60c3a: special PlaySlowCry keeptextopen writetext UnknownText_0x60f19 + waitbutton closetext - loadmovesprites end UnknownScript_0x60c51: writetext UnknownText_0x60f3d cry AMPHAROS + waitbutton closetext - loadmovesprites special FadeOutPalettes special FadeInPalettes special FadeOutPalettes diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index b16f96d6f..f8ca67bcf 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const OLIVINEMART_CLERK + const OLIVINEMART_COOLTRAINER_F + const OLIVINEMART_LASS + OlivineMart_MapScriptHeader: .MapTriggers: db 0 @@ -8,7 +13,7 @@ OlivineMart_MapScriptHeader: ClerkScript_0x9cac7: loadfont pokemart MARTTYPE_STANDARD, MART_OLIVINE - loadmovesprites + closetext end CooltrainerFScript_0x9cace: diff --git a/maps/OlivinePokeCenter1F.asm b/maps/OlivinePokeCenter1F.asm index f2e39540f..e0f0dbb69 100644 --- a/maps/OlivinePokeCenter1F.asm +++ b/maps/OlivinePokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const OLIVINEPOKECENTER1F_NURSE + const OLIVINEPOKECENTER1F_FISHING_GURU + const OLIVINEPOKECENTER1F_FISHER + const OLIVINEPOKECENTER1F_TEACHER + OlivinePokeCenter1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 38941d295..f0c583f2c 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -1,3 +1,12 @@ +const_value set 2 + const OLIVINEPORT_SAILOR1 + const OLIVINEPORT_SAILOR2 + const OLIVINEPORT_SAILOR3 + const OLIVINEPORT_FISHING_GURU1 + const OLIVINEPORT_FISHING_GURU2 + const OLIVINEPORT_YOUNGSTER + const OLIVINEPORT_COOLTRAINER_F + OlivinePort_MapScriptHeader: .MapTriggers: db 2 @@ -18,7 +27,7 @@ UnknownScript_0x748ad: UnknownScript_0x748b1: applymovement PLAYER, MovementData_0x74a32 - appear $2 + appear OLIVINEPORT_SAILOR1 dotrigger $0 setevent EVENT_GAVE_KURT_APRICORNS blackoutmod OLIVINE_CITY @@ -30,17 +39,17 @@ SailorScript_0x748c0: checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74919 writetext UnknownText_0x74a55 + waitbutton closetext - loadmovesprites - spriteface $2, DOWN + spriteface OLIVINEPORT_SAILOR1, DOWN pause 10 playsound SFX_EXIT_BUILDING - disappear $2 - waitbutton + disappear OLIVINEPORT_SAILOR1 + waitsfx applymovement PLAYER, MovementData_0x74a30 playsound SFX_EXIT_BUILDING special FadeOutPalettes - waitbutton + waitsfx checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x7490a clearevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND @@ -56,19 +65,19 @@ SailorScript_0x748c0: clearevent EVENT_BEAT_BLACKBELT_WAI UnknownScript_0x7490a: clearevent EVENT_FAST_SHIP_DESTINATION_OLIVINE - appear $2 + appear OLIVINEPORT_SAILOR1 domaptrigger FAST_SHIP_1F, $1 warp FAST_SHIP_1F, $19, $1 end UnknownScript_0x74919: writetext UnknownText_0x74a80 + waitbutton closetext - loadmovesprites end UnknownScript_0x7491f: - spriteface $4, RIGHT + spriteface OLIVINEPORT_SAILOR3, RIGHT checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x7498b checkevent EVENT_RECEIVED_BALLS_FROM_KURT @@ -92,30 +101,30 @@ UnknownScript_0x7494e: checkitem S_S_TICKET iffalse UnknownScript_0x7496d writetext UnknownText_0x74b11 + waitbutton closetext - loadmovesprites setevent EVENT_RECEIVED_BALLS_FROM_KURT applymovement PLAYER, MovementData_0x74a37 jump SailorScript_0x748c0 UnknownScript_0x7496d: writetext UnknownText_0x74b41 + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x74a34 end UnknownScript_0x74977: writetext UnknownText_0x74ba8 + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x74a34 end UnknownScript_0x74981: writetext UnknownText_0x74bce + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x74a34 end @@ -124,14 +133,14 @@ UnknownScript_0x7498b: UnknownScript_0x7498c: writetext UnknownText_0x74af6 + waitbutton closetext - loadmovesprites end UnknownScript_0x74992: writetext UnknownText_0x74af6 + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x74a34 end @@ -157,11 +166,11 @@ UnknownScript_0x749c0: checkitem S_S_TICKET iffalse UnknownScript_0x749ec writetext UnknownText_0x74b11 + waitbutton closetext - loadmovesprites setevent EVENT_RECEIVED_BALLS_FROM_KURT checkcode VAR_FACING - if_equal $3, UnknownScript_0x749e5 + if_equal RIGHT, UnknownScript_0x749e5 applymovement PLAYER, MovementData_0x74a3f jump SailorScript_0x748c0 @@ -171,20 +180,20 @@ UnknownScript_0x749e5: UnknownScript_0x749ec: writetext UnknownText_0x74b41 + waitbutton closetext - loadmovesprites end UnknownScript_0x749f2: writetext UnknownText_0x74ba8 + waitbutton closetext - loadmovesprites end UnknownScript_0x749f8: writetext UnknownText_0x74bce + waitbutton closetext - loadmovesprites end SailorScript_0x749fe: @@ -194,36 +203,36 @@ FishingGuruScript_0x74a01: faceplayer loadfont writetext UnknownText_0x74bf4 + waitbutton closetext - loadmovesprites - spriteface $5, UP + spriteface OLIVINEPORT_FISHING_GURU1, UP end FishingGuruScript_0x74a0c: faceplayer loadfont writetext UnknownText_0x74c35 + waitbutton closetext - loadmovesprites - spriteface $6, UP + spriteface OLIVINEPORT_FISHING_GURU2, UP end YoungsterScript_0x74a17: faceplayer loadfont writetext UnknownText_0x74c76 + waitbutton closetext - loadmovesprites - spriteface $7, DOWN + spriteface OLIVINEPORT_YOUNGSTER, DOWN end CooltrainerFScript_0x74a22: faceplayer loadfont writetext UnknownText_0x74ca2 + waitbutton closetext - loadmovesprites - spriteface $8, DOWN + spriteface OLIVINEPORT_COOLTRAINER_F, DOWN end MapOlivinePortSignpostItem0: diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 0083332b3..116a05dfd 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -1,3 +1,6 @@ +const_value set 2 + const OLIVINEPORTPASSAGE_POKEFAN_M + OlivinePortPassage_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index d1c28edbb..b819ab567 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const OLIVINEPUNISHMENTSPEECHHOUSE_POKEFAN_M + const OLIVINEPUNISHMENTSPEECHHOUSE_LASS + OlivinePunishmentSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/OlivineVoltorbHouse.asm b/maps/OlivineVoltorbHouse.asm index 083cda395..499e21c82 100644 --- a/maps/OlivineVoltorbHouse.asm +++ b/maps/OlivineVoltorbHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const OLIVINEVOLTORBHOUSE_FISHING_GURU + OlivineVoltorbHouse_MapScriptHeader: .MapTriggers: db 0 @@ -9,8 +12,8 @@ Tim: faceplayer loadfont trade $2 + waitbutton closetext - loadmovesprites end TimsHouseBookshelf: diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index bf6fd50fc..3b63dada5 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -1,3 +1,7 @@ +const_value set 2 + const PALLETTOWN_TEACHER + const PALLETTOWN_FISHER + PalletTown_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index ef3dfe610..3558cd91b 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -1,3 +1,10 @@ +const_value set 2 + const PEWTERCITY_COOLTRAINER_F + const PEWTERCITY_BUG_CATCHER + const PEWTERCITY_GRAMPS + const PEWTERCITY_FRUIT_TREE1 + const PEWTERCITY_FRUIT_TREE2 + PewterCity_MapScriptHeader: .MapTriggers: db 0 @@ -27,13 +34,13 @@ GrampsScript_0x18c00f: keeptextopen verbosegiveitem SILVER_WING setevent EVENT_GOT_SILVER_WING - loadmovesprites + closetext end UnknownScript_0x18c023: writetext UnknownText_0x18c1aa + waitbutton closetext - loadmovesprites end PewterCitySign: diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 9585b7320..8f80b9dc7 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -1,3 +1,8 @@ +const_value set 2 + const PEWTERGYM_BROCK + const PEWTERGYM_YOUNGSTER + const PEWTERGYM_GYM_GUY + PewterGym_MapScriptHeader: .MapTriggers: db 0 @@ -11,10 +16,10 @@ BrockScript_0x1a2864: checkflag ENGINE_BOULDERBADGE iftrue .FightDone writetext UnknownText_0x1a28d0 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x1a29bb, 0 - loadtrainer BROCK, 1 + scriptedtrainerdata BROCK, 1 startbattle returnafterbattle setevent EVENT_BEAT_BROCK @@ -22,28 +27,28 @@ BrockScript_0x1a2864: loadfont writetext UnknownText_0x1a2a3d playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_BOULDERBADGE writetext UnknownText_0x1a2a57 + waitbutton closetext - loadmovesprites end .FightDone writetext UnknownText_0x1a2ada + waitbutton closetext - loadmovesprites end TrainerCamperJerry: trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, CamperJerryScript CamperJerryScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a2c0f + waitbutton closetext - loadmovesprites end PewterGymGuyScript: @@ -52,14 +57,14 @@ PewterGymGuyScript: checkevent EVENT_BEAT_BROCK iftrue .PewterGymGuyWinScript writetext PewterGymGuyText + waitbutton closetext - loadmovesprites end .PewterGymGuyWinScript writetext PewterGymGuyWinText + waitbutton closetext - loadmovesprites end PewterGymStatue: diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index 0cfc70011..ca7940576 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const PEWTERMART_CLERK + const PEWTERMART_YOUNGSTER + const PEWTERMART_SUPER_NERD + PewterMart_MapScriptHeader: .MapTriggers: db 0 @@ -8,7 +13,7 @@ PewterMart_MapScriptHeader: ClerkScript_0x1a2dcb: loadfont pokemart MARTTYPE_STANDARD, MART_PEWTER - loadmovesprites + closetext end YoungsterScript_0x1a2dd2: diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index 42c0fc63b..541f123d6 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const PEWTERNIDORANSPEECHHOUSE_SUPER_NERD + const PEWTERNIDORANSPEECHHOUSE_GROWLITHE + PewterNidoranSpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -12,8 +16,8 @@ GrowlitheScript_0x1a280a: loadfont writetext UnknownText_0x1a2825 cry NIDORAN_M + waitbutton closetext - loadmovesprites end UnknownText_0x1a2814: diff --git a/maps/PewterPokeCEnter2FBeta.asm b/maps/PewterPokeCEnter2FBeta.asm index 74bd290ff..9acc590fe 100644 --- a/maps/PewterPokeCEnter2FBeta.asm +++ b/maps/PewterPokeCEnter2FBeta.asm @@ -1,3 +1,5 @@ +const_value set 2 + PewterPokeCEnter2FBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokeCenter1F.asm index b8f0d960e..cf3d55a0e 100644 --- a/maps/PewterPokeCenter1F.asm +++ b/maps/PewterPokeCenter1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const PEWTERPOKECENTER1F_NURSE + const PEWTERPOKECENTER1F_TEACHER + const PEWTERPOKECENTER1F_JIGGLYPUFF + const PEWTERPOKECENTER1F_BUG_CATCHER + const PEWTERPOKECENTER1F_POKEFAN_M + PewterPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -15,8 +22,8 @@ JigglypuffScript_0x1a2eed: loadfont writetext UnknownText_0x1a2f5d cry JIGGLYPUFF + waitbutton closetext - loadmovesprites end BugCatcherScript_0x1a2ef7: @@ -26,8 +33,8 @@ PokefanMScript_0x1a2efa: faceplayer loadfont trade $4 + waitbutton closetext - loadmovesprites end UnknownText_0x1a2f01: diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 4660ed2e1..41d0c10ba 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const PEWTERSNOOZESPEECHHOUSE_GRAMPS + PewterSnoozeSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index b5596bb9c..87f064c61 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const POKECENTER2F_LINK_RECEPTIONIST1 + const POKECENTER2F_LINK_RECEPTIONIST2 + const POKECENTER2F_LINK_RECEPTIONIST3 + const POKECENTER2F_OFFICER + PokeCenter2F_MapScriptHeader: .MapTriggers: db 6 @@ -45,7 +51,7 @@ PokeCenter2F_MapScriptHeader: end PokeCenter2F_AppearMysteryGiftDeliveryGuy: - appear $5 + appear POKECENTER2F_OFFICER setevent EVENT_RECEIVED_BALLS_FROM_KURT end @@ -53,16 +59,16 @@ Script_TradeCenterClosed: faceplayer loadfont writetext Text_TradeRoomClosed + waitbutton closetext - loadmovesprites end Script_BattleRoomClosed: faceplayer loadfont writetext Text_BattleRoomClosed + waitbutton closetext - loadmovesprites end LinkReceptionistScript_Trade: @@ -96,8 +102,8 @@ LinkReceptionistScript_Trade: special Special_CheckBothSelectedSameRoom iffalse .IncompatibleRooms writetext Text_PleaseComeIn2 + waitbutton closetext - loadmovesprites scall PokeCenter2F_CheckGender warpcheck end @@ -105,20 +111,20 @@ LinkReceptionistScript_Trade: .FriendNotReady: special Special_AbortLink writetext Text_FriendNotReady - loadmovesprites + closetext end .LinkedToFirstGen: special Special_FailedLinkToPast writetext Text_CantLinkToThePast special Special_CloseLink - loadmovesprites + closetext end .IncompatibleRooms: writetext Text_IncompatibleRooms special Special_CloseLink - loadmovesprites + closetext end .LinkTimedOut: @@ -130,7 +136,7 @@ LinkReceptionistScript_Trade: .AbortLink: special Special_AbortLink .Cancel: - loadmovesprites + closetext end .Mobile: @@ -151,14 +157,14 @@ LinkReceptionistScript_Trade: iffalse .Mobile_DidNotSave special Function1011f1 writetext Text_PleaseComeIn2 + waitbutton closetext - loadmovesprites writebyte $0 end .Mobile_DidNotSave: writetext Text_PleaseComeAgain - loadmovesprites + closetext writebyte $1 end @@ -198,8 +204,8 @@ LinkReceptionistScript_Battle: special Special_CheckBothSelectedSameRoom iffalse .IncompatibleRooms writetext Text_PleaseComeIn2 + waitbutton closetext - loadmovesprites scall PokeCenter2F_CheckGender warpcheck end @@ -207,20 +213,20 @@ LinkReceptionistScript_Battle: .FriendNotReady: special Special_AbortLink writetext Text_FriendNotReady - loadmovesprites + closetext end .LinkedToFirstGen: special Special_FailedLinkToPast writetext Text_CantLinkToThePast special Special_CloseLink - loadmovesprites + closetext end .IncompatibleRooms: writetext Text_IncompatibleRooms special Special_CloseLink - loadmovesprites + closetext end .LinkTimedOut: @@ -232,7 +238,7 @@ LinkReceptionistScript_Battle: .AbortLink: special Special_AbortLink .Cancel: - loadmovesprites + closetext end .Mobile: @@ -255,14 +261,14 @@ LinkReceptionistScript_Battle: iffalse .Mobile_DidNotSave special Function1011f1 writetext Text_PleaseComeIn2 + waitbutton closetext - loadmovesprites writebyte $0 end .Mobile_DidNotSave: writetext Text_PleaseComeAgain - loadmovesprites + closetext writebyte $1 end @@ -276,9 +282,9 @@ LinkReceptionistScript_Battle: .Mobile_InvalidParty: writetext Text_BrokeStadiumRules - closetext + waitbutton .Mobile_DidNotSelect: - loadmovesprites + closetext writebyte $0 end @@ -290,8 +296,8 @@ Script_TimeCapsuleClosed: faceplayer loadfont writetext Text_TimeCapsuleClosed + waitbutton closetext - loadmovesprites end LinkReceptionistScript_TimeCapsule: @@ -325,14 +331,14 @@ LinkReceptionistScript_TimeCapsule: special Special_CheckBothSelectedSameRoom writetext Text_IncompatibleRooms special Special_CloseLink - loadmovesprites + closetext end .OK: special Special_EnterTimeCapsule writetext Text_PleaseComeIn2 + waitbutton closetext - loadmovesprites scall TimeCapsuleScript_CheckPlayerGender warpcheck end @@ -340,7 +346,7 @@ LinkReceptionistScript_TimeCapsule: .FriendNotReady: special Special_AbortLink writetext Text_FriendNotReady - loadmovesprites + closetext end .LinkTimedOut: @@ -351,22 +357,22 @@ LinkReceptionistScript_TimeCapsule: writetext Text_PleaseComeAgain .Cancel: special Special_AbortLink - loadmovesprites + closetext end .MonTooNew: writetext Text_RejectNewMon - loadmovesprites + closetext end .MonMoveTooNew: writetext Text_RejectMonWithNewMove - loadmovesprites + closetext end .MonHasMail: writetext Text_RejectMonWithMail - loadmovesprites + closetext end Script_LeftCableTradeCenter: @@ -384,9 +390,9 @@ Script_LeftMobileTradeRoom: end Script_WalkOutOfMobileTradeRoom: - applymovement $2, MovementData_0x192d0b + applymovement POKECENTER2F_LINK_RECEPTIONIST1, MovementData_0x192d0b applymovement PLAYER, MovementData_0x192d0f - applymovement $2, MovementData_0x192d14 + applymovement POKECENTER2F_LINK_RECEPTIONIST1, MovementData_0x192d14 end Script_LeftCableColosseum: @@ -404,9 +410,9 @@ Script_LeftMobileBattleRoom: end Script_WalkOutOfMobileBattleRoom: - applymovement $3, MovementData_0x192d0b + applymovement POKECENTER2F_LINK_RECEPTIONIST2, MovementData_0x192d0b applymovement PLAYER, MovementData_0x192d0f - applymovement $3, MovementData_0x192d14 + applymovement POKECENTER2F_LINK_RECEPTIONIST2, MovementData_0x192d14 end PokeCenter2F_CheckGender: @@ -421,14 +427,14 @@ PokeCenter2F_CheckGender: applymovement PLAYER, MovementData_0x192ce2 loadfont writetext Text_OhPleaseWait + waitbutton closetext - loadmovesprites applymovement2 MovementData_0x192cdc spriteface PLAYER, LEFT loadfont writetext Text_ChangeTheLook + waitbutton closetext - loadmovesprites playsound SFX_TINGLE applymovement PLAYER, MovementData_0x192d17 writebyte (1 << 7) | (PAL_OW_RED << 4) @@ -438,8 +444,8 @@ PokeCenter2F_CheckGender: special ReplaceKrisSprite loadfont writetext Text_LikeTheLook + waitbutton closetext - loadmovesprites showemote EMOTE_SHOCK, PLAYER, 15 applymovement PLAYER, MovementData_0x192ce5 end @@ -447,13 +453,13 @@ PokeCenter2F_CheckGender: Script_CleanUpFemaleFlagAfterTrade: checkflag ENGINE_KRIS_IN_CABLE_CLUB iftrue .Female - applymovement $2, MovementData_0x192d04 + applymovement POKECENTER2F_LINK_RECEPTIONIST1, MovementData_0x192d04 applymovement PLAYER, MovementData_0x192cf5 - applymovement $2, MovementData_0x192cfe + applymovement POKECENTER2F_LINK_RECEPTIONIST1, MovementData_0x192cfe end .Female: - applymovement $2, MovementData_0x192d04 + applymovement POKECENTER2F_LINK_RECEPTIONIST1, MovementData_0x192d04 applymovement PLAYER, MovementData_0x192d28 clearflag ENGINE_KRIS_IN_CABLE_CLUB playsound SFX_TINGLE @@ -463,19 +469,19 @@ Script_CleanUpFemaleFlagAfterTrade: applymovement PLAYER, MovementData_0x192d1c special ReplaceKrisSprite applymovement PLAYER, MovementData_0x192d2a - applymovement $2, MovementData_0x192cfe + applymovement POKECENTER2F_LINK_RECEPTIONIST1, MovementData_0x192cfe end Script_CleanUpFemaleFlagAfterBattle: checkflag ENGINE_KRIS_IN_CABLE_CLUB iftrue .Female - applymovement $3, MovementData_0x192d04 + applymovement POKECENTER2F_LINK_RECEPTIONIST2, MovementData_0x192d04 applymovement PLAYER, MovementData_0x192cf5 - applymovement $3, MovementData_0x192cfe + applymovement POKECENTER2F_LINK_RECEPTIONIST2, MovementData_0x192cfe end .Female: - applymovement $3, MovementData_0x192d04 + applymovement POKECENTER2F_LINK_RECEPTIONIST2, MovementData_0x192d04 applymovement PLAYER, MovementData_0x192d28 clearflag ENGINE_KRIS_IN_CABLE_CLUB playsound SFX_TINGLE @@ -485,7 +491,7 @@ Script_CleanUpFemaleFlagAfterBattle: applymovement PLAYER, MovementData_0x192d1c special ReplaceKrisSprite applymovement PLAYER, MovementData_0x192d2a - applymovement $3, MovementData_0x192cfe + applymovement POKECENTER2F_LINK_RECEPTIONIST2, MovementData_0x192cfe end TimeCapsuleScript_CheckPlayerGender: @@ -527,28 +533,28 @@ TimeCapsuleScript_CheckPlayerGender: .FemaleContinue: loadfont writetext Text_OhPleaseWait + waitbutton closetext - loadmovesprites checkcode VAR_FACING if_not_equal UP, .FemaleChangeApperance spriteface PLAYER, LEFT .FemaleChangeApperance: loadfont writetext Text_ChangeTheLook + waitbutton closetext - loadmovesprites playsound SFX_TINGLE applymovement PLAYER, MovementData_0x192d17 writebyte (1 << 7) | (PAL_OW_RED << 4) special Special_SetPlayerPalette applymovement PLAYER, MovementData_0x192d22 - faceperson PLAYER, $4 + faceperson PLAYER, POKECENTER2F_LINK_RECEPTIONIST3 setflag ENGINE_KRIS_IN_CABLE_CLUB special ReplaceKrisSprite loadfont writetext Text_LikeTheLook + waitbutton closetext - loadmovesprites showemote EMOTE_SHOCK, PLAYER, 15 applymovement PLAYER, MovementData_0x192d2d end @@ -557,13 +563,13 @@ Script_LeftTimeCapsule: special Special_AbortLink checkflag ENGINE_KRIS_IN_CABLE_CLUB iftrue .Female - applymovement $4, MovementData_0x192d08 + applymovement POKECENTER2F_LINK_RECEPTIONIST3, MovementData_0x192d08 applymovement PLAYER, MovementData_0x192cf9 - applymovement $4, MovementData_0x192d01 + applymovement POKECENTER2F_LINK_RECEPTIONIST3, MovementData_0x192d01 jump .Done .Female: - applymovement $4, MovementData_0x192d08 + applymovement POKECENTER2F_LINK_RECEPTIONIST3, MovementData_0x192d08 applymovement PLAYER, MovementData_0x192cfc clearflag ENGINE_KRIS_IN_CABLE_CLUB playsound SFX_TINGLE @@ -573,7 +579,7 @@ Script_LeftTimeCapsule: applymovement PLAYER, MovementData_0x192d1c special ReplaceKrisSprite applymovement PLAYER, MovementData_0x192cfc - applymovement $4, MovementData_0x192d01 + applymovement POKECENTER2F_LINK_RECEPTIONIST3, MovementData_0x192d01 .Done: dotrigger $0 domaptrigger TIME_CAPSULE, $0 @@ -582,7 +588,7 @@ Script_LeftTimeCapsule: MapPokeCenter2FSignpost0Script: refreshscreen $0 special Special_DisplayLinkRecord - loadmovesprites + closetext end OfficerScript_0x192c9a: @@ -595,27 +601,27 @@ OfficerScript_0x192c9a: iffalse .RefusedGift writetext Text_MysteryGiftDeliveryGuy_HereYouGo keeptextopen - waitbutton + waitsfx special Special_GetMysteryGiftItem iffalse .BagIsFull itemnotify setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY .AlreadyGotGift: writetext Text_MysteryGiftDeliveryGuy_Outro + waitbutton closetext - loadmovesprites end .BagIsFull: writetext Text_MysteryGiftDeliveryGuy_NoRoom + waitbutton closetext - loadmovesprites end .RefusedGift: writetext Text_MysteryGiftDeliveryGuy_SaidNo + waitbutton closetext - loadmovesprites end MovementData_0x192cca: diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index f371cb300..1a4fdb7dd 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const POKESEERSHOUSE_GRANNY + PokeSeersHouse_MapScriptHeader: .MapTriggers: db 0 @@ -9,8 +12,8 @@ SeerScript: faceplayer loadfont special SpecialPokeSeer + waitbutton closetext - loadmovesprites end PokeSeersHouse_MapEventHeader: diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index ccb1156a7..8b4135690 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -1,3 +1,11 @@ +const_value set 2 + const POKEMONFANCLUB_GENTLEMAN + const POKEMONFANCLUB_RECEPTIONIST + const POKEMONFANCLUB_FISHER + const POKEMONFANCLUB_TEACHER + const POKEMONFANCLUB_FAIRY + const POKEMONFANCLUB_ODDISH + PokemonFanClub_MapScriptHeader: .MapTriggers: db 0 @@ -24,21 +32,21 @@ UnknownScript_0x191802: iffalse UnknownScript_0x19181f setevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT writetext UnknownText_0x191a72 + waitbutton closetext - loadmovesprites end UnknownScript_0x191815: writetext UnknownText_0x191ae0 + waitbutton closetext - loadmovesprites end UnknownScript_0x19181b: writetext UnknownText_0x191b38 - closetext + waitbutton UnknownScript_0x19181f: - loadmovesprites + closetext end ReceptionistScript_0x191821: @@ -52,44 +60,44 @@ FisherScript_0x191824: checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x191838 writetext UnknownText_0x191ba0 + waitbutton closetext - loadmovesprites end UnknownScript_0x191838: writetext UnknownText_0x191bff checkevent EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM iftrue UnknownScript_0x191844 + waitbutton closetext - loadmovesprites end UnknownScript_0x191844: keeptextopen writetext UnknownText_0x191c5a keeptextopen - waitbutton + waitsfx giveitem LOST_ITEM iffalse UnknownScript_0x191865 - disappear $6 + disappear POKEMONFANCLUB_FAIRY writetext UnknownText_0x191d0a playsound SFX_KEY_ITEM - waitbutton + waitsfx itemnotify setevent EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB - loadmovesprites + closetext end UnknownScript_0x19185f: writetext UnknownText_0x191d1e + waitbutton closetext - loadmovesprites end UnknownScript_0x191865: writetext UnknownText_0x191d58 + waitbutton closetext - loadmovesprites end TeacherScript_0x19186b: @@ -102,8 +110,8 @@ OddishScript_0x191871: loadfont writetext UnknownText_0x191de9 cry BAYLEEF + waitbutton closetext - loadmovesprites end MapPokemonFanClubSignpost0Script: diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 1c97b73fc..1e36acc5e 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -1,3 +1,12 @@ +const_value set 2 + const POWERPLANT_OFFICER1 + const POWERPLANT_GYM_GUY1 + const POWERPLANT_GYM_GUY2 + const POWERPLANT_OFFICER2 + const POWERPLANT_GYM_GUY3 + const POWERPLANT_FISHER + const POWERPLANT_GYM_GUY4 + PowerPlant_MapScriptHeader: .MapTriggers: db 2 @@ -17,24 +26,24 @@ UnknownScript_0x188dc4: UnknownScript_0x188dc5: playsound SFX_CALL - showemote EMOTE_SHOCK, $2, 15 - waitbutton + showemote EMOTE_SHOCK, POWERPLANT_OFFICER1, 15 + waitsfx pause 30 - applymovement $2, MovementData_0x188ed5 - spriteface $3, DOWN - spriteface $4, DOWN + applymovement POWERPLANT_OFFICER1, MovementData_0x188ed5 + spriteface POWERPLANT_GYM_GUY1, DOWN + spriteface POWERPLANT_GYM_GUY2, DOWN loadfont writetext UnknownText_0x188f22 + waitbutton closetext - loadmovesprites - spriteface $2, LEFT + spriteface POWERPLANT_OFFICER1, LEFT spriteface PLAYER, RIGHT loadfont writetext UnknownText_0x188f7f + waitbutton closetext - loadmovesprites spriteface PLAYER, DOWN - applymovement $2, MovementData_0x188eda + applymovement POWERPLANT_OFFICER1, MovementData_0x188eda dotrigger $0 end @@ -46,20 +55,20 @@ OfficerScript_0x188df5: checkevent EVENT_MET_MANAGER_AT_POWER_PLANT iftrue UnknownScript_0x188e09 writetext UnknownText_0x188ee0 + waitbutton closetext - loadmovesprites end UnknownScript_0x188e09: writetext UnknownText_0x188f7f + waitbutton closetext - loadmovesprites end UnknownScript_0x188e0f: writetext UnknownText_0x188fa2 + waitbutton closetext - loadmovesprites end GymGuyScript_0x188e15: @@ -68,14 +77,14 @@ GymGuyScript_0x188e15: checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e23 writetext UnknownText_0x188fcf + waitbutton closetext - loadmovesprites end UnknownScript_0x188e23: writetext UnknownText_0x189038 + waitbutton closetext - loadmovesprites end GymGuyScript_0x188e29: @@ -84,14 +93,14 @@ GymGuyScript_0x188e29: checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e37 writetext UnknownText_0x189079 + waitbutton closetext - loadmovesprites end UnknownScript_0x188e37: writetext UnknownText_0x1890ef + waitbutton closetext - loadmovesprites end OfficerScript_0x188e3d: @@ -100,14 +109,14 @@ OfficerScript_0x188e3d: checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e4b writetext UnknownText_0x18910e + waitbutton closetext - loadmovesprites end UnknownScript_0x188e4b: writetext UnknownText_0x18917f + waitbutton closetext - loadmovesprites end GymGuyScript_0x188e51: @@ -116,14 +125,14 @@ GymGuyScript_0x188e51: checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e5f writetext UnknownText_0x1891c2 + waitbutton closetext - loadmovesprites end UnknownScript_0x188e5f: writetext UnknownText_0x189225 + waitbutton closetext - loadmovesprites end PowerPlantManager: @@ -136,8 +145,8 @@ PowerPlantManager: checkevent EVENT_MET_MANAGER_AT_POWER_PLANT iftrue UnknownScript_0x188e8d writetext UnknownText_0x189264 + waitbutton closetext - loadmovesprites setevent EVENT_MET_MANAGER_AT_POWER_PLANT clearevent EVENT_CERULEAN_GYM_ROCKET clearevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM @@ -147,8 +156,8 @@ PowerPlantManager: UnknownScript_0x188e8d: writetext UnknownText_0x189308 + waitbutton closetext - loadmovesprites end UnknownScript_0x188e93: @@ -170,23 +179,23 @@ UnknownScript_0x188eac: iffalse UnknownScript_0x188ec3 setevent EVENT_GOT_TM07_ZAP_CANNON writetext UnknownText_0x1893f4 - closetext + waitbutton UnknownScript_0x188ec3: - loadmovesprites + closetext end UnknownScript_0x188ec5: writetext UnknownText_0x189475 + waitbutton closetext - loadmovesprites end GymGuyScript_0x188ecb: faceplayer loadfont trade $6 + waitbutton closetext - loadmovesprites end PowerPlantBookshelf: diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 78cfd8f0e..dba53bab8 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -1,3 +1,11 @@ +const_value set 2 + const RADIOTOWER1F_RECEPTIONIST + const RADIOTOWER1F_LASS + const RADIOTOWER1F_YOUNGSTER + const RADIOTOWER1F_ROCKET + const RADIOTOWER1F_GENTLEMAN + const RADIOTOWER1F_COOLTRAINER_F + RadioTower1F_MapScriptHeader: .MapTriggers: db 0 @@ -11,14 +19,14 @@ ReceptionistScript_0x5cd29: checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue UnknownScript_0x5cd37 writetext UnknownText_0x5ce77 + waitbutton closetext - loadmovesprites end UnknownScript_0x5cd37: writetext UnknownText_0x5ce81 + waitbutton closetext - loadmovesprites end GentlemanScript_0x5cd3d: @@ -35,19 +43,19 @@ GentlemanScript_0x5cd3d: iftrue .GameOver writetext UnknownText_0x5cf3a keeptextopen - loadmovesprites - applymovement $6, MovementData_0x5ce71 + closetext + applymovement RADIOTOWER1F_GENTLEMAN, MovementData_0x5ce71 loadfont writetext UnknownText_0x5cf5a keeptextopen - waitbutton + waitsfx writetext UnknownText_0x5cf79 playsound SFX_DEX_FANFARE_20_49 - waitbutton + waitsfx keeptextopen special Special_CheckForLuckyNumberWinners - loadmovesprites - applymovement $6, MovementData_0x5ce74 + closetext + applymovement RADIOTOWER1F_GENTLEMAN, MovementData_0x5ce74 loadfont if_equal 1, .FirstPlace if_equal 2, .SecondPlace @@ -56,14 +64,14 @@ GentlemanScript_0x5cd3d: .GameOver writetext UnknownText_0x5cf7e + waitbutton closetext - loadmovesprites end .FirstPlace writetext UnknownText_0x5cfb5 playsound SFX_1ST_PLACE - waitbutton + waitsfx keeptextopen giveitem MASTER_BALL iffalse .BagFull @@ -74,7 +82,7 @@ GentlemanScript_0x5cd3d: .SecondPlace writetext UnknownText_0x5d023 playsound SFX_2ND_PLACE - waitbutton + waitsfx keeptextopen giveitem EXP_SHARE iffalse .BagFull @@ -85,7 +93,7 @@ GentlemanScript_0x5cd3d: .ThirdPlace writetext UnknownText_0x5d076 playsound SFX_3RD_PLACE - waitbutton + waitsfx keeptextopen giveitem PP_UP iffalse .BagFull @@ -95,14 +103,14 @@ GentlemanScript_0x5cd3d: .NoPrize writetext UnknownText_0x5d0c0 + waitbutton closetext - loadmovesprites end .BagFull: writetext UnknownText_0x5d0e6 + waitbutton closetext - loadmovesprites end CooltrainerFScript_0x5cdd5: @@ -117,27 +125,27 @@ CooltrainerFScript_0x5cdd5: yesorno iffalse UnknownScript_0x5ce42 playsound SFX_ELEVATOR_END - waitbutton + waitsfx writetext UnknownText_0x5d231 yesorno iffalse UnknownScript_0x5ce42 playsound SFX_ELEVATOR_END - waitbutton + waitsfx writetext UnknownText_0x5d282 yesorno iftrue UnknownScript_0x5ce42 playsound SFX_ELEVATOR_END - waitbutton + waitsfx writetext UnknownText_0x5d2bc yesorno iffalse UnknownScript_0x5ce42 playsound SFX_ELEVATOR_END - waitbutton + waitsfx writetext UnknownText_0x5d30e yesorno iftrue UnknownScript_0x5ce42 playsound SFX_ELEVATOR_END - waitbutton + waitsfx writetext UnknownText_0x5d37b keeptextopen stringtotext RadioCardText, $1 @@ -147,8 +155,8 @@ CooltrainerFScript_0x5cdd5: setflag ENGINE_RADIO_CARD UnknownScript_0x5ce2d: writetext UnknownText_0x5d3e5 + waitbutton closetext - loadmovesprites end RadioCardText: @@ -161,14 +169,14 @@ UnknownScript_0x5ce3e: UnknownScript_0x5ce42: playsound SFX_WRONG writetext UnknownText_0x5d409 + waitbutton closetext - loadmovesprites end UnknownScript_0x5ce4b: writetext UnknownText_0x5d443 + waitbutton closetext - loadmovesprites end LassScript_0x5ce51: @@ -181,11 +189,11 @@ TrainerGruntM3: trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, 3, GruntM3SeenText, GruntM3BeatenText, 0, GruntM3Script GruntM3Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5d5a2 + waitbutton closetext - loadmovesprites end MapRadioTower1FSignpost0Script: diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index b4f5117ac..6e6288f25 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -1,3 +1,16 @@ +const_value set 2 + const RADIOTOWER2F_SUPER_NERD + const RADIOTOWER2F_TEACHER + const RADIOTOWER2F_ROCKET1 + const RADIOTOWER2F_ROCKET2 + const RADIOTOWER2F_ROCKET3 + const RADIOTOWER2F_ROCKET_GIRL + const RADIOTOWER2F_BLACK_BELT1 + const RADIOTOWER2F_BLACK_BELT2 + const RADIOTOWER2F_JIGGLYPUFF + const RADIOTOWER2F_BUENA + const RADIOTOWER2F_RECEPTIONIST + RadioTower2F_MapScriptHeader: .MapTriggers: db 0 @@ -17,22 +30,22 @@ TeacherScript_0x5d701: checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue UnknownScript_0x5d70f writetext UnknownText_0x5d956 + waitbutton closetext - loadmovesprites end UnknownScript_0x5d70f: writetext UnknownText_0x5d983 + waitbutton closetext - loadmovesprites end JigglypuffScript_0x5d715: loadfont writetext UnknownText_0x5d9b6 cry JIGGLYPUFF + waitbutton closetext - loadmovesprites end BlackBeltScript_0x5d71f: @@ -45,44 +58,44 @@ TrainerGruntM4: trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, 4, GruntM4SeenText, GruntM4BeatenText, 0, GruntM4Script GruntM4Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5db07 + waitbutton closetext - loadmovesprites end TrainerGruntM5: trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, 5, GruntM5SeenText, GruntM5BeatenText, 0, GruntM5Script GruntM5Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5db99 + waitbutton closetext - loadmovesprites end TrainerGruntM6: trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, 6, GruntM6SeenText, GruntM6BeatenText, 0, GruntM6Script GruntM6Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5dc00 + waitbutton closetext - loadmovesprites end TrainerGruntF2: trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, 2, GruntF2SeenText, GruntF2BeatenText, 0, GruntF2Script GruntF2Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5dcd0 + waitbutton closetext - loadmovesprites end Buena: @@ -107,39 +120,39 @@ Buena: special AskRememberPassword iffalse UnknownScript_0x5d81e writetext UnknownText_0x5de84 + waitbutton closetext - loadmovesprites - spriteface $b, RIGHT + spriteface RADIOTOWER2F_BUENA, RIGHT checkcode VAR_FACING - if_not_equal $3, UnknownScript_0x5d7be + if_not_equal RIGHT, UnknownScript_0x5d7be applymovement PLAYER, MovementData_0x5d921 UnknownScript_0x5d7be: spriteface PLAYER, RIGHT loadfont writetext UnknownText_0x5dedd + waitbutton closetext - loadmovesprites - spriteface $b, DOWN + spriteface RADIOTOWER2F_BUENA, DOWN refreshscreen $0 special SpecialBuenasPassword - loadmovesprites + closetext iffalse UnknownScript_0x5d845 loadfont writetext UnknownText_0x5dfc1 + waitbutton closetext - loadmovesprites checkcode VAR_BLUECARDBALANCE addvar $1 writevarcode VAR_BLUECARDBALANCE - waitbutton + waitsfx playsound SFX_TRANSACTION setflag ENGINE_BUENAS_PASSWORD_2 pause 20 - spriteface $b, RIGHT + spriteface RADIOTOWER2F_BUENA, RIGHT loadfont writetext UnknownText_0x5e054 + waitbutton closetext - loadmovesprites special Special_RotatePalettesRightMusic pause 20 special RestartMapMusic @@ -154,21 +167,21 @@ UnknownScript_0x5d800: verbosegiveitem BLUE_CARD UnknownScript_0x5d80a: writetext UnknownText_0x5de10 + waitbutton closetext - loadmovesprites checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d81a checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER iftrue UnknownScript_0x5d8cc UnknownScript_0x5d81a: - spriteface $b, RIGHT + spriteface RADIOTOWER2F_BUENA, RIGHT end UnknownScript_0x5d81e: writetext UnknownText_0x5df29 + waitbutton closetext - loadmovesprites - spriteface $b, RIGHT + spriteface RADIOTOWER2F_BUENA, RIGHT special Special_RotatePalettesRightMusic pause 20 special RestartMapMusic @@ -176,14 +189,14 @@ UnknownScript_0x5d81e: UnknownScript_0x5d82f: writetext UnknownText_0x5df6c + waitbutton closetext - loadmovesprites checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d83f checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER iftrue UnknownScript_0x5d8cc UnknownScript_0x5d83f: - spriteface $b, RIGHT + spriteface RADIOTOWER2F_BUENA, RIGHT pause 10 end @@ -191,15 +204,15 @@ UnknownScript_0x5d845: setflag ENGINE_BUENAS_PASSWORD_2 loadfont writetext UnknownText_0x5e01c + waitbutton closetext - loadmovesprites - spriteface $b, RIGHT + spriteface RADIOTOWER2F_BUENA, RIGHT pause 20 loadfont writetext UnknownText_0x5e054 + waitbutton closetext - loadmovesprites - spriteface $b, RIGHT + spriteface RADIOTOWER2F_BUENA, RIGHT special Special_RotatePalettesRightMusic pause 20 special RestartMapMusic @@ -207,38 +220,38 @@ UnknownScript_0x5d845: UnknownScript_0x5d865: writetext UnknownText_0x5e0c2 + waitbutton closetext - loadmovesprites end UnknownScript_0x5d86b: writetext UnknownText_0x5e192 + waitbutton closetext - loadmovesprites checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d87b checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc UnknownScript_0x5d87b: - spriteface $b, RIGHT + spriteface RADIOTOWER2F_BUENA, RIGHT end UnknownScript_0x5d87f: writetext UnknownText_0x5e0f1 + waitbutton closetext - loadmovesprites checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d88f checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc UnknownScript_0x5d88f: - spriteface $b, RIGHT + spriteface RADIOTOWER2F_BUENA, RIGHT end UnknownScript_0x5d893: writetext UnknownText_0x5e131 + waitbutton closetext - loadmovesprites checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d8a3 checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER @@ -250,13 +263,13 @@ UnknownScript_0x5d8a4: checkcellnum PHONE_BUENA iftrue UnknownScript_0x5d8fe pause 20 - spriteface $b, DOWN + spriteface RADIOTOWER2F_BUENA, DOWN pause 15 spriteface PLAYER, UP pause 15 checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc - showemote EMOTE_SHOCK, $b, 15 + showemote EMOTE_SHOCK, RADIOTOWER2F_BUENA, 15 setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER loadfont @@ -272,27 +285,27 @@ UnknownScript_0x5d8d0: if_equal $2, UnknownScript_0x5d8ed writetext UnknownText_0x5e2f3 playsound SFX_REGISTER_PHONE_NUMBER - waitbutton + waitsfx keeptextopen writetext UnknownText_0x5e310 + waitbutton closetext - loadmovesprites - spriteface $b, RIGHT + spriteface RADIOTOWER2F_BUENA, RIGHT addcellnum PHONE_BUENA end UnknownScript_0x5d8ed: writetext UnknownText_0x5e33c + waitbutton closetext - loadmovesprites - spriteface $b, RIGHT + spriteface RADIOTOWER2F_BUENA, RIGHT end UnknownScript_0x5d8f6: writetext UnknownText_0x5e35e + waitbutton closetext - loadmovesprites - spriteface $b, RIGHT + spriteface RADIOTOWER2F_BUENA, RIGHT UnknownScript_0x5d8fe: end @@ -304,13 +317,13 @@ ReceptionistScript_0x5d8ff: writetext UnknownText_0x5e392 keeptextopen special SpecialBuenaPrize - loadmovesprites + closetext end UnknownScript_0x5d90f: writetext UnknownText_0x5e3d8 keeptextopen - loadmovesprites + closetext end MapRadioTower2FSignpost0Script: diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 676bcfb83..cf848c126 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -1,3 +1,12 @@ +const_value set 2 + const RADIOTOWER3F_SUPER_NERD + const RADIOTOWER3F_GYM_GUY + const RADIOTOWER3F_COOLTRAINER_F + const RADIOTOWER3F_ROCKET1 + const RADIOTOWER3F_ROCKET2 + const RADIOTOWER3F_ROCKET3 + const RADIOTOWER3F_SCIENTIST + RadioTower3F_MapScriptHeader: .MapTriggers: db 0 @@ -28,14 +37,14 @@ GymGuyScript_0x5e556: checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x5e564 writetext UnknownText_0x5e682 + waitbutton closetext - loadmovesprites end UnknownScript_0x5e564: writetext UnknownText_0x5e6eb + waitbutton closetext - loadmovesprites end CooltrainerFScript_0x5e56a: @@ -48,14 +57,14 @@ CooltrainerFScript_0x5e56a: checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER iftrue UnknownScript_0x5e584 writetext UnknownText_0x5e754 + waitbutton closetext - loadmovesprites end UnknownScript_0x5e584: writetext UnknownText_0x5e7cb + waitbutton closetext - loadmovesprites end UnknownScript_0x5e58a: @@ -64,84 +73,84 @@ UnknownScript_0x5e58a: verbosegiveitem TM_SUNNY_DAY iffalse UnknownScript_0x5e5a1 writetext UnknownText_0x5e821 + waitbutton closetext - loadmovesprites setevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER end UnknownScript_0x5e59d: writetext UnknownText_0x5e85c - closetext + waitbutton UnknownScript_0x5e5a1: - loadmovesprites + closetext end TrainerGruntM7: trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, 7, GruntM7SeenText, GruntM7BeatenText, 0, GruntM7Script GruntM7Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5e8d0 + waitbutton closetext - loadmovesprites end TrainerGruntM8: trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, 8, GruntM8SeenText, GruntM8BeatenText, 0, GruntM8Script GruntM8Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5e944 + waitbutton closetext - loadmovesprites end TrainerGruntM9: trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, 9, GruntM9SeenText, GruntM9BeatenText, 0, GruntM9Script GruntM9Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5e9d0 + waitbutton closetext - loadmovesprites end TrainerScientistMarc: trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, ScientistMarcScript ScientistMarcScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5ea61 + waitbutton closetext - loadmovesprites end MapRadioTower3FSignpost2Script:: loadfont writetext UnknownText_0x5eaa4 - closetext + waitbutton checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER iftrue UnknownScript_0x5e603 checkitem CARD_KEY iftrue UnknownScript_0x5e605 UnknownScript_0x5e603: - loadmovesprites + closetext end UnknownScript_0x5e605: writetext UnknownText_0x5eabc - closetext + waitbutton setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER playsound SFX_ENTER_DOOR changeblock $e, $2, $2a changeblock $e, $4, $1 reloadmappart - loadmovesprites - waitbutton + closetext + waitsfx end MapRadioTower3FSignpost0Script: diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 061b11a17..18cbb5866 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -1,3 +1,12 @@ +const_value set 2 + const RADIOTOWER4F_FISHER + const RADIOTOWER4F_TEACHER + const RADIOTOWER4F_GROWLITHE + const RADIOTOWER4F_ROCKET1 + const RADIOTOWER4F_ROCKET2 + const RADIOTOWER4F_ROCKET_GIRL + const RADIOTOWER4F_SCIENTIST + RadioTower4F_MapScriptHeader: .MapTriggers: db 0 @@ -16,8 +25,8 @@ TeacherScript_0x5eb85: checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x5eb99 writetext UnknownText_0x5ec68 + waitbutton closetext - loadmovesprites end UnknownScript_0x5eb99: @@ -26,68 +35,68 @@ UnknownScript_0x5eb99: verbosegiveitem PINK_BOW iffalse UnknownScript_0x5ebb0 writetext UnknownText_0x5ecef + waitbutton closetext - loadmovesprites setevent EVENT_GOT_PINK_BOW_FROM_MARY end UnknownScript_0x5ebac: writetext UnknownText_0x5ed2c - closetext + waitbutton UnknownScript_0x5ebb0: - loadmovesprites + closetext end GrowlitheScript_0x5ebb2: loadfont writetext UnknownText_0x5ed66 cry MEOWTH + waitbutton closetext - loadmovesprites end TrainerGruntM10: trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, 10, GruntM10SeenText, GruntM10BeatenText, 0, GruntM10Script GruntM10Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5ede2 + waitbutton closetext - loadmovesprites end TrainerExecutivem2: trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, 2, Executivem2SeenText, Executivem2BeatenText, 0, Executivem2Script Executivem2Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5ee69 + waitbutton closetext - loadmovesprites end TrainerGruntF4: trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, 4, GruntF4SeenText, GruntF4BeatenText, 0, GruntF4Script GruntF4Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5ef31 + waitbutton closetext - loadmovesprites end TrainerScientistRich: trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, ScientistRichScript ScientistRichScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5efcb + waitbutton closetext - loadmovesprites end MapRadioTower4FSignpost0Script: diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 32a363e55..0213160bb 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const RADIOTOWER5F_GENTLEMAN + const RADIOTOWER5F_ROCKET + const RADIOTOWER5F_ROCKET_GIRL + const RADIOTOWER5F_ROCKER + const RADIOTOWER5F_POKE_BALL + RadioTower5F_MapScriptHeader: .MapTriggers: db 3 @@ -20,28 +27,28 @@ UnknownScript_0x60010: end UnknownScript_0x60011: - spriteface $2, UP - showemote EMOTE_SHOCK, $2, 15 + spriteface RADIOTOWER5F_GENTLEMAN, UP + showemote EMOTE_SHOCK, RADIOTOWER5F_GENTLEMAN, 15 loadfont writetext UnknownText_0x60128 + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x60109 + applymovement RADIOTOWER5F_GENTLEMAN, MovementData_0x60109 playmusic MUSIC_ROCKET_ENCOUNTER loadfont writetext UnknownText_0x60147 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x60223, 0 setlasttalked $2 - loadtrainer EXECUTIVEM, 3 + scriptedtrainerdata EXECUTIVEM, 3 startbattle returnafterbattle loadfont writetext UnknownText_0x60246 keeptextopen verbosegiveitem BASEMENT_KEY - loadmovesprites + closetext dotrigger $1 setevent EVENT_BEAT_ROCKET_EXECUTIVEM_3 end @@ -52,48 +59,48 @@ Director: checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x60054 writetext UnknownText_0x60246 + waitbutton closetext - loadmovesprites end UnknownScript_0x60054: writetext UnknownText_0x60824 + waitbutton closetext - loadmovesprites end TrainerExecutivef1: trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, 1, Executivef1SeenText, Executivef1BeatenText, 0, Executivef1Script Executivef1Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x60358 + waitbutton closetext - loadmovesprites end UnknownScript_0x6006e: applymovement PLAYER, MovementData_0x60125 playmusic MUSIC_ROCKET_ENCOUNTER - spriteface $3, RIGHT + spriteface RADIOTOWER5F_ROCKET, RIGHT loadfont writetext UnknownText_0x603d1 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x604f3, 0 setlasttalked $3 - loadtrainer EXECUTIVEM, 1 + scriptedtrainerdata EXECUTIVEM, 1 startbattle returnafterbattle loadfont writetext UnknownText_0x6050e + waitbutton closetext - loadmovesprites special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes - disappear $3 - disappear $4 + disappear RADIOTOWER5F_ROCKET + disappear RADIOTOWER5F_ROCKET_GIRL pause 15 special Special_FadeInQuickly setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1 @@ -109,18 +116,18 @@ UnknownScript_0x6006e: setevent EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM clearevent EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM special PlayMapMusic - disappear $2 - moveperson $2, $c, $0 - appear $2 - applymovement $2, MovementData_0x6010f + disappear RADIOTOWER5F_GENTLEMAN + moveperson RADIOTOWER5F_GENTLEMAN, $c, $0 + appear RADIOTOWER5F_GENTLEMAN + applymovement RADIOTOWER5F_GENTLEMAN, MovementData_0x6010f spriteface PLAYER, RIGHT loadfont writetext UnknownText_0x605b2 keeptextopen verbosegiveitem CLEAR_BELL writetext UnknownText_0x6062c + waitbutton closetext - loadmovesprites dotrigger $2 domaptrigger ECRUTEAK_HOUSE, $0 setevent EVENT_GOT_CLEAR_BELL @@ -128,9 +135,9 @@ UnknownScript_0x6006e: jump UnknownScript_0x600f1 UnknownScript_0x600f1: - applymovement $2, MovementData_0x6011a + applymovement RADIOTOWER5F_GENTLEMAN, MovementData_0x6011a playsound SFX_EXIT_BUILDING - disappear $2 + disappear RADIOTOWER5F_GENTLEMAN end Ben: diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 43c953e45..7546416ca 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -1,3 +1,6 @@ +const_value set 2 + const REDSHOUSE1F_REDS_MOM + RedsHouse1F_MapScriptHeader: .MapTriggers: db 1 @@ -17,14 +20,14 @@ RedsMom: checkevent EVENT_MET_REDS_MOM iftrue .MetAlready writetext RedsMomText1 + waitbutton closetext - loadmovesprites setevent EVENT_MET_REDS_MOM end .MetAlready writetext RedsMomText2 + waitbutton closetext - loadmovesprites end RedsHouse1FTV: diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index 5704cdcaf..7ea443097 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -1,3 +1,5 @@ +const_value set 2 + RedsHouse2F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index b795f5e64..d4118017c 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ROCKTUNNEL1F_POKE_BALL1 + const ROCKTUNNEL1F_POKE_BALL2 + RockTunnel1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index f25f4b013..67e6aeeb1 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROCKTUNNELB1F_POKE_BALL1 + const ROCKTUNNELB1F_POKE_BALL2 + const ROCKTUNNELB1F_POKE_BALL3 + RockTunnelB1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route1.asm b/maps/Route1.asm index cb29e65ed..4625a7f6f 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE1_YOUNGSTER + const ROUTE1_COOLTRAINER_F + const ROUTE1_FRUIT_TREE + Route1_MapScriptHeader: .MapTriggers: db 0 @@ -9,22 +14,22 @@ TrainerSchoolboyDanny: trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, SchoolboyDannyScript SchoolboyDannyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ac5d7 + waitbutton closetext - loadmovesprites end TrainerCooltrainerfQuinn: trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, CooltrainerfQuinnScript CooltrainerfQuinnScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ac640 + waitbutton closetext - loadmovesprites end MapRoute1Signpost0Script: diff --git a/maps/Route10North.asm b/maps/Route10North.asm index 29b345fed..b8ac1d641 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -1,3 +1,5 @@ +const_value set 2 + Route10North_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10PokeCenter1F.asm index 76b39967f..a2f971b43 100644 --- a/maps/Route10PokeCenter1F.asm +++ b/maps/Route10PokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const ROUTE10POKECENTER1F_NURSE + const ROUTE10POKECENTER1F_GENTLEMAN + const ROUTE10POKECENTER1F_GYM_GUY + const ROUTE10POKECENTER1F_COOLTRAINER_F + Route10PokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -17,14 +23,14 @@ GymGuyScript_0x188bda: checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188be8 writetext UnknownText_0x188c26 + waitbutton closetext - loadmovesprites end UnknownScript_0x188be8: writetext UnknownText_0x188c9e + waitbutton closetext - loadmovesprites end CooltrainerFScript_0x188bee: diff --git a/maps/Route10PokeCenter2FBeta.asm b/maps/Route10PokeCenter2FBeta.asm index a4a4aed6f..9b630c78f 100644 --- a/maps/Route10PokeCenter2FBeta.asm +++ b/maps/Route10PokeCenter2FBeta.asm @@ -1,3 +1,5 @@ +const_value set 2 + Route10PokeCenter2FBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 2e4c36ff4..fc94bbc2f 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ROUTE10SOUTH_POKEFAN_M1 + const ROUTE10SOUTH_POKEFAN_M2 + Route10South_MapScriptHeader: .MapTriggers: db 0 @@ -9,22 +13,22 @@ TrainerHikerJim: trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, 0, HikerJimScript HikerJimScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ae43b + waitbutton closetext - loadmovesprites end TrainerPokefanmRobert: trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, PokefanmRobertScript PokefanmRobertScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ae4a9 + waitbutton closetext - loadmovesprites end MapRoute10SouthSignpost0Script: diff --git a/maps/Route11.asm b/maps/Route11.asm index fde0d1544..b06dce62c 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -1,3 +1,10 @@ +const_value set 2 + const ROUTE11_YOUNGSTER1 + const ROUTE11_YOUNGSTER2 + const ROUTE11_YOUNGSTER3 + const ROUTE11_YOUNGSTER4 + const ROUTE11_FRUIT_TREE + Route11_MapScriptHeader: .MapTriggers: db 0 @@ -9,44 +16,44 @@ TrainerYoungsterOwen: trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, YoungsterOwenScript YoungsterOwenScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x680b2 + waitbutton closetext - loadmovesprites end TrainerYoungsterJason: trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, YoungsterJasonScript YoungsterJasonScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x6814a + waitbutton closetext - loadmovesprites end TrainerPsychicHerman: trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, PsychicHermanScript PsychicHermanScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x6817b + waitbutton closetext - loadmovesprites end TrainerPsychicFidel: trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, PsychicFidelScript PsychicFidelScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x681ec + waitbutton closetext - loadmovesprites end MapRoute11Signpost0Script: diff --git a/maps/Route12.asm b/maps/Route12.asm index 3f4d06fa4..9b1dba040 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -1,3 +1,11 @@ +const_value set 2 + const ROUTE12_FISHER1 + const ROUTE12_FISHER2 + const ROUTE12_FISHER3 + const ROUTE12_FISHER4 + const ROUTE12_POKE_BALL1 + const ROUTE12_POKE_BALL2 + Route12_MapScriptHeader: .MapTriggers: db 0 @@ -9,44 +17,44 @@ TrainerFisherKyle: trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, FisherKyleScript FisherKyleScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a7238 + waitbutton closetext - loadmovesprites end TrainerFisherMartin: trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, FisherMartinScript FisherMartinScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a704c + waitbutton closetext - loadmovesprites end TrainerFisherStephen: trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, FisherStephenScript FisherStephenScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a70d4 + waitbutton closetext - loadmovesprites end TrainerFisherBarney: trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, FisherBarneyScript FisherBarneyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a716d + waitbutton closetext - loadmovesprites end MapRoute12Signpost0Script: diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 8c5840b95..c999cee3c 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE12SUPERRODHOUSE_FISHING_GURU + Route12SuperRodHouse_MapScriptHeader: .MapTriggers: db 0 @@ -20,15 +23,15 @@ FishingGuruScript_0x7f484: setevent EVENT_GOT_SUPER_ROD UnknownScript_0x7f4a0: writetext UnknownText_0x7f57c + waitbutton closetext - loadmovesprites end UnknownScript_0x7f4a6: writetext UnknownText_0x7f5ec - closetext + waitbutton UnknownScript_0x7f4aa: - loadmovesprites + closetext end SuperRodHouseBookshelf: diff --git a/maps/Route13.asm b/maps/Route13.asm index 77b5b1fe5..b385f007b 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -1,3 +1,10 @@ +const_value set 2 + const ROUTE13_YOUNGSTER1 + const ROUTE13_YOUNGSTER2 + const ROUTE13_POKEFAN_M1 + const ROUTE13_POKEFAN_M2 + const ROUTE13_POKEFAN_M3 + Route13_MapScriptHeader: .MapTriggers: db 0 @@ -9,55 +16,55 @@ TrainerPokefanmAlex: trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, PokefanmAlexScript PokefanmAlexScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a24e3 + waitbutton closetext - loadmovesprites end TrainerPokefanmJoshua: trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, PokefanmJoshuaScript PokefanmJoshuaScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a254f + waitbutton closetext - loadmovesprites end TrainerBird_keeperPerry: trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, Bird_keeperPerrySeenText, Bird_keeperPerryBeatenText, 0, Bird_keeperPerryScript Bird_keeperPerryScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a25db + waitbutton closetext - loadmovesprites end TrainerBird_keeperBret: trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, Bird_keeperBretSeenText, Bird_keeperBretBeatenText, 0, Bird_keeperBretScript Bird_keeperBretScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a2662 + waitbutton closetext - loadmovesprites end TrainerHikerKenny: trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, HikerKennyScript HikerKennyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a26c2 + waitbutton closetext - loadmovesprites end MapRoute13Signpost0Script: diff --git a/maps/Route14.asm b/maps/Route14.asm index 0c62003d7..cb1095807 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -1,3 +1,9 @@ +const_value set 2 + const ROUTE14_POKEFAN_M1 + const ROUTE14_YOUNGSTER + const ROUTE14_POKEFAN_M2 + const ROUTE14_TEACHER + Route14_MapScriptHeader: .MapTriggers: db 0 @@ -9,41 +15,41 @@ TeacherScript_0x1ad47f: faceplayer loadfont trade $5 + waitbutton closetext - loadmovesprites end TrainerPokefanmCarter: trainer EVENT_BEAT_POKEFANM_CARTER, POKEFANM, CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, PokefanmCarterScript PokefanmCarterScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ad508 + waitbutton closetext - loadmovesprites end TrainerBird_keeperRoy: trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, Bird_keeperRoySeenText, Bird_keeperRoyBeatenText, 0, Bird_keeperRoyScript Bird_keeperRoyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ad5a4 + waitbutton closetext - loadmovesprites end TrainerPokefanmTrevor: trainer EVENT_BEAT_POKEFANM_TREVOR, POKEFANM, TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, PokefanmTrevorScript PokefanmTrevorScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ad660 + waitbutton closetext - loadmovesprites end PokefanmCarterSeenText: diff --git a/maps/Route15.asm b/maps/Route15.asm index 0f52d8daa..3f121ab8e 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -1,3 +1,12 @@ +const_value set 2 + const ROUTE15_YOUNGSTER1 + const ROUTE15_YOUNGSTER2 + const ROUTE15_YOUNGSTER3 + const ROUTE15_YOUNGSTER4 + const ROUTE15_TEACHER1 + const ROUTE15_TEACHER2 + const ROUTE15_POKE_BALL + Route15_MapScriptHeader: .MapTriggers: db 0 @@ -9,66 +18,66 @@ TrainerTeacherColette: trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, TeacherColetteScript TeacherColetteScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1aa60d + waitbutton closetext - loadmovesprites end TrainerTeacherHillary: trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, TeacherHillaryScript TeacherHillaryScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1aa6ca + waitbutton closetext - loadmovesprites end TrainerSchoolboyKipp: trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, SchoolboyKippScript SchoolboyKippScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1aa740 + waitbutton closetext - loadmovesprites end TrainerSchoolboyTommy: trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, SchoolboyTommyScript SchoolboyTommyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1aa7bc + waitbutton closetext - loadmovesprites end TrainerSchoolboyJohnny: trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, SchoolboyJohnnyScript SchoolboyJohnnyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1aa84a + waitbutton closetext - loadmovesprites end TrainerSchoolboyBilly: trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, SchoolboyBillyScript SchoolboyBillyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1aa8b0 + waitbutton closetext - loadmovesprites end MapRoute15Signpost0Script: diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 9576ccd51..00ba666bb 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE15FUCHSIAGATE_OFFICER + Route15FuchsiaGate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route16.asm b/maps/Route16.asm index 21a4a5962..8a787d3ba 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -1,3 +1,5 @@ +const_value set 2 + Route16_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 80bcfbb26..76cc7fa15 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD + Route16FuchsiaSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index bae75eac6..f5168a13d 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE16GATE_OFFICER + Route16Gate_MapScriptHeader: .MapTriggers: db 1 @@ -20,12 +23,12 @@ UnknownScript_0x733ed: end UnknownScript_0x733f3: - showemote EMOTE_SHOCK, $2, 15 + showemote EMOTE_SHOCK, ROUTE16GATE_OFFICER, 15 spriteface PLAYER, UP loadfont writetext UnknownText_0x73496 + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x73405 end diff --git a/maps/Route17.asm b/maps/Route17.asm index 994f91628..b5464f20a 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -1,3 +1,9 @@ +const_value set 2 + const ROUTE17_BIKER1 + const ROUTE17_BIKER2 + const ROUTE17_BIKER3 + const ROUTE17_BIKER4 + Route17_MapScriptHeader: .MapTriggers: db 0 @@ -18,44 +24,44 @@ TrainerBikerCharles: trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, BikerCharlesScript BikerCharlesScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ad293 + waitbutton closetext - loadmovesprites end TrainerBikerRiley: trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, BikerRileyScript BikerRileyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ad13b + waitbutton closetext - loadmovesprites end TrainerBikerJoel: trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, BikerJoelScript BikerJoelScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ad196 + waitbutton closetext - loadmovesprites end TrainerBikerGlenn: trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, BikerGlennScript BikerGlennScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ad225 + waitbutton closetext - loadmovesprites end MapRoute17SignpostItem0: diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index 1d8b9eb43..22edc065e 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE1718GATE_OFFICER + Route1718Gate_MapScriptHeader: .MapTriggers: db 1 @@ -20,12 +23,12 @@ UnknownScript_0x73611: end UnknownScript_0x73617: - showemote EMOTE_SHOCK, $2, 15 + showemote EMOTE_SHOCK, ROUTE1718GATE_OFFICER, 15 spriteface PLAYER, UP loadfont writetext UnknownText_0x7364d + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x73629 end diff --git a/maps/Route18.asm b/maps/Route18.asm index e846e52f9..1e5852cf6 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ROUTE18_YOUNGSTER1 + const ROUTE18_YOUNGSTER2 + Route18_MapScriptHeader: .MapTriggers: db 0 @@ -9,22 +13,22 @@ TrainerBird_keeperBoris: trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, 0, Bird_keeperBorisScript Bird_keeperBorisScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1acfa5 + waitbutton closetext - loadmovesprites end TrainerBird_keeperBob: trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, 0, Bird_keeperBobScript Bird_keeperBobScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ad00d + waitbutton closetext - loadmovesprites end MapRoute18Signpost0Script: diff --git a/maps/Route19.asm b/maps/Route19.asm index aa38af4ed..8aee0b309 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -1,3 +1,11 @@ +const_value set 2 + const ROUTE19_SWIMMER_GIRL + const ROUTE19_SWIMMER_GUY1 + const ROUTE19_SWIMMER_GUY2 + const ROUTE19_SWIMMER_GUY3 + const ROUTE19_FISHER1 + const ROUTE19_FISHER2 + Route19_MapScriptHeader: .MapTriggers: db 0 @@ -25,44 +33,44 @@ TrainerSwimmerfDawn: trainer EVENT_BEAT_SWIMMERF_DAWN, SWIMMERF, DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, SwimmerfDawnScript SwimmerfDawnScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19ebad + waitbutton closetext - loadmovesprites end TrainerSwimmermHarold: trainer EVENT_BEAT_SWIMMERM_HAROLD, SWIMMERM, HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, 0, SwimmermHaroldScript SwimmermHaroldScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19eab4 + waitbutton closetext - loadmovesprites end TrainerSwimmermJerome: trainer EVENT_BEAT_SWIMMERM_JEROME, SWIMMERM, JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, 0, SwimmermJeromeScript SwimmermJeromeScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19ec7e + waitbutton closetext - loadmovesprites end TrainerSwimmermTucker: trainer EVENT_BEAT_SWIMMERM_TUCKER, SWIMMERM, TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, 0, SwimmermTuckerScript SwimmermTuckerScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19eb3b + waitbutton closetext - loadmovesprites end FisherScript_0x19ea4d: @@ -71,14 +79,14 @@ FisherScript_0x19ea4d: checkevent EVENT_CINNABAR_ROCKS_CLEARED iftrue UnknownScript_0x19ea5b writetext UnknownText_0x19ecaf + waitbutton closetext - loadmovesprites end UnknownScript_0x19ea5b: writetext UnknownText_0x19ed24 + waitbutton closetext - loadmovesprites end FisherScript_0x19ea61: @@ -87,14 +95,14 @@ FisherScript_0x19ea61: checkevent EVENT_CINNABAR_ROCKS_CLEARED iftrue UnknownScript_0x19ea6f writetext UnknownText_0x19ed45 + waitbutton closetext - loadmovesprites end UnknownScript_0x19ea6f: writetext UnknownText_0x19ed7d + waitbutton closetext - loadmovesprites end MapRoute19Signpost0Script: diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index 7fb3fb0a4..6e8a8bf4b 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE19FUCHSIAGATE_OFFICER + Route19FuchsiaGate_MapScriptHeader: .MapTriggers: db 0 @@ -11,14 +14,14 @@ OfficerScript_0x1ab3f6: checkevent EVENT_CINNABAR_ROCKS_CLEARED iftrue .RocksCleared writetext UnknownText_0x1ab40a + waitbutton closetext - loadmovesprites end .RocksCleared writetext UnknownText_0x1ab48a + waitbutton closetext - loadmovesprites end UnknownText_0x1ab40a: diff --git a/maps/Route2.asm b/maps/Route2.asm index b97a27845..24a2bb69d 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -1,3 +1,13 @@ +const_value set 2 + const ROUTE2_BUG_CATCHER1 + const ROUTE2_BUG_CATCHER2 + const ROUTE2_BUG_CATCHER3 + const ROUTE2_POKE_BALL1 + const ROUTE2_POKE_BALL2 + const ROUTE2_POKE_BALL3 + const ROUTE2_POKE_BALL4 + const ROUTE2_FRUIT_TREE + Route2_MapScriptHeader: .MapTriggers: db 0 @@ -9,33 +19,33 @@ TrainerBug_catcherRob: trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, 0, Bug_catcherRobScript Bug_catcherRobScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ac34d + waitbutton closetext - loadmovesprites end TrainerBug_catcherEd: trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, 0, Bug_catcherEdScript Bug_catcherEdScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ac3cf + waitbutton closetext - loadmovesprites end TrainerBug_catcherDoug: trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, 0, Bug_catcherDougScript Bug_catcherDougScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ac423 + waitbutton closetext - loadmovesprites end MapRoute2Signpost0Script: diff --git a/maps/Route20.asm b/maps/Route20.asm index 86a0ad424..f1c9cc59e 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE20_SWIMMER_GIRL1 + const ROUTE20_SWIMMER_GIRL2 + const ROUTE20_SWIMMER_GUY + Route20_MapScriptHeader: .MapTriggers: db 0 @@ -17,33 +22,33 @@ TrainerSwimmerfNicole: trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, SwimmerfNicoleScript SwimmerfNicoleScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1acd93 + waitbutton closetext - loadmovesprites end TrainerSwimmerfLori: trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, SwimmerfLoriScript SwimmerfLoriScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ace15 + waitbutton closetext - loadmovesprites end TrainerSwimmermCameron: trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, SwimmermCameronScript SwimmermCameronScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ace8b + waitbutton closetext - loadmovesprites end MapRoute20Signpost0Script: diff --git a/maps/Route21.asm b/maps/Route21.asm index 36620ae53..3b3e598b4 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE21_SWIMMER_GIRL + const ROUTE21_SWIMMER_GUY + const ROUTE21_FISHER + Route21_MapScriptHeader: .MapTriggers: db 0 @@ -9,33 +14,33 @@ TrainerSwimmermSeth: trainer EVENT_BEAT_SWIMMERM_SETH, SWIMMERM, SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, SwimmermSethScript SwimmermSethScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ac873 + waitbutton closetext - loadmovesprites end TrainerSwimmerfNikki: trainer EVENT_BEAT_SWIMMERF_NIKKI, SWIMMERF, NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, 0, SwimmerfNikkiScript SwimmerfNikkiScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ac8f1 + waitbutton closetext - loadmovesprites end TrainerFisherArnold: trainer EVENT_BEAT_FISHER_ARNOLD, FISHER, ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, 0, FisherArnoldScript FisherArnoldScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ac95c + waitbutton closetext - loadmovesprites end SwimmermSethSeenText: diff --git a/maps/Route22.asm b/maps/Route22.asm index 875651460..55ccb16ff 100644 --- a/maps/Route22.asm +++ b/maps/Route22.asm @@ -1,3 +1,5 @@ +const_value set 2 + Route22_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route23.asm b/maps/Route23.asm index 29f3c0ba6..7194d7819 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -1,3 +1,5 @@ +const_value set 2 + Route23_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route24.asm b/maps/Route24.asm index b828c9e89..ab73faccb 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE24_ROCKET + Route24_MapScriptHeader: .MapTriggers: db 0 @@ -10,10 +13,10 @@ RocketScript_0x1adbfa: playmusic MUSIC_ROCKET_ENCOUNTER loadfont writetext UnknownText_0x1adc2e + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x1add67, -1 - loadtrainer GRUNTM, 31 + scriptedtrainerdata GRUNTM, 31 startbattle reloadmapmusic returnafterbattle @@ -23,11 +26,11 @@ RocketScript_0x1adbfa: keeptextopen special Special_RotatePalettesRightMusic writetext UnknownText_0x1adee1 + waitbutton closetext - loadmovesprites special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes - disappear $2 + disappear ROUTE24_ROCKET pause 25 special Special_FadeInQuickly playmapmusic diff --git a/maps/Route25.asm b/maps/Route25.asm index 12a60ef65..5f282677e 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -1,3 +1,16 @@ +const_value set 2 + const ROUTE25_MISTY + const ROUTE25_COOLTRAINER_M1 + const ROUTE25_YOUNGSTER1 + const ROUTE25_LASS1 + const ROUTE25_YOUNGSTER2 + const ROUTE25_LASS2 + const ROUTE25_YOUNGSTER3 + const ROUTE25_LASS3 + const ROUTE25_SUPER_NERD + const ROUTE25_COOLTRAINER_M2 + const ROUTE25_POKE_BALL + Route25_MapScriptHeader: .MapTriggers: db 2 @@ -16,52 +29,52 @@ UnknownScript_0x19ee9f: end UnknownScript_0x19eea0: - showemote EMOTE_HEART, $2, 15 + showemote EMOTE_HEART, ROUTE25_MISTY, 15 pause 30 - showemote EMOTE_SHOCK, $3, 10 - spriteface $2, DOWN - applymovement $3, MovementData_0x19efe8 - disappear $3 + showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10 + spriteface ROUTE25_MISTY, DOWN + applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x19efe8 + disappear ROUTE25_COOLTRAINER_M1 pause 15 playmusic MUSIC_BEAUTY_ENCOUNTER - spriteface $2, UP + spriteface ROUTE25_MISTY, UP pause 10 - applymovement $2, MovementData_0x19efed + applymovement ROUTE25_MISTY, MovementData_0x19efed loadfont writetext UnknownText_0x19f006 + waitbutton closetext - loadmovesprites spriteface PLAYER, DOWN - applymovement $2, MovementData_0x19effa + applymovement ROUTE25_MISTY, MovementData_0x19effa spriteface PLAYER, LEFT - applymovement $2, MovementData_0x19f000 - disappear $2 + applymovement ROUTE25_MISTY, MovementData_0x19f000 + disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM dotrigger $0 special RestartMapMusic end UnknownScript_0x19eee0: - showemote EMOTE_HEART, $2, 15 + showemote EMOTE_HEART, ROUTE25_MISTY, 15 pause 30 - showemote EMOTE_SHOCK, $3, 10 - spriteface $2, DOWN - applymovement $3, MovementData_0x19efea - disappear $3 + showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10 + spriteface ROUTE25_MISTY, DOWN + applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x19efea + disappear ROUTE25_COOLTRAINER_M1 pause 15 playmusic MUSIC_BEAUTY_ENCOUNTER - spriteface $2, UP + spriteface ROUTE25_MISTY, UP pause 10 - applymovement $2, MovementData_0x19eff4 + applymovement ROUTE25_MISTY, MovementData_0x19eff4 loadfont writetext UnknownText_0x19f006 + waitbutton closetext - loadmovesprites spriteface PLAYER, UP - applymovement $2, MovementData_0x19effd + applymovement ROUTE25_MISTY, MovementData_0x19effd spriteface PLAYER, LEFT - applymovement $2, MovementData_0x19f000 - disappear $2 + applymovement ROUTE25_MISTY, MovementData_0x19f000 + disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM dotrigger $0 special RestartMapMusic @@ -71,77 +84,77 @@ TrainerSchoolboyDudley: trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, SchoolboyDudleyScript SchoolboyDudleyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19f1b5 + waitbutton closetext - loadmovesprites end TrainerLassEllen: trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, LassEllenScript LassEllenScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19f208 + waitbutton closetext - loadmovesprites end TrainerSchoolboyJoe: trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, SchoolboyJoeScript SchoolboyJoeScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19f25c + waitbutton closetext - loadmovesprites end TrainerLassLaura: trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, 0, LassLauraScript LassLauraScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19f2a6 + waitbutton closetext - loadmovesprites end TrainerCamperLloyd: trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, CamperLloydScript CamperLloydScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19f2f8 + waitbutton closetext - loadmovesprites end TrainerLassShannon: trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, LassShannonScript LassShannonScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19f35b + waitbutton closetext - loadmovesprites end TrainerSupernerdPat: trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, SupernerdPatScript SupernerdPatScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19f41a + waitbutton closetext - loadmovesprites end CooltrainerMScript_0x19efac: @@ -158,19 +171,19 @@ CooltrainerMScript_0x19efac: setevent EVENT_CLEARED_NUGGET_BRIDGE UnknownScript_0x19efc7: writetext UnknownText_0x19f49d + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x19f4fd, 0 - loadtrainer COOLTRAINERM, KEVIN + scriptedtrainerdata COOLTRAINERM, KEVIN startbattle returnafterbattle setevent EVENT_BEAT_COOLTRAINERM_KEVIN loadfont UnknownScript_0x19efda: writetext UnknownText_0x19f520 - closetext + waitbutton UnknownScript_0x19efde: - loadmovesprites + closetext end MapRoute25Signpost0Script: diff --git a/maps/Route26.asm b/maps/Route26.asm index c1e4d38c9..8cf74d42d 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -1,3 +1,13 @@ +const_value set 2 + const ROUTE26_COOLTRAINER_M1 + const ROUTE26_COOLTRAINER_M2 + const ROUTE26_COOLTRAINER_F1 + const ROUTE26_COOLTRAINER_F2 + const ROUTE26_YOUNGSTER + const ROUTE26_FISHER + const ROUTE26_FRUIT_TREE + const ROUTE26_POKE_BALL + Route26_MapScriptHeader: .MapTriggers: db 0 @@ -9,11 +19,11 @@ TrainerCooltrainermJake: trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, CooltrainermJakeScript CooltrainermJakeScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a4f08 + waitbutton closetext - loadmovesprites end TrainerCooltrainermGaven3: @@ -21,7 +31,7 @@ TrainerCooltrainermGaven3: CooltrainermGaven3Script: writecode VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_GAVEN iftrue UnknownScript_0x1a4d79 @@ -59,7 +69,7 @@ UnknownScript_0x1a4d79: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight1 .LoadFight0 - loadtrainer COOLTRAINERM, GAVEN3 + scriptedtrainerdata COOLTRAINERM, GAVEN3 startbattle returnafterbattle loadvar wGavenFightCount, 1 @@ -67,7 +77,7 @@ UnknownScript_0x1a4d79: end .LoadFight1 - loadtrainer COOLTRAINERM, GAVEN1 + scriptedtrainerdata COOLTRAINERM, GAVEN1 startbattle returnafterbattle loadvar wGavenFightCount, 2 @@ -75,7 +85,7 @@ UnknownScript_0x1a4d79: end .LoadFight2 - loadtrainer COOLTRAINERM, GAVEN2 + scriptedtrainerdata COOLTRAINERM, GAVEN2 startbattle returnafterbattle clearflag ENGINE_GAVEN @@ -113,11 +123,11 @@ TrainerCooltrainerfJoyce: trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, CooltrainerfJoyceScript CooltrainerfJoyceScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a50d7 + waitbutton closetext - loadmovesprites end TrainerCooltrainerfBeth1: @@ -125,7 +135,7 @@ TrainerCooltrainerfBeth1: CooltrainerfBeth1Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_BETH - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_BETH iftrue UnknownScript_0x1a4e35 @@ -163,7 +173,7 @@ UnknownScript_0x1a4e35: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight1 .LoadFight0 - loadtrainer COOLTRAINERF, BETH1 + scriptedtrainerdata COOLTRAINERF, BETH1 startbattle returnafterbattle loadvar wBethFightCount, 1 @@ -171,7 +181,7 @@ UnknownScript_0x1a4e35: end .LoadFight1 - loadtrainer COOLTRAINERF, BETH2 + scriptedtrainerdata COOLTRAINERF, BETH2 startbattle returnafterbattle loadvar wBethFightCount, 2 @@ -179,7 +189,7 @@ UnknownScript_0x1a4e35: end .LoadFight2 - loadtrainer COOLTRAINERF, BETH3 + scriptedtrainerdata COOLTRAINERF, BETH3 startbattle returnafterbattle clearflag ENGINE_BETH @@ -217,22 +227,22 @@ TrainerPsychicRichard: trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, PsychicRichardScript PsychicRichardScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a5278 + waitbutton closetext - loadmovesprites end TrainerFisherScott: trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, FisherScottScript FisherScottScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a5326 + waitbutton closetext - loadmovesprites end MapRoute26Signpost0Script: diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/Route26DayofWeekSiblingsHouse.asm index ae8cd10b5..f725ae357 100644 --- a/maps/Route26DayofWeekSiblingsHouse.asm +++ b/maps/Route26DayofWeekSiblingsHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE26DAYOFWEEKSIBLINGSHOUSE_POKEDEX + Route26DayofWeekSiblingsHouse_MapScriptHeader: .MapTriggers: db 0 @@ -14,9 +17,9 @@ PokedexScript_0x7b1e4: yesorno iffalse UnknownText_0x7b1f7 writetext UnknownText_0x7b2b9 - closetext + waitbutton UnknownText_0x7b1f7: - loadmovesprites + closetext end UnknownText_0x7b1f9: diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index 785daaeb2..05998cdee 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE26HEALSPEECHHOUSE_TEACHER + Route26HealSpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -9,8 +12,8 @@ TeacherScript_0x7b125: faceplayer loadfont writetext UnknownText_0x7b14d + waitbutton closetext - loadmovesprites special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes special Mobile_HealParty @@ -21,8 +24,8 @@ TeacherScript_0x7b125: special RestartMapMusic loadfont writetext UnknownText_0x7b18b + waitbutton closetext - loadmovesprites end Route26HealHouseBookshelf: diff --git a/maps/Route27.asm b/maps/Route27.asm index 08351a33c..926cb3841 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -1,3 +1,14 @@ +const_value set 2 + const ROUTE27_COOLTRAINER_M1 + const ROUTE27_COOLTRAINER_M2 + const ROUTE27_COOLTRAINER_F1 + const ROUTE27_COOLTRAINER_F2 + const ROUTE27_YOUNGSTER1 + const ROUTE27_YOUNGSTER2 + const ROUTE27_POKE_BALL1 + const ROUTE27_POKE_BALL2 + const ROUTE27_FISHER + Route27_MapScriptHeader: .MapTriggers: db 2 @@ -16,23 +27,23 @@ UnknownScript_0x1a0872: end UnknownScript_0x1a0873: - spriteface $a, LEFT - showemote EMOTE_SHOCK, $a, 15 - applymovement $a, MovementData_0x1a0a66 + spriteface ROUTE27_FISHER, LEFT + showemote EMOTE_SHOCK, ROUTE27_FISHER, 15 + applymovement ROUTE27_FISHER, MovementData_0x1a0a66 jump UnknownScript_0x1a088c UnknownScript_0x1a0881: - spriteface $a, LEFT - showemote EMOTE_SHOCK, $a, 15 - applymovement $a, MovementData_0x1a0a69 + spriteface ROUTE27_FISHER, LEFT + showemote EMOTE_SHOCK, ROUTE27_FISHER, 15 + applymovement ROUTE27_FISHER, MovementData_0x1a0a69 UnknownScript_0x1a088c: spriteface PLAYER, RIGHT loadfont writetext UnknownText_0x1a0a6b keeptextopen writetext UnknownText_0x1a0a71 + waitbutton closetext - loadmovesprites dotrigger $1 end @@ -43,11 +54,11 @@ TrainerPsychicGilbert: trainer EVENT_BEAT_PSYCHIC_GILBERT, PSYCHIC_T, GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, 0, PsychicGilbertScript PsychicGilbertScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a0dd2 + waitbutton closetext - loadmovesprites end TrainerBird_keeperJose2: @@ -55,7 +66,7 @@ TrainerBird_keeperJose2: Bird_keeperJose2Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_JOSE - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_JOSE iftrue UnknownScript_0x1a08ff @@ -95,7 +106,7 @@ UnknownScript_0x1a08ff: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight1 .LoadFight0 - loadtrainer BIRD_KEEPER, JOSE2 + scriptedtrainerdata BIRD_KEEPER, JOSE2 startbattle returnafterbattle loadvar wJoseFightCount, 1 @@ -103,7 +114,7 @@ UnknownScript_0x1a08ff: end .LoadFight1 - loadtrainer BIRD_KEEPER, JOSE1 + scriptedtrainerdata BIRD_KEEPER, JOSE1 startbattle returnafterbattle loadvar wJoseFightCount, 2 @@ -111,7 +122,7 @@ UnknownScript_0x1a08ff: end .LoadFight2 - loadtrainer BIRD_KEEPER, JOSE3 + scriptedtrainerdata BIRD_KEEPER, JOSE3 startbattle returnafterbattle clearflag ENGINE_JOSE @@ -167,22 +178,22 @@ TrainerCooltrainermBlake: trainer EVENT_BEAT_COOLTRAINERM_BLAKE, COOLTRAINERM, BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, 0, CooltrainermBlakeScript CooltrainermBlakeScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a0b0b + waitbutton closetext - loadmovesprites end TrainerCooltrainermBrian: trainer EVENT_BEAT_COOLTRAINERM_BRIAN, COOLTRAINERM, BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, 0, CooltrainermBrianScript CooltrainermBrianScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a0bac + waitbutton closetext - loadmovesprites end TrainerCooltrainerfReena: @@ -190,7 +201,7 @@ TrainerCooltrainerfReena: CooltrainerfReena1Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_REENA - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_REENA iftrue UnknownScript_0x1a09e9 @@ -228,7 +239,7 @@ UnknownScript_0x1a09e9: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight1 .LoadFight0 - loadtrainer COOLTRAINERF, REENA1 + scriptedtrainerdata COOLTRAINERF, REENA1 startbattle returnafterbattle loadvar wReenaFightCount, 1 @@ -236,7 +247,7 @@ UnknownScript_0x1a09e9: end .LoadFight1 - loadtrainer COOLTRAINERF, REENA2 + scriptedtrainerdata COOLTRAINERF, REENA2 startbattle returnafterbattle loadvar wReenaFightCount, 2 @@ -244,7 +255,7 @@ UnknownScript_0x1a09e9: end .LoadFight2 - loadtrainer COOLTRAINERF, REENA3 + scriptedtrainerdata COOLTRAINERF, REENA3 startbattle returnafterbattle clearflag ENGINE_REENA @@ -282,11 +293,11 @@ TrainerCooltrainerfMegan: trainer EVENT_BEAT_COOLTRAINERF_MEGAN, COOLTRAINERF, MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, 0, CooltrainerfMeganScript CooltrainerfMeganScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a0cce + waitbutton closetext - loadmovesprites end MapRoute27Signpost0Script: diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index afb5b69e6..101d7c421 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE27SANDSTORMHOUSE_GRANNY + Route27SandstormHouse_MapScriptHeader: .MapTriggers: db 0 @@ -24,15 +27,15 @@ SandstormHouseWoman: setevent EVENT_GOT_TM37_SANDSTORM .AlreadyGotItem writetext SandstormHouseSandstormDescription - closetext + waitbutton .Done - loadmovesprites + closetext end .Disloyal writetext SandstormHouseWomanDisloyalText + waitbutton closetext - loadmovesprites end SandstormHouseBookshelf: diff --git a/maps/Route28.asm b/maps/Route28.asm index 320e62d4c..041f7517b 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -1,3 +1,5 @@ +const_value set 2 + Route28_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index c72bfaea3..bfd027915 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ROUTE28FAMOUSSPEECHHOUSE_COOLTRAINER_F + const ROUTE28FAMOUSSPEECHHOUSE_MOLTRES + Route28FamousSpeechHouse_MapScriptHeader: .MapTriggers: db 1 @@ -22,20 +26,20 @@ Celebrity: iffalse .Done setevent EVENT_GOT_TM47_STEEL_WING .Done - loadmovesprites + closetext end .AlreadyGotItem writetext CelebrityText2 + waitbutton closetext - loadmovesprites end CelebritysFearow: loadfont writetext CelebritysFearowText cry FEAROW + waitbutton closetext - loadmovesprites end CelebrityHouseBookshelf: diff --git a/maps/Route29.asm b/maps/Route29.asm index d33e4050b..4fe73be62 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -1,3 +1,13 @@ +const_value set 2 + const ROUTE29_COOLTRAINER_M1 + const ROUTE29_YOUNGSTER + const ROUTE29_TEACHER1 + const ROUTE29_FRUIT_TREE + const ROUTE29_FISHER + const ROUTE29_COOLTRAINER_M2 + const ROUTE29_TEACHER2 + const ROUTE29_POKE_BALL + Route29_MapScriptHeader: .MapTriggers: db 2 @@ -24,78 +34,78 @@ TuscanyCallback: iftrue .DoesTuscanyAppear .TuscanyDisappears - disappear $8 + disappear ROUTE29_TEACHER2 return .DoesTuscanyAppear checkcode VAR_WEEKDAY if_not_equal TUESDAY, .TuscanyDisappears - appear $8 + appear ROUTE29_TEACHER2 return UnknownScript_0x1a0f6d: - spriteface $2, UP - showemote EMOTE_SHOCK, $2, 15 - applymovement $2, MovementData_0x1a108d + spriteface ROUTE29_COOLTRAINER_M1, UP + showemote EMOTE_SHOCK, ROUTE29_COOLTRAINER_M1, 15 + applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a108d spriteface PLAYER, LEFT setevent EVENT_DUDE_TALKED_TO_YOU loadfont writetext UnknownText_0x1a10df yesorno iffalse UnknownScript_0x1a0fd9 - loadmovesprites - follow $2, PLAYER - applymovement $2, MovementData_0x1a109a + closetext + follow ROUTE29_COOLTRAINER_M1, PLAYER + applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a109a stopfollow - loadpokedata RATTATA, 5 + scriptedpokedata RATTATA, 5 catchtutorial BATTLETYPE_TUTORIAL - spriteface $2, UP + spriteface ROUTE29_COOLTRAINER_M1, UP loadfont writetext UnknownText_0x1a114d + waitbutton closetext - loadmovesprites dotrigger $0 setevent EVENT_LEARNED_TO_CATCH_POKEMON end UnknownScript_0x1a0fa3: - spriteface $2, UP - showemote EMOTE_SHOCK, $2, 15 - applymovement $2, MovementData_0x1a1094 + spriteface ROUTE29_COOLTRAINER_M1, UP + showemote EMOTE_SHOCK, ROUTE29_COOLTRAINER_M1, 15 + applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a1094 spriteface PLAYER, LEFT setevent EVENT_DUDE_TALKED_TO_YOU loadfont writetext UnknownText_0x1a10df yesorno iffalse UnknownScript_0x1a0fe5 - loadmovesprites - follow $2, PLAYER - applymovement $2, MovementData_0x1a10a1 + closetext + follow ROUTE29_COOLTRAINER_M1, PLAYER + applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a10a1 stopfollow - loadpokedata RATTATA, 5 + scriptedpokedata RATTATA, 5 catchtutorial BATTLETYPE_TUTORIAL - spriteface $2, UP + spriteface ROUTE29_COOLTRAINER_M1, UP loadfont writetext UnknownText_0x1a114d + waitbutton closetext - loadmovesprites dotrigger $0 setevent EVENT_LEARNED_TO_CATCH_POKEMON end UnknownScript_0x1a0fd9: writetext UnknownText_0x1a1197 + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x1a109a + applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a109a dotrigger $0 end UnknownScript_0x1a0fe5: writetext UnknownText_0x1a1197 + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x1a10a1 + applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a10a1 dotrigger $0 end @@ -111,26 +121,26 @@ CooltrainerMScript_0x1a0ff1: writetext UnknownText_0x1a11e3 yesorno iffalse UnknownScript_0x1a1022 - loadmovesprites - loadpokedata RATTATA, 5 + closetext + scriptedpokedata RATTATA, 5 catchtutorial BATTLETYPE_TUTORIAL loadfont writetext UnknownText_0x1a114d + waitbutton closetext - loadmovesprites setevent EVENT_LEARNED_TO_CATCH_POKEMON end UnknownScript_0x1a101c: writetext UnknownText_0x1a10a7 + waitbutton closetext - loadmovesprites end UnknownScript_0x1a1022: writetext UnknownText_0x1a1197 + waitbutton closetext - loadmovesprites end YoungsterScript_0x1a1028: @@ -151,14 +161,14 @@ CooltrainerMScript_0x1a1031: iftrue UnknownScript_0x1a1043 UnknownScript_0x1a103d: writetext UnknownText_0x1a134c + waitbutton closetext - loadmovesprites end UnknownScript_0x1a1043: writetext UnknownText_0x1a137c + waitbutton closetext - loadmovesprites end TuscanyScript: @@ -180,21 +190,21 @@ TuscanyScript: iffalse TuscanyDoneScript setevent EVENT_GOT_PINK_BOW_FROM_TUSCANY writetext TuscanyGaveGiftText + waitbutton closetext - loadmovesprites end TuscanyTuesdayScript: writetext TuscanyTuesdayText - closetext + waitbutton TuscanyDoneScript: - loadmovesprites + closetext end TuscanyNotTuesdayScript: writetext TuscanyNotTuesdayText + waitbutton closetext - loadmovesprites end MapRoute29Signpost0Script: diff --git a/maps/Route2946Gate.asm b/maps/Route2946Gate.asm index 476574864..2101fbe64 100644 --- a/maps/Route2946Gate.asm +++ b/maps/Route2946Gate.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ROUTE2946GATE_OFFICER + const ROUTE2946GATE_YOUNGSTER + Route2946Gate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index e93fa496c..f567dd3ae 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE2GATE_SCIENTIST + Route2Gate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm index bb0cbad93..04e17cb6d 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetSpeechHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE2NUGGETSPEECHHOUSE_FISHER + Route2NuggetSpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -17,9 +20,9 @@ FisherScript_0x9b847: setevent EVENT_GOT_NUGGET_FROM_GUY .GotItem writetext UnknownText_0x9b8e5 - closetext + waitbutton .Done - loadmovesprites + closetext end Route2NuggetSpeechHouseBookshelf: diff --git a/maps/Route3.asm b/maps/Route3.asm index e8333b9a4..486261c03 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -1,3 +1,9 @@ +const_value set 2 + const ROUTE3_FISHER1 + const ROUTE3_YOUNGSTER1 + const ROUTE3_YOUNGSTER2 + const ROUTE3_FISHER2 + Route3_MapScriptHeader: .MapTriggers: db 0 @@ -9,44 +15,44 @@ TrainerFirebreatherOtis: trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, FirebreatherOtisScript FirebreatherOtisScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1adff7 + waitbutton closetext - loadmovesprites end TrainerYoungsterWarren: trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, YoungsterWarrenScript YoungsterWarrenScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ae051 + waitbutton closetext - loadmovesprites end TrainerYoungsterJimmy: trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, YoungsterJimmyScript YoungsterJimmyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ae0a9 + waitbutton closetext - loadmovesprites end TrainerFirebreatherBurt: trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, FirebreatherBurtScript FirebreatherBurtScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ae118 + waitbutton closetext - loadmovesprites end MapRoute3Signpost0Script: diff --git a/maps/Route30.asm b/maps/Route30.asm index 0eab41100..06607023c 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -1,3 +1,16 @@ +const_value set 2 + const ROUTE30_YOUNGSTER1 + const ROUTE30_YOUNGSTER2 + const ROUTE30_YOUNGSTER3 + const ROUTE30_BUG_CATCHER + const ROUTE30_YOUNGSTER4 + const ROUTE30_MONSTER1 + const ROUTE30_MONSTER2 + const ROUTE30_FRUIT_TREE1 + const ROUTE30_FRUIT_TREE2 + const ROUTE30_COOLTRAINER_F + const ROUTE30_POKE_BALL + Route30_MapScriptHeader: .MapTriggers: db 0 @@ -6,22 +19,22 @@ Route30_MapScriptHeader: db 0 YoungsterScript_0x1a1673: - waitbutton + waitsfx playmusic MUSIC_JOHTO_TRAINER_BATTLE loadfont writetext UnknownText_0x1a1806 pause 30 - loadmovesprites + closetext playsound SFX_TACKLE - applymovement $8, MovementData_0x1a17fe + applymovement ROUTE30_MONSTER2, MovementData_0x1a17fe loadfont faceplayer writetext UnknownText_0x1a181c + waitbutton + spriteface ROUTE30_YOUNGSTER1, UP closetext - spriteface $2, UP - loadmovesprites playsound SFX_TACKLE - applymovement $7, MovementData_0x1a1802 + applymovement ROUTE30_MONSTER1, MovementData_0x1a1802 special RestartMapMusic end @@ -30,7 +43,7 @@ TrainerYoungsterJoey: YoungsterJoey1Script: writecode VAR_CALLERID, PHONE_YOUNGSTER_JOEY - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_JOEY iftrue UnknownScript_0x1a16e0 @@ -76,7 +89,7 @@ UnknownScript_0x1a16e0: checkflag ENGINE_FLYPOINT_GOLDENROD iftrue .LoadFight1 .LoadFight0 - loadtrainer YOUNGSTER, JOEY1 + scriptedtrainerdata YOUNGSTER, JOEY1 startbattle returnafterbattle loadvar wJoeyFightCount, 1 @@ -84,7 +97,7 @@ UnknownScript_0x1a16e0: end .LoadFight1 - loadtrainer YOUNGSTER, JOEY2 + scriptedtrainerdata YOUNGSTER, JOEY2 startbattle returnafterbattle loadvar wJoeyFightCount, 2 @@ -92,7 +105,7 @@ UnknownScript_0x1a16e0: end .LoadFight2 - loadtrainer YOUNGSTER, JOEY3 + scriptedtrainerdata YOUNGSTER, JOEY3 startbattle returnafterbattle loadvar wJoeyFightCount, 3 @@ -100,7 +113,7 @@ UnknownScript_0x1a16e0: end .LoadFight3 - loadtrainer YOUNGSTER, JOEY4 + scriptedtrainerdata YOUNGSTER, JOEY4 startbattle returnafterbattle loadvar wJoeyFightCount, 4 @@ -108,7 +121,7 @@ UnknownScript_0x1a16e0: end .LoadFight4 - loadtrainer YOUNGSTER, JOEY5 + scriptedtrainerdata YOUNGSTER, JOEY5 startbattle returnafterbattle clearflag ENGINE_JOEY @@ -128,7 +141,7 @@ UnknownScript_0x1a176e: UnknownScript_0x1a176f: loadfont writetext UnknownText_0x1a1bc0 - closetext + waitbutton verbosegiveitem HP_UP iffalse UnknownScript_0x1a179f clearevent EVENT_JOEY_HP_UP @@ -176,22 +189,22 @@ TrainerYoungsterMikey: trainer EVENT_BEAT_YOUNGSTER_MIKEY, YOUNGSTER, MIKEY, YoungsterMikeySeenText, YoungsterMikeyBeatenText, 0, YoungsterMikeyScript YoungsterMikeyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a197d + waitbutton closetext - loadmovesprites end TrainerBug_catcherDon: trainer EVENT_BEAT_BUG_CATCHER_DON, BUG_CATCHER, DON, Bug_catcherDonSeenText, Bug_catcherDonBeatenText, 0, Bug_catcherDonScript Bug_catcherDonScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a1a1c + waitbutton closetext - loadmovesprites end YoungsterScript_0x1a17d2: @@ -200,14 +213,14 @@ YoungsterScript_0x1a17d2: checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x1a17e0 writetext UnknownText_0x1a1a6a + waitbutton closetext - loadmovesprites end UnknownScript_0x1a17e0: writetext UnknownText_0x1a1a94 + waitbutton closetext - loadmovesprites end CooltrainerFScript_0x1a17e6: diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index e0c100815..a7e65d3a0 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE30BERRYSPEECHHOUSE_POKEFAN_M + Route30BerrySpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -17,9 +20,9 @@ PokefanMScript_0x196d64: setevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE UnknownScript_0x196d79: writetext UnknownText_0x196dec - closetext + waitbutton UnknownScript_0x196d7d: - loadmovesprites + closetext end Route30BerrySpeechHouseBookshelf: diff --git a/maps/Route31.asm b/maps/Route31.asm index aa32861ae..18bae0ae1 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -1,3 +1,12 @@ +const_value set 2 + const ROUTE31_FISHER + const ROUTE31_YOUNGSTER + const ROUTE31_BUG_CATCHER + const ROUTE31_COOLTRAINER_M + const ROUTE31_FRUIT_TREE + const ROUTE31_POKE_BALL1 + const ROUTE31_POKE_BALL2 + Route31_MapScriptHeader: .MapTriggers: db 0 @@ -23,7 +32,7 @@ TrainerBug_catcherWade1: Bug_catcherWade1Script: writecode VAR_CALLERID, PHONE_BUG_CATCHER_WADE - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_WADE iftrue .WadeRematch @@ -34,7 +43,7 @@ Bug_catcherWade1Script: checkevent EVENT_WADE_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain writetext UnknownText_0x1a5671 - closetext + waitbutton setevent EVENT_WADE_ASKED_FOR_PHONE_NUMBER scall .AskPhoneNumberSTD jump .Continue @@ -71,7 +80,7 @@ Bug_catcherWade1Script: checkflag ENGINE_FLYPOINT_GOLDENROD iftrue .LoadFight1 .LoadFight0 - loadtrainer BUG_CATCHER, WADE1 + scriptedtrainerdata BUG_CATCHER, WADE1 startbattle returnafterbattle loadvar wWadeFightCount, 1 @@ -79,7 +88,7 @@ Bug_catcherWade1Script: end .LoadFight1 - loadtrainer BUG_CATCHER, WADE2 + scriptedtrainerdata BUG_CATCHER, WADE2 startbattle returnafterbattle loadvar wWadeFightCount, 2 @@ -87,7 +96,7 @@ Bug_catcherWade1Script: end .LoadFight2 - loadtrainer BUG_CATCHER, WADE3 + scriptedtrainerdata BUG_CATCHER, WADE3 startbattle returnafterbattle loadvar wWadeFightCount, 3 @@ -95,7 +104,7 @@ Bug_catcherWade1Script: end .LoadFight3 - loadtrainer BUG_CATCHER, WADE4 + scriptedtrainerdata BUG_CATCHER, WADE4 startbattle returnafterbattle loadvar wWadeFightCount, 4 @@ -103,7 +112,7 @@ Bug_catcherWade1Script: end .LoadFight4 - loadtrainer BUG_CATCHER, WADE5 + scriptedtrainerdata BUG_CATCHER, WADE5 startbattle returnafterbattle clearflag ENGINE_WADE @@ -184,8 +193,8 @@ FisherScript_0x1a5570: checkevent EVENT_GOT_KENYA iftrue .TryGiveKenya writetext UnknownText_0x1a56d9 + waitbutton closetext - loadmovesprites end .TryGiveKenya: @@ -206,33 +215,33 @@ FisherScript_0x1a5570: setevent EVENT_GOT_TM50_NIGHTMARE .DescribeNightmare: writetext UnknownText_0x1a5896 - closetext + waitbutton .NoRoomForItems: - loadmovesprites + closetext end .WrongMail: writetext UnknownText_0x1a5921 + waitbutton closetext - loadmovesprites end .NoMail: writetext UnknownText_0x1a5939 + waitbutton closetext - loadmovesprites end .Refused: writetext UnknownText_0x1a5972 + waitbutton closetext - loadmovesprites end .LastMon: writetext UnknownText_0x1a5991 + waitbutton closetext - loadmovesprites end ReceivedSpearowMailText: diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index e55b02d6f..68155a705 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ROUTE31VIOLETGATE_OFFICER + const ROUTE31VIOLETGATE_COOLTRAINER_F + Route31VioletGate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route32.asm b/maps/Route32.asm index da557fde9..bccf2ea4f 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -1,3 +1,19 @@ +const_value set 2 + const ROUTE32_FISHER1 + const ROUTE32_FISHER2 + const ROUTE32_FISHER3 + const ROUTE32_YOUNGSTER1 + const ROUTE32_YOUNGSTER2 + const ROUTE32_YOUNGSTER3 + const ROUTE32_LASS1 + const ROUTE32_COOLTRAINER_M + const ROUTE32_YOUNGSTER4 + const ROUTE32_FISHER4 + const ROUTE32_POKE_BALL1 + const ROUTE32_FISHER5 + const ROUTE32_LASS2 + const ROUTE32_POKE_BALL2 + Route32_MapScriptHeader: .MapTriggers: db 3 @@ -26,11 +42,11 @@ UnknownScript_0x190462: FriedaCallback: checkcode VAR_WEEKDAY if_equal FRIDAY, .FriedaAppears - disappear $e + disappear ROUTE32_LASS2 return .FriedaAppears - appear $e + appear ROUTE32_LASS2 return CooltrainerMScript_0x19046f: @@ -44,14 +60,14 @@ UnknownScript_0x190470: checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE iftrue UnknownScript_0x19048f writetext UnknownText_0x1907ab + waitbutton closetext - loadmovesprites end UnknownScript_0x190489: writetext UnknownText_0x190820 + waitbutton closetext - loadmovesprites end UnknownScript_0x19048f: @@ -64,31 +80,31 @@ UnknownScript_0x19048f: UnknownScript_0x19049f: writetext UnknownText_0x1908b0 + waitbutton closetext - loadmovesprites end UnknownScript_0x1904a5: writetext UnknownText_0x190a15 - closetext + waitbutton UnknownScript_0x1904a9: - loadmovesprites + closetext end UnknownScript_0x1904ab: - spriteface $9, LEFT + spriteface ROUTE32_COOLTRAINER_M, LEFT spriteface PLAYER, RIGHT loadfont writetext UnknownText_0x190790 + waitbutton closetext - loadmovesprites - follow PLAYER, $9 + follow PLAYER, ROUTE32_COOLTRAINER_M applymovement PLAYER, MovementData_0x190789 stopfollow spriteface PLAYER, DOWN scall UnknownScript_0x190470 - applymovement $9, MovementData_0x19078c - applymovement $9, MovementData_0x19078e + applymovement ROUTE32_COOLTRAINER_M, MovementData_0x19078c + applymovement ROUTE32_COOLTRAINER_M, MovementData_0x19078e end FisherScript_0x1904ce: @@ -103,13 +119,13 @@ FisherScript_0x1904ce: setevent EVENT_GOT_TM05_ROAR UnknownScript_0x1904e3: writetext UnknownText_0x19118c - closetext + waitbutton UnknownScript_0x1904e7: - loadmovesprites + closetext end UnknownScript_0x1904e9: - spriteface $b, DOWN + spriteface ROUTE32_FISHER4, DOWN spriteface PLAYER, UP jump UnknownScript_0x1904f3 @@ -122,36 +138,36 @@ UnknownScript_0x1904f3: yesorno iffalse UnknownScript_0x190503 writetext UnknownText_0x190acf + waitbutton closetext - loadmovesprites end UnknownScript_0x190503: writetext UnknownText_0x190afc + waitbutton closetext - loadmovesprites end TrainerCamperRoland: trainer EVENT_BEAT_CAMPER_ROLAND, CAMPER, ROLAND, CamperRolandSeenText, CamperRolandBeatenText, 0, CamperRolandScript CamperRolandScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x190faa + waitbutton closetext - loadmovesprites end TrainerFisherJustin: trainer EVENT_BEAT_FISHER_JUSTIN, FISHER, JUSTIN, FisherJustinSeenText, FisherJustinBeatenText, 0, FisherJustinScript FisherJustinScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x190b4e + waitbutton closetext - loadmovesprites end TrainerFisherRalph1: @@ -159,7 +175,7 @@ TrainerFisherRalph1: FisherRalph1Script: writecode VAR_CALLERID, PHONE_FISHER_RALPH - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_RALPH iftrue UnknownScript_0x19057d @@ -207,7 +223,7 @@ UnknownScript_0x19057d: checkflag ENGINE_FLYPOINT_ECRUTEAK iftrue .LoadFight1 .LoadFight0 - loadtrainer FISHER, RALPH1 + scriptedtrainerdata FISHER, RALPH1 startbattle returnafterbattle loadvar wRalphFightCount, 1 @@ -215,7 +231,7 @@ UnknownScript_0x19057d: end .LoadFight1 - loadtrainer FISHER, RALPH2 + scriptedtrainerdata FISHER, RALPH2 startbattle returnafterbattle loadvar wRalphFightCount, 2 @@ -223,7 +239,7 @@ UnknownScript_0x19057d: end .LoadFight2 - loadtrainer FISHER, RALPH3 + scriptedtrainerdata FISHER, RALPH3 startbattle returnafterbattle loadvar wRalphFightCount, 3 @@ -231,7 +247,7 @@ UnknownScript_0x19057d: end .LoadFight3 - loadtrainer FISHER, RALPH4 + scriptedtrainerdata FISHER, RALPH4 startbattle returnafterbattle loadvar wRalphFightCount, 4 @@ -239,7 +255,7 @@ UnknownScript_0x19057d: end .LoadFight4 - loadtrainer FISHER, RALPH5 + scriptedtrainerdata FISHER, RALPH5 startbattle returnafterbattle clearflag ENGINE_RALPH @@ -247,8 +263,8 @@ UnknownScript_0x19057d: UnknownScript_0x1905f1: writetext UnknownText_0x190c37 + waitbutton closetext - loadmovesprites end UnknownScript_0x1905f7: @@ -283,11 +299,11 @@ TrainerFisherHenry: trainer EVENT_BEAT_FISHER_HENRY, FISHER, HENRY, FisherHenrySeenText, FisherHenryBeatenText, 0, FisherHenryScript FisherHenryScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x190df2 + waitbutton closetext - loadmovesprites end TrainerPicnickerLiz1: @@ -295,7 +311,7 @@ TrainerPicnickerLiz1: PicnickerLiz1Script: writecode VAR_CALLERID, PHONE_PICNICKER_LIZ - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_LIZ iftrue UnknownScript_0x19066d @@ -341,7 +357,7 @@ UnknownScript_0x19066d: checkflag ENGINE_FLYPOINT_ECRUTEAK iftrue .LoadFight1 .LoadFight0 - loadtrainer PICNICKER, LIZ1 + scriptedtrainerdata PICNICKER, LIZ1 startbattle returnafterbattle loadvar wLizFightCount, 1 @@ -349,7 +365,7 @@ UnknownScript_0x19066d: end .LoadFight1 - loadtrainer PICNICKER, LIZ2 + scriptedtrainerdata PICNICKER, LIZ2 startbattle returnafterbattle loadvar wLizFightCount, 2 @@ -357,7 +373,7 @@ UnknownScript_0x19066d: end .LoadFight2 - loadtrainer PICNICKER, LIZ3 + scriptedtrainerdata PICNICKER, LIZ3 startbattle returnafterbattle loadvar wLizFightCount, 3 @@ -365,7 +381,7 @@ UnknownScript_0x19066d: end .LoadFight3 - loadtrainer PICNICKER, LIZ4 + scriptedtrainerdata PICNICKER, LIZ4 startbattle returnafterbattle loadvar wLizFightCount, 4 @@ -373,7 +389,7 @@ UnknownScript_0x19066d: end .LoadFight4 - loadtrainer PICNICKER, LIZ5 + scriptedtrainerdata PICNICKER, LIZ5 startbattle returnafterbattle clearflag ENGINE_LIZ @@ -411,33 +427,33 @@ TrainerYoungsterAlbert: trainer EVENT_BEAT_YOUNGSTER_ALBERT, YOUNGSTER, ALBERT, YoungsterAlbertSeenText, YoungsterAlbertBeatenText, 0, YoungsterAlbertScript YoungsterAlbertScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x190e82 + waitbutton closetext - loadmovesprites end TrainerYoungsterGordon: trainer EVENT_BEAT_YOUNGSTER_GORDON, YOUNGSTER, GORDON, YoungsterGordonSeenText, YoungsterGordonBeatenText, 0, YoungsterGordonScript YoungsterGordonScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x190f49 + waitbutton closetext - loadmovesprites end TrainerBird_keeperPeter: trainer EVENT_BEAT_BIRD_KEEPER_PETER, BIRD_KEEPER, PETER, Bird_keeperPeterSeenText, Bird_keeperPeterBeatenText, 0, Bird_keeperPeterScript Bird_keeperPeterScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1910d4 + waitbutton closetext - loadmovesprites end FriedaScript: @@ -459,21 +475,21 @@ FriedaScript: iffalse FriedaDoneScript setevent EVENT_GOT_POISON_BARB_FROM_FRIEDA writetext FriedaGaveGiftText + waitbutton closetext - loadmovesprites end FriedaFridayScript: writetext FriedaFridayText - closetext + waitbutton FriedaDoneScript: - loadmovesprites + closetext end FriedaNotFridayScript: writetext FriedaNotFridayText + waitbutton closetext - loadmovesprites end ItemFragment_0x190773: diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32PokeCenter1F.asm index 439aecbb6..574cc5dc0 100644 --- a/maps/Route32PokeCenter1F.asm +++ b/maps/Route32PokeCenter1F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE32POKECENTER1F_NURSE + const ROUTE32POKECENTER1F_FISHING_GURU + const ROUTE32POKECENTER1F_COOLTRAINER_F + Route32PokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -20,21 +25,21 @@ FishingGuruScript_0x69b55: keeptextopen verbosegiveitem OLD_ROD writetext UnknownText_0x69c1b + waitbutton closetext - loadmovesprites setevent EVENT_GOT_OLD_ROD end UnknownScript_0x69b74: writetext UnknownText_0x69c6c + waitbutton closetext - loadmovesprites end UnknownScript_0x69b7a: writetext UnknownText_0x69c8d + waitbutton closetext - loadmovesprites end CooltrainerFScript_0x69b80: diff --git a/maps/Route32RuinsofAlphGate.asm b/maps/Route32RuinsofAlphGate.asm index 4f43f5121..404bb1a5f 100644 --- a/maps/Route32RuinsofAlphGate.asm +++ b/maps/Route32RuinsofAlphGate.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE32RUINSOFALPHGATE_OFFICER + const ROUTE32RUINSOFALPHGATE_POKEFAN_M + const ROUTE32RUINSOFALPHGATE_YOUNGSTER + Route32RuinsofAlphGate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route33.asm b/maps/Route33.asm index c56188c71..2d3f7044a 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE33_POKEFAN_M + const ROUTE33_LASS + const ROUTE33_FRUIT_TREE + Route33_MapScriptHeader: .MapTriggers: db 0 @@ -13,7 +18,7 @@ TrainerHikerAnthony: HikerAnthony2Script: writecode VAR_CALLERID, PHONE_HIKER_ANTHONY - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_ANTHONY iftrue UnknownScript_0x1ac051 @@ -61,7 +66,7 @@ UnknownScript_0x1ac051: checkflag ENGINE_FLYPOINT_OLIVINE iftrue .LoadFight1 .LoadFight0 - loadtrainer HIKER, ANTHONY2 + scriptedtrainerdata HIKER, ANTHONY2 startbattle returnafterbattle loadvar wAnthonyFightCount, 1 @@ -69,7 +74,7 @@ UnknownScript_0x1ac051: end .LoadFight1 - loadtrainer HIKER, ANTHONY1 + scriptedtrainerdata HIKER, ANTHONY1 startbattle returnafterbattle loadvar wAnthonyFightCount, 2 @@ -77,7 +82,7 @@ UnknownScript_0x1ac051: end .LoadFight2 - loadtrainer HIKER, ANTHONY3 + scriptedtrainerdata HIKER, ANTHONY3 startbattle returnafterbattle loadvar wAnthonyFightCount, 3 @@ -85,7 +90,7 @@ UnknownScript_0x1ac051: end .LoadFight3 - loadtrainer HIKER, ANTHONY4 + scriptedtrainerdata HIKER, ANTHONY4 startbattle returnafterbattle loadvar wAnthonyFightCount, 4 @@ -93,7 +98,7 @@ UnknownScript_0x1ac051: end .LoadFight4 - loadtrainer HIKER, ANTHONY5 + scriptedtrainerdata HIKER, ANTHONY5 startbattle returnafterbattle clearflag ENGINE_ANTHONY @@ -101,8 +106,8 @@ UnknownScript_0x1ac051: UnknownScript_0x1ac0c5: writetext UnknownText_0x1ac180 + waitbutton closetext - loadmovesprites end UnknownScript_0x1ac0cb: diff --git a/maps/Route34.asm b/maps/Route34.asm index 0b336311e..4b590caab 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -1,3 +1,18 @@ +const_value set 2 + const ROUTE34_YOUNGSTER1 + const ROUTE34_YOUNGSTER2 + const ROUTE34_YOUNGSTER3 + const ROUTE34_LASS + const ROUTE34_OFFICER + const ROUTE34_POKEFAN_M + const ROUTE34_GRAMPS + const ROUTE34_DAYCARE_MON_1 + const ROUTE34_DAYCARE_MON_2 + const ROUTE34_COOLTRAINER_F1 + const ROUTE34_COOLTRAINER_F2 + const ROUTE34_COOLTRAINER_F3 + const ROUTE34_POKE_BALL + Route34_MapScriptHeader: .MapTriggers: db 0 @@ -45,34 +60,34 @@ GrampsScript_0x7803d: faceplayer loadfont special Special_DayCareManOutside + waitbutton closetext - loadmovesprites if_equal $1, UnknownScript_0x7805a clearflag ENGINE_DAYCARE_MONS_ARE_COMPATIBLE checkcode VAR_FACING - if_equal $3, UnknownScript_0x7805b - applymovement $8, MovementData_0x78333 + if_equal RIGHT, UnknownScript_0x7805b + applymovement ROUTE34_GRAMPS, MovementData_0x78333 playsound SFX_ENTER_DOOR - disappear $8 + disappear ROUTE34_GRAMPS UnknownScript_0x7805a: end UnknownScript_0x7805b: - applymovement $8, MovementData_0x78337 + applymovement ROUTE34_GRAMPS, MovementData_0x78337 playsound SFX_ENTER_DOOR - disappear $8 + disappear ROUTE34_GRAMPS end DaycareMon1Script_0x78065: loadfont special Special_DayCareMon1 - loadmovesprites + closetext end DaycareMon2Script_0x7806b: loadfont special Special_DayCareMon2 - loadmovesprites + closetext end TrainerCamperTodd1: @@ -80,7 +95,7 @@ TrainerCamperTodd1: CamperTodd1Script: writecode VAR_CALLERID, PHONE_CAMPER_TODD - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_TODD iftrue UnknownScript_0x780bd @@ -128,7 +143,7 @@ UnknownScript_0x780bd: checkflag ENGINE_FLYPOINT_CIANWOOD iftrue .LoadFight1 .LoadFight0 - loadtrainer CAMPER, TODD1 + scriptedtrainerdata CAMPER, TODD1 startbattle returnafterbattle loadvar wToddFightCount, 1 @@ -136,7 +151,7 @@ UnknownScript_0x780bd: end .LoadFight1 - loadtrainer CAMPER, TODD2 + scriptedtrainerdata CAMPER, TODD2 startbattle returnafterbattle loadvar wToddFightCount, 2 @@ -144,7 +159,7 @@ UnknownScript_0x780bd: end .LoadFight2 - loadtrainer CAMPER, TODD3 + scriptedtrainerdata CAMPER, TODD3 startbattle returnafterbattle loadvar wToddFightCount, 3 @@ -152,7 +167,7 @@ UnknownScript_0x780bd: end .LoadFight3 - loadtrainer CAMPER, TODD4 + scriptedtrainerdata CAMPER, TODD4 startbattle returnafterbattle loadvar wToddFightCount, 4 @@ -160,7 +175,7 @@ UnknownScript_0x780bd: end .LoadFight4 - loadtrainer CAMPER, TODD5 + scriptedtrainerdata CAMPER, TODD5 startbattle returnafterbattle clearflag ENGINE_TODD @@ -168,8 +183,8 @@ UnknownScript_0x780bd: UnknownScript_0x78131: writetext UnknownText_0x78532 + waitbutton closetext - loadmovesprites end UnknownScript_0x78137: @@ -205,7 +220,7 @@ TrainerPicnickerGina1: PicnickerGina1Script: writecode VAR_CALLERID, PHONE_PICNICKER_GINA - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_GINA iftrue UnknownScript_0x7819f @@ -253,7 +268,7 @@ UnknownScript_0x7819f: checkflag ENGINE_FLYPOINT_MAHOGANY iftrue .LoadFight1 .LoadFight0 - loadtrainer PICNICKER, GINA1 + scriptedtrainerdata PICNICKER, GINA1 startbattle returnafterbattle loadvar wGinaFightCount, 1 @@ -261,7 +276,7 @@ UnknownScript_0x7819f: end .LoadFight1 - loadtrainer PICNICKER, GINA2 + scriptedtrainerdata PICNICKER, GINA2 startbattle returnafterbattle loadvar wGinaFightCount, 2 @@ -269,7 +284,7 @@ UnknownScript_0x7819f: end .LoadFight2 - loadtrainer PICNICKER, GINA3 + scriptedtrainerdata PICNICKER, GINA3 startbattle returnafterbattle loadvar wGinaFightCount, 3 @@ -277,7 +292,7 @@ UnknownScript_0x7819f: end .LoadFight3 - loadtrainer PICNICKER, GINA4 + scriptedtrainerdata PICNICKER, GINA4 startbattle returnafterbattle loadvar wGinaFightCount, 4 @@ -285,7 +300,7 @@ UnknownScript_0x7819f: end .LoadFight4 - loadtrainer PICNICKER, GINA5 + scriptedtrainerdata PICNICKER, GINA5 startbattle returnafterbattle clearflag ENGINE_GINA @@ -347,104 +362,104 @@ OfficerScript_0x7824c: iftrue UnknownScript_0x78270 playmusic MUSIC_OFFICER_ENCOUNTER writetext UnknownText_0x785e4 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x78609, 0 - loadtrainer OFFICER, KEITH + scriptedtrainerdata OFFICER, KEITH startbattle returnafterbattle setevent EVENT_BEAT_OFFICER_KEITH - loadmovesprites + closetext end UnknownScript_0x78270: writetext UnknownText_0x78624 + waitbutton closetext - loadmovesprites end UnknownScript_0x78276: writetext UnknownText_0x7866a + waitbutton closetext - loadmovesprites end TrainerYoungsterSamuel: trainer EVENT_BEAT_YOUNGSTER_SAMUEL, YOUNGSTER, SAMUEL, YoungsterSamuelSeenText, YoungsterSamuelBeatenText, 0, YoungsterSamuelScript YoungsterSamuelScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x783d8 + waitbutton closetext - loadmovesprites end TrainerYoungsterIan: trainer EVENT_BEAT_YOUNGSTER_IAN, YOUNGSTER, IAN, YoungsterIanSeenText, YoungsterIanBeatenText, 0, YoungsterIanScript YoungsterIanScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x78469 + waitbutton closetext - loadmovesprites end TrainerPokefanmBrandon: trainer EVENT_BEAT_POKEFANM_BRANDON, POKEFANM, BRANDON, PokefanmBrandonSeenText, PokefanmBrandonBeatenText, 0, PokefanmBrandonScript PokefanmBrandonScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x786fc + waitbutton closetext - loadmovesprites end TrainerCooltrainerfIrene: trainer EVENT_BEAT_COOLTRAINERF_IRENE, COOLTRAINERF, IRENE, CooltrainerfIreneSeenText, CooltrainerfIreneBeatenText, 0, CooltrainerfIreneScript CooltrainerfIreneScript: - talkaftercancel + end_if_just_battled loadfont checkevent EVENT_GOT_SOFT_SAND_FROM_KATE iftrue UnknownScript_0x782d2 writetext UnknownText_0x7877f + waitbutton closetext - loadmovesprites end UnknownScript_0x782d2: writetext UnknownText_0x787ad + waitbutton closetext - loadmovesprites end TrainerCooltrainerfJenn: trainer EVENT_BEAT_COOLTRAINERF_JENN, COOLTRAINERF, JENN, CooltrainerfJennSeenText, CooltrainerfJennBeatenText, 0, CooltrainerfJennScript CooltrainerfJennScript: - talkaftercancel + end_if_just_battled loadfont checkevent EVENT_GOT_SOFT_SAND_FROM_KATE iftrue UnknownScript_0x782f2 writetext UnknownText_0x78836 + waitbutton closetext - loadmovesprites end UnknownScript_0x782f2: writetext UnknownText_0x78866 + waitbutton closetext - loadmovesprites end TrainerCooltrainerfKate: trainer EVENT_BEAT_COOLTRAINERF_KATE, COOLTRAINERF, KATE, CooltrainerfKateSeenText, CooltrainerfKateBeatenText, 0, CooltrainerfKateScript CooltrainerfKateScript: - talkaftercancel + end_if_just_battled loadfont checkevent EVENT_GOT_SOFT_SAND_FROM_KATE iftrue UnknownScript_0x78319 @@ -455,9 +470,9 @@ CooltrainerfKateScript: setevent EVENT_GOT_SOFT_SAND_FROM_KATE UnknownScript_0x78319: writetext UnknownText_0x7892b - closetext + waitbutton UnknownScript_0x7831d: - loadmovesprites + closetext end UnknownScript_0x7831f: diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 78c161082..0b63707b4 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -1,3 +1,9 @@ +const_value set 2 + const ROUTE34ILEXFORESTGATE_TEACHER1 + const ROUTE34ILEXFORESTGATE_BUTTERFREE + const ROUTE34ILEXFORESTGATE_LASS + const ROUTE34ILEXFORESTGATE_TEACHER2 + Route34IlexForestGate_MapScriptHeader: .MapTriggers: db 0 @@ -12,30 +18,30 @@ Route34IlexForestGate_MapScriptHeader: UnknownScript_0x62d2d: checkevent EVENT_FOREST_IS_RESTLESS iffalse UnknownScript_0x62d38 - disappear $2 - appear $5 + disappear ROUTE34ILEXFORESTGATE_TEACHER1 + appear ROUTE34ILEXFORESTGATE_TEACHER2 return UnknownScript_0x62d38: - disappear $5 - appear $2 + disappear ROUTE34ILEXFORESTGATE_TEACHER2 + appear ROUTE34ILEXFORESTGATE_TEACHER1 return UnknownScript_0x62d3d: checkevent EVENT_FOREST_IS_RESTLESS iffalse UnknownScript_0x62d62 - showemote EMOTE_SHOCK, $5, 20 - spriteface $5, LEFT + showemote EMOTE_SHOCK, ROUTE34ILEXFORESTGATE_TEACHER2, 20 + spriteface ROUTE34ILEXFORESTGATE_TEACHER2, LEFT spriteface PLAYER, RIGHT - follow PLAYER, $5 + follow PLAYER, ROUTE34ILEXFORESTGATE_TEACHER2 applymovement PLAYER, MovementData_0x62d97 stopfollow spriteface PLAYER, DOWN loadfont writetext UnknownText_0x62e41 + waitbutton closetext - loadmovesprites - applymovement $5, MovementData_0x62d9a + applymovement ROUTE34ILEXFORESTGATE_TEACHER2, MovementData_0x62d9a UnknownScript_0x62d62: end @@ -53,23 +59,23 @@ TeacherScript_0x62d63: setevent EVENT_GOT_TM12_SWEET_SCENT UnknownScript_0x62d7e: writetext UnknownText_0x62df6 - closetext + waitbutton UnknownScript_0x62d82: - loadmovesprites + closetext end UnknownScript_0x62d84: writetext UnknownText_0x62e41 keeptextopen - loadmovesprites + closetext end ButterfreeScript_0x62d8a: loadfont writetext UnknownText_0x62e83 cry BUTTERFREE + waitbutton closetext - loadmovesprites end LassScript_0x62d94: diff --git a/maps/Route35.asm b/maps/Route35.asm index c4175e7b6..57c13ab86 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -1,3 +1,16 @@ +const_value set 2 + const ROUTE35_YOUNGSTER1 + const ROUTE35_YOUNGSTER2 + const ROUTE35_LASS1 + const ROUTE35_LASS2 + const ROUTE35_YOUNGSTER3 + const ROUTE35_FISHER + const ROUTE35_BUG_CATCHER + const ROUTE35_SUPER_NERD + const ROUTE35_OFFICER + const ROUTE35_FRUIT_TREE + const ROUTE35_POKE_BALL + Route35_MapScriptHeader: .MapTriggers: db 0 @@ -9,11 +22,11 @@ TrainerBird_keeperBryan: trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, Bird_keeperBryanSeenText, Bird_keeperBryanBeatenText, 0, Bird_keeperBryanScript Bird_keeperBryanScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19cc87 + waitbutton closetext - loadmovesprites end TrainerJugglerIrwin: @@ -21,7 +34,7 @@ TrainerJugglerIrwin: JugglerIrwin1Script: writecode VAR_CALLERID, PHONE_JUGGLER_IRWIN - talkaftercancel + end_if_just_battled loadfont checkcellnum PHONE_JUGGLER_IRWIN iftrue UnknownScript_0x19c90f @@ -75,44 +88,44 @@ TrainerCamperIvan: trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, CamperIvanScript CamperIvanScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19cac4 + waitbutton closetext - loadmovesprites end TrainerCamperElliot: trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, CamperElliotScript CamperElliotScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19cb47 + waitbutton closetext - loadmovesprites end TrainerPicnickerBrooke: trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, PicnickerBrookeScript PicnickerBrookeScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19cbba + waitbutton closetext - loadmovesprites end TrainerPicnickerKim: trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, PicnickerKimScript PicnickerKimScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19cc21 + waitbutton closetext - loadmovesprites end TrainerBug_catcherArnie1: @@ -120,7 +133,7 @@ TrainerBug_catcherArnie1: Bug_catcherArnie1Script: writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_ARNIE iftrue UnknownScript_0x19c9bb @@ -168,7 +181,7 @@ UnknownScript_0x19c9bb: checkflag ENGINE_FLYPOINT_LAKE_OF_RAGE iftrue .LoadFight1 .LoadFight0 - loadtrainer BUG_CATCHER, ARNIE1 + scriptedtrainerdata BUG_CATCHER, ARNIE1 startbattle returnafterbattle loadvar wArnieFightCount, 1 @@ -176,7 +189,7 @@ UnknownScript_0x19c9bb: end .LoadFight1 - loadtrainer BUG_CATCHER, ARNIE2 + scriptedtrainerdata BUG_CATCHER, ARNIE2 startbattle returnafterbattle loadvar wArnieFightCount, 2 @@ -184,7 +197,7 @@ UnknownScript_0x19c9bb: end .LoadFight2 - loadtrainer BUG_CATCHER, ARNIE3 + scriptedtrainerdata BUG_CATCHER, ARNIE3 startbattle returnafterbattle loadvar wArnieFightCount, 3 @@ -192,7 +205,7 @@ UnknownScript_0x19c9bb: end .LoadFight3 - loadtrainer BUG_CATCHER, ARNIE4 + scriptedtrainerdata BUG_CATCHER, ARNIE4 startbattle returnafterbattle loadvar wArnieFightCount, 4 @@ -200,7 +213,7 @@ UnknownScript_0x19c9bb: end .LoadFight4 - loadtrainer BUG_CATCHER, ARNIE5 + scriptedtrainerdata BUG_CATCHER, ARNIE5 startbattle returnafterbattle clearflag ENGINE_ARNIE @@ -208,19 +221,19 @@ UnknownScript_0x19c9bb: UnknownScript_0x19ca2f: writetext UnknownText_0x19ce38 + waitbutton closetext - loadmovesprites end TrainerFirebreatherWalt: trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, FirebreatherWaltScript FirebreatherWaltScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19cebc + waitbutton closetext - loadmovesprites end OfficerScript_0x19ca49: @@ -232,26 +245,26 @@ OfficerScript_0x19ca49: iftrue UnknownScript_0x19ca6d playmusic MUSIC_OFFICER_ENCOUNTER writetext UnknownText_0x19ceea + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x19cf06, 0 - loadtrainer OFFICER, DIRK + scriptedtrainerdata OFFICER, DIRK startbattle returnafterbattle setevent EVENT_BEAT_OFFICER_DIRK - loadmovesprites + closetext end UnknownScript_0x19ca6d: writetext UnknownText_0x19cf0f + waitbutton closetext - loadmovesprites end UnknownScript_0x19ca73: writetext UnknownText_0x19cf56 + waitbutton closetext - loadmovesprites end MapRoute35Signpost1Script: diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35Goldenrodgate.asm index 161aa3e1f..61af766cf 100644 --- a/maps/Route35Goldenrodgate.asm +++ b/maps/Route35Goldenrodgate.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE35GOLDENRODGATE_OFFICER + const ROUTE35GOLDENRODGATE_POKEFAN_F + const ROUTE35GOLDENRODGATE_FISHER + Route35Goldenrodgate_MapScriptHeader: .MapTriggers: db 0 @@ -19,31 +24,31 @@ OfficerScript_0x69d37: iffalse .refused writetext UnknownText_0x69e48 keeptextopen - waitbutton + waitsfx checkcode VAR_PARTYCOUNT if_equal PARTY_LENGTH, .partyfull writetext UnknownText_0x69eb8 playsound SFX_KEY_ITEM - waitbutton + waitsfx givepoke SPEAROW, 10, NO_ITEM, 1, GiftSpearowName, GiftSpearowOTName givepokeitem GiftSpearowMail setevent EVENT_GOT_KENYA .alreadyhavekenya: writetext UnknownText_0x69ed6 + waitbutton closetext - loadmovesprites end .partyfull: writetext UnknownText_0x69f56 + waitbutton closetext - loadmovesprites end .refused: writetext UnknownText_0x69f74 + waitbutton closetext - loadmovesprites end .questcomplete: @@ -54,9 +59,9 @@ OfficerScript_0x69d37: setevent EVENT_GOT_HP_UP_FROM_RANDY .gothpup: writetext UnknownText_0x69fd9 - closetext + waitbutton .bagfull: - loadmovesprites + closetext end GiftSpearowMail: @@ -76,14 +81,14 @@ PokefanFScript_0x69dc6: checkevent EVENT_FOUGHT_SUDOWOODO iftrue .aftersudowoodo writetext UnknownText_0x6a00a + waitbutton closetext - loadmovesprites end .aftersudowoodo: writetext UnknownText_0x6a09a + waitbutton closetext - loadmovesprites end FisherScript_0x69dda: diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index ba5c3516a..d2591c664 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE35NATIONALPARKGATE_OFFICER1 + const ROUTE35NATIONALPARKGATE_YOUNGSTER + const ROUTE35NATIONALPARKGATE_OFFICER2 + Route35NationalParkgate_MapScriptHeader: .MapTriggers: db 3 @@ -43,20 +48,20 @@ Route35NationalParkgate_CheckIfContestDay: if_equal SATURDAY, Route35NationalParkgate_IsContestDay checkflag ENGINE_BUG_CONTEST_TIMER iftrue Route35NationalParkgate_Yes - disappear $2 - appear $3 - appear $4 + disappear ROUTE35NATIONALPARKGATE_OFFICER1 + appear ROUTE35NATIONALPARKGATE_YOUNGSTER + appear ROUTE35NATIONALPARKGATE_OFFICER2 return Route35NationalParkgate_IsContestDay: - appear $2 - disappear $3 - disappear $4 + appear ROUTE35NATIONALPARKGATE_OFFICER1 + disappear ROUTE35NATIONALPARKGATE_YOUNGSTER + disappear ROUTE35NATIONALPARKGATE_OFFICER2 return Route35NationalParkGate_LeavingContestEarly: applymovement PLAYER, MovementData_0x6a2e2 - spriteface $2, RIGHT + spriteface ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT loadfont checkcode VAR_CONTESTMINUTES addvar $1 @@ -65,18 +70,18 @@ Route35NationalParkGate_LeavingContestEarly: yesorno iffalse Route35NationalParkgate_GoBackIn writetext UnknownText_0x6a7db + waitbutton closetext - loadmovesprites jumpstd bugcontestresultswarp Route35NationalParkgate_GoBackIn: writetext UnknownText_0x6a823 + waitbutton closetext - loadmovesprites scall Route35NationalParkgate_EnterContest playsound SFX_ENTER_DOOR special FadeOutPalettes - waitbutton + waitsfx warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f end @@ -105,15 +110,15 @@ Route35NationalParkgate_OkayToProceed: keeptextopen writetext UnknownText_0x6a3c7 playsound SFX_ITEM - waitbutton + waitsfx writetext UnknownText_0x6a3e2 + waitbutton closetext - loadmovesprites special Special_GiveParkBalls scall Route35NationalParkgate_EnterContest playsound SFX_ENTER_DOOR special FadeOutPalettes - waitbutton + waitsfx special Special_SelectRandomBugContestContestants warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f end @@ -147,44 +152,44 @@ Route35NationalParkgate_LessThanFullParty: ; 6a27d keeptextopen writetext UnknownText_0x6a56b playsound SFX_GOT_SAFARI_BALLS - waitbutton + waitsfx keeptextopen jump Route35NationalParkgate_OkayToProceed Route35NationalParkgate_DeclinedToParticipate: writetext UnknownText_0x6a5dc + waitbutton closetext - loadmovesprites end Route35NationalParkgate_DeclinedToLeaveMonsBehind: writetext UnknownText_0x6a597 + waitbutton closetext - loadmovesprites end Route35NationalParkgate_FirstMonIsFainted: writetext UnknownText_0x6a608 + waitbutton closetext - loadmovesprites end Route35NationalParkgate_NoRoomInBox: writetext UnknownText_0x6a67c + waitbutton closetext - loadmovesprites end Route35NationalParkgate_FirstMonIsEgg: writetext UnknownText_0x6a71f + waitbutton closetext - loadmovesprites end Route35NationalParkgate_ContestIsOver: writetext UnknownText_0x6a84f + waitbutton closetext - loadmovesprites end Route35NationalParkgate_NoContestToday: @@ -196,8 +201,8 @@ OfficerScript_0x6a2ca: checkflag ENGINE_DAILY_BUG_CONTEST iftrue Route35NationalParkgate_ContestIsOver writetext UnknownText_0x6a894 + waitbutton closetext - loadmovesprites end YoungsterScript_0x6a2d8: diff --git a/maps/Route36.asm b/maps/Route36.asm index 2fe3e7b28..5ec0870bd 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -1,3 +1,14 @@ +const_value set 2 + const ROUTE36_YOUNGSTER1 + const ROUTE36_YOUNGSTER2 + const ROUTE36_WEIRD_TREE + const ROUTE36_LASS1 + const ROUTE36_FISHER + const ROUTE36_FRUIT_TREE + const ROUTE36_YOUNGSTER3 + const ROUTE36_LASS2 + const ROUTE36_SUICUNE + Route36_MapScriptHeader: .MapTriggers: db 2 @@ -22,11 +33,11 @@ UnknownScript_0x19400e: ArthurCallback: checkcode VAR_WEEKDAY if_equal THURSDAY, .ArthurAppears - disappear $8 + disappear ROUTE36_YOUNGSTER3 return .ArthurAppears - appear $8 + appear ROUTE36_YOUNGSTER3 return UnknownScript_0x19401b: @@ -34,8 +45,8 @@ UnknownScript_0x19401b: pause 15 playsound SFX_WARP_FROM spriteface PLAYER, UP - applymovement $a, MovementData_0x194262 - disappear $a + applymovement ROUTE36_SUICUNE, MovementData_0x194262 + disappear ROUTE36_SUICUNE spriteface PLAYER, DOWN pause 10 dotrigger $0 @@ -46,9 +57,9 @@ UnknownScript_0x19401b: WeirdTreeScript_0x19403c: checkitem SQUIRTBOTTLE iftrue UnknownScript_0x19404a - waitbutton + waitsfx playsound SFX_SANDSTORM - applymovement $4, MovementData_0x194249 + applymovement ROUTE36_WEIRD_TREE, MovementData_0x194249 end UnknownScript_0x19404a: @@ -56,38 +67,38 @@ UnknownScript_0x19404a: writetext UnknownText_0x19426b yesorno iffalse UnknownScript_0x194079 - loadmovesprites + closetext ; fallthrough WateredWeirdTreeScript:: loadfont writetext UnknownText_0x194290 - closetext - loadmovesprites waitbutton + closetext + waitsfx playsound SFX_SANDSTORM - applymovement $4, MovementData_0x194249 + applymovement ROUTE36_WEIRD_TREE, MovementData_0x194249 loadfont writetext UnknownText_0x1942aa + waitbutton closetext - loadmovesprites - loadpokedata SUDOWOODO, 20 + scriptedpokedata SUDOWOODO, 20 startbattle setevent EVENT_FOUGHT_SUDOWOODO if_equal $2, UnknownScript_0x19407b - disappear $4 + disappear ROUTE36_WEIRD_TREE variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN returnafterbattle end UnknownScript_0x194079: - loadmovesprites + closetext end UnknownScript_0x19407b: returnafterbattle - applymovement $4, MovementData_0x19424b - disappear $4 + applymovement ROUTE36_WEIRD_TREE, MovementData_0x19424b + disappear ROUTE36_WEIRD_TREE variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN special RunCallback_04 special RefreshSprites @@ -100,24 +111,24 @@ LassScript_0x19408c: iftrue UnknownScript_0x1940b3 setevent EVENT_MET_FLORIA writetext UnknownText_0x1942f1 + waitbutton closetext - loadmovesprites clearevent EVENT_FLORIA_AT_FLOWER_SHOP checkcode VAR_FACING - if_equal $1, UnknownScript_0x1940ac - applymovement $9, MovementData_0x19424e - disappear $9 + if_equal UP, UnknownScript_0x1940ac + applymovement ROUTE36_LASS2, MovementData_0x19424e + disappear ROUTE36_LASS2 end UnknownScript_0x1940ac: - applymovement $9, MovementData_0x194258 - disappear $9 + applymovement ROUTE36_LASS2, MovementData_0x194258 + disappear ROUTE36_LASS2 end UnknownScript_0x1940b3: writetext UnknownText_0x1943ed + waitbutton closetext - loadmovesprites end FisherScript_0x1940b9: @@ -128,8 +139,8 @@ FisherScript_0x1940b9: checkevent EVENT_FOUGHT_SUDOWOODO iftrue UnknownScript_0x1940cd writetext UnknownText_0x19446f + waitbutton closetext - loadmovesprites end UnknownScript_0x1940cd: @@ -140,9 +151,9 @@ UnknownScript_0x1940cd: setevent EVENT_GOT_TM08_ROCK_SMASH UnknownScript_0x1940da: writetext UnknownText_0x19452c - closetext + waitbutton UnknownScript_0x1940de: - loadmovesprites + closetext end LassScript_0x1940e0: @@ -151,14 +162,14 @@ LassScript_0x1940e0: checkevent EVENT_FOUGHT_SUDOWOODO iftrue UnknownScript_0x1940ee writetext UnknownText_0x194626 + waitbutton closetext - loadmovesprites end UnknownScript_0x1940ee: writetext UnknownText_0x19469e + waitbutton closetext - loadmovesprites end TrainerSchoolboyAlan1: @@ -166,7 +177,7 @@ TrainerSchoolboyAlan1: SchoolboyAlan1Script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_ALAN - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_ALAN iftrue UnknownScript_0x194140 @@ -214,7 +225,7 @@ UnknownScript_0x194140: checkflag ENGINE_FLYPOINT_OLIVINE iftrue .LoadFight1 .LoadFight0 - loadtrainer SCHOOLBOY, ALAN1 + scriptedtrainerdata SCHOOLBOY, ALAN1 startbattle returnafterbattle loadvar wAlanFightCount, 1 @@ -222,7 +233,7 @@ UnknownScript_0x194140: end .LoadFight1 - loadtrainer SCHOOLBOY, ALAN2 + scriptedtrainerdata SCHOOLBOY, ALAN2 startbattle returnafterbattle loadvar wAlanFightCount, 2 @@ -230,7 +241,7 @@ UnknownScript_0x194140: end .LoadFight2 - loadtrainer SCHOOLBOY, ALAN3 + scriptedtrainerdata SCHOOLBOY, ALAN3 startbattle returnafterbattle loadvar wAlanFightCount, 3 @@ -238,7 +249,7 @@ UnknownScript_0x194140: end .LoadFight3 - loadtrainer SCHOOLBOY, ALAN4 + scriptedtrainerdata SCHOOLBOY, ALAN4 startbattle returnafterbattle loadvar wAlanFightCount, 4 @@ -246,7 +257,7 @@ UnknownScript_0x194140: end .LoadFight4 - loadtrainer SCHOOLBOY, ALAN5 + scriptedtrainerdata SCHOOLBOY, ALAN5 startbattle returnafterbattle clearflag ENGINE_ALAN @@ -303,11 +314,11 @@ TrainerPsychicMark: trainer EVENT_BEAT_PSYCHIC_MARK, PSYCHIC_T, MARK, PsychicMarkSeenText, PsychicMarkBeatenText, 0, PsychicMarkScript PsychicMarkScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19471e + waitbutton closetext - loadmovesprites end ArthurScript: @@ -329,21 +340,21 @@ ArthurScript: iffalse ArthurDoneScript setevent EVENT_GOT_HARD_STONE_FROM_ARTHUR writetext ArthurGaveGiftText + waitbutton closetext - loadmovesprites end ArthurThursdayScript: writetext ArthurThursdayText - closetext + waitbutton ArthurDoneScript: - loadmovesprites + closetext end ArthurNotThursdayScript: writetext ArthurNotThursdayText + waitbutton closetext - loadmovesprites end MapRoute36Signpost2Script: diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index 03c8c2474..199e424f3 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -1,3 +1,17 @@ +const_value set 2 + const ROUTE36NATIONALPARKGATE_OFFICER1 + const ROUTE36NATIONALPARKGATE_YOUNGSTER1 + const ROUTE36NATIONALPARKGATE_YOUNGSTER2 + const ROUTE36NATIONALPARKGATE_ROCKER + const ROUTE36NATIONALPARKGATE_POKEFAN_M + const ROUTE36NATIONALPARKGATE_YOUNGSTER3 + const ROUTE36NATIONALPARKGATE_YOUNGSTER4 + const ROUTE36NATIONALPARKGATE_LASS + const ROUTE36NATIONALPARKGATE_YOUNGSTER5 + const ROUTE36NATIONALPARKGATE_YOUNGSTER6 + const ROUTE36NATIONALPARKGATE_YOUNGSTER7 + const ROUTE36NATIONALPARKGATE_OFFICER2 + Route36NationalParkgate_MapScriptHeader: .MapTriggers: db 3 @@ -45,13 +59,13 @@ Route36NationalParkgate_MapScriptHeader: if_equal SATURDAY, .SetContestOfficer checkflag ENGINE_BUG_CONTEST_TIMER iftrue .SetContestOfficer - disappear $2 - appear $d + disappear ROUTE36NATIONALPARKGATE_OFFICER1 + appear ROUTE36NATIONALPARKGATE_OFFICER2 return .SetContestOfficer: - appear $2 - disappear $d + appear ROUTE36NATIONALPARKGATE_OFFICER1 + disappear ROUTE36NATIONALPARKGATE_OFFICER2 .Return: return @@ -65,13 +79,13 @@ Route36NationalParkgate_MapScriptHeader: yesorno iffalse .GoBackToContest writetext UnknownText_0x6b2c5 + waitbutton closetext - loadmovesprites special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes scall .CopyContestants - disappear $2 - appear $d + disappear ROUTE36NATIONALPARKGATE_OFFICER1 + appear ROUTE36NATIONALPARKGATE_OFFICER2 applymovement PLAYER, MovementData_0x6add1 pause 15 special Special_FadeInQuickly @@ -79,55 +93,55 @@ Route36NationalParkgate_MapScriptHeader: .GoBackToContest: writetext UnknownText_0x6b300 + waitbutton closetext - loadmovesprites spriteface PLAYER, LEFT playsound SFX_EXIT_BUILDING special FadeOutPalettes - waitbutton + waitsfx warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12 end .CopyContestants: checkevent EVENT_BUG_CATCHING_CONTESTANT_1A iftrue .Not1 - appear $3 + appear ROUTE36NATIONALPARKGATE_YOUNGSTER1 .Not1: checkevent EVENT_BUG_CATCHING_CONTESTANT_2A iftrue .Not2 - appear $4 + appear ROUTE36NATIONALPARKGATE_YOUNGSTER2 .Not2: checkevent EVENT_BUG_CATCHING_CONTESTANT_3A iftrue .Not3 - appear $5 + appear ROUTE36NATIONALPARKGATE_ROCKER .Not3: checkevent EVENT_BUG_CATCHING_CONTESTANT_4A iftrue .Not4 - appear $6 + appear ROUTE36NATIONALPARKGATE_POKEFAN_M .Not4: checkevent EVENT_BUG_CATCHING_CONTESTANT_5A iftrue .Not5 - appear $7 + appear ROUTE36NATIONALPARKGATE_YOUNGSTER3 .Not5: checkevent EVENT_BUG_CATCHING_CONTESTANT_6A iftrue .Not6 - appear $8 + appear ROUTE36NATIONALPARKGATE_YOUNGSTER4 .Not6: checkevent EVENT_BUG_CATCHING_CONTESTANT_7A iftrue .Not7 - appear $9 + appear ROUTE36NATIONALPARKGATE_LASS .Not7: checkevent EVENT_BUG_CATCHING_CONTESTANT_8A iftrue .Not8 - appear $a + appear ROUTE36NATIONALPARKGATE_YOUNGSTER5 .Not8: checkevent EVENT_BUG_CATCHING_CONTESTANT_9A iftrue .Not9 - appear $b + appear ROUTE36NATIONALPARKGATE_YOUNGSTER6 .Not9: checkevent EVENT_BUG_CATCHING_CONTESTANT_10A iftrue .Not10 - appear $c + appear ROUTE36NATIONALPARKGATE_YOUNGSTER7 .Not10: special UpdateSprites end @@ -155,19 +169,19 @@ Route36OfficerScriptContest: special PlayMapMusic writetext UnknownText_0x6ae87 keeptextopen - waitbutton + waitsfx writetext UnknownText_0x6aeb1 playsound SFX_ITEM - waitbutton + waitsfx writetext UnknownText_0x6aecc + waitbutton closetext - loadmovesprites setflag ENGINE_BUG_CONTEST_TIMER special Special_GiveParkBalls spriteface PLAYER, LEFT playsound SFX_EXIT_BUILDING special FadeOutPalettes - waitbutton + waitsfx special Special_SelectRandomBugContestContestants warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12 end @@ -190,38 +204,38 @@ Route36OfficerScriptContest: keeptextopen writetext UnknownText_0x6b055 playsound SFX_GOT_SAFARI_BALLS - waitbutton + waitsfx keeptextopen jump .ResumeStartingContest .DecidedNotToJoinContest: writetext UnknownText_0x6b0c6 + waitbutton closetext - loadmovesprites end .RefusedToLeaveMons: writetext UnknownText_0x6b081 + waitbutton closetext - loadmovesprites end .FirstMonIsFainted: writetext UnknownText_0x6b0f2 + waitbutton closetext - loadmovesprites end .BoxFull: writetext UnknownText_0x6b166 + waitbutton closetext - loadmovesprites end .FirstMonIsEgg: writetext UnknownText_0x6b209 + waitbutton closetext - loadmovesprites end Route36Officer_ContestHasConcluded: @@ -234,8 +248,8 @@ Route36Officer_ContestHasConcluded: checkevent EVENT_CONTEST_OFFICER_HAS_BERRY iftrue .Berry writetext UnknownText_0x6b32b + waitbutton closetext - loadmovesprites end .Sunstone: @@ -244,7 +258,7 @@ Route36Officer_ContestHasConcluded: verbosegiveitem SUN_STONE iffalse .BagFull clearevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE - loadmovesprites + closetext end .Everstone: @@ -253,7 +267,7 @@ Route36Officer_ContestHasConcluded: verbosegiveitem EVERSTONE iffalse .BagFull clearevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE - loadmovesprites + closetext end .GoldBerry: @@ -262,7 +276,7 @@ Route36Officer_ContestHasConcluded: verbosegiveitem GOLD_BERRY iffalse .BagFull clearevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY - loadmovesprites + closetext end .Berry: @@ -271,13 +285,13 @@ Route36Officer_ContestHasConcluded: verbosegiveitem BERRY iffalse .BagFull clearevent EVENT_CONTEST_OFFICER_HAS_BERRY - loadmovesprites + closetext end .BagFull: writetext UnknownText_0x6b910 + waitbutton closetext - loadmovesprites end _ContestNotOn: @@ -289,8 +303,8 @@ OfficerScript_0x6acf4: checkflag ENGINE_DAILY_BUG_CONTEST iftrue Route36Officer_ContestHasConcluded writetext UnknownText_0x6b370 + waitbutton closetext - loadmovesprites end Route36Parkgate_DayToText: @@ -303,14 +317,14 @@ YoungsterScript_0x6ad06: checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad14 writetext UnknownText_0x6b399 + waitbutton closetext - loadmovesprites end UnknownScript_0x6ad14: writetext UnknownText_0x6b3c4 + waitbutton closetext - loadmovesprites end YoungsterScript_0x6ad1a: @@ -319,14 +333,14 @@ YoungsterScript_0x6ad1a: checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad28 writetext UnknownText_0x6b40f + waitbutton closetext - loadmovesprites end UnknownScript_0x6ad28: writetext UnknownText_0x6b440 + waitbutton closetext - loadmovesprites end RockerScript_0x6ad2e: @@ -335,14 +349,14 @@ RockerScript_0x6ad2e: checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad3c writetext UnknownText_0x6b462 + waitbutton closetext - loadmovesprites end UnknownScript_0x6ad3c: writetext UnknownText_0x6b496 + waitbutton closetext - loadmovesprites end PokefanMScript_0x6ad42: @@ -351,14 +365,14 @@ PokefanMScript_0x6ad42: checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad50 writetext UnknownText_0x6b4da + waitbutton closetext - loadmovesprites end UnknownScript_0x6ad50: writetext UnknownText_0x6b50a + waitbutton closetext - loadmovesprites end YoungsterScript_0x6ad56: @@ -367,14 +381,14 @@ YoungsterScript_0x6ad56: checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad64 writetext UnknownText_0x6b54e + waitbutton closetext - loadmovesprites end UnknownScript_0x6ad64: writetext UnknownText_0x6b57c + waitbutton closetext - loadmovesprites end YoungsterScript_0x6ad6a: @@ -383,14 +397,14 @@ YoungsterScript_0x6ad6a: checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad78 writetext UnknownText_0x6b5b0 + waitbutton closetext - loadmovesprites end UnknownScript_0x6ad78: writetext UnknownText_0x6b5dd + waitbutton closetext - loadmovesprites end LassScript_0x6ad7e: @@ -399,14 +413,14 @@ LassScript_0x6ad7e: checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad8c writetext UnknownText_0x6b64b + waitbutton closetext - loadmovesprites end UnknownScript_0x6ad8c: writetext UnknownText_0x6b698 + waitbutton closetext - loadmovesprites end YoungsterScript_0x6ad92: @@ -415,14 +429,14 @@ YoungsterScript_0x6ad92: checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ada0 writetext UnknownText_0x6b6b8 + waitbutton closetext - loadmovesprites end UnknownScript_0x6ada0: writetext UnknownText_0x6b6e9 + waitbutton closetext - loadmovesprites end YoungsterScript_0x6ada6: @@ -431,14 +445,14 @@ YoungsterScript_0x6ada6: checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6adb4 writetext UnknownText_0x6b71b + waitbutton closetext - loadmovesprites end UnknownScript_0x6adb4: writetext UnknownText_0x6b740 + waitbutton closetext - loadmovesprites end YoungsterScript_0x6adba: @@ -447,14 +461,14 @@ YoungsterScript_0x6adba: checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6adc8 writetext UnknownText_0x6b76f + waitbutton closetext - loadmovesprites end UnknownScript_0x6adc8: writetext UnknownText_0x6b7af + waitbutton closetext - loadmovesprites end UnknownScript_0x6adce: diff --git a/maps/Route36RuinsofAlphgate.asm b/maps/Route36RuinsofAlphgate.asm index b24097c80..88ba737f4 100644 --- a/maps/Route36RuinsofAlphgate.asm +++ b/maps/Route36RuinsofAlphgate.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ROUTE36RUINSOFALPHGATE_OFFICER + const ROUTE36RUINSOFALPHGATE_GRAMPS + Route36RuinsofAlphgate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route37.asm b/maps/Route37.asm index 47a5d5bda..5e0853607 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -1,3 +1,12 @@ +const_value set 2 + const ROUTE37_WEIRD_TREE1 + const ROUTE37_WEIRD_TREE2 + const ROUTE37_YOUNGSTER + const ROUTE37_FRUIT_TREE1 + const ROUTE37_BUG_CATCHER + const ROUTE37_FRUIT_TREE2 + const ROUTE37_FRUIT_TREE3 + Route37_MapScriptHeader: .MapTriggers: db 0 @@ -12,44 +21,44 @@ Route37_MapScriptHeader: SunnyCallback: checkcode VAR_WEEKDAY if_equal SUNDAY, .SunnyAppears - disappear $6 + disappear ROUTE37_BUG_CATCHER return .SunnyAppears - appear $6 + appear ROUTE37_BUG_CATCHER return TrainerTwinsAnnandanne1: trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE1, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, TwinsAnnandanne1Script TwinsAnnandanne1Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a8e62 + waitbutton closetext - loadmovesprites end TrainerTwinsAnnandanne2: trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE2, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, 0, TwinsAnnandanne2Script TwinsAnnandanne2Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a8eec + waitbutton closetext - loadmovesprites end TrainerPsychicGreg: trainer EVENT_BEAT_PSYCHIC_GREG, PSYCHIC_T, GREG, PsychicGregSeenText, PsychicGregBeatenText, 0, PsychicGregScript PsychicGregScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a8f80 + waitbutton closetext - loadmovesprites end SunnyScript: @@ -78,21 +87,21 @@ SunnyScript: iffalse SunnyDoneScript setevent EVENT_GOT_MAGNET_FROM_SUNNY writetext SunnyGaveGiftText + waitbutton closetext - loadmovesprites end SunnySundayScript: writetext SunnySundayText - closetext + waitbutton SunnyDoneScript: - loadmovesprites + closetext end SunnyNotSundayScript: writetext SunnyNotSundayText + waitbutton closetext - loadmovesprites end MapRoute37Signpost0Script: diff --git a/maps/Route38.asm b/maps/Route38.asm index bf5bacf48..d9c0e1dc9 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -1,3 +1,12 @@ +const_value set 2 + const ROUTE38_STANDING_YOUNGSTER1 + const ROUTE38_LASS + const ROUTE38_STANDING_YOUNGSTER2 + const ROUTE38_BUENA1 + const ROUTE38_SAILOR + const ROUTE38_FRUIT_TREE + const ROUTE38_BUENA2 + Route38_MapScriptHeader: .MapTriggers: db 0 @@ -9,22 +18,22 @@ TrainerBird_keeperToby: trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, 0, .script .script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a1f86 + waitbutton closetext - loadmovesprites end TrainerSailorHarry: trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .script .script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a220c + waitbutton closetext - loadmovesprites end TrainerLassDana1: @@ -32,7 +41,7 @@ TrainerLassDana1: .script: writecode VAR_CALLERID, PHONE_LASS_DANA - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_DANA iftrue .DanaRematch @@ -80,7 +89,7 @@ TrainerLassDana1: checkflag ENGINE_FLYPOINT_CIANWOOD iftrue .LoadFight1 .LoadFight0 - loadtrainer LASS, DANA1 + scriptedtrainerdata LASS, DANA1 startbattle returnafterbattle loadvar wDanaFightCount, 1 @@ -88,7 +97,7 @@ TrainerLassDana1: end .LoadFight1 - loadtrainer LASS, DANA2 + scriptedtrainerdata LASS, DANA2 startbattle returnafterbattle loadvar wDanaFightCount, 2 @@ -96,7 +105,7 @@ TrainerLassDana1: end .LoadFight2 - loadtrainer LASS, DANA3 + scriptedtrainerdata LASS, DANA3 startbattle returnafterbattle loadvar wDanaFightCount, 3 @@ -104,7 +113,7 @@ TrainerLassDana1: end .LoadFight3 - loadtrainer LASS, DANA4 + scriptedtrainerdata LASS, DANA4 startbattle returnafterbattle loadvar wDanaFightCount, 4 @@ -112,7 +121,7 @@ TrainerLassDana1: end .LoadFight4 - loadtrainer LASS, DANA5 + scriptedtrainerdata LASS, DANA5 startbattle returnafterbattle clearflag ENGINE_DANA @@ -170,7 +179,7 @@ TrainerSchoolboyChad1: .script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_CHAD iftrue .ChadRematch @@ -216,7 +225,7 @@ TrainerSchoolboyChad1: checkflag ENGINE_FLYPOINT_MAHOGANY iftrue .LoadFight1 .LoadFight0 - loadtrainer SCHOOLBOY, CHAD1 + scriptedtrainerdata SCHOOLBOY, CHAD1 startbattle returnafterbattle loadvar wChadFightCount, 1 @@ -224,7 +233,7 @@ TrainerSchoolboyChad1: end .LoadFight1 - loadtrainer SCHOOLBOY, CHAD2 + scriptedtrainerdata SCHOOLBOY, CHAD2 startbattle returnafterbattle loadvar wChadFightCount, 2 @@ -232,7 +241,7 @@ TrainerSchoolboyChad1: end .LoadFight2 - loadtrainer SCHOOLBOY, CHAD3 + scriptedtrainerdata SCHOOLBOY, CHAD3 startbattle returnafterbattle loadvar wChadFightCount, 3 @@ -240,7 +249,7 @@ TrainerSchoolboyChad1: end .LoadFight3 - loadtrainer SCHOOLBOY, CHAD4 + scriptedtrainerdata SCHOOLBOY, CHAD4 startbattle returnafterbattle loadvar wChadFightCount, 4 @@ -248,7 +257,7 @@ TrainerSchoolboyChad1: end .LoadFight4 - loadtrainer SCHOOLBOY, CHAD5 + scriptedtrainerdata SCHOOLBOY, CHAD5 startbattle returnafterbattle clearflag ENGINE_CHAD @@ -286,22 +295,22 @@ TrainerBeautyValerie: trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .script .script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a2185 + waitbutton closetext - loadmovesprites end TrainerBeautyOlivia: trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .script .script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a229a + waitbutton closetext - loadmovesprites end MapRoute38Signpost0Script: diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index afeb6000c..7e376b413 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE38ECRUTEAKGATE_OFFICER + Route38EcruteakGate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route39.asm b/maps/Route39.asm index 515314981..e365c1119 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -1,3 +1,15 @@ +const_value set 2 + const ROUTE39_SAILOR + const ROUTE39_POKEFAN_M + const ROUTE39_POKEFAN_F1 + const ROUTE39_TAUROS1 + const ROUTE39_TAUROS2 + const ROUTE39_TAUROS3 + const ROUTE39_TAUROS4 + const ROUTE39_STANDING_YOUNGSTER + const ROUTE39_FRUIT_TREE + const ROUTE39_POKEFAN_F2 + Route39_MapScriptHeader: .MapTriggers: db 0 @@ -9,8 +21,8 @@ TaurosScript_0x1a5af5: loadfont writetext UnknownText_0x1a5bf9 cry MILTANK + waitbutton closetext - loadmovesprites end TrainerPokefanmDerek1: @@ -18,7 +30,7 @@ TrainerPokefanmDerek1: PokefanmDerek1Script: writecode VAR_CALLERID, PHONE_POKEFANM_DEREK - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_DEREK_HAS_NUGGET iftrue UnknownScript_0x1a5b4a @@ -56,8 +68,8 @@ UnknownScript_0x1a5b59: UnknownScript_0x1a5b5c: writetext UnknownText_0x1a5dec + waitbutton closetext - loadmovesprites end UnknownScript_0x1a5b62: @@ -96,33 +108,33 @@ TrainerPokefanfRuth: trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, PokefanfRuthScript PokefanfRuthScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a5db2 + waitbutton closetext - loadmovesprites end TrainerSailorEugene: trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, SailorEugeneScript SailorEugeneScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a5c4d + waitbutton closetext - loadmovesprites end TrainerPsychicNorman: trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, PsychicNormanScript PsychicNormanScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a5e57 + waitbutton closetext - loadmovesprites end PokefanFScript_0x1a5bbe: @@ -133,26 +145,26 @@ PokefanFScript_0x1a5bbe: checkevent EVENT_BEAT_POKEFANF_JAIME iftrue UnknownScript_0x1a5bdf writetext UnknownText_0x1a5ee8 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x1a5f17, 0 - loadtrainer POKEFANF, JAIME + scriptedtrainerdata POKEFANF, JAIME startbattle returnafterbattle setevent EVENT_BEAT_POKEFANF_JAIME - loadmovesprites + closetext end UnknownScript_0x1a5bdf: writetext UnknownText_0x1a5f31 + waitbutton closetext - loadmovesprites end UnknownScript_0x1a5be5: writetext UnknownText_0x1a5ec4 + waitbutton closetext - loadmovesprites end MapRoute39Signpost2Script: diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index d4574eac6..285f4f868 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE39BARN_TWIN1 + const ROUTE39BARN_TWIN2 + const ROUTE39BARN_TAUROS + Route39Barn_MapScriptHeader: .MapTriggers: db 0 @@ -11,16 +16,16 @@ TwinScript_0x9cc76: checkevent EVENT_HEALED_MOOMOO iftrue .FeedingMooMoo writetext Text_MoomooIsSick + waitbutton closetext - loadmovesprites - spriteface $2, RIGHT + spriteface ROUTE39BARN_TWIN1, RIGHT end .FeedingMooMoo: writetext Text_WereFeedingMoomoo + waitbutton closetext - loadmovesprites - spriteface $2, RIGHT + spriteface ROUTE39BARN_TWIN1, RIGHT end TwinScript_0x9cc90: @@ -29,16 +34,16 @@ TwinScript_0x9cc90: checkevent EVENT_HEALED_MOOMOO iftrue .FeedingMooMoo writetext Text_MoomooIsSick + waitbutton closetext - loadmovesprites - spriteface $3, LEFT + spriteface ROUTE39BARN_TWIN2, LEFT end .FeedingMooMoo: writetext Text_WereFeedingMoomoo + waitbutton closetext - loadmovesprites - spriteface $3, LEFT + spriteface ROUTE39BARN_TWIN2, LEFT end TaurosScript_0x9ccaa: @@ -52,8 +57,8 @@ TaurosScript_0x9ccaa: writetext Text_ItsCryIsWeak checkevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO iftrue .GiveBerry + waitbutton closetext - loadmovesprites end .GiveBerry: @@ -71,24 +76,24 @@ TaurosScript_0x9ccaa: if_equal 5, .FiveBerries if_equal 7, .SevenBerries writetext Text_GaveBerry + waitbutton closetext - loadmovesprites end .ThreeBerries: writetext Text_GaveBerry keeptextopen writetext Text_LittleHealthier + waitbutton closetext - loadmovesprites end .FiveBerries: writetext Text_GaveBerry keeptextopen writetext Text_QuiteHealthy + waitbutton closetext - loadmovesprites end .SevenBerries: @@ -98,28 +103,28 @@ TaurosScript_0x9ccaa: keeptextopen special RestartMapMusic writetext Text_TotallyHealthy + waitbutton closetext - loadmovesprites setevent EVENT_HEALED_MOOMOO end .NoBerriesInBag: writetext Text_NoBerries + waitbutton closetext - loadmovesprites end .Refused: writetext Text_RefusedToGiveBerry + waitbutton closetext - loadmovesprites end .HappyCow: writetext UnknownText_0x9cd92 cry MILTANK + waitbutton closetext - loadmovesprites end Text_MoomooIsSick: diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 6ca69ab49..7202925d7 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ROUTE39FARMHOUSE_POKEFAN_M + const ROUTE39FARMHOUSE_POKEFAN_F + Route39Farmhouse_MapScriptHeader: .MapTriggers: db 0 @@ -11,8 +15,8 @@ PokefanMScript_0x9ceb4: checkevent EVENT_HEALED_MOOMOO iftrue UnknownScript_0x9cec5 writetext UnknownText_0x9cf38 + waitbutton closetext - loadmovesprites setevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO end @@ -29,36 +33,36 @@ UnknownScript_0x9cec5: iffalse UnknownScript_0x9cefc takemoney $0, 500 special PlaceMoneyTopRightOW - waitbutton + waitsfx playsound SFX_TRANSACTION writetext UnknownText_0x9d05d keeptextopen itemnotify - loadmovesprites + closetext end UnknownScript_0x9cef6: writetext UnknownText_0x9d07c + waitbutton closetext - loadmovesprites end UnknownScript_0x9cefc: writetext UnknownText_0x9d09d + waitbutton closetext - loadmovesprites end UnknownScript_0x9cf02: writetext UnknownText_0x9d0b7 + waitbutton closetext - loadmovesprites end UnknownScript_0x9cf08: writetext UnknownText_0x9d0dc + waitbutton closetext - loadmovesprites end PokefanFScript_0x9cf0e: @@ -69,8 +73,8 @@ PokefanFScript_0x9cf0e: checkevent EVENT_HEALED_MOOMOO iftrue UnknownScript_0x9cf22 writetext UnknownText_0x9d0f6 + waitbutton closetext - loadmovesprites end UnknownScript_0x9cf22: @@ -81,9 +85,9 @@ UnknownScript_0x9cf22: setevent EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM UnknownScript_0x9cf2f: writetext UnknownText_0x9d1c7 - closetext + waitbutton UnknownScript_0x9cf33: - loadmovesprites + closetext end FarmhouseBookshelf: diff --git a/maps/Route4.asm b/maps/Route4.asm index 281c97f38..6bf7f276e 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -1,3 +1,9 @@ +const_value set 2 + const ROUTE4_YOUNGSTER + const ROUTE4_LASS1 + const ROUTE4_LASS2 + const ROUTE4_POKE_BALL + Route4_MapScriptHeader: .MapTriggers: db 0 @@ -9,33 +15,33 @@ TrainerBird_keeperHank: trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, Bird_keeperHankSeenText, Bird_keeperHankBeatenText, 0, Bird_keeperHankScript Bird_keeperHankScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ae258 + waitbutton closetext - loadmovesprites end TrainerPicnickerHope: trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, PicnickerHopeScript PicnickerHopeScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ae320 + waitbutton closetext - loadmovesprites end TrainerPicnickerSharon: trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, PicnickerSharonScript PicnickerSharonScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ae369 + waitbutton closetext - loadmovesprites end MapRoute4Signpost0Script: diff --git a/maps/Route40.asm b/maps/Route40.asm index d753be910..e9c7f61c0 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -1,3 +1,17 @@ +const_value set 2 + const ROUTE40_OLIVINE_RIVAL1 + const ROUTE40_OLIVINE_RIVAL2 + const ROUTE40_SWIMMER_GIRL1 + const ROUTE40_SWIMMER_GIRL2 + const ROUTE40_ROCK1 + const ROUTE40_ROCK2 + const ROUTE40_ROCK3 + const ROUTE40_LASS1 + const ROUTE40_BUENA + const ROUTE40_POKEFAN_M + const ROUTE40_LASS2 + const ROUTE40_STANDING_YOUNGSTER + Route40_MapScriptHeader: .MapTriggers: db 0 @@ -13,55 +27,55 @@ MonicaCallback: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR checkcode VAR_WEEKDAY if_equal MONDAY, .MonicaAppears - disappear $a + disappear ROUTE40_BUENA return .MonicaAppears - appear $a + appear ROUTE40_BUENA return TrainerSwimmerfElaine: trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, SwimmerfElaineScript SwimmerfElaineScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a637b + waitbutton closetext - loadmovesprites end TrainerSwimmerfPaula: trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, SwimmerfPaulaScript SwimmerfPaulaScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a63f5 + waitbutton closetext - loadmovesprites end TrainerSwimmermSimon: trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, SwimmermSimonScript SwimmermSimonScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a6282 + waitbutton closetext - loadmovesprites end TrainerSwimmermRandall: trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, SwimmermRandallScript SwimmermRandallScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a62fa + waitbutton closetext - loadmovesprites end LassScript_0x1a61c4: @@ -100,21 +114,21 @@ MonicaScript: iffalse MonicaDoneScript setevent EVENT_GOT_SHARP_BEAK_FROM_MONICA writetext MonicaGaveGiftText + waitbutton closetext - loadmovesprites end MonicaMondayScript: writetext MonicaMondayText - closetext + waitbutton MonicaDoneScript: - loadmovesprites + closetext end MonicaNotMondayScript: writetext MonicaNotMondayText + waitbutton closetext - loadmovesprites end MapRoute40Signpost0Script: diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index 9827690b3..ad98bb81e 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ROUTE40BATTLETOWERGATE_ROCKER + const ROUTE40BATTLETOWERGATE_TWIN + Route40BattleTowerGate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route41.asm b/maps/Route41.asm index 31ecded71..bf92dd50a 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -1,3 +1,15 @@ +const_value set 2 + const ROUTE41_OLIVINE_RIVAL1 + const ROUTE41_OLIVINE_RIVAL2 + const ROUTE41_OLIVINE_RIVAL3 + const ROUTE41_OLIVINE_RIVAL4 + const ROUTE41_OLIVINE_RIVAL5 + const ROUTE41_SWIMMER_GIRL1 + const ROUTE41_SWIMMER_GIRL2 + const ROUTE41_SWIMMER_GIRL3 + const ROUTE41_SWIMMER_GIRL4 + const ROUTE41_SWIMMER_GIRL5 + Route41_MapScriptHeader: .MapTriggers: db 0 @@ -9,110 +21,110 @@ TrainerSwimmerfKaylee: trainer EVENT_BEAT_SWIMMERF_KAYLEE, SWIMMERF, KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, SwimmerfKayleeScript SwimmerfKayleeScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a6c7f + waitbutton closetext - loadmovesprites end TrainerSwimmerfSusie: trainer EVENT_BEAT_SWIMMERF_SUSIE, SWIMMERF, SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, SwimmerfSusieScript SwimmerfSusieScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a6d11 + waitbutton closetext - loadmovesprites end TrainerSwimmerfDenise: trainer EVENT_BEAT_SWIMMERF_DENISE, SWIMMERF, DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, SwimmerfDeniseScript SwimmerfDeniseScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a6d79 + waitbutton closetext - loadmovesprites end TrainerSwimmerfKara: trainer EVENT_BEAT_SWIMMERF_KARA, SWIMMERF, KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, SwimmerfKaraScript SwimmerfKaraScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a6e58 + waitbutton closetext - loadmovesprites end TrainerSwimmerfWendy: trainer EVENT_BEAT_SWIMMERF_WENDY, SWIMMERF, WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, SwimmerfWendyScript SwimmerfWendyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a6ec2 + waitbutton closetext - loadmovesprites end TrainerSwimmermCharlie: trainer EVENT_BEAT_SWIMMERM_CHARLIE, SWIMMERM, CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, SwimmermCharlieScript SwimmermCharlieScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a696e + waitbutton closetext - loadmovesprites end TrainerSwimmermGeorge: trainer EVENT_BEAT_SWIMMERM_GEORGE, SWIMMERM, GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, SwimmermGeorgeScript SwimmermGeorgeScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a69d4 + waitbutton closetext - loadmovesprites end TrainerSwimmermBerke: trainer EVENT_BEAT_SWIMMERM_BERKE, SWIMMERM, BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, SwimmermBerkeScript SwimmermBerkeScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a6aa4 + waitbutton closetext - loadmovesprites end TrainerSwimmermKirk: trainer EVENT_BEAT_SWIMMERM_KIRK, SWIMMERM, KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, SwimmermKirkScript SwimmermKirkScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a6b6c + waitbutton closetext - loadmovesprites end TrainerSwimmermMathew: trainer EVENT_BEAT_SWIMMERM_MATHEW, SWIMMERM, MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, SwimmermMathewScript SwimmermMathewScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a6bed + waitbutton closetext - loadmovesprites end Route41Rock: diff --git a/maps/Route42.asm b/maps/Route42.asm index 327c7b88d..b330d88f8 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -1,3 +1,14 @@ +const_value set 2 + const ROUTE42_FISHER + const ROUTE42_POKEFAN_M + const ROUTE42_SUPER_NERD + const ROUTE42_FRUIT_TREE1 + const ROUTE42_FRUIT_TREE2 + const ROUTE42_FRUIT_TREE3 + const ROUTE42_POKE_BALL1 + const ROUTE42_POKE_BALL2 + const ROUTE42_SUICUNE + Route42_MapScriptHeader: .MapTriggers: db 2 @@ -19,8 +30,8 @@ UnknownScript_0x1a9218: showemote EMOTE_SHOCK, PLAYER, 15 pause 15 playsound SFX_WARP_FROM - applymovement $a, MovementData_0x1a9356 - disappear $a + applymovement ROUTE42_SUICUNE, MovementData_0x1a9356 + disappear ROUTE42_SUICUNE pause 10 dotrigger $0 clearevent EVENT_SAW_SUICUNE_ON_ROUTE_36 @@ -32,7 +43,7 @@ TrainerFisherTully1: FisherTully1Script: writecode VAR_CALLERID, PHONE_FISHER_TULLY - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_TULLY iftrue UnknownScript_0x1a927f @@ -76,7 +87,7 @@ UnknownScript_0x1a927f: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .LoadFight1 .LoadFight0 - loadtrainer FISHER, TULLY1 + scriptedtrainerdata FISHER, TULLY1 startbattle returnafterbattle loadvar wTullyFightCount, 1 @@ -84,7 +95,7 @@ UnknownScript_0x1a927f: end .LoadFight1 - loadtrainer FISHER, TULLY2 + scriptedtrainerdata FISHER, TULLY2 startbattle returnafterbattle loadvar wTullyFightCount, 2 @@ -92,7 +103,7 @@ UnknownScript_0x1a927f: end .LoadFight2 - loadtrainer FISHER, TULLY3 + scriptedtrainerdata FISHER, TULLY3 startbattle returnafterbattle loadvar wTullyFightCount, 3 @@ -100,7 +111,7 @@ UnknownScript_0x1a927f: end .LoadFight3 - loadtrainer FISHER, TULLY4 + scriptedtrainerdata FISHER, TULLY4 startbattle returnafterbattle clearflag ENGINE_TULLY @@ -157,22 +168,22 @@ TrainerPokemaniacShane: trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, PokemaniacShaneScript PokemaniacShaneScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a94d6 + waitbutton closetext - loadmovesprites end TrainerHikerBenjamin: trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, HikerBenjaminScript HikerBenjaminScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a943f + waitbutton closetext - loadmovesprites end MapRoute42Signpost0Script: diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index 773b7279d..df7927010 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE42ECRUTEAKGATE_OFFICER + Route42EcruteakGate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route43.asm b/maps/Route43.asm index 24e3a90ea..c03f5b227 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -1,3 +1,13 @@ +const_value set 2 + const ROUTE43_SUPER_NERD1 + const ROUTE43_SUPER_NERD2 + const ROUTE43_SUPER_NERD3 + const ROUTE43_FISHER + const ROUTE43_LASS + const ROUTE43_YOUNGSTER + const ROUTE43_FRUIT_TREE + const ROUTE43_POKE_BALL + Route43_MapScriptHeader: .MapTriggers: db 0 @@ -23,22 +33,22 @@ TrainerCamperSpencer: trainer EVENT_BEAT_CAMPER_SPENCER, CAMPER, SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, CamperSpencerScript CamperSpencerScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19d57e + waitbutton closetext - loadmovesprites end TrainerPokemaniacBen: trainer EVENT_BEAT_POKEMANIAC_BEN, POKEMANIAC, BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, 0, PokemaniacBenScript PokemaniacBenScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19d2d2 + waitbutton closetext - loadmovesprites end TrainerPokemaniacBrent1: @@ -46,7 +56,7 @@ TrainerPokemaniacBrent1: PokemaniacBrent1Script: writecode VAR_CALLERID, PHONE_POKEMANIAC_BRENT - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_BRENT iftrue UnknownScript_0x19d0cf @@ -88,7 +98,7 @@ UnknownScript_0x19d0cf: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .LoadFight1 .LoadFight0 - loadtrainer POKEMANIAC, BRENT1 + scriptedtrainerdata POKEMANIAC, BRENT1 startbattle returnafterbattle loadvar wBrentFightCount, 1 @@ -96,7 +106,7 @@ UnknownScript_0x19d0cf: end .LoadFight1 - loadtrainer POKEMANIAC, BRENT2 + scriptedtrainerdata POKEMANIAC, BRENT2 startbattle returnafterbattle loadvar wBrentFightCount, 2 @@ -104,7 +114,7 @@ UnknownScript_0x19d0cf: end .LoadFight2 - loadtrainer POKEMANIAC, BRENT3 + scriptedtrainerdata POKEMANIAC, BRENT3 startbattle returnafterbattle loadvar wBrentFightCount, 3 @@ -112,7 +122,7 @@ UnknownScript_0x19d0cf: end .LoadFight3 - loadtrainer POKEMANIAC, BRENT4 + scriptedtrainerdata POKEMANIAC, BRENT4 startbattle returnafterbattle clearflag ENGINE_BRENT @@ -150,22 +160,22 @@ TrainerPokemaniacRon: trainer EVENT_BEAT_POKEMANIAC_RON, POKEMANIAC, RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, 0, PokemaniacRonScript PokemaniacRonScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19d3f8 + waitbutton closetext - loadmovesprites end TrainerFisherMarvin: trainer EVENT_BEAT_FISHER_MARVIN, FISHER, MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, 0, FisherMarvinScript FisherMarvinScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19d4d3 + waitbutton closetext - loadmovesprites end TrainerPicnickerTiffany3: @@ -173,7 +183,7 @@ TrainerPicnickerTiffany3: PicnickerTiffany3Script: writecode VAR_CALLERID, PHONE_PICNICKER_TIFFANY - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_TIFFANY iftrue UnknownScript_0x19d1c1 @@ -219,7 +229,7 @@ UnknownScript_0x19d1c1: checkevent EVENT_CLEARED_RADIO_TOWER iftrue .LoadFight1 .LoadFight0 - loadtrainer PICNICKER, TIFFANY3 + scriptedtrainerdata PICNICKER, TIFFANY3 startbattle returnafterbattle loadvar wTiffanyFightCount, 1 @@ -227,7 +237,7 @@ UnknownScript_0x19d1c1: end .LoadFight1 - loadtrainer PICNICKER, TIFFANY1 + scriptedtrainerdata PICNICKER, TIFFANY1 startbattle returnafterbattle loadvar wTiffanyFightCount, 2 @@ -235,7 +245,7 @@ UnknownScript_0x19d1c1: end .LoadFight2 - loadtrainer PICNICKER, TIFFANY2 + scriptedtrainerdata PICNICKER, TIFFANY2 startbattle returnafterbattle loadvar wTiffanyFightCount, 3 @@ -243,7 +253,7 @@ UnknownScript_0x19d1c1: end .LoadFight3 - loadtrainer PICNICKER, TIFFANY4 + scriptedtrainerdata PICNICKER, TIFFANY4 startbattle returnafterbattle clearflag ENGINE_TIFFANY @@ -262,8 +272,8 @@ UnknownScript_0x19d230: UnknownScript_0x19d233: writetext UnknownText_0x19d64b + waitbutton closetext - loadmovesprites end UnknownScript_0x19d239: diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index c4fafdf81..2702e9fcb 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE43GATE_OFFICER + const ROUTE43GATE_ROCKET1 + const ROUTE43GATE_ROCKET2 + Route43Gate_MapScriptHeader: .MapTriggers: db 2 @@ -33,18 +38,18 @@ UnknownScript_0x19abd5: UnknownScript_0x19abda: playmusic MUSIC_ROCKET_ENCOUNTER checkcode VAR_FACING - if_equal $0, UnknownScript_0x19abea - if_equal $1, UnknownScript_0x19ac38 + if_equal DOWN, UnknownScript_0x19abea + if_equal UP, UnknownScript_0x19ac38 dotrigger $1 end UnknownScript_0x19abea: applymovement PLAYER, MovementData_0x19aca2 - showemote EMOTE_SHOCK, $4, 15 - applymovement $4, MovementData_0x19acbb - spriteface $3, UP - showemote EMOTE_SHOCK, $3, 15 - applymovement $3, MovementData_0x19aca4 + showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET2, 15 + applymovement ROUTE43GATE_ROCKET2, MovementData_0x19acbb + spriteface ROUTE43GATE_ROCKET1, UP + showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET1, 15 + applymovement ROUTE43GATE_ROCKET1, MovementData_0x19aca4 loadfont writetext UnknownText_0x19acd2 keeptextopen @@ -64,19 +69,19 @@ UnknownScript_0x19ac1d: UnknownScript_0x19ac28: keeptextopen - loadmovesprites - applymovement $3, MovementData_0x19acaa - applymovement $4, MovementData_0x19acc1 + closetext + applymovement ROUTE43GATE_ROCKET1, MovementData_0x19acaa + applymovement ROUTE43GATE_ROCKET2, MovementData_0x19acc1 dotrigger $1 special RestartMapMusic end UnknownScript_0x19ac38: - showemote EMOTE_SHOCK, $3, 15 - applymovement $3, MovementData_0x19acaf - spriteface $4, DOWN - showemote EMOTE_SHOCK, $4, 15 - applymovement $4, MovementData_0x19acc7 + showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET1, 15 + applymovement ROUTE43GATE_ROCKET1, MovementData_0x19acaf + spriteface ROUTE43GATE_ROCKET2, DOWN + showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET2, 15 + applymovement ROUTE43GATE_ROCKET2, MovementData_0x19acc7 loadfont writetext UnknownText_0x19acd2 keeptextopen @@ -96,9 +101,9 @@ UnknownScript_0x19ac67: UnknownScript_0x19ac72: keeptextopen - loadmovesprites - applymovement $4, MovementData_0x19accd - applymovement $3, MovementData_0x19acb5 + closetext + applymovement ROUTE43GATE_ROCKET2, MovementData_0x19accd + applymovement ROUTE43GATE_ROCKET1, MovementData_0x19acb5 dotrigger $1 special RestartMapMusic end @@ -116,14 +121,14 @@ OfficerScript_0x19ac85: verbosegiveitem TM_SLUDGE_BOMB iffalse UnknownScript_0x19aca0 setevent EVENT_GOT_TM36_SLUDGE_BOMB - loadmovesprites + closetext end UnknownScript_0x19ac9c: writetext UnknownText_0x19ae2d - closetext + waitbutton UnknownScript_0x19aca0: - loadmovesprites + closetext end MovementData_0x19aca2: diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index e3f750a44..a0d4d4ea8 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE43MAHOGANYGATE_OFFICER + Route43MahoganyGate_MapScriptHeader: .MapTriggers: db 0 @@ -11,14 +14,14 @@ OfficerScript_0x19ab0b: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19ab19 writetext UnknownText_0x19ab1f + waitbutton closetext - loadmovesprites end UnknownScript_0x19ab19: writetext UnknownText_0x19ab65 + waitbutton closetext - loadmovesprites end UnknownText_0x19ab1f: diff --git a/maps/Route44.asm b/maps/Route44.asm index 0692d8c71..7c4041726 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -1,3 +1,16 @@ +const_value set 2 + const ROUTE44_FISHER1 + const ROUTE44_FISHER2 + const ROUTE44_YOUNGSTER1 + const ROUTE44_SUPER_NERD + const ROUTE44_YOUNGSTER2 + const ROUTE44_COOLTRAINER_M + const ROUTE44_COOLTRAINER_F + const ROUTE44_FRUIT_TREE + const ROUTE44_POKE_BALL1 + const ROUTE44_POKE_BALL2 + const ROUTE44_POKE_BALL3 + Route44_MapScriptHeader: .MapTriggers: db 0 @@ -10,7 +23,7 @@ TrainerBird_keeperVance1: Bird_keeperVance1Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_VANCE iftrue UnknownScript_0x19d86a @@ -48,7 +61,7 @@ UnknownScript_0x19d86a: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight1 .LoadFight0 - loadtrainer BIRD_KEEPER, VANCE1 + scriptedtrainerdata BIRD_KEEPER, VANCE1 startbattle returnafterbattle loadvar wVanceFightCount, 1 @@ -56,7 +69,7 @@ UnknownScript_0x19d86a: end .LoadFight1 - loadtrainer BIRD_KEEPER, VANCE2 + scriptedtrainerdata BIRD_KEEPER, VANCE2 startbattle returnafterbattle loadvar wVanceFightCount, 2 @@ -64,7 +77,7 @@ UnknownScript_0x19d86a: end .LoadFight2 - loadtrainer BIRD_KEEPER, VANCE3 + scriptedtrainerdata BIRD_KEEPER, VANCE3 startbattle returnafterbattle clearflag ENGINE_VANCE @@ -84,7 +97,7 @@ UnknownScript_0x19d8ca: UnknownScript_0x19d8cb: loadfont writetext UnknownText_0x19dc67 - closetext + waitbutton verbosegiveitem CARBOS iffalse UnknownScript_0x19d903 clearevent EVENT_VANCE_CARBOS @@ -140,11 +153,11 @@ TrainerPsychicPhil: trainer EVENT_BEAT_PSYCHIC_PHIL, PSYCHIC_T, PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, PsychicPhilScript PsychicPhilScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19dcfc + waitbutton closetext - loadmovesprites end TrainerFisherWilton1: @@ -152,7 +165,7 @@ TrainerFisherWilton1: FisherWilton1Script: writecode VAR_CALLERID, PHONE_FISHER_WILTON - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_WILTON iftrue UnknownScript_0x19d96e @@ -192,7 +205,7 @@ UnknownScript_0x19d96e: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight1 .LoadFight0 - loadtrainer FISHER, WILTON1 + scriptedtrainerdata FISHER, WILTON1 startbattle returnafterbattle loadvar wWiltonFightCount, 1 @@ -200,7 +213,7 @@ UnknownScript_0x19d96e: end .LoadFight1 - loadtrainer FISHER, WILTON2 + scriptedtrainerdata FISHER, WILTON2 startbattle returnafterbattle loadvar wWiltonFightCount, 2 @@ -208,7 +221,7 @@ UnknownScript_0x19d96e: end .LoadFight2 - loadtrainer FISHER, WILTON3 + scriptedtrainerdata FISHER, WILTON3 startbattle returnafterbattle clearflag ENGINE_WILTON @@ -246,44 +259,44 @@ TrainerFisherEdgar: trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, FisherEdgarScript FisherEdgarScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19db6f + waitbutton closetext - loadmovesprites end TrainerCooltrainerfCybil: trainer EVENT_BEAT_COOLTRAINERF_CYBIL, COOLTRAINERF, CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, CooltrainerfCybilScript CooltrainerfCybilScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19df4d + waitbutton closetext - loadmovesprites end TrainerPokemaniacZach: trainer EVENT_BEAT_POKEMANIAC_ZACH, POKEMANIAC, ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, PokemaniacZachScript PokemaniacZachScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19dd7e + waitbutton closetext - loadmovesprites end TrainerCooltrainermAllen: trainer EVENT_BEAT_COOLTRAINERM_ALLEN, COOLTRAINERM, ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, CooltrainermAllenScript CooltrainermAllenScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19de66 + waitbutton closetext - loadmovesprites end MapRoute44Signpost0Script: diff --git a/maps/Route45.asm b/maps/Route45.asm index bab4302a5..6525ff9ed 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -1,3 +1,18 @@ +const_value set 2 + const ROUTE45_POKEFAN_M1 + const ROUTE45_POKEFAN_M2 + const ROUTE45_POKEFAN_M3 + const ROUTE45_POKEFAN_M4 + const ROUTE45_BLACK_BELT + const ROUTE45_COOLTRAINER_M + const ROUTE45_COOLTRAINER_F + const ROUTE45_FRUIT_TREE + const ROUTE45_POKE_BALL1 + const ROUTE45_POKE_BALL2 + const ROUTE45_POKE_BALL3 + const ROUTE45_POKE_BALL4 + const ROUTE45_YOUNGSTER + Route45_MapScriptHeader: .MapTriggers: db 0 @@ -10,7 +25,7 @@ TrainerBlackbeltKenji: BlackbeltKenji3Script: writecode VAR_CALLERID, PHONE_BLACKBELT_KENJI - talkaftercancel + end_if_just_battled loadfont checkcellnum PHONE_BLACKBELT_KENJI iftrue UnknownScript_0x19e0e4 @@ -18,7 +33,7 @@ BlackbeltKenji3Script: iftrue UnknownScript_0x19e0cd special Special_SampleKenjiBreakCountdown writetext UnknownText_0x19e5e2 - closetext + waitbutton setevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER scall UnknownScript_0x19e11b jump UnknownScript_0x19e0d0 @@ -51,14 +66,14 @@ UnknownScript_0x19e0e4: UnknownScript_0x19e10c: writetext UnknownText_0x19e634 + waitbutton closetext - loadmovesprites end UnknownScript_0x19e112: writetext UnknownText_0x19e66c + waitbutton closetext - loadmovesprites end UnknownScript_0x19e118: @@ -113,22 +128,22 @@ TrainerHikerErik: trainer EVENT_BEAT_HIKER_ERIK, HIKER, ERIK, HikerErikSeenText, HikerErikBeatenText, 0, HikerErikScript HikerErikScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19e301 + waitbutton closetext - loadmovesprites end TrainerHikerMichael: trainer EVENT_BEAT_HIKER_MICHAEL, HIKER, MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, HikerMichaelScript HikerMichaelScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19e3b1 + waitbutton closetext - loadmovesprites end TrainerHikerParry: @@ -136,7 +151,7 @@ TrainerHikerParry: HikerParry3Script: writecode VAR_CALLERID, PHONE_HIKER_PARRY - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_PARRY iftrue UnknownScript_0x19e1b8 @@ -174,7 +189,7 @@ UnknownScript_0x19e1b8: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight1 .LoadFight0 - loadtrainer HIKER, PARRY3 + scriptedtrainerdata HIKER, PARRY3 startbattle returnafterbattle loadvar wParryFightCount, 1 @@ -182,7 +197,7 @@ UnknownScript_0x19e1b8: end .LoadFight1 - loadtrainer HIKER, PARRY1 + scriptedtrainerdata HIKER, PARRY1 startbattle returnafterbattle loadvar wParryFightCount, 2 @@ -190,7 +205,7 @@ UnknownScript_0x19e1b8: end .LoadFight2 - loadtrainer HIKER, PARRY2 + scriptedtrainerdata HIKER, PARRY2 startbattle returnafterbattle clearflag ENGINE_PARRY @@ -210,7 +225,7 @@ UnknownScript_0x19e218: UnknownScript_0x19e219: loadfont writetext UnknownText_0x19e52c - closetext + waitbutton verbosegiveitem IRON iffalse UnknownScript_0x19e13f clearevent EVENT_PARRY_IRON @@ -221,33 +236,33 @@ TrainerHikerTimothy: trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, HikerTimothyScript HikerTimothyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19e4f1 + waitbutton closetext - loadmovesprites end TrainerCooltrainermRyan: trainer EVENT_BEAT_COOLTRAINERM_RYAN, COOLTRAINERM, RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, CooltrainermRyanScript CooltrainermRyanScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19e70d + waitbutton closetext - loadmovesprites end TrainerCooltrainerfKelly: trainer EVENT_BEAT_COOLTRAINERF_KELLY, COOLTRAINERF, KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, CooltrainerfKellyScript CooltrainerfKellyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19e7d1 + waitbutton closetext - loadmovesprites end YoungsterScript_0x19e269: @@ -256,26 +271,26 @@ YoungsterScript_0x19e269: checkevent EVENT_BEAT_CAMPER_QUENTIN iftrue UnknownScript_0x19e285 writetext UnknownText_0x19e87f + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x19e899, 0 - loadtrainer CAMPER, QUENTIN + scriptedtrainerdata CAMPER, QUENTIN startbattle returnafterbattle setevent EVENT_BEAT_CAMPER_QUENTIN - loadmovesprites + closetext end UnknownScript_0x19e285: writetext UnknownText_0x19e8bb + waitbutton closetext - loadmovesprites end UnknownScript_0x19e28b: writetext UnknownText_0x19e830 + waitbutton closetext - loadmovesprites end MapRoute45Signpost0Script: diff --git a/maps/Route46.asm b/maps/Route46.asm index 493bd5303..182d6c7ca 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -1,3 +1,11 @@ +const_value set 2 + const ROUTE46_POKEFAN_M + const ROUTE46_YOUNGSTER + const ROUTE46_LASS + const ROUTE46_FRUIT_TREE1 + const ROUTE46_FRUIT_TREE2 + const ROUTE46_POKE_BALL + Route46_MapScriptHeader: .MapTriggers: db 0 @@ -9,11 +17,11 @@ TrainerCamperTed: trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, 0, CamperTedScript CamperTedScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a9851 + waitbutton closetext - loadmovesprites end TrainerPicnickerErin1: @@ -21,7 +29,7 @@ TrainerPicnickerErin1: PicnickerErin1Script: writecode VAR_CALLERID, PHONE_PICNICKER_ERIN - talkaftercancel + end_if_just_battled loadfont checkflag ENGINE_ERIN iftrue UnknownScript_0x1a96da @@ -59,7 +67,7 @@ UnknownScript_0x1a96da: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight1 .LoadFight0 - loadtrainer PICNICKER, ERIN1 + scriptedtrainerdata PICNICKER, ERIN1 startbattle returnafterbattle loadvar wErinFightCount, 1 @@ -67,7 +75,7 @@ UnknownScript_0x1a96da: end .LoadFight1 - loadtrainer PICNICKER, ERIN2 + scriptedtrainerdata PICNICKER, ERIN2 startbattle returnafterbattle loadvar wErinFightCount, 2 @@ -75,7 +83,7 @@ UnknownScript_0x1a96da: end .LoadFight2 - loadtrainer PICNICKER, ERIN3 + scriptedtrainerdata PICNICKER, ERIN3 startbattle returnafterbattle clearflag ENGINE_ERIN @@ -95,7 +103,7 @@ UnknownScript_0x1a973a: UnknownScript_0x1a973b: loadfont writetext UnknownText_0x1a9927 - closetext + waitbutton verbosegiveitem CALCIUM iffalse UnknownScript_0x1a976b clearevent EVENT_ERIN_CALCIUM @@ -143,11 +151,11 @@ TrainerHikerBailey: trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, HikerBaileyScript HikerBaileyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1a97e8 + waitbutton closetext - loadmovesprites end MapRoute46Signpost0Script: diff --git a/maps/Route5.asm b/maps/Route5.asm index 607b98413..dfbf9b7cf 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE5_POKEFAN_M + Route5_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index 9cafc81ea..ad801e3ac 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const ROUTE5CLEANSETAGSPEECHHOUSE_GRANNY + const ROUTE5CLEANSETAGSPEECHHOUSE_TEACHER + Route5CleanseTagSpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -17,9 +21,9 @@ GrannyScript_0x18b634: setevent EVENT_GOT_CLEANSE_TAG UnknownScript_0x18b649: writetext UnknownText_0x18b6a7 - closetext + waitbutton UnknownScript_0x18b64d: - loadmovesprites + closetext end TeacherScript_0x18b64f: diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronCityGate.asm index 293d53121..cefe24e47 100644 --- a/maps/Route5SaffronCityGate.asm +++ b/maps/Route5SaffronCityGate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE5SAFFRONCITYGATE_OFFICER + Route5SaffronCityGate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route5UndergroundEntrance.asm b/maps/Route5UndergroundEntrance.asm index d56a31b26..a9051d75b 100644 --- a/maps/Route5UndergroundEntrance.asm +++ b/maps/Route5UndergroundEntrance.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE5UNDERGROUNDENTRANCE_TEACHER + Route5UndergroundEntrance_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route6.asm b/maps/Route6.asm index d70ed689d..534301966 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -1,3 +1,8 @@ +const_value set 2 + const ROUTE6_POKEFAN_M1 + const ROUTE6_POKEFAN_M2 + const ROUTE6_POKEFAN_M3 + Route6_MapScriptHeader: .MapTriggers: db 0 @@ -9,22 +14,22 @@ TrainerPokefanmRex: trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, PokefanmRexScript PokefanmRexScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ad9ff + waitbutton closetext - loadmovesprites end TrainerPokefanmAllan: trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, PokefanmAllanScript PokefanmAllanScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ada88 + waitbutton closetext - loadmovesprites end PokefanMScript_0x1ad951: diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index cb32e10c6..96210fcd7 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE6SAFFRONGATE_OFFICER + Route6SaffronGate_MapScriptHeader: .MapTriggers: db 1 @@ -17,14 +20,14 @@ OfficerScript_0x1926ea: checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x1926f8 writetext UnknownText_0x1926fe + waitbutton closetext - loadmovesprites end UnknownScript_0x1926f8: writetext UnknownText_0x1927cb + waitbutton closetext - loadmovesprites end UnknownText_0x1926fe: diff --git a/maps/Route6UndergroundEntrance.asm b/maps/Route6UndergroundEntrance.asm index e1dbd1b86..f2d23ef50 100644 --- a/maps/Route6UndergroundEntrance.asm +++ b/maps/Route6UndergroundEntrance.asm @@ -1,3 +1,5 @@ +const_value set 2 + Route6UndergroundEntrance_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route7.asm b/maps/Route7.asm index 5ccd0239c..e98fc20b9 100644 --- a/maps/Route7.asm +++ b/maps/Route7.asm @@ -1,3 +1,5 @@ +const_value set 2 + Route7_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index 29be287d4..3a36253cb 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE7SAFFRONGATE_OFFICER + Route7SaffronGate_MapScriptHeader: .MapTriggers: db 0 @@ -11,14 +14,14 @@ OfficerScript_0x73518: checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x73526 writetext UnknownText_0x7352c + waitbutton closetext - loadmovesprites end UnknownScript_0x73526: writetext UnknownText_0x73592 + waitbutton closetext - loadmovesprites end UnknownText_0x7352c: diff --git a/maps/Route8.asm b/maps/Route8.asm index e9d87f31b..ce626b879 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -1,3 +1,11 @@ +const_value set 2 + const ROUTE8_BIKER1 + const ROUTE8_BIKER2 + const ROUTE8_BIKER3 + const ROUTE8_SUPER_NERD1 + const ROUTE8_SUPER_NERD2 + const ROUTE8_FRUIT_TREE + Route8_MapScriptHeader: .MapTriggers: db 0 @@ -9,55 +17,55 @@ TrainerBikerDwayne: trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, BikerDwayneScript BikerDwayneScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x6c0c8 + waitbutton closetext - loadmovesprites end TrainerBikerHarris: trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, BikerHarrisScript BikerHarrisScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x6c143 + waitbutton closetext - loadmovesprites end TrainerBikerZeke: trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, BikerZekeScript BikerZekeScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x6c1a3 + waitbutton closetext - loadmovesprites end TrainerSupernerdSam: trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, SupernerdSamScript SupernerdSamScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x6c219 + waitbutton closetext - loadmovesprites end TrainerSupernerdTom: trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, SupernerdTomScript SupernerdTomScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x6c27e + waitbutton closetext - loadmovesprites end MapRoute8Signpost1Script: diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index 047599830..6f871c5fd 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -1,3 +1,6 @@ +const_value set 2 + const ROUTE8SAFFRONGATE_OFFICER + Route8SaffronGate_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/Route9.asm b/maps/Route9.asm index 5d13a398c..2ffdba46e 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -1,3 +1,11 @@ +const_value set 2 + const ROUTE9_YOUNGSTER1 + const ROUTE9_LASS1 + const ROUTE9_YOUNGSTER2 + const ROUTE9_LASS2 + const ROUTE9_POKEFAN_M1 + const ROUTE9_POKEFAN_M2 + Route9_MapScriptHeader: .MapTriggers: db 0 @@ -9,66 +17,66 @@ TrainerCamperDean: trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, CamperDeanScript CamperDeanScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1aafd9 + waitbutton closetext - loadmovesprites end TrainerPicnickerHeidi: trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, PicnickerHeidiScript PicnickerHeidiScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ab07c + waitbutton closetext - loadmovesprites end TrainerCamperSid: trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, 0, CamperSidScript CamperSidScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ab0f6 + waitbutton closetext - loadmovesprites end TrainerPicnickerEdna: trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, PicnickerEdnaScript PicnickerEdnaScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ab15f + waitbutton closetext - loadmovesprites end TrainerHikerTim: trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, 0, HikerTimScript HikerTimScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ab210 + waitbutton closetext - loadmovesprites end TrainerHikerSidney: trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, HikerSidneyScript HikerSidneyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1ab278 + waitbutton closetext - loadmovesprites end MapRoute9Signpost0Script: diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm index 506884841..f1f592f15 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsofAlphAerodactylChamber.asm @@ -1,3 +1,5 @@ +const_value set 2 + RuinsofAlphAerodactylChamber_MapScriptHeader: .MapTriggers: db 2 @@ -49,14 +51,14 @@ UnknownScript_0x58dd3: reloadmappart earthquake 50 dotrigger $1 - loadmovesprites + closetext end MapRuinsofAlphAerodactylChamberSignpost2Script: refreshscreen $0 writebyte $2 special Special_UnownPuzzle - loadmovesprites + closetext iftrue UnknownScript_0x58df7 end @@ -74,7 +76,7 @@ UnknownScript_0x58df7: earthquake 80 applymovement PLAYER, MovementData_0x58e4d playsound SFX_KINESIS - waitbutton + waitsfx pause 20 warpcheck end @@ -90,7 +92,7 @@ MapRuinsofAlphAerodactylChamberSignpost4Script: writetext UnknownText_0x58e4f writebyte $1 special Special_DisplayUnownWords - loadmovesprites + closetext end MapRuinsofAlphAerodactylChamberSignpost5Script: @@ -100,14 +102,14 @@ MapRuinsofAlphAerodactylChamberSignpost5Script: writetext UnknownText_0x58e81 writebyte $1 special Special_DisplayUnownWords - loadmovesprites + closetext end UnknownScript_0x58e46: loadfont writetext UnknownText_0x58ea2 + waitbutton closetext - loadmovesprites end MovementData_0x58e4d: diff --git a/maps/RuinsofAlphAerodactylItemRoom.asm b/maps/RuinsofAlphAerodactylItemRoom.asm index 07e2a2103..1ea6976e6 100644 --- a/maps/RuinsofAlphAerodactylItemRoom.asm +++ b/maps/RuinsofAlphAerodactylItemRoom.asm @@ -1,3 +1,9 @@ +const_value set 2 + const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL1 + const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL2 + const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL3 + const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL4 + RuinsofAlphAerodactylItemRoom_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/RuinsofAlphAerodactylWordRoom.asm b/maps/RuinsofAlphAerodactylWordRoom.asm index e79ca5c21..5b7917c6e 100644 --- a/maps/RuinsofAlphAerodactylWordRoom.asm +++ b/maps/RuinsofAlphAerodactylWordRoom.asm @@ -1,3 +1,5 @@ +const_value set 2 + RuinsofAlphAerodactylWordRoom_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm index ff04d56f2..6e1e30968 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsofAlphHoOhChamber.asm @@ -1,3 +1,5 @@ +const_value set 2 + RuinsofAlphHoOhChamber_MapScriptHeader: .MapTriggers: db 2 @@ -50,14 +52,14 @@ UnknownScript_0x58596: reloadmappart earthquake 50 dotrigger $1 - loadmovesprites + closetext end MapRuinsofAlphHoOhChamberSignpost2Script: refreshscreen $0 writebyte $3 special Special_UnownPuzzle - loadmovesprites + closetext iftrue UnknownScript_0x585ba end @@ -75,7 +77,7 @@ UnknownScript_0x585ba: earthquake 80 applymovement PLAYER, MovementData_0x58610 playsound SFX_KINESIS - waitbutton + waitsfx pause 20 warpcheck end @@ -91,7 +93,7 @@ MapRuinsofAlphHoOhChamberSignpost4Script: writetext UnknownText_0x58612 writebyte $3 special Special_DisplayUnownWords - loadmovesprites + closetext end MapRuinsofAlphHoOhChamberSignpost5Script: @@ -101,14 +103,14 @@ MapRuinsofAlphHoOhChamberSignpost5Script: writetext UnknownText_0x58644 writebyte $3 special Special_DisplayUnownWords - loadmovesprites + closetext end UnknownScript_0x58609: loadfont writetext UnknownText_0x58665 + waitbutton closetext - loadmovesprites end MovementData_0x58610: diff --git a/maps/RuinsofAlphHoOhItemRoom.asm b/maps/RuinsofAlphHoOhItemRoom.asm index 83d5720c4..6578c223d 100644 --- a/maps/RuinsofAlphHoOhItemRoom.asm +++ b/maps/RuinsofAlphHoOhItemRoom.asm @@ -1,3 +1,9 @@ +const_value set 2 + const RUINSOFALPHHOOHITEMROOM_POKE_BALL1 + const RUINSOFALPHHOOHITEMROOM_POKE_BALL2 + const RUINSOFALPHHOOHITEMROOM_POKE_BALL3 + const RUINSOFALPHHOOHITEMROOM_POKE_BALL4 + RuinsofAlphHoOhItemRoom_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/RuinsofAlphHoOhWordRoom.asm b/maps/RuinsofAlphHoOhWordRoom.asm index e0d35fa14..b547912e7 100644 --- a/maps/RuinsofAlphHoOhWordRoom.asm +++ b/maps/RuinsofAlphHoOhWordRoom.asm @@ -1,3 +1,5 @@ +const_value set 2 + RuinsofAlphHoOhWordRoom_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm index bb4b47d85..4751a9abe 100644 --- a/maps/RuinsofAlphInnerChamber.asm +++ b/maps/RuinsofAlphInnerChamber.asm @@ -1,3 +1,8 @@ +const_value set 2 + const RUINSOFALPHINNERCHAMBER_FISHER + const RUINSOFALPHINNERCHAMBER_TEACHER + const RUINSOFALPHINNERCHAMBER_GRAMPS + RuinsofAlphInnerChamber_MapScriptHeader: .MapTriggers: db 2 @@ -21,8 +26,8 @@ UnknownScript_0x58f6d: UnknownScript_0x58f6e: loadfont writetext UnknownText_0x58f89 + waitbutton closetext - loadmovesprites dotrigger $0 setevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index 63bd06be8..5c8566c57 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -1,3 +1,7 @@ +const_value set 2 + const RUINSOFALPHKABUTOCHAMBER_RECEPTIONIST + const RUINSOFALPHKABUTOCHAMBER_SCIENTIST + RuinsofAlphKabutoChamber_MapScriptHeader: .MapTriggers: db 2 @@ -51,7 +55,7 @@ UnknownScript_0x58751: reloadmappart earthquake 50 dotrigger $1 - loadmovesprites + closetext end ReceptionistScript_0x58769: @@ -61,7 +65,7 @@ MapRuinsofAlphKabutoChamberSignpost2Script: refreshscreen $0 writebyte $0 special Special_UnownPuzzle - loadmovesprites + closetext iftrue UnknownScript_0x58778 end @@ -80,7 +84,7 @@ UnknownScript_0x58778: earthquake 80 applymovement PLAYER, MovementData_0x587fe playsound SFX_KINESIS - waitbutton + waitsfx pause 20 warpcheck end @@ -98,21 +102,21 @@ ScientistScript_0x587a8: keeptextopen UnknownScript_0x587c0: writetext UnknownText_0x588f5 + waitbutton closetext - loadmovesprites - spriteface $3, UP + spriteface RUINSOFALPHKABUTOCHAMBER_SCIENTIST, UP end UnknownScript_0x587c9: writetext UnknownText_0x5897c + waitbutton closetext - loadmovesprites end UnknownScript_0x587cf: writetext UnknownText_0x594cb + waitbutton closetext - loadmovesprites end MapRuinsofAlphKabutoChamberSignpost1Script: @@ -126,7 +130,7 @@ MapRuinsofAlphKabutoChamberSignpost4Script: writetext UnknownText_0x58aa7 writebyte $0 special Special_DisplayUnownWords - loadmovesprites + closetext end MapRuinsofAlphKabutoChamberSignpost5Script: @@ -136,14 +140,14 @@ MapRuinsofAlphKabutoChamberSignpost5Script: writetext UnknownText_0x58ad9 writebyte $0 special Special_DisplayUnownWords - loadmovesprites + closetext end UnknownScript_0x587f7: loadfont writetext UnknownText_0x58afa + waitbutton closetext - loadmovesprites end MovementData_0x587fe: diff --git a/maps/RuinsofAlphKabutoItemRoom.asm b/maps/RuinsofAlphKabutoItemRoom.asm index 19a991479..3e771583a 100644 --- a/maps/RuinsofAlphKabutoItemRoom.asm +++ b/maps/RuinsofAlphKabutoItemRoom.asm @@ -1,3 +1,9 @@ +const_value set 2 + const RUINSOFALPHKABUTOITEMROOM_POKE_BALL1 + const RUINSOFALPHKABUTOITEMROOM_POKE_BALL2 + const RUINSOFALPHKABUTOITEMROOM_POKE_BALL3 + const RUINSOFALPHKABUTOITEMROOM_POKE_BALL4 + RuinsofAlphKabutoItemRoom_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/RuinsofAlphKabutoWordRoom.asm b/maps/RuinsofAlphKabutoWordRoom.asm index 8d754f657..1db1e5c6a 100644 --- a/maps/RuinsofAlphKabutoWordRoom.asm +++ b/maps/RuinsofAlphKabutoWordRoom.asm @@ -1,3 +1,5 @@ +const_value set 2 + RuinsofAlphKabutoWordRoom_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index 29b96cdd2..b8180a85e 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -1,3 +1,5 @@ +const_value set 2 + RuinsofAlphOmanyteChamber_MapScriptHeader: .MapTriggers: db 2 @@ -50,14 +52,14 @@ UnknownScript_0x58c12: reloadmappart earthquake 50 dotrigger $1 - loadmovesprites + closetext end MapRuinsofAlphOmanyteChamberSignpost2Script: refreshscreen $0 writebyte $1 special Special_UnownPuzzle - loadmovesprites + closetext iftrue UnknownScript_0x58c36 end @@ -75,7 +77,7 @@ UnknownScript_0x58c36: earthquake 80 applymovement PLAYER, MovementData_0x58c8c playsound SFX_KINESIS - waitbutton + waitsfx pause 20 warpcheck end @@ -91,7 +93,7 @@ MapRuinsofAlphOmanyteChamberSignpost4Script: writetext UnknownText_0x58c8e writebyte $2 special Special_DisplayUnownWords - loadmovesprites + closetext end MapRuinsofAlphOmanyteChamberSignpost5Script: @@ -101,14 +103,14 @@ MapRuinsofAlphOmanyteChamberSignpost5Script: writetext UnknownText_0x58cc0 writebyte $2 special Special_DisplayUnownWords - loadmovesprites + closetext end UnknownScript_0x58c85: loadfont writetext UnknownText_0x58ce1 + waitbutton closetext - loadmovesprites end MovementData_0x58c8c: diff --git a/maps/RuinsofAlphOmanyteItemRoom.asm b/maps/RuinsofAlphOmanyteItemRoom.asm index 0611de183..cb030b494 100644 --- a/maps/RuinsofAlphOmanyteItemRoom.asm +++ b/maps/RuinsofAlphOmanyteItemRoom.asm @@ -1,3 +1,9 @@ +const_value set 2 + const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL1 + const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL2 + const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL3 + const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL4 + RuinsofAlphOmanyteItemRoom_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/RuinsofAlphOmanyteWordRoom.asm b/maps/RuinsofAlphOmanyteWordRoom.asm index 7600f41d9..87848a2a7 100644 --- a/maps/RuinsofAlphOmanyteWordRoom.asm +++ b/maps/RuinsofAlphOmanyteWordRoom.asm @@ -1,3 +1,5 @@ +const_value set 2 + RuinsofAlphOmanyteWordRoom_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index 4c5293821..2bcaed562 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -1,3 +1,10 @@ +const_value set 2 + const RUINSOFALPHOUTSIDE_YOUNGSTER1 + const RUINSOFALPHOUTSIDE_SCIENTIST + const RUINSOFALPHOUTSIDE_FISHER + const RUINSOFALPHOUTSIDE_YOUNGSTER2 + const RUINSOFALPHOUTSIDE_YOUNGSTER3 + RuinsofAlphOutside_MapScriptHeader: .MapTriggers: db 2 @@ -32,22 +39,22 @@ UnknownScript_0x5801e: jump UnknownScript_0x5802c UnknownScript_0x58027: - appear $3 + appear RUINSOFALPHOUTSIDE_SCIENTIST dotrigger $1 return UnknownScript_0x5802c: - disappear $3 + disappear RUINSOFALPHOUTSIDE_SCIENTIST dotrigger $0 return UnknownScript_0x58031: - spriteface $3, UP + spriteface RUINSOFALPHOUTSIDE_SCIENTIST, UP spriteface PLAYER, DOWN jump UnknownScript_0x58044 UnknownScript_0x5803a: - spriteface $3, LEFT + spriteface RUINSOFALPHOUTSIDE_SCIENTIST, LEFT spriteface PLAYER, RIGHT jump UnknownScript_0x58044 @@ -56,12 +63,12 @@ ScientistScript_0x58043: UnknownScript_0x58044: loadfont writetext UnknownText_0x580c7 + waitbutton closetext - loadmovesprites playmusic MUSIC_SHOW_ME_AROUND - follow $3, PLAYER - applymovement $3, MovementData_0x580ba - disappear $3 + follow RUINSOFALPHOUTSIDE_SCIENTIST, PLAYER + applymovement RUINSOFALPHOUTSIDE_SCIENTIST, MovementData_0x580ba + disappear RUINSOFALPHOUTSIDE_SCIENTIST stopfollow applymovement PLAYER, MovementData_0x580c5 domaptrigger RUINS_OF_ALPH_RESEARCH_CENTER, $1 @@ -78,36 +85,36 @@ FisherScript_0x58061: keeptextopen .Next writetext UnknownText_0x58420 + waitbutton closetext - loadmovesprites end YoungsterScript_0x58076: faceplayer loadfont writetext UnknownText_0x58449 + waitbutton closetext - loadmovesprites end YoungsterScript_0x5807e: faceplayer loadfont writetext UnknownText_0x5848e + waitbutton closetext - loadmovesprites - spriteface $6, UP + spriteface RUINSOFALPHOUTSIDE_YOUNGSTER3, UP end TrainerPsychicNathan: trainer EVENT_BEAT_PSYCHIC_NATHAN, PSYCHIC_T, NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, 0, PsychicNathanScript PsychicNathanScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5830e + waitbutton closetext - loadmovesprites end @@ -115,11 +122,11 @@ TrainerSuperNerdStan: trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, UnknownScript_0x580a9 UnknownScript_0x580a9: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x58250 + waitbutton closetext - loadmovesprites end diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index 59262d20b..520afe0e0 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -1,3 +1,8 @@ +const_value set 2 + const RUINSOFALPHRESEARCHCENTER_SCIENTIST1 + const RUINSOFALPHRESEARCHCENTER_SCIENTIST2 + const RUINSOFALPHRESEARCHCENTER_SCIENTIST3 + RuinsofAlphResearchCenter_MapScriptHeader: .MapTriggers: db 2 @@ -26,12 +31,12 @@ UnknownScript_0x59185: return UnknownScript_0x5918b: - moveperson $4, $3, $7 - appear $4 + moveperson RUINSOFALPHRESEARCHCENTER_SCIENTIST3, $3, $7 + appear RUINSOFALPHRESEARCHCENTER_SCIENTIST3 return UnknownScript_0x59192: - applymovement $4, MovementData_0x5926f + applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x5926f playsound SFX_BOOT_PC pause 60 playsound SFX_SWITCH_POKEMON @@ -40,21 +45,21 @@ UnknownScript_0x59192: pause 30 playsound SFX_TRANSACTION pause 30 - spriteface $4, DOWN + spriteface RUINSOFALPHRESEARCHCENTER_SCIENTIST3, DOWN loadfont writetext UnknownText_0x59278 + waitbutton closetext - loadmovesprites - applymovement $4, MovementData_0x59274 + applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59274 loadfont writetext UnknownText_0x592fa playsound SFX_ITEM - waitbutton + waitsfx setflag ENGINE_UNOWN_DEX writetext UnknownText_0x59311 + waitbutton closetext - loadmovesprites - applymovement $4, MovementData_0x59276 + applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59276 dotrigger $0 special RestartMapMusic end @@ -65,14 +70,14 @@ ScientistScript_0x591d1: checkcode VAR_UNOWNCOUNT if_equal 26, UnknownScript_0x591df writetext UnknownText_0x59311 + waitbutton closetext - loadmovesprites end UnknownScript_0x591df: writetext UnknownText_0x5935f + waitbutton closetext - loadmovesprites end ScientistScript_0x591e5: @@ -85,26 +90,26 @@ ScientistScript_0x591e5: checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS iftrue UnknownScript_0x591ff writetext UnknownText_0x593ed + waitbutton closetext - loadmovesprites end UnknownScript_0x591ff: writetext UnknownText_0x59478 + waitbutton closetext - loadmovesprites end UnknownScript_0x59205: writetext UnknownText_0x59445 + waitbutton closetext - loadmovesprites end UnknownScript_0x5920b: writetext UnknownText_0x594cb + waitbutton closetext - loadmovesprites clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS end @@ -116,20 +121,20 @@ ScientistScript_0x59214: checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS iftrue UnknownScript_0x59228 writetext UnknownText_0x5954f + waitbutton closetext - loadmovesprites end UnknownScript_0x59228: writetext UnknownText_0x595cb + waitbutton closetext - loadmovesprites end UnknownScript_0x5922e: writetext UnknownText_0x59769 + waitbutton closetext - loadmovesprites end MapRuinsofAlphResearchCenterSignpost1Script: @@ -140,14 +145,14 @@ MapRuinsofAlphResearchCenterSignpost1Script: if_equal 26, UnknownScript_0x59247 UnknownScript_0x59241: writetext UnknownText_0x597b6 + waitbutton closetext - loadmovesprites end UnknownScript_0x59247: writetext UnknownText_0x597d9 + waitbutton closetext - loadmovesprites end MapRuinsofAlphResearchCenterSignpost2Script: @@ -158,15 +163,15 @@ MapRuinsofAlphResearchCenterSignpost2Script: if_equal 26, UnknownScript_0x59260 UnknownScript_0x5925a: writetext UnknownText_0x5980e + waitbutton closetext - loadmovesprites end UnknownScript_0x59260: writetext UnknownText_0x5982d - closetext + waitbutton special Special_UnownPrinter - loadmovesprites + closetext end UnknownScript_0x59269: diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm index 2f5fbe2ab..c29dce0df 100644 --- a/maps/SafariZoneBeta.asm +++ b/maps/SafariZoneBeta.asm @@ -1,3 +1,5 @@ +const_value set 2 + SafariZoneBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm index 60b24d4e1..0f5cddc98 100644 --- a/maps/SafariZoneFuchsiaGateBeta.asm +++ b/maps/SafariZoneFuchsiaGateBeta.asm @@ -1,3 +1,5 @@ +const_value set 2 + SafariZoneFuchsiaGateBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm index a116519ba..e557e7a61 100644 --- a/maps/SafariZoneMainOffice.asm +++ b/maps/SafariZoneMainOffice.asm @@ -1,3 +1,5 @@ +const_value set 2 + SafariZoneMainOffice_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index e3ea7f4ed..48d26f21e 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -1,3 +1,6 @@ +const_value set 2 + const SAFARIZONEWARDENSHOME_LASS + SafariZoneWardensHome_MapScriptHeader: .MapTriggers: db 0 @@ -11,14 +14,14 @@ WardensGranddaughter: checkevent EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER iftrue .AlreadyMet writetext WardensGranddaughterText1 + waitbutton closetext - loadmovesprites setevent EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER end .AlreadyMet writetext WardensGranddaughterText2 + waitbutton closetext - loadmovesprites end WardenPhoto: diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 46fd6186f..e01956fd4 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -1,3 +1,13 @@ +const_value set 2 + const SAFFRONCITY_LASS1 + const SAFFRONCITY_POKEFAN_M + const SAFFRONCITY_COOLTRAINER_M + const SAFFRONCITY_COOLTRAINER_F + const SAFFRONCITY_FISHER + const SAFFRONCITY_YOUNGSTER1 + const SAFFRONCITY_YOUNGSTER2 + const SAFFRONCITY_LASS2 + SaffronCity_MapScriptHeader: .MapTriggers: db 0 @@ -18,14 +28,14 @@ LassScript_0x19932a: checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x199338 writetext UnknownText_0x19938d + waitbutton closetext - loadmovesprites end UnknownScript_0x199338: writetext UnknownText_0x19940d + waitbutton closetext - loadmovesprites end PokefanMScript_0x19933e: @@ -34,14 +44,14 @@ PokefanMScript_0x19933e: checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x19934c writetext UnknownText_0x199460 + waitbutton closetext - loadmovesprites end UnknownScript_0x19934c: writetext UnknownText_0x1994ae + waitbutton closetext - loadmovesprites end CooltrainerMScript_0x199352: @@ -56,14 +66,14 @@ FisherScript_0x199358: checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x199366 writetext UnknownText_0x1995fc + waitbutton closetext - loadmovesprites end UnknownScript_0x199366: writetext UnknownText_0x19964b + waitbutton closetext - loadmovesprites end YoungsterScript_0x19936c: diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 0813c904a..6ee2b7245 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -1,3 +1,11 @@ +const_value set 2 + const SAFFRONGYM_SABRINA + const SAFFRONGYM_GRANNY1 + const SAFFRONGYM_YOUNGSTER1 + const SAFFRONGYM_GRANNY2 + const SAFFRONGYM_YOUNGSTER2 + const SAFFRONGYM_GYM_GUY + SaffronGym_MapScriptHeader: .MapTriggers: db 0 @@ -11,10 +19,10 @@ SabrinaScript_0x189c2e: checkflag ENGINE_MARSHBADGE iftrue .FightDone writetext UnknownText_0x189cdf + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x189df4, 0 - loadtrainer SABRINA, 1 + scriptedtrainerdata SABRINA, 1 startbattle returnafterbattle setevent EVENT_BEAT_SABRINA @@ -25,61 +33,61 @@ SabrinaScript_0x189c2e: loadfont writetext UnknownText_0x189e95 playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_MARSHBADGE writetext UnknownText_0x189ead + waitbutton closetext - loadmovesprites end .FightDone writetext UnknownText_0x189f6c + waitbutton closetext - loadmovesprites end TrainerMediumRebecca: trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, MediumRebeccaScript MediumRebeccaScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x18a034 + waitbutton closetext - loadmovesprites end TrainerPsychicFranklin: trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, PsychicFranklinScript PsychicFranklinScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x18a0a6 + waitbutton closetext - loadmovesprites end TrainerMediumDoris: trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, MediumDorisScript MediumDorisScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x18a136 + waitbutton closetext - loadmovesprites end TrainerPsychicJared: trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, PsychicJaredScript PsychicJaredScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x18a1b3 + waitbutton closetext - loadmovesprites end SaffronGymGuyScript: @@ -88,14 +96,14 @@ SaffronGymGuyScript: checkevent EVENT_BEAT_SABRINA iftrue .SaffronGymGuyWinScript writetext SaffronGymGuyText + waitbutton closetext - loadmovesprites end .SaffronGymGuyWinScript writetext SaffronGymGuyWinText + waitbutton closetext - loadmovesprites end SaffronGymStatue: diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index de4f50a67..f63ae3cf9 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const SAFFRONMART_CLERK + const SAFFRONMART_COOLTRAINER_M + const SAFFRONMART_COOLTRAINER_F + SaffronMart_MapScriptHeader: .MapTriggers: db 0 @@ -8,7 +13,7 @@ SaffronMart_MapScriptHeader: ClerkScript_0x18a3bf: loadfont pokemart MARTTYPE_STANDARD, MART_SAFFRON - loadmovesprites + closetext end CooltrainerMScript_0x18a3c6: diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokeCenter1F.asm index 21d6aa136..5c0ad4a17 100644 --- a/maps/SaffronPokeCenter1F.asm +++ b/maps/SaffronPokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const SAFFRONPOKECENTER1F_NURSE + const SAFFRONPOKECENTER1F_TEACHER + const SAFFRONPOKECENTER1F_FISHER + const SAFFRONPOKECENTER1F_YOUNGSTER + SaffronPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -22,14 +28,14 @@ FisherScript_0x18a48c: checkevent EVENT_RETURNED_MACHINE_PART iftrue .SolvedKantoPowerCrisis writetext UnknownText_0x18a5d3 + waitbutton closetext - loadmovesprites end .SolvedKantoPowerCrisis: writetext UnknownText_0x18a62e + waitbutton closetext - loadmovesprites end YoungsterScript_0x18a4a0: diff --git a/maps/SaffronPokeCenter2FBeta.asm b/maps/SaffronPokeCenter2FBeta.asm index 987236d0b..d45e81076 100644 --- a/maps/SaffronPokeCenter2FBeta.asm +++ b/maps/SaffronPokeCenter2FBeta.asm @@ -1,3 +1,5 @@ +const_value set 2 + SaffronPokeCenter2FBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index b79485c2e..466409e76 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -1,3 +1,9 @@ +const_value set 2 + const SAFFRONTRAINSTATION_OFFICER + const SAFFRONTRAINSTATION_GYM_GUY + const SAFFRONTRAINSTATION_TEACHER + const SAFFRONTRAINSTATION_LASS + SaffronTrainStation_MapScriptHeader: .MapTriggers: db 1 @@ -17,8 +23,8 @@ OfficerScript_0x18a81e: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .MagnetTrainToGoldenrod writetext UnknownText_0x18a8a9 + waitbutton closetext - loadmovesprites end .MagnetTrainToGoldenrod: @@ -28,9 +34,9 @@ OfficerScript_0x18a81e: checkitem PASS iffalse .PassNotInBag writetext UnknownText_0x18a917 + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x18a88f + applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a88f applymovement PLAYER, MovementData_0x18a898 writebyte $1 special Special_MagnetTrain @@ -46,24 +52,24 @@ OfficerScript_0x18a81e: .PassNotInBag: writetext UnknownText_0x18a956 + waitbutton closetext - loadmovesprites end .DecidedNotToRide: writetext UnknownText_0x18a978 + waitbutton closetext - loadmovesprites end Script_ArriveFromGoldenrod: - applymovement $2, MovementData_0x18a88f + applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a88f applymovement PLAYER, MovementData_0x18a8a1 - applymovement $2, MovementData_0x18a894 + applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a894 loadfont writetext UnknownText_0x18a993 + waitbutton closetext - loadmovesprites end GymGuyScript_0x18a875: @@ -72,14 +78,14 @@ GymGuyScript_0x18a875: checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x18a883 writetext UnknownText_0x18a9ca + waitbutton closetext - loadmovesprites end UnknownScript_0x18a883: writetext UnknownText_0x18aa61 + waitbutton closetext - loadmovesprites end TeacherScript_0x18a889: diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 4b0a49491..b617c7647 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -1,3 +1,7 @@ +const_value set 2 + const SEAFOAMGYM_BLAINE + const SEAFOAMGYM_GYM_GUY + SeafoamGym_MapScriptHeader: .MapTriggers: db 1 @@ -17,30 +21,30 @@ BlaineScript_0x1ab4fb: checkflag ENGINE_VOLCANOBADGE iftrue .FightDone writetext UnknownText_0x1ab548 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x1ab646, 0 - loadtrainer BLAINE, 1 + scriptedtrainerdata BLAINE, 1 startbattle iftrue .ReturnAfterBattle - appear $3 + appear SEAFOAMGYM_GYM_GUY .ReturnAfterBattle returnafterbattle setevent EVENT_BEAT_BLAINE loadfont writetext UnknownText_0x1ab683 playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_VOLCANOBADGE writetext UnknownText_0x1ab69d + waitbutton closetext - loadmovesprites end .FightDone writetext UnknownText_0x1ab71c + waitbutton closetext - loadmovesprites end SeafoamGymGuyScript: @@ -49,15 +53,15 @@ SeafoamGymGuyScript: checkevent EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE iftrue .TalkedToSeafoamGymGuyScript writetext SeafoamGymGuyWinText + waitbutton closetext - loadmovesprites setevent EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE end .TalkedToSeafoamGymGuyScript writetext SeafoamGymGuyWinText2 + waitbutton closetext - loadmovesprites end UnknownText_0x1ab548: diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index b5424ff25..67db2c5fb 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -1,3 +1,7 @@ +const_value set 2 + const SILPHCO1F_RECEPTIONIST + const SILPHCO1F_OFFICER + SilphCo1F_MapScriptHeader: .MapTriggers: db 0 @@ -20,9 +24,9 @@ OfficerScript_0x18abe8: setevent EVENT_GOT_UP_GRADE UnknownScript_0x18abfd: writetext UnknownText_0x18aca8 - closetext + waitbutton UnknownScript_0x18ac01: - loadmovesprites + closetext end UnknownText_0x18ac03: diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index 19830802e..000ce091f 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -1,3 +1,7 @@ +const_value set 2 + const SILVERCAVEITEMROOMS_POKE_BALL1 + const SILVERCAVEITEMROOMS_POKE_BALL2 + SilverCaveItemRooms_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 51718ba61..52bfe2eb2 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -1,3 +1,5 @@ +const_value set 2 + SilverCaveOutside_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/SilverCavePokeCenter1F.asm b/maps/SilverCavePokeCenter1F.asm index 32f11f61b..7aba170fe 100644 --- a/maps/SilverCavePokeCenter1F.asm +++ b/maps/SilverCavePokeCenter1F.asm @@ -1,3 +1,7 @@ +const_value set 2 + const SILVERCAVEPOKECENTER1F_NURSE + const SILVERCAVEPOKECENTER1F_GRANNY + SilverCavePokeCenter1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 03c33bda2..8f837b931 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -1,3 +1,9 @@ +const_value set 2 + const SILVERCAVEROOM1_POKE_BALL1 + const SILVERCAVEROOM1_POKE_BALL2 + const SILVERCAVEROOM1_POKE_BALL3 + const SILVERCAVEROOM1_POKE_BALL4 + SilverCaveRoom1_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index c596024c1..88cf949b8 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -1,3 +1,8 @@ +const_value set 2 + const SILVERCAVEROOM2_POKE_BALL1 + const SILVERCAVEROOM2_POKE_BALL2 + const SILVERCAVEROOM2_POKE_BALL3 + SilverCaveRoom2_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 08831af22..663e4dd09 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -1,3 +1,6 @@ +const_value set 2 + const SILVERCAVEROOM3_RED + SilverCaveRoom3_MapScriptHeader: .MapTriggers: db 0 @@ -10,21 +13,21 @@ RedScript_0x18c603: faceplayer loadfont writetext UnknownText_0x18c637 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x18c63c, UnknownText_0x18c63c - loadtrainer RED, 1 + scriptedtrainerdata RED, 1 startbattle reloadmapmusic returnafterbattle special Special_RotatePalettesRightMusic loadfont writetext UnknownText_0x18c63f + waitbutton closetext - loadmovesprites special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes - disappear $2 + disappear SILVERCAVEROOM3_RED pause 15 special Special_FadeInQuickly pause 30 diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 27b397543..f3d20e993 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -1,3 +1,14 @@ +const_value set 2 + const SLOWPOKEWELLB1F_ROCKET1 + const SLOWPOKEWELLB1F_ROCKET2 + const SLOWPOKEWELLB1F_ROCKET3 + const SLOWPOKEWELLB1F_ROCKET_GIRL + const SLOWPOKEWELLB1F_SLOWPOKE1 + const SLOWPOKEWELLB1F_SLOWPOKE2 + const SLOWPOKEWELLB1F_KURT + const SLOWPOKEWELLB1F_BOULDER + const SLOWPOKEWELLB1F_POKE_BALL + SlowpokeWellB1F_MapScriptHeader: .MapTriggers: db 0 @@ -12,11 +23,11 @@ TrainerGruntM29: trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, 29, GruntM29SeenText, GruntM29BeatenText, 0, GruntM29Script GruntM29Script: - talkaftercancel + end_if_just_battled loadfont writetext TrainerGruntM29SlowpokeProfitText + waitbutton closetext - loadmovesprites end TrainerGruntM1: @@ -25,25 +36,25 @@ TrainerGruntM1: GruntM1Script: loadfont writetext TrainerGruntM1WhenTalkText + waitbutton closetext - loadmovesprites special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes - disappear $2 - disappear $3 - disappear $4 - disappear $5 + disappear SLOWPOKEWELLB1F_ROCKET1 + disappear SLOWPOKEWELLB1F_ROCKET2 + disappear SLOWPOKEWELLB1F_ROCKET3 + disappear SLOWPOKEWELLB1F_ROCKET_GIRL pause 15 special Special_FadeInQuickly - disappear $8 - moveperson $8, $b, $6 - appear $8 - applymovement $8, KurtSlowpokeWellVictoryMovementData + disappear SLOWPOKEWELLB1F_KURT + moveperson SLOWPOKEWELLB1F_KURT, $b, $6 + appear SLOWPOKEWELLB1F_KURT + applymovement SLOWPOKEWELLB1F_KURT, KurtSlowpokeWellVictoryMovementData spriteface PLAYER, RIGHT loadfont writetext KurtLeaveSlowpokeWellText + waitbutton closetext - loadmovesprites setevent EVENT_CLEARED_SLOWPOKE_WELL variablesprite SPRITE_AZALEA_ROCKET, SPRITE_SILVER domaptrigger AZALEA_TOWN, $1 @@ -66,22 +77,22 @@ TrainerGruntM2: trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, 2, GruntM2SeenText, GruntM2BeatenText, 0, GruntM2Script GruntM2Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5aaf2 + waitbutton closetext - loadmovesprites end TrainerGruntF1: trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, 1, GruntF1SeenText, GruntF1BeatenText, 0, GruntF1Script GruntF1Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5ab8d + waitbutton closetext - loadmovesprites end SlowpokeScript_0x5a681: @@ -91,13 +102,13 @@ SlowpokeScript_0x5a681: writetext UnknownText_0x5abcb yesorno iftrue UnknownScript_0x5a68f - loadmovesprites + closetext end UnknownScript_0x5a68f: writetext UnknownText_0x5ac09 + waitbutton closetext - loadmovesprites end SlowpokeScript_0x5a695: @@ -105,8 +116,8 @@ SlowpokeScript_0x5a695: loadfont writetext UnknownText_0x5ac61 cry SLOWPOKE + waitbutton closetext - loadmovesprites end SlowpokeWellB1FBoulder: diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index f33718b12..d3f002b76 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -1,3 +1,7 @@ +const_value set 2 + const SLOWPOKEWELLB2F_GYM_GUY + const SLOWPOKEWELLB2F_POKE_BALL + SlowpokeWellB2F_MapScriptHeader: .MapTriggers: db 0 @@ -16,13 +20,13 @@ GymGuyScript_0x5ad0b: iffalse UnknownScript_0x5ad20 setevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL UnknownScript_0x5ad20: - loadmovesprites + closetext end UnknownScript_0x5ad22: writetext UnknownText_0x5adf2 + waitbutton closetext - loadmovesprites end ItemFragment_0x5ad28: diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 30b682850..db00dda58 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -1,3 +1,9 @@ +const_value set 2 + const SOULHOUSE_GRAMPS + const SOULHOUSE_TEACHER + const SOULHOUSE_LASS + const SOULHOUSE_GRANNY + SoulHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 7e0d0069a..cb899e8e2 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -1,3 +1,11 @@ +const_value set 2 + const SPROUTTOWER1F_SAGE1 + const SPROUTTOWER1F_SAGE2 + const SPROUTTOWER1F_GRANNY + const SPROUTTOWER1F_TEACHER + const SPROUTTOWER1F_SAGE3 + const SPROUTTOWER1F_POKE_BALL + SproutTower1F_MapScriptHeader: .MapTriggers: db 0 @@ -21,11 +29,11 @@ TrainerSageChow: trainer EVENT_BEAT_SAGE_CHOW, SAGE, CHOW, SageChowSeenText, SageChowBeatenText, 0, SageChowScript SageChowScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x184583 + waitbutton closetext - loadmovesprites end ItemFragment_0x18451e: diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index bdf50309b..d43363a5b 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const SPROUTTOWER2F_SAGE1 + const SPROUTTOWER2F_SAGE2 + const SPROUTTOWER2F_POKE_BALL + SproutTower2F_MapScriptHeader: .MapTriggers: db 0 @@ -9,22 +14,22 @@ TrainerSageNico: trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, 0, SageNicoScript SageNicoScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1847ff + waitbutton closetext - loadmovesprites end TrainerSageEdmond: trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, SageEdmondScript SageEdmondScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x18486f + waitbutton closetext - loadmovesprites end MapSproutTower2FSignpost0Script: diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index c8a1216a8..d81ad7013 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -1,3 +1,12 @@ +const_value set 2 + const SPROUTTOWER3F_SAGE1 + const SPROUTTOWER3F_SAGE2 + const SPROUTTOWER3F_SAGE3 + const SPROUTTOWER3F_SAGE4 + const SPROUTTOWER3F_POKE_BALL1 + const SPROUTTOWER3F_POKE_BALL2 + const SPROUTTOWER3F_SILVER + SproutTower3F_MapScriptHeader: .MapTriggers: db 2 @@ -27,30 +36,30 @@ UnknownScript_0x184947: playsound SFX_ELEVATOR earthquake 79 applymovement PLAYER, MovementData_0x184a1d - applymovement $8, MovementData_0x184a22 + applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a22 loadfont writetext UnknownText_0x184a27 + waitbutton closetext - loadmovesprites - showemote EMOTE_SHOCK, $8, 15 - spriteface $8, DOWN + showemote EMOTE_SHOCK, SPROUTTOWER3F_SILVER, 15 + spriteface SPROUTTOWER3F_SILVER, DOWN pause 15 - applymovement $8, MovementData_0x184a24 + applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a24 playmusic MUSIC_RIVAL_ENCOUNTER loadfont writetext UnknownText_0x184aec + waitbutton closetext - loadmovesprites - spriteface $8, UP + spriteface SPROUTTOWER3F_SILVER, UP loadfont writetext UnknownText_0x184bc8 pause 15 - loadmovesprites + closetext playsound SFX_WARP_TO special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes - disappear $8 - waitbutton + disappear SPROUTTOWER3F_SILVER + waitsfx special Special_FadeInQuickly dotrigger $1 special RestartMapMusic @@ -62,10 +71,10 @@ SageLiScript: checkevent EVENT_GOT_HM05_FLASH iftrue UnknownScript_0x1849d1 writetext SageLiSeenText + waitbutton closetext - loadmovesprites winlosstext SageLiBeatenText, 0 - loadtrainer SAGE, LI + scriptedtrainerdata SAGE, LI startbattle returnafterbattle loadfont @@ -75,47 +84,47 @@ SageLiScript: setevent EVENT_GOT_HM05_FLASH setevent EVENT_BEAT_SAGE_LI writetext UnknownText_0x184d13 + waitbutton closetext - loadmovesprites end UnknownScript_0x1849d1: writetext UnknownText_0x184d88 + waitbutton closetext - loadmovesprites end TrainerSageJin: trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, 0, SageJinScript SageJinScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x184dfa + waitbutton closetext - loadmovesprites end TrainerSageTroy: trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, 0, SageTroyScript SageTroyScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x184ea4 + waitbutton closetext - loadmovesprites end TrainerSageNeal: trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, 0, SageNealScript SageNealScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x184f12 + waitbutton closetext - loadmovesprites end MapSproutTower3FSignpost3Script: diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index e9e68a97d..44032079a 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -1,3 +1,11 @@ +const_value set 2 + const TEAMROCKETBASEB1F_ROCKET1 + const TEAMROCKETBASEB1F_ROCKET2 + const TEAMROCKETBASEB1F_SCIENTIST + const TEAMROCKETBASEB1F_POKE_BALL1 + const TEAMROCKETBASEB1F_POKE_BALL2 + const TEAMROCKETBASEB1F_POKE_BALL3 + TeamRocketBaseB1F_MapScriptHeader: .MapTriggers: db 1 @@ -16,7 +24,7 @@ UnknownScript_0x6c65a: end UnknownScript_0x6c65b: - disappear $2 + disappear TEAMROCKETBASEB1F_ROCKET1 return SecurityCamera1a: @@ -27,18 +35,18 @@ SecurityCamera1a: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson $2, $13, $2 - appear $2 + moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $2 + appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT - applymovement $2, SecurityCameraMovement1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson $2, $13, $2 - appear $2 - applymovement $2, SecurityCameraMovement1 + moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $2 + appear TEAMROCKETBASEB1F_ROCKET1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_1 @@ -52,18 +60,18 @@ SecurityCamera1b: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson $2, $13, $3 - appear $2 + moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $3 + appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT - applymovement $2, SecurityCameraMovement1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson $2, $13, $3 - appear $2 - applymovement $2, SecurityCameraMovement1 + moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $3 + appear TEAMROCKETBASEB1F_ROCKET1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_1 @@ -77,19 +85,19 @@ SecurityCamera2a: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson $2, $4, $7 - appear $2 + moveperson TEAMROCKETBASEB1F_ROCKET1, $4, $7 + appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT - applymovement $2, SecurityCameraMovement2 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement2 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson $2, $c, $5 - appear $2 - applymovement $2, SecurityCameraMovement3 + moveperson TEAMROCKETBASEB1F_ROCKET1, $c, $5 + appear TEAMROCKETBASEB1F_ROCKET1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement3 scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_2 @@ -103,19 +111,19 @@ SecurityCamera2b: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson $2, $4, $8 - appear $2 + moveperson TEAMROCKETBASEB1F_ROCKET1, $4, $8 + appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT - applymovement $2, SecurityCameraMovement4 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement4 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson $2, $c, $5 - appear $2 - applymovement $2, SecurityCameraMovement5 + moveperson TEAMROCKETBASEB1F_ROCKET1, $c, $5 + appear TEAMROCKETBASEB1F_ROCKET1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement5 scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_2 @@ -129,19 +137,19 @@ SecurityCamera3a: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson $2, $13, $6 - appear $2 + moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $6 + appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT - applymovement $2, SecurityCameraMovement1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson $2, $19, $b - appear $2 - applymovement $2, SecurityCameraMovement6 + moveperson TEAMROCKETBASEB1F_ROCKET1, $19, $b + appear TEAMROCKETBASEB1F_ROCKET1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement6 scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_3 @@ -155,19 +163,19 @@ SecurityCamera3b: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson $2, $13, $7 - appear $2 + moveperson TEAMROCKETBASEB1F_ROCKET1, $13, $7 + appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT - applymovement $2, SecurityCameraMovement1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson $2, $19, $c - appear $2 - applymovement $2, SecurityCameraMovement7 + moveperson TEAMROCKETBASEB1F_ROCKET1, $19, $c + appear TEAMROCKETBASEB1F_ROCKET1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement7 scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_3 @@ -181,19 +189,19 @@ SecurityCamera4: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson $2, $11, $10 - appear $2 + moveperson TEAMROCKETBASEB1F_ROCKET1, $11, $10 + appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT - applymovement $2, SecurityCameraMovement1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson $2, $19, $b - appear $2 - applymovement $2, SecurityCameraMovement8 + moveperson TEAMROCKETBASEB1F_ROCKET1, $19, $b + appear TEAMROCKETBASEB1F_ROCKET1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement8 scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_4 @@ -207,19 +215,19 @@ SecurityCamera5: iftrue NoSecurityCamera showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER - moveperson $2, $3, $10 - appear $2 + moveperson TEAMROCKETBASEB1F_ROCKET1, $3, $10 + appear TEAMROCKETBASEB1F_ROCKET1 spriteface PLAYER, LEFT - applymovement $2, SecurityCameraMovement1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1 scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds showemote EMOTE_SHOCK, PLAYER, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface PLAYER, RIGHT - moveperson $2, $e, $10 - appear $2 - applymovement $2, SecurityCameraMovement9 + moveperson TEAMROCKETBASEB1F_ROCKET1, $e, $10 + appear TEAMROCKETBASEB1F_ROCKET1 + applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement9 scall TrainerCameraGrunt2 if_equal $1, NoSecurityCamera setevent EVENT_SECURITY_CAMERA_5 @@ -231,26 +239,26 @@ NoSecurityCamera: TrainerCameraGrunt1: loadfont writetext CameraGrunt1SeenText + waitbutton closetext - loadmovesprites winlosstext CameraGrunt1BeatenText, 0 setlasttalked $2 - loadtrainer GRUNTM, 20 + scriptedtrainerdata GRUNTM, 20 startbattle - disappear $2 + disappear TEAMROCKETBASEB1F_ROCKET1 returnafterbattle end TrainerCameraGrunt2: loadfont writetext CameraGrunt2SeenText + waitbutton closetext - loadmovesprites winlosstext CameraGrunt2BeatenText, 0 setlasttalked $2 - loadtrainer GRUNTM, 21 + scriptedtrainerdata GRUNTM, 21 startbattle - disappear $2 + disappear TEAMROCKETBASEB1F_ROCKET1 returnafterbattle end @@ -450,7 +458,7 @@ VoltorbExplodingTrap: special FadeInPalettes setlasttalked $ff writecode VAR_BATTLETYPE, BATTLETYPE_TRAP - loadpokedata VOLTORB, 23 + scriptedpokedata VOLTORB, 23 startbattle end @@ -460,7 +468,7 @@ GeodudeExplodingTrap: special FadeInPalettes setlasttalked $ff writecode VAR_BATTLETYPE, BATTLETYPE_TRAP - loadpokedata GEODUDE, 21 + scriptedpokedata GEODUDE, 21 startbattle end @@ -470,7 +478,7 @@ KoffingExplodingTrap: special FadeInPalettes setlasttalked $ff writecode VAR_BATTLETYPE, BATTLETYPE_TRAP - loadpokedata KOFFING, 21 + scriptedpokedata KOFFING, 21 startbattle end @@ -481,22 +489,22 @@ TrainerScientistJed: trainer EVENT_BEAT_SCIENTIST_JED, SCIENTIST, JED, ScientistJedSeenText, ScientistJedBeatenText, 0, ScientistJedScript ScientistJedScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x6cc16 + waitbutton closetext - loadmovesprites end TrainerGruntM16: trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, 16, GruntM16SeenText, GruntM16BeatenText, 0, GruntM16Script GruntM16Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x6cd1b + waitbutton closetext - loadmovesprites end MapTeamRocketBaseB1FSignpost5Script: @@ -511,8 +519,8 @@ MapTeamRocketBaseB1FSignpost0Script: iftrue UnknownScript_0x6cabe writetext UnknownText_0x6cdad playsound SFX_TALLY + waitbutton closetext - loadmovesprites setevent EVENT_TURNED_OFF_SECURITY_CAMERAS setevent EVENT_SECURITY_CAMERA_1 setevent EVENT_SECURITY_CAMERA_2 @@ -523,8 +531,8 @@ MapTeamRocketBaseB1FSignpost0Script: UnknownScript_0x6cabe: writetext UnknownText_0x6cdd0 + waitbutton closetext - loadmovesprites end ItemFragment_0x6cac4: diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 2a44c4652..f38518976 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -1,3 +1,19 @@ +const_value set 2 + const TEAMROCKETBASEB2F_ROCKET1 + const TEAMROCKETBASEB2F_ROCKET_GIRL + const TEAMROCKETBASEB2F_LANCE + const TEAMROCKETBASEB2F_DRAGON + const TEAMROCKETBASEB2F_VOLTORB1 + const TEAMROCKETBASEB2F_VOLTORB2 + const TEAMROCKETBASEB2F_VOLTORB3 + const TEAMROCKETBASEB2F_VOLTORB4 + const TEAMROCKETBASEB2F_VOLTORB5 + const TEAMROCKETBASEB2F_VOLTORB6 + const TEAMROCKETBASEB2F_ROCKET2 + const TEAMROCKETBASEB2F_ROCKET3 + const TEAMROCKETBASEB2F_ROCKET4 + const TEAMROCKETBASEB2F_POKE_BALL + TeamRocketBaseB2F_MapScriptHeader: .MapTriggers: db 4 @@ -37,58 +53,58 @@ UnknownScript_0x6cf90: return UnknownScript_0x6cf95: - moveperson $4, $9, $d + moveperson TEAMROCKETBASEB2F_LANCE, $9, $d jump UnknownScript_0x6cfac UnknownScript_0x6cf9c: - moveperson $3, $15, $10 - moveperson $2, $15, $10 - moveperson $5, $a, $d - moveperson $4, $a, $d + moveperson TEAMROCKETBASEB2F_ROCKET_GIRL, $15, $10 + moveperson TEAMROCKETBASEB2F_ROCKET1, $15, $10 + moveperson TEAMROCKETBASEB2F_DRAGON, $a, $d + moveperson TEAMROCKETBASEB2F_LANCE, $a, $d UnknownScript_0x6cfac: - appear $3 - appear $2 + appear TEAMROCKETBASEB2F_ROCKET_GIRL + appear TEAMROCKETBASEB2F_ROCKET1 loadfont writetext UnknownText_0x6d2ad + waitbutton closetext - loadmovesprites spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 applymovement PLAYER, MovementData_0x6d21f playmusic MUSIC_ROCKET_ENCOUNTER - applymovement $3, MovementData_0x6d224 + applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d224 spriteface PLAYER, UP - applymovement $2, MovementData_0x6d22f + applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d22f loadfont writetext UnknownText_0x6d2c3 + waitbutton closetext - loadmovesprites cry DRAGONITE - spriteface $3, LEFT + spriteface TEAMROCKETBASEB2F_ROCKET_GIRL, LEFT spriteface PLAYER, LEFT - appear $5 - applymovement $5, MovementData_0x6d236 - applymovement $3, MovementData_0x6d23b - applymovement $2, MovementData_0x6d24c - appear $4 - applymovement $4, MovementData_0x6d244 + appear TEAMROCKETBASEB2F_DRAGON + applymovement TEAMROCKETBASEB2F_DRAGON, MovementData_0x6d236 + applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d23b + applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d24c + appear TEAMROCKETBASEB2F_LANCE + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d244 loadfont writetext UnknownText_0x6d38c + waitbutton closetext - loadmovesprites spriteface PLAYER, RIGHT - applymovement $3, MovementData_0x6d241 + applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d241 loadfont writetext UnknownText_0x6d3bd + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x6d24a - applymovement $3, MovementData_0x6d248 + applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d24a + applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d248 winlosstext UnknownText_0x6d45c, 0 setlasttalked $3 - loadtrainer EXECUTIVEF, 2 + scriptedtrainerdata EXECUTIVEF, 2 startbattle - disappear $5 + disappear TEAMROCKETBASEB2F_DRAGON setevent EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE setevent EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE setevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE @@ -96,40 +112,40 @@ UnknownScript_0x6cfac: setevent EVENT_BEAT_ROCKET_EXECUTIVEF_2 loadfont writetext UnknownText_0x6d4c6 + waitbutton closetext - loadmovesprites special Special_FadeBlackQuickly special Special_ReloadSpritesNoPalettes - disappear $2 - disappear $3 - disappear $c - disappear $d - disappear $e + disappear TEAMROCKETBASEB2F_ROCKET1 + disappear TEAMROCKETBASEB2F_ROCKET_GIRL + disappear TEAMROCKETBASEB2F_ROCKET2 + disappear TEAMROCKETBASEB2F_ROCKET3 + disappear TEAMROCKETBASEB2F_ROCKET4 pause 15 special Special_FadeInQuickly dotrigger $2 clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE - spriteface $4, DOWN + spriteface TEAMROCKETBASEB2F_LANCE, DOWN loadfont writetext UnknownText_0x6d5d8 + waitbutton closetext - loadmovesprites - applymovement $4, MovementData_0x6d250 + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d250 spriteface PLAYER, UP loadfont writetext UnknownText_0x6d64e + waitbutton closetext - loadmovesprites - follow $4, PLAYER - applymovement $4, MovementData_0x6d254 + follow TEAMROCKETBASEB2F_LANCE, PLAYER + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d254 stopfollow - applymovement $4, MovementData_0x6d258 + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d258 loadfont writetext UnknownText_0x6d6cf + waitbutton closetext - loadmovesprites - applymovement $4, MovementData_0x6d267 - disappear $4 + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d267 + disappear TEAMROCKETBASEB2F_LANCE UnknownScript_0x6d075: applymovement PLAYER, MovementData_0x6d271 @@ -138,8 +154,8 @@ UnknownScript_0x6d075: UnknownScript_0x6d07a: loadfont writetext UnknownText_0x6d7ea + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x6d278 end @@ -149,12 +165,12 @@ UnknownScript_0x6d085: UnknownScript_0x6d08b: spriteface PLAYER, RIGHT - spriteface $4, LEFT + spriteface TEAMROCKETBASEB2F_LANCE, LEFT UnknownScript_0x6d091: loadfont writetext UnknownText_0x6da97 + waitbutton closetext - loadmovesprites special FadeOutPalettes special Mobile_HealParty playsound SFX_FULL_HEAL @@ -162,61 +178,61 @@ UnknownScript_0x6d091: special FadeInPalettes loadfont writetext UnknownText_0x6daf7 + waitbutton closetext - loadmovesprites dotrigger $1 setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE checkcode VAR_FACING if_equal RIGHT, UnknownScript_0x6d0be - applymovement $4, MovementData_0x6d212 - disappear $4 + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d212 + disappear TEAMROCKETBASEB2F_LANCE end UnknownScript_0x6d0be: - applymovement $4, MovementData_0x6d219 - disappear $4 + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d219 + disappear TEAMROCKETBASEB2F_LANCE end TrainerGruntM17: trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, 17, GruntM17SeenText, GruntM17BeatenText, 0, GruntM17Script GruntM17Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x6db88 + waitbutton closetext - loadmovesprites end TrainerGruntM18: trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, 18, GruntM18SeenText, GruntM18BeatenText, 0, GruntM18Script GruntM18Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x6dc1a + waitbutton closetext - loadmovesprites end TrainerGruntM19: trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, 19, GruntM19SeenText, GruntM19BeatenText, 0, GruntM19Script GruntM19Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x6dcd1 + waitbutton closetext - loadmovesprites end VoltorbScript_0x6d101: cry ELECTRODE - loadpokedata ELECTRODE, 23 + scriptedpokedata ELECTRODE, 23 startbattle iftrue UnknownScript_0x6d182 - disappear $6 - disappear $9 + disappear TEAMROCKETBASEB2F_VOLTORB1 + disappear TEAMROCKETBASEB2F_VOLTORB4 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 iffalse UnknownScript_0x6d182 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 @@ -230,11 +246,11 @@ VoltorbScript_0x6d101: VoltorbScript_0x6d12c: cry ELECTRODE - loadpokedata ELECTRODE, 23 + scriptedpokedata ELECTRODE, 23 startbattle iftrue UnknownScript_0x6d182 - disappear $7 - disappear $a + disappear TEAMROCKETBASEB2F_VOLTORB2 + disappear TEAMROCKETBASEB2F_VOLTORB5 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 iffalse UnknownScript_0x6d182 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 @@ -248,11 +264,11 @@ VoltorbScript_0x6d12c: VoltorbScript_0x6d157: cry ELECTRODE - loadpokedata ELECTRODE, 23 + scriptedpokedata ELECTRODE, 23 startbattle iftrue UnknownScript_0x6d182 - disappear $8 - disappear $b + disappear TEAMROCKETBASEB2F_VOLTORB3 + disappear TEAMROCKETBASEB2F_VOLTORB6 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 iffalse UnknownScript_0x6d182 checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 @@ -269,9 +285,9 @@ UnknownScript_0x6d182: end UnknownScript_0x6d184: - moveperson $4, $12, $6 - appear $4 - applymovement $4, MovementData_0x6d27a + moveperson TEAMROCKETBASEB2F_LANCE, $12, $6 + appear TEAMROCKETBASEB2F_LANCE + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a spriteface PLAYER, RIGHT loadfont writetext UnknownText_0x6d809 @@ -279,16 +295,16 @@ UnknownScript_0x6d184: verbosegiveitem HM_WHIRLPOOL setevent EVENT_GOT_HM06_WHIRLPOOL writetext UnknownText_0x6d8f8 + waitbutton closetext - loadmovesprites - spriteface $4, DOWN + spriteface TEAMROCKETBASEB2F_LANCE, DOWN loadfont writetext UnknownText_0x6d994 + waitbutton closetext - loadmovesprites spriteface PLAYER, DOWN - applymovement $4, MovementData_0x6d283 - disappear $4 + applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d283 + disappear TEAMROCKETBASEB2F_LANCE setevent EVENT_CLEARED_ROCKET_HIDEOUT clearflag ENGINE_ROCKET_SIGNAL_ON_CH20 setevent EVENT_ROUTE_43_GATE_ROCKETS @@ -313,19 +329,19 @@ MapTeamRocketBaseB2FSignpost1Script: checkevent EVENT_LEARNED_HAIL_GIOVANNI iftrue UnknownScript_0x6d1e8 writetext UnknownText_0x6dd39 + waitbutton closetext - loadmovesprites end UnknownScript_0x6d1e8: writetext UnknownText_0x6dd6b - closetext + waitbutton playsound SFX_ENTER_DOOR changeblock $e, $c, $7 reloadmappart - loadmovesprites + closetext setevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER - waitbutton + waitsfx end MapTeamRocketBaseB2FSignpost21Script: @@ -333,14 +349,14 @@ MapTeamRocketBaseB2FSignpost21Script: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x6d207 writetext UnknownText_0x6dda7 + waitbutton closetext - loadmovesprites end UnknownScript_0x6d207: writetext UnknownText_0x6de03 + waitbutton closetext - loadmovesprites end ItemFragment_0x6d20d: diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 76cd16b73..8a8cf50cb 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -1,3 +1,19 @@ +const_value set 2 + const TEAMROCKETBASEB3F_LANCE + const TEAMROCKETBASEB3F_ROCKET1 + const TEAMROCKETBASEB3F_MOLTRES + const TEAMROCKETBASEB3F_ROCKET_GIRL + const TEAMROCKETBASEB3F_ROCKET2 + const TEAMROCKETBASEB3F_SCIENTIST1 + const TEAMROCKETBASEB3F_SCIENTIST2 + const TEAMROCKETBASEB3F_ROCKET3 + const TEAMROCKETBASEB3F_SILVER + const TEAMROCKETBASEB3F_POKE_BALL1 + const TEAMROCKETBASEB3F_POKE_BALL2 + const TEAMROCKETBASEB3F_POKE_BALL3 + const TEAMROCKETBASEB3F_POKE_BALL4 + const TEAMROCKETBASEB3F_POKE_BALL5 + TeamRocketBaseB3F_MapScriptHeader: .MapTriggers: db 4 @@ -40,15 +56,15 @@ TeamRocketBaseB3F_MapScriptHeader: LanceScript_0x6dffc: spriteface PLAYER, LEFT pause 5 - spriteface $4, RIGHT + spriteface TEAMROCKETBASEB3F_MOLTRES, RIGHT pause 20 - applymovement $2, MovementData_0x6e12a + applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12a loadfont writetext UnknownText_0x6e179 + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x6e12c - disappear $2 + applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12c + disappear TEAMROCKETBASEB3F_LANCE dotrigger $1 end @@ -56,18 +72,18 @@ UnknownScript_0x6e019: spriteface PLAYER, LEFT showemote EMOTE_SHOCK, PLAYER, 15 special Special_RotatePalettesRightMusic - appear $a - applymovement $a, MovementData_0x6e164 + appear TEAMROCKETBASEB3F_SILVER + applymovement TEAMROCKETBASEB3F_SILVER, MovementData_0x6e164 spriteface PLAYER, LEFT playmusic MUSIC_RIVAL_ENCOUNTER loadfont writetext UnknownText_0x6e267 + waitbutton closetext - loadmovesprites playsound SFX_TACKLE applymovement PLAYER, MovementData_0x6e175 - applymovement $a, MovementData_0x6e16d - disappear $a + applymovement TEAMROCKETBASEB3F_SILVER, MovementData_0x6e16d + disappear TEAMROCKETBASEB3F_SILVER dotrigger $2 special RestartMapMusic end @@ -83,36 +99,36 @@ UnknownScript_0x6e052: applymovement PLAYER, MovementData_0x6e13a UnknownScript_0x6e056: pause 30 - showemote EMOTE_SHOCK, $3, 15 + showemote EMOTE_SHOCK, TEAMROCKETBASEB3F_ROCKET1, 15 playmusic MUSIC_ROCKET_ENCOUNTER - spriteface $3, DOWN + spriteface TEAMROCKETBASEB3F_ROCKET1, DOWN loadfont writetext UnknownText_0x6e400 + waitbutton closetext - loadmovesprites - applymovement $3, MovementData_0x6e142 + applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e142 winlosstext UnknownText_0x6e511, 0 setlasttalked $3 - loadtrainer EXECUTIVEM, 4 + scriptedtrainerdata EXECUTIVEM, 4 startbattle returnafterbattle setevent EVENT_BEAT_ROCKET_EXECUTIVEM_4 loadfont writetext UnknownText_0x6e548 + waitbutton closetext - loadmovesprites - applymovement $3, MovementData_0x6e144 + applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e144 playsound SFX_TACKLE - applymovement $3, MovementData_0x6e147 - disappear $3 + applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e147 + disappear TEAMROCKETBASEB3F_ROCKET1 dotrigger $3 end MoltresScript_0x6e091: loadfont writetext UnknownText_0x6e585 + waitbutton closetext - loadmovesprites setevent EVENT_LEARNED_HAIL_GIOVANNI end @@ -120,11 +136,11 @@ TrainerGruntF5: trainer EVENT_BEAT_ROCKET_GRUNTF_5, GRUNTF, 5, GruntF5SeenText, GruntF5BeatenText, 0, GruntF5Script GruntF5Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x6e611 + waitbutton closetext - loadmovesprites setevent EVENT_LEARNED_SLOWPOKETAIL end @@ -132,11 +148,11 @@ TrainerGruntM28: trainer EVENT_BEAT_ROCKET_GRUNTM_28, GRUNTM, 28, GruntM28SeenText, GruntM28BeatenText, 0, GruntM28Script GruntM28Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x6e737 + waitbutton closetext - loadmovesprites setevent EVENT_LEARNED_RATICATE_TAIL end @@ -144,22 +160,22 @@ TrainerScientistRoss: trainer EVENT_BEAT_SCIENTIST_ROSS, SCIENTIST, ROSS, ScientistRossSeenText, ScientistRossBeatenText, 0, ScientistRossScript ScientistRossScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x6e822 + waitbutton closetext - loadmovesprites end TrainerScientistMitch: trainer EVENT_BEAT_SCIENTIST_MITCH, SCIENTIST, MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, 0, ScientistMitchScript ScientistMitchScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x6e90a + waitbutton closetext - loadmovesprites end BossDoor: @@ -176,19 +192,19 @@ BossDoor: .NeedsPassword writetext UnknownText_0x6e970 + waitbutton closetext - loadmovesprites end .OpenSesame writetext UnknownText_0x6e9a3 - closetext + waitbutton playsound SFX_ENTER_DOOR changeblock $a, $8, $7 reloadmappart - loadmovesprites + closetext setevent EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE - waitbutton + waitsfx end MapTeamRocketBaseB3FSignpost9Script: diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 3d9237d63..85c5a9bf1 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -1,3 +1,7 @@ +const_value set 2 + const TIMECAPSULE_CHRIS1 + const TIMECAPSULE_CHRIS2 + TimeCapsule_MapScriptHeader: .MapTriggers: db 2 @@ -23,13 +27,13 @@ TimeCapsule_MapScriptHeader: TimeCapsule_SetWhichChris: special Special_CableClubCheckWhichChris iffalse .Chris2 - disappear $3 - appear $2 + disappear TIMECAPSULE_CHRIS2 + appear TIMECAPSULE_CHRIS1 return .Chris2: - disappear $2 - appear $3 + disappear TIMECAPSULE_CHRIS1 + appear TIMECAPSULE_CHRIS2 return TimeCapsule_Initialize: @@ -45,8 +49,8 @@ MapTimeCapsuleSignpost1Script: ChrisScript_0x19351a: loadfont writetext UnknownText_0x193521 + waitbutton closetext - loadmovesprites end UnknownText_0x193521: diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 5ac0f1665..f2ee667e5 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -1,3 +1,15 @@ +const_value set 2 + const TINTOWER1F_SUICUNE + const TINTOWER1F_RAIKOU + const TINTOWER1F_ENTEI + const TINTOWER1F_SUPER_NERD + const TINTOWER1F_SAGE1 + const TINTOWER1F_SAGE2 + const TINTOWER1F_SAGE3 + const TINTOWER1F_SAGE4 + const TINTOWER1F_SAGE5 + const TINTOWER1F_SAGE6 + TinTower1F_MapScriptHeader: .MapTriggers: db 2 @@ -34,38 +46,38 @@ UnknownScript_0x18502f: UnknownScript_0x185047: checkevent EVENT_FOUGHT_HO_OH iffalse UnknownScript_0x18504f - appear $5 + appear TINTOWER1F_SUPER_NERD UnknownScript_0x18504f: return UnknownScript_0x185050: checkevent EVENT_FOUGHT_SUICUNE iftrue UnknownScript_0x185077 - appear $2 + appear TINTOWER1F_SUICUNE writebyte RAIKOU special SpecialMonCheck iftrue UnknownScript_0x185065 - appear $3 + appear TINTOWER1F_RAIKOU jump UnknownScript_0x185067 UnknownScript_0x185065: - disappear $3 + disappear TINTOWER1F_RAIKOU UnknownScript_0x185067: writebyte ENTEI special SpecialMonCheck iftrue UnknownScript_0x185074 - appear $4 + appear TINTOWER1F_ENTEI jump UnknownScript_0x185076 UnknownScript_0x185074: - disappear $4 + disappear TINTOWER1F_ENTEI UnknownScript_0x185076: return UnknownScript_0x185077: - disappear $2 - disappear $3 - disappear $4 + disappear TINTOWER1F_SUICUNE + disappear TINTOWER1F_RAIKOU + disappear TINTOWER1F_ENTEI clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 setevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 return @@ -83,40 +95,40 @@ UnknownScript_0x18508f: writebyte RAIKOU special SpecialMonCheck iftrue UnknownScript_0x1850b6 - applymovement $3, MovementData_0x1851d0 + applymovement TINTOWER1F_RAIKOU, MovementData_0x1851d0 spriteface PLAYER, LEFT cry RAIKOU pause 10 playsound SFX_WARP_FROM - applymovement $3, MovementData_0x1851d4 - disappear $3 + applymovement TINTOWER1F_RAIKOU, MovementData_0x1851d4 + disappear TINTOWER1F_RAIKOU playsound SFX_EXIT_BUILDING - waitbutton + waitsfx UnknownScript_0x1850b6: writebyte ENTEI special SpecialMonCheck iftrue UnknownScript_0x1850d7 - applymovement $4, MovementData_0x1851da + applymovement TINTOWER1F_ENTEI, MovementData_0x1851da spriteface PLAYER, RIGHT cry ENTEI pause 10 playsound SFX_WARP_FROM - applymovement $4, MovementData_0x1851de - disappear $4 + applymovement TINTOWER1F_ENTEI, MovementData_0x1851de + disappear TINTOWER1F_ENTEI playsound SFX_EXIT_BUILDING - waitbutton + waitsfx UnknownScript_0x1850d7: spriteface PLAYER, UP pause 10 applymovement PLAYER, MovementData_0x1851e8 - applymovement $2, MovementData_0x1851e4 + applymovement TINTOWER1F_SUICUNE, MovementData_0x1851e4 cry SUICUNE pause 20 - loadpokedata SUICUNE, 40 + scriptedpokedata SUICUNE, 40 writecode VAR_BATTLETYPE, BATTLETYPE_SUICUNE startbattle reloadmapmusic - disappear $2 + disappear TINTOWER1F_SUICUNE setevent EVENT_FOUGHT_SUICUNE setevent EVENT_SAW_SUICUNE_ON_ROUTE_42 domaptrigger ROUTE_42, $0 @@ -131,33 +143,33 @@ UnknownScript_0x1850d7: spriteface PLAYER, DOWN playmusic MUSIC_MYSTICALMAN_ENCOUNTER playsound SFX_ENTER_DOOR - moveperson $5, $a, $f - appear $5 - applymovement $5, MovementData_0x1851ec + moveperson TINTOWER1F_SUPER_NERD, $a, $f + appear TINTOWER1F_SUPER_NERD + applymovement TINTOWER1F_SUPER_NERD, MovementData_0x1851ec playsound SFX_ENTER_DOOR - moveperson $6, $9, $f - appear $6 - applymovement $6, MovementData_0x1851f5 + moveperson TINTOWER1F_SAGE1, $9, $f + appear TINTOWER1F_SAGE1 + applymovement TINTOWER1F_SAGE1, MovementData_0x1851f5 playsound SFX_ENTER_DOOR - moveperson $7, $9, $f - appear $7 - applymovement $7, MovementData_0x1851fb + moveperson TINTOWER1F_SAGE2, $9, $f + appear TINTOWER1F_SAGE2 + applymovement TINTOWER1F_SAGE2, MovementData_0x1851fb playsound SFX_ENTER_DOOR - moveperson $8, $9, $f - appear $8 - applymovement $8, MovementData_0x1851fe - moveperson $6, $7, $d - moveperson $7, $9, $d - moveperson $8, $b, $d + moveperson TINTOWER1F_SAGE3, $9, $f + appear TINTOWER1F_SAGE3 + applymovement TINTOWER1F_SAGE3, MovementData_0x1851fe + moveperson TINTOWER1F_SAGE1, $7, $d + moveperson TINTOWER1F_SAGE2, $9, $d + moveperson TINTOWER1F_SAGE3, $b, $d spriteface PLAYER, RIGHT loadfont writetext UnknownText_0x185203 + waitbutton closetext - loadmovesprites - applymovement $5, MovementData_0x1851f1 + applymovement TINTOWER1F_SUPER_NERD, MovementData_0x1851f1 playsound SFX_EXIT_BUILDING - disappear $5 - waitbutton + disappear TINTOWER1F_SUPER_NERD + waitsfx special Special_RotatePalettesRightMusic pause 20 playmapmusic @@ -190,26 +202,26 @@ SageScript_0x185188: writetext UnknownText_0x185629 keeptextopen verbosegiveitem RAINBOW_WING - loadmovesprites + closetext refreshscreen $0 earthquake 72 - waitbutton + waitsfx playsound SFX_STRENGTH changeblock $a, $2, $20 reloadmappart setevent EVENT_GOT_RAINBOW_WING - loadmovesprites + closetext loadfont UnknownScript_0x1851b0: writetext UnknownText_0x18564a + waitbutton closetext - loadmovesprites end UnknownScript_0x1851b6: writetext UnknownText_0x185803 + waitbutton closetext - loadmovesprites end SageScript_0x1851bc: diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm index 95c9724ea..e1689843e 100644 --- a/maps/TinTower2F.asm +++ b/maps/TinTower2F.asm @@ -1,3 +1,5 @@ +const_value set 2 + TinTower2F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 78f520a64..038afbc53 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -1,3 +1,6 @@ +const_value set 2 + const TINTOWER3F_POKE_BALL + TinTower3F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 9d4f1bb2c..b50356d88 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const TINTOWER4F_POKE_BALL1 + const TINTOWER4F_POKE_BALL2 + const TINTOWER4F_POKE_BALL3 + TinTower4F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index f946986e8..41bdb04ff 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -1,3 +1,6 @@ +const_value set 2 + const TINTOWER5F_POKE_BALL + TinTower5F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index 9063a82dd..82c6f41f4 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -1,3 +1,6 @@ +const_value set 2 + const TINTOWER6F_POKE_BALL + TinTower6F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index 0398ba0c3..2d6a4e4ce 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -1,3 +1,6 @@ +const_value set 2 + const TINTOWER7F_POKE_BALL + TinTower7F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index d89317a82..1a72e7690 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const TINTOWER8F_POKE_BALL1 + const TINTOWER8F_POKE_BALL2 + const TINTOWER8F_POKE_BALL3 + TinTower8F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 8e129a15b..02f24da7b 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -1,3 +1,6 @@ +const_value set 2 + const TINTOWER9F_POKE_BALL + TinTower9F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 09c6ef5e3..c2fe7a2f8 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -1,3 +1,6 @@ +const_value set 2 + const TINTOWERROOF_HO_OH + TinTowerRoof_MapScriptHeader: .MapTriggers: db 0 @@ -17,11 +20,11 @@ UnknownScript_0x77230: jump UnknownScript_0x77241 UnknownScript_0x7723e: - appear $2 + appear TINTOWERROOF_HO_OH return UnknownScript_0x77241: - disappear $2 + disappear TINTOWERROOF_HO_OH return HoOhScript_0x77244: @@ -30,12 +33,12 @@ HoOhScript_0x77244: writetext UnknownText_0x77260 cry HO_OH pause 15 - loadmovesprites + closetext setevent EVENT_FOUGHT_HO_OH writecode VAR_BATTLETYPE, BATTLETYPE_FORCEITEM - loadpokedata HO_OH, 60 + scriptedpokedata HO_OH, 60 startbattle - disappear $2 + disappear TINTOWERROOF_HO_OH returnafterbattle setevent EVENT_SET_WHEN_FOUGHT_HO_OH end diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index c14dba7b9..9145f9943 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -1,3 +1,6 @@ +const_value set 2 + const TOHJOFALLS_POKE_BALL + TohjoFalls_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index def2de6ec..96c126dcb 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -1,3 +1,7 @@ +const_value set 2 + const TRADECENTER_CHRIS1 + const TRADECENTER_CHRIS2 + TradeCenter_MapScriptHeader: .MapTriggers: db 2 @@ -23,13 +27,13 @@ TradeCenter_MapScriptHeader: TradeCenter_SetWhichChris: special Special_CableClubCheckWhichChris iffalse .Chris2 - disappear $3 - appear $2 + disappear TRADECENTER_CHRIS2 + appear TRADECENTER_CHRIS1 return .Chris2: - disappear $2 - appear $3 + disappear TRADECENTER_CHRIS1 + appear TRADECENTER_CHRIS2 return TradeCenter_Initialize: @@ -45,8 +49,8 @@ MapTradeCenterSignpost1Script: ChrisScript_0x19340b: loadfont writetext .FriendReadyText + waitbutton closetext - loadmovesprites end .FriendReadyText: diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index cbd68d69d..d196d9a47 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const TRAINERHOUSE1F_RECEPTIONIST + const TRAINERHOUSE1F_COOLTRAINER_M + const TRAINERHOUSE1F_COOLTRAINER_F + const TRAINERHOUSE1F_YOUNGSTER + const TRAINERHOUSE1F_GENTLEMAN + TrainerHouse1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index acb57b158..9ec37ceb7 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -1,3 +1,7 @@ +const_value set 2 + const TRAINERHOUSEB1F_RECEPTIONIST + const TRAINERHOUSEB1F_CHRIS + TrainerHouseB1F_MapScriptHeader: .MapTriggers: db 1 @@ -33,25 +37,25 @@ UnknownScript_0x9b3aa: iffalse UnknownScript_0x9b3ed setflag ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY writetext UnknownText_0x9b4a2 + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x9b401 loadfont writetext UnknownText_0x9b587 + waitbutton closetext - loadmovesprites special SpecialTrainerHouse iffalse UnknownScript_0x9b3dc winlosstext UnknownText_0x9b578, 0 setlasttalked $3 - loadtrainer CAL, CAL2 + scriptedtrainerdata CAL, CAL2 startbattle returnafterbattle iffalse UnknownScript_0x9b3e8 UnknownScript_0x9b3dc: winlosstext UnknownText_0x9b578, 0 setlasttalked $3 - loadtrainer CAL, CAL3 + scriptedtrainerdata CAL, CAL3 startbattle returnafterbattle UnknownScript_0x9b3e8: @@ -60,15 +64,15 @@ UnknownScript_0x9b3e8: UnknownScript_0x9b3ed: writetext UnknownText_0x9b4d6 + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x9b41d end UnknownScript_0x9b3f7: writetext UnknownText_0x9b51d + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x9b41d end diff --git a/maps/Underground.asm b/maps/Underground.asm index d021507f7..b88db2943 100644 --- a/maps/Underground.asm +++ b/maps/Underground.asm @@ -1,3 +1,5 @@ +const_value set 2 + Underground_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index f9cd1222f..77e87a9f4 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -1,3 +1,16 @@ +const_value set 2 + const UNDERGROUNDPATHSWITCHROOMENTRANCES_PHARMACIST1 + const UNDERGROUNDPATHSWITCHROOMENTRANCES_PHARMACIST2 + const UNDERGROUNDPATHSWITCHROOMENTRANCES_ROCKET1 + const UNDERGROUNDPATHSWITCHROOMENTRANCES_ROCKET2 + const UNDERGROUNDPATHSWITCHROOMENTRANCES_ROCKET3 + const UNDERGROUNDPATHSWITCHROOMENTRANCES_ROCKET_GIRL + const UNDERGROUNDPATHSWITCHROOMENTRANCES_TEACHER + const UNDERGROUNDPATHSWITCHROOMENTRANCES_SUPER_NERD + const UNDERGROUNDPATHSWITCHROOMENTRANCES_POKE_BALL1 + const UNDERGROUNDPATHSWITCHROOMENTRANCES_POKE_BALL2 + const UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER + UndergroundPathSwitchRoomEntrances_MapScriptHeader: .MapTriggers: db 2 @@ -83,16 +96,16 @@ UnknownScript_0x7ca80: special Special_RotatePalettesRightMusic pause 15 playsound SFX_EXIT_BUILDING - appear $c - waitbutton - applymovement $c, MovementData_0x7ce87 + appear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER + waitsfx + applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, MovementData_0x7ce87 spriteface PLAYER, RIGHT scall UnknownScript_0x7cad4 - applymovement $c, MovementData_0x7ce92 + applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, MovementData_0x7ce92 playsound SFX_EXIT_BUILDING - disappear $c + disappear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER dotrigger $1 - waitbutton + waitsfx playmapmusic end @@ -102,16 +115,16 @@ UnknownScript_0x7caaa: special Special_RotatePalettesRightMusic pause 15 playsound SFX_EXIT_BUILDING - appear $c - waitbutton - applymovement $c, MovementData_0x7ce8c + appear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER + waitsfx + applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, MovementData_0x7ce8c spriteface PLAYER, RIGHT scall UnknownScript_0x7cad4 - applymovement $c, MovementData_0x7ce97 + applymovement UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER, MovementData_0x7ce97 playsound SFX_EXIT_BUILDING - disappear $c + disappear UNDERGROUNDPATHSWITCHROOMENTRANCES_SILVER dotrigger $1 - waitbutton + waitsfx playmapmusic end @@ -124,8 +137,8 @@ UnknownScript_0x7cae1: playmusic MUSIC_RIVAL_ENCOUNTER loadfont writetext UnknownText_0x7ce9d + waitbutton closetext - loadmovesprites setevent EVENT_RIVAL_UNDERGROUND_PATH checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x7cb09 @@ -133,7 +146,7 @@ UnknownScript_0x7cae1: iftrue UnknownScript_0x7cb19 winlosstext UnknownText_0x7cf5d, UnknownText_0x7d102 setlasttalked $c - loadtrainer RIVAL1, RIVAL1_12 + scriptedtrainerdata RIVAL1, RIVAL1_12 startbattle reloadmapmusic returnafterbattle @@ -142,7 +155,7 @@ UnknownScript_0x7cae1: UnknownScript_0x7cb09: winlosstext UnknownText_0x7cf5d, UnknownText_0x7d102 setlasttalked $c - loadtrainer RIVAL1, RIVAL1_10 + scriptedtrainerdata RIVAL1, RIVAL1_10 startbattle reloadmapmusic returnafterbattle @@ -151,7 +164,7 @@ UnknownScript_0x7cb09: UnknownScript_0x7cb19: winlosstext UnknownText_0x7cf5d, UnknownText_0x7d102 setlasttalked $c - loadtrainer RIVAL1, RIVAL1_11 + scriptedtrainerdata RIVAL1, RIVAL1_11 startbattle reloadmapmusic returnafterbattle @@ -161,74 +174,74 @@ UnknownScript_0x7cb29: playmusic MUSIC_RIVAL_AFTER loadfont writetext UnknownText_0x7cfc2 + waitbutton closetext - loadmovesprites end TrainerGruntM11: trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, 11, GruntM11SeenText, GruntM11BeatenText, 0, GruntM11Script GruntM11Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7d290 + waitbutton closetext - loadmovesprites end TrainerGruntM25: trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, 25, GruntM25SeenText, GruntM25BeatenText, 0, GruntM25Script GruntM25Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7d347 + waitbutton closetext - loadmovesprites end TrainerBurglarDuncan: trainer EVENT_BEAT_BURGLAR_DUNCAN, BURGLAR, DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, 0, BurglarDuncanScript BurglarDuncanScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7d3cf + waitbutton closetext - loadmovesprites end TrainerBurglarEddie: trainer EVENT_BEAT_BURGLAR_EDDIE, BURGLAR, EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, 0, BurglarEddieScript BurglarEddieScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7d45b + waitbutton closetext - loadmovesprites end TrainerGruntM13: trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, 13, GruntM13SeenText, GruntM13BeatenText, 0, GruntM13Script GruntM13Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7d51f + waitbutton closetext - loadmovesprites end TrainerGruntF3: trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, 3, GruntF3SeenText, GruntF3BeatenText, 0, GruntF3Script GruntF3Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7d5e6 + waitbutton closetext - loadmovesprites end MapUndergroundPathSwitchRoomEntrancesSignpost0Script: @@ -336,7 +349,7 @@ UnknownScript_0x7cc70: jump UnknownScript_0x7cc8d UnknownScript_0x7cc8b: - loadmovesprites + closetext end UnknownScript_0x7cc8d: @@ -363,7 +376,7 @@ UnknownScript_0x7ccb0: scall UnknownScript_0x7ce65 scall UnknownScript_0x7ce71 reloadmappart - loadmovesprites + closetext end UnknownScript_0x7ccd7: @@ -376,7 +389,7 @@ UnknownScript_0x7ccd7: scall UnknownScript_0x7ce59 scall UnknownScript_0x7ce71 reloadmappart - loadmovesprites + closetext end UnknownScript_0x7ccf2: @@ -389,7 +402,7 @@ UnknownScript_0x7ccf2: scall UnknownScript_0x7ce65 scall UnknownScript_0x7ce71 reloadmappart - loadmovesprites + closetext end UnknownScript_0x7cd0d: @@ -402,7 +415,7 @@ UnknownScript_0x7cd0d: scall UnknownScript_0x7ce59 scall UnknownScript_0x7ce71 reloadmappart - loadmovesprites + closetext end UnknownScript_0x7cd28: @@ -415,7 +428,7 @@ UnknownScript_0x7cd28: scall UnknownScript_0x7ce65 scall UnknownScript_0x7ce71 reloadmappart - loadmovesprites + closetext end UnknownScript_0x7cd43: @@ -428,7 +441,7 @@ UnknownScript_0x7cd43: scall UnknownScript_0x7ce59 scall UnknownScript_0x7ce71 reloadmappart - loadmovesprites + closetext end UnknownScript_0x7cd5e: @@ -441,7 +454,7 @@ UnknownScript_0x7cd5e: scall UnknownScript_0x7ce41 scall UnknownScript_0x7ce65 reloadmappart - loadmovesprites + closetext end UnknownScript_0x7cd79: @@ -458,7 +471,7 @@ UnknownScript_0x7cd79: scall UnknownScript_0x7ce65 scall UnknownScript_0x7ce05 reloadmappart - loadmovesprites + closetext writebyte $6 copyvartobyte UndergroundSwitchPositions end diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index 1f04c7d82..5729a3c6d 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -1,3 +1,12 @@ +const_value set 2 + const UNDERGROUNDWAREHOUSE_ROCKET1 + const UNDERGROUNDWAREHOUSE_ROCKET2 + const UNDERGROUNDWAREHOUSE_ROCKET3 + const UNDERGROUNDWAREHOUSE_GENTLEMAN + const UNDERGROUNDWAREHOUSE_POKE_BALL1 + const UNDERGROUNDWAREHOUSE_POKE_BALL2 + const UNDERGROUNDWAREHOUSE_POKE_BALL3 + UndergroundWarehouse_MapScriptHeader: .MapTriggers: db 0 @@ -33,33 +42,33 @@ TrainerGruntM24: trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, 24, GruntM24SeenText, GruntM24BeatenText, 0, GruntM24Script GruntM24Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7da48 + waitbutton closetext - loadmovesprites end TrainerGruntM14: trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, 14, GruntM14SeenText, GruntM14BeatenText, 0, GruntM14Script GruntM14Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7db01 + waitbutton closetext - loadmovesprites end TrainerGruntM15: trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, 15, GruntM15SeenText, GruntM15BeatenText, 0, GruntM15Script GruntM15Script: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7db8e + waitbutton closetext - loadmovesprites end GentlemanScript_0x7d9bf: @@ -78,8 +87,8 @@ GentlemanScript_0x7d9bf: keeptextopen UnknownScript_0x7d9de: writetext UnknownText_0x7dc8d + waitbutton closetext - loadmovesprites end ItemFragment_0x7d9e4: diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index cf9b6ed88..fdc84a956 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -1,3 +1,14 @@ +const_value set 2 + const UNIONCAVE1F_POKEFAN_M1 + const UNIONCAVE1F_SUPER_NERD + const UNIONCAVE1F_POKEFAN_M2 + const UNIONCAVE1F_FISHER1 + const UNIONCAVE1F_FISHER2 + const UNIONCAVE1F_POKE_BALL1 + const UNIONCAVE1F_POKE_BALL2 + const UNIONCAVE1F_POKE_BALL3 + const UNIONCAVE1F_POKE_BALL4 + UnionCave1F_MapScriptHeader: .MapTriggers: db 0 @@ -9,55 +20,55 @@ TrainerPokemaniacLarry: trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, PokemaniacLarryScript PokemaniacLarryScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x59d31 + waitbutton closetext - loadmovesprites end TrainerHikerRussell: trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, HikerRussellScript HikerRussellScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x59c6c + waitbutton closetext - loadmovesprites end TrainerHikerDaniel: trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, HikerDanielScript HikerDanielScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x59dc9 + waitbutton closetext - loadmovesprites end TrainerFirebreatherBill: trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, FirebreatherBillScript FirebreatherBillScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x59e6f + waitbutton closetext - loadmovesprites end TrainerFirebreatherRay: trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, FirebreatherRayScript FirebreatherRayScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x59efc + waitbutton closetext - loadmovesprites end ItemFragment_0x59c00: diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index d8cbad843..278e414d1 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -1,3 +1,12 @@ +const_value set 2 + const UNIONCAVEB1F_POKEFAN_M1 + const UNIONCAVEB1F_POKEFAN_M2 + const UNIONCAVEB1F_SUPER_NERD1 + const UNIONCAVEB1F_SUPER_NERD2 + const UNIONCAVEB1F_POKE_BALL1 + const UNIONCAVEB1F_BOULDER + const UNIONCAVEB1F_POKE_BALL2 + UnionCaveB1F_MapScriptHeader: .MapTriggers: db 0 @@ -9,44 +18,44 @@ TrainerPokemaniacAndrew: trainer EVENT_BEAT_POKEMANIAC_ANDREW, POKEMANIAC, ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, PokemaniacAndrewScript PokemaniacAndrewScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5a181 + waitbutton closetext - loadmovesprites end TrainerPokemaniacCalvin: trainer EVENT_BEAT_POKEMANIAC_CALVIN, POKEMANIAC, CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, PokemaniacCalvinScript PokemaniacCalvinScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5a230 + waitbutton closetext - loadmovesprites end TrainerHikerPhillip: trainer EVENT_BEAT_HIKER_PHILLIP, HIKER, PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, HikerPhillipScript HikerPhillipScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5a073 + waitbutton closetext - loadmovesprites end TrainerHikerLeonard: trainer EVENT_BEAT_HIKER_LEONARD, HIKER, LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, HikerLeonardScript HikerLeonardScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5a0fb + waitbutton closetext - loadmovesprites end ItemFragment_0x5a016: diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index a0e1c24e3..97c558c97 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -1,3 +1,11 @@ +const_value set 2 + const UNIONCAVEB2F_ROCKER + const UNIONCAVEB2F_COOLTRAINER_F1 + const UNIONCAVEB2F_COOLTRAINER_F2 + const UNIONCAVEB2F_POKE_BALL1 + const UNIONCAVEB2F_POKE_BALL2 + const UNIONCAVEB2F_SURF + UnionCaveB2F_MapScriptHeader: .MapTriggers: db 0 @@ -15,19 +23,19 @@ UnknownScript_0x5a30d: checkcode VAR_WEEKDAY if_equal FRIDAY, UnknownScript_0x5a31c UnknownScript_0x5a319: - disappear $7 + disappear UNIONCAVEB2F_SURF return UnknownScript_0x5a31c: - appear $7 + appear UNIONCAVEB2F_SURF return SurfScript_0x5a31f: faceplayer cry LAPRAS - loadpokedata LAPRAS, 20 + scriptedpokedata LAPRAS, 20 startbattle - disappear $7 + disappear UNIONCAVEB2F_SURF setflag ENGINE_UNION_CAVE_LAPRAS returnafterbattle end @@ -36,33 +44,33 @@ TrainerCooltrainermNick: trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, CooltrainermNickScript CooltrainermNickScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5a3f0 + waitbutton closetext - loadmovesprites end TrainerCooltrainerfGwen: trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, CooltrainerfGwenScript CooltrainerfGwenScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5a488 + waitbutton closetext - loadmovesprites end TrainerCooltrainerfEmma: trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, CooltrainerfEmmaScript CooltrainerfEmmaScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x5a52b + waitbutton closetext - loadmovesprites end ItemFragment_0x5a36a: diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 426cc8249..9fe5e31d3 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -1,3 +1,11 @@ +const_value set 2 + const VERMILIONCITY_TEACHER + const VERMILIONCITY_GRAMPS + const VERMILIONCITY_MACHOP + const VERMILIONCITY_SUPER_NERD + const VERMILIONCITY_BIG_SNORLAX + const VERMILIONCITY_POKEFAN_M + VermilionCity_MapScriptHeader: .MapTriggers: db 0 @@ -22,13 +30,13 @@ VermilionMachop: loadfont writetext UnknownText_0x1aaaca cry MACHOP + waitbutton closetext - loadmovesprites earthquake 30 loadfont writetext UnknownText_0x1aaae2 + waitbutton closetext - loadmovesprites end SuperNerdScript_0x1aa99b: @@ -39,19 +47,19 @@ VermilionSnorlax: special SpecialSnorlaxAwake iftrue UnknownScript_0x1aa9ab writetext UnknownText_0x1aab64 + waitbutton closetext - loadmovesprites end UnknownScript_0x1aa9ab: writetext UnknownText_0x1aab84 pause 15 cry SNORLAX - loadmovesprites + closetext writecode VAR_BATTLETYPE, BATTLETYPE_FORCEITEM - loadpokedata SNORLAX, 50 + scriptedpokedata SNORLAX, 50 startbattle - disappear $6 + disappear VERMILIONCITY_BIG_SNORLAX setevent EVENT_FOUGHT_SNORLAX returnafterbattle end @@ -66,20 +74,20 @@ VermilionGymBadgeGuy: if_greater_than 13, .MostBadges if_greater_than 9, .SomeBadges writetext UnknownText_0x1aabc8 + waitbutton closetext - loadmovesprites end .SomeBadges writetext UnknownText_0x1aac2b + waitbutton closetext - loadmovesprites end .MostBadges writetext UnknownText_0x1aac88 + waitbutton closetext - loadmovesprites end .AllBadges @@ -90,9 +98,9 @@ VermilionGymBadgeGuy: setevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY .AlreadyGotItem writetext UnknownText_0x1aad4a - closetext + waitbutton .Done - loadmovesprites + closetext end VermilionCitySign: diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 17c51ff47..a40359d7d 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -1,3 +1,10 @@ +const_value set 2 + const VERMILIONGYM_SURGE + const VERMILIONGYM_GENTLEMAN + const VERMILIONGYM_ROCKER + const VERMILIONGYM_SUPER_NERD + const VERMILIONGYM_GYM_GUY + VermilionGym_MapScriptHeader: .MapTriggers: db 0 @@ -11,10 +18,10 @@ SurgeScript_0x1920a5: checkflag ENGINE_THUNDERBADGE iftrue .FightDone writetext UnknownText_0x192142 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x192238, 0 - loadtrainer LT_SURGE, 1 + scriptedtrainerdata LT_SURGE, 1 startbattle returnafterbattle setevent EVENT_BEAT_LTSURGE @@ -24,50 +31,50 @@ SurgeScript_0x1920a5: loadfont writetext UnknownText_0x192277 playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_THUNDERBADGE writetext UnknownText_0x192291 + waitbutton closetext - loadmovesprites end .FightDone writetext UnknownText_0x192303 + waitbutton closetext - loadmovesprites end TrainerGentlemanGregory: trainer EVENT_BEAT_GENTLEMAN_GREGORY, GENTLEMAN, GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, GentlemanGregoryScript GentlemanGregoryScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1923b0 + waitbutton closetext - loadmovesprites end TrainerGuitaristVincent: trainer EVENT_BEAT_GUITARIST_VINCENT, GUITARIST, VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, GuitaristVincentScript GuitaristVincentScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x19244b + waitbutton closetext - loadmovesprites end TrainerJugglerHorton: trainer EVENT_BEAT_JUGGLER_HORTON, JUGGLER, HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, JugglerHortonScript JugglerHortonScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x1924d6 + waitbutton closetext - loadmovesprites end VermilionGymGuyScript: @@ -76,14 +83,14 @@ VermilionGymGuyScript: checkevent EVENT_BEAT_LTSURGE iftrue .VermilionGymGuyWinScript writetext VermilionGymGuyText + waitbutton closetext - loadmovesprites end .VermilionGymGuyWinScript writetext VermilionGymGuyWinText + waitbutton closetext - loadmovesprites end MapVermilionGymSignpost14Script: diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm index 96e683728..1f1f42e66 100644 --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const VERMILIONHOUSEDIGLETTSCAVESPEECHHOUSE_GENTLEMAN + VermilionHouseDiglettsCaveSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionHouseFishingSpeechHouse.asm index fc784e562..3571d066f 100644 --- a/maps/VermilionHouseFishingSpeechHouse.asm +++ b/maps/VermilionHouseFishingSpeechHouse.asm @@ -1,3 +1,6 @@ +const_value set 2 + const VERMILIONHOUSEFISHINGSPEECHHOUSE_FISHING_GURU + VermilionHouseFishingSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index b9b86a019..c07f6ca28 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const VERMILIONMAGNETTRAINSPEECHHOUSE_POKEFAN_F + const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER + VermilionMagnetTrainSpeechHouse_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index b1f33863e..d671008b5 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const VERMILIONMART_CLERK + const VERMILIONMART_SUPER_NERD + const VERMILIONMART_BUENA + VermilionMart_MapScriptHeader: .MapTriggers: db 0 @@ -8,7 +13,7 @@ VermilionMart_MapScriptHeader: ClerkScript_0x191f7e: loadfont pokemart MARTTYPE_STANDARD, MART_VERMILION - loadmovesprites + closetext end SuperNerdScript_0x191f85: diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokeCenter1F.asm index 300f70722..725567083 100644 --- a/maps/VermilionPokeCenter1F.asm +++ b/maps/VermilionPokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const VERMILIONPOKECENTER1F_NURSE + const VERMILIONPOKECENTER1F_FISHING_GURU + const VERMILIONPOKECENTER1F_SAILOR + const VERMILIONPOKECENTER1F_BUG_CATCHER + VermilionPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -14,14 +20,14 @@ FishingGuruScript_0x191606: checkevent EVENT_FOUGHT_SNORLAX iftrue UnknownScript_0x191614 writetext UnknownText_0x191620 + waitbutton closetext - loadmovesprites end UnknownScript_0x191614: writetext UnknownText_0x191698 + waitbutton closetext - loadmovesprites end SailorScript_0x19161a: diff --git a/maps/VermilionPokeCenter2FBeta.asm b/maps/VermilionPokeCenter2FBeta.asm index 3d8ad1efc..3d97cfd04 100644 --- a/maps/VermilionPokeCenter2FBeta.asm +++ b/maps/VermilionPokeCenter2FBeta.asm @@ -1,3 +1,5 @@ +const_value set 2 + VermilionPokeCenter2FBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index c9cb32207..4a5e4e1d3 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -1,3 +1,8 @@ +const_value set 2 + const VERMILIONPORT_SAILOR1 + const VERMILIONPORT_SAILOR2 + const VERMILIONPORT_SUPER_NERD + VermilionPort_MapScriptHeader: .MapTriggers: db 2 @@ -25,7 +30,7 @@ VermilionPort_MapScriptHeader: UnknownScript_0x74da6: applymovement PLAYER, MovementData_0x74ef3 - appear $2 + appear VERMILIONPORT_SAILOR1 dotrigger $0 setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 setevent EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN @@ -42,17 +47,17 @@ SailorScript_0x74dc4: checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74e1a writetext UnknownText_0x74f06 + waitbutton closetext - loadmovesprites - spriteface $2, DOWN + spriteface VERMILIONPORT_SAILOR1, DOWN pause 10 playsound SFX_EXIT_BUILDING - disappear $2 - waitbutton + disappear VERMILIONPORT_SAILOR1 + waitsfx applymovement PLAYER, MovementData_0x74ef1 playsound SFX_EXIT_BUILDING special FadeOutPalettes - waitbutton + waitsfx setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND clearevent EVENT_BEAT_POKEMANIAC_ETHAN @@ -66,19 +71,19 @@ SailorScript_0x74dc4: clearevent EVENT_BEAT_SCHOOLBOY_NATE clearevent EVENT_BEAT_SCHOOLBOY_RICKY setevent EVENT_FAST_SHIP_DESTINATION_OLIVINE - appear $2 + appear VERMILIONPORT_SAILOR1 domaptrigger FAST_SHIP_1F, $1 warp FAST_SHIP_1F, $19, $1 end UnknownScript_0x74e1a: writetext UnknownText_0x74f31 + waitbutton closetext - loadmovesprites end UnknownScript_0x74e20: - spriteface $3, RIGHT + spriteface VERMILIONPORT_SAILOR2, RIGHT checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74e86 checkevent EVENT_RECEIVED_BALLS_FROM_KURT @@ -99,30 +104,30 @@ UnknownScript_0x74e20: checkitem S_S_TICKET iffalse UnknownScript_0x74e68 writetext UnknownText_0x74fc2 + waitbutton closetext - loadmovesprites setevent EVENT_RECEIVED_BALLS_FROM_KURT applymovement PLAYER, MovementData_0x74ef8 jump SailorScript_0x74dc4 UnknownScript_0x74e68: writetext UnknownText_0x74ff2 + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x74ef5 end UnknownScript_0x74e72: writetext UnknownText_0x75059 + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x74ef5 end UnknownScript_0x74e7c: writetext UnknownText_0x75080 + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x74ef5 end @@ -131,14 +136,14 @@ UnknownScript_0x74e86: UnknownScript_0x74e87: writetext UnknownText_0x74fa7 + waitbutton closetext - loadmovesprites end UnknownScript_0x74e8d: writetext UnknownText_0x74fa7 + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x74ef5 end @@ -161,36 +166,36 @@ SailorScript_0x74e97: checkitem S_S_TICKET iffalse UnknownScript_0x74ed4 writetext UnknownText_0x74fc2 + waitbutton closetext - loadmovesprites setevent EVENT_RECEIVED_BALLS_FROM_KURT applymovement PLAYER, MovementData_0x74efe jump SailorScript_0x74dc4 UnknownScript_0x74ed4: writetext UnknownText_0x74ff2 + waitbutton closetext - loadmovesprites end UnknownScript_0x74eda: writetext UnknownText_0x75059 + waitbutton closetext - loadmovesprites end UnknownScript_0x74ee0: writetext UnknownText_0x75080 + waitbutton closetext - loadmovesprites end SuperNerdScript_0x74ee6: faceplayer loadfont writetext UnknownText_0x750a6 + waitbutton closetext - loadmovesprites end MapVermilionPortSignpostItem0: diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 29b61c72e..8acb74505 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -1,3 +1,6 @@ +const_value set 2 + const VERMILIONPORTPASSAGE_TEACHER + VermilionPortPassage_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 25f58022e..d4e3840bb 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -1,3 +1,11 @@ +const_value set 2 + const VICTORYROAD_SILVER + const VICTORYROAD_POKE_BALL1 + const VICTORYROAD_POKE_BALL2 + const VICTORYROAD_POKE_BALL3 + const VICTORYROAD_POKE_BALL4 + const VICTORYROAD_POKE_BALL5 + VictoryRoad_MapScriptHeader: .MapTriggers: db 2 @@ -16,16 +24,16 @@ UnknownScript_0x74491: end UnknownScript_0x74492: - moveperson $2, $12, $b + moveperson VICTORYROAD_SILVER, $12, $b spriteface PLAYER, DOWN showemote EMOTE_SHOCK, PLAYER, 15 special Special_RotatePalettesRightMusic pause 15 - appear $2 - applymovement $2, MovementData_0x74539 + appear VICTORYROAD_SILVER + applymovement VICTORYROAD_SILVER, MovementData_0x74539 scall UnknownScript_0x744d4 - applymovement $2, MovementData_0x7454c - disappear $2 + applymovement VICTORYROAD_SILVER, MovementData_0x7454c + disappear VICTORYROAD_SILVER dotrigger $1 playmapmusic end @@ -35,11 +43,11 @@ UnknownScript_0x744b5: showemote EMOTE_SHOCK, PLAYER, 15 special Special_RotatePalettesRightMusic pause 15 - appear $2 - applymovement $2, MovementData_0x74542 + appear VICTORYROAD_SILVER + applymovement VICTORYROAD_SILVER, MovementData_0x74542 scall UnknownScript_0x744d4 - applymovement $2, MovementData_0x74555 - disappear $2 + applymovement VICTORYROAD_SILVER, MovementData_0x74555 + disappear VICTORYROAD_SILVER dotrigger $1 playmapmusic end @@ -49,8 +57,8 @@ UnknownScript_0x744d4: playmusic MUSIC_RIVAL_ENCOUNTER loadfont writetext UnknownText_0x7455f + waitbutton closetext - loadmovesprites setevent EVENT_RIVAL_VICTORY_ROAD checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x744ff @@ -58,7 +66,7 @@ UnknownScript_0x744d4: iftrue UnknownScript_0x7450f winlosstext UnknownText_0x7463d, UnknownText_0x747aa setlasttalked $2 - loadtrainer RIVAL1, RIVAL1_15 + scriptedtrainerdata RIVAL1, RIVAL1_15 startbattle reloadmapmusic returnafterbattle @@ -67,7 +75,7 @@ UnknownScript_0x744d4: UnknownScript_0x744ff: winlosstext UnknownText_0x7463d, UnknownText_0x747aa setlasttalked $2 - loadtrainer RIVAL1, RIVAL1_13 + scriptedtrainerdata RIVAL1, RIVAL1_13 startbattle reloadmapmusic returnafterbattle @@ -76,7 +84,7 @@ UnknownScript_0x744ff: UnknownScript_0x7450f: winlosstext UnknownText_0x7463d, UnknownText_0x747aa setlasttalked $2 - loadtrainer RIVAL1, RIVAL1_14 + scriptedtrainerdata RIVAL1, RIVAL1_14 startbattle reloadmapmusic returnafterbattle @@ -86,8 +94,8 @@ UnknownScript_0x7451f: playmusic MUSIC_RIVAL_AFTER loadfont writetext UnknownText_0x746ce + waitbutton closetext - loadmovesprites end ItemFragment_0x74529: diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index aca132bd1..0de55de72 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -1,3 +1,8 @@ +const_value set 2 + const VICTORYROADGATE_OFFICER + const VICTORYROADGATE_BLACK_BELT1 + const VICTORYROADGATE_BLACK_BELT2 + VictoryRoadGate_MapScriptHeader: .MapTriggers: db 2 @@ -28,15 +33,15 @@ UnknownScript_0x9ba04: checkcode VAR_BADGES if_greater_than 7, UnknownScript_0x9ba19 writetext UnknownText_0x9ba5f + waitbutton closetext - loadmovesprites applymovement PLAYER, MovementData_0x9ba27 end UnknownScript_0x9ba19: writetext UnknownText_0x9bab4 + waitbutton closetext - loadmovesprites dotrigger $1 end diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 248e3e564..1dea698bc 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -1,3 +1,13 @@ +const_value set 2 + const VIOLETCITY_FISHER + const VIOLETCITY_LASS + const VIOLETCITY_SUPER_NERD + const VIOLETCITY_GRAMPS + const VIOLETCITY_YOUNGSTER + const VIOLETCITY_FRUIT_TREE + const VIOLETCITY_POKE_BALL1 + const VIOLETCITY_POKE_BALL2 + VioletCity_MapScriptHeader: .MapTriggers: db 0 @@ -13,7 +23,7 @@ VioletCity_MapScriptHeader: return FisherScript_0x1a83bb: - applymovement $2, MovementData_0x1a8465 + applymovement VIOLETCITY_FISHER, MovementData_0x1a8465 faceplayer loadfont writetext UnknownText_0x1a8473 @@ -23,31 +33,31 @@ FisherScript_0x1a83bb: UnknownScript_0x1a83cb: writetext UnknownText_0x1a84ac + waitbutton closetext - loadmovesprites end UnknownScript_0x1a83d1: writetext UnknownText_0x1a84cb + waitbutton closetext - loadmovesprites playmusic MUSIC_SHOW_ME_AROUND - follow $2, PLAYER - applymovement $2, MovementData_0x1a842a + follow VIOLETCITY_FISHER, PLAYER + applymovement VIOLETCITY_FISHER, MovementData_0x1a842a spriteface PLAYER, UP - applymovement $2, MovementData_0x1a8465 + applymovement VIOLETCITY_FISHER, MovementData_0x1a8465 stopfollow special RestartMapMusic loadfont writetext UnknownText_0x1a84f9 + waitbutton closetext - loadmovesprites - applymovement $2, MovementData_0x1a8465 - applymovement $2, MovementData_0x1a8463 + applymovement VIOLETCITY_FISHER, MovementData_0x1a8465 + applymovement VIOLETCITY_FISHER, MovementData_0x1a8463 playsound SFX_ENTER_DOOR - disappear $2 + disappear VIOLETCITY_FISHER clearevent EVENT_EARLS_ACADEMY_EARL - waitbutton + waitsfx end LassScript_0x1a8403: diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 7b9d36025..1d9ad0668 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -1,3 +1,9 @@ +const_value set 2 + const VIOLETGYM_FALKNER + const VIOLETGYM_YOUNGSTER1 + const VIOLETGYM_YOUNGSTER2 + const VIOLETGYM_GYM_GUY + VioletGym_MapScriptHeader: .MapTriggers: db 0 @@ -11,17 +17,17 @@ FalknerScript_0x683c2: checkevent EVENT_BEAT_FALKNER iftrue .FightDone writetext UnknownText_0x68473 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x6854a, 0 - loadtrainer FALKNER, 1 + scriptedtrainerdata FALKNER, 1 startbattle returnafterbattle setevent EVENT_BEAT_FALKNER loadfont writetext UnknownText_0x685af playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_ZEPHYRBADGE checkcode VAR_BADGES scall VioletGymTriggerRockets @@ -38,15 +44,15 @@ FalknerScript_0x683c2: iffalse .NoRoomForMudSlap setevent EVENT_GOT_TM31_MUD_SLAP writetext UnknownText_0x68648 + waitbutton closetext - loadmovesprites end .SpeechAfterTM: writetext UnknownText_0x68735 - closetext + waitbutton .NoRoomForMudSlap: - loadmovesprites + closetext end VioletGymTriggerRockets: @@ -64,22 +70,22 @@ TrainerBird_keeperRod: trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, Bird_keeperRodSeenText, Bird_keeperRodBeatenText, 0, Bird_keeperRodScript Bird_keeperRodScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x68837 + waitbutton closetext - loadmovesprites end TrainerBird_keeperAbe: trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, Bird_keeperAbeSeenText, Bird_keeperAbeBeatenText, 0, Bird_keeperAbeScript Bird_keeperAbeScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x688c7 + waitbutton closetext - loadmovesprites end VioletGymGuyScript: @@ -88,14 +94,14 @@ VioletGymGuyScript: checkevent EVENT_BEAT_FALKNER iftrue .VioletGymGuyWinScript writetext VioletGymGuyText + waitbutton closetext - loadmovesprites end .VioletGymGuyWinScript writetext VioletGymGuyWinText + waitbutton closetext - loadmovesprites end VioletGymStatue: diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index f338b7086..f6c47e08f 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const VIOLETMART_CLERK + const VIOLETMART_GRANNY + const VIOLETMART_COOLTRAINER_M + VioletMart_MapScriptHeader: .MapTriggers: db 0 @@ -8,7 +13,7 @@ VioletMart_MapScriptHeader: ClerkScript_0x68295: loadfont pokemart MARTTYPE_STANDARD, MART_VIOLET - loadmovesprites + closetext end GrannyScript_0x6829c: diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index 28ed77051..d23891e32 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -1,3 +1,8 @@ +const_value set 2 + const VIOLETNICKNAMESPEECHHOUSE_TEACHER + const VIOLETNICKNAMESPEECHHOUSE_LASS + const VIOLETNICKNAMESPEECHHOUSE_BIRD + VioletNicknameSpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -16,8 +21,8 @@ BirdScript_0x693ef: loadfont writetext UnknownText_0x6947c cry PIDGEY + waitbutton closetext - loadmovesprites end UnknownText_0x693fa: diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletOnixTradeHouse.asm index bbdf8639b..76ce91e2c 100644 --- a/maps/VioletOnixTradeHouse.asm +++ b/maps/VioletOnixTradeHouse.asm @@ -1,3 +1,7 @@ +const_value set 2 + const VIOLETONIXTRADEHOUSE_POKEFAN_M + const VIOLETONIXTRADEHOUSE_YOUNGSTER + VioletOnixTradeHouse_MapScriptHeader: .MapTriggers: db 0 @@ -12,8 +16,8 @@ YoungsterScript_0x69990: faceplayer loadfont trade $1 + waitbutton closetext - loadmovesprites end UnknownText_0x69997: diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm index 94d56df43..8c6195b38 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokeCenter1F.asm @@ -1,3 +1,10 @@ +const_value set 2 + const VIOLETPOKECENTER1F_NURSE + const VIOLETPOKECENTER1F_GAMEBOY_KID + const VIOLETPOKECENTER1F_GENTLEMAN + const VIOLETPOKECENTER1F_YOUNGSTER + const VIOLETPOKECENTER1F_SCIENTIST + VioletPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -5,71 +12,71 @@ VioletPokeCenter1F_MapScriptHeader: .MapCallbacks: db 0 -NurseScript_0x694c9: +VioletPokeCenterNurse: jumpstd pokecenternurse -ScientistScript_0x694cc: +VioletPokeCenter1F_ElmsAideScript: faceplayer loadfont checkevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE - iftrue UnknownScript_0x6953a + iftrue .SecondTimeAsking writetext UnknownText_0x69555 -UnknownScript_0x694d7: +.AskTakeEgg: yesorno - iffalse UnknownScript_0x69531 + iffalse .RefusedEgg checkcode VAR_PARTYCOUNT - if_equal $6, UnknownScript_0x6952b + if_equal PARTY_LENGTH, .PartyFull giveegg TOGEPI, 5 stringtotext .eggname, $1 - scall UnknownScript_0x69527 + scall .AideGivesEgg setevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE clearevent EVENT_ELMS_AIDE_IN_LAB clearevent EVENT_TOGEPI_HATCHED domaptrigger ROUTE_32, $1 writetext UnknownText_0x695c5 + waitbutton closetext - loadmovesprites checkcode VAR_FACING - if_equal $1, .UnknownScript_0x69511 + if_equal UP, .AideWalksAroundPlayer spriteface PLAYER, DOWN - applymovement $6, MovementData_0x69549 + applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksStraightOutOfPokecenter playsound SFX_EXIT_BUILDING - disappear $6 - waitbutton + disappear VIOLETPOKECENTER1F_SCIENTIST + waitsfx end -.UnknownScript_0x69511 - applymovement $6, MovementData_0x6954e +.AideWalksAroundPlayer + applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksLeftToExitPokecenter spriteface PLAYER, DOWN - applymovement $6, MovementData_0x69551 + applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideFinishesLeavingPokecenter playsound SFX_EXIT_BUILDING - disappear $6 - waitbutton + disappear VIOLETPOKECENTER1F_SCIENTIST + waitsfx end .eggname db "EGG@" -UnknownScript_0x69527: +.AideGivesEgg: jumpstd receivetogepiegg end -UnknownScript_0x6952b: +.PartyFull: writetext UnknownText_0x69693 + waitbutton closetext - loadmovesprites end -UnknownScript_0x69531: +.RefusedEgg: writetext UnknownText_0x696f2 + waitbutton closetext - loadmovesprites setevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE end -UnknownScript_0x6953a: +.SecondTimeAsking: writetext UnknownText_0x69712 - jump UnknownScript_0x694d7 + jump .AskTakeEgg GameboyKidScript_0x69540: jumptextfaceplayer UnknownText_0x69809 @@ -80,19 +87,19 @@ GentlemanScript_0x69543: YoungsterScript_0x69546: jumptextfaceplayer UnknownText_0x698b8 -MovementData_0x69549: +MovementData_AideWalksStraightOutOfPokecenter: step_down step_down step_down step_down step_end -MovementData_0x6954e: +MovementData_AideWalksLeftToExitPokecenter: step_left step_down step_end -MovementData_0x69551: +MovementData_AideFinishesLeavingPokecenter: step_down step_down step_down @@ -226,8 +233,8 @@ VioletPokeCenter1F_MapEventHeader: .PersonEvents: db 5 - person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NurseScript_0x694c9, -1 + person_event SPRITE_NURSE, 1, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VioletPokeCenterNurse, -1 person_event SPRITE_GAMEBOY_KID, 6, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x69540, -1 person_event SPRITE_GENTLEMAN, 4, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x69543, -1 person_event SPRITE_YOUNGSTER, 1, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x69546, -1 - person_event SPRITE_SCIENTIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ScientistScript_0x694cc, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER + person_event SPRITE_SCIENTIST, 3, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, VioletPokeCenter1F_ElmsAideScript, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 83743b017..6403063b6 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -1,3 +1,9 @@ +const_value set 2 + const VIRIDIANCITY_GRAMPS1 + const VIRIDIANCITY_GRAMPS2 + const VIRIDIANCITY_FISHER + const VIRIDIANCITY_YOUNGSTER + ViridianCity_MapScriptHeader: .MapTriggers: db 0 @@ -19,14 +25,14 @@ GrampsScript_0x1a9a4c: yesorno iffalse UnknownScript_0x1a9a5b writetext UnknownText_0x1a9b6f + waitbutton closetext - loadmovesprites end UnknownScript_0x1a9a5b: writetext UnknownText_0x1a9bb7 + waitbutton closetext - loadmovesprites end GrampsScript_0x1a9a61: @@ -35,14 +41,14 @@ GrampsScript_0x1a9a61: checkevent EVENT_BLUE_IN_CINNABAR iftrue .BlueReturned writetext UnknownText_0x1a9c11 + waitbutton closetext - loadmovesprites end .BlueReturned writetext UnknownText_0x1a9c7e + waitbutton closetext - loadmovesprites end FisherScript_0x1a9a75: @@ -57,9 +63,9 @@ FisherScript_0x1a9a75: setevent EVENT_GOT_TM42_DREAM_EATER UnknownScript_0x1a9a8a: writetext UnknownText_0x1a9d86 - closetext + waitbutton UnknownScript_0x1a9a8e: - loadmovesprites + closetext end YoungsterScript_0x1a9a90: diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index 54dd617e8..970b69374 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -1,3 +1,7 @@ +const_value set 2 + const VIRIDIANGYM_BLUE + const VIRIDIANGYM_GYM_GUY + ViridianGym_MapScriptHeader: .MapTriggers: db 0 @@ -11,27 +15,27 @@ BlueScript_0x9aa26: checkflag ENGINE_EARTHBADGE iftrue .FightDone writetext UnknownText_0x9aa7b + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x9abae, 0 - loadtrainer BLUE, 1 + scriptedtrainerdata BLUE, 1 startbattle returnafterbattle setevent EVENT_BEAT_BLUE loadfont writetext UnknownText_0x9ac0f playsound SFX_GET_BADGE - waitbutton + waitsfx setflag ENGINE_EARTHBADGE writetext UnknownText_0x9ac27 + waitbutton closetext - loadmovesprites end .FightDone writetext UnknownText_0x9acab + waitbutton closetext - loadmovesprites end ViridianGymGuyScript: @@ -40,14 +44,14 @@ ViridianGymGuyScript: checkevent EVENT_BEAT_BLUE iftrue .ViridianGymGuyWinScript writetext ViridianGymGuyText + waitbutton closetext - loadmovesprites end .ViridianGymGuyWinScript writetext ViridianGymGuyWinText + waitbutton closetext - loadmovesprites end ViridianGymStatue: diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 0a3eb2356..0104cdc7d 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -1,3 +1,8 @@ +const_value set 2 + const VIRIDIANMART_CLERK + const VIRIDIANMART_LASS + const VIRIDIANMART_COOLTRAINER_M + ViridianMart_MapScriptHeader: .MapTriggers: db 0 @@ -8,7 +13,7 @@ ViridianMart_MapScriptHeader: ClerkScript_0x9b5e7: loadfont pokemart MARTTYPE_STANDARD, MART_VIRIDIAN - loadmovesprites + closetext end LassScript_0x9b5ee: diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index efdc8df83..57943667b 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -1,3 +1,9 @@ +const_value set 2 + const VIRIDIANNICKNAMESPEECHHOUSE_POKEFAN_M + const VIRIDIANNICKNAMESPEECHHOUSE_LASS + const VIRIDIANNICKNAMESPEECHHOUSE_MOLTRES + const VIRIDIANNICKNAMESPEECHHOUSE_GROWLITHE + ViridianNicknameSpeechHouse_MapScriptHeader: .MapTriggers: db 0 @@ -15,16 +21,16 @@ MoltresScript_0x9ae40: loadfont writetext UnknownText_0x9aefe cry SPEAROW + waitbutton closetext - loadmovesprites end GrowlitheScript_0x9ae4a: loadfont writetext UnknownText_0x9af10 cry RATTATA + waitbutton closetext - loadmovesprites end UnknownText_0x9ae54: diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokeCenter1F.asm index 7669ab8d9..61735b8f0 100644 --- a/maps/ViridianPokeCenter1F.asm +++ b/maps/ViridianPokeCenter1F.asm @@ -1,3 +1,9 @@ +const_value set 2 + const VIRIDIANPOKECENTER1F_NURSE + const VIRIDIANPOKECENTER1F_COOLTRAINER_M + const VIRIDIANPOKECENTER1F_COOLTRAINER_F + const VIRIDIANPOKECENTER1F_BUG_CATCHER + ViridianPokeCenter1F_MapScriptHeader: .MapTriggers: db 0 @@ -14,14 +20,14 @@ CooltrainerMScript_0x9b693: checkevent EVENT_BLUE_IN_CINNABAR iftrue .BlueReturned writetext UnknownText_0x9b6ad + waitbutton closetext - loadmovesprites end .BlueReturned writetext UnknownText_0x9b6f5 + waitbutton closetext - loadmovesprites end CooltrainerFScript_0x9b6a7: diff --git a/maps/ViridianPokeCenter2FBeta.asm b/maps/ViridianPokeCenter2FBeta.asm index c545a50bc..e7f0e36d1 100644 --- a/maps/ViridianPokeCenter2FBeta.asm +++ b/maps/ViridianPokeCenter2FBeta.asm @@ -1,3 +1,5 @@ +const_value set 2 + ViridianPokeCenter2FBeta_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 2ef14fcc0..114f62e46 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -1,3 +1,14 @@ +const_value set 2 + const WAREHOUSEENTRANCE_SUPER_NERD1 + const WAREHOUSEENTRANCE_SUPER_NERD2 + const WAREHOUSEENTRANCE_SUPER_NERD3 + const WAREHOUSEENTRANCE_SUPER_NERD4 + const WAREHOUSEENTRANCE_POKE_BALL + const WAREHOUSEENTRANCE_GRAMPS + const WAREHOUSEENTRANCE_SUPER_NERD5 + const WAREHOUSEENTRANCE_SUPER_NERD6 + const WAREHOUSEENTRANCE_GRANNY + WarehouseEntrance_MapScriptHeader: .MapTriggers: db 0 @@ -52,100 +63,100 @@ WarehouseEntrance_MapScriptHeader: if_equal SATURDAY, .Saturday .Sunday: - disappear $7 - disappear $8 - appear $9 - appear $a + disappear WAREHOUSEENTRANCE_GRAMPS + disappear WAREHOUSEENTRANCE_SUPER_NERD5 + appear WAREHOUSEENTRANCE_SUPER_NERD6 + appear WAREHOUSEENTRANCE_GRANNY return .Monday: - disappear $7 + disappear WAREHOUSEENTRANCE_GRAMPS checkmorn iffalse .NotMondayMorning - appear $7 + appear WAREHOUSEENTRANCE_GRAMPS .NotMondayMorning: - disappear $8 - disappear $9 - disappear $a + disappear WAREHOUSEENTRANCE_SUPER_NERD5 + disappear WAREHOUSEENTRANCE_SUPER_NERD6 + disappear WAREHOUSEENTRANCE_GRANNY return .Tuesday: - disappear $7 - appear $8 - disappear $9 - disappear $a + disappear WAREHOUSEENTRANCE_GRAMPS + appear WAREHOUSEENTRANCE_SUPER_NERD5 + disappear WAREHOUSEENTRANCE_SUPER_NERD6 + disappear WAREHOUSEENTRANCE_GRANNY return .Wednesday: - disappear $7 - disappear $8 - appear $9 - disappear $a + disappear WAREHOUSEENTRANCE_GRAMPS + disappear WAREHOUSEENTRANCE_SUPER_NERD5 + appear WAREHOUSEENTRANCE_SUPER_NERD6 + disappear WAREHOUSEENTRANCE_GRANNY return .Thursday: - disappear $7 - appear $8 - disappear $9 - disappear $a + disappear WAREHOUSEENTRANCE_GRAMPS + appear WAREHOUSEENTRANCE_SUPER_NERD5 + disappear WAREHOUSEENTRANCE_SUPER_NERD6 + disappear WAREHOUSEENTRANCE_GRANNY return .Friday: - disappear $7 - disappear $8 - appear $9 - disappear $a + disappear WAREHOUSEENTRANCE_GRAMPS + disappear WAREHOUSEENTRANCE_SUPER_NERD5 + appear WAREHOUSEENTRANCE_SUPER_NERD6 + disappear WAREHOUSEENTRANCE_GRANNY return .Saturday: - disappear $7 - appear $8 - disappear $9 - appear $a + disappear WAREHOUSEENTRANCE_GRAMPS + appear WAREHOUSEENTRANCE_SUPER_NERD5 + disappear WAREHOUSEENTRANCE_SUPER_NERD6 + appear WAREHOUSEENTRANCE_GRANNY return TrainerSupernerdEric: trainer EVENT_BEAT_SUPER_NERD_ERIC, SUPER_NERD, ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, SupernerdEricScript SupernerdEricScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7c36c + waitbutton closetext - loadmovesprites end TrainerSupernerdTeru: trainer EVENT_BEAT_SUPER_NERD_TERU, SUPER_NERD, TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, 0, SupernerdTeruScript SupernerdTeruScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7c410 + waitbutton closetext - loadmovesprites end TrainerPokemaniacIssac: trainer EVENT_BEAT_POKEMANIAC_ISSAC, POKEMANIAC, ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, 0, PokemaniacIssacScript PokemaniacIssacScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7c498 + waitbutton closetext - loadmovesprites end TrainerPokemaniacDonald: trainer EVENT_BEAT_POKEMANIAC_DONALD, POKEMANIAC, DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, 0, PokemaniacDonaldScript PokemaniacDonaldScript: - talkaftercancel + end_if_just_battled loadfont writetext UnknownText_0x7c52f + waitbutton closetext - loadmovesprites end GrannyScript_0x7c132: @@ -157,7 +168,7 @@ GrannyScript_0x7c132: .Open: pokemart MARTTYPE_BITTER, MART_UNDERGROUND - loadmovesprites + closetext end GrampsScript_0x7c146: @@ -172,7 +183,7 @@ GrampsScript_0x7c146: checkmorn iffalse WarehouseEntranceScript_ShopClosed pokemart MARTTYPE_BARGAIN, 0 - loadmovesprites + closetext end OlderHaircutBrotherScript: @@ -224,8 +235,8 @@ OlderHaircutBrotherScript: takemoney $0, 500 special PlaceMoneyTopRightOW writetext UnknownText_0x7c6b8 + waitbutton closetext - loadmovesprites special FadeOutPalettes playmusic MUSIC_HEAL pause 60 @@ -233,7 +244,7 @@ OlderHaircutBrotherScript: special RestartMapMusic loadfont writetext UnknownText_0x7c6d8 - closetext + waitbutton checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x7c2bb checkevent EVENT_RECEIVED_BALLS_FROM_KURT @@ -242,20 +253,20 @@ OlderHaircutBrotherScript: .Refused: writetext UnknownText_0x7c6ea + waitbutton closetext - loadmovesprites end .NotEnoughMoney: writetext UnknownText_0x7c709 + waitbutton closetext - loadmovesprites end .AlreadyGotHaircut: writetext UnknownText_0x7c72b + waitbutton closetext - loadmovesprites end YoungerHaircutBrotherScript: @@ -307,8 +318,8 @@ YoungerHaircutBrotherScript: takemoney $0, 300 special PlaceMoneyTopRightOW writetext UnknownText_0x7c80e + waitbutton closetext - loadmovesprites special FadeOutPalettes playmusic MUSIC_HEAL pause 60 @@ -316,7 +327,7 @@ YoungerHaircutBrotherScript: special RestartMapMusic loadfont writetext UnknownText_0x7c82a - closetext + waitbutton checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x7c2bb checkevent EVENT_RECEIVED_BALLS_FROM_KURT @@ -325,41 +336,41 @@ YoungerHaircutBrotherScript: .Refused: writetext UnknownText_0x7c842 + waitbutton closetext - loadmovesprites end .NotEnoughMoney: writetext UnknownText_0x7c85b + waitbutton closetext - loadmovesprites end .AlreadyGotHaircut: writetext UnknownText_0x7c87b + waitbutton closetext - loadmovesprites end UnknownScript_0x7c2bb: writetext HaircutBrosText_SlightlyHappier special PlayCurMonCry + waitbutton closetext - loadmovesprites end UnknownScript_0x7c2c4: writetext HaircutBrosText_Happier special PlayCurMonCry + waitbutton closetext - loadmovesprites end UnknownScript_0x7c2cd: writetext HaircutBrosText_MuchHappier special PlayCurMonCry + waitbutton closetext - loadmovesprites end BasementDoorScript:: @@ -369,31 +380,31 @@ BasementDoorScript:: checkitem BASEMENT_KEY iftrue .Unlock writetext UnknownText_0x7c5b0 + waitbutton closetext - loadmovesprites end .Unlock: playsound SFX_TRANSACTION writetext UnknownText_0x7c5d6 + waitbutton closetext - loadmovesprites changeblock $12, $6, $2e reloadmappart - loadmovesprites + closetext setevent EVENT_USED_BASEMENT_KEY end .Open: writetext UnknownText_0x7c5c3 + waitbutton closetext - loadmovesprites end WarehouseEntranceScript_ShopClosed: writetext UnknownText_0x7c904 + waitbutton closetext - loadmovesprites end ItemFragment_0x7c306: diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index e1de0b780..730bdaf4e 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -1,3 +1,11 @@ +const_value set 2 + const WHIRLISLANDB1F_POKE_BALL1 + const WHIRLISLANDB1F_POKE_BALL2 + const WHIRLISLANDB1F_POKE_BALL3 + const WHIRLISLANDB1F_POKE_BALL4 + const WHIRLISLANDB1F_POKE_BALL5 + const WHIRLISLANDB1F_BOULDER + WhirlIslandB1F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index 7d8d4311b..5c3823411 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -1,3 +1,8 @@ +const_value set 2 + const WHIRLISLANDB2F_POKE_BALL1 + const WHIRLISLANDB2F_POKE_BALL2 + const WHIRLISLANDB2F_POKE_BALL3 + WhirlIslandB2F_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm index 3b2b6f0e7..5b496eca4 100644 --- a/maps/WhirlIslandCave.asm +++ b/maps/WhirlIslandCave.asm @@ -1,3 +1,5 @@ +const_value set 2 + WhirlIslandCave_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 6a1f215a1..8db5eb734 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -1,3 +1,6 @@ +const_value set 2 + const WHIRLISLANDLUGIACHAMBER_LUGIA + WhirlIslandLugiaChamber_MapScriptHeader: .MapTriggers: db 0 @@ -17,11 +20,11 @@ UnknownScript_0x18c504: jump UnknownScript_0x18c515 UnknownScript_0x18c512: - appear $2 + appear WHIRLISLANDLUGIACHAMBER_LUGIA return UnknownScript_0x18c515: - disappear $2 + disappear WHIRLISLANDLUGIACHAMBER_LUGIA return LugiaScript_0x18c518: @@ -30,12 +33,12 @@ LugiaScript_0x18c518: writetext UnknownText_0x18c531 cry LUGIA pause 15 - loadmovesprites + closetext setevent EVENT_FOUGHT_LUGIA writecode VAR_BATTLETYPE, BATTLETYPE_FORCEITEM - loadpokedata LUGIA, 60 + scriptedpokedata LUGIA, 60 startbattle - disappear $2 + disappear WHIRLISLANDLUGIACHAMBER_LUGIA returnafterbattle end diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index e8992db89..5999d0d01 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -1,3 +1,6 @@ +const_value set 2 + const WHIRLISLANDNE_POKE_BALL + WhirlIslandNE_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm index 60eafae8e..14cddfb45 100644 --- a/maps/WhirlIslandNW.asm +++ b/maps/WhirlIslandNW.asm @@ -1,3 +1,5 @@ +const_value set 2 + WhirlIslandNW_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm index 32cad9594..ba5a186d7 100644 --- a/maps/WhirlIslandSE.asm +++ b/maps/WhirlIslandSE.asm @@ -1,3 +1,5 @@ +const_value set 2 + WhirlIslandSE_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index 8cc34dc17..298f68a64 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -1,3 +1,6 @@ +const_value set 2 + const WHIRLISLANDSW_POKE_BALL + WhirlIslandSW_MapScriptHeader: .MapTriggers: db 0 diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index a3288fec8..3a81d4d96 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -1,3 +1,6 @@ +const_value set 2 + const WILLSROOM_WILL + WillsRoom_MapScriptHeader: .MapTriggers: db 2 @@ -38,10 +41,10 @@ UnknownScript_0x1804e0: earthquake 80 changeblock $4, $e, $2a reloadmappart - loadmovesprites + closetext dotrigger $1 setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED - waitbutton + waitsfx end WillScript_0x1804f8: @@ -50,29 +53,29 @@ WillScript_0x1804f8: checkevent EVENT_BEAT_ELITE_4_WILL iftrue UnknownScript_0x180526 writetext UnknownText_0x180531 + waitbutton closetext - loadmovesprites winlosstext UnknownText_0x18062c, 0 - loadtrainer WILL, 1 + scriptedtrainerdata WILL, 1 startbattle returnafterbattle setevent EVENT_BEAT_ELITE_4_WILL loadfont writetext UnknownText_0x180644 + waitbutton closetext - loadmovesprites playsound SFX_ENTER_DOOR changeblock $4, $2, $16 reloadmappart - loadmovesprites + closetext setevent EVENT_WILLS_ROOM_EXIT_OPEN - waitbutton + waitsfx end UnknownScript_0x180526: writetext UnknownText_0x180644 + waitbutton closetext - loadmovesprites end MovementData_0x18052c: diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 01a098a7f..9d6250f64 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -1,3 +1,11 @@ +const_value set 2 + const WISETRIOSROOM_SAGE1 + const WISETRIOSROOM_SAGE2 + const WISETRIOSROOM_SAGE3 + const WISETRIOSROOM_SAGE4 + const WISETRIOSROOM_SAGE5 + const WISETRIOSROOM_SAGE6 + WiseTriosRoom_MapScriptHeader: .MapTriggers: db 2 @@ -50,19 +58,19 @@ SageScript_0x985a0: jumptextfaceplayer UnknownText_0x987af UnknownScript_0x985a3: - spriteface $4, UP + spriteface WISETRIOSROOM_SAGE3, UP spriteface PLAYER, DOWN - showemote EMOTE_SHOCK, $4, 20 - follow PLAYER, $4 + showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE3, 20 + follow PLAYER, WISETRIOSROOM_SAGE3 applymovement PLAYER, MovementData_0x98622 stopfollow spriteface PLAYER, RIGHT loadfont writetext UnknownText_0x98712 + waitbutton closetext - loadmovesprites - applymovement $4, MovementData_0x98625 - spriteface $4, LEFT + applymovement WISETRIOSROOM_SAGE3, MovementData_0x98625 + spriteface WISETRIOSROOM_SAGE3, LEFT end TrainerSageGaku: @@ -71,8 +79,8 @@ TrainerSageGaku: SageGakuScript: loadfont writetext UnknownText_0x98938 + waitbutton closetext - loadmovesprites end TrainerSageMasa: @@ -81,8 +89,8 @@ TrainerSageMasa: SageMasaScript: loadfont writetext UnknownText_0x98a35 + waitbutton closetext - loadmovesprites end TrainerSageKoji: @@ -92,15 +100,15 @@ SageKojiScript: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue UnknownScript_0x9861b pause 10 - showemote EMOTE_SHOCK, $7, 20 + showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE6, 20 loadfont writetext UnknownText_0x98c6c keeptextopen writetext UnknownText_0x98cac + waitbutton closetext - loadmovesprites - applymovement $7, MovementData_0x98628 - spriteface $7, UP + applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628 + spriteface WISETRIOSROOM_SAGE6, UP setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER dotrigger $1 end @@ -108,8 +116,8 @@ SageKojiScript: UnknownScript_0x9861b: loadfont writetext UnknownText_0x98db5 + waitbutton closetext - loadmovesprites end MovementData_0x98622: diff --git a/misc/battle_tower_5c.asm b/misc/battle_tower_5c.asm index 1c9c7436b..76a2eac44 100755 --- a/misc/battle_tower_5c.asm +++ b/misc/battle_tower_5c.asm @@ -1,11 +1,11 @@ Function1700b0: ; 1700b0 - call Function17021e + call Bank5c_ClearJumptableRAM callba Function118121 ret ; 1700ba Function1700ba: ; 1700ba - call Function17021e + call Bank5c_ClearJumptableRAM callba Function11811a ret ; 1700c4 @@ -17,21 +17,22 @@ Function1700c4: ; 1700c4 ld [rSVBK], a call Function17042c + ld a, $5 call GetSRAMBank ld a, $1 ld [$be45], a xor a ld [$be46], a - ld hl, $dffc + ld hl, w3_dffc ld de, $aa41 ld bc, $0004 call CopyBytes - ld hl, $d202 + ld hl, w3_d202 ld de, $aa8e - ld bc, $0594 + ld bc, 7 * $cc ; length of battle tower struct from japanese games? call CopyBytes - ld hl, $aa5d + ld hl, $aa5d ; some sort of count ld a, [hl] inc [hl] inc hl @@ -42,7 +43,7 @@ Function1700c4: ; 1700c4 add hl, de ld e, l ld d, h - ld hl, $dffc + ld hl, w3_dffc ld bc, $0004 call CopyBytes call CloseSRAM @@ -52,7 +53,7 @@ Function1700c4: ; 1700c4 ; 170114 Function170114: ; 170114 - call Function17021e + call Bank5c_ClearJumptableRAM call Function170121 callba Function11805f ret @@ -62,7 +63,7 @@ Function170121: ; 170121 ld a, $5 call GetSRAMBank ld hl, $a948 - ld de, $c608 + ld de, wMisc ld bc, $00f6 call CopyBytes call CloseSRAM @@ -71,27 +72,29 @@ Function170121: ; 170121 ; 170139 Function170139: ; 170139 +; Convert the 4-digit decimal number at 5:aa41 into binary ld a, $5 call GetSRAMBank ld de, $aa41 ld h, $0 ld l, h - ld bc, $03e8 - call Function17020c - ld bc, $0064 - call Function17020c - ld bc, $000a - call Function17020c + ld bc, 1000 + call .DecToBin + ld bc, 100 + call .DecToBin + ld bc, 10 + call .DecToBin ld a, [de] ld c, a ld b, $0 add hl, bc call CloseSRAM +; Store that number in wMisc ld a, h - ld [$c608], a + ld [wMisc], a ld a, l - ld [$c608 + 1], a - ld hl, $c628 + ld [wMisc + 1], a + ld hl, wBT_OTTempPkmn1DVs ld a, [PlayerID] ld [hli], a ld a, [PlayerID + 1] @@ -108,26 +111,26 @@ Function170139: ; 170139 ld bc, PlayerID ld de, PlayerGender callba Function4e929 - ld de, $c62c + 5 + ld de, wBT_OTTempPkmn1CaughtGender ld a, c ld [de], a inc de - ld a, $df + ld a, PartyMons % $100 ld [wcd49], a - ld a, $dc + ld a, PartyMons / $100 ld [wcd4a], a - ld a, $41 + ld a, PartyMonNicknames % $100 ld [wcd4b], a - ld a, $de + ld a, PartyMonNicknames / $100 ld [wcd4c], a - ld a, $3 -.asm_1701ac + ld a, 3 +.CopyLoop push af ld a, [wcd49] ld l, a ld a, [wcd4a] ld h, a - ld bc, $0030 + ld bc, PARTYMON_STRUCT_LENGTH call CopyBytes ld a, l ld [wcd49], a @@ -145,7 +148,7 @@ Function170139: ; 170139 ld [wcd4c], a pop af dec a - jr nz, .asm_1701ac + jr nz, .CopyLoop ld a, $4 call GetSRAMBank ld hl, $a013 @@ -157,7 +160,7 @@ Function170139: ; 170139 ld hl, $a894 ld bc, $0006 call CopyBytes - ld hl, $c608 + ld hl, wMisc ld de, $a948 ld bc, $00f6 call CopyBytes @@ -165,16 +168,16 @@ Function170139: ; 170139 ret ; 17020c -Function17020c: ; 17020c +.DecToBin: ; 17020c ld a, [de] inc de and a ret z -.loop +.digit_loop add hl, bc dec a - jr nz, .loop + jr nz, .digit_loop ret ; 170215 @@ -189,7 +192,7 @@ EmptySpecial_17021d: ; 17021d ret ; 17021e -Function17021e: ; 17021e +Bank5c_ClearJumptableRAM: ; 17021e xor a ld [wcf63], a ld [wcf64], a @@ -508,7 +511,7 @@ BT_ChrisName: ; 170426 Function17042c: ; 17042c ld hl, w3_d202TrainerData - ld a, 7 + ld a, BATTLETOWER_NROFTRAINERS .loop push af push hl @@ -521,7 +524,7 @@ Function17042c: ; 17042c ld a, [hli] and a jr z, .empty - cp $f + cp 15 jr nc, .copy_data push hl @@ -615,7 +618,7 @@ CopyBTTrainer_FromBT_OT_TowBT_OTTemp: ; 1704a2 ld [rSVBK], a ld hl, BT_OTTrainer ; $d100 - ld de, wBT_OTTemp ; $c608 + ld de, wBT_OTTemp ; wMisc ld bc, BATTLE_TOWER_STRUCT_LENGTH call CopyBytes @@ -624,7 +627,7 @@ CopyBTTrainer_FromBT_OT_TowBT_OTTemp: ; 1704a2 ld a, BANK(sBattleTowerChallengeState) call GetSRAMBank - ld a, $2 + ld a, BATTLETOWER_CHALLENGE_IN_PROGESS ld [sBattleTowerChallengeState], a ld hl, sNrOfBeatenBattleTowerTrainers inc [hl] @@ -632,7 +635,9 @@ CopyBTTrainer_FromBT_OT_TowBT_OTTemp: ; 1704a2 SkipBattleTowerTrainer: ; 1704c9 ret ; 1704ca + Function1704ca: ; 1704ca +; unreferenced mobile function ld a, [$be46] cp $7 jr c, .asm_1704d3 @@ -653,36 +658,37 @@ Function1704ca: ; 1704ca ; 1704e1 Function1704e1: ; 1704e1 +; unreferenced special call SpeechTextBox call FadeToMenu - call Function17021e - call Function1704f1 + call Bank5c_ClearJumptableRAM + call .JumptableLoop call ReturnToCallingMenu ret ; 1704f1 -Function1704f1: ; 1704f1 +.JumptableLoop: ; 1704f1 call ClearBGPalettes call ClearSprites call ClearScreen -.asm_1704fa +.loop call JoyTextDelay ld a, [wJumptableIndex] bit 7, a - jr nz, .asm_17050f - call Function170510 + jr nz, .done + call .DoJumptable callba ReloadMapPart - jr .asm_1704fa + jr .loop -.asm_17050f +.done ret ; 170510 -Function170510: ; 170510 +.DoJumptable: ; 170510 ld a, [wJumptableIndex] ld e, a ld d, 0 - ld hl, Jumptable_17051f + ld hl, .jumptable rept 2 add hl, de endr @@ -692,13 +698,13 @@ endr jp [hl] ; 17051f -Jumptable_17051f: ; 17051f - dw Function170525 - dw Function170571 - dw Function170577 +.jumptable: ; 17051f + dw .Jumptable_0 + dw .Jumptable_1 + dw .Jumptable_2 ; 170525 -Function170525: ; 170525 +.Jumptable_0: ; 170525 ld a, $5 call GetSRAMBank @@ -708,7 +714,7 @@ Function170525: ; 170525 call CopyBytes ld hl, $a8b2 - ld de, $c608 + ld de, wMisc ld bc, $0096 call CopyBytes @@ -717,117 +723,117 @@ Function170525: ; 170525 ld de, StringBuffer3 call PlaceString hlcoord 1, 3 - ld de, String_170676 + ld de, .String_Mail call PlaceString hlcoord 4, 3 ld de, StringBuffer4 call PlaceString hlcoord 8, 3 - ld de, String_17067a + ld de, .String_PastReaders call PlaceString - call Function1705b7 - call Function1705f0 - jr Function1705b2 + call .DrawBorder + call .PlaceTextItems + jr .NextJumptableFunction -Function170571: +.Jumptable_1: call SetPalettes - call Function1705b2 + call .NextJumptableFunction -Function170577: +.Jumptable_2: ld hl, hJoyPressed ld a, [hl] - and $1 - jr nz, .asm_1705ac + and A_BUTTON + jr nz, .pressed_a_or_b ld a, [hl] - and $2 - jr nz, .asm_1705ac + and B_BUTTON + jr nz, .pressed_a_or_b ld a, [hl] - and $40 - jr nz, .asm_17058f + and D_UP + jr nz, .pressed_up ld a, [hl] - and $80 - jr nz, .asm_17059d + and D_DOWN + jr nz, .pressed_down ret -.asm_17058f +.pressed_up ld a, [wcf64] and a ret z - sub $f + sub 15 ld [wcf64], a - call Function1705f0 + call .PlaceTextItems ret -.asm_17059d +.pressed_down ld a, [wcf64] - cp $3c + cp 60 ret z - add $f + add 15 ld [wcf64], a - call Function1705f0 + call .PlaceTextItems ret -.asm_1705ac +.pressed_a_or_b ld hl, wJumptableIndex set 7, [hl] ret -Function1705b2: +.NextJumptableFunction: ld hl, wJumptableIndex inc [hl] ret ; 1705b7 -Function1705b7: ; 1705b7 +.DrawBorder: ; 1705b7 hlcoord 0, 4 ld a, $79 ld [hli], a - ld c, $12 -.asm_1705bf + ld c, SCREEN_WIDTH - 2 +.top_border_loop ld a, $7a ld [hli], a dec c - jr nz, .asm_1705bf + jr nz, .top_border_loop ld a, $7b ld [hli], a - ld de, $0014 - ld c, $c -.asm_1705cd + ld de, SCREEN_WIDTH + ld c, 12 +.left_border_loop ld a, $7c ld [hl], a add hl, de dec c - jr nz, .asm_1705cd + jr nz, .left_border_loop ld a, $7d ld [hli], a - ld c, $12 -.asm_1705d9 + ld c, SCREEN_WIDTH - 2 +.bottom_border_loop ld a, $7a ld [hli], a dec c - jr nz, .asm_1705d9 + jr nz, .bottom_border_loop ld a, $7e ld [hl], a - ld de, $ffec + ld de, -SCREEN_WIDTH add hl, de - ld c, $c -.asm_1705e8 + ld c, 12 +.right_border_loop ld a, $7c ld [hl], a add hl, de dec c - jr nz, .asm_1705e8 + jr nz, .right_border_loop ret ; 1705f0 -Function1705f0: ; 1705f0 - call Function17064b - call Function17065d +.PlaceTextItems: ; 1705f0 + call .ClearBox + call .PlaceUpDownArrows ld a, $50 ld [wcd4e], a - ld hl, $c608 + ld hl, wMisc ld a, [wcf64] ld c, a xor a @@ -836,19 +842,20 @@ Function1705f0: ; 1705f0 push hl pop bc hlcoord 1, 6 - ld a, $6 -.asm_17060c + ld a, 6 +.loop1 push af push hl - ld a, $3 -.asm_170610 + ld a, 3 +.loop2 push af ld de, wcd49 ld a, [bc] and a - jr z, .asm_170625 - ld a, $5 -.asm_17061a + jr z, .fill_with_e3 +; .copy + ld a, 5 +.loop3a push af ld a, [bc] ld [de], a @@ -856,12 +863,12 @@ Function1705f0: ; 1705f0 inc de pop af dec a - jr nz, .asm_17061a - jr .asm_170631 + jr nz, .loop3a + jr .rejoin -.asm_170625 - ld a, $5 -.asm_170627 +.fill_with_e3 + ld a, 5 +.loop3b push af ld a, $e3 ld [de], a @@ -869,68 +876,68 @@ Function1705f0: ; 1705f0 inc bc pop af dec a - jr nz, .asm_170627 + jr nz, .loop3b -.asm_170631 +.rejoin ld de, wcd49 push bc call PlaceString - ld de, $0006 + ld de, 6 add hl, de pop bc pop af dec a - jr nz, .asm_170610 + jr nz, .loop2 pop hl - ld de, $0028 + ld de, $28 add hl, de pop af dec a - jr nz, .asm_17060c + jr nz, .loop1 ret ; 17064b -Function17064b: ; 17064b +.ClearBox: ; 17064b hlcoord 1, 5 xor a - ld b, $c -.asm_170651 - ld c, $12 -.asm_170653 + ld b, 12 +.clearbox_row + ld c, SCREEN_WIDTH - 2 +.clearbox_column ld [hli], a dec c - jr nz, .asm_170653 + jr nz, .clearbox_column rept 2 inc hl endr dec b - jr nz, .asm_170651 + jr nz, .clearbox_row ret ; 17065d -Function17065d: ; 17065d +.PlaceUpDownArrows: ; 17065d ld a, [wcf64] and a - jr z, .asm_170669 + jr z, .nope hlcoord 18, 5 - ld a, $61 + ld a, "▲" ld [hl], a -.asm_170669 +.nope ld a, [wcf64] - cp $3c + cp 60 ret z hlcoord 18, 16 - ld a, $ee + ld a, "▼" ld [hl], a ret ; 170676 -String_170676: ; 170676 +.String_Mail: ; 170676 db "ルーム@" ; 17067a -String_17067a: ; 17067a +.String_PastReaders: ; 17067a db "れきだいりーダーいちらん@" ; 170687 @@ -953,13 +960,13 @@ endr dw Function17075f ; 0x00 dw Function170788 ; 0x01 dw Function170778 ; 0x02 - dw Function170799 ; 0x03 - dw Function17079d ; 0x04 + dw BattleTowerAction_SetByteToQuickSaveChallenge ; 0x03 + dw BattleTowerAction_SetByteToCancelChallenge ; 0x04 dw Function1707ac ; 0x05 dw Function1707f4 ; 0x06 - dw Function170868 ; 0x07 - dw Function170881 ; 0x08 - dw Function17089a ; 0x09 + dw SaveBattleTowerLevelGroup ; 0x07 + dw LoadBattleTowerLevelGroup ; 0x08 + dw BattleTower_CheckSaveFileExistsAndIsYours ; 0x09 dw Function1708b1 ; 0x0a dw CheckMobileEventIndex ; 0x0b dw Function1708c8 ; 0x0c @@ -980,7 +987,7 @@ endr dw Function1706ee ; 0x1b dw Function17071b ; 0x1c dw Function170729 ; 0x1d - dw Function17073e ; 0x1e + dw BattleTower_RandomlyChooseReward ; 0x1e dw Function170737 ; 0x1f @@ -1033,7 +1040,7 @@ Function1706ee: ; 1706ee (5c:46ee) BattleTowerAction $1b Function17071b: ; 17071b (5c:471b) BattleTowerAction $1c ld a, BANK(sBattleTowerChallengeState) call GetSRAMBank - ld a, $3 + ld a, BATTLETOWER_WON_CHALLENGE ld [sBattleTowerChallengeState], a call CloseSRAM ret @@ -1041,7 +1048,7 @@ Function17071b: ; 17071b (5c:471b) BattleTowerAction $1c Function170729: ; 170729 (5c:4729) BattleTowerAction $1d ld a, BANK(sBattleTowerChallengeState) call GetSRAMBank - ld a, $4 + ld a, BATTLETOWER_RECEIVED_REWARD ld [sBattleTowerChallengeState], a call CloseSRAM ret @@ -1050,7 +1057,7 @@ Function170737: ; 170737 (5c:4737) BattleTowerAction $1e callba SaveOptions ret -Function17073e: ; 17073e (5c:473e) BattleTowerAction $1f +BattleTower_RandomlyChooseReward: ; 17073e (5c:473e) BattleTowerAction $1f ; Generate a random stat boosting item. .loop call Random @@ -1072,7 +1079,7 @@ Function17073e: ; 17073e (5c:473e) BattleTowerAction $1f ret Function17075f: ; 17075f (5c:475f) BattleTowerAction $00 - call Function17089a + call BattleTower_CheckSaveFileExistsAndIsYours ld a, [ScriptVar] and a ret z @@ -1103,12 +1110,12 @@ Function170788: ; 170788 (5c:4788) BattleTowerAction $01 call CloseSRAM ret -Function170799: ; 170799 (5c:4799) BattleTowerAction $03 - ld c, $1 +BattleTowerAction_SetByteToQuickSaveChallenge: ; 170799 (5c:4799) BattleTowerAction $03 + ld c, BATTLETOWER_SAVED_AND_LEFT jr asm_17079f -Function17079d: ; 17079d (5c:479d) BattleTowerAction $04 - ld c, $0 +BattleTowerAction_SetByteToCancelChallenge: ; 17079d (5c:479d) BattleTowerAction $04 + ld c, BATTLETOWER_NO_CHALLENGE asm_17079f: ; 17079f (5c:479f) ld a, BANK(sBattleTowerChallengeState) call GetSRAMBank @@ -1203,9 +1210,10 @@ Function17081d: ; 17081d (5c:481d) BattleTowerAction $17 and a jr nz, .asm_170853 ret + .asm_170849 ld hl, CurDay - ld a, $8c + ld a, 140 sub c add [hl] cp $b @@ -1221,39 +1229,39 @@ Function17081d: ; 17081d (5c:481d) BattleTowerAction $17 call CloseSRAM ret -Function170868: ; 170868 (5c:4868) BattleTowerAction $07 - ld a, BANK(sbe47) +SaveBattleTowerLevelGroup: ; 170868 (5c:4868) BattleTowerAction $07 + ld a, BANK(sBTChoiceOfLevelGroup) call GetSRAMBank ld a, [rSVBK] push af ld a, $3 ld [rSVBK], a - ld a, [wd000 + $800] - ld [sbe47], a + ld a, [wBTChoiceOfLvlGroup] + ld [sBTChoiceOfLevelGroup], a pop af ld [rSVBK], a call CloseSRAM ret -Function170881: ; 170881 (5c:4881) BattleTowerAction $08 - ld a, BANK(sbe47) +LoadBattleTowerLevelGroup: ; 170881 (5c:4881) BattleTowerAction $08 ; Load level group choice + ld a, BANK(sBTChoiceOfLevelGroup) call GetSRAMBank ld a, [rSVBK] push af ld a, $3 ld [rSVBK], a - ld a, [sbe47] - ld [wd000 + $800], a + ld a, [sBTChoiceOfLevelGroup] + ld [wBTChoiceOfLvlGroup], a pop af ld [rSVBK], a call CloseSRAM ret -Function17089a: ; 17089a BattleTowerAction $09 +BattleTower_CheckSaveFileExistsAndIsYours: ; 17089a BattleTowerAction $09 ld a, [wSaveFileExists] and a jr z, .nope - callba Function14bcb + callba CompareLoadedAndSavedPlayerID jr z, .yes xor a jr .nope @@ -1359,7 +1367,7 @@ Function17093c: ; 17093c (5c:493c) BattleTowerAction $0e jr nz, .not_egg push hl ld hl, PartyMonOT ; wddff (aliases: PartyMonOT) - ld de, $6 + ld de, $6 ; NAME_LENGTH ld a, b and a jr z, .skip @@ -1369,38 +1377,38 @@ Function17093c: ; 17093c (5c:493c) BattleTowerAction $0e jr nz, .loop2 .skip ld de, String_1709a4 - ld a, $6 -.asm_17096e + ld a, $6 ; NAME_LENGTH +.compare_loop push af ld a, [de] inc de cp [hl] inc hl - jr nz, .asm_17099d + jr nz, .different pop af dec a - jr nz, .asm_17096e + jr nz, .compare_loop rept 4 dec hl endr - ld a, $50 + ld a, "@" rept 2 ld [hli], a endr pop hl ld a, EGG_TICKET ld [CurItem], a - ld a, $1 + ld a, 1 ld [wItemQuantityChangeBuffer], a - ld a, $ff - ld [wd107], a + ld a, -1 + ld [ItemCountBuffer], a ld hl, NumItems call TossItem ld a, $1 ld [ScriptVar], a ret -.asm_17099d +.different pop af pop hl .not_egg @@ -1454,30 +1462,30 @@ endr ; 1709e7 (5c:49e7) Jumptable_1709e7: ; 1709e7 - dw Function170a00 - dw Function170a00 - dw Function1709f3 - dw Function1709f3 - dw Function170a01 - dw Function170a33 + dw .NoAction + dw .NoAction + dw .DoAction1 + dw .DoAction1 + dw .Action4 + dw .Action5 ; 1709f3 -Function1709f3: ; 1709f3 +.DoAction1: ; 1709f3 ld a, $5 call GetSRAMBank ld a, $1 ld [$a800], a call CloseSRAM -Function170a00: ; 170a00 +.NoAction: ; 170a00 ret ; 170a01 -Function170a01: ; 170a01 +.Action4: ; 170a01 ld a, $5 call GetSRAMBank ld hl, $b023 - ld de, $c608 + ld de, wMisc ld bc, $0069 call CopyBytes ld a, [$a825] @@ -1492,27 +1500,27 @@ Function170a01: ; 170a01 ret ; 170a33 -Function170a33: ; 170a33 +.Action5: ; 170a33 ld a, $0 call GetSRAMBank ld hl, wRTC - ld de, $c608 + ld de, wMisc ld bc, $0004 call CopyBytes call CloseSRAM ld a, $5 call GetSRAMBank ld hl, $b08c - ld de, $c608 + ld de, wMisc ld c, $4 -.asm_170a54 +.compare_loop ld a, [de] inc de cp [hl] - jr nz, .asm_170a78 + jr nz, .different inc hl dec c - jr nz, .asm_170a54 + jr nz, .compare_loop call CloseSRAM ld a, [MapGroup] ld b, a @@ -1521,17 +1529,17 @@ Function170a33: ; 170a33 call GetMapTrigger ld a, d or e - jr z, .asm_170a72 + jr z, .no_trigger ld a, [de] and a ret nz -.asm_170a72 +.no_trigger ld a, $1 ld [ScriptVar], a ret -.asm_170a78 +.different call CloseSRAM ld a, $5 call GetSRAMBank @@ -1546,11 +1554,11 @@ Function170a33: ; 170a33 call GetMapTrigger ld a, d or e - jr z, .asm_170a9b + jr z, .no_trigger_2 xor a ld [de], a -.asm_170a9b +.no_trigger_2 ret ; 170a9c @@ -1577,10 +1585,11 @@ Function170aaf: ; 170aaf (5c:4aaf) BattleTowerAction $13 ret Function170abe: ; 170abe (5c:4abe) BattleTowerAction $14 - call Function17089a + call BattleTower_CheckSaveFileExistsAndIsYours ld a, [ScriptVar] and a ret z + ld a, BANK(sbe4f) call GetSRAMBank ld a, [sbe4f] @@ -1603,13 +1612,13 @@ Function170ae8: ; 170ae8 (5c:4ae8) BattleTowerAction $18 call GetSRAMBank ld a, [$b2fb] call CloseSRAM - ld c, $a + ld c, 10 call SimpleDivide ld a, b ld [wcd4f], a xor a ld [ScriptVar], a - callba Function119d93 + callba Function119d93 ; level check ret nc ld a, $5 call GetSRAMBank @@ -1629,7 +1638,7 @@ Function170b16: ; 170b16 (5c:4b16) BattleTowerAction $19 ld [wcd4f], a xor a ld [ScriptVar], a - callba Function119dd1 + callba Function119dd1 ; ubers check ret nc ld a, $5 call GetSRAMBank diff --git a/misc/fixed_words.asm b/misc/fixed_words.asm index 708116689..a3d3f0389 100755 --- a/misc/fixed_words.asm +++ b/misc/fixed_words.asm @@ -308,7 +308,7 @@ Function11c1ca: ; 11c1ca callba ReloadMapPart callba Function8cf53 callba LoadPokemonData - callba Function40c30 + callba Pokedex_ABCMode ld a, [rSVBK] push af ld a, $5 @@ -362,7 +362,7 @@ Function11c283: ; 11c283 bit 7, a jr nz, .exit call .DoJumptableFunction - callba Function8cf69 + callba PlaySpriteAnimations callba ReloadMapPart jr .loop diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index 9b98046c0..211fabea5 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -2011,7 +2011,7 @@ Function100cb5: ; 100cb5 call Function100dd2 callba Function241ba push bc - callba Function8cf69 + callba PlaySpriteAnimations callba Function10402d call Function100dfd pop bc @@ -2065,7 +2065,7 @@ Function100d22: ; 100d22 call Function100dd2 callba Function241ba push bc - callba Function8cf69 + callba PlaySpriteAnimations callba Function10402d call Function100dfd pop bc @@ -4059,7 +4059,7 @@ Function101a21: ; 101a21 ld a, $1 ld [wc2d7], a callba BattleIntro - callba SendOutFirstMons + callba DoBattle callba ShowLinkBattleParticipantsAfterEnd xor a ld [wc2d7], a @@ -6006,7 +6006,7 @@ Function1027eb: ; 1027eb ld c, $12 ld d, h ld e, l - callba Function16d61d + callba _LinkTextbox ld de, String_102804 hlcoord 2, 16 call PlaceString @@ -6302,7 +6302,7 @@ Function1029cf: ; 1029cf ld c, $8 ld d, h ld e, l - callba Function16d61d + callba _LinkTextbox ld de, String_102a26 hlcoord 12, 8 call PlaceString @@ -6468,7 +6468,7 @@ Function102b32: ; 102b32 dec a ld [CurPartyMon], a ld a, $1 - ld [wd1e9], a + ld [wForceEvolution], a callba EvolvePokemon call Function102d9a call Function102dd3 @@ -6774,11 +6774,11 @@ Function102d48: ; 102d48 call AddNTimes predef GetUnownLetter callba UpdateUnownDex - ld a, [wdef4] + ld a, [wFirstUnownSeen] and a jr nz, .asm_102d98 ld a, [UnownLetter] - ld [wdef4], a + ld [wFirstUnownSeen], a .asm_102d98 and a @@ -6812,7 +6812,7 @@ Function102dc3: ; 102dc3 ld c, $12 ld d, h ld e, l - callba Function16d61d + callba _LinkTextbox ret ; 102dd3 @@ -6855,7 +6855,7 @@ Function102e07: ; 102e07 ld c, $b ld d, h ld e, l - callba Function16d61d + callba _LinkTextbox .asm_102e28 ld de, String_102e32 diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm index 69abe1cd2..79f52115e 100755 --- a/misc/mobile_41.asm +++ b/misc/mobile_41.asm @@ -1058,7 +1058,7 @@ Function1064d8: ; 1064d8 jr asm_1064ed asm_1064ed - ld de, w6_d000 + ld de, wBackupTilemap ld b, $0 ld a, [rSVBK] push af diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm index 0e25021bf..c2d7171e0 100644 --- a/misc/mobile_42.asm +++ b/misc/mobile_42.asm @@ -400,7 +400,7 @@ Function1082c6: ; 1082c6 Function1082cc: ; 1082cc .asm_1082cc push bc - callba Function8cf69 + callba PlaySpriteAnimations pop bc call DelayFrame dec c @@ -410,7 +410,7 @@ Function1082cc: ; 1082cc Function1082db: ; 1082db .asm_1082db - callba Function8cf69 + callba PlaySpriteAnimations callba Functiond00b4 callba Function10402d jr nc, .asm_1082db @@ -431,7 +431,7 @@ Function1082fa: ; 1082fa call Function108b78 push hl push bc - callba Function8cf69 + callba PlaySpriteAnimations pop bc pop hl call DelayFrame diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index 006a135f1..40e4cac16 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -5662,7 +5662,7 @@ Function1161d5: ; 1161d5 ld [rSVBK], a ld hl, Unknown_117356 - ld de, w6_d000 + ld de, wBackupTilemap ld bc, $0300 call CopyBytes @@ -7721,7 +7721,7 @@ Function1176ee: ; 1176ee (45:76ee) bit 7, a jr nz, .asm_117709 call Function117719 - callba Function8cf69 + callba PlaySpriteAnimations callba ReloadMapPart jr Function1176ee .asm_117709 diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm index 836da4fa0..8bfed5609 100755 --- a/misc/mobile_46.asm +++ b/misc/mobile_46.asm @@ -4108,7 +4108,7 @@ Function119d93: ; 119d93 (46:5d93) ld bc, PARTYMON_STRUCT_LENGTH ld de, PartyMon1Level ld a, [PartyCount] -.asm_119daf +.party_loop push af ld a, [de] push hl @@ -4119,17 +4119,18 @@ Function119d93: ; 119d93 (46:5d93) pop de pop hl cp [hl] - jr z, .asm_119dbd - jr nc, .asm_119dc6 -.asm_119dbd + jr z, .equal + jr nc, .exceeds +.equal pop af dec a - jr nz, .asm_119daf + jr nz, .party_loop pop af ld [rSVBK], a and a ret -.asm_119dc6 + +.exceeds pop af ld a, $4 ld [wcf66], a @@ -4143,40 +4144,41 @@ Function119dd1: ; 119dd1 (46:5dd1) push af ld a, [wcd4f] cp 70 / 10 - jr nc, .asm_119e08 + jr nc, .level_70_or_more ld a, $1 ld [rSVBK], a ld hl, PartyMon1Level ld bc, PARTYMON_STRUCT_LENGTH ld de, PartySpecies ld a, [PartyCount] -.asm_119deb +.loop push af ld a, [de] cp MEWTWO - jr z, .asm_119dfd + jr z, .uber cp MEW - jr z, .asm_119dfd + jr z, .uber cp LUGIA - jr c, .asm_119e02 + jr c, .next cp NUM_POKEMON + 1 - jr nc, .asm_119e02 -.asm_119dfd + jr nc, .next +.uber ld a, [hl] cp 70 - jr c, .asm_119e0d -.asm_119e02 + jr c, .uber_under_70 +.next add hl, bc inc de pop af dec a - jr nz, .asm_119deb -.asm_119e08 + jr nz, .loop +.level_70_or_more pop af ld [rSVBK], a and a ret -.asm_119e0d + +.uber_under_70 pop af ld a, [de] ld [wd265], a @@ -5984,7 +5986,7 @@ Function11ad1b: ; 11ad1b ld [wcd30], a ld a, $2 ld [wc7d4], a - callba Function40bdc + callba Pokedex_ChangeMode ret ; 11ad6e @@ -7677,7 +7679,7 @@ Function11b7e5: ; 11b7e5 callba Function108016 callba Function17d1f1 ld a, $1 - ld [wd1e9], a + ld [wForceEvolution], a ld a, $2 ld [wLinkMode], a callba EvolvePokemon @@ -7707,7 +7709,7 @@ Function11b7e5: ; 11b7e5 ; 11b879 Function11b879: ; 11b879 - callba Function17089a + callba BattleTower_CheckSaveFileExistsAndIsYours ld a, [ScriptVar] and a ret z diff --git a/misc/mobile_5b.asm b/misc/mobile_5b.asm index 19d192aeb..cd2d57e82 100755 --- a/misc/mobile_5b.asm +++ b/misc/mobile_5b.asm @@ -908,22 +908,21 @@ INCBIN "gfx/unknown/16d5cd.tilemap" Tilemap_16d5f5: INCBIN "gfx/unknown/16d5f5.tilemap" -Function16d61d: ; 16d61d +_LinkTextbox: ; 16d61d ld h, d ld l, e push bc push hl - call Function16d640 + call .draw_border pop hl pop bc + ld de, AttrMap - TileMap add hl, de -rept 2 inc b -endr -rept 2 + inc b + inc c inc c -endr ld a, $7 .loop push bc @@ -941,43 +940,44 @@ endr ret ; 16d640 -Function16d640: ; 16d640 +.draw_border: ; 16d640 push hl ld a, $30 ld [hli], a inc a - call Function16d66d + call .fill_row inc a ld [hl], a pop hl ld de, SCREEN_WIDTH add hl, de -.loop +.loop3 push hl ld a, $33 ld [hli], a ld a, " " - call Function16d66d + call .fill_row ld [hl], $34 pop hl ld de, SCREEN_WIDTH add hl, de dec b - jr nz, .loop + jr nz, .loop3 + ld a, $35 ld [hli], a ld a, $36 - call Function16d66d + call .fill_row ld [hl], $37 ret ; 16d66d -Function16d66d: ; 16d66d +.fill_row: ; 16d66d ld d, c -.loop +.loop4 ld [hli], a dec d - jr nz, .loop + jr nz, .loop4 ret ; 16d673 @@ -1029,7 +1029,7 @@ Function16d6ae: ; 16d6ae ; 16d6ca LinkTextbox: ; 16d6ca - call Function16d61d + call _LinkTextbox ret ; 16d6ce diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm index ebebb302c..8eedea0fd 100755 --- a/misc/mobile_5c.asm +++ b/misc/mobile_5c.asm @@ -422,7 +422,7 @@ Function171a11: ; 171a11 (5c:5a11) bit 7, a jr nz, .asm_171a2c call Function171a36 - callba Function8cf69 + callba PlaySpriteAnimations callba ReloadMapPart jr Function171a11 .asm_171a2c diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index 19c3748e8..26bf5f28e 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -302,7 +302,7 @@ Function17d0f3: ; 17d0f3 callba Function10804d callba Function17d1f1 ld a, $1 - ld [wd1e9], a + ld [wForceEvolution], a ld a, $2 ld [wLinkMode], a callba EvolvePokemon @@ -418,12 +418,12 @@ Function17d1f1: ; 17d1f1 call AddNTimes predef GetUnownLetter callab UpdateUnownDex - ld a, [wdef4] + ld a, [wFirstUnownSeen] and a jr nz, .asm_17d223 ld a, [UnownLetter] - ld [wdef4], a + ld [wFirstUnownSeen], a .asm_17d223 ret @@ -135,7 +135,36 @@ s1_b277:: sLinkBattleStatsEnd:: sHallOfFame:: ; b2c0 - ds HOF_LENGTH * NUM_HOF_TEAMS +sHallOfFame01:: hall_of_fame sHallOfFame01 +sHallOfFame02:: hall_of_fame sHallOfFame02 +sHallOfFame03:: hall_of_fame sHallOfFame03 +sHallOfFame04:: hall_of_fame sHallOfFame04 +sHallOfFame05:: hall_of_fame sHallOfFame05 +sHallOfFame06:: hall_of_fame sHallOfFame06 +sHallOfFame07:: hall_of_fame sHallOfFame07 +sHallOfFame08:: hall_of_fame sHallOfFame08 +sHallOfFame09:: hall_of_fame sHallOfFame09 +sHallOfFame10:: hall_of_fame sHallOfFame10 +sHallOfFame11:: hall_of_fame sHallOfFame11 +sHallOfFame12:: hall_of_fame sHallOfFame12 +sHallOfFame13:: hall_of_fame sHallOfFame13 +sHallOfFame14:: hall_of_fame sHallOfFame14 +sHallOfFame15:: hall_of_fame sHallOfFame15 +sHallOfFame16:: hall_of_fame sHallOfFame16 +sHallOfFame17:: hall_of_fame sHallOfFame17 +sHallOfFame18:: hall_of_fame sHallOfFame18 +sHallOfFame19:: hall_of_fame sHallOfFame19 +sHallOfFame20:: hall_of_fame sHallOfFame20 +sHallOfFame21:: hall_of_fame sHallOfFame21 +sHallOfFame22:: hall_of_fame sHallOfFame22 +sHallOfFame23:: hall_of_fame sHallOfFame23 +sHallOfFame24:: hall_of_fame sHallOfFame24 +sHallOfFame25:: hall_of_fame sHallOfFame25 +sHallOfFame26:: hall_of_fame sHallOfFame26 +sHallOfFame27:: hall_of_fame sHallOfFame27 +sHallOfFame28:: hall_of_fame sHallOfFame28 +sHallOfFame29:: hall_of_fame sHallOfFame29 +sHallOfFame30:: hall_of_fame sHallOfFame30 sHallOfFameEnd:: sMobileEventIndex:: ds 1 @@ -152,7 +181,7 @@ sBattleTowerChallengeState:: ds 1 sBattleTower:: ; be46 sNrOfBeatenBattleTowerTrainers:: ds 1 -sbe47:: ds 1 +sBTChoiceOfLevelGroup:: ds 1 ; The 7 trainers of the BattleTower are saved here, so nobody appears more than once sBTTrainers:: ; sbe48 ds 7 diff --git a/text/battle.asm b/text/battle.asm index c17765855..4a49cb50c 100644 --- a/text/battle.asm +++ b/text/battle.asm @@ -478,9 +478,9 @@ BecameConfusedText: ; 0x80d97 text "<TARGET>" line "became confused!" prompt -; 0x80dab +; ItemHealedConfusion -BattleText_0x80dab: ; 0x80dab +BattleText_ItemHealedConfusion: ; ItemHealedConfusion text "A @" text_from_ram StringBuffer1 text " rid" diff --git a/text/common_2.asm b/text/common_2.asm index 052ea9ebb..78dd90069 100644 --- a/text/common_2.asm +++ b/text/common_2.asm @@ -109,7 +109,7 @@ UnknownText_0x1bc14f: ; 0x1bc14f deciram CurPartyLevel, 1, 3 text "!@" sound_dex_fanfare_50_79 - text_waitbutton + text_waitsfx db "@" ; 0x1bc16d @@ -1576,7 +1576,7 @@ UnknownText_0x1bd3be: ; 0x1bd3be text_from_ram StringBuffer1 text "!@" sound_item - text_waitbutton + text_waitsfx db "@" ; 0x1bd3d6 diff --git a/text/common_3.asm b/text/common_3.asm index adc32f6cb..bb0f286e9 100644 --- a/text/common_3.asm +++ b/text/common_3.asm @@ -362,7 +362,7 @@ UnknownText_0x1c05ec: ; 1c05ec UnknownText_0x1c0609: ; 1c0609 text "A blinding FLASH" line "lights the area!@" - text_waitbutton + text_waitsfx db "@" ; 1c062e @@ -932,7 +932,7 @@ UnknownText_0x1c0dba: ; 1c0dba text " came" line "out of its EGG!@" sound_caught_mon - text_waitbutton + text_waitsfx db "@" ; 1c0dd7 @@ -1223,7 +1223,7 @@ UnknownText_0x1c123a: ; 1c123a text " caught by" line "@" text_from_ram wMagikarpRecordHoldersName - text_waitbutton + text_waitsfx db "@" ; 1c1260 @@ -1786,7 +1786,7 @@ _OakText2: ; 1c1da4 ; 1c1de2 _OakText3: ; 1c1de2 - text_waitbutton + text_waitsfx db "@" ; 1c1de4 diff --git a/text/common_4.asm b/text/common_4.asm index ad4a90d27..a3ed18ac9 100644 --- a/text/common_4.asm +++ b/text/common_4.asm @@ -1051,7 +1051,7 @@ UnknownText_0x1c5660: ; 0x1c5660 text_from_ram StringBuffer2 text "!@" sound_dex_fanfare_50_79 - text_waitbutton + text_waitsfx db "@" ; 0x1c5677 @@ -1376,7 +1376,7 @@ UnknownText_0x1c5b34: ; 0x1c5b34 ; 0x1c5b35 Text_Waitbutton_2: ; 0x1c5b35 - text_waitbutton + text_waitsfx db "@" ; 0x1c5b37 @@ -1397,7 +1397,7 @@ UnknownText_0x1c5b53: ; 0x1c5b53 line "was newly added to" cont "the #DEX.@" sound_slot_machine_start - text_waitbutton + text_waitsfx db "@" ; 0x1c5b7e @@ -1453,7 +1453,7 @@ UnknownText_0x1c5c28: ; 0x1c5c28 UnknownText_0x1c5c44: ; 0x1c5c44 text "<PLAYER> played the" line "# FLUTE.@" - text_waitbutton + text_waitsfx db "@" ; 0x1c5c5d diff --git a/trainers/read_party.asm b/trainers/read_party.asm new file mode 100755 index 000000000..71cbdc5e5 --- /dev/null +++ b/trainers/read_party.asm @@ -0,0 +1,401 @@ + +ReadTrainerParty: ; 39771 + ld a, [InBattleTowerBattle] + bit 0, a + ret nz + + ld a, [wLinkMode] + and a + ret nz + + ld hl, OTPartyCount + xor a + ld [hli], a + dec a + ld [hl], a + + ld hl, OTPartyMons + ld bc, OTPartyMonsEnd - OTPartyMons + xor a + call ByteFill + + ld a, [OtherTrainerClass] + cp CAL + jr nz, .not_cal2 + ld a, [OtherTrainerID] + cp CAL2 + jr z, .cal2 + ld a, [OtherTrainerClass] +.not_cal2 + + dec a + ld c, a + ld b, 0 + ld hl, TrainerGroups +rept 2 + add hl, bc +endr + ld a, [hli] + ld h, [hl] + ld l, a + + ld a, [OtherTrainerID] + ld b, a +.skip_trainer + dec b + jr z, .got_trainer +.loop + ld a, [hli] + cp $ff + jr nz, .loop + jr .skip_trainer +.got_trainer + +.skip_name + ld a, [hli] + cp "@" + jr nz, .skip_name + + ld a, [hli] + ld c, a + ld b, 0 + ld d, h + ld e, l + ld hl, TrainerTypes +rept 2 + add hl, bc +endr + ld a, [hli] + ld h, [hl] + ld l, a + ld bc, .done + push bc + jp [hl] + +.done + jp ComputeTrainerReward + +.cal2 + ld a, BANK(sMysteryGiftTrainer) + call GetSRAMBank + ld de, sMysteryGiftTrainer + call TrainerType2 + call CloseSRAM + jr .done +; 397e3 + +TrainerTypes: ; 397e3 + dw TrainerType1 ; level, species + dw TrainerType2 ; level, species, moves + dw TrainerType3 ; level, species, item + dw TrainerType4 ; level, species, item, moves +; 397eb + +TrainerType1: ; 397eb +; normal (level, species) + ld h, d + ld l, e +.loop + ld a, [hli] + cp $ff + ret z + + ld [CurPartyLevel], a + ld a, [hli] + ld [CurPartySpecies], a + ld a, OTPARTYMON + ld [MonType], a + push hl + predef TryAddMonToParty + pop hl + jr .loop +; 39806 + +TrainerType2: ; 39806 +; moves + ld h, d + ld l, e +.loop + ld a, [hli] + cp $ff + ret z + + ld [CurPartyLevel], a + ld a, [hli] + ld [CurPartySpecies], a + ld a, OTPARTYMON + ld [MonType], a + + push hl + predef TryAddMonToParty + ld a, [OTPartyCount] + dec a + ld hl, OTPartyMon1Moves + ld bc, PARTYMON_STRUCT_LENGTH + call AddNTimes + ld d, h + ld e, l + pop hl + + ld b, NUM_MOVES +.copy_moves + ld a, [hli] + ld [de], a + inc de + dec b + jr nz, .copy_moves + + push hl + + ld a, [OTPartyCount] + dec a + ld hl, OTPartyMon1Species + ld bc, PARTYMON_STRUCT_LENGTH + call AddNTimes + ld d, h + ld e, l + ld hl, MON_PP + add hl, de + push hl + ld hl, MON_MOVES + add hl, de + pop de + + ld b, NUM_MOVES +.copy_pp + ld a, [hli] + and a + jr z, .copied_pp + + push hl + push bc + dec a + ld hl, Moves + MOVE_PP + ld bc, MOVE_LENGTH + call AddNTimes + ld a, BANK(Moves) + call GetFarByte + pop bc + pop hl + + ld [de], a + inc de + dec b + jr nz, .copy_pp +.copied_pp + + pop hl + jr .loop +; 39871 + +TrainerType3: ; 39871 +; item + ld h, d + ld l, e +.loop + ld a, [hli] + cp $ff + ret z + + ld [CurPartyLevel], a + ld a, [hli] + ld [CurPartySpecies], a + ld a, OTPARTYMON + ld [MonType], a + push hl + predef TryAddMonToParty + ld a, [OTPartyCount] + dec a + ld hl, OTPartyMon1Item + ld bc, PARTYMON_STRUCT_LENGTH + call AddNTimes + ld d, h + ld e, l + pop hl + ld a, [hli] + ld [de], a + jr .loop +; 3989d (e:589d) + +TrainerType4: ; 3989d +; item + moves + ld h, d + ld l, e +.loop + ld a, [hli] + cp $ff + ret z + + ld [CurPartyLevel], a + ld a, [hli] + ld [CurPartySpecies], a + + ld a, OTPARTYMON + ld [MonType], a + + push hl + predef TryAddMonToParty + ld a, [OTPartyCount] + dec a + ld hl, OTPartyMon1Item + ld bc, PARTYMON_STRUCT_LENGTH + call AddNTimes + ld d, h + ld e, l + pop hl + + ld a, [hli] + ld [de], a + + push hl + ld a, [OTPartyCount] + dec a + ld hl, OTPartyMon1Moves + ld bc, PARTYMON_STRUCT_LENGTH + call AddNTimes + ld d, h + ld e, l + pop hl + + ld b, NUM_MOVES +.copy_moves + ld a, [hli] + ld [de], a + inc de + dec b + jr nz, .copy_moves + + push hl + + ld a, [OTPartyCount] + dec a + ld hl, OTPartyMon1 + ld bc, PARTYMON_STRUCT_LENGTH + call AddNTimes + ld d, h + ld e, l + ld hl, MON_PP + add hl, de + + push hl + ld hl, MON_MOVES + add hl, de + pop de + + ld b, NUM_MOVES +.copy_pp + ld a, [hli] + and a + jr z, .copied_pp + + push hl + push bc + dec a + ld hl, Moves + MOVE_PP + ld bc, MOVE_LENGTH + call AddNTimes + ld a, BANK(Moves) + call GetFarByte + pop bc + pop hl + + ld [de], a + inc de + dec b + jr nz, .copy_pp +.copied_pp + + pop hl + jr .loop +; 3991b + +ComputeTrainerReward: ; 3991b (e:591b) + ld hl, hProduct + xor a +rept 3 + ld [hli], a +endr + ld a, [wEnemyTrainerBaseReward] + ld [hli], a + ld a, [CurPartyLevel] + ld [hl], a + call Multiply + ld hl, wBattleReward + xor a + ld [hli], a + ld a, [hProduct + 2] + ld [hli], a + ld a, [hProduct + 3] + ld [hl], a + ret + + +Battle_GetTrainerName:: ; 39939 + ld a, [InBattleTowerBattle] + bit 0, a + ld hl, wd26b + jp nz, CopyTrainerName + + ld a, [OtherTrainerID] + ld b, a + ld a, [OtherTrainerClass] + ld c, a + +GetTrainerName:: ; 3994c + ld a, c + cp CAL + jr nz, .not_cal2 + + ld a, BANK(sMysteryGiftTrainerHouseFlag) + call GetSRAMBank + ld a, [sMysteryGiftTrainerHouseFlag] + and a + call CloseSRAM + jr z, .not_cal2 + + ld a, BANK(sMysteryGiftPartnerName) + call GetSRAMBank + ld hl, sMysteryGiftPartnerName + call CopyTrainerName + jp CloseSRAM + +.not_cal2 + dec c + push bc + ld b, 0 + ld hl, TrainerGroups +rept 2 + add hl, bc +endr + ld a, [hli] + ld h, [hl] + ld l, a + pop bc + +.loop + dec b + jr z, CopyTrainerName + +.skip + ld a, [hli] + cp $ff + jr nz, .skip + jr .loop + +CopyTrainerName: ; 39984 + ld de, StringBuffer1 + push de + ld bc, NAME_LENGTH + call CopyBytes + pop de + ret +; 39990 + +Function39990: ; 39990 +; This function is useless. + ld de, StringBuffer1 + push de + ld bc, NAME_LENGTH + pop de + ret +; 39999 @@ -156,6 +156,25 @@ mailmsg: MACRO \1End:: endm +hof_mon: MACRO +\1Species:: ds 1 +\1ID:: ds 2 +\1DVs:: ds 2 +\1Level:: ds 1 +\1Nickname:: ds PKMN_NAME_LENGTH +- 1 +\1End:: +endm + +hall_of_fame: MACRO +\1WinCount:: ds 1 +\1Mon1:: hof_mon \1Mon1 +\1Mon2:: hof_mon \1Mon2 +\1Mon3:: hof_mon \1Mon3 +\1Mon4:: hof_mon \1Mon4 +\1Mon5:: hof_mon \1Mon5 +\1Mon6:: hof_mon \1Mon6 +\1End:: ds 1 +ENDM INCLUDE "vram.asm" @@ -316,7 +335,7 @@ wc2cf:: ds 1 wc2d0:: ds 4 wc2d4:: ds 1 wc2d5:: ds 1 -wc2d6:: ds 1 +wLastDexEntry:: ds 1 wc2d7:: ds 1 wPreviousLandmark:: ds 1 wCurrentLandmark:: ds 1 @@ -512,15 +531,18 @@ TileMapEnd:: SECTION "Battle", WRAM0 - party_struct OddEgg +wOddEgg:: party_struct OddEgg wOddEggName:: ds PKMN_NAME_LENGTH wOddEggOTName:: ds PKMN_NAME_LENGTH - ds -70 + ds wOddEgg - @ wBT_OTTemp:: battle_tower_struct wBT_OTTemp ds wBT_OTTemp - @ -wMisc:: +wHallOfFameTemp:: hall_of_fame wHallOfFameTemp + ds wHallOfFameTemp - @ + +wMisc:: ; ds $28 * 6 wBattle:: wc608:: @@ -740,7 +762,6 @@ wOTTrademon:: trademon wOTTrademon ds wPlayerTrademon - @ wc6d0:: -wPokedexDataStart:: PlayerSDefLevel:: ; c6d0 ds 1 wc6d1:: @@ -981,10 +1002,20 @@ wc7b9:: ds 1 wc7ba:: ds 1 wc7bb:: ds 15 wc7ca:: ds 6 -wc7d0:: ds 1 -wc7d1:: ds 1 -wc7d2:: ds 1 -wc7d3:: ds 1 + + ds -$100 +wPokedexDataStart:: +wPokedexOrder:: ds NUM_POKEMON +- 1 +wPokedexOrderEnd:: ds 6 +wPokedexMetadata:: +wDexListingPage:: +wc7d0:: ds 1 ; Dex list page +wDexListingCursor:: +wc7d1:: ds 1 ; Dex cursor +wDexListingEnd:: +wc7d2:: ds 1 ; Last mon to display +wc7d3:: ds 1 ; Number of mons visible per dex list page +wCurrentDexMode:: ; Pokedex Mode wc7d4:: ds 1 ; Index of the topmost visible item in a scrolling menu wc7d5:: ds 1 ; Which row the cursor is at in a scrolling menu (0-6) wc7d6:: ds 1 @@ -992,15 +1023,18 @@ wc7d7:: ds 1 wc7d8:: ds 1 wc7d9:: ds 1 wc7da:: ds 1 -wc7db:: ds 1 -wc7dc:: ds 1 +wDexSearchSlowpokeFrame:: ds 1 +wUnlockedUnownMode:: ds 1 wc7dd:: ds 1 wc7de:: ds 1 wc7df:: ds 1 wc7e0:: ds 1 wc7e1:: ds 1 +wBackupDexListingCursor:: wc7e2:: ds 1 +wBackupDexListingPage:: wc7e3:: ds 1 +wDexCurrentLocation:: wc7e4:: ds 1 IF DEF(CRYSTAL11) wPokedexStatus:: @@ -1471,7 +1505,7 @@ wSaveFileExists:: ds 1 TextBoxFrame:: ; cfce ; bits 0-2: textbox frame 0-7 ds 1 - +TextBoxFlags:: ds 1 GBPrinter:: ; cfd0 @@ -1814,18 +1848,14 @@ CurPartyLevel:: ; d143 wd144:: ds 2 ; used when following a map warp -wNextWarp:: -wd146:: ds 1 -wNextMapGroup:: -wd147:: ds 1 -wNextMapNumber:: -wd148:: ds 1 -wPrevWarp:: -wd149:: ds 1 -wPrevMapGroup:: -wd14a:: ds 1 -wPrevMapNumber:: -wd14b:: ds 1 +; d146 +wNextWarp:: ds 1 +wNextMapGroup:: ds 1 +wNextMapNumber:: ds 1 +wPrevWarp:: ds 1 +wPrevMapGroup:: ds 1 +wPrevMapNumber:: ds 1 +; d14c wd14c:: ds 1 ; used in FollowNotExact wd14d:: ds 1 ; used in FollowNotExact @@ -1989,7 +2019,7 @@ TilesetPalettes:: ; d1e6 EvolvableFlags:: ; d1e8 flag_array PARTY_LENGTH -wd1e9:: ds 1 +wForceEvolution:: ds 1 MagikarpLength:: Buffer1:: ; d1ea ds 1 @@ -2139,9 +2169,6 @@ TimeOfDay:: ; d269 ds 1 ds 1 -SECTION "Enemy Party", WRAMX, BANK [1] -OTPlayerName:: ds NAME_LENGTH - ds OTPlayerName - @ wPokedexShowPointerAddr:: wd26b:: ds 1 wd26c:: ds 1 @@ -2149,9 +2176,13 @@ wPokedexShowPointerBank:: wd26d:: ds 1 ds 3 wd271:: ds 5 -OTPlayerID:: wd276:: ds 10 + ds wd26b - @ +SECTION "Enemy Party", WRAMX, BANK [1] +OTPlayerName:: ds NAME_LENGTH +OTPlayerID:: ds 2 + ds 8 OTPartyCount:: ds 1 ; d280 OTPartySpecies:: ds PARTY_LENGTH ; d281 OTPartyEnd:: ds 1 @@ -2182,6 +2213,7 @@ MapEventStatus:: ; d433 ds 1 ScriptFlags:: ; d434 +; bit 3: priority jump ds 1 ScriptFlags2:: ; d435 ds 1 @@ -2212,7 +2244,11 @@ wScriptStackBA5:: ds 3 ScriptDelay:: ; d44d ds 1 +wPriorityScriptBank:: +wScriptTextBank:: wd44e:: ds 1 +wPriorityScriptAddr:: +wScriptTextAddr:: wd44f:: ds 1 wd450:: ds 1 wd451:: ds 1 @@ -2487,7 +2523,7 @@ PCItemsEnd:: wPokegearFlags:: ds 1 wRadioTuningKnob:: ds 1 -wd959:: ds 2 +wLastDexMode:: ds 2 WhichRegisteredItem:: ; d95b ds 1 RegisteredItem:: ; d95c @@ -2768,11 +2804,11 @@ wPlayerDataEnd:: wMapData:: VisitedSpawns:: ; dca5 - flag_array 27 + flag_array NUM_SPAWNS -wdca9:: ds 1 -wdcaa:: ds 1 -wdcab:: ds 1 +wDigWarp:: ds 1 +wDigMapGroup:: ds 1 +wDigMapNumber:: ds 1 ; used on maps like second floor pokécenter, which are reused, so we know which ; map to return to BackupWarpNumber:: ; dcac @@ -2784,10 +2820,8 @@ BackupMapNumber:: ; dcae ds 3 -wLastSpawnMapGroup:: -wdcb2:: ds 1 -wLastSpawnMapNumber:: -wdcb3:: ds 1 +wLastSpawnMapGroup:: ds 1 +wLastSpawnMapNumber:: ds 1 WarpNumber:: ; dcb4 ds 1 @@ -2848,7 +2882,7 @@ UnownDex:: ; ded9 UnlockedUnowns:: ; def3 ds 1 -wdef4:: ds 1 +wFirstUnownSeen:: ds 1 wDaycareMan:: ; def5 @@ -2990,8 +3024,8 @@ w3_d742:: battle_tower_struct w3_d742 wBTChoiceOfLvlGroup:: w3_d800:: ds $400 w3_dc00:: ds $168 -w3_dd68:: - +w3_dd68:: ds $294 +w3_dffc:: ds 4 SECTION "GBC Video", WRAMX, BANK [5] @@ -3071,8 +3105,10 @@ w5_dc3e:: ds $c SECTION "WRAM 6", WRAMX, BANK [6] -w6_d000:: ds $400 -w6_d400:: ds $200 +wBackupTilemap:: ds $20 * SCREEN_HEIGHT + ds $1c0 +wBackupAttrMap:: ds $20 * SCREEN_HEIGHT + ds -$40 w6_d600:: ds $200 w6_d800:: |